diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7824f..6a8ca9e1859 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,6 +4,7 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
+type: 'Bug'
 
 ---
 
@@ -31,7 +32,6 @@ If applicable, add screenshots to help explain your problem.
 **Smartphone (please complete the following information):**
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
 **Additional context**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7d615..8520249f9cb 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,6 +4,7 @@ about: Suggest an idea for this project
 title: ''
 labels: ''
 assignees: ''
+type: 'Feature'
 
 ---
 
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 808043bb503..877b16b0f1e 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -129,7 +129,9 @@ jobs:
           makeLatest: true
 
       - name: 🔧 Install XML tools
-        run: sudo apt-get install -y libxml2-utils
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libxml2-utils
 
       - name: 🔼 Bump versionCode in root POM
         id: bump_version
diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml
index 59aaaffdc04..c293c074119 100644
--- a/.github/workflows/test-build.yaml
+++ b/.github/workflows/test-build.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17' ]
+        java: ['17', '21']
     name: Test with Java ${{ matrix.Java }}
     steps:
       - uses: actions/checkout@v3
diff --git a/.gitignore b/.gitignore
index a57534b0d4a..eb48c74dba1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,9 @@ forge-gui-mobile-dev/testAssets
 
 forge-gui/res/cardsfolder/*.bat
 
+# Generated changelog file
+forge-gui/release-files/CHANGES.txt
+
 forge-gui/res/PerSetTrackingResults
 forge-gui/res/decks
 forge-gui/res/layouts
diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md
deleted file mode 100644
index c2804f08ab3..00000000000
--- a/.gitlab/issue_templates/Bug.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Summary
-
-(Summarize the bug encountered concisely)
-
-
-Steps to reproduce
-
-(How one can reproduce the issue - this is very important. Specific cards and specific actions especially)
-
-
-Which version of Forge are you on (Release, Snapshot? Desktop, Android?)
-
-
-What is the current bug behavior?
-
-(What actually happens)
-
-
-What is the expected correct behavior?
-
-(What you should see instead)
-
-
-Relevant logs and/or screenshots
-
-(Paste/Attach your game.log from the crash - please use code blocks (```)) Also, provide screenshots of the current state.
-
-
-Possible fixes
-
-(If you can, link to the line of code that might be responsible for the problem)
-
-/label ~needs-investigation
\ No newline at end of file
diff --git a/.gitlab/issue_templates/Feature.md b/.gitlab/issue_templates/Feature.md
deleted file mode 100644
index 712f6a75065..00000000000
--- a/.gitlab/issue_templates/Feature.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Summary
-
-(Summarize the feature you wish concisely)
-
-
-Example screenshots
-
-(If this is a UI change, please provide an example screenshot of how this feature might work)
-
-
-Feature type
-
-(Where in Forge does this belong? e.g. Quest Mode, Deck Editor, Limited, Constructed, etc.)
-
-/label ~feature request
\ No newline at end of file
diff --git a/adventure-editor/src/main/java/forge/adventure/Main.java b/adventure-editor/src/main/java/forge/adventure/Main.java
index 946c88cae70..d3efde2b85e 100644
--- a/adventure-editor/src/main/java/forge/adventure/Main.java
+++ b/adventure-editor/src/main/java/forge/adventure/Main.java
@@ -15,7 +15,7 @@ public class Main {
 
     public static void main(String[] args) {
         GuiBase.setInterface(new GuiMobile(Files.exists(Paths.get("./res"))?"./":"../forge-gui/"));
-        GuiBase.setDeviceInfo(null, 0, 0);
+        GuiBase.setDeviceInfo(null, 0, 0, System.getProperty("user.home") + "/Downloads/");
         new EditorMainWindow(Config.instance());
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index 7f09eb3cfab..c9d698c7582 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -97,6 +97,7 @@ public class AiController {
     private int lastAttackAggression;
     private boolean useLivingEnd;
     private List<SpellAbility> skipped;
+    private boolean timeoutReached;
 
     public AiController(final Player computerPlayer, final Game game0) {
         player = computerPlayer;
@@ -886,27 +887,8 @@ public class AiController {
     private AiPlayDecision canPlayAndPayForFace(final SpellAbility sa) {
         final Card host = sa.getHostCard();
 
-        // Check a predefined condition
-        if (sa.hasParam("AICheckSVar")) {
-            final String svarToCheck = sa.getParam("AICheckSVar");
-            String comparator = "GE";
-            int compareTo = 1;
-
-            if (sa.hasParam("AISVarCompare")) {
-                final String fullCmp = sa.getParam("AISVarCompare");
-                comparator = fullCmp.substring(0, 2);
-                final String strCmpTo = fullCmp.substring(2);
-                try {
-                    compareTo = Integer.parseInt(strCmpTo);
-                } catch (final Exception ignored) {
-                    compareTo = AbilityUtils.calculateAmount(host, host.getSVar(strCmpTo), sa);
-                }
-            }
-
-            int left = AbilityUtils.calculateAmount(host, svarToCheck, sa);
-            if (!Expressions.compare(left, comparator, compareTo)) {
-                return AiPlayDecision.AnotherTime;
-            }
+        if (sa.hasParam("AICheckSVar") && !aiShouldRun(sa, sa, host, null)) {
+            return AiPlayDecision.AnotherTime;
         }
 
         // this is the "heaviest" check, which also sets up targets, defines X, etc.
@@ -924,7 +906,7 @@ public class AiController {
 
         // check if enough left (pass memory indirectly because we don't want to include those)
         Set<Card> tappedForMana = AiCardMemory.getMemorySet(player, MemorySet.PAYS_TAP_COST);
-        if (tappedForMana != null && tappedForMana.isEmpty() &&
+        if (tappedForMana != null && !tappedForMana.isEmpty() &&
                 !ComputerUtilCost.checkTapTypeCost(player, sa.getPayCosts(), host, sa, new CardCollection(tappedForMana))) {
             return AiPlayDecision.CantAfford;
         }
@@ -1664,6 +1646,9 @@ public class AiController {
             Sentry.captureMessage(ex.getMessage() + "\nAssertionError [verifyTransitivity]: " + assertex);
         }
 
+        // in case of infinite loop reset below would not be reached
+        timeoutReached = false;
+
         FutureTask<SpellAbility> future = new FutureTask<>(() -> {
             //avoid ComputerUtil.aiLifeInDanger in loops as it slows down a lot.. call this outside loops will generally be fast...
             boolean isLifeInDanger = useLivingEnd && ComputerUtil.aiLifeInDanger(player, true, 0);
@@ -1673,6 +1658,11 @@ public class AiController {
                     continue;
                 }
 
+                if (timeoutReached) {
+                    timeoutReached = false;
+                    break;
+                }
+
                 if (sa.getHostCard().hasKeyword(Keyword.STORM)
                         && sa.getApi() != ApiType.Counter // AI would suck at trying to deliberately proc a Storm counterspell
                         && player.getZone(ZoneType.Hand).contains(
@@ -1752,7 +1742,10 @@ public class AiController {
                 t.stop();
             } catch (UnsupportedOperationException ex) {
                 // Android and Java 20 dropped support to stop so sadly thread will keep running
+                timeoutReached = true;
                 future.cancel(true);
+                // TODO wait a few more seconds to try and exit at a safe point before letting the engine continue
+                // TODO mark some as skipped to increase chance to find something playable next priority
             }
             return null;
         }
@@ -1805,14 +1798,9 @@ public class AiController {
      * @param sa the sa
      * @return true, if successful
      */
-    public final boolean aiShouldRun(final ReplacementEffect effect, final SpellAbility sa, GameEntity affected) {
-        Card hostCard = effect.getHostCard();
-        if (hostCard.hasAlternateState()) {
-            hostCard = game.getCardState(hostCard);
-        }
-
+    public final boolean aiShouldRun(final CardTraitBase effect, final SpellAbility sa, final Card host, final GameEntity affected) {
         if (effect.hasParam("AILogic") && effect.getParam("AILogic").equalsIgnoreCase("ProtectFriendly")) {
-            final Player controller = hostCard.getController();
+            final Player controller = host.getController();
             if (affected instanceof Player) {
                 return !((Player) affected).isOpponentOf(controller);
             }
@@ -1821,7 +1809,6 @@ public class AiController {
             }
         }
         if (effect.hasParam("AICheckSVar")) {
-            System.out.println("aiShouldRun?" + sa);
             final String svarToCheck = effect.getParam("AICheckSVar");
             String comparator = "GE";
             int compareTo = 1;
@@ -1834,9 +1821,9 @@ public class AiController {
                     compareTo = Integer.parseInt(strCmpTo);
                 } catch (final Exception ignored) {
                     if (sa == null) {
-                        compareTo = AbilityUtils.calculateAmount(hostCard, hostCard.getSVar(strCmpTo), effect);
+                        compareTo = AbilityUtils.calculateAmount(host, host.getSVar(strCmpTo), effect);
                     } else {
-                        compareTo = AbilityUtils.calculateAmount(hostCard, hostCard.getSVar(strCmpTo), sa);
+                        compareTo = AbilityUtils.calculateAmount(host, host.getSVar(strCmpTo), sa);
                     }
                 }
             }
@@ -1844,13 +1831,12 @@ public class AiController {
             int left = 0;
 
             if (sa == null) {
-                left = AbilityUtils.calculateAmount(hostCard, svarToCheck, effect);
+                left = AbilityUtils.calculateAmount(host, svarToCheck, effect);
             } else {
-                left = AbilityUtils.calculateAmount(hostCard, svarToCheck, sa);
+                left = AbilityUtils.calculateAmount(host, svarToCheck, sa);
             }
-            System.out.println("aiShouldRun?" + left + comparator + compareTo);
             return Expressions.compare(left, comparator, compareTo);
-        } else if (effect.hasParam("AICheckDredge")) {
+        } else if (effect.isKeyword(Keyword.DREDGE)) {
             return player.getCardsIn(ZoneType.Library).size() > 8 || player.isCardInPlay("Laboratory Maniac");
         } else return sa != null && doTrigger(sa, false);
     }
diff --git a/forge-ai/src/main/java/forge/ai/AiCostDecision.java b/forge-ai/src/main/java/forge/ai/AiCostDecision.java
index 52d9ad4f90a..88de7ba4eb4 100644
--- a/forge-ai/src/main/java/forge/ai/AiCostDecision.java
+++ b/forge-ai/src/main/java/forge/ai/AiCostDecision.java
@@ -29,12 +29,15 @@ public class AiCostDecision extends CostDecisionMakerBase {
     private final CardCollection tapped;
 
     public AiCostDecision(Player ai0, SpellAbility sa, final boolean effect) {
+        this(ai0, sa, effect, false);
+    }
+    public AiCostDecision(Player ai0, SpellAbility sa, final boolean effect, final boolean payMana) {
         super(ai0, effect, sa, sa.getHostCard());
 
         discarded = new CardCollection();
         tapped = new CardCollection();
         Set<Card> tappedForMana = AiCardMemory.getMemorySet(ai0, MemorySet.PAYS_TAP_COST);
-        if (tappedForMana != null) {
+        if (!payMana && tappedForMana != null) {
             tapped.addAll(tappedForMana);
         }
     }
@@ -110,7 +113,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 randomSubset = ability.getActivatingPlayer().getController().orderMoveToZoneList(randomSubset, ZoneType.Graveyard, ability);
             }
             return PaymentDecision.card(randomSubset);
-        } else if (type.equals("DifferentNames")) {
+        } else if (type.contains("+WithDifferentNames")) {
             CardCollection differentNames = new CardCollection();
             CardCollection discardMe = CardLists.filter(hand, CardPredicates.hasSVar("DiscardMe"));
             while (c > 0) {
@@ -563,7 +566,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 int thisRemove = Math.min(prefCard.getCounters(cType), stillToRemove);
                 if (thisRemove > 0) {
                     removed += thisRemove;
-                    table.put(null, prefCard, CounterType.get(cType), thisRemove);
+                    table.put(null, prefCard, cType, thisRemove);
                 }
             }
         }
@@ -573,7 +576,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
     @Override
     public PaymentDecision visit(CostRemoveAnyCounter cost) {
         final int c = cost.getAbilityAmount(ability);
-        final Card originalHost = ObjectUtils.defaultIfNull(ability.getOriginalHost(), source);
+        final Card originalHost = ObjectUtils.getIfNull(ability.getOriginalHost(), source);
 
         if (c <= 0) {
             return null;
@@ -716,7 +719,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 int over = Math.min(crd.getCounters(CounterEnumType.QUEST) - e, c - toRemove);
                 if (over > 0) {
                     toRemove += over;
-                    table.put(null, crd, CounterType.get(CounterEnumType.QUEST), over);
+                    table.put(null, crd, CounterEnumType.QUEST, over);
                 }
             }
         }
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 7a95f488277..bad4b3c3bbc 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -767,7 +767,7 @@ public class ComputerUtil {
     public static CardCollection chooseUntapType(final Player ai, final String type, final Card activate, final boolean untap, final int amount, SpellAbility sa) {
         CardCollection typeList = CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), type.split(";"), activate.getController(), activate, sa);
 
-        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterType.get(CounterEnumType.STUN)));
+        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterEnumType.STUN));
 
         if (untap) {
             typeList.remove(activate);
@@ -2542,7 +2542,7 @@ public class ComputerUtil {
 
         boolean opponent = controller.isOpponentOf(ai);
 
-        final CounterType p1p1Type = CounterType.get(CounterEnumType.P1P1);
+        final CounterType p1p1Type = CounterEnumType.P1P1;
 
         if (!sa.hasParam("AILogic")) {
             return Aggregates.random(options);
@@ -3104,41 +3104,38 @@ public class ComputerUtil {
 
     public static CardCollection filterAITgts(SpellAbility sa, Player ai, CardCollection srcList, boolean alwaysStrict) {
         final Card source = sa.getHostCard();
-        if (source == null) { return srcList; }
-
-        if (sa.hasParam("AITgts")) {
-            CardCollection list;
-            String aiTgts = sa.getParam("AITgts");
-            if (aiTgts.startsWith("BetterThan")) {
-                int value = 0;
-                if (aiTgts.endsWith("Source")) {
-                    value = ComputerUtilCard.evaluateCreature(source);
-                    if (source.isEnchanted()) {
-                        for (Card enc : source.getEnchantedBy()) {
-                            if (enc.getController().equals(ai)) {
-                                value += 100; // is 100 per AI's own aura enough?
-                            }
-                        }
-                    }
-                } else if (aiTgts.contains("EvalRating.")) {
-                    value = AbilityUtils.calculateAmount(source, aiTgts.substring(aiTgts.indexOf(".") + 1), sa);
-                } else {
-                    System.err.println("Warning: Unspecified AI target evaluation rating for SA " + sa);
-                    value = ComputerUtilCard.evaluateCreature(source);
-                }
-                final int totalValue = value;
-                list = CardLists.filter(srcList, c -> ComputerUtilCard.evaluateCreature(c) > totalValue + 30);
-            } else {
-                list = CardLists.getValidCards(srcList, sa.getParam("AITgts"), sa.getActivatingPlayer(), source, sa);
-            }
-
-            if (!list.isEmpty() || sa.hasParam("AITgtsStrict") || alwaysStrict) {
-                return list;
-            } else {
-                return srcList;
-            }
+        if (source == null || !sa.hasParam("AITgts")) {
+            return srcList;
         }
 
+        CardCollection list;
+        String aiTgts = sa.getParam("AITgts");
+        if (aiTgts.startsWith("BetterThan")) {
+            int value = 0;
+            if (aiTgts.endsWith("Source")) {
+                value = ComputerUtilCard.evaluateCreature(source);
+                if (source.isEnchanted()) {
+                    for (Card enc : source.getEnchantedBy()) {
+                        if (enc.getController().equals(ai)) {
+                            value += 100; // is 100 per AI's own aura enough?
+                        }
+                    }
+                }
+            } else if (aiTgts.contains("EvalRating.")) {
+                value = AbilityUtils.calculateAmount(source, aiTgts.substring(aiTgts.indexOf(".") + 1), sa);
+            } else {
+                System.err.println("Warning: Unspecified AI target evaluation rating for SA " + sa);
+                value = ComputerUtilCard.evaluateCreature(source);
+            }
+            final int totalValue = value;
+            list = CardLists.filter(srcList, c -> ComputerUtilCard.evaluateCreature(c) > totalValue + 30);
+        } else {
+            list = CardLists.getValidCards(srcList, sa.getParam("AITgts"), sa.getActivatingPlayer(), source, sa);
+        }
+
+        if (!list.isEmpty() || sa.hasParam("AITgtsStrict") || alwaysStrict) {
+            return list;
+        }
         return srcList;
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 7e5f7144482..602d8a23f07 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -177,16 +177,16 @@ public class ComputerUtilCombat {
     public static int damageIfUnblocked(final Card attacker, final GameEntity attacked, final Combat combat, boolean withoutAbilities) {
         int damage = attacker.getNetCombatDamage();
         int sum = 0;
-        if (attacked instanceof Player player && !player.canLoseLife()) {
-            return 0;
-        }
-
-        // ask ReplacementDamage directly
-        if (isCombatDamagePrevented(attacker, attacked, damage)) {
+        if (attacked instanceof Player p && !p.canLoseLife()) {
             return 0;
         }
 
         if (!attacker.hasKeyword(Keyword.INFECT)) {
+            // ask ReplacementDamage directly
+            if (isCombatDamagePrevented(attacker, attacked, damage)) {
+                return 0;
+            }
+
             damage += predictPowerBonusOfAttacker(attacker, null, combat, withoutAbilities);
             sum = predictDamageTo(attacked, damage, attacker, true);
             if (attacker.hasDoubleStrike()) {
@@ -974,17 +974,13 @@ public class ComputerUtilCombat {
                 continue;
             }
 
+            int pBonus = 0;
             if (ability.getApi() == ApiType.Pump) {
                 if (!ability.hasParam("NumAtt")) {
                     continue;
                 }
 
-                if (ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
-                    int pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumAtt"), ability);
-                    if (pBonus > 0) {
-                        power += pBonus;
-                    }
-                }
+                pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumAtt"), ability);
             } else if (ability.getApi() == ApiType.PutCounter) {
                 if (!ability.hasParam("CounterType") || !ability.getParam("CounterType").equals("P1P1")) {
                     continue;
@@ -998,12 +994,11 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
-                    int pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
-                    if (pBonus > 0) {
-                        power += pBonus;
-                    }
-                }
+                pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
+            }
+
+            if (pBonus > 0 && ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
+                power += pBonus;
             }
         }
 
@@ -1107,17 +1102,13 @@ public class ComputerUtilCombat {
                 continue;
             }
 
+            int tBonus = 0;
             if (ability.getApi() == ApiType.Pump) {
                 if (!ability.hasParam("NumDef")) {
                     continue;
                 }
 
-                if (ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
-                    int tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumDef"), ability);
-                    if (tBonus > 0) {
-                        toughness += tBonus;
-                    }
-                }
+                tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumDef"), ability);
             } else if (ability.getApi() == ApiType.PutCounter) {
                 if (!ability.hasParam("CounterType") || !ability.getParam("CounterType").equals("P1P1")) {
                     continue;
@@ -1131,12 +1122,11 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
-                    int tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
-                    if (tBonus > 0) {
-                        toughness += tBonus;
-                    }
-                }
+                tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
+            }
+
+            if (tBonus > 0 && ComputerUtilCost.canPayCost(ability, blocker.getController(), false)) {
+                toughness += tBonus;
             }
         }
         return toughness;
@@ -1305,6 +1295,7 @@ public class ComputerUtilCombat {
                 continue;
             }
 
+            int pBonus = 0;
             if (ability.getApi() == ApiType.Pump) {
                 if (!ability.hasParam("NumAtt")) {
                     continue;
@@ -1314,11 +1305,8 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (!ability.getPayCosts().hasTapCost() && ComputerUtilCost.canPayCost(ability, attacker.getController(), false)) {
-                    int pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumAtt"), ability);
-                    if (pBonus > 0) {
-                        power += pBonus;
-                    }
+                if (!ability.getPayCosts().hasTapCost()) {
+                    pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumAtt"), ability);
                 }
             } else if (ability.getApi() == ApiType.PutCounter) {
                 if (!ability.hasParam("CounterType") || !ability.getParam("CounterType").equals("P1P1")) {
@@ -1333,13 +1321,14 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                if (!ability.getPayCosts().hasTapCost() && ComputerUtilCost.canPayCost(ability, attacker.getController(), false)) {
-                    int pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
-                    if (pBonus > 0) {
-                        power += pBonus;
-                    }
+                if (!ability.getPayCosts().hasTapCost()) {
+                    pBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
                 }
             }
+
+            if (pBonus > 0 && ComputerUtilCost.canPayCost(ability, attacker.getController(), false)) {
+                power += pBonus;
+            }
         }
         return power;
     }
@@ -1530,16 +1519,14 @@ public class ComputerUtilCombat {
             if (ability.getPayCosts().hasTapCost() && !attacker.hasKeyword(Keyword.VIGILANCE)) {
                 continue;
             }
-            if (!ComputerUtilCost.canPayCost(ability, attacker.getController(), false)) {
-                continue;
-            }
 
+            int tBonus = 0;
             if (ability.getApi() == ApiType.Pump) {
                 if (!ability.hasParam("NumDef")) {
                     continue;
                 }
 
-                toughness += AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumDef"), ability, true);
+                tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParam("NumDef"), ability, true);
             } else if (ability.getApi() == ApiType.PutCounter) {
                 if (!ability.hasParam("CounterType") || !ability.getParam("CounterType").equals("P1P1")) {
                     continue;
@@ -1553,10 +1540,11 @@ public class ComputerUtilCombat {
                     continue;
                 }
 
-                int tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
-                if (tBonus > 0) {
-                    toughness += tBonus;
-                }
+                tBonus = AbilityUtils.calculateAmount(ability.getHostCard(), ability.getParamOrDefault("CounterNum", "1"), ability);
+            }
+
+            if (tBonus > 0 && ComputerUtilCost.canPayCost(ability, attacker.getController(), false)) {
+                toughness += tBonus;
             }
         }
         return toughness;
@@ -2020,35 +2008,35 @@ public class ComputerUtilCombat {
      *
      * @param self
      *            a {@link forge.game.player.Player} object.
-     * @param attacker
+     * @param combatant
      *            a {@link forge.game.card.Card} object.
-     * @param block
+     * @param opposedCombatants
      * @param dmgCanDeal
      *            a int.
      * @param defender
      * @param overrideOrder overriding combatant order
      */
-    public static Map<Card, Integer> distributeAIDamage(final Player self, final Card attacker, final CardCollectionView block, final CardCollectionView remaining, int dmgCanDeal, GameEntity defender, boolean overrideOrder) {
+    public static Map<Card, Integer> distributeAIDamage(final Player self, final Card combatant, CardCollectionView opposedCombatants, final CardCollectionView remaining, int dmgCanDeal, GameEntity defender, boolean overrideOrder) {
         Map<Card, Integer> damageMap = Maps.newHashMap();
-        Combat combat = attacker.getGame().getCombat();
+        Combat combat = combatant.getGame().getCombat();
 
         boolean isAttacking = defender != null;
 
         // Check for Banding, Defensive Formation
-        boolean isAttackingMe = isAttacking && combat.getDefenderPlayerByAttacker(attacker).equals(self);
-        boolean isBlockingMyBand = attacker.getController().isOpponentOf(self) && AttackingBand.isValidBand(block, true);
+        boolean isAttackingMe = isAttacking && combat.getDefenderPlayerByAttacker(combatant).equals(self);
+        boolean isBlockingMyBand = combatant.getController().isOpponentOf(self) && AttackingBand.isValidBand(opposedCombatants, true);
         final boolean aiDistributesBandingDmg = isAttackingMe || isBlockingMyBand;
 
-        final boolean hasTrample = attacker.hasKeyword(Keyword.TRAMPLE);
+        final boolean hasTrample = combatant.hasKeyword(Keyword.TRAMPLE);
 
-        if (combat != null && remaining != null && hasTrample && attacker.isAttacking() && !aiDistributesBandingDmg) {
+        if (combat != null && remaining != null && hasTrample && combatant.isAttacking() && !aiDistributesBandingDmg) {
             // if attacker has trample and some of its blockers are also blocking others it's generally a good idea
             // to assign those without trample first so we can maximize the damage to the defender
             for (final Card c : remaining) {
-                if (c == attacker || c.hasKeyword(Keyword.TRAMPLE)) {
+                if (c == combatant || c.hasKeyword(Keyword.TRAMPLE)) {
                     continue;
                 }
-                final CardCollection sharedBlockers = new CardCollection(block);
+                final CardCollection sharedBlockers = new CardCollection(opposedCombatants);
                 sharedBlockers.retainAll(combat.getBlockers(c));
                 if (!sharedBlockers.isEmpty()) {
                     // signal skip for now
@@ -2058,12 +2046,21 @@ public class ComputerUtilCombat {
             // TODO sort remaining tramplers for DamageDone triggers
         }
 
-        if (block.size() == 1) {
-            final Card blocker = block.getFirst();
+        // Order the combatants in preferred order in case legacy ordering is disabled
+        if (!self.getGame().getRules().hasOrderCombatants()) {
+            if (combatant.isAttacking()) { 
+                opposedCombatants = AiBlockController.orderBlockers(combatant, new CardCollection(opposedCombatants));
+            } else {
+                opposedCombatants = AiBlockController.orderAttackers(combatant, new CardCollection(opposedCombatants));
+            }
+        }
+
+        if (opposedCombatants.size() == 1) {
+            final Card blocker = opposedCombatants.getFirst();
             int dmgToBlocker = dmgCanDeal;
 
             if (hasTrample && isAttacking && !aiDistributesBandingDmg) { // otherwise no entity to deliver damage via trample
-                dmgToBlocker = getEnoughDamageToKill(blocker, dmgCanDeal, attacker, true);
+                dmgToBlocker = getEnoughDamageToKill(blocker, dmgCanDeal, combatant, true);
 
                 if (dmgCanDeal < dmgToBlocker) {
                     // can't kill so just put the lowest legal amount
@@ -2082,9 +2079,9 @@ public class ComputerUtilCombat {
             // Does the attacker deal lethal damage to all blockers
             //Blocking Order now determined after declare blockers
             Card lastBlocker = null;
-            for (final Card b : block) {
+            for (final Card b : opposedCombatants) {
                 lastBlocker = b;
-                final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true);
+                final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, combatant, true);
                 if (dmgToKill <= dmgCanDeal) {
                     damageMap.put(b, dmgToKill);
                     dmgCanDeal -= dmgToKill;
@@ -2109,15 +2106,15 @@ public class ComputerUtilCombat {
         } else {
             // In the event of Banding or Defensive Formation, assign max damage to the blocker who
             // can tank all the damage or to the worst blocker to lose as little as possible
-            for (final Card b : block) {
-                final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, attacker, true);
+            for (final Card b : opposedCombatants) {
+                final int dmgToKill = getEnoughDamageToKill(b, dmgCanDeal, combatant, true);
                 if (dmgToKill > dmgCanDeal) {
                     damageMap.put(b, dmgCanDeal);
                     break;
                 }
             }
             if (damageMap.isEmpty()) {
-                damageMap.put(ComputerUtilCard.getWorstCreatureAI(block), dmgCanDeal);
+                damageMap.put(ComputerUtilCard.getWorstCreatureAI(opposedCombatants), dmgCanDeal);
             }
         }
         return damageMap;
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
index ad00bc9c9c8..60af06cc6ba 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
@@ -287,7 +287,9 @@ public class ComputerUtilMana {
                 continue;
             }
 
-            if (!ComputerUtilCost.checkTapTypeCost(ai, ma.getPayCosts(), ma.getHostCard(), sa, AiCardMemory.getMemorySet(ai, MemorySet.PAYS_TAP_COST))) {
+            int amount = ma.hasParam("Amount") ? AbilityUtils.calculateAmount(ma.getHostCard(), ma.getParam("Amount"), ma) : 1;
+            if (amount <= 0) {
+                // wrong gamestate for variable amount
                 continue;
             }
 
@@ -351,9 +353,14 @@ public class ComputerUtilMana {
                 continue;
             }
 
+            // these should come last since they reserve the paying cards
+            // (this means if a mana ability has both parts it doesn't currently undo reservations if the second part fails)
             if (!ComputerUtilCost.checkForManaSacrificeCost(ai, ma.getPayCosts(), ma, ma.isTrigger())) {
                 continue;
             }
+            if (!ComputerUtilCost.checkTapTypeCost(ai, ma.getPayCosts(), ma.getHostCard(), sa, AiCardMemory.getMemorySet(ai, MemorySet.PAYS_TAP_COST))) {
+                continue;
+            }
 
             return paymentChoice;
         }
@@ -443,7 +450,6 @@ public class ComputerUtilMana {
                         manaProduced = manaProduced.replace(s, color);
                     }
                 } else if (saMana.hasParam("ReplaceColor")) {
-                    // replace color
                     String color = saMana.getParam("ReplaceColor");
                     if ("Chosen".equals(color)) {
                         if (card.hasChosenColor()) {
@@ -704,9 +710,9 @@ public class ComputerUtilMana {
             if (hasConverge &&
                     (toPay == ManaCostShard.GENERIC || toPay == ManaCostShard.X)) {
                 final int unpaidColors = cost.getUnpaidColors() + cost.getColorsPaid() ^ ManaCostShard.COLORS_SUPERPOSITION;
-                for (final byte b : ColorSet.fromMask(unpaidColors)) {
+                for (final MagicColor.Color b : ColorSet.fromMask(unpaidColors)) {
                     // try and pay other colors for converge
-                    final ManaCostShard shard = ManaCostShard.valueOf(b);
+                    final ManaCostShard shard = ManaCostShard.valueOf(b.getColorMask());
                     saList = sourcesForShards.get(shard);
                     if (saList != null && !saList.isEmpty()) {
                         toPay = shard;
@@ -735,7 +741,8 @@ public class ComputerUtilMana {
 
             if (saPayment != null && ComputerUtilCost.isSacrificeSelfCost(saPayment.getPayCosts())) {
                 if (sa.getTargets() != null && sa.getTargets().contains(saPayment.getHostCard())) {
-                    saExcludeList.add(saPayment); // not a good idea to sac a card that you're targeting with the SA you're paying for
+                    // not a good idea to sac a card that you're targeting with the SA you're paying for
+                    saExcludeList.add(saPayment);
                     continue;
                 }
             }
@@ -809,11 +816,11 @@ public class ComputerUtilMana {
                 String manaProduced = predictManafromSpellAbility(saPayment, ai, toPay);
                 payMultipleMana(cost, manaProduced, ai);
 
-                // remove from available lists
+                // remove to prevent re-usage since resources don't get consumed
                 sourcesForShards.values().removeIf(CardTraitPredicates.isHostCard(saPayment.getHostCard()));
             } else {
                 final CostPayment pay = new CostPayment(saPayment.getPayCosts(), saPayment);
-                if (!pay.payComputerCosts(new AiCostDecision(ai, saPayment, effect))) {
+                if (!pay.payComputerCosts(new AiCostDecision(ai, saPayment, effect, true))) {
                     saList.remove(saPayment);
                     continue;
                 }
@@ -822,8 +829,10 @@ public class ComputerUtilMana {
                 // subtract mana from mana pool
                 manapool.payManaFromAbility(sa, cost, saPayment);
 
-                // no need to remove abilities from resource map,
-                // once their costs are paid and consume resources, they can not be used again
+                // need to consider if another use is now prevented
+                if (!cost.isPaid() && saPayment.isActivatedAbility() && !saPayment.getRestrictions().canPlay(saPayment.getHostCard(), saPayment)) {
+                    sourcesForShards.values().removeIf(s -> s == saPayment);
+                }
 
                 if (hasConverge) {
                     // hack to prevent converge re-using sources
@@ -887,7 +896,8 @@ public class ComputerUtilMana {
         if (hasConverge) {
             // add extra colors for paying converge
             final int unpaidColors = cost.getUnpaidColors() + cost.getColorsPaid() ^ ManaCostShard.COLORS_SUPERPOSITION;
-            for (final byte b : ColorSet.fromMask(unpaidColors)) {
+            for (final MagicColor.Color color : ColorSet.fromMask(unpaidColors)) {
+                final byte b = color.getColorMask();
                 final ManaCostShard shard = ManaCostShard.valueOf(b);
                 if (!sourcesForShards.containsKey(shard)) {
                     if (ai.getManaPool().canPayForShardWithColor(shard, b)) {
@@ -914,7 +924,7 @@ public class ComputerUtilMana {
             ColorSet shared = ColorSet.fromMask(toPay.getColorMask()).getSharedColors(ColorSet.fromNames(m.getComboColors(saPayment).split(" ")));
             // but other effects might still lead to a more permissive payment
             if (!shared.isColorless()) {
-                m.setExpressChoice(ColorSet.fromMask(shared.iterator().next()));
+                m.setExpressChoice(shared.iterator().next().getShortName());
             }
             getComboManaChoice(ai, saPayment, sa, cost);
         }
@@ -1089,7 +1099,7 @@ public class ComputerUtilMana {
         // * pay hybrids
         // * pay phyrexian, keep mana for colorless
         // * pay generic
-        return cost.getShardToPayByPriority(shardsToPay, ColorSet.ALL_COLORS.getColor());
+        return cost.getShardToPayByPriority(shardsToPay, ColorSet.WUBRG.getColor());
     }
 
     private static void adjustManaCostToAvoidNegEffects(ManaCostBeingPaid cost, final Card card, Player ai) {
@@ -1496,7 +1506,7 @@ public class ComputerUtilMana {
                     }
 
                     if (!cost.isReusuableResource()) {
-                        for(CostPart part : cost.getCostParts()) {
+                        for (CostPart part : cost.getCostParts()) {
                             if (part instanceof CostSacrifice && !part.payCostFromSource()) {
                                 unpreferredCost = true;
                             }
@@ -1587,10 +1597,8 @@ public class ComputerUtilMana {
 
                 // don't use abilities with dangerous drawbacks
                 AbilitySub sub = m.getSubAbility();
-                if (sub != null) {
-                    if (!SpellApiToAi.Converter.get(sub).chkDrawbackWithSubs(ai, sub).willingToPlay()) {
-                        continue;
-                    }
+                if (sub != null && !SpellApiToAi.Converter.get(sub).chkDrawbackWithSubs(ai, sub).willingToPlay()) {
+                    continue;
                 }
 
                 manaMap.get(ManaAtom.GENERIC).add(m); // add to generic source list
@@ -1658,7 +1666,6 @@ public class ComputerUtilMana {
                                 if (replaced.contains("C")) {
                                     manaMap.put(ManaAtom.COLORLESS, m);
                                 }
-
                             }
                         }
                     }
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 6cd6815c86f..05f92ee72f2 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -460,7 +460,11 @@ public class PlayerControllerAi extends PlayerController {
 
     @Override
     public boolean confirmReplacementEffect(ReplacementEffect replacementEffect, SpellAbility effectSA, GameEntity affected, String question) {
-        return brains.aiShouldRun(replacementEffect, effectSA, affected);
+        Card host = replacementEffect.getHostCard();
+        if (host.hasAlternateState()) {
+            host = host.getGame().getCardState(host);
+        }
+        return brains.aiShouldRun(replacementEffect, effectSA, host, affected);
     }
 
     @Override
@@ -1024,13 +1028,13 @@ public class PlayerControllerAi extends PlayerController {
         if ((colors.getColor() & chosenColorMask) != 0) {
             return chosenColorMask;
         }
-        return Iterables.getFirst(colors, (byte)0);
+        return Iterables.getFirst(colors, MagicColor.Color.COLORLESS).getColorMask();
     }
 
     @Override
     public byte chooseColor(String message, SpellAbility sa, ColorSet colors) {
         if (colors.countColors() < 2) {
-            return Iterables.getFirst(colors, MagicColor.WHITE);
+            return Iterables.getFirst(colors, MagicColor.Color.WHITE).getColorMask();
         }
         // You may switch on sa.getApi() here and use sa.getParam("AILogic")
         CardCollectionView hand = player.getCardsIn(ZoneType.Hand);
@@ -1043,7 +1047,7 @@ public class PlayerControllerAi extends PlayerController {
         if ((colors.getColor() & chosenColorMask) != 0) {
             return chosenColorMask;
         }
-        return Iterables.getFirst(colors, MagicColor.WHITE);
+        return Iterables.getFirst(colors, MagicColor.Color.WHITE).getColorMask();
     }
 
     @Override
@@ -1347,6 +1351,11 @@ public class PlayerControllerAi extends PlayerController {
         // Ai won't understand that anyway
     }
 
+    @Override
+    public void revealUnsupported(Map<Player, List<PaperCard>> unsupported) {
+        // Ai won't understand that anyway
+    }
+
     @Override
     public Map<DeckSection, List<? extends PaperCard>> complainCardsCantPlayWell(Deck myDeck) {
         // TODO check if profile detection set to Auto
diff --git a/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java b/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java
index 036641d7f6b..9b514a68343 100644
--- a/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java
+++ b/forge-ai/src/main/java/forge/ai/SpecialAiLogic.java
@@ -171,7 +171,7 @@ public class SpecialAiLogic {
                 final boolean isInfect = source.hasKeyword(Keyword.INFECT); // Flesh-Eater Imp
                 int lethalDmg = isInfect ? 10 - defPlayer.getPoisonCounters() : defPlayer.getLife();
 
-                if (isInfect && !combat.getDefenderByAttacker(source).canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                if (isInfect && !combat.getDefenderByAttacker(source).canReceiveCounters(CounterEnumType.POISON)) {
                     lethalDmg = Integer.MAX_VALUE; // won't be able to deal poison damage to kill the opponent
                 }
 
@@ -277,7 +277,7 @@ public class SpecialAiLogic {
                 final boolean isInfect = source.hasKeyword(Keyword.INFECT);
                 int lethalDmg = isInfect ? 10 - defPlayer.getPoisonCounters() : defPlayer.getLife();
 
-                if (isInfect && !combat.getDefenderByAttacker(source).canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                if (isInfect && !combat.getDefenderByAttacker(source).canReceiveCounters(CounterEnumType.POISON)) {
                     lethalDmg = Integer.MAX_VALUE; // won't be able to deal poison damage to kill the opponent
                 }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
index 49cf157d4c8..590c4285a96 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -101,11 +101,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
             sa.getHostCard().removeSVar("AIPreferenceOverride");
         }
 
-        if (aiLogic.equals("BeforeCombat")) {
-            if (ai.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_BEGIN)) {
-                return false;
-            }
-        } else if (aiLogic.equals("SurpriseBlock")) {
+        if (aiLogic.equals("SurpriseBlock")) {
             if (ai.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
                 return false;
             }
@@ -298,13 +294,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
         boolean activateForCost = ComputerUtil.activateForCost(sa, ai);
 
         if (sa.hasParam("Origin")) {
-            try {
-                origin = ZoneType.listValueOf(sa.getParam("Origin"));
-            } catch (IllegalArgumentException ex) {
-                // This happens when Origin is something like
-                // "Graveyard,Library" (Doomsday)
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-            }
+            origin = ZoneType.listValueOf(sa.getParam("Origin"));
         }
         final String destination = sa.getParam("Destination");
 
@@ -771,6 +761,8 @@ public class ChangeZoneAi extends SpellAbilityAi {
             return ph.getNextTurn().equals(ai) && ph.is(PhaseType.END_OF_TURN);
         } else if (aiLogic.equals("Main1") && ph.is(PhaseType.MAIN1, ai)) {
             return true;
+        } else if (aiLogic.equals("BeforeCombat")) {
+            return !ai.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_BEGIN);
         }
 
         if (sa.isHidden()) {
@@ -897,9 +889,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
         CardCollection list = CardLists.getTargetableCards(game.getCardsIn(origin), sa);
 
         list = ComputerUtil.filterAITgts(sa, ai, list, true);
-        if (sa.hasParam("AITgtsOnlyBetterThanSelf")) {
-            list = CardLists.filter(list, card -> ComputerUtilCard.evaluateCreature(card) > ComputerUtilCard.evaluateCreature(source) + 30);
-        }
 
         if (source.isInZone(ZoneType.Hand)) {
             list = CardLists.filter(list, CardPredicates.nameNotEquals(source.getName())); // Don't get the same card back.
@@ -908,8 +897,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
             list.remove(source); // spells can't target their own source, because it's actually in the stack zone
         }
 
-        // list = CardLists.canSubsequentlyTarget(list, sa);
-
         if (sa.hasParam("AttachedTo")) {
             list = CardLists.filter(list, c -> {
                 for (Card card : game.getCardsIn(ZoneType.Battlefield)) {
@@ -1252,53 +1239,12 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 }
             }
 
-            // if max CMC exceeded, do not choose this card (but keep looking for other options)
-            if (sa.hasParam("MaxTotalTargetCMC")) {
-                if (choice.getCMC() > sa.getTargetRestrictions().getMaxTotalCMC(choice, sa) - sa.getTargets().getTotalTargetedCMC()) {
-                    list.remove(choice);
-                    continue;
-                }
-            }
-
-            // if max power exceeded, do not choose this card (but keep looking for other options)
-            if (sa.hasParam("MaxTotalTargetPower")) {
-                if (choice.getNetPower() > sa.getTargetRestrictions().getMaxTotalPower(choice, sa) -sa.getTargets().getTotalTargetedPower()) {
-                    list.remove(choice);
-                    continue;
-                }
-            }
-
-            // honor the Same Creature Type restriction
-            if (sa.getTargetRestrictions().isWithSameCreatureType()) {
-                Card firstTarget = sa.getTargetCard();
-                if (firstTarget != null && !choice.sharesCreatureTypeWith(firstTarget)) {
-                    list.remove(choice);
-                    continue;
-                }
-            }
-
             list.remove(choice);
             if (sa.canTarget(choice)) {
                 sa.getTargets().add(choice);
             }
         }
 
-        // Honor the Single Zone restriction. For now, simply remove targets that do not belong to the same zone as the first targeted card.
-        // TODO: ideally the AI should consider at this point which targets exactly to pick (e.g. one card in the first player's graveyard
-        // vs. two cards in the second player's graveyard, which cards are more relevant to be targeted, etc.). Consider improving.
-        if (sa.getTargetRestrictions().isSingleZone()) {
-            Card firstTgt = sa.getTargetCard();
-            CardCollection toRemove = new CardCollection();
-            if (firstTgt != null) {
-                for (Card t : sa.getTargets().getTargetCards()) {
-                    if (!t.getController().equals(firstTgt.getController())) {
-                        toRemove.add(t);
-                    }
-                }
-                sa.getTargets().removeAll(toRemove);
-            }
-        }
-
         return true;
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/CloneAi.java b/forge-ai/src/main/java/forge/ai/ability/CloneAi.java
index 519f26bdd3b..b7199681f47 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CloneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CloneAi.java
@@ -96,6 +96,10 @@ public class CloneAi extends SpellAbilityAi {
         if (sa.usesTargeting()) {
             chance = cloneTgtAI(sa);
         } else {
+            if (sa.isReplacementAbility() && host.isCloned()) {
+                // prevent StackOverflow from infinite loop copying another ETB RE
+                return new AiAbilityDecision(0, AiPlayDecision.StopRunawayActivations);
+            }
             if (sa.hasParam("Choices")) {
                 CardCollectionView choices = CardLists.getValidCards(host.getGame().getCardsIn(ZoneType.Battlefield),
                         sa.getParam("Choices"), host.getController(), host, sa);
@@ -188,7 +192,7 @@ public class CloneAi extends SpellAbilityAi {
         final boolean canCloneLegendary = "True".equalsIgnoreCase(sa.getParam("NonLegendary"));
 
         String filter = !isVesuva ? "Permanent.YouDontCtrl,Permanent.nonLegendary"
-                : "Permanent.YouDontCtrl+notnamed" + name + ",Permanent.nonLegendary+notnamed" + name;
+                : "Permanent.YouDontCtrl+!named" + name + ",Permanent.nonLegendary+!named" + name;
 
         // TODO: rewrite this block so that this is done somehow more elegantly
         if (canCloneLegendary) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/ConniveAi.java b/forge-ai/src/main/java/forge/ai/ability/ConniveAi.java
index 3beb8d09463..dc7abc8cdf0 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ConniveAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ConniveAi.java
@@ -119,7 +119,7 @@ public class ConniveAi extends SpellAbilityAi {
             }
         }
         return new AiAbilityDecision(
-                sa.isTargetNumberValid() && !sa.getTargets().isEmpty() ? 100 : 0,
+                sa.isTargetNumberValid() ? 100 : 0,
                 sa.isTargetNumberValid() ? AiPlayDecision.WillPlay : AiPlayDecision.TargetingFailed
         );
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/ControlExchangeAi.java b/forge-ai/src/main/java/forge/ai/ability/ControlExchangeAi.java
index 09faaaee18c..57262dd602a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ControlExchangeAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ControlExchangeAi.java
@@ -53,17 +53,15 @@ public class ControlExchangeAi extends SpellAbilityAi {
             if (mandatory) {
                 return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
             }
-        } else {
-            if (mandatory) {
-                AiAbilityDecision decision = chkDrawback(sa, aiPlayer);
-                if (sa.isTargetNumberValid()) {
-                    return  new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-                }
-
-                return decision;
-            } else {
-                return canPlay(aiPlayer, sa);
+        } else if (mandatory) {
+            AiAbilityDecision decision = chkDrawback(sa, aiPlayer);
+            if (sa.isTargetNumberValid()) {
+                return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
             }
+
+            return decision;
+        } else {
+            return canPlay(aiPlayer, sa);
         }
         return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
index 779d6a02e15..7fb91ce52d8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
@@ -44,7 +44,7 @@ public class CopyPermanentAi extends SpellAbilityAi {
                 // Not at EOT phase
                 return new AiAbilityDecision(0, AiPlayDecision.WaitForEndOfTurn);
             }
-        } if ("DuplicatePerms".equals(aiLogic)) {
+        } else if ("DuplicatePerms".equals(aiLogic)) {
             final List<Card> valid = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa);
             if (valid.size() < 2) {
                 return new AiAbilityDecision(0, AiPlayDecision.MissingNeededCards);
@@ -212,7 +212,7 @@ public class CopyPermanentAi extends SpellAbilityAi {
                 if (mandatory) {
                     return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
                 } else {
-                    return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
+                    return new AiAbilityDecision(0, AiPlayDecision.MissingNeededCards);
                 }
             }
         }
diff --git a/forge-ai/src/main/java/forge/ai/ability/CounterAi.java b/forge-ai/src/main/java/forge/ai/ability/CounterAi.java
index dc9f5b16e02..f8c6060117a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CounterAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CounterAi.java
@@ -135,9 +135,7 @@ public class CounterAi extends SpellAbilityAi {
 
         if (sa.hasParam("AILogic")) {
             String logic = sa.getParam("AILogic");
-            if ("Never".equals(logic)) {
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-            } else if (logic.startsWith("MinCMC.")) { // TODO fix Daze and fold into AITgts
+            if (logic.startsWith("MinCMC.")) { // TODO fix Daze and fold into AITgts
                 int minCMC = Integer.parseInt(logic.substring(7));
                 if (tgtCMC < minCMC) {
                     return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersAi.java
index ea7a896b62a..e8df15e7f5d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersAi.java
@@ -102,7 +102,7 @@ public abstract class CountersAi extends SpellAbilityAi {
         } else if (type.equals("DIVINITY")) {
             final CardCollection boon = CardLists.filter(list, c -> c.getCounters(CounterEnumType.DIVINITY) == 0);
             choice = ComputerUtilCard.getMostExpensivePermanentAI(boon);
-        } else if (CounterType.get(type).isKeywordCounter()) {
+        } else if (CounterType.getType(type).isKeywordCounter()) {
             choice = ComputerUtilCard.getBestCreatureAI(CardLists.getNotKeyword(list, type));
         } else {
             // The AI really should put counters on cards that can use it.
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
index 6d6cc83b351..d102ea2065d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
@@ -424,16 +424,20 @@ public class CountersMoveAi extends SpellAbilityAi {
 
             // move counter to opponents creature but only if you can not steal them
             // try to move to something useless or something that would leave play
-            List<Card> oppList = CardLists.filterControlledBy(tgtCards, ai.getOpponents());
-            if (!oppList.isEmpty()) {
-                List<Card> best = CardLists.filter(oppList, card -> {
+            boolean isNegative = ComputerUtil.isNegativeCounter(cType, src);
+            List<Card> filteredTgtList;
+            filteredTgtList = isNegative ? CardLists.filterControlledBy(tgtCards, ai.getOpponents()) :
+                CardLists.filterControlledBy(tgtCards, ai.getYourTeam());
+
+            if (!filteredTgtList.isEmpty()) {
+                List<Card> best = CardLists.filter(filteredTgtList, card -> {
                     // gain from useless
-                    if (!ComputerUtilCard.isUselessCreature(ai, card)) {
+                    if (isNegative && !ComputerUtilCard.isUselessCreature(ai, card)) {
                         return true;
                     }
 
                     // source would leave the game
-                    if (!card.hasSVar("EndOfTurnLeavePlay")) {
+                    if (isNegative && !card.hasSVar("EndOfTurnLeavePlay")) {
                         return true;
                     }
 
@@ -441,7 +445,7 @@ public class CountersMoveAi extends SpellAbilityAi {
                 });
 
                 if (best.isEmpty()) {
-                    best = oppList;
+                    best = filteredTgtList;
                 }
 
                 Card card = ComputerUtilCard.getBestCreatureAI(best);
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java
index c3c80df3d04..5564cfd0b59 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java
@@ -154,7 +154,7 @@ public class CountersMultiplyAi extends SpellAbilityAi {
                 }
 
                 if (counterType == null || counterType.is(type)) {
-                    addTargetsByCounterType(ai, sa, aiList, CounterType.get(type));
+                    addTargetsByCounterType(ai, sa, aiList, type);
                 }
             }
         }
@@ -163,7 +163,7 @@ public class CountersMultiplyAi extends SpellAbilityAi {
         if (!oppList.isEmpty()) {
             // not enough targets
             if (sa.canAddMoreTarget()) {
-                final CounterType type = CounterType.get(CounterEnumType.M1M1);
+                final CounterType type = CounterEnumType.M1M1;
                 if (counterType == null || counterType == type) {
                     addTargetsByCounterType(ai, sa, oppList, type);
                 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java
index 7ac79b97ac7..ef11dc61c80 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java
@@ -110,7 +110,7 @@ public class CountersProliferateAi extends SpellAbilityAi {
     public <T extends GameEntity> T chooseSingleEntity(Player ai, SpellAbility sa, Collection<T> options, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
         // Proliferate is always optional for all, no need to select best
 
-        final CounterType poison = CounterType.get(CounterEnumType.POISON);
+        final CounterType poison = CounterEnumType.POISON;
 
         boolean aggroAI = (((PlayerControllerAi) ai.getController()).getAi()).getBooleanProperty(AiProps.PLAY_AGGRO);
         // because countertype can't be chosen anymore, only look for poison counters
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
index c0a846e603b..77dfc9c9443 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
@@ -92,9 +92,8 @@ public class CountersPutAi extends CountersAi {
                     return false;
                 }
                 return chance > MyRandom.getRandom().nextFloat();
-            } else {
-                return false;
             }
+            return false;
         }
 
         if (sa.isKeyword(Keyword.LEVEL_UP)) {
@@ -124,7 +123,6 @@ public class CountersPutAi extends CountersAi {
         final Cost abCost = sa.getPayCosts();
         final Card source = sa.getHostCard();
         final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa);
-        CardCollection list;
         Card choice = null;
         final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final boolean divided = sa.isDividedAsYouChoose();
@@ -170,7 +168,7 @@ public class CountersPutAi extends CountersAi {
                     CardCollection oppCreatM1 = CardLists.filter(oppCreat, CardPredicates.hasCounter(CounterEnumType.M1M1));
                     oppCreatM1 = CardLists.getNotKeyword(oppCreatM1, Keyword.UNDYING);
 
-                    oppCreatM1 = CardLists.filter(oppCreatM1, input -> input.getNetToughness() <= 1 && input.canReceiveCounters(CounterType.get(CounterEnumType.M1M1)));
+                    oppCreatM1 = CardLists.filter(oppCreatM1, input -> input.getNetToughness() <= 1 && input.canReceiveCounters(CounterEnumType.M1M1));
 
                     Card best = ComputerUtilCard.getBestAI(oppCreatM1);
                     if (best != null) {
@@ -292,10 +290,8 @@ public class CountersPutAi extends CountersAi {
 
             if (willActivate) {
                 return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-            } else {
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             }
-
+            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
         } else if (logic.equals("ChargeToBestCMC")) {
             return doChargeToCMCLogic(ai, sa);
         } else if (logic.equals("ChargeToBestOppControlledCMC")) {
@@ -336,7 +332,7 @@ public class CountersPutAi extends CountersAi {
             Game game = ai.getGame();
             Combat combat = game.getCombat();
 
-            if (!source.canReceiveCounters(CounterType.get(CounterEnumType.P1P1)) || source.getCounters(CounterEnumType.P1P1) > 0) {
+            if (!source.canReceiveCounters(CounterEnumType.P1P1) || source.getCounters(CounterEnumType.P1P1) > 0) {
                 return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             } else if (combat != null && ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
                 return doCombatAdaptLogic(source, amount, combat);
@@ -348,7 +344,7 @@ public class CountersPutAi extends CountersAi {
             if (type.equals("P1P1")) {
                 nPump = amount;
             }
-            return FightAi.canFightAi(ai, sa, nPump, nPump);
+            return FightAi.canFight(ai, sa, nPump, nPump);
         }
 
         if (amountStr.equals("X")) {
@@ -442,17 +438,16 @@ public class CountersPutAi extends CountersAi {
                         }
                         sa.addDividedAllocation(c, amount);
                         return decision;
-                    } else {
-                        if (!hasSacCost) {
-                            // for Sacrifice costs, evaluate further to see if it's worth using the ability before the card dies
-                            return decision;
-                        }
+                    } else if (!hasSacCost) {
+                        // for Sacrifice costs, evaluate further to see if it's worth using the ability before the card dies
+                        return decision;
                     }
                 }
             }
 
             sa.resetTargets();
 
+            CardCollection list;
             if (sa.isCurse()) {
                 list = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
             } else {
@@ -608,7 +603,21 @@ public class CountersPutAi extends CountersAi {
                 return new AiAbilityDecision(0, AiPlayDecision.MissingNeededCards);
             }
 
-            final int currCounters = cards.get(0).getCounters(CounterType.get(type));
+            final int currCounters = cards.get(0).getCounters(CounterType.getType(type));
+
+            // adding counters would cause counter amount to overflow
+            if (Integer.MAX_VALUE - currCounters <= amount) {
+                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+            }
+            if (type.equals("P1P1")) {
+                if (Integer.MAX_VALUE - cards.get(0).getNetPower() <= amount) {
+                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+                }
+                if (Integer.MAX_VALUE - cards.get(0).getNetToughness() <= amount) {
+                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+                }
+            }
+
             // each non +1/+1 counter on the card is a 10% chance of not
             // activating this ability.
 
@@ -623,7 +632,7 @@ public class CountersPutAi extends CountersAi {
             }
 
             // Useless since the card already has the keyword (or for another reason)
-            if (ComputerUtil.isUselessCounter(CounterType.get(type), cards.get(0))) {
+            if (ComputerUtil.isUselessCounter(CounterType.getType(type), cards.get(0))) {
                 return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             }
         }
@@ -670,14 +679,12 @@ public class CountersPutAi extends CountersAi {
                 || (sa.getRootAbility().isTrigger() && !sa.getRootAbility().isOptionalTrigger());
 
         if (sa.usesTargeting()) {
-            CardCollection list = null;
-
+            CardCollection list;
             if (sa.isCurse()) {
                 list = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
             } else {
                 list = new CardCollection(ai.getCardsIn(ZoneType.Battlefield));
             }
-
             list = CardLists.getTargetableCards(list, sa);
 
             if (list.isEmpty() && isMandatoryTrigger) {
@@ -693,9 +700,8 @@ public class CountersPutAi extends CountersAi {
                             || sa.getTargets().isEmpty()) {
                         sa.resetTargets();
                         return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
-                    } else {
-                        break;
                     }
+                    break;
                 }
 
                 if (sa.isCurse()) {
@@ -737,9 +743,7 @@ public class CountersPutAi extends CountersAi {
     protected AiAbilityDecision doTriggerNoCost(Player ai, SpellAbility sa, boolean mandatory) {
         final SpellAbility root = sa.getRootAbility();
         final Card source = sa.getHostCard();
-        final String aiLogic = sa.getParamOrDefault("AILogic", "");
-        boolean preferred = true;
-        CardCollection list;
+        final String aiLogic = sa.getParam("AILogic");
         final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final boolean divided = sa.isDividedAsYouChoose();
         final int amount = AbilityUtils.calculateAmount(source, amountStr, sa);
@@ -758,14 +762,10 @@ public class CountersPutAi extends CountersAi {
         }
 
         if ("ChargeToBestCMC".equals(aiLogic)) {
-            AiAbilityDecision decision = doChargeToCMCLogic(ai, sa);
-            if (decision.willingToPlay()) {
-                return decision;
-            } else if (mandatory) {
+            if (mandatory) {
                 return new AiAbilityDecision(50, AiPlayDecision.MandatoryPlay);
-            } else {
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             }
+            return doChargeToCMCLogic(ai, sa);
         }
 
         if (!sa.usesTargeting()) {
@@ -789,7 +789,6 @@ public class CountersPutAi extends CountersAi {
                 // things like Powder Keg, which are way too complex for the AI
             }
         } else if (sa.getTargetRestrictions().canOnlyTgtOpponent() && !sa.getTargetRestrictions().canTgtCreature()) {
-            // can only target opponent
             PlayerCollection playerList = new PlayerCollection(IterableUtil.filter(
                     sa.getTargetRestrictions().getAllCandidates(sa, true, true), Player.class));
 
@@ -804,34 +803,32 @@ public class CountersPutAi extends CountersAi {
                 sa.getTargets().add(choice);
             }
         } else {
-            String logic = sa.getParam("AILogic");
-            if ("Fight".equals(logic) || "PowerDmg".equals(logic)) {
+            if ("Fight".equals(aiLogic) || "PowerDmg".equals(aiLogic)) {
                 int nPump = 0;
                 if (type.equals("P1P1")) {
                     nPump = amount;
                 }
-                AiAbilityDecision decision = FightAi.canFightAi(ai, sa, nPump, nPump);
+                AiAbilityDecision decision = FightAi.canFight(ai, sa, nPump, nPump);
                 if (decision.willingToPlay()) {
                     return decision;
                 }
             }
 
-            if (sa.isCurse()) {
-                list = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
-            } else {
-                list = new CardCollection(ai.getCardsIn(ZoneType.Battlefield));
-            }
-            list = CardLists.getTargetableCards(list, sa);
-
-            // Filter AI-specific targets if provided
-            list = ComputerUtil.filterAITgts(sa, ai, list, false);
-
-            int totalTargets = list.size();
-
             sa.resetTargets();
+
+            Iterable<Card> filteredField;
+            if (sa.isCurse()) {
+                filteredField = ai.getOpponents().getCardsIn(ZoneType.Battlefield);
+            } else {
+                filteredField = ai.getCardsIn(ZoneType.Battlefield);
+            }
+            CardCollection list = CardLists.getTargetableCards(filteredField, sa);
+            list = ComputerUtil.filterAITgts(sa, ai, list, false);
+            int totalTargets = list.size();
+            boolean preferred = true;
+
             while (sa.canAddMoreTarget()) {
                 if (mandatory) {
-                    // When things are mandatory, gotta handle a little differently
                     if ((list.isEmpty() || !preferred) && sa.isTargetNumberValid()) {
                         return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
                     }
@@ -856,7 +853,7 @@ public class CountersPutAi extends CountersAi {
                     return new AiAbilityDecision(sa.isTargetNumberValid() ? 100 : 0, sa.isTargetNumberValid() ? AiPlayDecision.WillPlay : AiPlayDecision.CantPlayAi);
                 }
 
-                Card choice = null;
+                Card choice;
 
                 // Choose targets here:
                 if (sa.isCurse()) {
@@ -865,33 +862,27 @@ public class CountersPutAi extends CountersAi {
                         if (choice == null && mandatory) {
                             choice = Aggregates.random(list);
                         }
+                    } else if (type.equals("M1M1")) {
+                        choice = ComputerUtilCard.getWorstCreatureAI(list);
                     } else {
-                        if (type.equals("M1M1")) {
-                            choice = ComputerUtilCard.getWorstCreatureAI(list);
-                        } else {
-                            choice = Aggregates.random(list);
-                        }
+                        choice = Aggregates.random(list);
                     }
+                } else if (preferred) {
+                    list = ComputerUtil.getSafeTargets(ai, sa, list);
+                    choice = chooseBoonTarget(list, type);
+                    if (choice == null && mandatory) {
+                        choice = Aggregates.random(list);
+                    }
+                } else if (type.equals("P1P1")) {
+                    choice = ComputerUtilCard.getWorstCreatureAI(list);
                 } else {
-                    if (preferred) {
-                        list = ComputerUtil.getSafeTargets(ai, sa, list);
-                        choice = chooseBoonTarget(list, type);
-                        if (choice == null && mandatory) {
-                            choice = Aggregates.random(list);
-                        }
-                    } else {
-                        if (type.equals("P1P1")) {
-                            choice = ComputerUtilCard.getWorstCreatureAI(list);
-                        } else {
-                            choice = Aggregates.random(list);
-                        }
-                    }
+                    choice = Aggregates.random(list);
                 }
                 if (choice != null && divided) {
-                    int alloc = Math.max(amount / totalTargets, 1);
                     if (sa.getTargets().size() == Math.min(totalTargets, sa.getMaxTargets()) - 1) {
                         sa.addDividedAllocation(choice, left);
                     } else {
+                        int alloc = Math.max(amount / totalTargets, 1);
                         sa.addDividedAllocation(choice, alloc);
                         left -= alloc;
                     }
@@ -961,8 +952,8 @@ public class CountersPutAi extends CountersAi {
     protected Card chooseSingleCard(final Player ai, SpellAbility sa, Iterable<Card> options, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
         // Bolster does use this
         // TODO need more or less logic there?
-        final CounterType m1m1 = CounterType.get(CounterEnumType.M1M1);
-        final CounterType p1p1 = CounterType.get(CounterEnumType.P1P1);
+        final CounterType m1m1 = CounterEnumType.M1M1;
+        final CounterType p1p1 = CounterEnumType.P1P1;
 
         // no logic if there is no options or no to choice
         if (!isOptional && Iterables.size(options) <= 1) {
@@ -981,9 +972,7 @@ public class CountersPutAi extends CountersAi {
         final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), amountStr, sa);
 
-        final boolean isCurse = sa.isCurse();
-
-        if (isCurse) {
+        if (sa.isCurse()) {
             final CardCollection opponents = CardLists.filterControlledBy(options, ai.getOpponents());
 
             if (!opponents.isEmpty()) {
@@ -1080,11 +1069,10 @@ public class CountersPutAi extends CountersAi {
         Player ai = sa.getActivatingPlayer();
         GameEntity e = (GameEntity) params.get("Target");
         // for Card try to select not useless counter
-        if (e instanceof Card) {
-            Card c = (Card) e;
+        if (e instanceof Card c) {
             if (c.getController().isOpponentOf(ai)) {
-                if (options.contains(CounterType.get(CounterEnumType.M1M1)) && !c.hasKeyword(Keyword.UNDYING)) {
-                    return CounterType.get(CounterEnumType.M1M1);
+                if (options.contains(CounterEnumType.M1M1) && !c.hasKeyword(Keyword.UNDYING)) {
+                    return CounterEnumType.M1M1;
                 }
                 for (CounterType type : options) {
                     if (ComputerUtil.isNegativeCounter(type, c)) {
@@ -1098,15 +1086,14 @@ public class CountersPutAi extends CountersAi {
                     }
                 }
             }
-        } else if (e instanceof Player) {
-            Player p = (Player) e;
+        } else if (e instanceof Player p) {
             if (p.isOpponentOf(ai)) {
-                if (options.contains(CounterType.get(CounterEnumType.POISON))) {
-                    return CounterType.get(CounterEnumType.POISON);
+                if (options.contains(CounterEnumType.POISON)) {
+                    return CounterEnumType.POISON;
                 }
             } else {
-                if (options.contains(CounterType.get(CounterEnumType.EXPERIENCE))) {
-                    return CounterType.get(CounterEnumType.EXPERIENCE);
+                if (options.contains(CounterEnumType.EXPERIENCE)) {
+                    return CounterEnumType.EXPERIENCE;
                 }
             }
 
@@ -1211,9 +1198,8 @@ public class CountersPutAi extends CountersAi {
         }
         if (numCtrs < optimalCMC) {
             return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-        } else {
-            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
         }
+        return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
     }
 
     private AiAbilityDecision doChargeToOppCtrlCMCLogic(Player ai, SpellAbility sa) {
@@ -1233,9 +1219,8 @@ public class CountersPutAi extends CountersAi {
         if (numCtrs < optimalCMC) {
             // If the AI has less counters than the optimal CMC, it should play the ability.
             return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-        } else {
-            // If the AI has enough counters or more than the optimal CMC, it should not play the ability.
-            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
         }
+        // If the AI has enough counters or more than the optimal CMC, it should not play the ability.
+        return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
index e440110daf0..83f4f59a784 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java
@@ -218,18 +218,18 @@ public class CountersPutOrRemoveAi extends SpellAbilityAi {
         Card tgt = (Card) params.get("Target");
 
         // planeswalker has high priority for loyalty counters
-        if (tgt.isPlaneswalker() && options.contains(CounterType.get(CounterEnumType.LOYALTY))) {
-            return CounterType.get(CounterEnumType.LOYALTY);
+        if (tgt.isPlaneswalker() && options.contains(CounterEnumType.LOYALTY)) {
+            return CounterEnumType.LOYALTY;
         }
 
         if (tgt.getController().isOpponentOf(ai)) {
             // creatures with BaseToughness below or equal zero might be
             // killed if their counters are removed
             if (tgt.isCreature() && tgt.getBaseToughness() <= 0) {
-                if (options.contains(CounterType.get(CounterEnumType.P1P1))) {
-                    return CounterType.get(CounterEnumType.P1P1);
-                } else if (options.contains(CounterType.get(CounterEnumType.M1M1))) {
-                    return CounterType.get(CounterEnumType.M1M1);
+                if (options.contains(CounterEnumType.P1P1)) {
+                    return CounterEnumType.P1P1;
+                } else if (options.contains(CounterEnumType.M1M1)) {
+                    return CounterEnumType.M1M1;
                 }
             }
 
@@ -241,17 +241,17 @@ public class CountersPutOrRemoveAi extends SpellAbilityAi {
             }
         } else {
             // this counters are treat first to be removed
-            if ("Dark Depths".equals(tgt.getName()) && options.contains(CounterType.get(CounterEnumType.ICE))) {
+            if ("Dark Depths".equals(tgt.getName()) && options.contains(CounterEnumType.ICE)) {
                 CardCollectionView marit = ai.getCardsIn(ZoneType.Battlefield, "Marit Lage");
                 boolean maritEmpty = marit.isEmpty() || Iterables.contains(marit, (Predicate<Card>) Card::ignoreLegendRule);
 
                 if (maritEmpty) {
-                    return CounterType.get(CounterEnumType.ICE);
+                    return CounterEnumType.ICE;
                 }
-            } else if (tgt.hasKeyword(Keyword.UNDYING) && options.contains(CounterType.get(CounterEnumType.P1P1))) {
-                return CounterType.get(CounterEnumType.P1P1);
-            } else if (tgt.hasKeyword(Keyword.PERSIST) && options.contains(CounterType.get(CounterEnumType.M1M1))) {
-                return CounterType.get(CounterEnumType.M1M1);
+            } else if (tgt.hasKeyword(Keyword.UNDYING) && options.contains(CounterEnumType.P1P1)) {
+                return CounterEnumType.P1P1;
+            } else if (tgt.hasKeyword(Keyword.PERSIST) && options.contains(CounterEnumType.M1M1)) {
+                return CounterEnumType.M1M1;
             }
 
             // fallback logic, select positive counter to add more
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
index 8641772befc..ea28a216b43 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
@@ -384,7 +384,7 @@ public class CountersRemoveAi extends SpellAbilityAi {
             if (targetCard.getController().isOpponentOf(ai)) {
                 // if its a Planeswalker try to remove Loyality first
                 if (targetCard.isPlaneswalker()) {
-                    return CounterType.get(CounterEnumType.LOYALTY);
+                    return CounterEnumType.LOYALTY;
                 }
                 for (CounterType type : options) {
                     if (!ComputerUtil.isNegativeCounter(type, targetCard)) {
@@ -392,10 +392,10 @@ public class CountersRemoveAi extends SpellAbilityAi {
                     }
                 }
             } else {
-                if (options.contains(CounterType.get(CounterEnumType.M1M1)) && targetCard.hasKeyword(Keyword.PERSIST)) {
-                    return CounterType.get(CounterEnumType.M1M1);
-                } else if (options.contains(CounterType.get(CounterEnumType.P1P1)) && targetCard.hasKeyword(Keyword.UNDYING)) {
-                    return CounterType.get(CounterEnumType.P1P1);
+                if (options.contains(CounterEnumType.M1M1) && targetCard.hasKeyword(Keyword.PERSIST)) {
+                    return CounterEnumType.M1M1;
+                } else if (options.contains(CounterEnumType.P1P1) && targetCard.hasKeyword(Keyword.UNDYING)) {
+                    return CounterEnumType.P1P1;
                 }
                 for (CounterType type : options) {
                     if (ComputerUtil.isNegativeCounter(type, targetCard)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java
index b28b7e89d03..e01fceb598a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DamageAllAi.java
@@ -133,9 +133,9 @@ public class  DamageAllAi extends SpellAbilityAi {
                     if (ComputerUtilCombat.predictDamageTo(opp, dmg, source, false) > 0) {
                         // When using Pestilence to hurt players, do it at
                         // the end of the opponent's turn only
-                        if ((!"DmgAllCreaturesAndPlayers".equals(sa.getParam("AILogic")))
-                                || ((ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)
-                                && (ai.getGame().getNonactivePlayers().contains(ai)))))
+                        if (!"DmgAllCreaturesAndPlayers".equals(sa.getParam("AILogic"))
+                                || (ai.getGame().getPhaseHandler().is(PhaseType.END_OF_TURN)
+                                && !ai.getGame().getPhaseHandler().isPlayerTurn(ai)))
                         // Need further improvement : if able to kill immediately with repeated activations, do not wait
                         // for phases! Will also need to implement considering repeated activations for killed creatures!
                         // || (ai.sa.getPayCosts(). ??? )
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java b/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
index a6ff092ffbc..9a646b9e0d2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
@@ -37,10 +37,6 @@ public class DigMultipleAi extends SpellAbilityAi {
             return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
         }
 
-        if ("Never".equals(sa.getParam("AILogic"))) {
-            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-        }
-
         // don't deck yourself
         if (sa.hasParam("DestinationZone2") && !"Library".equals(sa.getParam("DestinationZone2"))) {
             int numToDig = AbilityUtils.calculateAmount(host, sa.getParam("DigNum"), sa);
diff --git a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
index 4d0f5420928..0a9cc6285b7 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
@@ -26,7 +26,6 @@ import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.cost.*;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -55,7 +54,7 @@ public class DrawAi extends SpellAbilityAi {
         }
 
         if (ComputerUtil.playImmediately(ai, sa)) {
-            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+            return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
         }
 
         // Don't tap creatures that may be able to block
@@ -74,9 +73,10 @@ public class DrawAi extends SpellAbilityAi {
                 // TODO: make this configurable in the AI profile
                 return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
             }
+            return new AiAbilityDecision(0, AiPlayDecision.CostNotAcceptable);
         }
 
-        return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+        return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
     }
 
     /*
@@ -174,9 +174,8 @@ public class DrawAi extends SpellAbilityAi {
     public AiAbilityDecision chkDrawback(SpellAbility sa, Player ai) {
         if (targetAI(ai, sa, sa.isTrigger() && sa.getHostCard().isInPlay())) {
             return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-        } else {
-            return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
         }
+        return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
     }
 
     /**
@@ -370,7 +369,7 @@ public class DrawAi extends SpellAbilityAi {
 
                 // try to make opponent lose to poison
                 // currently only Caress of Phyrexia
-                if (getPoison != null && oppA.canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                if (getPoison != null && oppA.canReceiveCounters(CounterEnumType.POISON)) {
                     if (oppA.getPoisonCounters() + numCards > 9) {
                         sa.getTargets().add(oppA);
                         return true;
@@ -414,7 +413,7 @@ public class DrawAi extends SpellAbilityAi {
                     }
                 }
 
-                if (getPoison != null && ai.canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                if (getPoison != null && ai.canReceiveCounters(CounterEnumType.POISON)) {
                     if (numCards + ai.getPoisonCounters() >= 8) {
                         aiTarget = false;
                     }
@@ -472,7 +471,7 @@ public class DrawAi extends SpellAbilityAi {
                 }
 
                 // ally would lose because of poison
-                if (getPoison != null && ally.canReceiveCounters(CounterType.get(CounterEnumType.POISON)) && ally.getPoisonCounters() + numCards > 9) {
+                if (getPoison != null && ally.canReceiveCounters(CounterEnumType.POISON) && ally.getPoisonCounters() + numCards > 9) {
                         continue;
                 }
 
@@ -541,9 +540,8 @@ public class DrawAi extends SpellAbilityAi {
 
         if (targetAI(ai, sa, mandatory)) {
             return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-        } else {
-            return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
         }
+        return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
     }
 
     /* (non-Javadoc)
diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
index 746a5b7623f..8e7b0d073bc 100644
--- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java
@@ -270,7 +270,7 @@ public class EffectAi extends SpellAbilityAi {
                 }
                 return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             } else if (logic.equals("Fight")) {
-                return FightAi.canFightAi(ai, sa, 0,0);
+                return FightAi.canFight(ai, sa, 0,0);
             } else if (logic.equals("Pump")) {
                 sa.resetTargets();
                 List<Card> options = CardUtil.getValidCardsToTarget(sa);
diff --git a/forge-ai/src/main/java/forge/ai/ability/FightAi.java b/forge-ai/src/main/java/forge/ai/ability/FightAi.java
index 083aa8c155b..ff15bb89907 100644
--- a/forge-ai/src/main/java/forge/ai/ability/FightAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/FightAi.java
@@ -177,7 +177,7 @@ public class FightAi extends SpellAbilityAi {
      * @param power	bonus to power
      * @return true if fight effect should be played, false otherwise
      */
-    public static AiAbilityDecision canFightAi(final Player ai, final SpellAbility sa, int power, int toughness) {
+    public static AiAbilityDecision canFight(final Player ai, final SpellAbility sa, int power, int toughness) {
     	final Card source = sa.getHostCard();
         final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa);
         AbilitySub tgtFight = sa.getSubAbility();
diff --git a/forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java b/forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java
index 885c09975a8..031f4077b9c 100644
--- a/forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java
@@ -12,15 +12,13 @@ import forge.game.spellability.SpellAbility;
 public class FlipACoinAi extends SpellAbilityAi {
 
     /* (non-Javadoc)
-     * @see forge.card.abilityfactory.SpellAiLogic#canPlayAI(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
+     * @see forge.card.abilityfactory.SpellAiLogic#checkApiLogic(forge.game.player.Player, java.util.Map, forge.card.spellability.SpellAbility)
      */
     @Override
-    protected AiAbilityDecision canPlay(Player ai, SpellAbility sa) {
+    protected AiAbilityDecision checkApiLogic(Player ai, SpellAbility sa) {
         if (sa.hasParam("AILogic")) {
             String ailogic = sa.getParam("AILogic");
-            if (ailogic.equals("Never")) {
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-            } else if (ailogic.equals("PhaseOut")) {
+            if (ailogic.equals("PhaseOut")) {
                 if (!ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(sa.getHostCard())) {
                     return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
                 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/ManaAi.java b/forge-ai/src/main/java/forge/ai/ability/ManaAi.java
index 9abccca74f3..6bd4e24a37e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ManaAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ManaAi.java
@@ -159,7 +159,7 @@ public class ManaAi extends SpellAbilityAi {
         int numCounters = 0;
         int manaSurplus = 0;
         if ("Count$xPaid".equals(host.getSVar("X")) && sa.getPayCosts().hasSpecificCostType(CostRemoveCounter.class)) {
-            CounterType ctrType = CounterType.get(CounterEnumType.KI); // Petalmane Baku
+            CounterType ctrType = CounterEnumType.KI; // Petalmane Baku
             for (CostPart part : sa.getPayCosts().getCostParts()) {
                 if (part instanceof CostRemoveCounter) {
                     ctrType = ((CostRemoveCounter)part).counter;
diff --git a/forge-ai/src/main/java/forge/ai/ability/MillAi.java b/forge-ai/src/main/java/forge/ai/ability/MillAi.java
index 2f6ae8947a0..4fe634834e0 100644
--- a/forge-ai/src/main/java/forge/ai/ability/MillAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/MillAi.java
@@ -24,12 +24,7 @@ public class MillAi extends SpellAbilityAi {
 
     @Override
     protected boolean checkAiLogic(final Player ai, final SpellAbility sa, final String aiLogic) {
-        PhaseHandler ph = ai.getGame().getPhaseHandler();
-
-        if (aiLogic.equals("Main1")) {
-            return !ph.getPhase().isBefore(PhaseType.MAIN2) || sa.hasParam("ActivationPhases")
-                    || ComputerUtil.castSpellInMain1(ai, sa);
-        } else if (aiLogic.equals("LilianaMill")) {
+        if (aiLogic.equals("LilianaMill")) {
             // TODO convert to AICheckSVar
             // Only mill if a "Raise Dead" target is available, in case of control decks with few creatures
             return CardLists.filter(ai.getCardsIn(ZoneType.Graveyard), CardPredicates.CREATURES).size() >= 1;
@@ -55,9 +50,10 @@ public class MillAi extends SpellAbilityAi {
             // because they are also potentially useful for combat
             return ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai);
         }
-        return true;
+        return !ph.getPhase().isBefore(PhaseType.MAIN2) || sa.hasParam("ActivationPhases")
+                || ComputerUtil.castSpellInMain1(ai, sa);
     }
-    
+
     @Override
     protected AiAbilityDecision checkApiLogic(final Player ai, final SpellAbility sa) {
         /*
diff --git a/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java b/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java
index 407f3e00eb0..e98c6924426 100644
--- a/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/MustBlockAi.java
@@ -6,10 +6,10 @@ import forge.game.Game;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
+import forge.game.card.CardUtil;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.keyword.Keyword;
-import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 
@@ -38,9 +38,6 @@ public class MustBlockAi extends SpellAbilityAi {
 
         if (!list.isEmpty()) {
             final Card blocker = ComputerUtilCard.getBestCreatureAI(list);
-            if (blocker == null) {
-                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-            }
             sa.getTargets().add(blocker);
             return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
         }
@@ -63,11 +60,6 @@ public class MustBlockAi extends SpellAbilityAi {
     protected AiAbilityDecision doTriggerNoCost(final Player ai, SpellAbility sa, boolean mandatory) {
         final Card source = sa.getHostCard();
 
-        // only use on creatures that can attack
-        if (!ai.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)) {
-            return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-        }
-
         Card attacker = source;
         if (sa.hasParam("DefinedAttacker")) {
             final List<Card> cards = AbilityUtils.getDefinedCards(source, sa.getParam("DefinedAttacker"), sa);
@@ -81,13 +73,9 @@ public class MustBlockAi extends SpellAbilityAi {
         boolean chance = false;
 
         if (sa.usesTargeting()) {
-            final List<Card> list = determineGoodBlockers(attacker, ai, ai.getWeakestOpponent(), sa, true, true);
-            if (list.isEmpty()) {
-                if (sa.isTargetNumberValid()) {
-                    return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-                } else {
-                    return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
-                }
+            List<Card> list = determineGoodBlockers(attacker, ai, ai.getWeakestOpponent(), sa, true, true);
+            if (list.isEmpty() && mandatory) {
+                list = CardUtil.getValidCardsToTarget(sa);
             }
             final Card blocker = ComputerUtilCard.getBestCreatureAI(list);
             if (blocker == null) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java b/forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java
index 60f13d95328..200d5648d91 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java
@@ -78,7 +78,7 @@ public class PermanentCreatureAi extends PermanentAi {
                         || ph.getPhase().isBefore(PhaseType.END_OF_TURN))
                         && ai.getManaPool().totalMana() <= 0
                         && (ph.isPlayerTurn(ai) || ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS))
-                        && (!card.hasETBTrigger(true) && !card.hasSVar("AmbushAI"))
+                        && !card.hasETBTrigger(true) && !card.hasSVar("AmbushAI")
                         && game.getStack().isEmpty()
                         && !ComputerUtil.castPermanentInMain1(ai, sa)) {
                     // AiPlayDecision.AnotherTime;
diff --git a/forge-ai/src/main/java/forge/ai/ability/PhasesAi.java b/forge-ai/src/main/java/forge/ai/ability/PhasesAi.java
index 5cdbaafdc06..02ae927180f 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PhasesAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PhasesAi.java
@@ -33,10 +33,8 @@ public class PhasesAi extends SpellAbilityAi {
                 final boolean isThreatened = ComputerUtil.predictThreatenedObjects(aiPlayer, null, true).contains(source);
                 if (isThreatened) {
                     return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
-                } else {
-                    return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-
                 }
+                return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
             }
 
             return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
diff --git a/forge-ai/src/main/java/forge/ai/ability/PoisonAi.java b/forge-ai/src/main/java/forge/ai/ability/PoisonAi.java
index 650af4ec3e8..66c177e0a53 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PoisonAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PoisonAi.java
@@ -6,7 +6,6 @@ import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.player.GameLossReason;
@@ -65,7 +64,7 @@ public class PoisonAi extends SpellAbilityAi {
         boolean result;
         if (sa.usesTargeting()) {
             result = tgtPlayer(ai, sa, mandatory);
-        } else if (mandatory || !ai.canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+        } else if (mandatory || !ai.canReceiveCounters(CounterEnumType.POISON)) {
             // mandatory or ai is uneffected
             result = true;
         } else {
@@ -90,7 +89,7 @@ public class PoisonAi extends SpellAbilityAi {
             PlayerCollection betterTgts = tgts.filter(input -> {
                 if (input.cantLoseCheck(GameLossReason.Poisoned)) {
                     return false;
-                } else if (!input.canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                } else if (!input.canReceiveCounters(CounterEnumType.POISON)) {
                     return false;
                 }
                 return true;
@@ -109,7 +108,7 @@ public class PoisonAi extends SpellAbilityAi {
         if (tgts.isEmpty()) {
             if (mandatory) {
                 // AI is uneffected
-                if (ai.canBeTargetedBy(sa) && !ai.canReceiveCounters(CounterType.get(CounterEnumType.POISON))) {
+                if (ai.canBeTargetedBy(sa) && !ai.canReceiveCounters(CounterEnumType.POISON)) {
                     sa.getTargets().add(ai);
                     return true;
                 }
@@ -121,7 +120,7 @@ public class PoisonAi extends SpellAbilityAi {
                         if (input.cantLoseCheck(GameLossReason.Poisoned)) {
                             return true;
                         }
-                        return !input.canReceiveCounters(CounterType.get(CounterEnumType.POISON));
+                        return !input.canReceiveCounters(CounterEnumType.POISON);
                     });
                     if (!betterAllies.isEmpty()) {
                         allies = betterAllies;
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
index 3c0cec2634d..948337ed207 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
@@ -339,11 +339,11 @@ public class PumpAi extends PumpAiBase {
             return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
         }
 
-        if (!pumpTgtAI(ai, sa, defense, attack, false, false)) {
-            return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
+        if (pumpTgtAI(ai, sa, defense, attack, false, false)) {
+            return new AiAbilityDecision(100, AiPlayDecision.WillPlay);
         }
 
-        return new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
+        return new AiAbilityDecision(0, AiPlayDecision.TargetingFailed);
     }
 
     private boolean pumpTgtAI(final Player ai, final SpellAbility sa, final int defense, final int attack, final boolean mandatory,
@@ -453,7 +453,7 @@ public class PumpAi extends PumpAiBase {
             }
 
             if (isFight) {
-                return FightAi.canFightAi(ai, sa, attack, defense).willingToPlay();
+                return FightAi.canFight(ai, sa, attack, defense).willingToPlay();
             }
         }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
index 83f74410723..c082ea153d6 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java
@@ -131,7 +131,7 @@ public class PumpAllAi extends PumpAiBase {
         boolean result = ai.getCreaturesInPlay().anyMatch(c -> c.isValid(valid, source.getController(), source, sa)
                 && ComputerUtilCard.shouldPumpCard(ai, sa, c, defense, power, keywords));
         return result ? new AiAbilityDecision(100, AiPlayDecision.WillPlay) : new AiAbilityDecision(0, AiPlayDecision.CantPlayAi);
-    } // pumpAllCanPlayAI()
+    }
 
     @Override
     public AiAbilityDecision chkDrawback(SpellAbility sa, Player aiPlayer) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java b/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java
index adddae91d79..c36128335d0 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TimeTravelAi.java
@@ -8,7 +8,6 @@ import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
 import forge.game.card.CardPredicates;
 import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
 import forge.game.player.PlayerController;
@@ -40,7 +39,7 @@ public class TimeTravelAi extends SpellAbilityAi {
         // so removing them is good; stuff on the battlefield is usually stuff like Vanishing or As Foretold, which favors adding Time
         // counters for better effect, but exceptions should be added here).
         Card target = (Card)params.get("Target");
-        return !ComputerUtil.isNegativeCounter(CounterType.get(CounterEnumType.TIME), target);
+        return !ComputerUtil.isNegativeCounter(CounterEnumType.TIME, target);
     }
 
     @Override
diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index 9e88336b61d..e6b2c166685 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -31,6 +31,8 @@ public final class ImageKeys {
     public static final String MONARCH_IMAGE         = "monarch";
     public static final String THE_RING_IMAGE        = "the_ring";
     public static final String RADIATION_IMAGE       = "radiation";
+    public static final String SPEED_IMAGE           = "speed";
+    public static final String MAX_SPEED_IMAGE       = "max_speed";
 
     public static final String BACKFACE_POSTFIX  = "$alt";
     public static final String SPECFACE_W = "$wspec";
diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index 3ebb8092dad..249724aa50a 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -29,8 +29,6 @@ import java.util.stream.Collectors;
 public class StaticData {
     private final CardStorageReader cardReader;
     private final CardStorageReader tokenReader;
-    private final CardStorageReader customCardReader;
-
     private final String blockDataFolder;
     private final CardDb commonCards;
     private final CardDb variantCards;
@@ -79,7 +77,6 @@ public class StaticData {
         this.tokenReader = tokenReader;
         this.editions = new CardEdition.Collection(new CardEdition.Reader(new File(editionFolder)));
         this.blockDataFolder = blockDataFolder;
-        this.customCardReader = customCardReader;
         this.allowCustomCardsInDecksConformance = allowCustomCardsInDecksConformance;
         this.enableSmartCardArtSelection = enableSmartCardArtSelection;
         this.loadNonLegalCards = loadNonLegalCards;
@@ -881,7 +878,7 @@ public class StaticData {
                 }
             }
         }
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList());
         List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList());
         List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList());
diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java
index 296b985958c..4c4cc36242b 100644
--- a/forge-core/src/main/java/forge/card/CardDb.java
+++ b/forge-core/src/main/java/forge/card/CardDb.java
@@ -45,8 +45,6 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
     public final static char NameSetSeparator = '|';
     public final static String FlagPrefix = "#";
     public static final String FlagSeparator = "\t";
-    private final String exlcudedCardName = "Concentrate";
-    private final String exlcudedCardSet = "DS0";
 
     // need this to obtain cardReference by name+set+artindex
     private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), Lists::newArrayList);
@@ -303,7 +301,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
 
         // create faces list from rules
         for (final CardRules rule : rules.values()) {
-            if (filteredCards.contains(rule.getName()) && !exlcudedCardName.equalsIgnoreCase(rule.getName()))
+            if (filteredCards.contains(rule.getName()))
                 continue;
             for (ICardFace face : rule.getAllFaces()) {
                 addFaceToDbNames(face);
@@ -501,8 +499,9 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
     }
 
     public void addCard(PaperCard paperCard) {
-        if (excludeCard(paperCard.getName(), paperCard.getEdition()))
+        if (filtered.contains(paperCard.getName())) {
             return;
+        }
 
         allCardsByName.put(paperCard.getName(), paperCard);
 
@@ -523,17 +522,6 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
         }
     }
 
-    private boolean excludeCard(String cardName, String cardEdition) {
-        if (filtered.isEmpty())
-            return false;
-        if (filtered.contains(cardName)) {
-            if (exlcudedCardSet.equalsIgnoreCase(cardEdition) && exlcudedCardName.equalsIgnoreCase(cardName))
-                return true;
-            else return !exlcudedCardName.equalsIgnoreCase(cardName);
-        }
-        return false;
-    }
-
     private void reIndex() {
         uniqueCardsByName.clear();
         for (Entry<String, Collection<PaperCard>> kv : allCardsByName.asMap().entrySet()) {
diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java
index df16246453f..3a69cfd0b37 100644
--- a/forge-core/src/main/java/forge/card/CardEdition.java
+++ b/forge-core/src/main/java/forge/card/CardEdition.java
@@ -52,6 +52,14 @@ import java.util.stream.Collectors;
  */
 public final class CardEdition implements Comparable<CardEdition> {
 
+    public DraftOptions getDraftOptions() {
+        return draftOptions;
+    }
+
+    public void setDraftOptions(DraftOptions draftOptions) {
+        this.draftOptions = draftOptions;
+    }
+
     // immutable
     public enum Type {
         UNKNOWN,
@@ -275,18 +283,22 @@ public final class CardEdition implements Comparable<CardEdition> {
     // Booster/draft info
     private List<BoosterSlot> boosterSlots = null;
     private boolean smallSetOverride = false;
-    private boolean foilAlwaysInCommonSlot = false;
+    private String additionalUnlockSet = "";
     private FoilType foilType = FoilType.NOT_SUPPORTED;
+
+    // Replace all of these things with booster slots
+    private boolean foilAlwaysInCommonSlot = false;
     private double foilChanceInBooster = 0;
     private double chanceReplaceCommonWith = 0;
     private String slotReplaceCommonWith = "Common";
     private String additionalSheetForFoils = "";
-    private String additionalUnlockSet = "";
     private String boosterMustContain = "";
     private String boosterReplaceSlotFromPrintSheet = "";
     private String sheetReplaceCardFromSheet = "";
     private String sheetReplaceCardFromSheet2 = "";
-    private String doublePickDuringDraft = "";
+
+    // Draft options
+    private DraftOptions draftOptions = null;
     private String[] chaosDraftThemes = new String[0];
 
     private final ListMultimap<String, EditionEntry> cardMap;
@@ -373,7 +385,6 @@ public final class CardEdition implements Comparable<CardEdition> {
     public String getSlotReplaceCommonWith() { return slotReplaceCommonWith; }
     public String getAdditionalSheetForFoils() { return additionalSheetForFoils; }
     public String getAdditionalUnlockSet() { return additionalUnlockSet; }
-    public String getDoublePickDuringDraft() { return doublePickDuringDraft; }
     public String getBoosterMustContain() { return boosterMustContain; }
     public String getBoosterReplaceSlotFromPrintSheet() { return boosterReplaceSlotFromPrintSheet; }
     public String getSheetReplaceCardFromSheet() { return sheetReplaceCardFromSheet; }
@@ -619,7 +630,7 @@ public final class CardEdition implements Comparable<CardEdition> {
                     * functional variant name - grouping #9
              */
 //                "(^(.?[0-9A-Z]+.?))?(([SCURML]) )?(.*)$"
-                    "(^(.?[0-9A-Z-]+\\S?[A-Z]*)\\s)?(([SCURML])\\s)?([^@\\$]*)( @([^\\$]*))?( \\$(.+))?$"
+                    "(^(.?[0-9A-Z-]+\\S*[A-Z]*)\\s)?(([SCURML])\\s)?([^@\\$]*)( @([^\\$]*))?( \\$(.+))?$"
             );
 
             final Pattern tokenPattern = Pattern.compile(
@@ -628,7 +639,7 @@ public final class CardEdition implements Comparable<CardEdition> {
                      * name - grouping #3
                      * artist name - grouping #5
                      */
-                    "(^(.?[0-9A-Z-]+\\S?[A-Z]*)\\s)?([^@]*)( @(.*))?$"
+                    "(^(.?[0-9A-Z-]+\\S?[A-Z☇]*)\\s)?([^@]*)( @(.*))?$"
             );
 
             ListMultimap<String, EditionEntry> cardMap = ArrayListMultimap.create();
@@ -649,31 +660,37 @@ public final class CardEdition implements Comparable<CardEdition> {
                     continue;
                 }
 
-                // parse sections of the format "<collector number> <rarity> <name>"
-                if (editionSectionsWithCollectorNumbers.contains(sectionName)) {
-                    for(String line : contents.get(sectionName)) {
-                        Matcher matcher = pattern.matcher(line);
-
-                        if (!matcher.matches()) {
-                            continue;
-                        }
-
-                        String collectorNumber = matcher.group(2);
-                        CardRarity r = CardRarity.smartValueOf(matcher.group(4));
-                        String cardName = matcher.group(5);
-                        String artistName = matcher.group(7);
-                        String functionalVariantName = matcher.group(9);
-                        EditionEntry cis = new EditionEntry(cardName, collectorNumber, r, artistName, functionalVariantName);
-
-                        cardMap.put(sectionName, cis);
-                    }
-                } else if (boosterSlotsToParse.contains(sectionName)) {
-                    // parse booster slots of the format "Base=N\n|Replace=<amount> <sheet>"
-                    boosterSlots.add(BoosterSlot.parseSlot(sectionName, contents.get(sectionName)));
+                if (sectionName.endsWith("Types")) {
+                    CardType.Helper.parseTypes(sectionName, contents.get(sectionName));
                 } else {
-                    // save custom print sheets of the format "<amount> <name>|<setcode>|<art index>"
-                    // to parse later when printsheets are loaded lazily (and the cardpool is already initialized)
-                    customPrintSheetsToParse.put(sectionName, contents.get(sectionName));
+                    // Parse cards
+
+                    // parse sections of the format "<collector number> <rarity> <name>"
+                    if (editionSectionsWithCollectorNumbers.contains(sectionName)) {
+                        for(String line : contents.get(sectionName)) {
+                            Matcher matcher = pattern.matcher(line);
+
+                            if (!matcher.matches()) {
+                                continue;
+                            }
+
+                            String collectorNumber = matcher.group(2);
+                            CardRarity r = CardRarity.smartValueOf(matcher.group(4));
+                            String cardName = matcher.group(5);
+                            String artistName = matcher.group(7);
+                            String functionalVariantName = matcher.group(9);
+                            EditionEntry cis = new EditionEntry(cardName, collectorNumber, r, artistName, functionalVariantName);
+
+                            cardMap.put(sectionName, cis);
+                        }
+                    } else if (boosterSlotsToParse.contains(sectionName)) {
+                        // parse booster slots of the format "Base=N\n|Replace=<amount> <sheet>"
+                        boosterSlots.add(BoosterSlot.parseSlot(sectionName, contents.get(sectionName)));
+                    } else {
+                        // save custom print sheets of the format "<amount> <name>|<setcode>|<art index>"
+                        // to parse later when printsheets are loaded lazily (and the cardpool is already initialized)
+                        customPrintSheetsToParse.put(sectionName, contents.get(sectionName));
+                    }
                 }
             }
 
@@ -802,7 +819,6 @@ public final class CardEdition implements Comparable<CardEdition> {
             res.additionalUnlockSet = metadata.get("AdditionalSetUnlockedInQuest", ""); // e.g. Time Spiral Timeshifted (TSB) for Time Spiral
 
             res.smallSetOverride = metadata.getBoolean("TreatAsSmallSet", false); // for "small" sets with over 200 cards (e.g. Eldritch Moon)
-            res.doublePickDuringDraft = metadata.get("DoublePick", ""); // "FirstPick" or "Always"
 
             res.boosterMustContain = metadata.get("BoosterMustContain", ""); // e.g. Dominaria guaranteed legendary creature
             res.boosterReplaceSlotFromPrintSheet = metadata.get("BoosterReplaceSlotFromPrintSheet", ""); // e.g. Zendikar Rising guaranteed double-faced card
@@ -810,6 +826,23 @@ public final class CardEdition implements Comparable<CardEdition> {
             res.sheetReplaceCardFromSheet2 = metadata.get("SheetReplaceCardFromSheet2", "");
             res.chaosDraftThemes = metadata.get("ChaosDraftThemes", "").split(";"); // semicolon separated list of theme names
 
+            // Draft options
+            String doublePick = metadata.get("DoublePick", "Never");
+            int maxPodSize = metadata.getInt("MaxPodSize", 8);
+            int recommendedPodSize = metadata.getInt("RecommendedPodSize", 8);
+            int maxMatchPlayers = metadata.getInt("MaxMatchPlayers", 2);
+            String deckType = metadata.get("DeckType", "Normal");
+            String freeCommander = metadata.get("FreeCommander", "");
+
+            res.draftOptions = new DraftOptions(
+                    doublePick,
+                    maxPodSize,
+                    recommendedPodSize,
+                    maxMatchPlayers,
+                    deckType,
+                    freeCommander
+            );
+
             return res;
         }
 
@@ -840,7 +873,7 @@ public final class CardEdition implements Comparable<CardEdition> {
         @Override
         public void add(CardEdition item) { //Even though we want it to be read only, make an exception for custom content.
             if(lock) throw new UnsupportedOperationException("This is a read-only storage");
-            else map.put(item.getName(), item);
+            else map.put(item.getCode(), item);
         }
         public void append(CardEdition.Collection C){ //Append custom editions
             if (lock) throw new UnsupportedOperationException("This is a read-only storage");
@@ -985,16 +1018,13 @@ public final class CardEdition implements Comparable<CardEdition> {
 
         public static final Predicate<CardEdition> HAS_BOOSTER_BOX = edition -> edition.getBoosterBoxCount() > 0;
 
+        @Deprecated //Use CardEdition::hasBasicLands and a nonnull test.
         public static final Predicate<CardEdition> hasBasicLands = ed -> {
             if (ed == null) {
                 // Happens for new sets with "???" code
                 return false;
             }
-            for(String landName : MagicColor.Constant.BASIC_LANDS) {
-                if (null == StaticData.instance().getCommonCards().getCard(landName, ed.getCode(), 0))
-                    return false;
-            }
-            return true;
+            return ed.hasBasicLands();
         };
     }
 
@@ -1015,7 +1045,7 @@ public final class CardEdition implements Comparable<CardEdition> {
 
     public boolean hasBasicLands() {
         for(String landName : MagicColor.Constant.BASIC_LANDS) {
-            if (null == StaticData.instance().getCommonCards().getCard(landName, this.getCode(), 0))
+            if (this.getCardInSet(landName).isEmpty())
                 return false;
         }
         return true;
diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java
index b2b41a1bd03..3d3ffe0648c 100644
--- a/forge-core/src/main/java/forge/card/CardRules.java
+++ b/forge-core/src/main/java/forge/card/CardRules.java
@@ -53,6 +53,7 @@ public final class CardRules implements ICardCharacteristics {
     private boolean addsWildCardColor;
     private int setColorID;
     private boolean custom;
+    private boolean unsupported;
     private String path;
 
     public CardRules(ICardFace[] faces, CardSplitType altMode, CardAiHints cah) {
@@ -167,21 +168,7 @@ public final class CardRules implements ICardCharacteristics {
     }
 
     public boolean isTransformable() {
-        if (CardSplitType.Transform == getSplitType()) {
-            return true;
-        }
-        if (CardSplitType.Modal != getSplitType()) {
-            return false;
-        }
-        for (ICardFace face : getAllFaces()) {
-            for (String spell : face.getAbilities()) {
-                if (spell.contains("AB$ SetState") && spell.contains("Mode$ Transform")) {
-                    return true;
-                }
-            }
-            // TODO check keywords if needed
-        }
-        return false;
+        return CardSplitType.Transform == getSplitType() || CardSplitType.Modal == getSplitType();
     }
 
     public ICardFace getWSpecialize() {
@@ -220,7 +207,9 @@ public final class CardRules implements ICardCharacteristics {
     }
 
     public boolean isCustom() { return custom; }
-    public void setCustom() { custom = true;   }
+    public void setCustom() { custom = true; }
+
+    public boolean isUnsupported() { return unsupported; }
 
     @Override
     public CardType getType() {
@@ -335,6 +324,15 @@ public final class CardRules implements ICardCharacteristics {
         }
         if (hasKeyword("Friends forever") && b.hasKeyword("Friends forever")) {
             legal = true; // Stranger Things Secret Lair gimmick partner commander
+        }  
+        if (hasKeyword("Partner - Survivors") && b.hasKeyword("Partner - Survivors")) {
+            legal = true; // The Last of Us Secret Lair gimmick partner commander
+        }
+        if (hasKeyword("Partner - Father & Son") && b.hasKeyword("Partner - Father & Son")) {
+            legal = true; // God of War Secret Lair gimmick partner commander
+        }
+        if (hasKeyword("Partner - Character select") && b.hasKeyword("Partner - Character select")) {
+            legal = true; // TMNT Commander deck gimmick partner commander
         }
         if (hasKeyword("Choose a Background") && b.canBeBackground()
                 || b.hasKeyword("Choose a Background") && canBeBackground()) {
@@ -353,6 +351,7 @@ public final class CardRules implements ICardCharacteristics {
         }
         return canBeCommander() && (hasKeyword("Partner") || !this.partnerWith.isEmpty() ||
                 hasKeyword("Friends forever") || hasKeyword("Choose a Background") ||
+                hasKeyword("Partner - Father & Son") || hasKeyword("Partner - Survivors") || hasKeyword("Partner - Character select") ||
                 hasKeyword("Doctor's companion") || isDoctor());
     }
 
@@ -373,6 +372,9 @@ public final class CardRules implements ICardCharacteristics {
 
     public boolean canBeOathbreaker() {
         CardType type = mainPart.getType();
+        if (mainPart.getOracleText().contains("can be your commander")) {
+            return true;
+        }
         return type.isPlaneswalker();
     }
 
@@ -825,6 +827,8 @@ public final class CardRules implements ICardCharacteristics {
         faces[0].assignMissingFields();
         final CardRules result = new CardRules(faces, CardSplitType.None, cah);
 
+        result.unsupported = true;
+
         return result;
     }
 
diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
index 505c70f86e8..ef658eff833 100644
--- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java
+++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java
@@ -196,6 +196,31 @@ public final class CardRulesPredicates {
         return card -> card.getSplitType().equals(type);
     }
 
+    /**
+     * @return a Predicate that matches cards that are vanilla.
+     */
+    public static Predicate<CardRules> isVanilla() {
+        return card -> {
+            if (!(card.getType().isCreature() || card.getType().isLand()) ||
+                card.getSplitType() != CardSplitType.None ||
+                card.hasFunctionalVariants()) {
+                return false;
+            }
+
+            ICardFace mainPart = card.getMainPart();
+
+            boolean hasAny =
+                mainPart.getKeywords().iterator().hasNext() ||
+                mainPart.getAbilities().iterator().hasNext() ||
+                mainPart.getStaticAbilities().iterator().hasNext() ||
+                mainPart.getTriggers().iterator().hasNext() ||
+                (mainPart.getDraftActions() != null && mainPart.getDraftActions().iterator().hasNext()) ||
+                mainPart.getReplacements().iterator().hasNext();
+
+            return !hasAny;
+        };
+    }
+
     /**
      * Checks for color.
      *
diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index 84d9edc49d3..b8998629be2 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -1066,4 +1066,74 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
         return type;
     }
 
+    public static class Helper {
+        public static final void parseTypes(String sectionName, List<String> content) {
+            Set<String> addToSection = null;
+
+            switch (sectionName) {
+                case "BasicTypes":
+                    addToSection = CardType.Constant.BASIC_TYPES;
+                    break;
+                case "LandTypes":
+                    addToSection = CardType.Constant.LAND_TYPES;
+                    break;
+                case "CreatureTypes":
+                    addToSection = CardType.Constant.CREATURE_TYPES;
+                    break;
+                case "SpellTypes":
+                    addToSection = CardType.Constant.SPELL_TYPES;
+                    break;
+                case "EnchantmentTypes":
+                    addToSection = CardType.Constant.ENCHANTMENT_TYPES;
+                    break;
+                case "ArtifactTypes":
+                    addToSection = CardType.Constant.ARTIFACT_TYPES;
+                    break;
+                case "WalkerTypes":
+                    addToSection = CardType.Constant.WALKER_TYPES;
+                    break;
+                case "DungeonTypes":
+                    addToSection = CardType.Constant.DUNGEON_TYPES;
+                    break;
+                case "BattleTypes":
+                    addToSection = CardType.Constant.BATTLE_TYPES;
+                    break;
+                case "PlanarTypes":
+                    addToSection = CardType.Constant.PLANAR_TYPES;
+                    break;
+            }
+
+            if (addToSection == null) {
+                return;
+            }
+
+            for(String line : content) {
+                if (line.length() == 0) continue;
+
+                if (line.contains(":")) {
+                    String[] k = line.split(":");
+
+                    if (addToSection.contains(k[0])) {
+                        continue;
+                    }
+
+                    addToSection.add(k[0]);
+                    CardType.Constant.pluralTypes.put(k[0], k[1]);
+
+                    if (k[0].contains(" ")) {
+                        CardType.Constant.MultiwordTypes.add(k[0]);
+                    }
+                } else {
+                    if (addToSection.contains(line)) {
+                        continue;
+                    }
+
+                    addToSection.add(line);
+                    if (line.contains(" ")) {
+                        CardType.Constant.MultiwordTypes.add(line);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/forge-core/src/main/java/forge/card/ColorSet.java b/forge-core/src/main/java/forge/card/ColorSet.java
index abf25c085da..e4b3fe19a5f 100644
--- a/forge-core/src/main/java/forge/card/ColorSet.java
+++ b/forge-core/src/main/java/forge/card/ColorSet.java
@@ -17,15 +17,12 @@
  */
 package forge.card;
 
-import com.google.common.collect.UnmodifiableIterator;
 import forge.card.MagicColor.Color;
 import forge.card.mana.ManaCost;
-import forge.card.mana.ManaCostShard;
 import forge.util.BinaryUtil;
 
 import java.io.Serializable;
 import java.util.*;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -38,28 +35,64 @@ import java.util.stream.Stream;
  *
  *
  */
-public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Serializable {
-    private static final long serialVersionUID = 794691267379929080L;
+public enum ColorSet implements Iterable<Color>, Serializable {
 
-    private final byte myColor;
+    C(Color.COLORLESS),
+    W(Color.WHITE),
+    U(Color.BLUE),
+    WU(Color.WHITE, Color.BLUE),
+    B(Color.BLACK),
+    WB(Color.WHITE, Color.BLACK),
+    UB(Color.BLUE, Color.BLACK),
+    WUB(Color.WHITE, Color.BLUE, Color.BLACK),
+    R(Color.RED),
+    RW(Color.RED, Color.WHITE),
+    UR(Color.BLUE, Color.RED),
+    URW(Color.BLUE, Color.RED, Color.WHITE),
+    BR(Color.BLACK, Color.RED),
+    RWB(Color.RED, Color.WHITE, Color.BLACK),
+    UBR(Color.BLUE, Color.BLACK, Color.RED),
+    WUBR(Color.WHITE, Color.BLUE, Color.BLACK, Color.RED),
+    G(Color.GREEN),
+    GW(Color.GREEN, Color.WHITE),
+    GU(Color.GREEN, Color.BLUE),
+    GWU(Color.GREEN, Color.WHITE, Color.BLUE),
+    BG(Color.BLACK, Color.GREEN),
+    WBG(Color.WHITE, Color.BLACK, Color.GREEN),
+    BGU(Color.BLACK, Color.GREEN, Color.BLUE),
+    GWUB(Color.GREEN, Color.WHITE, Color.BLUE, Color.BLACK),
+    RG(Color.RED, Color.GREEN),
+    RGW(Color.RED, Color.GREEN, Color.WHITE),
+    GUR(Color.GREEN, Color.BLUE, Color.RED),
+    RGWU(Color.RED, Color.GREEN, Color.WHITE, Color.BLUE),
+    BRG(Color.BLACK, Color.RED, Color.GREEN),
+    BRGW(Color.BLACK, Color.RED, Color.GREEN, Color.WHITE),
+    UBRG(Color.BLUE, Color.BLACK, Color.RED, Color.GREEN),
+    WUBRG(Color.WHITE, Color.BLUE, Color.BLACK, Color.RED, Color.GREEN)
+    ;
+
+    private static final long serialVersionUID = 794691267379929080L;
+    // needs to be before other static
+
+    private final Collection<Color> orderedShards;
     private final float orderWeight;
 
-    private static final ColorSet[] cache = new ColorSet[32];
-
-    public static final ColorSet ALL_COLORS = fromMask(MagicColor.ALL_COLORS);
-    private static final ColorSet NO_COLORS = fromMask(MagicColor.COLORLESS);
-
-    private ColorSet(final byte mask) {
-        this.myColor = mask;
-        this.orderWeight = this.getOrderWeight();
+    private ColorSet(final Color... ordered) {
+        this.orderedShards = Arrays.asList(ordered);
+        this.orderWeight = this.calcOrderWeight();
     }
 
     public static ColorSet fromMask(final int mask) {
         final int mask32 = mask & MagicColor.ALL_COLORS;
-        if (cache[mask32] == null) {
-            cache[mask32] = new ColorSet((byte) mask32);
+        return values()[mask32];
+    }
+
+    public static ColorSet fromEnums(final Color... colors) {
+        byte mask = 0;
+        for (Color e : colors) {
+            mask |= e.getColorMask();
         }
-        return cache[mask32];
+        return fromMask(mask);
     }
 
     public static ColorSet fromNames(final String... colors) {
@@ -98,7 +131,10 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if successful
      */
     public boolean hasAnyColor(final int colormask) {
-        return (this.myColor & colormask) != 0;
+        return (this.ordinal() & colormask) != 0;
+    }
+    public boolean hasAnyColor(final Color c) {
+        return this.orderedShards.contains(c);
     }
 
     /**
@@ -109,12 +145,12 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if successful
      */
     public boolean hasAllColors(final int colormask) {
-        return (this.myColor & colormask) == colormask;
+        return (this.ordinal() & colormask) == colormask;
     }
 
     /** this has exactly the colors defined by operand.  */
     public boolean hasExactlyColor(final int colormask) {
-        return this.myColor == colormask;
+        return this.ordinal() == colormask;
     }
 
     /** this has no other colors except defined by operand.  */
@@ -124,17 +160,17 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
 
     /** this has no other colors except defined by operand.  */
     public boolean hasNoColorsExcept(final int colormask) {
-        return (this.myColor & ~colormask) == 0;
+        return (this.ordinal() & ~colormask) == 0;
     }
 
     /** This returns the colors that colormask contains that are not in color */
     public ColorSet getMissingColors(final byte colormask) {
-        return fromMask(this.myColor & ~colormask);
+        return fromMask(this.ordinal() & ~colormask);
     }
 
     /** Operand has no other colors except defined by this. */
     public boolean containsAllColorsFrom(final int colorProfile) {
-        return (~this.myColor & colorProfile) == 0;
+        return (~this.ordinal() & colorProfile) == 0;
     }
 
     /**
@@ -143,7 +179,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return the int
      */
     public int countColors() {
-        return BinaryUtil.bitCount(this.myColor);
+        return BinaryUtil.bitCount(this.ordinal());
     } // bit count
 
     // order has to be: W U B R G multi colorless - same as cards numbering
@@ -153,7 +189,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      *
      * @return the order weight
      */
-    private float getOrderWeight() {
+    private float calcOrderWeight() {
         float res = this.countColors();
         if (hasWhite()) {
             res += 0.0005f;
@@ -172,6 +208,10 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
         }
         return res;
     }
+    public float getOrderWeight()
+    {
+        return orderWeight;
+    }
 
     /**
      * Checks if is colorless.
@@ -179,7 +219,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if is colorless
      */
     public boolean isColorless() {
-        return this.myColor == 0;
+        return this == C;
     }
 
     /**
@@ -197,7 +237,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if is all colors
      */
     public boolean isAllColors() {
-        return this == ALL_COLORS;
+        return this == WUBRG;
     }
 
     /**
@@ -217,17 +257,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if is equal
      */
     public boolean isEqual(final byte color) {
-        return color == this.myColor;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Comparable#compareTo(java.lang.Object)
-     */
-    @Override
-    public int compareTo(final ColorSet other) {
-        return Float.compare(this.orderWeight, other.orderWeight);
+        return color == this.ordinal();
     }
 
     // Presets
@@ -277,33 +307,13 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
     }
 
     public ColorSet inverse() {
-        byte mask = this.myColor;
+        byte mask = (byte)this.ordinal();
         mask ^= MagicColor.ALL_COLORS;
         return fromMask(mask);
     }
 
     public byte getColor() {
-        return myColor;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.lang.Object#toString()
-     */
-    @Override
-    public String toString() {
-        final ManaCostShard[] orderedShards = getOrderedShards();
-        return Arrays.stream(orderedShards).map(ManaCostShard::toShortString).collect(Collectors.joining());
-    }
-
-    /**
-     * Gets the null color.
-     *
-     * @return the nullColor
-     */
-    public static ColorSet getNullColor() {
-        return NO_COLORS;
+        return (byte)ordinal();
     }
 
     /**
@@ -313,7 +323,7 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
      * @return true, if successful
      */
     public boolean sharesColorWith(final ColorSet ccOther) {
-        return (this.myColor & ccOther.myColor) != 0;
+        return (this.ordinal() & ccOther.ordinal()) != 0;
     }
 
     public ColorSet getSharedColors(final ColorSet ccOther) {
@@ -321,123 +331,24 @@ public final class ColorSet implements Comparable<ColorSet>, Iterable<Byte>, Ser
     }
 
     public ColorSet getOffColors(final ColorSet ccOther) {
-        return fromMask(~this.myColor & ccOther.myColor);
+        return fromMask(~this.ordinal() & ccOther.ordinal());
     }
 
     public Set<Color> toEnumSet() {
-        if (isColorless()) {
-            return EnumSet.of(Color.COLORLESS);
-        }
-        List<Color> list = new ArrayList<>();
-        for (Color c : Color.values()) {
-            if (hasAnyColor(c.getColormask())) {
-                list.add(c);
-            }
-        }
-        return EnumSet.copyOf(list);
+        return EnumSet.copyOf(orderedShards);
     }
 
-    @Override
-    public Iterator<Byte> iterator() {
-        return new ColorIterator();
+    //@Override
+    public Iterator<Color> iterator() {
+        return this.orderedShards.iterator();
     }
 
-    private class ColorIterator extends UnmodifiableIterator<Byte> {
-        int currentBit = -1;
-
-        private int getIndexOfNextColor(){
-            int nextBit = currentBit + 1;
-            while (nextBit < MagicColor.NUMBER_OR_COLORS) {
-                if ((myColor & MagicColor.WUBRG[nextBit]) != 0) {
-                    break;
-                }
-                nextBit++;
-            }
-            return nextBit;
-        }
-
-        @Override
-        public boolean hasNext() {
-            return getIndexOfNextColor() < MagicColor.NUMBER_OR_COLORS;
-        }
-
-        @Override
-        public Byte next() {
-            currentBit = getIndexOfNextColor();
-            if (currentBit >= MagicColor.NUMBER_OR_COLORS) {
-                throw new NoSuchElementException();
-            }
-
-            return MagicColor.WUBRG[currentBit];
-        }
-    }
-
-    public Stream<MagicColor.Color> stream() {
-        return this.toEnumSet().stream();
+    public Stream<Color> stream() {
+        return this.orderedShards.stream();
     }
 
     //Get array of mana cost shards for color set in the proper order
-    public ManaCostShard[] getOrderedShards() {
-        return shardOrderLookup[myColor];
-    }
-
-    private static final ManaCostShard[][] shardOrderLookup = new ManaCostShard[MagicColor.ALL_COLORS + 1][];
-    static {
-        byte COLORLESS = MagicColor.COLORLESS;
-        byte WHITE = MagicColor.WHITE;
-        byte BLUE = MagicColor.BLUE;
-        byte BLACK = MagicColor.BLACK;
-        byte RED = MagicColor.RED;
-        byte GREEN = MagicColor.GREEN;
-        ManaCostShard C = ManaCostShard.COLORLESS;
-        ManaCostShard W = ManaCostShard.WHITE;
-        ManaCostShard U = ManaCostShard.BLUE;
-        ManaCostShard B = ManaCostShard.BLACK;
-        ManaCostShard R = ManaCostShard.RED;
-        ManaCostShard G = ManaCostShard.GREEN;
-
-        //colorless
-        shardOrderLookup[COLORLESS] = new ManaCostShard[] { C };
-
-        //mono-color
-        shardOrderLookup[WHITE] = new ManaCostShard[] { W };
-        shardOrderLookup[BLUE] = new ManaCostShard[] { U };
-        shardOrderLookup[BLACK] = new ManaCostShard[] { B };
-        shardOrderLookup[RED] = new ManaCostShard[] { R };
-        shardOrderLookup[GREEN] = new ManaCostShard[] { G };
-
-        //two-color
-        shardOrderLookup[WHITE | BLUE] = new ManaCostShard[] { W, U };
-        shardOrderLookup[WHITE | BLACK] = new ManaCostShard[] { W, B };
-        shardOrderLookup[BLUE | BLACK] = new ManaCostShard[] { U, B };
-        shardOrderLookup[BLUE | RED] = new ManaCostShard[] { U, R };
-        shardOrderLookup[BLACK | RED] = new ManaCostShard[] { B, R };
-        shardOrderLookup[BLACK | GREEN] = new ManaCostShard[] { B, G };
-        shardOrderLookup[RED | GREEN] = new ManaCostShard[] { R, G };
-        shardOrderLookup[RED | WHITE] = new ManaCostShard[] { R, W };
-        shardOrderLookup[GREEN | WHITE] = new ManaCostShard[] { G, W };
-        shardOrderLookup[GREEN | BLUE] = new ManaCostShard[] { G, U };
-
-        //three-color
-        shardOrderLookup[WHITE | BLUE | BLACK] = new ManaCostShard[] { W, U, B };
-        shardOrderLookup[WHITE | BLACK | GREEN] = new ManaCostShard[] { W, B, G };
-        shardOrderLookup[BLUE | BLACK | RED] = new ManaCostShard[] { U, B, R };
-        shardOrderLookup[BLUE | RED | WHITE] = new ManaCostShard[] { U, R, W };
-        shardOrderLookup[BLACK | RED | GREEN] = new ManaCostShard[] { B, R, G };
-        shardOrderLookup[BLACK | GREEN | BLUE] = new ManaCostShard[] { B, G, U };
-        shardOrderLookup[RED | GREEN | WHITE] = new ManaCostShard[] { R, G, W };
-        shardOrderLookup[RED | WHITE | BLACK] = new ManaCostShard[] { R, W, B };
-        shardOrderLookup[GREEN | WHITE | BLUE] = new ManaCostShard[] { G, W, U };
-        shardOrderLookup[GREEN | BLUE | RED] = new ManaCostShard[] { G, U, R };
-
-        //four-color
-        shardOrderLookup[WHITE | BLUE | BLACK | RED] = new ManaCostShard[] { W, U, B, R };
-        shardOrderLookup[BLUE | BLACK | RED | GREEN] = new ManaCostShard[] { U, B, R, G };
-        shardOrderLookup[BLACK | RED | GREEN | WHITE] = new ManaCostShard[] { B, R, G, W };
-        shardOrderLookup[RED | GREEN | WHITE | BLUE] = new ManaCostShard[] { R, G, W, U };
-        shardOrderLookup[GREEN | WHITE | BLUE | BLACK] = new ManaCostShard[] { G, W, U, B };
-
-        //five-color
-        shardOrderLookup[WHITE | BLUE | BLACK | RED | GREEN] = new ManaCostShard[] { W, U, B, R, G };
+    public Collection<Color> getOrderedColors() {
+        return orderedShards;
     }
 }
diff --git a/forge-core/src/main/java/forge/card/DraftOptions.java b/forge-core/src/main/java/forge/card/DraftOptions.java
new file mode 100644
index 00000000000..cdeca05203f
--- /dev/null
+++ b/forge-core/src/main/java/forge/card/DraftOptions.java
@@ -0,0 +1,75 @@
+package forge.card;
+
+public class DraftOptions {
+    public enum DoublePick {
+        NEVER,
+        FIRST_PICK, // only first pick each pack
+        WHEN_POD_SIZE_IS_4, // only when pod size is 4, so you can pick two cards each time
+        ALWAYS // each time you receive a pack, you can pick two cards
+    };
+    public enum DeckType {
+        Normal, // Standard deck, usually 40 cards
+        Commander // Special deck type for Commander format. Important for selection/construction
+    }
+
+    private DoublePick doublePick = DoublePick.NEVER;
+    private final int maxPodSize; // Usually 8, but could be smaller for cubes. I guess it could be larger too
+    private final int recommendedPodSize; // Usually 8, but is 4 for new double pick
+    private final int maxMatchPlayers; // Usually 2, but 4 for things like Commander or Conspiracy
+    private final DeckType deckType; // Normal or Commander
+    private final String freeCommander;
+
+    public DraftOptions(String doublePickOption, int maxPodSize, int recommendedPodSize, int maxMatchPlayers, String deckType, String freeCommander) {
+        this.maxPodSize = maxPodSize;
+        this.recommendedPodSize = recommendedPodSize;
+        this.maxMatchPlayers = maxMatchPlayers;
+        this.deckType = DeckType.valueOf(deckType);
+        this.freeCommander = freeCommander;
+        if (doublePickOption != null) {
+            switch (doublePickOption.toLowerCase()) {
+                case "firstpick":
+                    doublePick = DoublePick.FIRST_PICK;
+                    break;
+                case "always":
+                    doublePick = DoublePick.ALWAYS;
+                    break;
+                case "whenpodsizeis4":
+                    doublePick = DoublePick.WHEN_POD_SIZE_IS_4;
+                    break;
+            }
+        }
+
+    }
+    public int getMaxPodSize() {
+        return maxPodSize;
+    }
+    public int getRecommendedPodSize() {
+        return recommendedPodSize;
+    }
+    public DoublePick getDoublePick() {
+        return doublePick;
+    }
+
+    public DoublePick isDoublePick(int podSize) {
+        if (doublePick == DoublePick.WHEN_POD_SIZE_IS_4) {
+            if (podSize != 4) {
+                return DoublePick.NEVER;
+            }
+            // only when pod size is 4, so you can pick two cards each time
+            return DoublePick.ALWAYS;
+        }
+
+        return doublePick;
+    }
+
+
+    public int getMaxMatchPlayers() {
+        return maxMatchPlayers;
+    }
+    public DeckType getDeckType() {
+        return deckType;
+    }
+    public String getFreeCommander() {
+        return freeCommander;
+    }
+}
diff --git a/forge-core/src/main/java/forge/card/ICardDatabase.java b/forge-core/src/main/java/forge/card/ICardDatabase.java
index 1f516664621..537d3499648 100644
--- a/forge-core/src/main/java/forge/card/ICardDatabase.java
+++ b/forge-core/src/main/java/forge/card/ICardDatabase.java
@@ -75,8 +75,6 @@ public interface ICardDatabase extends Iterable<PaperCard> {
     PaperCard getCardFromEditionsReleasedAfter(String cardName, CardArtPreference artPreference, int artIndex, Date releaseDate);
     PaperCard getCardFromEditionsReleasedAfter(String cardName, CardArtPreference artPreference, int artIndex, Date releaseDate, Predicate<PaperCard> filter);
 
-
-
     /* CARDS COLLECTION RETRIEVAL METHODS
      * ================================== */
     Collection<PaperCard> getAllCards();
diff --git a/forge-core/src/main/java/forge/card/MagicColor.java b/forge-core/src/main/java/forge/card/MagicColor.java
index f1e29ebf0e1..0eb9a7b6470 100644
--- a/forge-core/src/main/java/forge/card/MagicColor.java
+++ b/forge-core/src/main/java/forge/card/MagicColor.java
@@ -1,7 +1,9 @@
 package forge.card;
 
 import com.google.common.collect.ImmutableList;
-import forge.deck.DeckRecognizer;
+
+import forge.util.ITranslatable;
+import forge.util.Localizer;
 
 /**
  * Holds byte values for each color magic has.
@@ -157,21 +159,24 @@ public final class MagicColor {
         }
     }
 
-    public enum Color {
-        WHITE(Constant.WHITE, MagicColor.WHITE, "{W}"),
-        BLUE(Constant.BLUE, MagicColor.BLUE, "{U}"),
-        BLACK(Constant.BLACK, MagicColor.BLACK, "{B}"),
-        RED(Constant.RED, MagicColor.RED, "{R}"),
-        GREEN(Constant.GREEN, MagicColor.GREEN, "{G}"),
-        COLORLESS(Constant.COLORLESS, MagicColor.COLORLESS, "{C}");
+    public enum Color implements ITranslatable {
+        WHITE(Constant.WHITE, MagicColor.WHITE, "W", "lblWhite"),
+        BLUE(Constant.BLUE, MagicColor.BLUE, "U", "lblBlue"),
+        BLACK(Constant.BLACK, MagicColor.BLACK, "B", "lblBlack"),
+        RED(Constant.RED, MagicColor.RED, "R", "lblRed"),
+        GREEN(Constant.GREEN, MagicColor.GREEN, "G", "lblGreen"),
+        COLORLESS(Constant.COLORLESS, MagicColor.COLORLESS, "C", "lblColorless");
 
-        private final String name, symbol;
+        private final String name, shortName, symbol;
+        private final String label;
         private final byte colormask;
 
-        Color(String name0, byte colormask0, String symbol0) {
+        Color(String name0, byte colormask0, String shortName, String label) {
             name = name0;
             colormask = colormask0;
-            symbol = symbol0;
+            this.shortName = shortName;
+            symbol = "{" + shortName + "}";
+            this.label = label;
         }
 
         public static Color fromByte(final byte color) {
@@ -185,25 +190,25 @@ public final class MagicColor {
             }
         }
 
+        @Override
         public String getName() {
             return name;
         }
-
-        public String getLocalizedName() {
-            //Should probably move some of this logic back here, or at least to a more general location.
-            return DeckRecognizer.getLocalisedMagicColorName(getName());
+        public String getShortName() {
+            return shortName;
         }
 
-        public byte getColormask() {
+        @Override
+        public String getTranslatedName() {
+            return Localizer.getInstance().getMessage(label);
+        }
+
+        public byte getColorMask() {
             return colormask;
         }
         public String getSymbol() {
             return symbol;
         }
-        @Override
-        public String toString() {
-            return name;
-        }
     }
 
 }
diff --git a/forge-core/src/main/java/forge/card/mana/ManaCostShard.java b/forge-core/src/main/java/forge/card/mana/ManaCostShard.java
index 1d558520a25..41b9b667256 100644
--- a/forge-core/src/main/java/forge/card/mana/ManaCostShard.java
+++ b/forge-core/src/main/java/forge/card/mana/ManaCostShard.java
@@ -17,6 +17,7 @@
  */
 package forge.card.mana;
 
+import forge.card.ColorSet;
 import forge.util.BinaryUtil;
 
 /**
@@ -34,52 +35,51 @@ public enum ManaCostShard {
     COLORLESS(ManaAtom.COLORLESS, "C"),
 
     /* Hybrid */
-    WU(ManaAtom.WHITE | ManaAtom.BLUE, "W/U", "WU"),
-    WB(ManaAtom.WHITE | ManaAtom.BLACK, "W/B", "WB"),
-    UB(ManaAtom.BLUE | ManaAtom.BLACK, "U/B", "UB"),
-    UR(ManaAtom.BLUE | ManaAtom.RED, "U/R", "UR"),
-    BR(ManaAtom.BLACK | ManaAtom.RED, "B/R", "BR"),
-    BG(ManaAtom.BLACK | ManaAtom.GREEN, "B/G", "BG"),
-    RW(ManaAtom.RED | ManaAtom.WHITE, "R/W", "RW"),
-    RG(ManaAtom.RED | ManaAtom.GREEN, "R/G", "RG"),
-    GW(ManaAtom.GREEN | ManaAtom.WHITE, "G/W", "GW"),
-    GU(ManaAtom.GREEN | ManaAtom.BLUE, "G/U", "GU"),
+    WU(ManaAtom.WHITE | ManaAtom.BLUE, "W/U"),
+    WB(ManaAtom.WHITE | ManaAtom.BLACK, "W/B"),
+    UB(ManaAtom.BLUE | ManaAtom.BLACK, "U/B"),
+    UR(ManaAtom.BLUE | ManaAtom.RED, "U/R"),
+    BR(ManaAtom.BLACK | ManaAtom.RED, "B/R"),
+    BG(ManaAtom.BLACK | ManaAtom.GREEN, "B/G"),
+    RW(ManaAtom.RED | ManaAtom.WHITE, "R/W"),
+    RG(ManaAtom.RED | ManaAtom.GREEN, "R/G"),
+    GW(ManaAtom.GREEN | ManaAtom.WHITE, "G/W"),
+    GU(ManaAtom.GREEN | ManaAtom.BLUE, "G/U"),
 
     /* Or 2 generic */
-    W2(ManaAtom.WHITE | ManaAtom.OR_2_GENERIC, "2/W", "2W"),
-    U2(ManaAtom.BLUE | ManaAtom.OR_2_GENERIC, "2/U", "2U"),
-    B2(ManaAtom.BLACK | ManaAtom.OR_2_GENERIC, "2/B", "2B"),
-    R2(ManaAtom.RED | ManaAtom.OR_2_GENERIC, "2/R", "2R"),
-    G2(ManaAtom.GREEN | ManaAtom.OR_2_GENERIC, "2/G", "2G"),
+    W2(ManaAtom.WHITE | ManaAtom.OR_2_GENERIC, "2/W"),
+    U2(ManaAtom.BLUE | ManaAtom.OR_2_GENERIC, "2/U"),
+    B2(ManaAtom.BLACK | ManaAtom.OR_2_GENERIC, "2/B"),
+    R2(ManaAtom.RED | ManaAtom.OR_2_GENERIC, "2/R"),
+    G2(ManaAtom.GREEN | ManaAtom.OR_2_GENERIC, "2/G"),
 
     /* Or Colorless */
-    CW(ManaAtom.WHITE | ManaAtom.COLORLESS, "C/W", "CW"),
-    CU(ManaAtom.BLUE | ManaAtom.COLORLESS, "C/U", "CU"),
-    CB(ManaAtom.BLACK | ManaAtom.COLORLESS, "C/B", "CB"),
-    CR(ManaAtom.RED | ManaAtom.COLORLESS, "C/R", "CR"),
-    CG(ManaAtom.GREEN | ManaAtom.COLORLESS, "C/G", "CG"),
+    CW(ManaAtom.WHITE | ManaAtom.COLORLESS, "C/W"),
+    CU(ManaAtom.BLUE | ManaAtom.COLORLESS, "C/U"),
+    CB(ManaAtom.BLACK | ManaAtom.COLORLESS, "C/B"),
+    CR(ManaAtom.RED | ManaAtom.COLORLESS, "C/R"),
+    CG(ManaAtom.GREEN | ManaAtom.COLORLESS, "C/G"),
 
     // Snow and colorless
     S(ManaAtom.IS_SNOW, "S"),
     GENERIC(ManaAtom.GENERIC, "1"),
 
-
     /* Phyrexian */
-    WP(ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "W/P", "WP"),
-    UP(ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "U/P", "UP"),
-    BP(ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "B/P", "BP"),
-    RP(ManaAtom.RED | ManaAtom.OR_2_LIFE, "R/P", "RP"),
-    GP(ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "G/P", "GP"),
-    BGP(ManaAtom.BLACK | ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "B/G/P", "BGP"),
-    BRP(ManaAtom.BLACK | ManaAtom.RED | ManaAtom.OR_2_LIFE, "B/R/P", "BRP"),
-    GUP(ManaAtom.GREEN | ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "G/U/P", "GUP"),
-    GWP(ManaAtom.GREEN | ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "G/W/P", "GWP"),
-    RGP(ManaAtom.RED | ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "R/G/P", "RGP"),
-    RWP(ManaAtom.RED | ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "R/W/P", "RWP"),
-    UBP(ManaAtom.BLUE | ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "U/B/P", "UBP"),
-    URP(ManaAtom.BLUE | ManaAtom.RED | ManaAtom.OR_2_LIFE, "U/R/P", "URP"),
-    WBP(ManaAtom.WHITE | ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "W/B/P", "WBP"),
-    WUP(ManaAtom.WHITE | ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "W/U/P", "WUP"),
+    WP(ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "W/P"),
+    UP(ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "U/P"),
+    BP(ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "B/P"),
+    RP(ManaAtom.RED | ManaAtom.OR_2_LIFE, "R/P"),
+    GP(ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "G/P"),
+    BGP(ManaAtom.BLACK | ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "B/G/P"),
+    BRP(ManaAtom.BLACK | ManaAtom.RED | ManaAtom.OR_2_LIFE, "B/R/P"),
+    GUP(ManaAtom.GREEN | ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "G/U/P"),
+    GWP(ManaAtom.GREEN | ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "G/W/P"),
+    RGP(ManaAtom.RED | ManaAtom.GREEN | ManaAtom.OR_2_LIFE, "R/G/P"),
+    RWP(ManaAtom.RED | ManaAtom.WHITE | ManaAtom.OR_2_LIFE, "R/W/P"),
+    UBP(ManaAtom.BLUE | ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "U/B/P"),
+    URP(ManaAtom.BLUE | ManaAtom.RED | ManaAtom.OR_2_LIFE, "U/R/P"),
+    WBP(ManaAtom.WHITE | ManaAtom.BLACK | ManaAtom.OR_2_LIFE, "W/B/P"),
+    WUP(ManaAtom.WHITE | ManaAtom.BLUE | ManaAtom.OR_2_LIFE, "W/U/P"),
 
     X(ManaAtom.IS_X, "X"),
 
@@ -108,26 +108,12 @@ public enum ManaCostShard {
      *            the s value
      */
     ManaCostShard(final int value, final String sValue) {
-        this(value, sValue, sValue);
-    }
-
-    /**
-     * Instantiates a new card mana cost shard.
-     * 
-     * @param value
-     *            the value
-     * @param sValue
-     *            the s value
-     * @param imgKey
-     *            the img key
-     */
-    ManaCostShard(final int value, final String sValue, final String imgKey) {
         this.shard = value;
         this.cmc = this.getCMC();
         this.cmpc = this.getCmpCost();
         this.stringValue = "{" + sValue + "}";
         this.shortStringValue = sValue;
-        this.imageKey = imgKey;
+        this.imageKey = sValue.replace("/", "");
     }
 
     public static final int COLORS_SUPERPOSITION = ManaAtom.WHITE | ManaAtom.BLUE | ManaAtom.BLACK | ManaAtom.RED | ManaAtom.GREEN;
@@ -186,6 +172,10 @@ public enum ManaCostShard {
         return (byte)(this.shard & COLORS_SUPERPOSITION);
     }
 
+    public final ColorSet getColor() {
+        return ColorSet.fromMask(getColorMask());
+    }
+
     /**
      * Value of.
      * 
diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java
index 4d6b34e22a7..22f11d22c8f 100644
--- a/forge-core/src/main/java/forge/deck/Deck.java
+++ b/forge-core/src/main/java/forge/deck/Deck.java
@@ -115,6 +115,20 @@ public class Deck extends DeckBase implements Iterable<Entry<DeckSection, CardPo
         return parts.get(DeckSection.Main);
     }
 
+    public Pair<Deck, List<PaperCard>> getValid() {
+        List<PaperCard> unsupported = new ArrayList<>();
+        for (Entry<DeckSection, CardPool> kv : parts.entrySet()) {
+            CardPool pool = kv.getValue();
+            for (Entry<PaperCard, Integer> pc : pool) {
+                if (pc.getKey().getRules() != null && pc.getKey().getRules().isUnsupported()) {
+                    unsupported.add(pc.getKey());
+                    pool.remove(pc.getKey());
+                }
+            }
+        }
+        return Pair.of(this, unsupported);
+    }
+
     public List<PaperCard> getCommanders() {
         List<PaperCard> result = Lists.newArrayList();
         final CardPool cp = get(DeckSection.Commander);
diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java
index 2757f418b26..8ea96e9847a 100644
--- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java
+++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java
@@ -22,6 +22,7 @@ import forge.StaticData;
 import forge.card.CardDb;
 import forge.card.CardEdition;
 import forge.card.CardType;
+import forge.card.ColorSet;
 import forge.card.MagicColor;
 import forge.item.IPaperCard;
 import forge.item.PaperCard;
@@ -49,6 +50,16 @@ public class DeckRecognizer {
         LIMITED_CARD,
         CARD_FROM_NOT_ALLOWED_SET,
         CARD_FROM_INVALID_SET,
+        /**
+         * Valid card request, but can't be imported because the player does not have enough copies.
+         * Should be replaced with a different printing if possible.
+         */
+        CARD_NOT_IN_INVENTORY,
+        /**
+         * Valid card request for a card that isn't in the player's inventory, but new copies can be acquired freely.
+         * Usually used for basic lands. Should be supplied to the import controller by the editor.
+         */
+        FREE_CARD_NOT_IN_INVENTORY,
         // Warning messages
         WARNING_MESSAGE,
         UNKNOWN_CARD,
@@ -63,10 +74,14 @@ public class DeckRecognizer {
         CARD_TYPE,
         CARD_RARITY,
         CARD_CMC,
-        MANA_COLOUR
+        MANA_COLOUR;
+
+        public static final EnumSet<TokenType> CARD_TOKEN_TYPES = EnumSet.of(LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET, CARD_FROM_INVALID_SET, CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY);
+        public static final EnumSet<TokenType> IN_DECK_TOKEN_TYPES = EnumSet.of(LEGAL_CARD, LIMITED_CARD, DECK_NAME, FREE_CARD_NOT_IN_INVENTORY);
+        public static final EnumSet<TokenType> CARD_PLACEHOLDER_TOKEN_TYPES = EnumSet.of(CARD_TYPE, CARD_RARITY, CARD_CMC, MANA_COLOUR);
     }
 
-    public enum LimitedCardType{
+    public enum LimitedCardType {
         BANNED,
         RESTRICTED,
     }
@@ -108,6 +123,10 @@ public class DeckRecognizer {
             return new Token(TokenType.CARD_FROM_INVALID_SET, count, card, cardRequestHasSetCode);
         }
 
+        public static Token NotInInventoryFree(final PaperCard card, final int count, final DeckSection section) {
+            return new Token(TokenType.FREE_CARD_NOT_IN_INVENTORY, count, card, section, true);
+        }
+
         // WARNING MESSAGES
         // ================
         public static Token UnknownCard(final String cardName, final String setCode, final int count) {
@@ -126,6 +145,10 @@ public class DeckRecognizer {
            return new Token(TokenType.WARNING_MESSAGE, msg);
         }
 
+        public static Token NotInInventory(final PaperCard card, final int count, final DeckSection section) {
+            return new Token(TokenType.CARD_NOT_IN_INVENTORY, count, card, section, false);
+        }
+
         /* =================================
          * DECK SECTIONS
          * ================================= */
@@ -239,14 +262,11 @@ public class DeckRecognizer {
         /**
          * Filters all token types that have a PaperCard instance set (not null)
          * @return true for tokens of type:
-         * LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET and CARD_FROM_INVALID_SET.
+         * LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET and CARD_FROM_INVALID_SET, CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY.
          * False otherwise.
          */
         public boolean isCardToken() {
-            return (this.type == TokenType.LEGAL_CARD ||
-                    this.type == TokenType.LIMITED_CARD ||
-                    this.type == TokenType.CARD_FROM_NOT_ALLOWED_SET ||
-                    this.type == TokenType.CARD_FROM_INVALID_SET);
+            return TokenType.CARD_TOKEN_TYPES.contains(this.type);
         }
 
         /**
@@ -255,9 +275,7 @@ public class DeckRecognizer {
          * LEGAL_CARD, LIMITED_CARD, DECK_NAME; false otherwise.
          */
         public boolean isTokenForDeck() {
-            return (this.type == TokenType.LEGAL_CARD ||
-                    this.type == TokenType.LIMITED_CARD ||
-                    this.type == TokenType.DECK_NAME);
+            return TokenType.IN_DECK_TOKEN_TYPES.contains(this.type);
         }
 
         /**
@@ -266,7 +284,7 @@ public class DeckRecognizer {
          * False otherwise.
          */
         public boolean isCardTokenForDeck() {
-            return (this.type == TokenType.LEGAL_CARD || this.type == TokenType.LIMITED_CARD);
+            return isCardToken() && isTokenForDeck();
         }
 
         /**
@@ -276,10 +294,7 @@ public class DeckRecognizer {
          * CARD_RARITY, CARD_CMC, CARD_TYPE, MANA_COLOUR
          */
         public boolean isCardPlaceholder(){
-            return (this.type == TokenType.CARD_RARITY ||
-                    this.type == TokenType.CARD_CMC ||
-                    this.type == TokenType.MANA_COLOUR ||
-                    this.type == TokenType.CARD_TYPE);
+            return TokenType.CARD_PLACEHOLDER_TOKEN_TYPES.contains(this.type);
         }
 
         /** Determines if current token is a Deck Section token
@@ -536,7 +551,7 @@ public class DeckRecognizer {
             PaperCard tokenCard = token.getCard();
 
             if (isAllowed(tokenSection)) {
-                if (!tokenSection.equals(referenceDeckSectionInParsing)) {
+                if (tokenSection != referenceDeckSectionInParsing) {
                     Token sectionToken = Token.DeckSection(tokenSection.name(), this.allowedDeckSections);
                     // just check that last token is stack is a card placeholder.
                     // In that case, add the new section token before the placeholder
@@ -575,7 +590,7 @@ public class DeckRecognizer {
         refLine = purgeAllLinks(refLine);
 
         String line;
-        if (StringUtils.startsWith(refLine, LINE_COMMENT_DELIMITER_OR_MD_HEADER))
+        if (refLine.startsWith(LINE_COMMENT_DELIMITER_OR_MD_HEADER))
             line = refLine.replaceAll(LINE_COMMENT_DELIMITER_OR_MD_HEADER, "");
         else
             line = refLine.trim();  // Remove any trailing formatting
@@ -584,7 +599,7 @@ public class DeckRecognizer {
         // Final fantasy cards like Summon: Choco/Mog should be ommited to be recognized. TODO: fix maybe for future cards
         if (!line.contains("Summon:"))
             line = SEARCH_SINGLE_SLASH.matcher(line).replaceFirst(" // ");
-        if (StringUtils.startsWith(line, ASTERISK))  // markdown lists (tappedout md export)
+        if (line.startsWith(ASTERISK))  // Markdown lists (tappedout md export)
             line = line.substring(2);
 
         // == Patches to Corner Cases
@@ -600,8 +615,8 @@ public class DeckRecognizer {
         Token result = recogniseCardToken(line, referenceSection);
         if (result == null)
             result = recogniseNonCardToken(line);
-        return result != null ? result : StringUtils.startsWith(refLine, DOUBLE_SLASH) ||
-                StringUtils.startsWith(refLine, LINE_COMMENT_DELIMITER_OR_MD_HEADER) ?
+        return result != null ? result : refLine.startsWith(DOUBLE_SLASH) ||
+                refLine.startsWith(LINE_COMMENT_DELIMITER_OR_MD_HEADER) ?
                 new Token(TokenType.COMMENT, 0, refLine) : new Token(TokenType.UNKNOWN_TEXT, 0, refLine);
     }
 
@@ -613,7 +628,7 @@ public class DeckRecognizer {
         while (m.find()) {
             line = line.replaceAll(m.group(), "").trim();
         }
-        if (StringUtils.endsWith(line, "()"))
+        if (line.endsWith("()"))
             return line.substring(0, line.length()-2);
         return line;
     }
@@ -741,21 +756,12 @@ public class DeckRecognizer {
     // This would save tons of time in parsing Input + would also allow to return UnsupportedCardTokens beforehand
     private DeckSection getTokenSection(String deckSec, DeckSection currentDeckSection, PaperCard card){
         if (deckSec != null) {
-            DeckSection cardSection;
-            switch (deckSec.toUpperCase().trim()) {
-                case "MB":
-                    cardSection = DeckSection.Main;
-                    break;
-                case "SB":
-                    cardSection = DeckSection.Sideboard;
-                    break;
-                case "CM":
-                    cardSection = DeckSection.Commander;
-                    break;
-                default:
-                    cardSection = DeckSection.matchingSection(card);
-                    break;
-            }
+            DeckSection cardSection = switch (deckSec.toUpperCase().trim()) {
+                case "MB" -> DeckSection.Main;
+                case "SB" -> DeckSection.Sideboard;
+                case "CM" -> DeckSection.Commander;
+                default -> DeckSection.matchingSection(card);
+            };
             if (cardSection.validate(card))
                 return cardSection;
         }
@@ -988,80 +994,37 @@ public class DeckRecognizer {
 
     private static String getMagicColourLabel(MagicColor.Color magicColor) {
         if (magicColor == null) // Multicolour
-            return String.format("%s {W}{U}{B}{R}{G}", getLocalisedMagicColorName("Multicolour"));
-        return String.format("%s %s", magicColor.getLocalizedName(), magicColor.getSymbol());
+            return String.format("%s {W}{U}{B}{R}{G}", Localizer.getInstance().getMessage("lblMulticolor"));
+        return String.format("%s %s", magicColor.getTranslatedName(), magicColor.getSymbol());
     }
 
-    private static final HashMap<Integer, String> manaSymbolsMap = new HashMap<Integer, String>() {{
-        put(MagicColor.WHITE | MagicColor.BLUE, "WU");
-        put(MagicColor.BLUE | MagicColor.BLACK, "UB");
-        put(MagicColor.BLACK | MagicColor.RED, "BR");
-        put(MagicColor.RED | MagicColor.GREEN, "RG");
-        put(MagicColor.GREEN | MagicColor.WHITE, "GW");
-        put(MagicColor.WHITE | MagicColor.BLACK, "WB");
-        put(MagicColor.BLUE | MagicColor.RED, "UR");
-        put(MagicColor.BLACK | MagicColor.GREEN, "BG");
-        put(MagicColor.RED | MagicColor.WHITE, "RW");
-        put(MagicColor.GREEN | MagicColor.BLUE, "GU");
-    }};
-    private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2){
+    private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2) {
         if (magicColor2 == null || magicColor2 == MagicColor.Color.COLORLESS
                 || magicColor1 == MagicColor.Color.COLORLESS)
             return String.format("%s // %s", getMagicColourLabel(magicColor1), getMagicColourLabel(magicColor2));
-        String localisedName1 = magicColor1.getLocalizedName();
-        String localisedName2 = magicColor2.getLocalizedName();
-        String comboManaSymbol = manaSymbolsMap.get(magicColor1.getColormask() | magicColor2.getColormask());
-        return String.format("%s/%s {%s}", localisedName1, localisedName2, comboManaSymbol);
+        String localisedName1 = magicColor1.getTranslatedName();
+        String localisedName2 = magicColor2.getTranslatedName();
+        return String.format("%s/%s {%s}", localisedName1, localisedName2, ColorSet.fromEnums(magicColor1, magicColor2));
     }
 
     private static MagicColor.Color getMagicColor(String colorName){
         if (colorName.toLowerCase().startsWith("multi") || colorName.equalsIgnoreCase("m"))
             return null;  // will be handled separately
-
-        byte color = MagicColor.fromName(colorName.toLowerCase());
-        switch (color) {
-            case MagicColor.WHITE:
-                return MagicColor.Color.WHITE;
-            case MagicColor.BLUE:
-                return MagicColor.Color.BLUE;
-            case MagicColor.BLACK:
-                return MagicColor.Color.BLACK;
-            case MagicColor.RED:
-                return MagicColor.Color.RED;
-            case MagicColor.GREEN:
-                return MagicColor.Color.GREEN;
-            default:
-                return MagicColor.Color.COLORLESS;
-
-        }
+        return MagicColor.Color.fromByte(MagicColor.fromName(colorName.toLowerCase()));
     }
 
     public static String getLocalisedMagicColorName(String colorName){
         Localizer localizer = Localizer.getInstance();
-        switch(colorName.toLowerCase()){
-            case MagicColor.Constant.WHITE:
-                return localizer.getMessage("lblWhite");
-
-            case MagicColor.Constant.BLUE:
-                return localizer.getMessage("lblBlue");
-
-            case MagicColor.Constant.BLACK:
-                return localizer.getMessage("lblBlack");
-
-            case MagicColor.Constant.RED:
-                return localizer.getMessage("lblRed");
-
-            case MagicColor.Constant.GREEN:
-                return localizer.getMessage("lblGreen");
-
-            case MagicColor.Constant.COLORLESS:
-                return localizer.getMessage("lblColorless");
-            case "multicolour":
-            case "multicolor":
-                return localizer.getMessage("lblMulticolor");
-            default:
-                return "";
-        }
+        return switch (colorName.toLowerCase()) {
+            case MagicColor.Constant.WHITE -> localizer.getMessage("lblWhite");
+            case MagicColor.Constant.BLUE -> localizer.getMessage("lblBlue");
+            case MagicColor.Constant.BLACK -> localizer.getMessage("lblBlack");
+            case MagicColor.Constant.RED -> localizer.getMessage("lblRed");
+            case MagicColor.Constant.GREEN -> localizer.getMessage("lblGreen");
+            case MagicColor.Constant.COLORLESS -> localizer.getMessage("lblColorless");
+            case "multicolour", "multicolor" -> localizer.getMessage("lblMulticolor");
+            default -> "";
+        };
     }
 
     /**
@@ -1080,37 +1043,6 @@ public class DeckRecognizer {
 
         return "";
     }
-
-
-    private static Pair<String, String> getManaNameAndSymbol(String matchedMana) {
-        if (matchedMana == null)
-            return null;
-
-        Localizer localizer = Localizer.getInstance();
-        switch (matchedMana.toLowerCase()) {
-            case MagicColor.Constant.WHITE:
-            case "w":
-                return Pair.of(localizer.getMessage("lblWhite"), MagicColor.Color.WHITE.getSymbol());
-            case MagicColor.Constant.BLUE:
-            case "u":
-                return Pair.of(localizer.getMessage("lblBlue"), MagicColor.Color.BLUE.getSymbol());
-            case MagicColor.Constant.BLACK:
-            case "b":
-                return Pair.of(localizer.getMessage("lblBlack"), MagicColor.Color.BLACK.getSymbol());
-            case MagicColor.Constant.RED:
-            case "r":
-                return Pair.of(localizer.getMessage("lblRed"), MagicColor.Color.RED.getSymbol());
-            case MagicColor.Constant.GREEN:
-            case "g":
-                return Pair.of(localizer.getMessage("lblGreen"), MagicColor.Color.GREEN.getSymbol());
-            case MagicColor.Constant.COLORLESS:
-            case "c":
-                return Pair.of(localizer.getMessage("lblColorless"), MagicColor.Color.COLORLESS.getSymbol());
-            default: // Multicolour
-                return Pair.of(localizer.getMessage("lblMulticolor"), "");
-        }
-    }
-
     public static boolean isDeckName(final String lineAsIs) {
         if (lineAsIs == null)
             return false;
diff --git a/forge-core/src/main/java/forge/item/IPaperCard.java b/forge-core/src/main/java/forge/item/IPaperCard.java
index 9d16618c2c4..af12c23c78e 100644
--- a/forge-core/src/main/java/forge/item/IPaperCard.java
+++ b/forge-core/src/main/java/forge/item/IPaperCard.java
@@ -52,9 +52,4 @@ public interface IPaperCard extends InventoryItem, Serializable {
     default String getUntranslatedType() {
         return getRules().getType().toString();
     }
-
-    @Override
-    default String getUntranslatedOracle() {
-        return getRules().getOracleText();
-    }
 }
\ No newline at end of file
diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java
index 5796def118e..63e5642ba3e 100644
--- a/forge-core/src/main/java/forge/item/PaperCard.java
+++ b/forge-core/src/main/java/forge/item/PaperCard.java
@@ -375,7 +375,8 @@ public class PaperCard implements Comparable<IPaperCard>, InventoryItemFromSet,
                 System.out.println("PaperCard: " + name + " not found with set and index " + edition + ", " + artIndex);
                 pc = readObjectAlternate(name, edition);
                 if (pc == null) {
-                    throw new IOException(TextUtil.concatWithSpace("Card", name, "not found with set and index", edition, Integer.toString(artIndex)));
+                    pc = StaticData.instance().getCommonCards().createUnsupportedCard(name);
+                    //throw new IOException(TextUtil.concatWithSpace("Card", name, "not found with set and index", edition, Integer.toString(artIndex)));
                 }
                 System.out.println("Alternate object found: " + pc.getName() + ", " + pc.getEdition() + ", " + pc.getArtIndex());
             }
@@ -592,7 +593,7 @@ public class PaperCard implements Comparable<IPaperCard>, InventoryItemFromSet,
 
         public PaperCardFlags withMarkedColors(ColorSet markedColors) {
             if(markedColors == null)
-                markedColors = ColorSet.getNullColor();
+                markedColors = ColorSet.C;
             return new PaperCardFlags(this, markedColors, null);
         }
 
diff --git a/forge-core/src/main/java/forge/item/PaperCardPredicates.java b/forge-core/src/main/java/forge/item/PaperCardPredicates.java
index b685885baa1..449d191b9c6 100644
--- a/forge-core/src/main/java/forge/item/PaperCardPredicates.java
+++ b/forge-core/src/main/java/forge/item/PaperCardPredicates.java
@@ -57,6 +57,42 @@ public abstract class PaperCardPredicates {
         return new PredicateFoil(isFoil);
     }
 
+    /**
+     * Filters cards that were printed in any of the specified editions.
+     */
+    public static Predicate<PaperCard> printedInAnyEditions(final String[] editionCodes) {
+        Set<String> editions = new HashSet<>(Arrays.asList(editionCodes));
+
+        return card -> StaticData.instance().getCommonCards().getAllCards(card.getName()).stream()
+            .map(PaperCard::getEdition).anyMatch(editionCode ->
+                editions.contains(editionCode) &&
+                    StaticData.instance().getCardEdition(editionCode).isCardObtainable(card.getName())
+        );
+    }
+
+    /**
+     * Filters cards that only printed in any of the specified editions.
+     */
+    public static Predicate<PaperCard> onlyPrintedInEditions(final String[] editionCodes) {
+        Set<String> editions = new HashSet<>(Arrays.asList(editionCodes));
+
+        return card -> StaticData.instance().getCommonCards().getAllCards(card.getName()).stream()
+            .map(PaperCard::getEdition).allMatch(editionCode ->
+                editions.contains(editionCode) &&
+                    StaticData.instance().getCardEdition(editionCode).isCardObtainable(card.getName())
+        );
+    }
+
+    /**
+     * Filters cards that are obtainable in any edition.
+     */
+    public static Predicate<PaperCard> isObtainableAnyEdition() {
+        return card -> StaticData.instance().getCommonCards().getAllCards(card.getName()).stream()
+            .map(PaperCard::getEdition).anyMatch(editionCode ->
+                StaticData.instance().getCardEdition(editionCode).isCardObtainable(card.getName())
+            );
+    }
+
     private static final class PredicatePrintedWithRarity implements Predicate<PaperCard> {
         private final CardRarity matchingRarity;
 
@@ -76,25 +112,19 @@ public abstract class PaperCardPredicates {
     }
 
     private static final class PredicateColor implements Predicate<PaperCard> {
-        private final byte operand;
+        private final MagicColor.Color operand;
 
-        private PredicateColor(final byte color) {
+        private PredicateColor(final MagicColor.Color color) {
             this.operand = color;
         }
 
         @Override
         public boolean test(final PaperCard card) {
-            for (final byte color : card.getRules().getColor()) {
-                if (color == operand) {
-                    return true;
-                }
+            if (card.getRules().getColor().hasAnyColor(operand)) {
+                return true;
             }
-            if (card.getRules().getType().hasType(CardType.CoreType.Land)) {
-                for (final byte color : card.getRules().getColorIdentity()) {
-                    if (color == operand) {
-                        return true;
-                    }
-                }
+            if (card.getRules().getType().hasType(CardType.CoreType.Land) && card.getRules().getColorIdentity().hasAnyColor(operand)) {
+                return true;
             }
             return false;
         }
@@ -199,11 +229,11 @@ public abstract class PaperCardPredicates {
     public static final Predicate<PaperCard> IS_RARE_OR_MYTHIC = PaperCardPredicates.IS_RARE.or(PaperCardPredicates.IS_MYTHIC_RARE);
     public static final Predicate<PaperCard> IS_SPECIAL = new PredicateRarity(CardRarity.Special);
     public static final Predicate<PaperCard> IS_BASIC_LAND_RARITY = new PredicateRarity(CardRarity.BasicLand);
-    public static final Predicate<PaperCard> IS_BLACK = new PredicateColor(MagicColor.BLACK);
-    public static final Predicate<PaperCard> IS_BLUE = new PredicateColor(MagicColor.BLUE);
-    public static final Predicate<PaperCard> IS_GREEN = new PredicateColor(MagicColor.GREEN);
-    public static final Predicate<PaperCard> IS_RED = new PredicateColor(MagicColor.RED);
-    public static final Predicate<PaperCard> IS_WHITE = new PredicateColor(MagicColor.WHITE);
+    public static final Predicate<PaperCard> IS_BLACK = new PredicateColor(MagicColor.Color.BLACK);
+    public static final Predicate<PaperCard> IS_BLUE = new PredicateColor(MagicColor.Color.BLUE);
+    public static final Predicate<PaperCard> IS_GREEN = new PredicateColor(MagicColor.Color.GREEN);
+    public static final Predicate<PaperCard> IS_RED = new PredicateColor(MagicColor.Color.RED);
+    public static final Predicate<PaperCard> IS_WHITE = new PredicateColor(MagicColor.Color.WHITE);
     public static final Predicate<PaperCard> IS_COLORLESS = paperCard -> paperCard.getRules().getColor().isColorless();
     public static final Predicate<PaperCard> IS_UNREBALANCED = PaperCard::isUnRebalanced;
     public static final Predicate<PaperCard> IS_REBALANCED = PaperCard::isRebalanced;
diff --git a/forge-core/src/main/java/forge/item/PaperToken.java b/forge-core/src/main/java/forge/item/PaperToken.java
index 76f94634093..f60c5befe5c 100644
--- a/forge-core/src/main/java/forge/item/PaperToken.java
+++ b/forge-core/src/main/java/forge/item/PaperToken.java
@@ -156,7 +156,7 @@ public class PaperToken implements InventoryItemFromSet, IPaperCard {
             return false;
         CardSplitType cst = this.cardRules.getSplitType();
         //expand this on future for other tokens that has other backsides besides transform..
-        return cst == CardSplitType.Transform;
+        return cst == CardSplitType.Transform || cst == CardSplitType.Modal;
     }
 
     @Override
diff --git a/forge-core/src/main/java/forge/item/generation/BoosterGenerator.java b/forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
index ad6951478a1..2a64d6154bd 100644
--- a/forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
+++ b/forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
@@ -633,7 +633,10 @@ public class BoosterGenerator {
                 System.out.println("Parsing from main code: " + mainCode);
                 String sheetName = StringUtils.strip(mainCode.substring(10), "()\" ");
                 System.out.println("Attempting to lookup: " + sheetName);
-                src = tryGetStaticSheet(sheetName).toFlatList();
+                PrintSheet fromSheet = tryGetStaticSheet(sheetName);
+                if (fromSheet == null)
+                    throw new RuntimeException("PrintSheet Error: " + ps.getName() + " didn't find " + sheetName + " from " + mainCode);
+                src = fromSheet.toFlatList();
                 setPred = x -> true;
 
             } else if (mainCode.startsWith("promo") || mainCode.startsWith("name")) { // get exactly the named cards, that's a tiny inlined print sheet
diff --git a/forge-core/src/main/java/forge/util/ITranslatable.java b/forge-core/src/main/java/forge/util/ITranslatable.java
index 6bbba27afb3..6f75fcd96cc 100644
--- a/forge-core/src/main/java/forge/util/ITranslatable.java
+++ b/forge-core/src/main/java/forge/util/ITranslatable.java
@@ -10,13 +10,11 @@ public interface ITranslatable extends IHasName {
     default String getUntranslatedName() {
         return getName();
     }
+    default String getTranslatedName() {
+        return getName();
+    }
 
     default String getUntranslatedType() {
         return "";
     }
-
-    default String getUntranslatedOracle() {
-        return "";
-    }
-
 }
diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 358d85abb76..a6594512378 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -207,8 +207,6 @@ public class ImageUtil {
         else
             editionCode = cp.getEdition().toLowerCase();
         String cardCollectorNumber = cp.getCollectorNumber();
-        // Hack to account for variations in Arabian Nights
-        cardCollectorNumber = cardCollectorNumber.replace("+", "†");
         // override old planechase sets from their modified id since scryfall move the planechase cards outside their original setcode
         if (cardCollectorNumber.startsWith("OHOP")) {
             editionCode = "ohop";
@@ -252,6 +250,11 @@ public class ImageUtil {
                     : "&face=front");
         }
 
+        if (cardCollectorNumber.endsWith("☇")) {
+            faceParam = "&face=back";
+            cardCollectorNumber = cardCollectorNumber.substring(0, cardCollectorNumber.length() - 1);
+        }
+
         return String.format("%s/%s/%s?format=image&version=%s%s", editionCode, encodeUtf8(cardCollectorNumber),
                 langCode, versionParam, faceParam);
     }
@@ -261,6 +264,10 @@ public class ImageUtil {
         if (!faceParam.isEmpty()) {
             faceParam = (faceParam.equals("back") ? "&face=back" : "&face=front");
         }
+        if (collectorNumber.endsWith("☇")) {
+            faceParam = "&face=back";
+            collectorNumber = collectorNumber.substring(0, collectorNumber.length() - 1);
+        }
         return String.format("%s/%s/%s?format=image&version=%s%s", setCode, encodeUtf8(collectorNumber),
                 langCode, versionParam, faceParam);
     }
@@ -281,8 +288,7 @@ public class ImageUtil {
         char c;
         for (int i = 0; i < in.length(); i++) {
             c = in.charAt(i);
-            if ((c == '"') || (c == '/') || (c == ':') || (c == '?')) {
-            } else {
+            if ((c != '"') && (c != '/') && (c != ':') && (c != '?')) {
                 out.append(c);
             }
         }
diff --git a/forge-game/pom.xml b/forge-game/pom.xml
index d4c360abda8..ce1a3dd95a5 100644
--- a/forge-game/pom.xml
+++ b/forge-game/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-logback</artifactId>
-            <version>8.19.1</version>
+            <version>8.21.1</version>
         </dependency>
         <dependency>
             <groupId>org.jgrapht</groupId>
diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index f707f2b0aea..4d84640e782 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -62,7 +62,9 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
 
     /** Keys of descriptive (text) parameters. */
     private static final ImmutableList<String> descriptiveKeys = ImmutableList.<String>builder()
-            .add("Description", "SpellDescription", "StackDescription", "TriggerDescription").build();
+            .add("Description", "SpellDescription", "StackDescription", "TriggerDescription")
+            .add("ChangeTypeDesc")
+            .build();
 
     /**
      * Keys that should not changed
diff --git a/forge-game/src/main/java/forge/game/ForgeScript.java b/forge-game/src/main/java/forge/game/ForgeScript.java
index d7bfb7065f9..cf7a461f92b 100644
--- a/forge-game/src/main/java/forge/game/ForgeScript.java
+++ b/forge-game/src/main/java/forge/game/ForgeScript.java
@@ -35,7 +35,7 @@ public class ForgeScript {
         boolean withSource = property.endsWith("Source");
         final ColorSet colors;
         if (withSource && StaticAbilityColorlessDamageSource.colorlessDamageSource(cardState)) {
-            colors = ColorSet.getNullColor();
+            colors = ColorSet.C;
         } else {
             colors = cardState.getCard().getColor(cardState);
         }
@@ -166,8 +166,6 @@ public class ForgeScript {
             Card source, CardTraitBase spellAbility) {
         if (property.equals("ManaAbility")) {
             return sa.isManaAbility();
-        } else if (property.equals("nonManaAbility")) {
-            return !sa.isManaAbility();
         } else if (property.equals("withoutXCost")) {
             return !sa.costHasManaX();
         } else if (property.startsWith("XCost")) {
@@ -195,7 +193,7 @@ public class ForgeScript {
             return sa.isKeyword(Keyword.SADDLE);
         } else if (property.equals("Station")) {
             return sa.isKeyword(Keyword.STATION);
-        }else if (property.equals("Cycling")) {
+        } else if (property.equals("Cycling")) {
             return sa.isCycling();
         } else if (property.equals("Dash")) {
             return sa.isDash();
@@ -237,6 +235,8 @@ public class ForgeScript {
             return sa.isBoast();
         } else if (property.equals("Exhaust")) {
             return sa.isExhaust();
+        } else if (property.equals("Mayhem")) {
+            return sa.isMayhem();
         } else if (property.equals("Mutate")) {
             return sa.isMutate();
         } else if (property.equals("Ninjutsu")) {
@@ -410,6 +410,8 @@ public class ForgeScript {
                 return !sa.isPwAbility() && !sa.getRestrictions().isSorcerySpeed();
             }
             return true;
+        } else if(property.startsWith("NamedAbility")) {
+            return sa.getName().equals(property.substring(12));
         } else if (sa.getHostCard() != null) {
             return sa.getHostCard().hasProperty(property, sourceController, source, spellAbility);
         }
diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index 196dc753239..c9f8171f7c2 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -414,19 +414,6 @@ public class Game {
         return players;
     }
 
-    /**
-     * Gets the nonactive players who are still fighting to win, in turn order.
-     */
-    public final PlayerCollection getNonactivePlayers() {
-        // Don't use getPlayersInTurnOrder to prevent copying the player collection twice
-        final PlayerCollection players = new PlayerCollection(ingamePlayers);
-        players.remove(phaseHandler.getPlayerTurn());
-        if (!getTurnOrder().isDefaultDirection()) {
-            Collections.reverse(players);
-        }
-        return players;
-    }
-
     /**
      * Gets the players who participated in match (regardless of outcome).
      * <i>Use this in UI and after match calculations</i>
@@ -858,6 +845,8 @@ public class Game {
             p.revealFaceDownCards();
         }
 
+        // TODO free any mindslaves
+
         for (Card c : cards) {
             // CR 800.4d if card is controlled by opponent, LTB should trigger
             if (c.getOwner().equals(p) && c.getController().equals(p)) {
@@ -893,8 +882,6 @@ public class Game {
                         }
                         triggerList.put(c.getZone().getZoneType(), null, c);
                         getAction().ceaseToExist(c, false);
-                        // CR 603.2f owner of trigger source lost game
-                        getTriggerHandler().clearDelayedTrigger(c);
                     }
                 } else {
                     // return stolen permanents
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 09faddb309b..0c985d805ea 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -57,6 +57,8 @@ import forge.item.PaperCard;
 import forge.util.*;
 import forge.util.collect.FCollection;
 import forge.util.collect.FCollectionView;
+import io.sentry.Breadcrumb;
+import io.sentry.Sentry;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.jgrapht.alg.cycle.SzwarcfiterLauerSimpleCycles;
 import org.jgrapht.graph.DefaultDirectedGraph;
@@ -220,10 +222,6 @@ public class GameAction {
                     //copied.setGamePieceType(GamePieceType.COPIED_SPELL);
                 }
 
-                if (c.isTransformed()) {
-                    copied.incrementTransformedTimestamp();
-                }
-
                 if (cause != null && cause.isSpell() && c.equals(cause.getHostCard())) {
                     copied.setCastSA(cause);
                     copied.setSplitStateToPlayAbility(cause);
@@ -753,26 +751,29 @@ public class GameAction {
 
     public final Card moveTo(final ZoneType name, final Card c, final int libPosition, SpellAbility cause, Map<AbilityKey, Object> params) {
         // Call specific functions to set PlayerZone, then move onto moveTo
-        switch(name) {
-            case Hand:          return moveToHand(c, cause, params);
-            case Library:       return moveToLibrary(c, libPosition, cause, params);
-            case Battlefield:   return moveToPlay(c, c.getController(), cause, params);
-            case Graveyard:     return moveToGraveyard(c, cause, params);
-            case Exile:
-                if (!c.canExiledBy(cause, true)) {
-                    return null;
-                }
-                return exile(c, cause, params);
-            case Stack:         return moveToStack(c, cause, params);
-            case PlanarDeck:
-            case SchemeDeck:
-            case AttractionDeck:
-            case ContraptionDeck:
-                return moveToVariantDeck(c, name, libPosition, cause, params);
-            case Junkyard:
-                return moveToJunkyard(c, cause, params);
-            default: // sideboard will also get there
-                return moveTo(c.getOwner().getZone(name), c, cause);
+        try {
+            return switch (name) {
+                case Hand -> moveToHand(c, cause, params);
+                case Library -> moveToLibrary(c, libPosition, cause, params);
+                case Battlefield -> moveToPlay(c, c.getController(), cause, params);
+                case Graveyard -> moveToGraveyard(c, cause, params);
+                case Exile -> !c.canExiledBy(cause, true) ? null : exile(c, cause, params);
+                case Stack -> moveToStack(c, cause, params);
+                case PlanarDeck, SchemeDeck, AttractionDeck, ContraptionDeck -> moveToVariantDeck(c, name, libPosition, cause, params);
+                case Junkyard -> moveToJunkyard(c, cause, params);
+                default -> moveTo(c.getOwner().getZone(name), c, cause); // sideboard will also get there
+            };
+        } catch (Exception e) {
+            String msg = "GameAction:moveTo: Exception occured";
+
+            Breadcrumb bread = new Breadcrumb(msg);
+            bread.setData("Card", c.getName());
+            bread.setData("SA", cause.toString());
+            bread.setData("ZoneType", name.name());
+            bread.setData("Player", c.getOwner());
+            Sentry.addBreadcrumb(bread);
+
+            throw new RuntimeException("Error in GameAction moveTo " + c.getName() + " to Player Zone " + name.name(), e);
         }
     }
 
@@ -974,6 +975,7 @@ public class GameAction {
         // in some corner cases there's no zone yet (copied spell that failed targeting)
         if (z != null) {
             z.remove(c);
+            c.setZone(c.getOwner().getZone(ZoneType.None));
             if (z.is(ZoneType.Battlefield)) {
                 c.runLeavesPlayCommands();
             }
@@ -1600,9 +1602,7 @@ public class GameAction {
         }
 
         // recheck the game over condition at this point to make sure no other win conditions apply now.
-        if (!game.isGameOver()) {
-            checkGameOverCondition();
-        }
+        checkGameOverCondition();
 
         if (game.getAge() != GameStage.Play) {
             return false;
@@ -1822,8 +1822,8 @@ public class GameAction {
 
     private boolean stateBasedAction704_5q(Card c) {
         boolean checkAgain = false;
-        final CounterType p1p1 = CounterType.get(CounterEnumType.P1P1);
-        final CounterType m1m1 = CounterType.get(CounterEnumType.M1M1);
+        final CounterType p1p1 = CounterEnumType.P1P1;
+        final CounterType m1m1 = CounterEnumType.M1M1;
         int plusOneCounters = c.getCounters(p1p1);
         int minusOneCounters = c.getCounters(m1m1);
         if (plusOneCounters > 0 && minusOneCounters > 0) {
@@ -1843,7 +1843,7 @@ public class GameAction {
         return checkAgain;
     }
     private boolean stateBasedAction704_5r(Card c) {
-        final CounterType dreamType = CounterType.get(CounterEnumType.DREAM);
+        final CounterType dreamType = CounterEnumType.DREAM;
 
         int old = c.getCounters(dreamType);
         if (old <= 0) {
@@ -1883,6 +1883,10 @@ public class GameAction {
     }
 
     public void checkGameOverCondition() {
+        if (game.isGameOver()) {
+            return;
+        }
+
         // award loses as SBE
         GameEndReason reason = null;
         List<Player> losers = null;
@@ -2222,6 +2226,13 @@ public class GameAction {
         }
     }
 
+    public void revealUnsupported(Map<Player, List<PaperCard>> unsupported) {
+        // Notify players
+        for (Player p : game.getPlayers()) {
+            p.getController().revealUnsupported(unsupported);
+        }
+    }
+
     /** Delivers a message to all players. (use reveal to show Cards) */
     public void notifyOfValue(SpellAbility saSource, GameObject relatedTarget, String value, Player playerExcept) {
         if (saSource != null) {
diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index f9fd21b76c3..b7e2ec6d469 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -125,10 +125,22 @@ public final class GameActionUtil {
 
             // need to be done there before static abilities does reset the card
             // These Keywords depend on the Mana Cost of for Split Cards
-            if (sa.isBasicSpell() && !sa.isLandAbility()) {
+            if (sa.isBasicSpell()) {
                 for (final KeywordInterface inst : source.getKeywords()) {
                     final String keyword = inst.getOriginal();
 
+                    if (keyword.startsWith("Mayhem")) {
+                        if (!source.isInZone(ZoneType.Graveyard) || !source.wasDiscarded() || !source.enteredThisTurn()) {
+                            continue;
+                        }
+
+                        alternatives.add(getGraveyardSpellByKeyword(inst, sa, activator, AlternativeCost.Mayhem));
+                    }
+
+                    if (sa.isLandAbility()) {
+                        continue;
+                    }
+
                     if (keyword.startsWith("Escape")) {
                         if (!source.isInZone(ZoneType.Graveyard)) {
                             continue;
@@ -166,18 +178,6 @@ public final class GameActionUtil {
                         }
 
                         alternatives.add(getGraveyardSpellByKeyword(inst, sa, activator, AlternativeCost.Flashback));
-                    } else if (keyword.startsWith("Mayhem")) {
-                        if (!source.isInZone(ZoneType.Graveyard) || !source.wasDiscarded() || !source.enteredThisTurn()) {
-                            continue;
-                        }
-
-                        // if source has No Mana cost, and Mayhem doesn't have own one,
-                        // Mayhem can't work
-                        if (keyword.equals("Mayhem") && source.getManaCost().isNoCost()) {
-                            continue;
-                        }
-
-                        alternatives.add(getGraveyardSpellByKeyword(inst, sa, activator, AlternativeCost.Mayhem));
                     } else if (keyword.startsWith("Harmonize")) {
                         if (!source.isInZone(ZoneType.Graveyard)) {
                             continue;
@@ -242,6 +242,7 @@ public final class GameActionUtil {
                     }
                     stackCopy.setLastKnownZone(game.getStackZone());
                     stackCopy.setCastFrom(oldZone);
+                    stackCopy.setCastSA(sa);
                     lkicheck = true;
 
                     stackCopy.clearStaticChangedCardKeywords(false);
@@ -992,9 +993,6 @@ public final class GameActionUtil {
             oldCard.setBackSide(false);
             oldCard.setState(oldCard.getFaceupCardStateName(), true);
             oldCard.unanimateBestow();
-            if (ability.isDisturb() || ability.hasParam("CastTransformed")) {
-                oldCard.undoIncrementTransformedTimestamp();
-            }
 
             if (ability.hasParam("Prototype")) {
                 oldCard.removeCloneState(oldCard.getPrototypeTimestamp());
diff --git a/forge-game/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java
index 966c4382799..1447b1d78ad 100644
--- a/forge-game/src/main/java/forge/game/GameEntity.java
+++ b/forge-game/src/main/java/forge/game/GameEntity.java
@@ -33,17 +33,18 @@ import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
-import forge.game.card.CounterEnumType;
 import forge.game.card.CounterType;
-import forge.game.event.GameEventCardAttachment;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
+import forge.game.keyword.KeywordWithType;
 import forge.game.player.Player;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.replacement.ReplacementType;
 import forge.game.spellability.SpellAbility;
+import forge.game.staticability.StaticAbility;
 import forge.game.staticability.StaticAbilityCantAttach;
 import forge.game.zone.ZoneType;
+import forge.util.Lang;
 
 public abstract class GameEntity extends GameObject implements IIdentifiable {
     protected int id;
@@ -197,14 +198,12 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
     public final void addAttachedCard(final Card c) {
         if (attachedCards.add(c)) {
             updateAttachedCards();
-            getGame().fireEvent(new GameEventCardAttachment(c, null, this));
         }
     }
 
     public final void removeAttachedCard(final Card c) {
         if (attachedCards.remove(c)) {
             updateAttachedCards();
-            getGame().fireEvent(new GameEventCardAttachment(c, this, null));
         }
     }
 
@@ -222,63 +221,83 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         return canBeAttached(attach, sa, false);
     }
     public boolean canBeAttached(final Card attach, SpellAbility sa, boolean checkSBA) {
-        // master mode
-        if (!attach.isAttachment() || (attach.isCreature() && !attach.hasKeyword(Keyword.RECONFIGURE))
-                || equals(attach)) {
-            return false;
+        return cantBeAttachedMsg(attach, sa, checkSBA) == null;
+    }
+
+    public String cantBeAttachedMsg(final Card attach, SpellAbility sa) {
+        return cantBeAttachedMsg(attach, sa, false);
+    }
+    public String cantBeAttachedMsg(final Card attach, SpellAbility sa, boolean checkSBA) {
+        if (!attach.isAttachment()) {
+            return attach.getName() + " is not an attachment";
+        }
+        if (equals(attach)) {
+            return attach.getName() + " can't attach to itself";
+        }
+
+        if (attach.isCreature() && !attach.hasKeyword(Keyword.RECONFIGURE)) {
+            return attach.getName() + " is a creature without reconfigure";
         }
 
         if (attach.isPhasedOut()) {
-            return false;
+            return attach.getName() + " is phased out";
         }
 
-        // check for rules
-        if (attach.isAura() && !canBeEnchantedBy(attach)) {
-            return false;
+        if (attach.isAura()) {
+            String msg = cantBeEnchantedByMsg(attach);
+            if (msg != null) {
+                return msg;
+            }
         }
-        if (attach.isEquipment() && !canBeEquippedBy(attach, sa)) {
-            return false;
+        if (attach.isEquipment()) {
+            String msg = cantBeEquippedByMsg(attach, sa);
+            if (msg != null) {
+                return msg;
+            }
         }
-        if (attach.isFortification() && !canBeFortifiedBy(attach)) {
-            return false;
+        if (attach.isFortification()) {
+            String msg = cantBeFortifiedByMsg(attach);
+            if (msg != null) {
+                return msg;
+            }
         }
 
-        // check for can't attach static
-        if (StaticAbilityCantAttach.cantAttach(this, attach, checkSBA)) {
-            return false;
+        StaticAbility stAb = StaticAbilityCantAttach.cantAttach(this, attach, checkSBA);
+        if (stAb != null) {
+            return stAb.toString();
         }
 
-        // true for all
-        return true;
+        return null;
     }
 
-    protected boolean canBeEquippedBy(final Card aura, SpellAbility sa) {
-        /**
-         * Equip only to Creatures which are cards
-         */
-        return false;
-    }
-
-    protected boolean canBeFortifiedBy(final Card aura) {
+    protected String cantBeEquippedByMsg(final Card aura, SpellAbility sa) {
         /**
          * Equip only to Lands which are cards
          */
-        return false;
+        return getName() + " is not a Creature";
     }
 
-    protected boolean canBeEnchantedBy(final Card aura) {
+    protected String cantBeFortifiedByMsg(final Card fort) {
+        /**
+         * Equip only to Lands which are cards
+         */
+        return getName() + " is not a Land";
+    }
+
+    protected String cantBeEnchantedByMsg(final Card aura) {
         if (!aura.hasKeyword(Keyword.ENCHANT)) {
-            return false;
+            return "No Enchant Keyword";
         }
         for (KeywordInterface ki : aura.getKeywords(Keyword.ENCHANT)) {
-            String k = ki.getOriginal();
-            String m[] = k.split(":");
-            String v = m[1];
-            if (!isValid(v.split(","), aura.getController(), aura, null)) {
-                return false;
+            if (ki instanceof KeywordWithType kwt) {
+                String v = kwt.getValidType();
+                String desc = kwt.getTypeDescription();
+                if (!isValid(v.split(","), aura.getController(), aura, null)) {
+                    return getName() + " is not " + Lang.nounWithAmount(1, desc);
+                }
             }
         }
-        return true;
+        return null;
     }
 
     public boolean hasCounters() {
@@ -305,9 +324,6 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         Integer value = counters.get(counterName);
         return value == null ? 0 : value;
     }
-    public final int getCounters(final CounterEnumType counterType) {
-        return getCounters(CounterType.get(counterType));
-    }
 
     public void setCounters(final CounterType counterType, final Integer num) {
         if (num <= 0) {
@@ -316,9 +332,6 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
             counters.put(counterType, num);
         }
     }
-    public void setCounters(final CounterEnumType counterType, final Integer num) {
-        setCounters(CounterType.get(counterType), num);
-    }
 
     abstract public void setCounters(final Map<CounterType, Integer> allCounters);
 
@@ -328,10 +341,6 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
     abstract public int subtractCounter(final CounterType counterName, final int n, final Player remover);
     abstract public void clearCounters();
 
-    public boolean canReceiveCounters(final CounterEnumType type) {
-        return canReceiveCounters(CounterType.get(type));
-    }
-
     public final void addCounter(final CounterType counterType, int n, final Player source, GameEntityCounterTable table) {
         if (n <= 0 || !canReceiveCounters(counterType)) {
             // As per rule 107.1b
@@ -351,18 +360,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         table.put(source, this, counterType, n);
     }
 
-    public final void addCounter(final CounterEnumType counterType, final int n, final Player source, GameEntityCounterTable table) {
-        addCounter(CounterType.get(counterType), n, source, table);
-    }
-
-    public int subtractCounter(final CounterEnumType counterName, final int n, final Player remover) {
-        return subtractCounter(CounterType.get(counterName), n, remover);
-    }
-
     abstract public void addCounterInternal(final CounterType counterType, final int n, final Player source, final boolean fireEvents, GameEntityCounterTable table, Map<AbilityKey, Object> params);
-    public void addCounterInternal(final CounterEnumType counterType, final int n, final Player source, final boolean fireEvents, GameEntityCounterTable table, Map<AbilityKey, Object> params) {
-        addCounterInternal(CounterType.get(counterType), n, source, fireEvents, table, params);
-    }
     public Integer getCounterMax(final CounterType counterType) {
         return null;
     }
diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java
index 2a2c60eb227..7adab70f9a2 100644
--- a/forge-game/src/main/java/forge/game/GameLogFormatter.java
+++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java
@@ -29,25 +29,25 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
     @Override
     public GameLogEntry visit(GameEventGameOutcome ev) {
         // Turn number counted from the starting player
-        int lastTurn = (int)Math.ceil((float)ev.result.getLastTurnNumber() / 2.0);
+        int lastTurn = (int)Math.ceil((float)ev.result().getLastTurnNumber() / 2.0);
         log.add(GameLogEntryType.GAME_OUTCOME, localizer.getMessage("lblTurn") + " " + lastTurn);
 
-        for (String outcome : ev.result.getOutcomeStrings()) {
+        for (String outcome : ev.result().getOutcomeStrings()) {
             log.add(GameLogEntryType.GAME_OUTCOME, outcome);
         }
-        return generateSummary(ev.history);
+        return generateSummary(ev.history());
     }
 
     @Override
     public GameLogEntry visit(GameEventScry ev) {
         String scryOutcome = "";
 
-        if (ev.toTop > 0 && ev.toBottom > 0) {
-            scryOutcome = localizer.getMessage("lblLogScryTopBottomLibrary").replace("%s", ev.player.toString()).replace("%top", String.valueOf(ev.toTop)).replace("%bottom", String.valueOf(ev.toBottom));
-        } else if (ev.toBottom == 0) {
-            scryOutcome = localizer.getMessage("lblLogScryTopLibrary").replace("%s", ev.player.toString()).replace("%top", String.valueOf(ev.toTop));
+        if (ev.toTop() > 0 && ev.toBottom() > 0) {
+            scryOutcome = localizer.getMessage("lblLogScryTopBottomLibrary").replace("%s", ev.player().toString()).replace("%top", String.valueOf(ev.toTop())).replace("%bottom", String.valueOf(ev.toBottom()));
+        } else if (ev.toBottom() == 0) {
+            scryOutcome = localizer.getMessage("lblLogScryTopLibrary").replace("%s", ev.player().toString()).replace("%top", String.valueOf(ev.toTop()));
         } else {
-            scryOutcome = localizer.getMessage("lblLogScryBottomLibrary").replace("%s", ev.player.toString()).replace("%bottom", String.valueOf(ev.toBottom));
+            scryOutcome = localizer.getMessage("lblLogScryBottomLibrary").replace("%s", ev.player().toString()).replace("%bottom", String.valueOf(ev.toBottom()));
         }
 
         return new GameLogEntry(GameLogEntryType.STACK_RESOLVE, scryOutcome);
@@ -57,12 +57,12 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
     public GameLogEntry visit(GameEventSurveil ev) {
         String surveilOutcome = "";
 
-        if (ev.toLibrary > 0 && ev.toGraveyard > 0) {
-            surveilOutcome = localizer.getMessage("lblLogSurveiledToLibraryGraveyard", ev.player.toString(), String.valueOf(ev.toLibrary), String.valueOf(ev.toGraveyard));
-        } else if (ev.toGraveyard == 0) {
-            surveilOutcome = localizer.getMessage("lblLogSurveiledToLibrary", ev.player.toString(), String.valueOf(ev.toLibrary));
+        if (ev.toLibrary() > 0 && ev.toGraveyard() > 0) {
+            surveilOutcome = localizer.getMessage("lblLogSurveiledToLibraryGraveyard", ev.player().toString(), String.valueOf(ev.toLibrary()), String.valueOf(ev.toGraveyard()));
+        } else if (ev.toGraveyard() == 0) {
+            surveilOutcome = localizer.getMessage("lblLogSurveiledToLibrary", ev.player().toString(), String.valueOf(ev.toLibrary()));
         } else {
-            surveilOutcome = localizer.getMessage("lblLogSurveiledToGraveyard", ev.player.toString(), String.valueOf(ev.toGraveyard));
+            surveilOutcome = localizer.getMessage("lblLogSurveiledToGraveyard", ev.player().toString(), String.valueOf(ev.toGraveyard()));
         }
 
         return new GameLogEntry(GameLogEntryType.STACK_RESOLVE, surveilOutcome);
@@ -70,26 +70,26 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventSpellResolved ev) {
-        String messageForLog = ev.hasFizzled ? localizer.getMessage("lblLogCardAbilityFizzles", ev.spell.getHostCard().toString()) : ev.spell.getStackDescription();
+        String messageForLog = ev.hasFizzled() ? localizer.getMessage("lblLogCardAbilityFizzles", ev.spell().getHostCard().toString()) : ev.spell().getStackDescription();
         return new GameLogEntry(GameLogEntryType.STACK_RESOLVE, messageForLog);
     }
 
     @Override
     public GameLogEntry visit(GameEventSpellAbilityCast event) {
-        String player = event.sa.getActivatingPlayer().getName();
-        String action = event.sa.isSpell() ? localizer.getMessage("lblCast")
-                : event.sa.isTrigger() ? localizer.getMessage("lblTriggered")
+        String player = event.sa().getActivatingPlayer().getName();
+        String action = event.sa().isSpell() ? localizer.getMessage("lblCast")
+                : event.sa().isTrigger() ? localizer.getMessage("lblTriggered")
                         : localizer.getMessage("lblActivated");
-        String object = event.si.getStackDescription().startsWith("Morph ")
+        String object = event.si().getStackDescription().startsWith("Morph ")
                 ? localizer.getMessage("lblMorph")
-                : event.sa.getHostCard().toString();
+                : event.sa().getHostCard().toString();
 
         String messageForLog = "";
 
-        if (event.sa.getTargetRestrictions() != null) {
+        if (event.sa().getTargetRestrictions() != null) {
             StringBuilder sb = new StringBuilder();
 
-            for (TargetChoices ch : event.sa.getAllTargetChoices()) {
+            for (TargetChoices ch : event.sa().getAllTargetChoices()) {
                 if (null != ch) {
                     sb.append(ch);
                 }
@@ -104,18 +104,18 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventCardModeChosen ev) {
-        if (!ev.log) {
+        if (!ev.log()) {
             return null;
         }
 
         String modeChoiceOutcome;
-        if (ev.random) {
-            modeChoiceOutcome = localizer.getMessage("lblLogRandomMode", ev.cardName, ev.mode);
+        if (ev.random()) {
+            modeChoiceOutcome = localizer.getMessage("lblLogRandomMode", ev.cardName(), ev.mode());
         } else {
             modeChoiceOutcome = localizer.getMessage("lblLogPlayerChosenModeForCard",
-                    ev.player.toString(), ev.mode, ev.cardName);
+                    ev.player().toString(), ev.mode(), ev.cardName());
         }
-        String name = CardTranslation.getTranslatedName(ev.cardName);
+        String name = CardTranslation.getTranslatedName(ev.cardName());
         modeChoiceOutcome = TextUtil.fastReplace(modeChoiceOutcome, "CARDNAME", name);
         modeChoiceOutcome = TextUtil.fastReplace(modeChoiceOutcome, "NICKNAME",
                 Lang.getInstance().getNickName(name));
@@ -124,7 +124,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventRandomLog ev) {
-        return new GameLogEntry(GameLogEntryType.STACK_RESOLVE, ev.message);
+        return new GameLogEntry(GameLogEntryType.STACK_RESOLVE, ev.message());
     }
 
     private static GameLogEntry generateSummary(final Collection<GameOutcome> gamesPlayed) {
@@ -152,8 +152,8 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(final GameEventPlayerControl event) {
-        final LobbyPlayer newLobbyPlayer = event.newLobbyPlayer;
-        final Player p = event.player;
+        final LobbyPlayer newLobbyPlayer = event.newLobbyPlayer();
+        final Player p = event.player();
 
         final String message;
         if (newLobbyPlayer == null) {
@@ -166,23 +166,23 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventTurnPhase ev) {
-        Player p = ev.playerTurn;
-        return new GameLogEntry(GameLogEntryType.PHASE, ev.phaseDesc + Lang.getInstance().getPossessedObject(p.getName(), ev.phase.nameForUi));
+        Player p = ev.playerTurn();
+        return new GameLogEntry(GameLogEntryType.PHASE, ev.phaseDesc() + Lang.getInstance().getPossessedObject(p.getName(), ev.phase().nameForUi));
     }
 
     @Override
     public GameLogEntry visit(GameEventCardDamaged event) {
         String additionalLog = "";
-        if (event.type == DamageType.Deathtouch) {
+        if (event.type() == DamageType.Deathtouch) {
             additionalLog = localizer.getMessage("lblDeathtouch");
         }
-        if (event.type == DamageType.M1M1Counters) {
+        if (event.type() == DamageType.M1M1Counters) {
             additionalLog = localizer.getMessage("lblAsM1M1Counters");
         }
-        if (event.type == DamageType.LoyaltyLoss) {
-            additionalLog = localizer.getMessage("lblRemovingNLoyaltyCounter", String.valueOf(event.amount));
+        if (event.type() == DamageType.LoyaltyLoss) {
+            additionalLog = localizer.getMessage("lblRemovingNLoyaltyCounter", String.valueOf(event.amount()));
         }
-        String message = localizer.getMessage("lblSourceDealsNDamageToDest", event.source.toString(), String.valueOf(event.amount), additionalLog, event.card.toString());
+        String message = localizer.getMessage("lblSourceDealsNDamageToDest", event.source().toString(), String.valueOf(event.amount()), additionalLog, event.card().toString());
         return new GameLogEntry(GameLogEntryType.DAMAGE, message);
     }
 
@@ -191,43 +191,43 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
      */
     @Override
     public GameLogEntry visit(GameEventLandPlayed ev) {
-        String message = localizer.getMessage("lblLogPlayerPlayedLand", ev.player.toString(), ev.land.toString());
+        String message = localizer.getMessage("lblLogPlayerPlayedLand", ev.player().toString(), ev.land().toString());
         return new GameLogEntry(GameLogEntryType.LAND, message);
     }
 
     @Override
     public GameLogEntry visit(GameEventTurnBegan event) {
-        String message = localizer.getMessage("lblLogTurnNOwnerByPlayer", String.valueOf(event.turnNumber), event.turnOwner.toString());
+        String message = localizer.getMessage("lblLogTurnNOwnerByPlayer", String.valueOf(event.turnNumber()), event.turnOwner().toString());
         return new GameLogEntry(GameLogEntryType.TURN, message);
     }
 
     @Override
     public GameLogEntry visit(GameEventPlayerDamaged ev) {
-        String extra = ev.infect ? localizer.getMessage("lblLogAsPoisonCounters") : "";
-        String damageType = ev.combat ? localizer.getMessage("lblCombat") : localizer.getMessage("lblNonCombat");
-        String message = localizer.getMessage("lblLogSourceDealsNDamageOfTypeToDest", ev.source.toString(),
-                            String.valueOf(ev.amount), damageType, ev.target.toString(), extra);
+        String extra = ev.infect() ? localizer.getMessage("lblLogAsPoisonCounters") : "";
+        String damageType = ev.combat() ? localizer.getMessage("lblCombat") : localizer.getMessage("lblNonCombat");
+        String message = localizer.getMessage("lblLogSourceDealsNDamageOfTypeToDest", ev.source().toString(),
+                            String.valueOf(ev.amount()), damageType, ev.target().toString(), extra);
         return new GameLogEntry(GameLogEntryType.DAMAGE, message);
     }
 
     @Override
     public GameLogEntry visit(GameEventPlayerPoisoned ev) {
         String message = localizer.getMessage("lblLogPlayerReceivesNPosionCounterFrom",
-                            ev.receiver.toString(), String.valueOf(ev.amount), ev.source.toString());
+                            ev.receiver().toString(), String.valueOf(ev.amount()), ev.source().toString());
         return new GameLogEntry(GameLogEntryType.DAMAGE, message);
     }
 
     @Override
     public GameLogEntry visit(GameEventPlayerRadiation ev) {
         String message;
-        final int change = ev.change;
+        final int change = ev.change();
         String radCtr = CounterEnumType.RAD.getName().toLowerCase() + " " +
                 Localizer.getInstance().getMessage("lblCounter").toLowerCase();
         if (change >= 0) message = localizer.getMessage("lblLogPlayerRadiation",
-                ev.receiver.toString(), Lang.nounWithNumeralExceptOne(String.valueOf(change), radCtr),
-                ev.source.toString());
+                ev.receiver().toString(), Lang.nounWithNumeralExceptOne(String.valueOf(change), radCtr),
+                ev.source().toString());
         else message = localizer.getMessage("lblLogPlayerRadRemove",
-                ev.receiver.toString(), Lang.nounWithNumeralExceptOne(String.valueOf(Math.abs(change)), radCtr));
+                ev.receiver().toString(), Lang.nounWithNumeralExceptOne(String.valueOf(Math.abs(change)), radCtr));
         return new GameLogEntry(GameLogEntryType.DAMAGE, message);
     }
 
@@ -239,16 +239,16 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
         // Append Defending Player/Planeswalker
 
         // Not a big fan of the triple nested loop here
-        for (GameEntity k : ev.attackersMap.keySet()) {
-            Collection<Card> attackers = ev.attackersMap.get(k);
+        for (GameEntity k : ev.attackersMap().keySet()) {
+            Collection<Card> attackers = ev.attackersMap().get(k);
             if (attackers == null || attackers.isEmpty()) {
                 continue;
             }
             if (sb.length() > 0) sb.append("\n");
-            sb.append(localizer.getMessage("lblLogPlayerAssignedAttackerToAttackTarget", ev.player, Lang.joinHomogenous(attackers), k));
+            sb.append(localizer.getMessage("lblLogPlayerAssignedAttackerToAttackTarget", ev.player(), Lang.joinHomogenous(attackers), k));
         }
         if (sb.length() == 0) {
-            sb.append(localizer.getMessage("lblPlayerDidntAttackThisTurn").replace("%s", ev.player.toString()));
+            sb.append(localizer.getMessage("lblPlayerDidntAttackThisTurn").replace("%s", ev.player().toString()));
         }
         return new GameLogEntry(GameLogEntryType.COMBAT, sb.toString());
     }
@@ -262,7 +262,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
         Collection<Card> blockers = null;
 
-        for (Entry<GameEntity, MapOfLists<Card, Card>> kv : ev.blockers.entrySet()) {
+        for (Entry<GameEntity, MapOfLists<Card, Card>> kv : ev.blockers().entrySet()) {
             GameEntity defender = kv.getKey();
             MapOfLists<Card, Card> attackers = kv.getValue();
             if (attackers == null || attackers.isEmpty()) {
@@ -298,7 +298,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventMulligan ev) {
-        String message = localizer.getMessage("lblPlayerHasMulliganedDownToNCards").replace("%d", String.valueOf(ev.player.getZone(ZoneType.Hand).size())).replace("%s", ev.player.toString());
+        String message = localizer.getMessage("lblPlayerHasMulliganedDownToNCards").replace("%d", String.valueOf(ev.player().getZone(ZoneType.Hand).size())).replace("%s", ev.player().toString());
         return new GameLogEntry(GameLogEntryType.MULLIGAN, message);
     }
 
diff --git a/forge-game/src/main/java/forge/game/GameRules.java b/forge-game/src/main/java/forge/game/GameRules.java
index f36ccef565c..c38b6c113c9 100644
--- a/forge-game/src/main/java/forge/game/GameRules.java
+++ b/forge-game/src/main/java/forge/game/GameRules.java
@@ -15,6 +15,7 @@ public class GameRules {
     private boolean AISideboardingEnabled = false;
     private boolean sideboardForAI = false;
     private final Set<GameType> appliedVariants = EnumSet.noneOf(GameType.class);
+    private int simTimeout = 120;
 
     // it's a preference, not rule... but I could hardly find a better place for it
     private boolean useGrayText;
@@ -124,4 +125,12 @@ public class GameRules {
     public void setWarnAboutAICards(final boolean warnAboutAICards) {
         this.warnAboutAICards = warnAboutAICards;
     }
+
+    public int getSimTimeout() {
+        return this.simTimeout;
+    }
+
+    public void setSimTimeout(final int duration) {
+        this.simTimeout = duration;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/GameView.java b/forge-game/src/main/java/forge/game/GameView.java
index 2c5540db3dd..db597afa820 100644
--- a/forge-game/src/main/java/forge/game/GameView.java
+++ b/forge-game/src/main/java/forge/game/GameView.java
@@ -215,6 +215,7 @@ public class GameView extends TrackableObject {
     }
     public void setDependencies(Table<StaticAbility, StaticAbility, Set<StaticAbilityLayer>> dependencies) {
         if (dependencies.isEmpty()) {
+            set(TrackableProperty.Dependencies, "");
             return;
         }
         StringBuilder sb = new StringBuilder();
diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java
index 2c5b7e3605e..90759e6274c 100644
--- a/forge-game/src/main/java/forge/game/Match.java
+++ b/forge-game/src/main/java/forge/game/Match.java
@@ -23,6 +23,7 @@ import forge.item.PaperCard;
 import forge.util.Localizer;
 import forge.util.MyRandom;
 import forge.util.collect.FCollectionView;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -224,6 +225,7 @@ public class Match {
         // friendliness
         Map<Player, Map<DeckSection, List<? extends PaperCard>>> rAICards = new HashMap<>();
         Multimap<Player, PaperCard> removedAnteCards = ArrayListMultimap.create();
+        Map<Player, List<PaperCard>> unsupported = new HashMap<>();
 
         final FCollectionView<Player> players = game.getPlayers();
         final List<RegisteredPlayer> playersConditions = game.getMatch().getPlayers();
@@ -288,22 +290,32 @@ public class Match {
                 }
             }
 
-            Deck myDeck = psc.getDeck();
-            player.setDraftNotes(myDeck.getDraftNotes());
+            Deck toCheck = psc.getDeck();
+            if (toCheck == null) {
+                try {
+                    System.err.println(psc.getPlayer().getName() + " Deck is NULL...");
+                    int val = rules.getGameType().getDeckFormat().getMainRange().getMinimum();
+                    toCheck = new Deck("NULL");
+                    if (val > 0)
+                        toCheck.getMain().add("Wastes", val);
+                } catch (Exception ignored) {}
+            }
+            Pair<Deck, List<PaperCard>> myDeck = toCheck.getValid();
+            player.setDraftNotes(myDeck.getLeft().getDraftNotes());
 
             Set<PaperCard> myRemovedAnteCards = null;
             if (!rules.useAnte()) {
-                myRemovedAnteCards = getRemovedAnteCards(myDeck);
+                myRemovedAnteCards = getRemovedAnteCards(myDeck.getLeft());
                 for (PaperCard cp: myRemovedAnteCards) {
-                    for (Entry<DeckSection, CardPool> ds : myDeck) {
+                    for (Entry<DeckSection, CardPool> ds : myDeck.getLeft()) {
                         ds.getValue().removeAll(cp);
                     }
                 }
             }
 
-            preparePlayerZone(player, ZoneType.Library, myDeck.getMain(), psc.useRandomFoil());
-            if (myDeck.has(DeckSection.Sideboard)) {
-                preparePlayerZone(player, ZoneType.Sideboard, myDeck.get(DeckSection.Sideboard), psc.useRandomFoil());
+            preparePlayerZone(player, ZoneType.Library, myDeck.getLeft().getMain(), psc.useRandomFoil());
+            if (myDeck.getLeft().has(DeckSection.Sideboard)) {
+                preparePlayerZone(player, ZoneType.Sideboard, myDeck.getLeft().get(DeckSection.Sideboard), psc.useRandomFoil());
 
                 // Assign Companion
                 Card companion = player.assignCompanion(game, person);
@@ -322,7 +334,7 @@ public class Match {
             player.shuffle(null);
 
             if (isFirstGame) {
-                Map<DeckSection, List<? extends PaperCard>> cardsComplained = player.getController().complainCardsCantPlayWell(myDeck);
+                Map<DeckSection, List<? extends PaperCard>> cardsComplained = player.getController().complainCardsCantPlayWell(myDeck.getLeft());
                 if (cardsComplained != null && !cardsComplained.isEmpty()) {
                     rAICards.put(player, cardsComplained);
                 }
@@ -337,6 +349,7 @@ public class Match {
             if (myRemovedAnteCards != null && !myRemovedAnteCards.isEmpty()) {
                 removedAnteCards.putAll(player, myRemovedAnteCards);
             }
+            unsupported.put(player, myDeck.getRight());
         }
 
         final Localizer localizer = Localizer.getInstance();
@@ -347,6 +360,10 @@ public class Match {
         if (!removedAnteCards.isEmpty()) {
             game.getAction().revealAnte(localizer.getMessage("lblAnteCardsRemoved"), removedAnteCards);
         }
+
+        if (!unsupported.isEmpty()) {
+            game.getAction().revealUnsupported(unsupported);
+        }
     }
 
     private void executeAnte(Game lastGame) {
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
index 4b452a7620c..f0c89aa25d2 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
@@ -239,6 +239,10 @@ public final class AbilityFactory {
             spellAbility.putParam("PrecostDesc", "Exhaust — ");
         }
 
+        if (mapParams.containsKey("Named")) {
+            spellAbility.setName(mapParams.get("Named"));
+        }
+
         // *********************************************
         // set universal properties of the SpellAbility
 
@@ -359,9 +363,6 @@ public final class AbilityFactory {
         if (mapParams.containsKey("TargetUnique")) {
             abTgt.setUniqueTargets(true);
         }
-        if (mapParams.containsKey("TargetsFromSingleZone")) {
-            abTgt.setSingleZone(true);
-        }
         if (mapParams.containsKey("TargetsWithoutSameCreatureType")) {
             abTgt.setWithoutSameCreatureType(true);
         }
@@ -383,6 +384,9 @@ public final class AbilityFactory {
         if (mapParams.containsKey("TargetsWithDifferentCMC")) {
             abTgt.setDifferentCMC(true);
         }
+        if (mapParams.containsKey("TargetsWithDifferentNames")) {
+            abTgt.setDifferentNames(true);
+        }
         if (mapParams.containsKey("TargetsWithEqualToughness")) {
             abTgt.setEqualToughness(true);
         }
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 94d1d10f119..2f8d310fcc7 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -43,7 +43,6 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 public class AbilityUtils {
     private final static ImmutableList<String> cmpList = ImmutableList.of("LT", "LE", "EQ", "GE", "GT", "NE");
 
@@ -523,6 +522,8 @@ public class AbilityUtils {
             }
         } else if (calcX[0].equals("OriginalHost")) {
             val = xCount(ability.getOriginalHost(), calcX[1], ability);
+        } else if (calcX[0].equals("DungeonsCompleted")) {
+            val = handlePaid(player.getCompletedDungeons(), calcX[1], card, ability);
         } else if (calcX[0].startsWith("ExiledWith")) {
             val = handlePaid(card.getExiledCards(), calcX[1], card, ability);
         } else if (calcX[0].startsWith("Convoked")) {
@@ -1870,6 +1871,14 @@ public class AbilityUtils {
                     }
                     return doXMath(v, expr, c, ctb);
                 }
+                
+                // Count$FromNamedAbility[abilityName].<True>.<False>
+                if (sq[0].startsWith("FromNamedAbility")) {
+                    String abilityNamed = sq[0].substring(16);
+                    SpellAbility trigSA = sa.getHostCard().getCastSA();
+                    boolean fromNamedAbility = trigSA != null && trigSA.getName().equals(abilityNamed);
+                    return doXMath(calculateAmount(c, sq[fromNamedAbility ? 1 : 2], ctb), expr, c, ctb);
+                }
             } else {
                 // fallback if ctb isn't a spellability
                 if (sq[0].startsWith("LastStateBattlefield")) {
@@ -2534,34 +2543,13 @@ public class AbilityUtils {
             return doXMath(CardLists.getValidCardCount(game.getLeftGraveyardThisTurn(), validFilter, player, c, ctb), expr, c, ctb);
         }
 
-        // Count$UnlockedDoors <Valid>
-        if (sq[0].startsWith("UnlockedDoors")) {
-            final String[] workingCopy = l[0].split(" ", 2);
-            final String validFilter = workingCopy[1];
-
-            int unlocked = 0;
-            for (Card doorCard : CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), validFilter, player, c, ctb)) {
-                unlocked += doorCard.getUnlockedRooms().size();
-            }
-
-            return doXMath(unlocked, expr, c, ctb);
+        if (sq[0].equals("UnlockedDoors")) {
+            return doXMath(player.getUnlockedDoors().size(), expr, c, ctb);
         }
 
-        // Count$DistinctUnlockedDoors <Valid>
         // Counts the distinct names of unlocked doors. Used for the "Promising Stairs"
-        if (sq[0].startsWith("DistinctUnlockedDoors")) {
-            final String[] workingCopy = l[0].split(" ", 2);
-            final String validFilter = workingCopy[1];
-
-            Set<String> viewedNames = new HashSet<>();
-            for (Card doorCard : CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), validFilter, player, c, ctb)) {
-                for(CardStateName stateName : doorCard.getUnlockedRooms()) {
-                    viewedNames.add(doorCard.getState(stateName).getName());
-                }
-            }
-            int distinctUnlocked = viewedNames.size();
-
-            return doXMath(distinctUnlocked, expr, c, ctb);
+        if (sq[0].equals("DistinctUnlockedDoors")) {
+            return doXMath(Sets.newHashSet(player.getUnlockedDoors()).size(), expr, c, ctb);
         }
 
         // Manapool
@@ -2881,21 +2869,6 @@ public class AbilityUtils {
             return max;
         }
 
-        if (sq[0].startsWith("DifferentCardNames_")) {
-            final List<String> crdname = Lists.newArrayList();
-            final String restriction = l[0].substring(19);
-            CardCollection list = CardLists.getValidCards(game.getCardsInGame(), restriction, player, c, ctb);
-            // TODO rewrite with sharesName to respect Spy Kit
-            for (final Card card : list) {
-                String name = card.getName();
-                // CR 201.2b Those objects have different names only if each of them has at least one name and no two objects in that group have a name in common
-                if (!crdname.contains(name) && !name.isEmpty()) {
-                    crdname.add(name);
-                }
-            }
-            return doXMath(crdname.size(), expr, c, ctb);
-        }
-
         if (sq[0].startsWith("MostProminentCreatureType")) {
             String restriction = l[0].split(" ")[1];
             CardCollection list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), restriction, player, c, ctb);
@@ -2910,13 +2883,6 @@ public class AbilityUtils {
         }
 
         // TODO move below to handlePaid
-        if (sq[0].startsWith("SumPower")) {
-            final String[] restrictions = l[0].split("_");
-            int sumPower = game.getCardsIn(ZoneType.Battlefield).stream()
-                    .filter(CardPredicates.restriction(restrictions[1], player, c, ctb))
-                    .mapToInt(Card::getNetPower).sum();
-            return doXMath(sumPower, expr, c, ctb);
-        }
         if (sq[0].startsWith("DifferentPower_")) {
             final String restriction = l[0].substring(15);
             final int uniquePowers = (int) game.getCardsIn(ZoneType.Battlefield).stream()
@@ -3436,6 +3402,7 @@ public class AbilityUtils {
     }
 
     public static int playerXProperty(final Player player, final String s, final Card source, CardTraitBase ctb) {
+
         final String[] l = s.split("/");
         final String m = CardFactoryUtil.extractOperators(s);
 
@@ -3622,46 +3589,10 @@ public class AbilityUtils {
             return doXMath(player.hasBeenDealtCombatDamageSinceLastTurn() ? 1 : 0, m, source, ctb);
         }
 
-        if (value.equals("DungeonsCompleted")) {
-            return doXMath(player.getCompletedDungeons().size(), m, source, ctb);
-        }
-
         if (value.equals("RingTemptedYou")) {
             return doXMath(player.getNumRingTemptedYou(), m, source, ctb);
         }
 
-        if (value.startsWith("DungeonCompletedNamed")) {
-            String [] full = value.split("_");
-            String name = full[1];
-            int completed = 0;
-            List<Card> dungeons = player.getCompletedDungeons();
-            for (Card c : dungeons) {
-                if (c.getName().equals(name)) {
-                    ++completed;
-                }
-            }
-            return doXMath(completed, m, source, ctb);
-        }
-        if (value.equals("DifferentlyNamedDungeonsCompleted")) {
-            int amount = 0;
-            List<Card> dungeons = player.getCompletedDungeons();
-            for (int i = 0; i < dungeons.size(); ++i) {
-                Card d1 = dungeons.get(i);
-                boolean hasSameName = false;
-                for (int j = i - 1; j >= 0; --j) {
-                    Card d2 = dungeons.get(j);
-                    if (d1.getName().equals(d2.getName())) {
-                        hasSameName = true;
-                        break;
-                    }
-                }
-                if (!hasSameName) {
-                    ++amount;
-                }
-            }
-            return doXMath(amount, m, source, ctb);
-        }
-
         if (value.equals("AttractionsVisitedThisTurn")) {
             return doXMath(player.getAttractionsVisitedThisTurn(), m, source, ctb);
         }
@@ -3740,10 +3671,6 @@ public class AbilityUtils {
             return CardLists.getTotalPower(paidList, ctb);
         }
 
-        if (string.startsWith("SumToughness")) {
-            return Aggregates.sum(paidList, Card::getNetToughness);
-        }
-
         if (string.startsWith("GreatestCMC")) {
             return Aggregates.max(paidList, Card::getCMC);
         }
@@ -3752,6 +3679,10 @@ public class AbilityUtils {
             return CardUtil.getColorsFromCards(paidList).countColors();
         }
 
+        if (string.startsWith("DifferentCardNames")) {
+            return doXMath(CardLists.getDifferentNamesCount(paidList), CardFactoryUtil.extractOperators(string), source, ctb);
+        }
+
         if (string.equals("DifferentColorPair")) {
             final Set<ColorSet> diffPair = new HashSet<>();
             for (final Card card : paidList) {
diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 96bc1c9c6e1..f9e8358fa23 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -1069,7 +1069,7 @@ public abstract class SpellAbilityEffect {
         // if ability was granted use that source so they can be kept apart later
         if (cause.isCopiedTrait()) {
             exilingSource = cause.getOriginalHost();
-        } else if (cause.getKeyword() != null && cause.getKeyword().getStatic() != null) {
+        } else if (!cause.isSpell() && cause.getKeyword() != null && cause.getKeyword().getStatic() != null) {
             exilingSource = cause.getKeyword().getStatic().getOriginalHost();
         }
         movedCard.setExiledWith(exilingSource);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AirbendEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AirbendEffect.java
index a32995cd92d..bfb9f8b85d9 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AirbendEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AirbendEffect.java
@@ -20,14 +20,14 @@ public class AirbendEffect extends SpellAbilityEffect {
     @Override
     protected String getStackDescription(SpellAbility sa) {
         final StringBuilder sb = new StringBuilder("Airbend ");
-        
+
         Iterable<Card> tgts;
         if (sa.usesTargeting()) {
             tgts = getCardsfromTargets(sa);
         } else { // otherwise add self to list and go from there
             tgts = sa.knownDetermineDefined(sa.getParam("Defined"));
         }
-        
+
         sb.append(sa.getParamOrDefault("DefinedDesc", Lang.joinHomogenous(tgts)));
         sb.append(".");
         if (Iterables.size(tgts) > 1) {
@@ -46,7 +46,7 @@ public class AirbendEffect extends SpellAbilityEffect {
         final Player pl = sa.getActivatingPlayer();
 
         final CardZoneTable triggerList = CardZoneTable.getSimultaneousInstance(sa);
-        
+
         for (Card c : getTargetCards(sa)) {
             final Card gameCard = game.getCardState(c, null);
             // gameCard is LKI in that case, the card is not in game anymore
@@ -55,7 +55,7 @@ public class AirbendEffect extends SpellAbilityEffect {
             if (gameCard == null || !c.equalsWithGameTimestamp(gameCard) || gameCard.isPhasedOut()) {
                 continue;
             }
-            
+
             if (!gameCard.canExiledBy(sa, true)) {
                 continue;
             }
@@ -86,7 +86,7 @@ public class AirbendEffect extends SpellAbilityEffect {
         }
         triggerList.triggerChangesZoneAll(game, sa);
         handleExiledWith(triggerList.allCards(), sa);
-        
+
         pl.triggerElementalBend(TriggerType.Airbend);
     }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AlterAttributeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AlterAttributeEffect.java
index 79ad1993dc2..14ae5d11caf 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AlterAttributeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AlterAttributeEffect.java
@@ -46,6 +46,9 @@ public class AlterAttributeEffect extends SpellAbilityEffect {
                 boolean altered = false;
 
                 switch (attr.trim()) {
+                    case "Harnessed":
+                        altered = gameCard.setHarnessed(activate);
+                        break;
                     case "Plotted":
                         altered = gameCard.setPlotted(activate);
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java
index 848e5fb87ca..1eafcfab5b0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java
@@ -17,7 +17,6 @@ import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardZoneTable;
 import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.card.token.TokenInfo;
 import forge.game.event.GameEventCombatChanged;
 import forge.game.event.GameEventTokenCreated;
@@ -86,7 +85,7 @@ public class AmassEffect extends TokenEffectBase {
         }
 
         Map<String, Object> params = Maps.newHashMap();
-        params.put("CounterType", CounterType.get(CounterEnumType.P1P1));
+        params.put("CounterType", CounterEnumType.P1P1);
         params.put("Amount", amount);
         Card tgt = activator.getController().chooseSingleEntityForEffect(tgtCards, sa, Localizer.getInstance().getMessage("lblChooseAnArmy"), false, params);
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
index 667257cb0bc..efdfb6b197e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java
@@ -90,6 +90,16 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
             c.addPerpetual(p);
             p.applyEffect(c);
         }
+        if (sa.hasParam("ManaCost")) {
+            final ManaCost manaCost = new ManaCost(new ManaCostParser(sa.getParam("ManaCost")));
+            if (perpetual) {
+                PerpetualManaCost p = new PerpetualManaCost(timestamp, manaCost);
+                c.addPerpetual(p);
+                p.applyEffect(c);
+            } else {
+                c.addChangedManaCost(manaCost, timestamp, (long) 0);
+            }
+        }
         
         if (!addType.isEmpty() || !removeType.isEmpty() || addAllCreatureTypes || !remove.isEmpty()) {
             if (perpetual) {
@@ -128,7 +138,7 @@ public abstract class AnimateEffectBase extends SpellAbilityEffect {
             if (perpetual) {
                 c.addPerpetual(new PerpetualColors(timestamp, colors, overwrite));
             }
-            c.addColor(colors, !overwrite, timestamp, 0, false);
+            c.addColor(colors, !overwrite, timestamp, null);
         }
 
         if (sa.hasParam("LeaveBattlefield")) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTextEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTextEffect.java
index b425d41a6f8..74308bc66c7 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTextEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTextEffect.java
@@ -34,7 +34,7 @@ public class ChangeTextEffect extends SpellAbilityEffect {
             final String[] changedColorWordsArray = sa.getParam("ChangeColorWord").split(" ");
             if (changedColorWordsArray[0].equals("Choose")) {
                 originalColor = sa.getActivatingPlayer().getController().chooseColor(
-                        Localizer.getInstance().getMessage("lblChooseColorReplace"), sa, ColorSet.ALL_COLORS);
+                        Localizer.getInstance().getMessage("lblChooseColorReplace"), sa, ColorSet.WUBRG);
                 changedColorWordOriginal = TextUtil.capitalize(MagicColor.toLongString(originalColor));
             } else {
                 changedColorWordOriginal = changedColorWordsArray[0];
@@ -44,7 +44,7 @@ public class ChangeTextEffect extends SpellAbilityEffect {
             if (changedColorWordsArray[1].equals("Choose")) {
                 final ColorSet possibleNewColors;
                 if (originalColor == 0) { // no original color (ie. any or absent)
-                    possibleNewColors = ColorSet.ALL_COLORS;
+                    possibleNewColors = ColorSet.WUBRG;
                 } else { // may choose any except original color
                     possibleNewColors = ColorSet.fromMask(originalColor).inverse();
                 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 530e944e6c1..885b6ab442d 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -31,6 +31,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class ChangeZoneEffect extends SpellAbilityEffect {
 
@@ -103,6 +104,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         }
         final String destination = sa.getParam("Destination");
 
+        final int num = sa.hasParam("ChangeNum") ? AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa) : 1;
         String type = "card";
         boolean defined = false;
         if (sa.hasParam("ChangeTypeDesc")) {
@@ -117,12 +119,11 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             type = Lang.joinHomogenous(tgts);
             defined = true;
         } else if (sa.hasParam("ChangeType") && !sa.getParam("ChangeType").equals("Card")) {
-            final String ct = sa.getParam("ChangeType");
-            type = CardType.CoreType.isValidEnum(ct) ? ct.toLowerCase() : ct;
+            List<String> typeList = Arrays.stream(sa.getParam("ChangeType").split(",")).map(ct -> CardType.isACardType(ct) ? ct.toLowerCase() : ct).collect(Collectors.toList());
+            type = Lang.joinHomogenous(typeList, null, num == 1 ? "or" : "and/or");
         }
         final String cardTag = type.contains("card") ? "" : " card";
 
-        final int num = sa.hasParam("ChangeNum") ? AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa) : 1;
         boolean tapped = sa.hasParam("Tapped");
         boolean attacking = sa.hasParam("Attacking");
         if (sa.isNinjutsu()) {
@@ -152,6 +153,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             } else {
                 sb.append(" for ");
             }
+            if (num != 1) {
+                sb.append(" up to ");
+            }
             sb.append(Lang.nounWithNumeralExceptOne(num, type + cardTag)).append(", ");
             if (!sa.hasParam("NoReveal") && ZoneType.smartValueOf(destination) != null && ZoneType.smartValueOf(destination).isHidden()) {
                 if (choosers.size() == 1) {
@@ -928,7 +932,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
 
             List<ZoneType> origin = Lists.newArrayList();
             if (sa.hasParam("Origin")) {
-                origin = ZoneType.listValueOf(sa.getParam("Origin"));
+                origin.addAll(ZoneType.listValueOf(sa.getParam("Origin")));
             }
             ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
 
@@ -969,12 +973,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 String prompt;
                 if (sa.hasParam("OptionalPrompt")) {
                     prompt = sa.getParam("OptionalPrompt");
+                } else if (defined) {
+                    prompt = Localizer.getInstance().getMessage("lblPutThatCardFromPlayerOriginToDestination", "{player's}", Lang.joinHomogenous(origin, ZoneType::getTranslatedName).toLowerCase(), destination.getTranslatedName().toLowerCase());
                 } else {
-                    if (defined) {
-                        prompt = Localizer.getInstance().getMessage("lblPutThatCardFromPlayerOriginToDestination", "{player's}", Lang.joinHomogenous(origin, ZoneType::getTranslatedName).toLowerCase(), destination.getTranslatedName().toLowerCase());
-                    } else {
-                        prompt = Localizer.getInstance().getMessage("lblSearchPlayerZoneConfirm", "{player's}", Lang.joinHomogenous(origin, ZoneType::getTranslatedName).toLowerCase());
-                    }
+                    prompt = Localizer.getInstance().getMessage("lblSearchPlayerZoneConfirm", "{player's}", Lang.joinHomogenous(origin, ZoneType::getTranslatedName).toLowerCase());
                 }
                 String message = MessageUtil.formatMessage(prompt , decider, player);
                 if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneGeneral, message, null)) {
@@ -1101,7 +1103,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             if (changeType.startsWith("EACH")) {
                 String[] eachTypes = changeType.substring(5).split(" & ");
                 for (String thisType : eachTypes) {
-                    for (int i = 0; i < changeNum && destination != null; i++) {
+                    for (int i = 0; i < changeNum; i++) {
                         CardCollection thisList = (CardCollection) AbilityUtils.filterListByType(fetchList, thisType, sa);
                         if (!chosenCards.isEmpty()) {
                             thisList.removeAll(chosenCards);
@@ -1136,7 +1138,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 // maybe prompt the user if they selected fewer than the maximum possible?
             } else {
                 // one at a time
-                for (int i = 0; i < changeNum && destination != null; i++) {
+                for (int i = 0; i < changeNum; i++) {
                     if (sa.hasParam("DifferentNames")) {
                         for (Card c : chosenCards) {
                             fetchList = CardLists.filter(fetchList, CardPredicates.sharesNameWith(c).negate());
@@ -1250,6 +1252,10 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 player.removeController(controlTimestamp);
             }
 
+            if (sa.hasParam("Exactly") && chosenCards.size() < changeNum) {
+                continue;
+            }
+
             HiddenOriginChoices choices = new HiddenOriginChoices();
             choices.searchedLibrary = searchedLibrary;
             choices.shuffleMandatory = shuffleMandatory;
@@ -1279,7 +1285,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             Player decider = ObjectUtils.firstNonNull(chooser, player);
 
             for (final Card c : chosenCards) {
-                Card movedCard = null;
+                Card movedCard;
                 final Zone originZone = game.getZoneOf(c);
                 Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
                 moveParams.put(AbilityKey.FoundSearchingLibrary, searchedLibrary);
@@ -1411,6 +1417,9 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                         movedCard.addMayLookFaceDownExile(sa.getActivatingPlayer());
                     }
                 }
+                else if (destination == null) {
+                    movedCard = c;
+                }
                 else {
                     movedCard = game.getAction().moveTo(destination, c, 0, sa, moveParams);
                 }
@@ -1476,7 +1485,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 }
                 if (ZoneType.Exile.equals(destination) && sa.hasParam("WithCountersType")) {
                     CounterType cType = CounterType.getType(sa.getParam("WithCountersType"));
-                    int cAmount = AbilityUtils.calculateAmount(sa.getOriginalHost(), sa.getParamOrDefault("WithCountersAmount", "1"), sa);
+                    int cAmount = AbilityUtils.calculateAmount(source, sa.getParamOrDefault("WithCountersAmount", "1"), sa);
                     GameEntityCounterTable table = new GameEntityCounterTable();
                     movedCard.addCounter(cType, cAmount, player, table);
                     table.replaceCounterEffect(game, sa, true);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
index 7345e824bb1..771909901ab 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java
@@ -287,22 +287,17 @@ public class CopyPermanentEffect extends TokenEffectBase {
             int id = newOwner == null ? 0 : newOwner.getGame().nextCardId();
             // need to create a physical card first, i need the original card faces
             copy = CardFactory.getCard(original.getPaperCard(), newOwner, id, host.getGame());
+
+            copy.setStates(CardFactory.getCloneStates(original, copy, sa));
+            // force update the now set State
             if (original.isTransformable()) {
+                copy.setState(original.isTransformed() ? CardStateName.Backside : CardStateName.Original, true, true);
                 // 707.8a If an effect creates a token that is a copy of a transforming permanent or a transforming double-faced card not on the battlefield,
                 // the resulting token is a transforming token that has both a front face and a back face.
                 // The characteristics of each face are determined by the copiable values of the same face of the permanent it is a copy of, as modified by any other copy effects that apply to that permanent.
                 // If the token is a copy of a transforming permanent with its back face up, the token enters the battlefield with its back face up.
                 // This rule does not apply to tokens that are created with their own set of characteristics and enter the battlefield as a copy of a transforming permanent due to a replacement effect.
                 copy.setBackSide(original.isBackSide());
-                if (original.isTransformed()) {
-                    copy.incrementTransformedTimestamp();
-                }
-            }
-
-            copy.setStates(CardFactory.getCloneStates(original, copy, sa));
-            // force update the now set State
-            if (original.isTransformable()) {
-                copy.setState(original.isTransformed() ? CardStateName.Backside : CardStateName.Original, true, true);
             } else {
                 copy.setState(copy.getCurrentStateName(), true, true);
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
index fd401571072..41b4c840054 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
@@ -102,24 +102,29 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
 
         int totalRemoved = 0;
         CardCollectionView srcCards;
-
         if (sa.hasParam("Choices")) {
             ZoneType choiceZone = sa.hasParam("ChoiceZone") ? ZoneType.smartValueOf(sa.getParam("ChoiceZone"))
                     : ZoneType.Battlefield;
-
-            CardCollection choices = CardLists.getValidCards(game.getCardsIn(choiceZone), sa.getParam("Choices"),
+            srcCards = CardLists.getValidCards(game.getCardsIn(choiceZone), sa.getParam("Choices"),
                     activator, source, sa);
+        } else {
+            srcCards = getTargetCards(sa);
+        }
+        if (sa.isReplacementAbility()) {
+            srcCards = new CardCollection(srcCards).filter(c -> !c.isInPlay() || sa.getLastStateBattlefield().contains(c));
+        }
 
+        if (sa.hasParam("Choices")) {
             int min = 1;
             int max = 1;
             if (sa.hasParam("ChoiceOptional")) {
                 min = 0;
-                max = choices.size();
+                max = srcCards.size();
             }
             if (sa.hasParam("ChoiceNum")) {
                 min = max = AbilityUtils.calculateAmount(source, sa.getParam("ChoiceNum"), sa);
             }
-            if (choices.size() < min) {
+            if (srcCards.size() < min) {
                 return;
             }
 
@@ -128,13 +133,12 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
             title = title.replace("  ", " ");
             Map<String, Object> params = Maps.newHashMap();
             params.put("CounterType", counterType);
-            srcCards = pc.chooseCardsForEffect(choices, sa, title, min, max, min == 0, params);
+            srcCards = pc.chooseCardsForEffect(srcCards, sa, title, min, max, min == 0, params);
         } else {
             for (final Player tgtPlayer : getTargetPlayers(sa)) {
                 if (!tgtPlayer.isInGame()) {
                     continue;
                 }
-                // Removing energy
                 if (type.equals("All")) {
                     for (Map.Entry<CounterType, Integer> e : Lists.newArrayList(tgtPlayer.getCounters().entrySet())) {
                         totalRemoved += tgtPlayer.subtractCounter(e.getKey(), e.getValue(), activator);
@@ -150,8 +154,6 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
                     }
                 }
             }
-
-            srcCards = getTargetCards(sa);
         }
 
         for (final Card tgtCard : srcCards) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageResolveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageResolveEffect.java
index c96a27937fc..e4e85049f56 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DamageResolveEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DamageResolveEffect.java
@@ -18,6 +18,10 @@ public class DamageResolveEffect extends SpellAbilityEffect {
     @Override
     public void resolve(SpellAbility sa) {
         CardDamageMap damageMap = sa.getDamageMap();
+        if (damageMap == null) {
+            // this can happen if damagesource was missing
+            return;
+        }
         CardDamageMap preventMap = sa.getPreventMap();
         GameEntityCounterTable counterTable = sa.getCounterTable();
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java
index 8c2ff61c0e8..e1a707bd1d8 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java
@@ -73,6 +73,11 @@ import java.util.*;
              }
 
              Card made = game.getAction().moveTo(zone, c, sa, moveParams);
+             if (zone.equals(ZoneType.Battlefield)) {
+                 if (sa.hasParam("Tapped")) {
+                     made.setTapped(true);
+                 }
+             }
              if (zone.equals(ZoneType.Exile)) {
                  handleExiledWith(made, sa);
                  if (sa.hasParam("ExileFaceDown")) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EarthbendEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EarthbendEffect.java
index 5e58004a14c..723bf4522e9 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EarthbendEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EarthbendEffect.java
@@ -47,7 +47,7 @@ public class EarthbendEffect extends SpellAbilityEffect {
         final Game game = source.getGame();
         final Player pl = sa.getActivatingPlayer();
         int num = AbilityUtils.calculateAmount(source, sa.getParamOrDefault("Num", "1"), sa);
-        
+
         long ts = game.getNextTimestamp();
 
         String desc = "When it dies or is exiled, return it to the battlefield tapped.";
@@ -59,17 +59,17 @@ public class EarthbendEffect extends SpellAbilityEffect {
             c.addNewPT(0, 0, ts, 0);
             c.addChangedCardTypes(Arrays.asList("Creature"), null, false, EnumSet.noneOf(RemoveType.class), ts, 0, true, false);
             c.addChangedCardKeywords(Arrays.asList("Haste"), null, false, ts, null);
-            
+
             GameEntityCounterTable table = new GameEntityCounterTable();
             c.addCounter(CounterEnumType.P1P1, num, pl, table);
             table.replaceCounterEffect(game, sa, true);
-            
+
             buildTrigger(sa, c, sbTrigA, "Graveyard");
             buildTrigger(sa, c, sbTrigB, "Exile");
         }
         pl.triggerElementalBend(TriggerType.Earthbend);
     }
-    
+
     protected void buildTrigger(SpellAbility sa, Card c, String sbTrig, String zone) {
         final Card source = sa.getHostCard();
         final Game game = source.getGame();
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index a7ca54bd0e2..954c833b7ab 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -269,22 +269,22 @@ public class EffectEffect extends SpellAbilityEffect {
                 }
             }
 
-            // Set Chosen Color(s)
             if (hostCard.hasChosenColor()) {
                 eff.setChosenColors(Lists.newArrayList(hostCard.getChosenColors()));
             }
 
-            // Set Chosen Cards
             if (hostCard.hasChosenCard()) {
                 eff.setChosenCards(hostCard.getChosenCards());
             }
 
-            // Set Chosen Player
             if (hostCard.hasChosenPlayer()) {
                 eff.setChosenPlayer(hostCard.getChosenPlayer());
             }
 
-            // Set Chosen Type
+            if (hostCard.getChosenDirection() != null) {
+                eff.setChosenDirection(hostCard.getChosenDirection());
+            }
+
             if (hostCard.hasChosenType()) {
                 eff.setChosenType(hostCard.getChosenType());
             }
@@ -292,12 +292,10 @@ public class EffectEffect extends SpellAbilityEffect {
                 eff.setChosenType2(hostCard.getChosenType2());
             }
 
-            // Set Chosen name
             if (hostCard.hasNamedCard()) {
                 eff.setNamedCards(Lists.newArrayList(hostCard.getNamedCards()));
             }
 
-            // chosen number
             if (sa.hasParam("SetChosenNumber")) {
                 eff.setChosenNumber(AbilityUtils.calculateAmount(hostCard, sa.getParam("SetChosenNumber"), sa));
             } else if (hostCard.hasChosenNumber()) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java
index 49e8af3f38d..5f640ddaa82 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ImmediateTriggerEffect.java
@@ -34,6 +34,9 @@ public class ImmediateTriggerEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final Card host = sa.getHostCard();
         final Game game = host.getGame();
+
+        // CR 603.12a if the trigger event or events occur multiple times during the resolution of the spell or ability that created it,
+        // the reflexive triggered ability will trigger once for each of those times
         int amt = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("TriggerAmount", "1"), sa);
         if (amt <= 0) {
             return;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
index c179f83b10d..3c4bcfd5c08 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java
@@ -54,33 +54,29 @@ public class LifeExchangeEffect extends SpellAbilityEffect {
 
         final int life1 = p1.getLife();
         final int life2 = p2.getLife();
+        final int diff = Math.abs(life1 - life2);
 
-        if (sa.hasParam("RememberDifference")) {
-            final int diff = life1 - life2;
-            source.addRemembered(diff);
+        if (life2 > life1) {
+            // swap players
+            Player tmp = p2;
+            p2 = p1;
+            p1 = tmp;
         }
-
-        final Map<Player, Integer> lossMap = Maps.newHashMap();
-        if ((life1 > life2) && p1.canLoseLife() && p2.canGainLife()) {
-            final int diff = life1 - life2;
+        if (diff > 0 && p1.canLoseLife() && p2.canGainLife()) {
             final int lost = p1.loseLife(diff, false, false);
             p2.gainLife(diff, source, sa);
             if (lost > 0) {
+                final Map<Player, Integer> lossMap = Maps.newHashMap();
                 lossMap.put(p1, lost);
+                final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPIMap(lossMap);
+                source.getGame().getTriggerHandler().runTrigger(TriggerType.LifeLostAll, runParams, false);
+                if (sa.hasParam("RememberOwnLoss") && p1.equals(sa.getActivatingPlayer())) {
+                    source.addRemembered(lost);
+                }
             }
-        } else if ((life2 > life1) && p2.canLoseLife() && p1.canGainLife()) {
-            final int diff = life2 - life1;
-            final int lost = p2.loseLife(diff, false, false);
-            p1.gainLife(diff, source, sa);
-            if (lost > 0) {
-                lossMap.put(p2, lost);
-            }
-        } else {
-            // they are equal or can't be exchanged, so nothing to do
         }
-        if (!lossMap.isEmpty()) { // Run triggers if any player actually lost life
-            final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPIMap(lossMap);
-            source.getGame().getTriggerHandler().runTrigger(TriggerType.LifeLostAll, runParams, false);
+        if (sa.hasParam("RememberDifference")) {
+            source.addRemembered(p1.getLife() - p2.getLife());
         }
     }
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
index 49bff555a0f..b21b252e4cb 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
@@ -156,7 +156,7 @@ public class ManaEffect extends SpellAbilityEffect {
                 for (int nChar = 0; nChar < colorsNeeded.length(); nChar++) {
                     mask |= MagicColor.fromName(colorsNeeded.charAt(nChar));
                 }
-                colorMenu = mask == 0 ? ColorSet.ALL_COLORS : ColorSet.fromMask(mask);
+                colorMenu = mask == 0 ? ColorSet.WUBRG : ColorSet.fromMask(mask);
                 byte val = chooser.getController().chooseColor(Localizer.getInstance().getMessage("lblSelectManaProduce"), sa, colorMenu);
                 if (0 == val) {
                     throw new RuntimeException("ManaEffect::resolve() /*any mana*/ - " + p + " color mana choice is empty for " + card.getName());
@@ -271,10 +271,11 @@ public class ManaEffect extends SpellAbilityEffect {
             producedMana.append(abMana.produceMana(mana, p, sa));
         }
 
-        abMana.tapsForMana(sa.getRootAbility(), producedMana.toString());
-
         // Only clear express choice after mana has been produced
         abMana.clearExpressChoice();
+
+        abMana.tapsForMana(sa.getRootAbility(), producedMana.toString());
+
         if (sa.isKeyword(Keyword.FIREBENDING)) {
             activator.triggerElementalBend(TriggerType.Firebend);
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java
index 4cf4203da68..3500663e6cf 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MutateEffect.java
@@ -80,7 +80,7 @@ public class MutateEffect extends SpellAbilityEffect {
         game.getTriggerHandler().clearActiveTriggers(target, null);
         game.getTriggerHandler().registerActiveTrigger(target, false);
 
-        game.getAction().moveTo(p.getZone(ZoneType.Merged), host, sa, AbilityKey.newMap());
+        game.getAction().moveTo(p.getZone(ZoneType.Merged), host, sa);
 
         host.setTapped(target.isTapped());
         host.setFlipped(target.isFlipped());
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
index 220db684055..af40471d554 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
@@ -15,8 +15,9 @@ public class PermanentCreatureEffect extends PermanentEffect {
     public String getStackDescription(final SpellAbility sa) {
         final CardState source = sa.getCardState();
         final StringBuilder sb = new StringBuilder();
-        sb.append(CardTranslation.getTranslatedName(source.getName())).append(" - ").append(Localizer.getInstance().getMessage("lblCreature")).append(" ").append(source.getBasePowerString());
-        sb.append(" / ").append(source.getBaseToughnessString());
+        sb.append(CardTranslation.getTranslatedName(source.getName())).append(" - ").append(Localizer.getInstance().getMessage("lblCreature")).append(" ");
+        sb.append(sa.getParamOrDefault("SetPower", source.getBasePowerString()));
+        sb.append(" / ").append(sa.getParamOrDefault("SetToughness", source.getBaseToughnessString()));
         return sb.toString();
     }
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
index 5bc43048acc..514b5c2bd16 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
@@ -428,6 +428,10 @@ public class PlayEffect extends SpellAbilityEffect {
                 tgtSA.getTargetRestrictions().setMandatory(true);
             }
 
+            if (sa.hasParam("Named")) {
+                tgtSA.setName(sa.getName());
+            }
+
             // can't be done later
             if (sa.hasParam("ReplaceGraveyard")) {
                 if (!sa.hasParam("ReplaceGraveyardValid")
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
index 278080894a4..bbcab86846e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java
@@ -124,8 +124,8 @@ public class ProtectEffect extends SpellAbilityEffect {
                 }
             } else if (sa.getParam("Gains").startsWith("Defined")) {
                 CardCollection def = AbilityUtils.getDefinedCards(host, sa.getParam("Gains").substring(8), sa);
-                for (final Byte color : def.get(0).getColor()) {
-                    gains.add(MagicColor.toLongString(color));
+                for (final MagicColor.Color color : def.get(0).getColor()) {
+                    gains.add(color.getName());
                 }
             } else {
                 gains.addAll(choices);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
index 1369f2bd4f5..86d108b9225 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
@@ -17,7 +17,6 @@ import forge.game.GameEntity;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
-import forge.game.card.CardCollection;
 import forge.game.card.CardFactoryUtil;
 import forge.game.card.CardUtil;
 import forge.game.card.perpetual.PerpetualKeywords;
@@ -282,6 +281,17 @@ public class PumpEffect extends SpellAbilityEffect {
         List<Card> tgtCards = getCardsfromTargets(sa);
         List<Player> tgtPlayers = getTargetPlayers(sa);
 
+        if (sa.hasParam("Optional")) {
+            final String targets = Lang.joinHomogenous(tgtCards);
+            final String message = sa.hasParam("OptionQuestion")
+                    ? TextUtil.fastReplace(sa.getParam("OptionQuestion"), "TARGETS", targets)
+                    : Localizer.getInstance().getMessage("lblApplyPumpToTarget", targets);
+
+            if (!activator.getController().confirmAction(sa, null, message, null)) {
+                return;
+            }
+        }
+
         List<String> keywords = Lists.newArrayList();
         if (sa.hasParam("KW")) {
             keywords.addAll(Arrays.asList(sa.getParam("KW").split(" & ")));
@@ -307,8 +317,6 @@ public class PumpEffect extends SpellAbilityEffect {
             keywords = CardFactoryUtil.sharedKeywords(keywords, restrictions, zones, host, sa);
         }
 
-        final CardCollection untargetedCards = CardUtil.getRadiance(sa);
-
         if (sa.hasParam("DefinedKW")) {
             String defined = sa.getParam("DefinedKW");
             if (defined.equals("ChosenType")) {
@@ -394,17 +402,6 @@ public class PumpEffect extends SpellAbilityEffect {
             keywords = choice;
         }
 
-        if (sa.hasParam("Optional")) {
-            final String targets = Lang.joinHomogenous(tgtCards);
-            final String message = sa.hasParam("OptionQuestion")
-                    ? TextUtil.fastReplace(sa.getParam("OptionQuestion"), "TARGETS", targets)
-                    : Localizer.getInstance().getMessage("lblApplyPumpToTarget", targets);
-
-            if (!activator.getController().confirmAction(sa, null, message, null)) {
-                return;
-            }
-        }
-
         if (sa.hasParam("RememberObjects")) {
             host.addRemembered(AbilityUtils.getDefinedObjects(host, sa.getParam("RememberObjects"), sa));
         }
@@ -494,7 +491,7 @@ public class PumpEffect extends SpellAbilityEffect {
             registerDelayedTrigger(sa, sa.getParam("AtEOT"), tgtCards);
         }
 
-        for (final Card tgtC : untargetedCards) {
+        for (final Card tgtC : CardUtil.getRadiance(sa)) {
             // only pump things in PumpZone
             if (!tgtC.isInZones(pumpZones)) {
                 continue;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ReplaceManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReplaceManaEffect.java
index 70ff51e0829..f754eedb5ad 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ReplaceManaEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ReplaceManaEffect.java
@@ -34,14 +34,14 @@ public class ReplaceManaEffect extends SpellAbilityEffect {
             // replace type and amount
             replaced = sa.getParam("ReplaceMana");
             if ("Any".equals(replaced)) {
-                byte rs = player.getController().chooseColor("Choose a color", sa, ColorSet.ALL_COLORS);
+                byte rs = player.getController().chooseColor("Choose a color", sa, ColorSet.WUBRG);
                 replaced = MagicColor.toShortString(rs);
             }
         } else if (sa.hasParam("ReplaceType")) {
             // replace color and colorless
             String color = sa.getParam("ReplaceType");
             if ("Any".equals(color)) {
-                byte rs = player.getController().chooseColor("Choose a color", sa, ColorSet.ALL_COLORS);
+                byte rs = player.getController().chooseColor("Choose a color", sa, ColorSet.WUBRG);
                 color = MagicColor.toShortString(rs);
             } else {
                 // convert in case Color Word used
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
index 32bb7126c0e..92fbc180d36 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java
@@ -75,9 +75,8 @@ public class RestartGameEffect extends SpellAbilityEffect {
             p.clearController();
 
             CardCollection newLibrary = new CardCollection(p.getCardsIn(restartZones, false));
-            List<Card> filteredCards = null;
             if (leaveZone != null) {
-                filteredCards = CardLists.getValidCards(p.getCardsIn(leaveZone), leaveRestriction, p, sa.getHostCard(), sa);
+                List<Card> filteredCards = CardLists.getValidCards(p.getCardsIn(leaveZone), leaveRestriction, p, sa.getHostCard(), sa);
                 newLibrary.addAll(filteredCards);
             }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
index 44c58aac69c..b04882ef9ea 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
@@ -369,8 +369,8 @@ public class RollDiceEffect extends SpellAbilityEffect {
         List<Card> canIncrementDice = new ArrayList<>();
         for (Card c : xenosquirrels) {
             // Xenosquirrels must have a P1P1 counter on it to remove in order to modify
-            Integer P1P1Counters = c.getCounters().get(CounterType.get(CounterEnumType.P1P1));
-            if (P1P1Counters != null && P1P1Counters > 0 && c.canRemoveCounters(CounterType.get(CounterEnumType.P1P1))) {
+            Integer P1P1Counters = c.getCounters().get(CounterEnumType.P1P1);
+            if (P1P1Counters != null && P1P1Counters > 0 && c.canRemoveCounters(CounterEnumType.P1P1)) {
                 canIncrementDice.add(c);
             }
         }
@@ -399,6 +399,7 @@ public class RollDiceEffect extends SpellAbilityEffect {
      * @param repParams       replacement effect parameters
      * @return list of final roll results after applying ignores and replacements, sorted in ascending order
      */
+    @SuppressWarnings("unchecked")
     private static List<Integer> rollAction(int amount, int sides, int ignore, List<Integer> rollsResult, List<Integer> ignored, Map<Player, Integer> ignoreChosenMap, Set<Card> dicePTExchanges, Player player, Map<AbilityKey, Object> repParams) {
 
         repParams.put(AbilityKey.Sides, sides);
@@ -416,6 +417,8 @@ public class RollDiceEffect extends SpellAbilityEffect {
                 ignoreChosenMap = (Map<Player, Integer>) repParams.get(AbilityKey.IgnoreChosen);
                 break;
             }
+            default:
+                break;
         }
 
         List<Integer> naturalRolls = (rollsResult == null ? new ArrayList<>() : rollsResult);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
index 313261f7459..4fe536aae8f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java
@@ -92,12 +92,11 @@ public class SacrificeEffect extends SpellAbilityEffect {
         CardZoneTable zoneMovements = AbilityKey.addCardZoneTableParams(params, sa);
 
         if (valid.equals("Self") && game.getZoneOf(host) != null) {
-            if (host.getController().equals(activator) && game.getZoneOf(host).is(ZoneType.Battlefield)) {
-                if (!optional || activator.getController().confirmAction(sa, null,
-                        Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", host.getName()), null)) {
-                    if (game.getAction().sacrifice(new CardCollection(host), sa, true, params) != null && remSacrificed) {
-                        host.addRemembered(host);
-                    }
+            if (host.getController().equals(activator) && game.getZoneOf(host).is(ZoneType.Battlefield) &&
+                    (!optional || activator.getController().confirmAction(sa, null,
+                        Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", host.getName()), null))) {
+                if (game.getAction().sacrifice(new CardCollection(host), sa, true, params) != null && remSacrificed) {
+                    host.addRemembered(host);
                 }
             }
         } else {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/TimeTravelEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TimeTravelEffect.java
index 449cfb758b1..69fc1f8a470 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/TimeTravelEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/TimeTravelEffect.java
@@ -9,8 +9,10 @@ import forge.game.GameEntityCounterTable;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
+import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
+import forge.game.card.CounterType;
 import forge.game.card.CounterEnumType;
 import forge.game.player.Player;
 import forge.game.player.PlayerController;
@@ -19,7 +21,6 @@ import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.CardTranslation;
 import forge.util.Localizer;
-import forge.util.collect.FCollection;
 
 public class TimeTravelEffect extends SpellAbilityEffect {
 
@@ -37,13 +38,11 @@ public class TimeTravelEffect extends SpellAbilityEffect {
 
         PlayerController pc = activator.getController();
 
-        final CounterEnumType counterType = CounterEnumType.TIME;
+        final CounterType counterType = CounterEnumType.TIME;
 
         for (int i = 0; i < num; i++) {
-            FCollection<Card> list = new FCollection<>();
-
             // card you own that is suspended
-            list.addAll(CardLists.filter(activator.getCardsIn(ZoneType.Exile), CardPredicates.hasSuspend()));
+            CardCollection list = CardLists.filter(activator.getCardsIn(ZoneType.Exile), CardPredicates.hasSuspend());
             // permanent you control with time counter
             list.addAll(CardLists.filter(activator.getCardsIn(ZoneType.Battlefield), CardPredicates.hasCounter(counterType)));
 
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index ac7d38b63f6..b9cc50ede98 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -203,6 +203,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     private boolean unearthed;
     private boolean ringbearer;
     private boolean monstrous;
+    private boolean harnessed;
     private boolean renowned;
     private boolean solved;
     private boolean tributed;
@@ -256,7 +257,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
 
     private long worldTimestamp = -1;
     private long bestowTimestamp = -1;
-    private long transformedTimestamp = 0;
+    private long transformedTimestamp = -1;
     private long prototypeTimestamp = -1;
     private long mutatedTimestamp = -1;
     private int timesMutated = 0;
@@ -424,8 +425,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     public long getPrototypeTimestamp() { return prototypeTimestamp; }
 
     public long getTransformedTimestamp() { return transformedTimestamp; }
-    public void incrementTransformedTimestamp() { this.transformedTimestamp++; }
-    public void undoIncrementTransformedTimestamp() { this.transformedTimestamp--; }
+    public void setTransformedTimestamp(long ts) { this.transformedTimestamp = ts; }
 
     // The following methods are used to selectively update certain view components (text,
     // P/T, card types) in order to avoid card flickering due to aggressive full update
@@ -449,7 +449,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
 
     public final void updateColorForView() {
         currentState.getView().updateColors(this);
-        currentState.getView().updateHasChangeColors(!Iterables.isEmpty(getChangedCardColors()));
+        currentState.getView().updateHasChangeColors(hasChangedCardColors());
     }
 
     public void updateAttackingForView() {
@@ -695,7 +695,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
                 final Map<AbilityKey, Object> runParams = AbilityKey.mapFromCard(this);
                 getGame().getTriggerHandler().runTrigger(TriggerType.Transformed, runParams, false);
             }
-            incrementTransformedTimestamp();
+            setTransformedTimestamp(ts);
 
             return retResult;
         } else if (mode.equals("Flip")) {
@@ -965,7 +965,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         String name = state.getName();
         for (CardChangedName change : this.changedCardNames.values()) {
             if (change.isOverwrite()) {
-                name = change.getNewName();
+                name = change.newName();
             }
         }
         return alt ? StaticData.instance().getCommonCards().getName(name, true) :  name;
@@ -980,7 +980,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         for (CardChangedName change : this.changedCardNames.values()) {
             if (change.isOverwrite()) {
                 result = false;
-            } else if (change.isAddNonLegendaryCreatureNames()) {
+            } else if (change.addNonLegendaryCreatureNames()) {
                 result = true;
             }
         }
@@ -1013,6 +1013,12 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         currentState.getView().updateName(currentState);
     }
 
+    private record CardChangedName(String newName, boolean addNonLegendaryCreatureNames) {
+        public boolean isOverwrite() {
+            return newName != null;
+        }
+    }
+
     public void setGamePieceType(GamePieceType gamePieceType) {
         this.gamePieceType = gamePieceType;
         this.view.updateGamePieceType(this);
@@ -1069,7 +1075,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     }
 
     public final boolean isDoubleFaced() {
-        return isTransformable() || isMeldable() || isModal();
+        return isTransformable() || isMeldable();
     }
 
     public final boolean isFlipCard() {
@@ -1131,7 +1137,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     }
 
     public final boolean isTransformed() {
-        return getTransformedTimestamp() != 0;
+        if (isMeldable() || hasMergedCard()) {
+            return false;
+        }
+        return this.isTransformable() && isBackSide();
     }
 
     public final boolean isFlipped() {
@@ -2262,7 +2271,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
 
     public final ColorSet getMarkedColors() {
         if (markedColor == null) {
-            return ColorSet.getNullColor();
+            return ColorSet.C;
         }
         return markedColor;
     }
@@ -2450,22 +2459,11 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
                 } else if (keyword.startsWith("DeckLimit")) {
                     final String[] k = keyword.split(":");
                     sbLong.append(k[2]).append("\r\n");
-                } else if (keyword.startsWith("Enchant")) {
-                    String m[] = keyword.split(":");
-                    String desc;
-                    if (m.length > 2) {
-                        desc = m[2];
-                    } else {
-                        desc = m[1];
-                        if (CardType.isACardType(desc) || "Permanent".equals(desc) || "Player".equals(desc) || "Opponent".equals(desc)) {
-                            desc = desc.toLowerCase();
-                        }
-                    }
+                } else if (keyword.startsWith("Enchant") && inst instanceof KeywordWithType kwt) {
+                    String desc = kwt.getTypeDescription();
                     sbLong.append("Enchant ").append(desc).append("\r\n");
-                } else if (keyword.startsWith("Ripple")) {
-                    sbLong.append(TextUtil.fastReplace(keyword, ":", " ")).append("\r\n");
                 } else if (keyword.startsWith("Morph") || keyword.startsWith("Megamorph")
-                        || keyword.startsWith("Disguise")
+                        || keyword.startsWith("Disguise") || keyword.startsWith("Reflect")
                         || keyword.startsWith("Escape") || keyword.startsWith("Foretell:")
                         || keyword.startsWith("Madness:")|| keyword.startsWith("Recover")
                         || keyword.startsWith("Reconfigure") || keyword.startsWith("Squad")
@@ -2504,17 +2502,15 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
                                 sbLong.append(".");
                             }
                             if (k.length > 3) {
-                                sbLong.append(". " + k[3]);
+                                sbLong.append(". ").append(k[3]);
                             }
                         }
                         sbLong.append(" (").append(inst.getReminderText()).append(")");
                         sbLong.append("\r\n");
+                    } else if (keyword.equals("Mayhem")) {
+                        sbLong.append(" (").append(inst.getReminderText()).append(")");
+                        sbLong.append("\r\n");
                     }
-                } else if (keyword.startsWith("Reflect")) {
-                    final String[] k = keyword.split(":");
-                    sbLong.append(k[0]).append(" ").append(ManaCostParser.parse(k[1]));
-                    sbLong.append(" (").append(inst.getReminderText()).append(")");
-                    sbLong.append("\r\n");
                 } else if (keyword.startsWith("Echo")) {
                     sbLong.append("Echo ");
                     final String[] upkeepCostParams = keyword.split(":");
@@ -2608,6 +2604,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
                         || keyword.equals("Battle cry") || keyword.equals("Devoid") || keyword.equals("Riot")
                         || keyword.equals("Daybound") || keyword.equals("Nightbound")
                         || keyword.equals("Friends forever") || keyword.equals("Choose a Background")
+                        || keyword.equals("Partner - Father & Son") || keyword.equals("Partner - Survivors")
                         || keyword.equals("Space sculptor") || keyword.equals("Doctor's companion")
                         || keyword.equals("Start your engines")) {
                     sbLong.append(keyword).append(" (").append(inst.getReminderText()).append(")");
@@ -2653,7 +2650,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
                         || keyword.startsWith("Graft") || keyword.startsWith("Fading") || keyword.startsWith("Vanishing:")
                         || keyword.startsWith("Afterlife") || keyword.startsWith("Hideaway") || keyword.startsWith("Toxic")
                         || keyword.startsWith("Afflict") || keyword.startsWith ("Poisonous") || keyword.startsWith("Rampage")
-                        || keyword.startsWith("Renown") || keyword.startsWith("Annihilator")) {
+                        || keyword.startsWith("Renown") || keyword.startsWith("Annihilator") || keyword.startsWith("Ripple")) {
                     final String[] k = keyword.split(":");
                     sbLong.append(k[0]).append(" ").append(k[1]).append(" (").append(inst.getReminderText()).append(")");
                 } else if (keyword.startsWith("Crew")) {
@@ -2969,6 +2966,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         if (monstrous) {
             sb.append("Monstrous\r\n");
         }
+        if (harnessed) {
+            sb.append("Harnessed\r\n");
+        }
         if (renowned) {
             sb.append("Renowned\r\n");
         }
@@ -3561,7 +3561,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         if (!getStaticAbilities().isEmpty()) {
             return false;
         }
-        if (!getReplacementEffects().isEmpty()) {
+        if (!getReplacementEffects().isEmpty()
+                && (getReplacementEffects().size() > 1 || !isSaga() || hasKeyword(Keyword.READ_AHEAD))) {
             return false;
         }
         if (!getTriggers().isEmpty()) {
@@ -3794,7 +3795,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     public final void addLeavesPlayCommand(final GameCommand c) {
         leavePlayCommandList.add(c);
     }
- 
+
     public void addStaticCommandList(Object[] objects) {
         staticCommandList.add(objects);
     }
@@ -4296,18 +4297,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     }
 
     public boolean clearChangedCardColors() {
-        boolean changed = false;
+        boolean changed = hasChangedCardColors();
 
-        if (!changedCardColorsByText.isEmpty())
-            changed = true;
         changedCardColorsByText.clear();
-
-        if (!changedCardTypesCharacterDefining.isEmpty())
-            changed = true;
         changedCardTypesCharacterDefining.clear();
-
-        if (!changedCardColors.isEmpty())
-            changed = true;
         changedCardColors.clear();
 
         return changed;
@@ -4393,17 +4386,19 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         }
     }
 
-    public Iterable<CardColor> getChangedCardColors() {
-        return Iterables.concat(changedCardColorsByText.values(), changedCardColorsCharacterDefining.values(), changedCardColors.values());
+    public boolean hasChangedCardColors() {
+        return !changedCardColorsByText.isEmpty() || !changedCardColorsCharacterDefining.isEmpty() || !changedCardColors.isEmpty();
     }
 
-    public void addColorByText(final ColorSet color, final long timestamp, final long staticId) {
-        changedCardColorsByText.put(timestamp, staticId, new CardColor(color, false));
+    public void addColorByText(final ColorSet color, final long timestamp, final StaticAbility stAb) {
+        changedCardColorsByText.put(timestamp, (long)stAb.getId(), new CardColor(color, false));
         updateColorForView();
     }
 
-    public final void addColor(final ColorSet color, final boolean addToColors, final long timestamp, final long staticId, final boolean cda) {
-        (cda ? changedCardColorsCharacterDefining : changedCardColors).put(timestamp, staticId, new CardColor(color, addToColors));
+    public final void addColor(final ColorSet color, final boolean addToColors, final long timestamp, final StaticAbility stAb) {
+        (stAb != null && stAb.isCharacteristicDefining() ? changedCardColorsCharacterDefining : changedCardColors).put(
+                timestamp, stAb != null ? stAb.getId() : (long)0, new CardColor(color, addToColors)
+        );
         updateColorForView();
     }
 
@@ -4430,16 +4425,20 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     }
     public final ColorSet getColor(CardState state) {
         byte colors = state.getColor();
-        for (final CardColor cc : getChangedCardColors()) {
-            if (cc.isAdditional()) {
-                colors |= cc.getColorMask();
+        for (final CardColor cc : Iterables.concat(changedCardColorsByText.values(), changedCardColorsCharacterDefining.values(), changedCardColors.values())) {
+            if (cc.additional()) {
+                colors |= cc.color().getColor();
             } else {
-                colors = cc.getColorMask();
+                colors = cc.color().getColor();
             }
         }
         return ColorSet.fromMask(colors);
     }
 
+    private record CardColor(ColorSet color, boolean additional) {
+
+    }
+
     public final int getCurrentLoyalty() {
         return getCounters(CounterEnumType.LOYALTY);
     }
@@ -4809,7 +4808,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     public void addDraftAction(String s) {
         draftActions.add(s);
     }
- 
+
     private int intensity = 0;
     public final void addIntensity(final int n) {
         intensity += n;
@@ -6441,10 +6440,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
 
         DamageType damageType = DamageType.Normal;
         if (isPlaneswalker()) { // 120.3c
-            subtractCounter(CounterType.get(CounterEnumType.LOYALTY), damageIn, null, true);
+            subtractCounter(CounterEnumType.LOYALTY, damageIn, null, true);
         }
         if (isBattle()) {
-            subtractCounter(CounterType.get(CounterEnumType.DEFENSE), damageIn, null, true);
+            subtractCounter(CounterEnumType.DEFENSE, damageIn, null, true);
         }
         if (isCreature()) {
             if (source.isWitherDamage()) { // 120.3d
@@ -6692,6 +6691,14 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         setRingBearer(false);
     }
 
+    public final boolean isHarnessed() {
+        return harnessed;
+    }
+    public final boolean setHarnessed(final boolean harnessed0) {
+        harnessed = harnessed0;
+        return true;
+    }
+
     public final boolean isMonstrous() {
         return monstrous;
     }
@@ -6849,6 +6856,10 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         return exiledSA.isKeyword(Keyword.WARP);
     }
 
+    public boolean isWebSlinged() {
+        return getCastSA() != null && getCastSA().isAlternativeCost(AlternativeCost.WebSlinging);
+    }
+
     public boolean isSpecialized() {
         return specialized;
     }
@@ -7144,7 +7155,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
             return false;
         }
 
-        if (StaticAbilityCantTarget.cantTarget(this, sa)) {
+        if (StaticAbilityCantTarget.cantTarget(this, sa) != null) {
             return false;
         }
 
@@ -7156,51 +7167,62 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
     }
 
     @Override
-    protected final boolean canBeEnchantedBy(final Card aura) {
+    protected final String cantBeEnchantedByMsg(final Card aura) {
         if (!aura.hasKeyword(Keyword.ENCHANT)) {
-            return false;
+            return "No Enchant Keyword";
         }
         for (KeywordInterface ki : aura.getKeywords(Keyword.ENCHANT)) {
-            String k = ki.getOriginal();
-            String m[] = k.split(":");
-            String v = m[1];
-            if (!isValid(v.split(","), aura.getController(), aura, null)) {
-                return false;
-            }
-            if (!v.contains("inZone") && !isInPlay()) {
-                return false;
+            if (ki instanceof KeywordWithType kwt) {
+                String v = kwt.getValidType();
+                String desc = kwt.getTypeDescription();
+                if (!isValid(v.split(","), aura.getController(), aura, null) || (!v.contains("inZone") && !isInPlay())) {
+                    return getName() + " is not " + Lang.nounWithAmount(1, desc);
+                }
             }
         }
-        return true;
+        return null;
     }
 
+
     @Override
-    protected final boolean canBeEquippedBy(final Card equip, SpellAbility sa) {
+    protected String cantBeEquippedByMsg(final Card equip, SpellAbility sa) {
         if (!isInPlay()) {
-            return false;
+            return getName() + " is not in play";
         }
         if (sa != null && sa.isEquip()) {
-            return isValid(sa.getTargetRestrictions().getValidTgts(), sa.getActivatingPlayer(), equip, sa);
+            if (!isValid(sa.getTargetRestrictions().getValidTgts(), sa.getActivatingPlayer(), equip, sa)) {
+                Equip eq = (Equip) sa.getKeyword();
+                return getName() + " is not " + Lang.nounWithAmount(1, eq.getValidDescription());
+            }
+            return null;
         }
-        return isCreature();
+        if (!isCreature()) {
+            return getName() + " is not a creature";
+        }
+        return null;
     }
 
     @Override
-    protected boolean canBeFortifiedBy(final Card fort) {
-        return isLand() && isInPlay() && !fort.isLand();
+    protected String cantBeFortifiedByMsg(final Card fort) {
+        if (!isLand()) {
+            return getName() + " is not a Land";
+        }
+        if (!isInPlay()) {
+            return getName() + " is not in play";
+        }
+        if (fort.isLand()) {
+            return fort.getName() + " is a Land";
+        }
+
+        return null;
     }
 
-    /* (non-Javadoc)
-     * @see forge.game.GameEntity#canBeAttached(forge.game.card.Card, boolean)
-     */
     @Override
-    public boolean canBeAttached(Card attach, SpellAbility sa, boolean checkSBA) {
-        // phase check there
+    public String cantBeAttachedMsg(final Card attach, SpellAbility sa, boolean checkSBA) {
         if (isPhasedOut() && !attach.isPhasedOut()) {
-            return false;
+            return getName() + " is phased out";
         }
-
-        return super.canBeAttached(attach, sa, checkSBA);
+        return super.cantBeAttachedMsg(attach, sa, checkSBA);
     }
 
     public final boolean canBeSacrificedBy(final SpellAbility source, final boolean effect) {
@@ -7625,9 +7647,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         if (sa.isBestow()) {
             animateBestow();
         }
-        if (sa.isDisturb() || sa.hasParam("CastTransformed")) {
-            incrementTransformedTimestamp();
-        }
         if (sa.hasParam("Prototype") && prototypeTimestamp == -1) {
             long next = game.getNextTimestamp();
             addCloneState(CardFactory.getCloneStates(this, this, sa), next);
@@ -7837,8 +7856,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
         return currentState.getUntranslatedType();
     }
     @Override
-    public String getUntranslatedOracle() {
-        return currentState.getUntranslatedOracle();
+    public String getTranslatedName() {
+        return CardTranslation.getTranslatedName(this);
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/card/CardChangedName.java b/forge-game/src/main/java/forge/game/card/CardChangedName.java
deleted file mode 100644
index 63dcd82ac8f..00000000000
--- a/forge-game/src/main/java/forge/game/card/CardChangedName.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package forge.game.card;
-
-public class CardChangedName {
-
-    protected String newName;
-    protected boolean addNonLegendaryCreatureNames = false;
-
-    public CardChangedName(String newName, boolean addNonLegendaryCreatureNames) {
-        this.newName = newName;
-        this.addNonLegendaryCreatureNames = addNonLegendaryCreatureNames;
-    }
-
-    public String getNewName() {
-        return newName;
-    }
-
-    public boolean isOverwrite() {
-        return newName != null;
-    }
-
-    public boolean isAddNonLegendaryCreatureNames() {
-        return addNonLegendaryCreatureNames;
-    }
-}
diff --git a/forge-game/src/main/java/forge/game/card/CardColor.java b/forge-game/src/main/java/forge/game/card/CardColor.java
deleted file mode 100644
index c37460a4128..00000000000
--- a/forge-game/src/main/java/forge/game/card/CardColor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Forge: Play Magic: the Gathering.
- * Copyright (C) 2011  Forge Team
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package forge.game.card;
-
-import forge.card.ColorSet;
-
-/**
- * <p>
- * Card_Color class.
- * </p>
- * 
- * @author Forge
- * @version $Id$
- */
-public class CardColor {
-    private final byte colorMask;
-    public final byte getColorMask() {
-        return colorMask;
-    }
-
-    private final boolean additional;
-    public final boolean isAdditional() {
-        return this.additional;
-    }
-
-    CardColor(final ColorSet colors, final boolean addToColors) {
-        this.colorMask = colors.getColor();
-        this.additional = addToColors;
-    }
-}
diff --git a/forge-game/src/main/java/forge/game/card/CardCopyService.java b/forge-game/src/main/java/forge/game/card/CardCopyService.java
index 3cd81c703ce..ebf6c3a6009 100644
--- a/forge-game/src/main/java/forge/game/card/CardCopyService.java
+++ b/forge-game/src/main/java/forge/game/card/CardCopyService.java
@@ -131,9 +131,7 @@ public class CardCopyService {
 
         c.setState(in.getCurrentStateName(), false);
         c.setRules(in.getRules());
-        if (in.isTransformed()) {
-            c.incrementTransformedTimestamp();
-        }
+        c.setBackSide(in.isBackSide());
 
         return c;
     }
@@ -168,9 +166,6 @@ public class CardCopyService {
             // The characteristics of its front and back face are determined by the copiable values of the same face of the spell it is a copy of, as modified by any other copy effects.
             // If the spell it is a copy of has its back face up, the copy is created with its back face up. The token that’s put onto the battlefield as that spell resolves is a transforming token.
             to.setBackSide(copyFrom.isBackSide());
-            if (copyFrom.isTransformed()) {
-                to.incrementTransformedTimestamp();
-            }
         } else if (fromIsTransformedCard) {
             copyState(copyFrom, copyFrom.getCurrentStateName(), to, CardStateName.Original);
         } else {
@@ -274,9 +269,6 @@ public class CardCopyService {
         }
         newCopy.setFlipped(copyFrom.isFlipped());
         newCopy.setBackSide(copyFrom.isBackSide());
-        if (copyFrom.isTransformed()) {
-            newCopy.incrementTransformedTimestamp();
-        }
         if (newCopy.hasAlternateState()) {
             newCopy.setState(copyFrom.getCurrentStateName(), false, true);
         }
diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index b2966cbe849..b800d8e0a25 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -87,22 +87,16 @@ public class CardFactory {
         // need to create a physical card first, i need the original card faces
         final Card copy = getCard(original.getPaperCard(), controller, id, game);
 
+        copy.setStates(getCloneStates(original, copy, sourceSA));
+        // force update the now set State
         if (original.isTransformable()) {
+            copy.setState(original.isTransformed() ? CardStateName.Backside : CardStateName.Original, true, true);
             // 707.8a If an effect creates a token that is a copy of a transforming permanent or a transforming double-faced card not on the battlefield,
             // the resulting token is a transforming token that has both a front face and a back face.
             // The characteristics of each face are determined by the copiable values of the same face of the permanent it is a copy of, as modified by any other copy effects that apply to that permanent.
             // If the token is a copy of a transforming permanent with its back face up, the token enters the battlefield with its back face up.
             // This rule does not apply to tokens that are created with their own set of characteristics and enter the battlefield as a copy of a transforming permanent due to a replacement effect.
             copy.setBackSide(original.isBackSide());
-            if (original.isTransformed()) {
-                copy.incrementTransformedTimestamp();
-            }
-        }
-
-        copy.setStates(getCloneStates(original, copy, sourceSA));
-        // force update the now set State
-        if (original.isTransformable()) {
-            copy.setState(original.isTransformed() ? CardStateName.Backside : CardStateName.Original, true, true);
         } else {
             copy.setState(copy.getCurrentStateName(), true, true);
         }
@@ -376,22 +370,28 @@ public class CardFactory {
             }
         }
 
-        // Build English oracle and translated oracle mapping
+        // Negative card Id's are for view purposes only
         if (c.getId() >= 0) {
+            // Build English oracle and translated oracle mapping
             CardTranslation.buildOracleMapping(face.getName(), face.getOracleText(), variantName);
         }
 
-        // Name first so Senty has the Card name
+        // Set name for Sentry reports to be identifiable
         c.setName(face.getName());
 
-        for (Entry<String, String> v : face.getVariables())  c.setSVar(v.getKey(), v.getValue());
+        if (c.getId() >= 0) { // Set Triggers & Abilities if not for view
+            for (Entry<String, String> v : face.getVariables())
+                c.setSVar(v.getKey(), v.getValue());
+            for (String r : face.getReplacements())
+                c.addReplacementEffect(ReplacementHandler.parseReplacement(r, c, true, c.getCurrentState()));
+            for (String s : face.getStaticAbilities())
+                c.addStaticAbility(s);
+            for (String t : face.getTriggers())
+                c.addTrigger(TriggerHandler.parseTrigger(t, c, true, c.getCurrentState()));
 
-        for (String r : face.getReplacements())              c.addReplacementEffect(ReplacementHandler.parseReplacement(r, c, true, c.getCurrentState()));
-        for (String s : face.getStaticAbilities())           c.addStaticAbility(s);
-        for (String t : face.getTriggers())                  c.addTrigger(TriggerHandler.parseTrigger(t, c, true, c.getCurrentState()));
-
-        // keywords not before variables
-        c.addIntrinsicKeywords(face.getKeywords(), false);
+            // keywords not before variables
+            c.addIntrinsicKeywords(face.getKeywords(), false);
+        }
         if (face.getDraftActions() != null) {
             face.getDraftActions().forEach(c::addDraftAction);
         }
@@ -420,7 +420,8 @@ public class CardFactory {
 
         c.setAttractionLights(face.getAttractionLights());
 
-        CardFactoryUtil.addAbilityFactoryAbilities(c, face.getAbilities());
+        if (c.getId() > 0) // Set FactoryAbilities if not for view
+            CardFactoryUtil.addAbilityFactoryAbilities(c, face.getAbilities());
     }
 
     public static void copySpellAbility(SpellAbility from, SpellAbility to, final Card host, final Player p, final boolean lki, final boolean keepTextChanges) {
@@ -465,29 +466,29 @@ public class CardFactory {
         return new WrappedAbility(sa.getTrigger(), sa.getWrappedAbility().copy(newHost, controller, false), sa.getDecider());
     }
 
-    public static CardCloneStates getCloneStates(final Card in, final Card out, final CardTraitBase sa) {
-        final Card host = sa.getHostCard();
+    public static CardCloneStates getCloneStates(final Card in, final Card out, final CardTraitBase cause) {
+        final Card host = cause.getHostCard();
         final Map<String,String> origSVars = host.getSVars();
         final List<String> types = Lists.newArrayList();
         final List<String> keywords = Lists.newArrayList();
         boolean KWifNew = false;
         final List<String> removeKeywords = Lists.newArrayList();
         List<String> creatureTypes = null;
-        final CardCloneStates result = new CardCloneStates(in, sa);
+        final CardCloneStates result = new CardCloneStates(in, cause);
 
-        final String newName = sa.getParam("NewName");
+        final String newName = cause.getParam("NewName");
         ColorSet colors = null;
 
-        if (sa.hasParam("AddTypes")) {
-            types.addAll(Arrays.asList(sa.getParam("AddTypes").split(" & ")));
+        if (cause.hasParam("AddTypes")) {
+            types.addAll(Arrays.asList(cause.getParam("AddTypes").split(" & ")));
         }
 
-        if (sa.hasParam("SetCreatureTypes")) {
-            creatureTypes = ImmutableList.copyOf(sa.getParam("SetCreatureTypes").split(" "));
+        if (cause.hasParam("SetCreatureTypes")) {
+            creatureTypes = ImmutableList.copyOf(cause.getParam("SetCreatureTypes").split(" "));
         }
 
-        if (sa.hasParam("AddKeywords")) {
-            String kwString = sa.getParam("AddKeywords");
+        if (cause.hasParam("AddKeywords")) {
+            String kwString = cause.getParam("AddKeywords");
             if (kwString.startsWith("IfNew ")) {
                 KWifNew = true;
                 kwString = kwString.substring(6);
@@ -495,21 +496,21 @@ public class CardFactory {
             keywords.addAll(Arrays.asList(kwString.split(" & ")));
         }
 
-        if (sa.hasParam("RemoveKeywords")) {
-            removeKeywords.addAll(Arrays.asList(sa.getParam("RemoveKeywords").split(" & ")));
+        if (cause.hasParam("RemoveKeywords")) {
+            removeKeywords.addAll(Arrays.asList(cause.getParam("RemoveKeywords").split(" & ")));
         }
 
-        if (sa.hasParam("AddColors")) {
-            colors = ColorSet.fromNames(sa.getParam("AddColors").split(","));
+        if (cause.hasParam("AddColors")) {
+            colors = ColorSet.fromNames(cause.getParam("AddColors").split(","));
         }
 
-        if (sa.hasParam("SetColor")) {
-            colors = ColorSet.fromNames(sa.getParam("SetColor").split(","));
+        if (cause.hasParam("SetColor")) {
+            colors = ColorSet.fromNames(cause.getParam("SetColor").split(","));
         }
 
-        if (sa.hasParam("SetColorByManaCost")) {
-            if (sa.hasParam("SetManaCost")) {
-                colors = ColorSet.fromManaCost(new ManaCost(new ManaCostParser(sa.getParam("SetManaCost"))));
+        if (cause.hasParam("SetColorByManaCost")) {
+            if (cause.hasParam("SetManaCost")) {
+                colors = ColorSet.fromManaCost(new ManaCost(new ManaCostParser(cause.getParam("SetManaCost"))));
             } else {
                 colors = ColorSet.fromManaCost(host.getManaCost());
             }
@@ -521,56 +522,55 @@ public class CardFactory {
             // if something is cloning a facedown card, it only clones the
             // facedown state into original
             final CardState ret = new CardState(out, CardStateName.Original);
-            ret.copyFrom(in.getFaceDownState(), false, sa);
+            ret.copyFrom(in.getFaceDownState(), false, cause);
             result.put(CardStateName.Original, ret);
         } else if (in.isFlipCard()) {
             // if something is cloning a flip card, copy both original and
             // flipped state
             final CardState ret1 = new CardState(out, CardStateName.Original);
-            ret1.copyFrom(in.getState(CardStateName.Original), false, sa);
+            ret1.copyFrom(in.getState(CardStateName.Original), false, cause);
             result.put(CardStateName.Original, ret1);
 
             final CardState ret2 = new CardState(out, CardStateName.Flipped);
-            ret2.copyFrom(in.getState(CardStateName.Flipped), false, sa);
+            ret2.copyFrom(in.getState(CardStateName.Flipped), false, cause);
             result.put(CardStateName.Flipped, ret2);
         } else if (in.hasState(CardStateName.Secondary)) {
             final CardState ret1 = new CardState(out, CardStateName.Original);
-            ret1.copyFrom(in.getState(CardStateName.Original), false, sa);
+            ret1.copyFrom(in.getState(CardStateName.Original), false, cause);
             result.put(CardStateName.Original, ret1);
 
             final CardState ret2 = new CardState(out, CardStateName.Secondary);
-            ret2.copyFrom(in.getState(CardStateName.Secondary), false, sa);
+            ret2.copyFrom(in.getState(CardStateName.Secondary), false, cause);
             result.put(CardStateName.Secondary, ret2);
-        } else if (in.isTransformable() && sa instanceof SpellAbility && (
-                ApiType.CopyPermanent.equals(((SpellAbility)sa).getApi()) ||
-                ApiType.CopySpellAbility.equals(((SpellAbility)sa).getApi()) ||
-                ApiType.ReplaceToken.equals(((SpellAbility)sa).getApi())
-                )) {
+        } else if (in.isTransformable() && cause instanceof SpellAbility sa && (
+                ApiType.CopyPermanent.equals(sa.getApi()) ||
+                ApiType.CopySpellAbility.equals(sa.getApi()) ||
+                ApiType.ReplaceToken.equals(sa.getApi()))) {
             // CopyPermanent can copy token
             final CardState ret1 = new CardState(out, CardStateName.Original);
-            ret1.copyFrom(in.getState(CardStateName.Original), false, sa);
+            ret1.copyFrom(in.getState(CardStateName.Original), false, cause);
             result.put(CardStateName.Original, ret1);
 
             final CardState ret2 = new CardState(out, CardStateName.Backside);
-            ret2.copyFrom(in.getState(CardStateName.Backside), false, sa);
+            ret2.copyFrom(in.getState(CardStateName.Backside), false, cause);
             result.put(CardStateName.Backside, ret2);
         } else if (in.isSplitCard()) {
             // for split cards, copy all three states
             final CardState ret1 = new CardState(out, CardStateName.Original);
-            ret1.copyFrom(in.getState(CardStateName.Original), false, sa);
+            ret1.copyFrom(in.getState(CardStateName.Original), false, cause);
             result.put(CardStateName.Original, ret1);
 
             final CardState ret2 = new CardState(out, CardStateName.LeftSplit);
-            ret2.copyFrom(in.getState(CardStateName.LeftSplit), false, sa);
+            ret2.copyFrom(in.getState(CardStateName.LeftSplit), false, cause);
             result.put(CardStateName.LeftSplit, ret2);
 
             final CardState ret3 = new CardState(out, CardStateName.RightSplit);
-            ret3.copyFrom(in.getState(CardStateName.RightSplit), false, sa);
+            ret3.copyFrom(in.getState(CardStateName.RightSplit), false, cause);
             result.put(CardStateName.RightSplit, ret3);
         } else {
             // in all other cases just copy the current state to original
             final CardState ret = new CardState(out, CardStateName.Original);
-            ret.copyFrom(in.getState(in.getCurrentStateName()), false, sa);
+            ret.copyFrom(in.getState(in.getCurrentStateName()), false, cause);
             result.put(CardStateName.Original, ret);
         }
 
@@ -580,32 +580,32 @@ public class CardFactory {
             final CardState state = e.getValue();
 
             // has Embalm Condition for extra changes of Vizier of Many Faces
-            if (sa.hasParam("Embalm") && !out.isEmbalmed()) {
+            if (cause.hasParam("Embalm") && !out.isEmbalmed()) {
                 continue;
             }
 
             // update the names for the states
-            if (sa.hasParam("KeepName")) {
+            if (cause.hasParam("KeepName")) {
                 state.setName(originalState.getName());
             } else if (newName != null) {
                 // convert NICKNAME descriptions?
                 state.setName(newName);
             }
 
-            if (sa.hasParam("AddColors")) {
+            if (cause.hasParam("AddColors")) {
                 state.addColor(colors.getColor());
             }
 
-            if (sa.hasParam("SetColor") || sa.hasParam("SetColorByManaCost")) {
+            if (cause.hasParam("SetColor") || cause.hasParam("SetColorByManaCost")) {
                 state.setColor(colors.getColor());
             }
 
-            if (sa.hasParam("NonLegendary")) {
+            if (cause.hasParam("NonLegendary")) {
                 state.removeType(CardType.Supertype.Legendary);
             }
 
-            if (sa.hasParam("RemoveCardTypes")) {
-                state.removeCardTypes(sa.hasParam("RemoveSubTypes"));
+            if (cause.hasParam("RemoveCardTypes")) {
+                state.removeCardTypes(cause.hasParam("RemoveSubTypes"));
             }
 
             state.addType(types);
@@ -637,31 +637,31 @@ public class CardFactory {
 
             // CR 208.3 A noncreature object not on the battlefield has power or toughness only if it has a power and toughness printed on it.
             // currently only LKI can be trusted?
-            if ((sa.hasParam("SetPower") || sa.hasParam("SetToughness")) &&
+            if ((cause.hasParam("SetPower") || cause.hasParam("SetToughness")) &&
                 (state.getType().isCreature() || (originalState != null && in.getOriginalState(originalState.getStateName()).getBasePowerString() != null))) {
-                if (sa.hasParam("SetPower")) {
-                    state.setBasePower(AbilityUtils.calculateAmount(host, sa.getParam("SetPower"), sa));
+                if (cause.hasParam("SetPower")) {
+                    state.setBasePower(AbilityUtils.calculateAmount(host, cause.getParam("SetPower"), cause));
                 }
-                if (sa.hasParam("SetToughness")) {
-                    state.setBaseToughness(AbilityUtils.calculateAmount(host, sa.getParam("SetToughness"), sa));
+                if (cause.hasParam("SetToughness")) {
+                    state.setBaseToughness(AbilityUtils.calculateAmount(host, cause.getParam("SetToughness"), cause));
                 }
             }
 
-            if (state.getType().isPlaneswalker() && sa.hasParam("SetLoyalty")) {
-                state.setBaseLoyalty(String.valueOf(AbilityUtils.calculateAmount(host, sa.getParam("SetLoyalty"), sa)));
+            if (state.getType().isPlaneswalker() && cause.hasParam("SetLoyalty")) {
+                state.setBaseLoyalty(String.valueOf(AbilityUtils.calculateAmount(host, cause.getParam("SetLoyalty"), cause)));
             }
 
-            if (sa.hasParam("RemoveCost")) {
+            if (cause.hasParam("RemoveCost")) {
                 state.setManaCost(ManaCost.NO_COST);
             }
 
-            if (sa.hasParam("SetManaCost")) {
-                state.setManaCost(new ManaCost(new ManaCostParser(sa.getParam("SetManaCost"))));
+            if (cause.hasParam("SetManaCost")) {
+                state.setManaCost(new ManaCost(new ManaCostParser(cause.getParam("SetManaCost"))));
             }
 
             // SVars to add to clone
-            if (sa.hasParam("AddSVars") || sa.hasParam("GainTextSVars")) {
-                final String str = sa.getParamOrDefault("GainTextSVars", sa.getParam("AddSVars"));
+            if (cause.hasParam("AddSVars") || cause.hasParam("GainTextSVars")) {
+                final String str = cause.getParamOrDefault("GainTextSVars", cause.getParam("AddSVars"));
                 for (final String s : str.split(",")) {
                     if (origSVars.containsKey(s)) {
                         final String actualsVar = origSVars.get(s);
@@ -671,8 +671,8 @@ public class CardFactory {
             }
 
             // triggers to add to clone
-            if (sa.hasParam("AddTriggers")) {
-                for (final String s : sa.getParam("AddTriggers").split(",")) {
+            if (cause.hasParam("AddTriggers")) {
+                for (final String s : cause.getParam("AddTriggers").split(",")) {
                     if (origSVars.containsKey(s)) {
                         final String actualTrigger = origSVars.get(s);
                         final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, out, true, state);
@@ -682,8 +682,8 @@ public class CardFactory {
             }
 
             // abilities to add to clone
-            if (sa.hasParam("AddAbilities") || sa.hasParam("GainTextAbilities")) {
-                final String str = sa.getParamOrDefault("GainTextAbilities", sa.getParam("AddAbilities"));
+            if (cause.hasParam("AddAbilities") || cause.hasParam("GainTextAbilities")) {
+                final String str = cause.getParamOrDefault("GainTextAbilities", cause.getParam("AddAbilities"));
                 for (final String s : str.split(",")) {
                     if (origSVars.containsKey(s)) {
                         final String actualAbility = origSVars.get(s);
@@ -695,18 +695,18 @@ public class CardFactory {
             }
 
             // static abilities to add to clone
-            if (sa.hasParam("AddStaticAbilities")) {
-                final String str = sa.getParam("AddStaticAbilities");
+            if (cause.hasParam("AddStaticAbilities")) {
+                final String str = cause.getParam("AddStaticAbilities");
                 for (final String s : str.split(",")) {
                     if (origSVars.containsKey(s)) {
                         final String actualStatic = origSVars.get(s);
-                        state.addStaticAbility(StaticAbility.create(actualStatic, out, sa.getCardState(), true));
+                        state.addStaticAbility(StaticAbility.create(actualStatic, out, cause.getCardState(), true));
                     }
                 }
             }
 
-            if (sa.hasParam("GainThisAbility") && sa instanceof SpellAbility) {
-                SpellAbility root = ((SpellAbility) sa).getRootAbility();
+            if (cause.hasParam("GainThisAbility") && cause instanceof SpellAbility sa) {
+                SpellAbility root = sa.getRootAbility();
 
                 // Aurora Shifter
                 if (root.isTrigger() && root.getTrigger().getSpawningAbility() != null) {
@@ -723,35 +723,35 @@ public class CardFactory {
             }
 
             // Special Rules for Embalm and Eternalize
-            if (sa.isEmbalm() && sa.isIntrinsic()) {
+            if (cause.isEmbalm() && cause.isIntrinsic()) {
                 String name = "embalm_" + TextUtil.fastReplace(
                         TextUtil.fastReplace(host.getName(), ",", ""),
                         " ", "_").toLowerCase();
                 state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode()));
             }
 
-            if (sa.isEternalize() && sa.isIntrinsic()) {
+            if (cause.isEternalize() && cause.isIntrinsic()) {
                 String name = "eternalize_" + TextUtil.fastReplace(
                     TextUtil.fastReplace(host.getName(), ",", ""),
                         " ", "_").toLowerCase();
                 state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode()));
             }
 
-            if (sa.isKeyword(Keyword.OFFSPRING) && sa.isIntrinsic()) {
+            if (cause.isKeyword(Keyword.OFFSPRING) && cause.isIntrinsic()) {
                 String name = "offspring_" + TextUtil.fastReplace(
                         TextUtil.fastReplace(host.getName(), ",", ""),
                         " ", "_").toLowerCase();
                 state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode()));
             }
 
-            if (sa.isKeyword(Keyword.SQUAD) && sa.isIntrinsic()) {
+            if (cause.isKeyword(Keyword.SQUAD) && cause.isIntrinsic()) {
                 String name = "squad_" + TextUtil.fastReplace(
                         TextUtil.fastReplace(host.getName(), ",", ""),
                         " ", "_").toLowerCase();
                 state.setImageKey(StaticData.instance().getOtherImageKey(name, host.getSetCode()));
             }
             
-            if (sa.hasParam("GainTextOf") && originalState != null) {
+            if (cause.hasParam("GainTextOf") && originalState != null) {
                 state.setSetCode(originalState.getSetCode());
                 state.setRarity(originalState.getRarity());
                 state.setImageKey(originalState.getImageKey());
@@ -763,27 +763,27 @@ public class CardFactory {
                     continue;
                 }
 
-                if (sa.hasParam("SetPower") && sta.hasParam("SetPower"))
+                if (cause.hasParam("SetPower") && sta.hasParam("SetPower"))
                     state.removeStaticAbility(sta);
 
-                if (sa.hasParam("SetToughness") && sta.hasParam("SetToughness"))
+                if (cause.hasParam("SetToughness") && sta.hasParam("SetToughness"))
                     state.removeStaticAbility(sta);
 
                 // currently only Changeling and similar should be affected by that
                 // other cards using AddType$ ChosenType should not
-                if (sa.hasParam("SetCreatureTypes") && sta.hasParam("AddAllCreatureTypes")) {
+                if (cause.hasParam("SetCreatureTypes") && sta.hasParam("AddAllCreatureTypes")) {
                     state.removeStaticAbility(sta);
                 }
-                if ((sa.hasParam("SetColor") || sa.hasParam("SetColorByManaCost")) && sta.hasParam("SetColor")) {
+                if ((cause.hasParam("SetColor") || cause.hasParam("SetColorByManaCost")) && sta.hasParam("SetColor")) {
                     state.removeStaticAbility(sta);
                 }
             }
 
             // remove some keywords
-            if (sa.hasParam("SetCreatureTypes")) {
+            if (cause.hasParam("SetCreatureTypes")) {
                 state.removeIntrinsicKeyword(Keyword.CHANGELING);
             }
-            if (sa.hasParam("SetColor") || sa.hasParam("SetColorByManaCost")) {
+            if (cause.hasParam("SetColor") || cause.hasParam("SetColorByManaCost")) {
                 state.removeIntrinsicKeyword(Keyword.DEVOID);
             }
         }
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index c817e5d8c74..f5a3c133177 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -2238,7 +2238,7 @@ public class CardFactoryUtil {
             final String actualRep = "Event$ Draw | ActiveZones$ Graveyard | ValidPlayer$ You | "
                     + "Secondary$ True | Optional$ True | CheckSVar$ "
                     + "DredgeCheckLib | SVarCompare$ GE" + dredgeAmount
-                    + " | AICheckDredge$ True | Description$ CARDNAME - Dredge " + dredgeAmount;
+                    + " | Description$ CARDNAME - Dredge " + dredgeAmount;
 
             final String abString = "DB$ Mill | Defined$ You | NumCards$ " + dredgeAmount;
 
@@ -2568,7 +2568,7 @@ public class CardFactoryUtil {
         }  else if (keyword.equals("Sunburst")) {
             // Rule 702.43a If this object is entering the battlefield as a creature,
             // ignoring any type-changing effects that would affect it
-            CounterType t = CounterType.get(host.isCreature() ? CounterEnumType.P1P1 : CounterEnumType.CHARGE);
+            CounterType t = host.isCreature() ? CounterEnumType.P1P1 : CounterEnumType.CHARGE;
 
             StringBuilder sb = new StringBuilder("etbCounter:");
             sb.append(t).append(":Sunburst:no Condition:");
@@ -2776,10 +2776,9 @@ public class CardFactoryUtil {
             final String cost = params[1];
 
             final StringBuilder sbAttach = new StringBuilder();
-            sbAttach.append("SP$ Attach | Cost$ ");
+            sbAttach.append("SP$ Attach | ValidTgts$ Creature | Cost$ ");
             sbAttach.append(cost);
             sbAttach.append(" | AILogic$ ").append(params.length > 2 ? params[2] : "Pump");
-            sbAttach.append(" | Bestow$ True | ValidTgts$ Creature");
 
             final SpellAbility sa = AbilityFactory.getAbility(sbAttach.toString(), card);
             final StringBuilder sbDesc = new StringBuilder();
@@ -4113,7 +4112,7 @@ public class CardFactoryUtil {
                 sbValid.append("| ").append(param).append(k[1]);
             }
 
-            String effect = "Mode$ CantTarget | ValidCard$ Card.Self | Secondary$ True"
+            String effect = "Mode$ CantTarget | ValidTarget$ Card.Self | Secondary$ True"
                     + sbValid.toString() + " | Activator$ Opponent | Description$ "
                     + sbDesc.toString() + " (" + inst.getReminderText() + ")";
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
@@ -4154,7 +4153,7 @@ public class CardFactoryUtil {
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
 
             // Target
-            effect = "Mode$ CantTarget | Protection$ True | ValidCard$ Card.Self | Secondary$ True ";
+            effect = "Mode$ CantTarget | ValidTarget$ Card.Self | Secondary$ True ";
             if (!valid.isEmpty()) {
                 effect += "| ValidSource$ " + valid;
             }
@@ -4162,7 +4161,7 @@ public class CardFactoryUtil {
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
 
             // Attach
-            effect = "Mode$ CantAttach | Protection$ True | Target$ Card.Self | Secondary$ True ";
+            effect = "Mode$ CantAttach | Target$ Card.Self | Secondary$ True ";
             if (!valid.isEmpty()) {
                 effect += "| ValidCard$ " + valid;
             }
@@ -4183,7 +4182,7 @@ public class CardFactoryUtil {
                     " | Description$ Chapter abilities of this Saga can't trigger the turn it entered the battlefield unless it has exactly the number of lore counters on it specified in the chapter symbol of that ability.";
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
         } else if (keyword.equals("Shroud")) {
-            String effect = "Mode$ CantTarget | ValidCard$ Card.Self | Secondary$ True"
+            String effect = "Mode$ CantTarget | ValidTarget$ Card.Self | Secondary$ True"
                     + " | Description$ Shroud (" + inst.getReminderText() + ")";
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
         } else if (keyword.equals("Skulk")) {
diff --git a/forge-game/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java
index 279499db015..8f91260b10d 100644
--- a/forge-game/src/main/java/forge/game/card/CardLists.java
+++ b/forge-game/src/main/java/forge/game/card/CardLists.java
@@ -26,12 +26,17 @@ import forge.game.spellability.TargetRestrictions;
 import forge.game.staticability.StaticAbilityTapPowerValue;
 import forge.util.IterableUtil;
 import forge.util.MyRandom;
+import forge.util.StreamUtil;
 import forge.util.collect.FCollectionView;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -480,4 +485,26 @@ public class CardLists {
         // (b) including the last element
         return isSubsetSum(numList, sum) || isSubsetSum(numList, sum - last);
     }
+
+    public static int getDifferentNamesCount(Iterable<Card> cardList) {
+        // first part the ones with SpyKit, and already collect them via
+        Map<Boolean, List<Card>> parted = StreamUtil.stream(cardList).collect(Collectors
+                .partitioningBy(Card::hasNonLegendaryCreatureNames, Collector.of(ArrayList::new, (list, c) -> {
+                    if (!c.hasNoName() && list.stream().noneMatch(c2 -> c.sharesNameWith(c2))) {
+                        list.add(c);
+                    }
+                }, (l1, l2) -> {
+                    l1.addAll(l2);
+                    return l1;
+                })));
+        List<Card> preList = parted.get(Boolean.FALSE);
+
+        // then try to apply the SpyKit ones
+        for (Card c : parted.get(Boolean.TRUE)) {
+            if (preList.stream().noneMatch(c2 -> c.sharesNameWith(c2))) {
+                preList.add(c);
+            }
+        }
+        return preList.size();
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java
index c030da0359d..dc74aedc746 100644
--- a/forge-game/src/main/java/forge/game/card/CardPredicates.java
+++ b/forge-game/src/main/java/forge/game/card/CardPredicates.java
@@ -213,16 +213,10 @@ public final class CardPredicates {
     public static Predicate<Card> hasCounter(final CounterType type) {
         return hasCounter(type, 1);
     }
-    public static Predicate<Card> hasCounter(final CounterEnumType type) {
-        return hasCounter(type, 1);
-    }
 
     public static Predicate<Card> hasCounter(final CounterType type, final int n) {
         return c -> c.getCounters(type) >= n;
     }
-    public static Predicate<Card> hasCounter(final CounterEnumType type, final int n) {
-        return hasCounter(CounterType.get(type), n);
-    }
 
     public static Predicate<Card> hasLessCounter(final CounterType type, final int n) {
         return c -> {
@@ -230,16 +224,10 @@ public final class CardPredicates {
             return x > 0 && x <= n;
         };
     }
-    public static Predicate<Card> hasLessCounter(final CounterEnumType type, final int n) {
-        return hasLessCounter(CounterType.get(type), n);
-    }
 
     public static Predicate<Card> canReceiveCounters(final CounterType counter) {
         return c -> c.canReceiveCounters(counter);
     }
-    public static Predicate<Card> canReceiveCounters(final CounterEnumType counter) {
-        return canReceiveCounters(CounterType.get(counter));
-    }
 
     public static Predicate<Card> hasGreaterPowerThan(final int minPower) {
         return c -> c.getNetPower() > minPower;
@@ -248,9 +236,6 @@ public final class CardPredicates {
     public static Comparator<Card> compareByCounterType(final CounterType type) {
         return Comparator.comparingInt(arg0 -> arg0.getCounters(type));
     }
-    public static Comparator<Card> compareByCounterType(final CounterEnumType type) {
-        return compareByCounterType(CounterType.get(type));
-    }
 
     public static Predicate<Card> hasSVar(final String name) {
         return c -> c.hasSVar(name);
diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java
index c0433236286..e27a4f8fed7 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -66,12 +66,6 @@ public class CardProperty {
             if (!card.sharesNameWith(name)) {
                 return false;
             }
-        } else if (property.startsWith("notnamed")) {
-            String name = TextUtil.fastReplace(property.substring(8), ";", ","); // workaround for card name with ","
-            name = TextUtil.fastReplace(name, "_", " ");
-            if (card.sharesNameWith(name)) {
-                return false;
-            }
         } else if (property.equals("NamedCard")) {
             boolean found = false;
             for (String name : source.getNamedCards()) {
@@ -1244,7 +1238,8 @@ public class CardProperty {
             if (property.contains("ControlledBy")) {
                 FCollectionView<Player> p = AbilityUtils.getDefinedPlayers(source, property.split("ControlledBy")[1], spellAbility);
                 cards = CardLists.filterControlledBy(cards, p);
-                if (!cards.contains(card)) {
+                // Kraven the Hunter LTB trigger
+                if (!card.isLKI() && !cards.contains(card)) {
                     return false;
                 }
             }
@@ -1563,8 +1558,6 @@ public class CardProperty {
                     return false;
                 }
             }
-        } else if (property.startsWith("notattacking")) {
-            return null == combat || !combat.isAttacking(card);
         } else if (property.startsWith("enlistedThisCombat")) {
             if (card.getEnlistedThisCombat() == false) return false;
         } else if (property.startsWith("attackedThisCombat")) {
@@ -1618,8 +1611,6 @@ public class CardProperty {
             if (Collections.disjoint(combat.getAttackersBlockedBy(source), combat.getAttackersBlockedBy(card))) {
                 return false;
             }
-        } else if (property.startsWith("notblocking")) {
-            return null == combat || !combat.isBlocking(card);
         }
         // Nex predicates refer to past combat and don't need a reference to actual combat
         else if (property.equals("blocked")) {
@@ -1819,6 +1810,10 @@ public class CardProperty {
             if (!card.isWarped()) {
                 return false;
             }
+        } else if (property.equals("webSlinged")) {
+            if (!card.isWebSlinged()) {
+                return false;
+            }
         } else if (property.equals("CrewedThisTurn")) {
             if (!hasTimestampMatch(card, source.getCrewedByThisTurn())) return false;
         } else if (property.equals("CrewedBySourceThisTurn")) {
@@ -1827,6 +1822,10 @@ public class CardProperty {
             if (card.getDevouredCards().isEmpty()) {
                 return false;
             }
+        } else if (property.equals("harnessed")) {
+            if (!card.isHarnessed()) {
+                return false;
+            }
         } else if (property.equals("IsMonstrous")) {
             if (!card.isMonstrous()) {
                 return false;
@@ -2064,16 +2063,6 @@ public class CardProperty {
             } else {
                 return false;
             }
-        } else if (property.startsWith("NotTriggered")) {
-            final String key = property.substring("NotTriggered".length());
-            if (spellAbility instanceof SpellAbility) {
-                SpellAbility sa = (SpellAbility) spellAbility;
-                if (card.equals(sa.getRootAbility().getTriggeringObject(AbilityKey.fromString(key)))) {
-                    return false;
-                }
-            } else {
-                return false;
-            }
         } else if (property.startsWith("NotDefined")) {
             final String key = property.substring("NotDefined".length());
             if (AbilityUtils.getDefinedCards(source, key, spellAbility).contains(card)) {
diff --git a/forge-game/src/main/java/forge/game/card/CardState.java b/forge-game/src/main/java/forge/game/card/CardState.java
index d0bb304503b..289520ecf28 100644
--- a/forge-game/src/main/java/forge/game/card/CardState.java
+++ b/forge-game/src/main/java/forge/game/card/CardState.java
@@ -32,6 +32,7 @@ import forge.game.card.CardView.CardStateView;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordCollection;
 import forge.game.keyword.KeywordInterface;
+import forge.game.keyword.KeywordWithType;
 import forge.game.player.Player;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.spellability.LandAbility;
@@ -40,6 +41,7 @@ import forge.game.spellability.SpellAbilityPredicates;
 import forge.game.spellability.SpellPermanent;
 import forge.game.staticability.StaticAbility;
 import forge.game.trigger.Trigger;
+import forge.util.CardTranslation;
 import forge.util.ITranslatable;
 import forge.util.IterableUtil;
 import forge.util.collect.FCollection;
@@ -367,7 +369,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
     public final FCollectionView<SpellAbility> getManaAbilities() {
         FCollection<SpellAbility> newCol = new FCollection<>();
         updateSpellAbilities(newCol, true);
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         newCol.addAll(abilities.stream().filter(SpellAbility::isManaAbility).collect(Collectors.toList()));
         card.updateSpellAbilities(newCol, this, true);
         return newCol;
@@ -375,7 +377,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
     public final FCollectionView<SpellAbility> getNonManaAbilities() {
         FCollection<SpellAbility> newCol = new FCollection<>();
         updateSpellAbilities(newCol, false);
-        // stream().toList() causes crash on Android, use Collectors.toList()
+        // stream().toList() causes crash on Android 8-13, use Collectors.toList()
         newCol.addAll(abilities.stream().filter(Predicate.not(SpellAbility::isManaAbility)).collect(Collectors.toList()));
         card.updateSpellAbilities(newCol, this, false);
         return newCol;
@@ -390,7 +392,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
                 if (null != mana) {
                     leftAbilities = leftAbilities.stream()
                             .filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
-                            // stream().toList() causes crash on Android, use Collectors.toList()
+                            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
                             .collect(Collectors.toList());
                 }
                 newCol.addAll(leftAbilities);
@@ -402,7 +404,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
                 if (null != mana) {
                     rightAbilities = rightAbilities.stream()
                             .filter(mana ? SpellAbility::isManaAbility : Predicate.not(SpellAbility::isManaAbility))
-                            // stream().toList() causes crash on Android, use Collectors.toList()
+                            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
                             .collect(Collectors.toList());
                 }
                 newCol.addAll(rightAbilities);
@@ -468,6 +470,9 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
         return Iterables.getFirst(getIntrinsicSpellAbilities(), null);
     }
     public final SpellAbility getFirstSpellAbility() {
+        if (this.card.getCastSA() != null) {
+            return this.card.getCastSA();
+        }
         return Iterables.getFirst(getNonManaAbilities(), null);
     }
 
@@ -497,15 +502,8 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
             String desc = "";
             String extra = "";
             for (KeywordInterface ki : this.getCachedKeyword(Keyword.ENCHANT)) {
-                String o = ki.getOriginal();
-                String m[] = o.split(":");
-                if (m.length > 2) {
-                    desc = m[2];
-                } else {
-                    desc = m[1];
-                    if (CardType.isACardType(desc) || "Permanent".equals(desc) || "Player".equals(desc) || "Opponent".equals(desc)) {
-                        desc = desc.toLowerCase();
-                    }
+                if (ki instanceof KeywordWithType kwt) {
+                    desc = kwt.getTypeDescription();
                 }
                 break;
             }
@@ -605,18 +603,18 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
             result.add(loyaltyRep);
         }
         if (type.isBattle()) {
-            // TODO This is currently breaking for Battle/Defense
-            // Going to script the cards to work but ideally it would happen here
             if (defenseRep == null) {
                 defenseRep = CardFactoryUtil.makeEtbCounter("etbCounter:DEFENSE:" + this.baseDefense, this, true);
             }
             result.add(defenseRep);
-
-            // TODO add Siege "Choose a player to protect it"
         }
+
+        card.updateReplacementEffects(result, this);
+
+        // below are global rules
         if (type.hasSubtype("Saga") && !hasKeyword(Keyword.READ_AHEAD)) {
             if (sagaRep == null) {
-                sagaRep = CardFactoryUtil.makeEtbCounter("etbCounter:LORE:1", this, true);
+                sagaRep = CardFactoryUtil.makeEtbCounter("etbCounter:LORE:1", this, false);
             }
             result.add(sagaRep);
         }
@@ -633,7 +631,6 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
             result.add(omenRep);
         }
 
-        card.updateReplacementEffects(result, this);
         return result;
     }
     public boolean addReplacementEffect(final ReplacementEffect replacementEffect) {
@@ -944,7 +941,7 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
     }
 
     @Override
-    public String getUntranslatedOracle() {
-        return getOracleText();
+    public String getTranslatedName() {
+        return CardTranslation.getTranslatedName(this);
     }
 }
diff --git a/forge-game/src/main/java/forge/game/card/CardView.java b/forge-game/src/main/java/forge/game/card/CardView.java
index 674477c3795..773b82204aa 100644
--- a/forge-game/src/main/java/forge/game/card/CardView.java
+++ b/forge-game/src/main/java/forge/game/card/CardView.java
@@ -60,13 +60,12 @@ public class CardView extends GameEntityView {
     }
 
     public static TrackableCollection<CardView> getCollection(Iterable<Card> cards) {
-        if (cards == null) {
-            return null;
-        }
         TrackableCollection<CardView> collection = new TrackableCollection<>();
-        for (Card c : cards) {
-            if (c.getRenderForUI()) { //only add cards that match their card for UI
-                collection.add(c.getView());
+        if (cards != null) {
+            for (Card c : cards) {
+                if (c != null && c.getRenderForUI()) { //only add cards that match their card for UI
+                    collection.add(c.getView());
+                }
             }
         }
         return collection;
@@ -1096,7 +1095,7 @@ public class CardView extends GameEntityView {
             if (c.getGame() != null) {
                 if (c.hasPerpetual()) currentStateView.updateColors(c);
                 else currentStateView.updateColors(currentState);
-                currentStateView.updateHasChangeColors(!Iterables.isEmpty(c.getChangedCardColors()));
+                currentStateView.updateHasChangeColors(c.hasChangedCardColors());
             }
         } else {
             currentStateView.updateLoyalty(currentState);
@@ -1842,8 +1841,8 @@ public class CardView extends GameEntityView {
         }
 
         @Override
-        public String getUntranslatedOracle() {
-            return getOracleText();
+        public String getTranslatedName() {
+            return CardTranslation.getTranslatedName(this);
         }
     }
 
diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
index 2beca786f9f..01b3751f5a5 100644
--- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java
@@ -28,7 +28,7 @@ import java.util.Locale;
  * @author Clemens Koza
  * @version V0.0 17.02.2010
  */
-public enum CounterEnumType {
+public enum CounterEnumType implements CounterType {
 
     M1M1("-1/-1", "-1/-1", 255, 110, 106),
     P1P1("+1/+1", "+1/+1", 96, 226, 23),
@@ -167,6 +167,8 @@ public enum CounterEnumType {
 
     FILIBUSTER("FLBTR", 255, 179, 119),
 
+    FILM("FILM", 255, 255, 255),
+
     FINALITY("FINAL", 255, 255, 255),
 
     FIRE("FIRE", 240, 30, 35),
@@ -555,4 +557,14 @@ public enum CounterEnumType {
 
     public static final ImmutableList<CounterEnumType> values = ImmutableList.copyOf(values());
 
+    @Override
+    public boolean is(CounterEnumType eType) {
+        return this == eType;
+    }
+
+    @Override
+    public boolean isKeywordCounter() {
+        return false;
+    }
+
 }
diff --git a/forge-game/src/main/java/forge/game/card/CounterKeywordType.java b/forge-game/src/main/java/forge/game/card/CounterKeywordType.java
new file mode 100644
index 00000000000..6ceea9a0043
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/card/CounterKeywordType.java
@@ -0,0 +1,74 @@
+package forge.game.card;
+
+import java.util.Map;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
+
+public record CounterKeywordType(String keyword) implements CounterType {
+
+    // Rule 122.1b
+    static ImmutableList<String> keywordCounter = ImmutableList.of(
+            "Flying", "First Strike", "Double Strike", "Deathtouch", "Decayed", "Exalted", "Haste", "Hexproof",
+            "Indestructible", "Lifelink", "Menace", "Reach", "Shadow", "Trample", "Vigilance");
+    private static Map<String, CounterKeywordType> sMap = Maps.newHashMap();
+
+
+    public static CounterKeywordType get(String s) {
+        if (!sMap.containsKey(s)) {
+            sMap.put(s, new CounterKeywordType(s));
+        }
+        return sMap.get(s);
+    }
+    
+    @Override
+    public String toString() {
+        return keyword;
+    }
+
+    public String getName() {
+        return getKeywordDescription();
+    }
+
+    public String getCounterOnCardDisplayName() {
+        return getKeywordDescription();
+    }
+
+    private String getKeywordDescription() {
+        if (keyword.startsWith("Hexproof:")) {
+            final String[] k = keyword.split(":");
+            return "Hexproof from " + k[2];
+        }
+        if (keyword.startsWith("Trample:")) {
+            return "Trample over Planeswalkers";
+        }
+        return keyword;
+    }
+
+    public boolean is(CounterEnumType eType) {
+        return false;
+    }
+
+    public boolean isKeywordCounter() {
+        if (keyword.startsWith("Hexproof:")) {
+            return true;
+        }
+        if (keyword.startsWith("Trample:")) {
+            return true;
+        }
+        return keywordCounter.contains(keyword);
+    }
+    
+
+    public int getRed() {
+        return 255;
+    }
+
+    public int getGreen() {
+        return 255;
+    }
+
+    public int getBlue() {
+        return 255;
+    }
+}
diff --git a/forge-game/src/main/java/forge/game/card/CounterType.java b/forge-game/src/main/java/forge/game/card/CounterType.java
index 6a5007c2927..75864f47f2a 100644
--- a/forge-game/src/main/java/forge/game/card/CounterType.java
+++ b/forge-game/src/main/java/forge/game/card/CounterType.java
@@ -1,141 +1,31 @@
 package forge.game.card;
 
-import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-
 import java.io.Serializable;
-import java.util.Map;
-import java.util.Objects;
 
-public class CounterType implements Comparable<CounterType>, Serializable {
-    private static final long serialVersionUID = -7575835723159144478L;
-
-    private CounterEnumType eVal = null;
-    private String sVal = null;
-
-    // Rule 122.1b
-    static ImmutableList<String> keywordCounter = ImmutableList.of(
-            "Flying", "First Strike", "Double Strike", "Deathtouch", "Decayed", "Exalted", "Haste", "Hexproof",
-            "Indestructible", "Lifelink", "Menace", "Reach", "Shadow", "Trample", "Vigilance");
-
-    private static Map<CounterEnumType, CounterType> eMap = Maps.newEnumMap(CounterEnumType.class);
-    private static Map<String, CounterType> sMap = Maps.newHashMap();
-
-    private CounterType(CounterEnumType e, String s) {
-        this.eVal = e;
-        this.sVal = s;
-    }
-
-    public static CounterType get(CounterEnumType e) {
-        if (!eMap.containsKey(e)) {
-            eMap.put(e, new CounterType(e, null));
-        }
-        return eMap.get(e);
-    }
-
-    public static CounterType get(String s) {
-        if (!sMap.containsKey(s)) {
-            sMap.put(s, new CounterType(null, s));
-        }
-        return sMap.get(s);
-    }
+public interface CounterType extends Serializable {
 
     public static CounterType getType(String name) {
         if ("Any".equalsIgnoreCase(name)) {
             return null;
         }
         try {
-            return get(CounterEnumType.getType(name));
+            return CounterEnumType.getType(name);
         } catch (final IllegalArgumentException ex) {
-            return get(name);
+            return CounterKeywordType.get(name);
         }
     }
 
+    public String getName();
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(eVal, sVal);
-    }
+    public String getCounterOnCardDisplayName();
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (this == obj) {
-            return true;
-        }
-        if (obj.getClass() != getClass()) {
-            return false;
-        }
-        CounterType rhs = (CounterType) obj;
-        return new EqualsBuilder()
-                .append(eVal, rhs.eVal)
-                .append(sVal, rhs.sVal)
-                .isEquals();
-    }
+    public boolean is(CounterEnumType eType);
 
-    @Override
-    public String toString() {
-        return eVal != null ? eVal.toString() : sVal;
-    }
+    public boolean isKeywordCounter();
 
-    public String getName() {
-        return eVal != null ? eVal.getName() : getKeywordDescription();
-    }
+    public int getRed();
 
-    public String getCounterOnCardDisplayName() {
-        return eVal != null ? eVal.getCounterOnCardDisplayName() : getKeywordDescription();
-    }
+    public int getGreen();
 
-    private String getKeywordDescription() {
-        if (sVal.startsWith("Hexproof:")) {
-            final String[] k = sVal.split(":");
-            return "Hexproof from " + k[2];
-        }
-        if (sVal.startsWith("Trample:")) {
-            return "Trample over Planeswalkers";
-        }
-        return sVal;
-    }
-
-    @Override
-    public int compareTo(CounterType o) {
-        return ComparisonChain.start()
-                .compare(eVal, o.eVal, Ordering.natural().nullsLast())
-                .compare(sVal, o.sVal, Ordering.natural().nullsLast())
-                .result();
-    }
-
-    public boolean is(CounterEnumType eType) {
-        return eVal == eType;
-    }
-
-    public boolean isKeywordCounter() {
-        if (eVal != null) {
-            return false;
-        }
-        if (sVal.startsWith("Hexproof:")) {
-            return true;
-        }
-        if (sVal.startsWith("Trample:")) {
-            return true;
-        }
-        return keywordCounter.contains(sVal);
-    }
-
-    public int getRed() {
-        return eVal != null ? eVal.getRed() : 255;
-    }
-
-    public int getGreen() {
-        return eVal != null ? eVal.getGreen() : 255;
-    }
-
-    public int getBlue() {
-        return eVal != null ? eVal.getBlue() : 255;
-    }
+    public int getBlue();
 }
diff --git a/forge-game/src/main/java/forge/game/card/perpetual/PerpetualColors.java b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualColors.java
index ecdf4f287cb..20c999c65c5 100644
--- a/forge-game/src/main/java/forge/game/card/perpetual/PerpetualColors.java
+++ b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualColors.java
@@ -12,7 +12,7 @@ public record PerpetualColors(long timestamp, ColorSet colors, boolean overwrite
 
     @Override
     public void applyEffect(Card c) {
-        c.addColor(colors, !overwrite, timestamp, (long) 0, false);
+        c.addColor(colors, !overwrite, timestamp, null);
     }
 
 }
diff --git a/forge-game/src/main/java/forge/game/card/perpetual/PerpetualIncorporate.java b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualIncorporate.java
index 0b647fe1f5d..386b7c2c588 100644
--- a/forge-game/src/main/java/forge/game/card/perpetual/PerpetualIncorporate.java
+++ b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualIncorporate.java
@@ -17,7 +17,7 @@ public record PerpetualIncorporate(long timestamp, ManaCost incorporate) impleme
         ColorSet colors = ColorSet.fromMask(incorporate.getColorProfile());
         final ManaCost newCost = ManaCost.combine(c.getManaCost(), incorporate);
         c.addChangedManaCost(newCost, timestamp, (long) 0);
-        c.addColor(colors, true, timestamp, (long) 0, false);
+        c.addColor(colors, true, timestamp, null);
         c.updateManaCostForView();
 
         if (c.getFirstSpellAbility() != null) {
diff --git a/forge-game/src/main/java/forge/game/card/perpetual/PerpetualManaCost.java b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualManaCost.java
new file mode 100644
index 00000000000..0c8cffa4673
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/card/perpetual/PerpetualManaCost.java
@@ -0,0 +1,26 @@
+package forge.game.card.perpetual;
+
+import forge.card.mana.ManaCost;
+import forge.game.card.Card;
+import forge.game.cost.Cost;
+
+public record PerpetualManaCost(long timestamp, ManaCost manaCost) implements PerpetualInterface {
+
+    @Override
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    @Override
+    public void applyEffect(Card c) {
+        c.addChangedManaCost(manaCost, timestamp, (long) 0);
+
+        c.updateManaCostForView();
+
+        if (c.getFirstSpellAbility() != null) {
+            Cost cost = c.getFirstSpellAbility().getPayCosts().copyWithDefinedMana(manaCost);
+            c.getFirstSpellAbility().setPayCosts(cost);
+        }
+    }
+
+}
diff --git a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
index b15ed8cd1ae..678420d49c8 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
@@ -1,6 +1,5 @@
 package forge.game.combat;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -39,10 +38,12 @@ public class AttackRequirement {
 
         //MustAttack static check
         final List<GameEntity> mustAttack = StaticAbilityMustAttack.entitiesMustAttack(attacker);
-        nAttackAnything += Collections.frequency(mustAttack, attacker);
         for (GameEntity e : mustAttack) {
-            if (e.equals(attacker)) continue;
-            defenderSpecific.add(e);
+            if (e.equals(attacker)) {
+                nAttackAnything++;
+            } else {
+                defenderSpecific.add(e);
+            }
         }
 
         for (final GameEntity defender : possibleDefenders) {
diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 351d051fda4..16902d805e1 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -225,7 +225,7 @@ public class CombatUtil {
                     if (!ge.equals(defender) && ge instanceof Player) {
                         // found a player which does not goad that creature
                         // and creature can attack this player or planeswalker
-                        if (!attacker.isGoadedBy((Player) ge) && !ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
+                        if (!attacker.isGoadedBy((Player) ge) && canAttack(attacker, ge)) {
                             return false;
                         }
                     }
@@ -233,17 +233,6 @@ public class CombatUtil {
             }
         }
 
-        // Quasi-goad logic for "Kardur, Doomscourge" etc. that isn't goad but behaves the same
-        if (defender != null && defender.hasKeyword("Creatures your opponents control attack a player other than you if able.")) {
-            for (GameEntity ge : getAllPossibleDefenders(attacker.getController())) {
-                if (!ge.equals(defender) && ge instanceof Player) {
-                    if (!ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
-                        return false;
-                    }
-                }
-            }
-        }
-
         // CantAttack static abilities
         if (StaticAbilityCantAttackBlock.cantAttack(attacker, defender)) {
             return false;
diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java
index 9c0e9070415..8cf784c6e7e 100644
--- a/forge-game/src/main/java/forge/game/cost/Cost.java
+++ b/forge-game/src/main/java/forge/game/cost/Cost.java
@@ -237,17 +237,17 @@ public class Cost implements Serializable {
         CostPartMana parsedMana = null;
         for (String part : parts) {
             if (part.startsWith("XMin")) {
-                xMin = (part);
+                xMin = part;
             } else if ("Mandatory".equals(part)) {
                 this.isMandatory = true;
             } else {
                 CostPart cp = parseCostPart(part, tapCost, untapCost);
                 if (null != cp)
-                    if (cp instanceof CostPartMana) {
-                        parsedMana = (CostPartMana) cp;
+                    if (cp instanceof CostPartMana p) {
+                        parsedMana = p;
                     } else {
-                        if (cp instanceof CostPartWithList) {
-                            ((CostPartWithList)cp).setIntrinsic(intrinsic);
+                        if (cp instanceof CostPartWithList p) {
+                            p.setIntrinsic(intrinsic);
                         }
                         this.costParts.add(cp);
                     }
@@ -621,8 +621,11 @@ public class Cost implements Serializable {
     }
 
     public final Cost copyWithDefinedMana(String manaCost) {
+        return copyWithDefinedMana(new ManaCost(new ManaCostParser(manaCost)));
+    }
+    public final Cost copyWithDefinedMana(ManaCost manaCost) {
         Cost toRet = copyWithNoMana();
-        toRet.costParts.add(new CostPartMana(new ManaCost(new ManaCostParser(manaCost)), null));
+        toRet.costParts.add(new CostPartMana(manaCost, null));
         toRet.cacheTapCost();
         return toRet;
     }
@@ -994,9 +997,9 @@ public class Cost implements Serializable {
                                 Integer counters = otherAmount - part.convertAmount();
                                 // the cost can turn positive if multiple Carth raise it
                                 if (counters < 0) {
-                                    costParts.add(new CostPutCounter(String.valueOf(counters *-1), CounterType.get(CounterEnumType.LOYALTY), part.getType(), part.getTypeDescription()));
+                                    costParts.add(new CostPutCounter(String.valueOf(counters *-1), CounterEnumType.LOYALTY, part.getType(), part.getTypeDescription()));
                                 } else {
-                                    costParts.add(new CostRemoveCounter(String.valueOf(counters), CounterType.get(CounterEnumType.LOYALTY), part.getType(), part.getTypeDescription(), Lists.newArrayList(ZoneType.Battlefield) , false));
+                                    costParts.add(new CostRemoveCounter(String.valueOf(counters), CounterEnumType.LOYALTY, part.getType(), part.getTypeDescription(), Lists.newArrayList(ZoneType.Battlefield) , false));
                                 }
                             } else {
                                 continue;
diff --git a/forge-game/src/main/java/forge/game/cost/CostDiscard.java b/forge-game/src/main/java/forge/game/cost/CostDiscard.java
index e89a8213419..755c341ed14 100644
--- a/forge-game/src/main/java/forge/game/cost/CostDiscard.java
+++ b/forge-game/src/main/java/forge/game/cost/CostDiscard.java
@@ -18,7 +18,6 @@
 package forge.game.cost;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import forge.game.ability.AbilityKey;
 import forge.game.card.*;
 import forge.game.player.Player;
@@ -29,7 +28,6 @@ import forge.util.TextUtil;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * The Class CostDiscard.
@@ -63,11 +61,20 @@ public class CostDiscard extends CostPartWithList {
     public Integer getMaxAmountX(SpellAbility ability, Player payer, final boolean effect) {
         final Card source = ability.getHostCard();
         String type = this.getType();
+
+        boolean differentNames = false;
+        if (type.contains("+WithDifferentNames")) {
+            type = type.replace("+WithDifferentNames", "");
+            differentNames = true;
+        }
         CardCollectionView handList = payer.canDiscardBy(ability, effect) ? payer.getCardsIn(ZoneType.Hand) : CardCollection.EMPTY;
 
         if (!type.equals("Random")) {
             handList = CardLists.getValidCards(handList, type.split(";"), payer, source, ability);
         }
+        if (differentNames) {
+            return CardLists.getDifferentNamesCount(handList);
+        }
         return handList.size();
     }
 
@@ -92,7 +99,7 @@ public class CostDiscard extends CostPartWithList {
         else if (this.getType().equals("LastDrawn")) {
             sb.append("the last card you drew this turn");
         }
-        else if (this.getType().equals("DifferentNames")) {
+        else if (this.getType().contains("+WithDifferentNames")) {
             sb.append(Cost.convertAmountTypeToWords(i, this.getAmount(), "Card")).append(" with different names");
         }
         else {
@@ -145,21 +152,17 @@ public class CostDiscard extends CostPartWithList {
             final Card c = payer.getLastDrawnCard();
             return handList.contains(c);
         }
-        else if (type.equals("DifferentNames")) {
-            Set<String> cardNames = Sets.newHashSet();
-            for (Card c : handList) {
-                if (!c.hasNoName()) {
-                    cardNames.add(c.getName());
-                }
-            }
-            return cardNames.size() >= amount;
-        }
         else {
             boolean sameName = false;
+            boolean differentNames = false;
             if (type.contains("+WithSameName")) {
                 sameName = true;
                 type = TextUtil.fastReplace(type, "+WithSameName", "");
             }
+            if (type.contains("+WithDifferentNames")) {
+                type = type.replace("+WithDifferentNames", "");
+                differentNames = true;
+            }
             if (type.contains("ChosenColor") && !source.hasChosenColor()) {
                 //color hasn't been chosen yet, so skip getValidCards
             } else if (!type.equals("Random") && !type.contains("X")) {
@@ -173,6 +176,10 @@ public class CostDiscard extends CostPartWithList {
                     }
                 }
                 return false;
+            } else if (differentNames) {
+                if (CardLists.getDifferentNamesCount(handList) < amount) {
+                    return false;
+                }
             }
             int adjustment = 0;
             if (source.isInZone(ZoneType.Hand) && payer.equals(source.getOwner())) {
diff --git a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java
index a99c3da8b2d..357235f88bc 100644
--- a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java
+++ b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java
@@ -17,7 +17,6 @@
  */
 package forge.game.cost;
 
-import com.google.common.collect.Sets;
 import forge.card.CardType;
 import forge.game.Game;
 import forge.game.ability.AbilityKey;
@@ -31,7 +30,6 @@ import forge.game.zone.ZoneType;
 import forge.util.Lang;
 
 import java.util.Map;
-import java.util.Set;
 
 /**
  * The Class CostSacrifice.
@@ -74,16 +72,7 @@ public class CostSacrifice extends CostPartWithList {
         }
         typeList = CardLists.filter(typeList, CardPredicates.canBeSacrificedBy(ability, effect));
         if (differentNames) {
-            // TODO rewrite with sharesName to respect Spy Kit
-            final Set<String> crdname = Sets.newHashSet();
-            for (final Card card : typeList) {
-                String name = card.getName();
-                // CR 201.2b Those objects have different names only if each of them has at least one name and no two objects in that group have a name in common
-                if (!card.hasNoName()) {
-                    crdname.add(name);
-                }
-            }
-            return crdname.size();
+            return CardLists.getDifferentNamesCount(typeList);
         }
         return typeList.size();
     }
diff --git a/forge-game/src/main/java/forge/game/cost/CostUntap.java b/forge-game/src/main/java/forge/game/cost/CostUntap.java
index 29420173dff..effcc619523 100644
--- a/forge-game/src/main/java/forge/game/cost/CostUntap.java
+++ b/forge-game/src/main/java/forge/game/cost/CostUntap.java
@@ -22,7 +22,6 @@ import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CounterEnumType;
-import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.trigger.TriggerType;
@@ -81,7 +80,7 @@ public class CostUntap extends CostPart {
     public final boolean canPay(final SpellAbility ability, final Player payer, final boolean effect) {
         final Card source = ability.getHostCard();
         return source.isTapped() && !source.isAbilitySick() &&
-                (source.getCounters(CounterEnumType.STUN) == 0 || source.canRemoveCounters(CounterType.get(CounterEnumType.STUN)));
+                (source.getCounters(CounterEnumType.STUN) == 0 || source.canRemoveCounters(CounterEnumType.STUN));
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/cost/CostUntapType.java b/forge-game/src/main/java/forge/game/cost/CostUntapType.java
index 6f2008a2992..50e95bc2e71 100644
--- a/forge-game/src/main/java/forge/game/cost/CostUntapType.java
+++ b/forge-game/src/main/java/forge/game/cost/CostUntapType.java
@@ -86,7 +86,7 @@ public class CostUntapType extends CostPartWithList {
         if (!canUntapSource) {
             typeList.remove(source);
         }
-        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterType.get(CounterEnumType.STUN)));
+        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterEnumType.STUN));
 
         final int amount = this.getAbilityAmount(ability);
         return (typeList.size() != 0) && (typeList.size() >= amount);
diff --git a/forge-game/src/main/java/forge/game/event/Event.java b/forge-game/src/main/java/forge/game/event/Event.java
index 401c49b0803..02e835658e0 100644
--- a/forge-game/src/main/java/forge/game/event/Event.java
+++ b/forge-game/src/main/java/forge/game/event/Event.java
@@ -1,5 +1,5 @@
 package forge.game.event;
 
-public abstract class Event {
+public interface Event {
 
 }
diff --git a/forge-game/src/main/java/forge/game/event/EventValueChangeType.java b/forge-game/src/main/java/forge/game/event/EventValueChangeType.java
index 8b35954a2cc..54797cc68f0 100644
--- a/forge-game/src/main/java/forge/game/event/EventValueChangeType.java
+++ b/forge-game/src/main/java/forge/game/event/EventValueChangeType.java
@@ -1,9 +1,5 @@
 package forge.game.event;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
 public enum EventValueChangeType {
     Added,
     Removed,
diff --git a/forge-game/src/main/java/forge/game/event/GameEvent.java b/forge-game/src/main/java/forge/game/event/GameEvent.java
index 77a7e268f04..8b08775ba03 100644
--- a/forge-game/src/main/java/forge/game/event/GameEvent.java
+++ b/forge-game/src/main/java/forge/game/event/GameEvent.java
@@ -1,6 +1,6 @@
 package forge.game.event;
 
-public abstract class GameEvent extends Event {
+public interface GameEvent extends Event {
 
     public abstract <T> T visit(IGameEventVisitor<T> visitor);
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java b/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
index 1b9c06ece6e..01dd5d7fa87 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java
@@ -5,11 +5,7 @@ import com.google.common.collect.Multimap;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-public class GameEventAnteCardsSelected extends GameEvent {
-    public final Multimap<Player, Card> cards;
-    public GameEventAnteCardsSelected(Multimap<Player, Card> list) {
-        cards = list;
-    }
+public record GameEventAnteCardsSelected(Multimap<Player, Card> cards) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java
index 09ef47c0a43..12b9531bf62 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java
@@ -6,27 +6,21 @@ import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventAttackersDeclared extends GameEvent {
-
-    public final Player player;
-    public final Multimap<GameEntity, Card> attackersMap;
-
-    public GameEventAttackersDeclared(Player playerTurn, Multimap<GameEntity, Card> attackersMap) {
-        this.player = playerTurn;
-        this.attackersMap = attackersMap;
-    }
+public record GameEventAttackersDeclared(Player player, Multimap<GameEntity, Card> attackersMap) implements GameEvent {
 
     /* (non-Javadoc)
      * @see forge.game.event.GameEvent#visit(forge.game.event.IGameEventVisitor)
      */
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " declared attackers: " + attackersMap;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
index 810c727b87c..9ec99ead4e3 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java
@@ -12,23 +12,10 @@ import forge.util.Lang;
 import forge.util.TextUtil;
 import forge.util.maps.MapOfLists;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventBlockersDeclared extends GameEvent {
-
-    public final Map<GameEntity, MapOfLists<Card, Card>> blockers;
-    public final Player defendingPlayer;
-
-    public GameEventBlockersDeclared(Player who, Map<GameEntity, MapOfLists<Card, Card>> blockers) {
-        this.blockers = blockers;
-        defendingPlayer = who;
-    }
+public record GameEventBlockersDeclared(Player defendingPlayer, Map<GameEntity, MapOfLists<Card, Card>> blockers) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
 
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java b/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
index 1653c15777e..c6acf10358b 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardAttachment.java
@@ -3,20 +3,18 @@ package forge.game.event;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 
-public class GameEventCardAttachment extends GameEvent {
-
-    public final Card equipment;
-    public final GameEntity newTarget; // can enchant player, I'm ssaving a class to enchants - it could be incorrect.
-    public final GameEntity oldEntiy;
-
-    public GameEventCardAttachment(Card attachment, GameEntity formerEntity, GameEntity newEntity) {
-        this.equipment = attachment;
-        this.newTarget = newEntity;
-        this.oldEntiy = formerEntity;
-    }
+public record GameEventCardAttachment(Card equipment, GameEntity oldEntity, GameEntity newTarget) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return newTarget == null ? "Detached " + equipment + " from " + oldEntity : "Attached " + equipment + (oldEntity == null ? "" : " from " + oldEntity) + " to " + newTarget;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java b/forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java
index fce42173208..8a105185a45 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardChangeZone.java
@@ -4,17 +4,7 @@ import forge.game.card.Card;
 import forge.game.zone.Zone;
 import forge.util.TextUtil;
 
-public class GameEventCardChangeZone extends GameEvent {
-    
-    public final Card card;
-    public final Zone from;
-    public final Zone to;
-
-    public GameEventCardChangeZone(Card c, Zone zoneFrom, Zone zoneTo) {
-        card = c;
-        from = zoneFrom;
-        to = zoneTo;
-    }
+public record GameEventCardChangeZone(Card card, Zone from, Zone to) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardCounters.java b/forge-game/src/main/java/forge/game/event/GameEventCardCounters.java
index 31c09db1b7e..32a1de9e38b 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardCounters.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardCounters.java
@@ -3,21 +3,17 @@ package forge.game.event;
 import forge.game.card.Card;
 import forge.game.card.CounterType;
 
-public class GameEventCardCounters extends GameEvent {
-    public final Card card;
-    public final CounterType type;
-    public final int oldValue;
-    public final int newValue;
-
-    public GameEventCardCounters(Card card, CounterType counterType, int old, int newValue) {
-        this.card = card;
-        type = counterType;
-        this.oldValue = old;
-        this.newValue = newValue;
-    }
-
+public record GameEventCardCounters(Card card, CounterType type, int oldValue, int newValue) implements GameEvent {
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + card + " " + type + " counters: " + oldValue + " -> " + newValue;
+    }
 }
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java b/forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java
index 69a4c156205..f91fe98a910 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardDamaged.java
@@ -2,7 +2,7 @@ package forge.game.event;
 
 import forge.game.card.Card;
 
-public class GameEventCardDamaged extends GameEvent {
+public record GameEventCardDamaged(Card card, Card source, int amount, DamageType type) implements GameEvent {
 
     public enum DamageType {
         Normal, 
@@ -11,21 +11,16 @@ public class GameEventCardDamaged extends GameEvent {
         LoyaltyLoss
     }
 
-    public final Card card;
-    public final Card source;
-    public final int amount;
-    public final DamageType type;
-
-    public GameEventCardDamaged(Card card, Card src, int damageToAdd, DamageType damageType) {
-        this.card = card;
-        source = src;
-        amount = damageToAdd;
-        type = damageType;
-    }
-
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + source + " dealt " + amount + " " + type + " damage to " + card;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java b/forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java
index bfb0d0590cf..05074aad3c9 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardDestroyed.java
@@ -1,10 +1,17 @@
 package forge.game.event;
 
-public class GameEventCardDestroyed extends GameEvent {
+public record GameEventCardDestroyed() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Card destroyed";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardForetold.java b/forge-game/src/main/java/forge/game/event/GameEventCardForetold.java
index b7003036045..891b6438f48 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardForetold.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardForetold.java
@@ -2,12 +2,7 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventCardForetold extends GameEvent {
-    public final Player activatingPlayer;
-
-    public GameEventCardForetold(Player player) {
-        activatingPlayer = player;
-    }
+public record GameEventCardForetold(Player activatingPlayer) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardModeChosen.java b/forge-game/src/main/java/forge/game/event/GameEventCardModeChosen.java
index 865cc2cfa4e..a289bb916eb 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardModeChosen.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardModeChosen.java
@@ -2,21 +2,7 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventCardModeChosen extends GameEvent {
-
-    public final Player player;
-    public final String cardName;
-    public final String mode;
-    public final boolean log;
-    public final boolean random;
-
-    public GameEventCardModeChosen(Player player, String cardName, String mode, boolean log, boolean random) {
-        this.player = player;
-        this.cardName = cardName;
-        this.mode = mode;
-        this.log = log;
-        this.random = random;
-    }
+public record GameEventCardModeChosen(Player player, String cardName, String mode, boolean log, boolean random) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardPhased.java b/forge-game/src/main/java/forge/game/event/GameEventCardPhased.java
index 132aae4bce7..a7038d21939 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardPhased.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardPhased.java
@@ -2,19 +2,7 @@ package forge.game.event;
 
 import forge.game.card.Card;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventCardPhased extends GameEvent {
-
-    public final Card card; 
-    public final boolean phaseState;
-
-    public GameEventCardPhased(Card card, boolean state) {
-        this.card = card;
-        phaseState = state;
-    }
+public record GameEventCardPhased(Card card, boolean phaseState) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardPlotted.java b/forge-game/src/main/java/forge/game/event/GameEventCardPlotted.java
index 785a4d58be7..e789fb522d5 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardPlotted.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardPlotted.java
@@ -3,16 +3,7 @@ package forge.game.event;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-public class GameEventCardPlotted extends GameEvent {
-
-    public final Card card;
-
-    public final Player activatingPlayer;
-
-    public GameEventCardPlotted(Card card, Player player) {
-        this.card = card;
-        activatingPlayer = player;
-    }
+public record GameEventCardPlotted(Card card, Player activatingPlayer) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java b/forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java
index a348a2ad77e..147bfb088e7 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardRegenerated.java
@@ -5,11 +5,9 @@ import forge.game.card.Card;
 import java.util.Arrays;
 import java.util.Collection;
 
-public class GameEventCardRegenerated extends GameEvent {
-
-    public final Collection<Card> cards;
+public record GameEventCardRegenerated(Collection<Card> cards) implements GameEvent {
     public GameEventCardRegenerated(Card affected) {
-        cards = Arrays.asList(affected);
+        this(Arrays.asList(affected));
     }
 
     @Override
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java b/forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java
index 105d9d1724c..bda3c86f631 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardSacrificed.java
@@ -1,9 +1,19 @@
 package forge.game.event;
 
-public class GameEventCardSacrificed extends GameEvent {
+import forge.game.card.Card;
+
+public record GameEventCardSacrificed(Card card) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + card.getController() + " sacrificed " + card;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
index f58f4c85e11..83ed5146ebb 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java
@@ -11,23 +11,20 @@ import forge.game.card.Card;
 /**
  * This means card's characteristics have changed on server, clients must re-request them
  */
-public class GameEventCardStatsChanged extends GameEvent {
+public record GameEventCardStatsChanged(Collection<Card> cards, boolean transform) implements GameEvent {
 
-    public final Collection<Card> cards;
-    public boolean transform = false;
     public GameEventCardStatsChanged(Card affected) {
         this(affected, false);
     }
 
     public GameEventCardStatsChanged(Card affected, boolean isTransform) {
-        cards = Arrays.asList(affected);
+        this(Arrays.asList(affected), false);
         //the transform should only fire once so the flip effect sound will trigger once every transformation...
         // disable for now
-        transform = false;
     }
 
     public GameEventCardStatsChanged(Collection<Card> affected) {
-        cards = affected;
+        this(affected, false);
     }
 
     /* (non-Javadoc)
@@ -35,7 +32,6 @@ public class GameEventCardStatsChanged extends GameEvent {
      */
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
 
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardTapped.java b/forge-game/src/main/java/forge/game/event/GameEventCardTapped.java
index 993e1cda1db..bfd538e0951 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCardTapped.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCardTapped.java
@@ -2,17 +2,18 @@ package forge.game.event;
 
 import forge.game.card.Card;
 
-public class GameEventCardTapped extends GameEvent {
-    public final boolean tapped;
-    public final Card card;
-
-    public GameEventCardTapped(final Card card, final boolean tapped) {
-        this.tapped = tapped;
-        this.card = card;
-    }
+public record GameEventCardTapped(Card card, boolean tapped) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + card.getController() + (tapped ? " tapped " : " untapped ") + card;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCombatChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCombatChanged.java
index e600e56a66c..3bcd3e92d00 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCombatChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCombatChanged.java
@@ -1,13 +1,17 @@
 package forge.game.event;
 
-public class GameEventCombatChanged extends GameEvent {
-
-    public GameEventCombatChanged() {
-    }
+public record GameEventCombatChanged() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Combat changed";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java b/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java
index db7b42e3de4..fc4dbd8ebd6 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java
@@ -4,19 +4,18 @@ import java.util.List;
 
 import forge.game.card.Card;
 
-public class GameEventCombatEnded extends GameEvent {
-
-    public final List<Card> attackers;
-    public final List<Card> blockers;
-
-    public GameEventCombatEnded(List<Card> attackers, List<Card> blockers) {
-        this.attackers = attackers;
-        this.blockers = blockers;
-    }
+public record GameEventCombatEnded(List<Card> attackers, List<Card> blockers) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Combat ended. Attackers: " + attackers + " Blockers: " + blockers;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventCombatUpdate.java b/forge-game/src/main/java/forge/game/event/GameEventCombatUpdate.java
index 50989e9d7eb..73f68ad4352 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventCombatUpdate.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventCombatUpdate.java
@@ -4,15 +4,7 @@ import java.util.List;
 
 import forge.game.card.Card;
 
-public class GameEventCombatUpdate extends GameEvent {
-
-    public final List<Card> attackers;
-    public final List<Card> blockers;
-
-    public GameEventCombatUpdate(List<Card> attackers, List<Card> blockers) {
-        this.attackers = attackers;
-        this.blockers = blockers;
-    }
+public record GameEventCombatUpdate(List<Card> attackers, List<Card> blockers) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventDayTimeChanged.java b/forge-game/src/main/java/forge/game/event/GameEventDayTimeChanged.java
index e4c67e4cb2f..d41c8b9b046 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventDayTimeChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventDayTimeChanged.java
@@ -1,11 +1,6 @@
 package forge.game.event;
 
-public class GameEventDayTimeChanged extends GameEvent {
-    public final boolean daytime;
-
-    public GameEventDayTimeChanged(final boolean daytime) {
-        this.daytime = daytime;
-    }
+public record GameEventDayTimeChanged(boolean daytime) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventDoorChanged.java b/forge-game/src/main/java/forge/game/event/GameEventDoorChanged.java
index 5f04cf5a7de..bf846625b1f 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventDoorChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventDoorChanged.java
@@ -3,21 +3,9 @@ package forge.game.event;
 import forge.card.CardStateName;
 import forge.game.card.Card;
 import forge.game.player.Player;
-import forge.util.CardTranslation;
 import forge.util.Lang;
 
-public class GameEventDoorChanged extends GameEvent {
-    public final Player activatingPlayer;
-    public final Card card;
-    public final CardStateName state;
-    public boolean unlock;
-
-    public GameEventDoorChanged(Player player, Card c, CardStateName state, boolean unlock) {
-        activatingPlayer = player;
-        card = c;
-        this.state = state;
-        this.unlock = unlock;
-    }
+public record GameEventDoorChanged(Player activatingPlayer, Card card, CardStateName state, boolean unlock) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
@@ -26,7 +14,7 @@ public class GameEventDoorChanged extends GameEvent {
 
     @Override
     public String toString() {
-        String doorName = CardTranslation.getTranslatedName(card.getState(state));
+        String doorName = card.getState(state).getTranslatedName();
 
         StringBuilder sb = new StringBuilder();
         sb.append(activatingPlayer);
diff --git a/forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java b/forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java
index a28dc4ed16e..ebed52d2424 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventFlipCoin.java
@@ -1,9 +1,17 @@
 package forge.game.event;
 
-public class GameEventFlipCoin extends GameEvent {
+public record GameEventFlipCoin() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Flipped coin";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventGameFinished.java b/forge-game/src/main/java/forge/game/event/GameEventGameFinished.java
index 4b600634104..7e0078d07de 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventGameFinished.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventGameFinished.java
@@ -1,8 +1,17 @@
 package forge.game.event;
 
-public class GameEventGameFinished extends GameEvent {
+public record GameEventGameFinished() implements GameEvent {
+
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Game finished";
+    }
 } // need this class to launch after log was built via previous event
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java b/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java
index 4a675c05881..3351dffb1f8 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java
@@ -4,17 +4,18 @@ import java.util.Collection;
 
 import forge.game.GameOutcome;
 
-public class GameEventGameOutcome extends GameEvent {
-    public final GameOutcome result;
-    public final Collection<GameOutcome> history;
-
-    public GameEventGameOutcome(GameOutcome lastOne, Collection<GameOutcome> history) {
-        this.result = lastOne;
-        this.history = history;
-    }
+public record GameEventGameOutcome(GameOutcome result, Collection<GameOutcome> history) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Game Outcome: " + result.getOutcomeStrings();
+    }
 }
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java b/forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java
index e997831a714..0ad85a4e068 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventGameRestarted.java
@@ -2,17 +2,7 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventGameRestarted extends GameEvent {
-
-    public final Player whoRestarted; 
-
-    public GameEventGameRestarted(Player playerTurn) {
-        whoRestarted = playerTurn;
-    }
+public record GameEventGameRestarted(Player whoRestarted) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventGameStarted.java b/forge-game/src/main/java/forge/game/event/GameEventGameStarted.java
index 550a439d5e5..3bf5f55b436 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventGameStarted.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventGameStarted.java
@@ -5,22 +5,7 @@ import forge.game.player.Player;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventGameStarted extends GameEvent {
-
-    public final Player firstTurn;
-    public final Iterable<Player> players;
-    public final GameType gameType;
-
-    public GameEventGameStarted(GameType type, Player firstTurn, Iterable<Player> players) {
-        super();
-        this.gameType = type;
-        this.firstTurn = firstTurn;
-        this.players = players;
-    }
+public record GameEventGameStarted(GameType gameType, Player firstTurn, Iterable<Player> players) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java b/forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java
index 595bf9783c9..6a6224239a2 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventLandPlayed.java
@@ -3,19 +3,17 @@ package forge.game.event;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-public class GameEventLandPlayed extends GameEvent {
-
-    public final Player player;
-    public final Card land;
-
-    public GameEventLandPlayed(Player player, Card land) {
-        this.player = player;
-        this.land = land;
-
-    }
-
+public record GameEventLandPlayed(Player player, Card land) implements GameEvent {
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " played " + land;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventManaBurn.java b/forge-game/src/main/java/forge/game/event/GameEventManaBurn.java
index 5b9a06367f1..db8e4790316 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventManaBurn.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventManaBurn.java
@@ -3,22 +3,7 @@ package forge.game.event;
 import forge.game.player.Player;
 
 // This special event denotes loss of mana due to phase end
-public class GameEventManaBurn extends GameEvent {
-
-    public final Player player;
-    public final boolean causedLifeLoss;
-    public final int amount;
-
-    /**
-     * TODO: Write javadoc for Constructor.
-     * @param dealDamage 
-     * @param burn 
-     */
-    public GameEventManaBurn(Player who, int burn, boolean dealDamage) {
-        player = who;
-    	amount = burn;
-        causedLifeLoss = dealDamage;
-    }
+public record GameEventManaBurn(Player player, boolean causedLifeLoss, int amount) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventManaPool.java b/forge-game/src/main/java/forge/game/event/GameEventManaPool.java
index 473e25f6191..6602376dfec 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventManaPool.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventManaPool.java
@@ -4,20 +4,7 @@ import forge.game.mana.Mana;
 import forge.game.player.Player;
 import forge.util.Lang;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventManaPool extends GameEvent {
-    public final Player player;
-    public final EventValueChangeType mode;
-    public final Mana mana;
-
-    public GameEventManaPool(Player owner, EventValueChangeType changeMode, Mana mana) {
-        this.mana = mana;
-        player = owner;
-        mode = changeMode;
-    }
+public record GameEventManaPool(Player player, EventValueChangeType mode, Mana mana) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventMulligan.java b/forge-game/src/main/java/forge/game/event/GameEventMulligan.java
index 30dcd25391b..34c763253d7 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventMulligan.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventMulligan.java
@@ -2,19 +2,18 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventMulligan extends GameEvent {
-
-    public final Player player;
-    public GameEventMulligan(Player p) {
-        player = p;
-    }
+public record GameEventMulligan(Player player) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " mulligans";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java
index b0fc48c9406..e3c28ca37d3 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerControl.java
@@ -4,23 +4,18 @@ import forge.LobbyPlayer;
 import forge.game.player.Player;
 import forge.game.player.PlayerController;
 
-public class GameEventPlayerControl extends GameEvent {
-    public final Player player;
-    public final LobbyPlayer oldLobbyPlayer;
-    public final PlayerController oldController;
-    public final LobbyPlayer newLobbyPlayer;
-    public final PlayerController newController;
-
-    public GameEventPlayerControl(final Player p, final LobbyPlayer oldLobbyPlayer, final PlayerController oldController, final LobbyPlayer newLobbyPlayer, final PlayerController newController) {
-        this.player = p;
-        this.oldLobbyPlayer = oldLobbyPlayer;
-        this.oldController = oldController;
-        this.newLobbyPlayer = newLobbyPlayer;
-        this.newController = newController;
-    }
+public record GameEventPlayerControl(Player player, LobbyPlayer oldLobbyPlayer, PlayerController oldController, LobbyPlayer newLobbyPlayer, PlayerController newController) implements GameEvent {
 
     @Override
     public <T> T visit(final IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " controlled by " + player.getControllingPlayer();
+    }
 }
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerCounters.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerCounters.java
index d595012e164..e79b1e1a6d8 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerCounters.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerCounters.java
@@ -3,21 +3,18 @@ package forge.game.event;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
 
-public class GameEventPlayerCounters extends GameEvent {
-        public final Player receiver;
-        public final CounterType type;
-        public final int oldValue;
-        public final int amount;
+public record GameEventPlayerCounters(Player receiver, CounterType type, int oldValue, int amount) implements GameEvent {
 
-        public GameEventPlayerCounters(Player recv, CounterType t, int old, int num) {
-            receiver = recv;
-            type = t;
-            oldValue = old;
-            amount = num;
-        }
+    @Override
+    public <T> T visit(IGameEventVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
 
-        @Override
-        public <T> T visit(IGameEventVisitor<T> visitor) {
-            return visitor.visit(this);
-        }
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + receiver + " got " + oldValue + " plus " + amount + " " + type;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java
index 62197fecd5c..499a2cd924f 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerDamaged.java
@@ -3,33 +3,7 @@ package forge.game.event;
 import forge.game.card.Card;
 import forge.game.player.Player;
 
-
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventPlayerDamaged extends GameEvent {
-    public final Player target;
-    public final Card source;
-    public final int amount;
-    final public boolean infect;
-    public final boolean combat;
-
-    /**
-     * TODO: Write javadoc for Constructor.
-     * @param player
-     * @param source
-     * @param amount
-     * @param isCombat
-     * @param infect
-     */
-    public GameEventPlayerDamaged(Player player, Card source, int amount, boolean isCombat, boolean infect) {
-        target = player;
-        this.source = source;
-        this.amount = amount;
-        combat = isCombat;
-        this.infect = infect;
-    }
+public record GameEventPlayerDamaged(Player target, Card source, int amount, boolean combat, boolean infect) implements GameEvent {
 
     /* (non-Javadoc)
      * @see forge.game.event.GameEvent#visit(forge.game.event.IGameEventVisitor)
@@ -39,4 +13,11 @@ public class GameEventPlayerDamaged extends GameEvent {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + target + " took " + amount + (infect ? " infect" : combat ? " combat" : "") + " damage from " + source;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
index c84ab7edea5..cb3d8686618 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java
@@ -4,16 +4,7 @@ import forge.game.player.Player;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-public class GameEventPlayerLivesChanged extends GameEvent {
-    public final Player player;
-    public final int oldLives;
-    public final int newLives;
-
-    public GameEventPlayerLivesChanged(Player who, int oldValue, int newValue) {
-        player = who;
-        oldLives = oldValue;
-        newLives = newValue;
-    }
+public record GameEventPlayerLivesChanged(Player player, int oldLives, int newLives) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
index 7e4c24efcad..e53d08b0e9f 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerPoisoned.java
@@ -6,18 +6,7 @@ import forge.game.player.Player;
  * 
  *
  */
-public class GameEventPlayerPoisoned extends GameEvent {
-    public final Player receiver;
-    public final Player source;
-    public final int oldValue;
-    public final int amount;
-
-    public GameEventPlayerPoisoned(Player recv, Player src, int old, int num) {
-        receiver = recv;
-        source = src;
-        oldValue = old;
-        amount = num;
-    }
+public record GameEventPlayerPoisoned(Player receiver, Player source, int oldValue, int amount) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java
index 0a748996269..bfc9e87c3cc 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerPriority.java
@@ -4,21 +4,7 @@ import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.util.TextUtil;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventPlayerPriority extends GameEvent {
-
-    public final Player turn;
-    public final PhaseType phase;
-    public final Player priority;
-
-    public GameEventPlayerPriority(Player playerTurn, PhaseType phase, Player priorityPlayer) {
-        turn = playerTurn;
-        this.phase = phase;
-        priority = priorityPlayer;
-    }
+public record GameEventPlayerPriority(Player turn, PhaseType phase, Player priority) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerRadiation.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerRadiation.java
index b9214b15b63..af7347dab51 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerRadiation.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerRadiation.java
@@ -2,16 +2,7 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventPlayerRadiation extends GameEvent {
-    public final Player receiver;
-    public final Player source;
-    public final int change;
-
-    public GameEventPlayerRadiation(Player recv, Player src, int chng) {
-        receiver = recv;
-        source = src;
-        change = chng;
-    }
+public record GameEventPlayerRadiation(Player receiver, Player source, int change) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerShardsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerShardsChanged.java
index 4ff56fc6bae..6edd2c33bbc 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerShardsChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerShardsChanged.java
@@ -4,16 +4,7 @@ import forge.game.player.Player;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-public class GameEventPlayerShardsChanged extends GameEvent {
-    public final Player player;
-    public final int oldShards;
-    public final int newShards;
-
-    public GameEventPlayerShardsChanged(Player who, int oldValue, int newValue) {
-        player = who;
-        oldShards = oldValue;
-        newShards = newValue;
-    }
+public record GameEventPlayerShardsChanged(Player player, int oldShards, int newShards) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
index b077517cc24..fcaf4887dbb 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
@@ -10,18 +10,10 @@ import forge.util.TextUtil;
 /**
  * This means card's characteristics have changed on server, clients must re-request them
  */
-public class GameEventPlayerStatsChanged extends GameEvent {
+public record GameEventPlayerStatsChanged(Collection<Player> players, boolean updateCards) implements GameEvent {
 
-    public final Collection<Player> players;
-    public final boolean updateCards;
     public GameEventPlayerStatsChanged(Player affected, boolean updateCards) {
-        players = Arrays.asList(affected);
-        this.updateCards = updateCards;
-    }
-
-    public GameEventPlayerStatsChanged(Collection<Player> affected, boolean updateCards) {
-        players = affected;
-        this.updateCards = updateCards;
+        this(Arrays.asList(affected), updateCards);
     }
 
     /* (non-Javadoc)
@@ -29,7 +21,6 @@ public class GameEventPlayerStatsChanged extends GameEvent {
      */
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
 
diff --git a/forge-game/src/main/java/forge/game/event/GameEventRandomLog.java b/forge-game/src/main/java/forge/game/event/GameEventRandomLog.java
index 3fa778bbd74..4552e1fbf19 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventRandomLog.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventRandomLog.java
@@ -1,12 +1,6 @@
 package forge.game.event;
 
-public class GameEventRandomLog extends GameEvent {
-
-    public final String message;
-
-    public GameEventRandomLog(String message) {
-        this.message = message;
-    }
+public record GameEventRandomLog(String message) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventRollDie.java b/forge-game/src/main/java/forge/game/event/GameEventRollDie.java
index b44674e924e..a3046fb04d8 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventRollDie.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventRollDie.java
@@ -1,6 +1,6 @@
 package forge.game.event;
 
-public class GameEventRollDie extends GameEvent {
+public record GameEventRollDie() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventScry.java b/forge-game/src/main/java/forge/game/event/GameEventScry.java
index 624de741bf2..96221a0c6b4 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventScry.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventScry.java
@@ -2,19 +2,18 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventScry extends GameEvent {
-
-    public final Player player;
-    public final int toTop, toBottom;
-
-    public GameEventScry(Player player, int toTop, int toBottom) {
-        this.player = player;
-        this.toTop = toTop;
-        this.toBottom = toBottom;
-    }
+public record GameEventScry(Player player, int toTop, int toBottom) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " scried " + toTop + " to top, " + toBottom + " to bottom";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventShuffle.java b/forge-game/src/main/java/forge/game/event/GameEventShuffle.java
index 893d617fe16..96502a89597 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventShuffle.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventShuffle.java
@@ -4,13 +4,7 @@ import forge.game.player.Player;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-public class GameEventShuffle extends GameEvent {
-
-    public final Player player;
-
-    public GameEventShuffle(Player player) {
-        this.player = player;
-    }
+public record GameEventShuffle(Player player) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
@@ -22,6 +16,6 @@ public class GameEventShuffle extends GameEvent {
      */
     @Override
     public String toString() {
-        return TextUtil.concatWithSpace(player.toString(), Lang.joinVerb(player.getName(), "shuffle"),"his/her/its library");
+        return TextUtil.concatWithSpace(player.toString(), Lang.joinVerb(player.getName(), "shuffle"), "their library");
     }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSpeedChanged.java b/forge-game/src/main/java/forge/game/event/GameEventSpeedChanged.java
index 5320fef0626..31fb2abf7c9 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSpeedChanged.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSpeedChanged.java
@@ -2,18 +2,7 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventSpeedChanged extends GameEvent {
-
-    public final Player player;
-    public final int oldValue;
-    public final int newValue;
-
-    public GameEventSpeedChanged(Player affected, int oldValue, int newValue) {
-        player = affected;
-        this.oldValue = oldValue;
-        this.newValue = newValue;
-    }
-
+public record GameEventSpeedChanged(Player player, int oldValue, int newValue) implements GameEvent {
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java b/forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
index a64240e989d..e38c374abde 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSpellAbilityCast.java
@@ -3,21 +3,7 @@ package forge.game.event;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.SpellAbilityStackInstance;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventSpellAbilityCast extends GameEvent {
-
-    public final SpellAbility sa; 
-    public final SpellAbilityStackInstance si;
-    public final int stackIndex;
-
-    public GameEventSpellAbilityCast(SpellAbility sp, SpellAbilityStackInstance si, int stackIndex) {
-        sa = sp;
-        this.si = si;
-        this.stackIndex = stackIndex;
-    }
+public record GameEventSpellAbilityCast(SpellAbility sa, SpellAbilityStackInstance si, int stackIndex) implements GameEvent {
 
     /* (non-Javadoc)
      * @see forge.game.event.GameEvent#visit(forge.game.event.IGameEventVisitor)
@@ -27,4 +13,11 @@ public class GameEventSpellAbilityCast extends GameEvent {
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + sa.getActivatingPlayer() + (sa.isSpell() ? " cast " : sa.isActivatedAbility() ? " activated " : " triggered ") + sa;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java b/forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
index 0725efff997..5a089f6a7d1 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSpellRemovedFromStack.java
@@ -2,21 +2,18 @@ package forge.game.event;
 
 import forge.game.spellability.SpellAbility;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventSpellRemovedFromStack extends GameEvent {
-    public final SpellAbility sa;
-
-    public GameEventSpellRemovedFromStack(SpellAbility spellAbility) {
-        sa = spellAbility;
-    }
+public record GameEventSpellRemovedFromStack(SpellAbility sa) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Stack removed " + sa;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java b/forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java
index af97226fcfb..c54571a26ea 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSpellResolved.java
@@ -2,29 +2,18 @@ package forge.game.event;
 
 import forge.game.spellability.SpellAbility;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventSpellResolved extends GameEvent {
-
-    public final SpellAbility spell;
-    public final boolean hasFizzled;
-
-    /**
-     * TODO: Write javadoc for Constructor.
-     * @param source
-     * @param sa
-     * @param hasFizzled 
-     */
-    public GameEventSpellResolved(SpellAbility sa, boolean hasFizzled) {
-        // TODO Auto-generated constructor stub
-        this.spell = sa;
-        this.hasFizzled = hasFizzled;
-    }
+public record GameEventSpellResolved(SpellAbility spell, boolean hasFizzled) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Stack resolved " + spell + (hasFizzled ? " (fizzled)" : "");
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSprocketUpdate.java b/forge-game/src/main/java/forge/game/event/GameEventSprocketUpdate.java
index 601ee1bafff..690f57422d4 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSprocketUpdate.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSprocketUpdate.java
@@ -2,18 +2,7 @@ package forge.game.event;
 
 import forge.game.card.Card;
 
-public class GameEventSprocketUpdate extends GameEvent {
-
-    public final Card contraption;
-    public final int oldSprocket;
-    public final int sprocket;
-
-    public GameEventSprocketUpdate(Card contraption, int oldSprocket, int sprocket) {
-        this.contraption = contraption;
-        this.oldSprocket = oldSprocket;
-        this.sprocket = sprocket;
-    }
-
+public record GameEventSprocketUpdate(Card contraption, int oldSprocket, int sprocket) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSubgameEnd.java b/forge-game/src/main/java/forge/game/event/GameEventSubgameEnd.java
index 5fcaf2a9256..89a9ed7d99a 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSubgameEnd.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSubgameEnd.java
@@ -2,15 +2,7 @@ package forge.game.event;
 
 import forge.game.Game;
 
-public class GameEventSubgameEnd extends GameEvent {
-    public final Game maingame;
-    public final String message;
-
-    public GameEventSubgameEnd(Game game, String message0) {
-        maingame = game;
-        message = message0;
-    }
-
+public record GameEventSubgameEnd(Game maingame, String message) implements GameEvent {
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSubgameStart.java b/forge-game/src/main/java/forge/game/event/GameEventSubgameStart.java
index 8d9f733a52b..eb13c72f7ca 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSubgameStart.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSubgameStart.java
@@ -2,14 +2,7 @@ package forge.game.event;
 
 import forge.game.Game;
 
-public class GameEventSubgameStart extends GameEvent {
-    public final Game subgame;
-    public final String message;
-
-    public GameEventSubgameStart(Game subgame0, String message0) {
-        subgame = subgame0;
-        message = message0;
-    }
+public record GameEventSubgameStart(Game subgame, String message) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventSurveil.java b/forge-game/src/main/java/forge/game/event/GameEventSurveil.java
index 8ef9e8710f9..3e2f11d27f0 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventSurveil.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventSurveil.java
@@ -2,19 +2,18 @@ package forge.game.event;
 
 import forge.game.player.Player;
 
-public class GameEventSurveil extends GameEvent {
-
-    public final Player player;
-    public final int toLibrary, toGraveyard;
-
-    public GameEventSurveil(Player player, int toLibrary, int toGraveyard) {
-        this.player = player;
-        this.toLibrary = toLibrary;
-        this.toGraveyard = toGraveyard;
-    }
+public record GameEventSurveil(Player player, int toLibrary, int toGraveyard) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "" + player + " surveilled " + toLibrary + " to library, " + toGraveyard + " to graveyard";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java b/forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java
index 9cae6830b1f..d72bec6ece7 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventTokenCreated.java
@@ -1,9 +1,17 @@
 package forge.game.event;
 
-public class GameEventTokenCreated extends GameEvent {
+public record GameEventTokenCreated() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Token created";
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java b/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
index 198e4c86614..eecb4281f08 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventTurnBegan.java
@@ -3,16 +3,7 @@ package forge.game.event;
 import forge.game.player.Player;
 import forge.util.TextUtil;
 
-public class GameEventTurnBegan extends GameEvent {
-
-    public final Player turnOwner;
-    public final int turnNumber;
-
-    public GameEventTurnBegan(Player turnOwner, int turnNumber) {
-        super();
-        this.turnOwner = turnOwner;
-        this.turnNumber = turnNumber;
-    }
+public record GameEventTurnBegan(Player turnOwner, int turnNumber) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java b/forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java
index 04e3fc22c30..b9bb4ab86a2 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventTurnEnded.java
@@ -1,9 +1,17 @@
 package forge.game.event;
 
-public class GameEventTurnEnded extends GameEvent {
+public record GameEventTurnEnded() implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
         return visitor.visit(this);
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Turn ended";
+    }
 }
\ No newline at end of file
diff --git a/forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java b/forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java
index e0b99b5ce49..79fd40657fd 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventTurnPhase.java
@@ -5,20 +5,7 @@ import forge.game.player.Player;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
-public class GameEventTurnPhase extends GameEvent {
-    public final Player playerTurn;
-    public final PhaseType phase;
-    public final String phaseDesc;
-
-    public GameEventTurnPhase(Player player, PhaseType ph, String desc) {
-        playerTurn = player;
-        phase = ph;
-        phaseDesc = desc;
-    }
+public record GameEventTurnPhase(Player playerTurn, PhaseType phase, String phaseDesc) implements GameEvent {
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
diff --git a/forge-game/src/main/java/forge/game/event/GameEventZone.java b/forge-game/src/main/java/forge/game/event/GameEventZone.java
index fd9f5bd72f2..706cd2e1690 100644
--- a/forge-game/src/main/java/forge/game/event/GameEventZone.java
+++ b/forge-game/src/main/java/forge/game/event/GameEventZone.java
@@ -2,31 +2,28 @@ package forge.game.event;
 
 import forge.game.card.Card;
 import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
 import forge.util.Lang;
 import forge.util.TextUtil;
 
-/** 
- * TODO: Write javadoc for this type.
- *
+/**
+ * Represents a game event related to a card or ability entering or leaving a zone.
+ * Stores information about the affected zone, player, card, and spell ability.
+ * Used for tracking zone changes such as casting, moving, or activating cards and abilities.
  */
-public class GameEventZone extends GameEvent {
-
-    public final ZoneType zoneType;
-    public final Player player;
-    public final EventValueChangeType mode;
-    public final Card card;
+public record GameEventZone(ZoneType zoneType, Player player, EventValueChangeType mode, Card card, SpellAbility sa) implements GameEvent {
 
     public GameEventZone(ZoneType zoneType, Player player, EventValueChangeType added, Card c) {
-        this.zoneType = zoneType;
-        this.player = player;
-        this.mode = added;
-        this.card = c;
+        this(zoneType, player, added, c, null);
+    }
+
+    public GameEventZone(ZoneType zoneType, SpellAbility sa, EventValueChangeType added) {
+        this(zoneType, sa.getActivatingPlayer(), added, sa.getHostCard(), sa);
     }
 
     @Override
     public <T> T visit(IGameEventVisitor<T> visitor) {
-        // TODO Auto-generated method stub
         return visitor.visit(this);
     }
     
@@ -36,10 +33,9 @@ public class GameEventZone extends GameEvent {
     @Override
     public String toString() {
         String owners = player == null ? "Game" : Lang.getInstance().getPossesive(player.getName());
-        return card == null
-                ? TextUtil.concatWithSpace(owners, zoneType.toString(), ":", mode.toString())
-                : TextUtil.concatWithSpace(owners, zoneType.toString(), ":", mode.toString(), card.toString()
-        );
+        return card == null && sa == null ?
+            TextUtil.concatWithSpace(owners, zoneType.toString(), ":", mode.toString()) :
+            TextUtil.concatWithSpace(owners, zoneType.toString(), ":", mode.toString(), "" + (sa == null ? card : sa));
     }
 
 }
diff --git a/forge-game/src/main/java/forge/game/event/IGameEventVisitor.java b/forge-game/src/main/java/forge/game/event/IGameEventVisitor.java
index f07f5bb031a..4e55f671d7f 100644
--- a/forge-game/src/main/java/forge/game/event/IGameEventVisitor.java
+++ b/forge-game/src/main/java/forge/game/event/IGameEventVisitor.java
@@ -1,9 +1,5 @@
 package forge.game.event;
 
-/** 
- * TODO: Write javadoc for this type.
- *
- */
 public interface IGameEventVisitor<T> {
     T visit(GameEventAnteCardsSelected event);
     T visit(GameEventAttackersDeclared event);
diff --git a/forge-game/src/main/java/forge/game/keyword/Equip.java b/forge-game/src/main/java/forge/game/keyword/Equip.java
index 66a5c2ad65d..bf7313943f1 100644
--- a/forge-game/src/main/java/forge/game/keyword/Equip.java
+++ b/forge-game/src/main/java/forge/game/keyword/Equip.java
@@ -7,6 +7,8 @@ public class Equip extends KeywordWithCost {
     public Equip() {
     }
 
+    public String getValidDescription() { return type; }
+
     @Override
     protected void parse(String details) {
         String[] k = details.split(":");
diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java
index 9853a510179..65b74ab7276 100644
--- a/forge-game/src/main/java/forge/game/keyword/Keyword.java
+++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java
@@ -1,8 +1,8 @@
 package forge.game.keyword;
 
-import forge.StaticData;
-import forge.game.card.Card;
+import forge.card.CardSplitType;
 import forge.item.PaperCard;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
 
@@ -119,7 +119,7 @@ public enum Keyword {
     LIVING_METAL("Living metal", SimpleKeyword.class, true, "During your turn, this Vehicle is also a creature."),
     LIVING_WEAPON("Living Weapon", SimpleKeyword.class, true, "When this Equipment enters, create a 0/0 black Phyrexian Germ creature token, then attach this to it."),
     MADNESS("Madness", KeywordWithCost.class, false, "If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard."),
-    MAYHEM("Mayhem", KeywordWithCost.class, false, "You may cast this card from your graveyard for %s if you discarded it this turn. Timing rules still apply."),
+    MAYHEM("Mayhem", Mayhem.class, false, "You may cast this card from your graveyard for %s if you discarded it this turn. Timing rules still apply."),
     MELEE("Melee", SimpleKeyword.class, false, "Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat."),
     MENTOR("Mentor", SimpleKeyword.class, false, "Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power."),
     MENACE("Menace", SimpleKeyword.class, true, "This creature can't be blocked except by two or more creatures."),
@@ -141,6 +141,9 @@ public enum Keyword {
     OFFSPRING("Offspring", KeywordWithCost.class, false, "You may pay an additional %s as you cast this spell. If you do, when this creature enters, create a 1/1 token copy of it."),
     OVERLOAD("Overload", KeywordWithCost.class, false, "You may cast this spell for its overload cost. If you do, change its text by replacing all instances of \"target\" with \"each.\""),
     PARTNER("Partner", Partner.class, true, "You can have two commanders if both have partner."),
+    PARTNER_SURVIVORS("Partner - Survivors", Partner.class, true, "You can have two commanders if both have this ability."),
+    PARTNER_FATHER_AND_SON("Partner - Father & Son", Partner.class, true, "You can have two commanders if both have this ability."),    
+    PARTNER_CHARACTER_SELECT("Partner - Character select", Partner.class, true, "You can have two commanders if both have this ability."),    
     PERSIST("Persist", SimpleKeyword.class, false, "When this creature dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it."),
     PHASING("Phasing", SimpleKeyword.class, true, "This phases in or out before you untap during each of your untap steps. While it's phased out, it's treated as though it doesn't exist."),
     PLOT("Plot", KeywordWithCost.class, false, "You may pay %s and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery."),
@@ -223,7 +226,7 @@ public enum Keyword {
         displayName = displayName0;
     }
 
-    public static KeywordInterface getInstance(String k) {
+    private static Pair<Keyword, String> getKeywordDetails(String k) {
         Keyword keyword = Keyword.UNDEFINED;
         String details = k;
         // try to get real part
@@ -255,15 +258,20 @@ public enum Keyword {
             keyword = smartValueOf(k);
             details = "";
         }
+        return Pair.of(keyword, details);
+    }
+
+    public static KeywordInterface getInstance(String k) {
+        Pair<Keyword, String> p = getKeywordDetails(k);
 
         KeywordInstance<?> inst;
         try {
-            inst = keyword.type.getConstructor().newInstance();
+            inst = p.getKey().type.getConstructor().newInstance();
         }
         catch (Exception e) {
             inst = new UndefinedKeyword();
         }
-        inst.initialize(k, keyword, details);
+        inst.initialize(k, p.getKey(), p.getValue());
         return inst;
     }
 
@@ -278,36 +286,44 @@ public enum Keyword {
         return keywords;
     }
 
+    private static Keyword get(String k) {
+        if (k == null || k.isEmpty())
+            return Keyword.UNDEFINED;
+
+        return getKeywordDetails(k).getKey();
+    }
+
     private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<>();
 
     public static Set<Keyword> getKeywordSet(PaperCard card) {
-        String key = card.getName();
-        Set<Keyword> keywordSet = cardKeywordSetLookup.get(key);
+        String name = card.getName();
+        Set<Keyword> keywordSet = cardKeywordSetLookup.get(name);
         if (keywordSet == null) {
-            keywordSet = new HashSet<>();
-            for (KeywordInterface inst : Card.getCardForUi(card).getKeywords()) {
-                final Keyword keyword = inst.getKeyword();
-                if (keyword != Keyword.UNDEFINED) {
-                    keywordSet.add(keyword);
+            CardSplitType cardSplitType = card.getRules().getSplitType();
+            keywordSet = EnumSet.noneOf(Keyword.class);
+            if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
+                if (card.getRules().getOtherPart() != null) {
+                    if (card.getRules().getOtherPart().getKeywords() != null) {
+                        for (String key : card.getRules().getOtherPart().getKeywords()) {
+                            Keyword keyword = get(key);
+                            if (!Keyword.UNDEFINED.equals(keyword))
+                                keywordSet.add(keyword);
+                        }
+                    }
                 }
             }
-            cardKeywordSetLookup.put(card.getName(), keywordSet);
+            if (card.getRules().getMainPart().getKeywords() != null) {
+                for (String key : card.getRules().getMainPart().getKeywords()) {
+                    Keyword keyword = get(key);
+                    if (!Keyword.UNDEFINED.equals(keyword))
+                        keywordSet.add(keyword);
+                }
+            }
+            cardKeywordSetLookup.put(name, keywordSet);
         }
         return keywordSet;
     }
 
-    public static Runnable getPreloadTask() {
-        if (cardKeywordSetLookup.size() < 10000) { //allow preloading even if some but not all cards loaded
-            return () -> {
-                final Collection<PaperCard> cards = StaticData.instance().getCommonCards().getUniqueCards();
-                for (PaperCard card : cards) {
-                    getKeywordSet(card);
-                }
-            };
-        }
-        return null;
-    }
-
     public static Keyword smartValueOf(String value) {
         for (final Keyword v : Keyword.values()) {
             if (v.displayName.equalsIgnoreCase(value)) {
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordWithType.java b/forge-game/src/main/java/forge/game/keyword/KeywordWithType.java
index a31ace72781..2bf274f1272 100644
--- a/forge-game/src/main/java/forge/game/keyword/KeywordWithType.java
+++ b/forge-game/src/main/java/forge/game/keyword/KeywordWithType.java
@@ -3,38 +3,50 @@ package forge.game.keyword;
 import forge.card.CardType;
 
 public class KeywordWithType extends KeywordInstance<KeywordWithType> {
-    protected String type;
+    protected String type = null;
+    protected String descType = null;
+    protected String reminderType = null;
+
+    public String getValidType() { return type; }
+    public String getTypeDescription() { return descType; }
 
     @Override
     protected void parse(String details) {
-        if (CardType.isACardType(details)) {
-            type = details.toLowerCase();
-        } else if (details.contains(":")) {
+        String k[];
+        if (details.contains(":")) {
             switch (getKeyword()) {
             case AFFINITY:
-                type = details.split(":")[1];
-                // type lists defined by rules should not be changed by TextChange in reminder text 
-                if (type.equalsIgnoreCase("Outlaw")) {
-                    type = "Assassin, Mercenary, Pirate, Rogue, and/or Warlock";
-                } else if (type.equalsIgnoreCase("historic permanent")) {
-                    type = "artifact, legendary, and/or Saga permanent";
-                }
-                break;
             case BANDSWITH:
+            case ENCHANT:
             case HEXPROOF:
             case LANDWALK:
-                type = details.split(":")[1];
+                k = details.split(":");
+                type = k[0];
+                descType = k[1];
                 break;
             default:
-                type = details.split(":")[0];
+                k = details.split(":");
+                type = k[1];
+                descType = k[0];
             }
         } else {
-            type = details;
+            descType = type = details;
+        }
+
+        if (CardType.isACardType(descType) || "Permanent".equals(descType) || "Player".equals(descType) || "Opponent".equals(descType)) {
+            descType = descType.toLowerCase();
+        } else if (descType.equalsIgnoreCase("Outlaw")) {
+            reminderType = "Assassin, Mercenary, Pirate, Rogue, and/or Warlock";
+        } else if (type.equalsIgnoreCase("historic permanent")) {
+            reminderType = "artifact, legendary, and/or Saga permanent";
+        }
+        if (reminderType == null) {
+            reminderType = type;
         }
     }
 
     @Override
     protected String formatReminderText(String reminderText) {
-        return String.format(reminderText, type);
+        return String.format(reminderText, reminderType);
     }
 }
diff --git a/forge-game/src/main/java/forge/game/keyword/Mayhem.java b/forge-game/src/main/java/forge/game/keyword/Mayhem.java
new file mode 100644
index 00000000000..ec364d649f9
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/keyword/Mayhem.java
@@ -0,0 +1,25 @@
+package forge.game.keyword;
+
+import forge.card.mana.ManaCost;
+import forge.game.cost.Cost;
+
+public class Mayhem extends KeywordWithCost {
+
+
+    @Override
+    protected void parse(String details) {
+        if (!details.isEmpty()) {
+            super.parse(details);
+        } else {
+            this.cost = new Cost(ManaCost.NO_COST, true);
+        }
+    }
+
+    @Override
+    protected String formatReminderText(String reminderText) {
+        if (this.cost.getTotalMana().isNoCost()) {
+            return "You may play this card from your graveyard if you discarded it this turn. Timing rules still apply.";
+        }
+        return super.formatReminderText(reminderText);
+    }
+}
diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index 3513eb77976..035ee178385 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -62,6 +62,9 @@ import java.util.*;
 public class PhaseHandler implements java.io.Serializable {
     private static final long serialVersionUID = 5207222278370963197L;
 
+    // used for debugging phase timing
+    private final StopWatch sw = new StopWatch();
+
     // Start turn at 0, since we start even before first untap
     private PhaseType phase = null;
     private int turn = 0;
@@ -92,6 +95,7 @@ public class PhaseHandler implements java.io.Serializable {
 
     private final transient Game game;
 
+
     public PhaseHandler(final Game game0) {
         game = game0;
     }
@@ -1003,12 +1007,7 @@ public class PhaseHandler implements java.io.Serializable {
 
     private final static boolean DEBUG_PHASES = false;
 
-    public void startFirstTurn(Player goesFirst) {
-        startFirstTurn(goesFirst, null);
-    }
-    public void startFirstTurn(Player goesFirst, Runnable startGameHook) {
-        StopWatch sw = new StopWatch();
-
+    public void setupFirstTurn(Player goesFirst, Runnable startGameHook) {
         if (phase != null) {
             throw new IllegalStateException("Turns already started, call this only once per game");
         }
@@ -1024,132 +1023,146 @@ public class PhaseHandler implements java.io.Serializable {
             startGameHook.run();
             givePriorityToPlayer = true;
         }
+    }
 
+    public void startFirstTurn(Player goesFirst) {
+        startFirstTurn(goesFirst, null);
+    }
+    public void startFirstTurn(Player goesFirst, Runnable startGameHook) {
+        setupFirstTurn(goesFirst, startGameHook);
+        mainGameLoop();
+    }
+
+    public void mainGameLoop() {
         // MAIN GAME LOOP
-        while (!game.isGameOver()) {
-            if (givePriorityToPlayer) {
-                if (DEBUG_PHASES) {
-                    sw.start();
-                }
+        while (!game.isGameOver() && !(game.getAge() == GameStage.RestartedByKarn)) {
+            mainLoopStep();
+        }
+    }
 
-                game.fireEvent(new GameEventPlayerPriority(playerTurn, phase, getPriorityPlayer()));
-                List<SpellAbility> chosenSa = null;
-
-                int loopCount = 0;
-                do {
-                    if (checkStateBasedEffects()) {
-                        // state-based effects check could lead to game over
-                        return;
-                    }
-                    game.stashGameState();
-
-                    chosenSa = pPlayerPriority.getController().chooseSpellAbilityToPlay();
-
-                    // this needs to come after chosenSa so it sees you conceding on own turn
-                    if (playerTurn.hasLost() && pPlayerPriority.equals(playerTurn) && pFirstPriority.equals(playerTurn)) {
-                        // If the active player has lost, and they have priority, set the next player to have priority
-                        System.out.println("Active player is no longer in the game...");
-                        pPlayerPriority = game.getNextPlayerAfter(getPriorityPlayer());
-                        pFirstPriority = pPlayerPriority;
-                    }
-
-                    if (chosenSa == null) {
-                        break; // that means 'I pass'
-                    }
-                    if (DEBUG_PHASES) {
-                        System.out.print("... " + pPlayerPriority + " plays " + chosenSa);
-                    }
-
-                    boolean rollback = false;
-                    for (SpellAbility sa : chosenSa) {
-                        Card saHost = sa.getHostCard();
-                        final Zone originZone = saHost.getZone();
-                        final CardZoneTable triggerList = new CardZoneTable(game.getLastStateBattlefield(), game.getLastStateGraveyard());
-
-                        if (pPlayerPriority.getController().playChosenSpellAbility(sa)) {
-                            // 117.3c If a player has priority when they cast a spell, activate an ability, [play a land]
-                            // that player receives priority afterward.
-                            pFirstPriority = pPlayerPriority; // all opponents have to pass before stack is allowed to resolve
-                        } else if (game.EXPERIMENTAL_RESTORE_SNAPSHOT) {
-                            rollback = true;
-                        }
-
-                        saHost = game.getCardState(saHost);
-                        final Zone currentZone = saHost.getZone();
-
-                        // Need to check if Zone did change
-                        if (currentZone != null && originZone != null && !currentZone.equals(originZone) && (sa.isSpell() || sa.isLandAbility())) {
-                            // currently there can be only one Spell put on the Stack at once, or Land Abilities be played
-                            triggerList.put(originZone.getZoneType(), currentZone.getZoneType(), saHost);
-                            triggerList.triggerChangesZoneAll(game, sa);
-                        }
-                    }
-                    // Don't copy last state if we're in the middle of rolling back a spell...
-                    if (!rollback) {
-                        game.copyLastState();
-                    }
-                    loopCount++;
-                } while (loopCount < 999 || !pPlayerPriority.getController().isAI());
-
-                if (loopCount >= 999 && pPlayerPriority.getController().isAI()) {
-                    System.out.print("AI looped too much with: " + chosenSa);
-                }
-
-                if (DEBUG_PHASES) {
-                    sw.stop();
-                    System.out.print("... passed in " + sw.getTime()/1000f + " s\n");
-                    System.out.println("\t\tStack: " + game.getStack());
-                    sw.reset();
-                }
-            }
-            else if (DEBUG_PHASES) {
-                System.out.print(" >> (no priority given to " + getPriorityPlayer() + ")\n");
+    public void mainLoopStep() {
+        if (givePriorityToPlayer) {
+            if (DEBUG_PHASES) {
+                sw.start();
             }
 
-            // actingPlayer is the player who may act
-            // the firstAction is the player who gained Priority First in this segment
-            // of Priority
-            Player nextPlayer = game.getNextPlayerAfter(getPriorityPlayer());
+            game.fireEvent(new GameEventPlayerPriority(playerTurn, phase, getPriorityPlayer()));
+            List<SpellAbility> chosenSa = null;
 
-            if (game.isGameOver() || nextPlayer == null) { return; } // conceded?
+            int loopCount = 0;
+            do {
+                if (checkStateBasedEffects()) {
+                    // state-based effects check could lead to game over
+                    return;
+                }
+                game.stashGameState();
+
+                chosenSa = pPlayerPriority.getController().chooseSpellAbilityToPlay();
+
+                // this needs to come after chosenSa so it sees you conceding on own turn
+                if (playerTurn.hasLost() && pPlayerPriority.equals(playerTurn) && pFirstPriority.equals(playerTurn)) {
+                    // If the active player has lost, and they have priority, set the next player to have priority
+                    System.out.println("Active player is no longer in the game...");
+                    pPlayerPriority = game.getNextPlayerAfter(getPriorityPlayer());
+                    pFirstPriority = pPlayerPriority;
+                }
+
+                if (chosenSa == null) {
+                    break; // that means 'I pass'
+                }
+                if (DEBUG_PHASES) {
+                    System.out.print("... " + pPlayerPriority + " plays " + chosenSa);
+                }
+
+                boolean rollback = false;
+                for (SpellAbility sa : chosenSa) {
+                    Card saHost = sa.getHostCard();
+                    final Zone originZone = saHost.getZone();
+                    final CardZoneTable triggerList = new CardZoneTable(game.getLastStateBattlefield(), game.getLastStateGraveyard());
+
+                    if (pPlayerPriority.getController().playChosenSpellAbility(sa)) {
+                        // 117.3c If a player has priority when they cast a spell, activate an ability, [play a land]
+                        // that player receives priority afterward.
+                        pFirstPriority = pPlayerPriority; // all opponents have to pass before stack is allowed to resolve
+                    } else if (game.EXPERIMENTAL_RESTORE_SNAPSHOT) {
+                        rollback = true;
+                    }
+
+                    saHost = game.getCardState(saHost);
+                    final Zone currentZone = saHost.getZone();
+
+                    // Need to check if Zone did change
+                    if (currentZone != null && originZone != null && !currentZone.equals(originZone) && (sa.isSpell() || sa.isLandAbility())) {
+                        // currently there can be only one Spell put on the Stack at once, or Land Abilities be played
+                        triggerList.put(originZone.getZoneType(), currentZone.getZoneType(), saHost);
+                        triggerList.triggerChangesZoneAll(game, sa);
+                    }
+                }
+                // Don't copy last state if we're in the middle of rolling back a spell...
+                if (!rollback) {
+                    game.copyLastState();
+                }
+                loopCount++;
+            } while (loopCount < 999 || !pPlayerPriority.getController().isAI());
+
+            if (loopCount >= 999 && pPlayerPriority.getController().isAI()) {
+                System.out.print("AI looped too much with: " + chosenSa);
+            }
 
             if (DEBUG_PHASES) {
-                System.out.println(TextUtil.concatWithSpace(playerTurn.toString(),TextUtil.addSuffix(phase.toString(),":"), pPlayerPriority.toString(),"is active, previous was", nextPlayer.toString()));
+                sw.stop();
+                System.out.print("... passed in " + sw.getTime()/1000f + " s\n");
+                System.out.println("\t\tStack: " + game.getStack());
+                sw.reset();
             }
-            if (pFirstPriority == nextPlayer) {
-                if (game.getStack().isEmpty()) {
-                    if (playerTurn.hasLost()) {
-                        setPriority(game.getNextPlayerAfter(playerTurn));
-                    } else {
-                        setPriority(playerTurn);
-                    }
+        }
+        else if (DEBUG_PHASES) {
+            System.out.print(" >> (no priority given to " + getPriorityPlayer() + ")\n");
+        }
 
-                    // end phase
-                    givePriorityToPlayer = true;
-                    onPhaseEnd();
-                    advanceToNextPhase();
-                    onPhaseBegin();
+        // actingPlayer is the player who may act
+        // the firstAction is the player who gained Priority First in this segment
+        // of Priority
+        Player nextPlayer = game.getNextPlayerAfter(getPriorityPlayer());
+
+        if (game.isGameOver() || nextPlayer == null) { return; } // conceded?
+
+        if (DEBUG_PHASES) {
+            System.out.println(TextUtil.concatWithSpace(playerTurn.toString(),TextUtil.addSuffix(phase.toString(),":"), pPlayerPriority.toString(),"is active, previous was", nextPlayer.toString()));
+        }
+        if (pFirstPriority == nextPlayer) {
+            if (game.getStack().isEmpty()) {
+                if (playerTurn.hasLost()) {
+                    setPriority(game.getNextPlayerAfter(playerTurn));
+                } else {
+                    setPriority(playerTurn);
                 }
-                else if (!game.getStack().hasSimultaneousStackEntries()) {
-                    game.getStack().resolveStack();
-                }
-            } else {
-                // pass the priority to other player
-                pPlayerPriority = nextPlayer;
-            }
 
-            // If ever the karn's ultimate resolved
-            if (game.getAge() == GameStage.RestartedByKarn) {
-                setPhase(null);
-                game.updatePhaseForView();
-                game.fireEvent(new GameEventGameRestarted(playerTurn));
-                return;
+                // end phase
+                givePriorityToPlayer = true;
+                onPhaseEnd();
+                advanceToNextPhase();
+                onPhaseBegin();
             }
+            else if (!game.getStack().hasSimultaneousStackEntries()) {
+                game.getStack().resolveStack();
+            }
+        } else {
+            // pass the priority to other player
+            pPlayerPriority = nextPlayer;
+        }
 
-            // update Priority for all players
-            for (final Player p : game.getPlayers()) {
-                p.setHasPriority(getPriorityPlayer() == p);
-            }
+        // If ever the karn's ultimate resolved
+        if (game.getAge() == GameStage.RestartedByKarn) {
+            setPhase(null);
+            game.updatePhaseForView();
+            game.fireEvent(new GameEventGameRestarted(playerTurn));
+            return;
+        }
+
+        // update Priority for all players
+        for (final Player p : game.getPlayers()) {
+            p.setHasPriority(getPriorityPlayer() == p);
         }
     }
 
diff --git a/forge-game/src/main/java/forge/game/player/AchievementTracker.java b/forge-game/src/main/java/forge/game/player/AchievementTracker.java
index a597642ff08..457c75451a0 100644
--- a/forge-game/src/main/java/forge/game/player/AchievementTracker.java
+++ b/forge-game/src/main/java/forge/game/player/AchievementTracker.java
@@ -27,7 +27,7 @@ public class AchievementTracker {
                 activatedNonPWUltimates.add(card.getName());
             }
         }
-        if (card.getColor().equals(ColorSet.ALL_COLORS)) {
+        if (card.getColor().equals(ColorSet.WUBRG)) {
             challengesCompleted.add("Chromatic");
         }
     }
diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index e64dbb1c10f..60525c5a051 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -44,6 +44,7 @@ import forge.game.replacement.ReplacementResult;
 import forge.game.replacement.ReplacementType;
 import forge.game.spellability.AbilitySub;
 
+import forge.game.spellability.AlternativeCost;
 import forge.game.spellability.SpellAbility;
 import forge.game.staticability.*;
 import forge.game.trigger.Trigger;
@@ -454,7 +455,6 @@ public class Player extends GameEntity implements Comparable<Player> {
             return false;
         }
 
-        // Run any applicable replacement effects.
         final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(this);
         repParams.put(AbilityKey.LifeGained, lifeGain);
         repParams.put(AbilityKey.SourceSA, sa);
@@ -520,7 +520,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             return 0;
         }
         int oldLife = life;
-        // Run applicable replacement effects
+
         final Map<AbilityKey, Object> repParams = AbilityKey.mapFromAffected(this);
         repParams.put(AbilityKey.Amount, toLose);
         repParams.put(AbilityKey.IsDamage, damage);
@@ -547,13 +547,12 @@ public class Player extends GameEntity implements Comparable<Player> {
         life -= toLose;
         view.updateLife(this);
         if (manaBurn) {
-            game.fireEvent(new GameEventManaBurn(this, toLose, true));
+            game.fireEvent(new GameEventManaBurn(this, true, toLose));
         } else {
             game.fireEvent(new GameEventPlayerLivesChanged(this, oldLife, life));
         }
 
         boolean firstLost = lifeLostThisTurn == 0;
-
         lifeLostThisTurn += toLose;
 
         final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(this);
@@ -578,9 +577,6 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public final boolean payLife(final int lifePayment, final SpellAbility cause, final boolean effect) {
-        return payLife(lifePayment, cause, effect, null);
-    }
-    public final boolean payLife(final int lifePayment, final SpellAbility cause, final boolean effect, Map<AbilityKey, Object> params) {
         // fast check for pay zero life
         if (lifePayment <= 0) {
             cause.setPaidLife(0);
@@ -600,9 +596,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         if (cause.isReplacementAbility() && effect) {
             replaceParams.putAll(cause.getReplacingObjects());
         }
-        if (params != null) {
-            replaceParams.putAll(params);
-        }
         switch (getGame().getReplacementHandler().run(ReplacementType.PayLife, replaceParams)) {
         case Replaced:
             return true;
@@ -944,10 +937,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         getGame().fireEvent(new GameEventPlayerCounters(this, null, 0, 0));
     }
 
-    public void setCounters(final CounterEnumType counterType, final Integer num, Player source, boolean fireEvents) {
-        this.setCounters(CounterType.get(counterType), num, source, fireEvents);
-    }
-
     public void setCounters(final CounterType counterType, final Integer num, Player source, boolean fireEvents) {
         int old = getCounters(counterType);
         setCounters(counterType, num);
@@ -973,7 +962,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         getGame().fireEvent(new GameEventPlayerCounters(this, null, 0, 0));
 
         // create Radiation Effect for GameState
-        if (counters.getOrDefault(CounterType.get(CounterEnumType.RAD), 0) > 0) {
+        if (counters.getOrDefault(CounterEnumType.RAD, 0) > 0) {
             this.createRadiationEffect(null);
         } else {
             this.removeRadiationEffect();
@@ -1089,7 +1078,7 @@ public class Player extends GameEntity implements Comparable<Player> {
         }
 
         // CantTarget static abilities
-        if (StaticAbilityCantTarget.cantTarget(this, sa)) {
+        if (StaticAbilityCantTarget.cantTarget(this, sa) != null) {
             return false;
         }
 
@@ -1131,13 +1120,14 @@ public class Player extends GameEntity implements Comparable<Player> {
             getGame().fireEvent(new GameEventSurveil(this, numToTop, numToGrave));
         }
 
-        surveilThisTurn++;
         final Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(this);
-        runParams.put(AbilityKey.FirstTime, surveilThisTurn == 1);
+        runParams.put(AbilityKey.FirstTime, surveilThisTurn == 0);
         if (params != null) {
             runParams.putAll(params);
         }
         getGame().getTriggerHandler().runTrigger(TriggerType.Surveil, runParams, false);
+
+        surveilThisTurn++;
     }
 
     public int getSurveilThisTurn() {
@@ -1722,7 +1712,8 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
 
             final Zone zone = game.getZoneOf(land);
-            if (zone != null && (zone.is(ZoneType.Battlefield) || (!zone.is(ZoneType.Hand) && !mayPlay))) {
+            if (zone != null && (zone.is(ZoneType.Battlefield) || (!zone.is(ZoneType.Hand) && !mayPlay
+                    && (landSa == null || !landSa.isAlternativeCost(AlternativeCost.Mayhem))))) {
                 return false;
             }
         }
@@ -1970,10 +1961,11 @@ public class Player extends GameEntity implements Comparable<Player> {
         CardState speedFront = speedEffect.getState(CardStateName.Original);
         CardState speedBack = speedEffect.getState(CardStateName.Backside);
 
-        speedFront.setImageKey("t:speed");
+
+        speedFront.setImageKey(StaticData.instance().getOtherImageKey(ImageKeys.SPEED_IMAGE, CardEdition.UNKNOWN_CODE));
         speedFront.setName("Start Your Engines!");
 
-        speedBack.setImageKey("t:max_speed");
+        speedBack.setImageKey(StaticData.instance().getOtherImageKey(ImageKeys.MAX_SPEED_IMAGE, CardEdition.UNKNOWN_CODE));
         speedBack.setName("Max Speed!");
 
         String label = Localizer.getInstance().getMessage("lblSpeed", this.speed);
@@ -2321,7 +2313,7 @@ public class Player extends GameEntity implements Comparable<Player> {
 
     public final void addSacrificedThisTurn(final Card cpy, final SpellAbility source) {
         // Play the Sacrifice sound
-        game.fireEvent(new GameEventCardSacrificed());
+        game.fireEvent(new GameEventCardSacrificed(cpy));
 
         sacrificedThisTurn.add(cpy);
 
@@ -2349,9 +2341,6 @@ public class Player extends GameEntity implements Comparable<Player> {
     public final void resetSpellCastSinceBegOfYourLastTurn() {
         spellsCastSinceBeginningOfLastTurn = Lists.newArrayList();
     }
-    public final void setSpellCastSinceBegOfYourLastTurn(List<Card> spells) {
-        spellsCastSinceBeginningOfLastTurn = new ArrayList<>(spells);
-    }
     public final void addSpellCastSinceBegOfYourLastTurn(List<Card> spells) {
         spellsCastSinceBeginningOfLastTurn.addAll(spells);
     }
diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java
index c44f84e8470..b6eff922da9 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerController.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerController.java
@@ -287,6 +287,8 @@ public abstract class PlayerController {
     public abstract void revealAnte(String message, Multimap<Player, PaperCard> removedAnteCards);
     public abstract void revealAISkipCards(String message, Map<Player, Map<DeckSection, List<? extends PaperCard>>> deckCards);
 
+    public abstract void revealUnsupported(Map<Player, List<PaperCard>> unsupported);
+
     // These 2 are for AI
     public CardCollectionView cheatShuffle(CardCollectionView list) { return list; }
     public Map<DeckSection, List<? extends PaperCard>> complainCardsCantPlayWell(Deck myDeck) { return null; }
diff --git a/forge-game/src/main/java/forge/game/player/PlayerFactoryUtil.java b/forge-game/src/main/java/forge/game/player/PlayerFactoryUtil.java
index d5d0cc00e1b..34933815924 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerFactoryUtil.java
@@ -23,21 +23,21 @@ public class PlayerFactoryUtil {
                 sbValid.append("| ValidSource$ ").append(k[1]);
             }
 
-            String effect = "Mode$ CantTarget | ValidPlayer$ Player.You | Secondary$ True "
+            String effect = "Mode$ CantTarget | ValidTarget$ Player.You | Secondary$ True "
                     + sbValid.toString() + " | Activator$ Opponent | EffectZone$ Command | Description$ "
                     + sbDesc.toString() + " (" + inst.getReminderText() + ")";
 
             final Card card = player.getKeywordCard();
             inst.addStaticAbility(StaticAbility.create(effect, card, card.getCurrentState(), false));
         } else if (keyword.equals("Shroud")) {
-            String effect = "Mode$ CantTarget | ValidPlayer$ Player.You | Secondary$ True "
+            String effect = "Mode$ CantTarget | ValidTarget$ Player.You | Secondary$ True "
                     + "| EffectZone$ Command | Description$ Shroud (" + inst.getReminderText() + ")";
 
             final Card card = player.getKeywordCard();
             inst.addStaticAbility(StaticAbility.create(effect, card, card.getCurrentState(), false));
         } else if (keyword.startsWith("Protection")) {
             String valid = CardFactoryUtil.getProtectionValid(keyword, false);
-            String effect = "Mode$ CantTarget | Protection$ True | ValidPlayer$ Player.You | EffectZone$ Command | Secondary$ True ";
+            String effect = "Mode$ CantTarget | ValidTarget$ Player.You | EffectZone$ Command | Secondary$ True ";
             if (!valid.isEmpty()) {
                 effect += "| ValidSource$ " + valid;
             }
@@ -45,7 +45,7 @@ public class PlayerFactoryUtil {
             inst.addStaticAbility(StaticAbility.create(effect, card, card.getCurrentState(), false));
 
             // Attach
-            effect = "Mode$ CantAttach | Protection$ True | Target$ Player.You | EffectZone$ Command | Secondary$ True ";
+            effect = "Mode$ CantAttach | Target$ Player.You | EffectZone$ Command | Secondary$ True ";
             if (!valid.isEmpty()) {
                 effect += "| ValidCard$ " + valid;
             }
diff --git a/forge-game/src/main/java/forge/game/player/PlayerPredicates.java b/forge-game/src/main/java/forge/game/player/PlayerPredicates.java
index 3bd1fbc3f35..d9535bcfd95 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerPredicates.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerPredicates.java
@@ -7,7 +7,6 @@ import forge.game.CardTraitBase;
 import forge.game.GameEntity;
 import forge.game.card.Card;
 import forge.game.card.CardLists;
-import forge.game.card.CounterEnumType;
 import forge.game.card.CounterType;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
@@ -57,14 +56,6 @@ public final class PlayerPredicates {
     public static Predicate<Player> hasCounter(final CounterType type, final int n) {
         return p -> p.getCounters(type) >= n;
     }
-
-    public static Predicate<Player> hasCounter(final CounterEnumType type) {
-        return hasCounter(CounterType.get(type), 1);
-    }
-
-    public static Predicate<Player> hasCounter(final CounterEnumType type, final int n) {
-        return hasCounter(CounterType.get(type), n);
-    }
     
     public static Predicate<Player> hasKeyword(final String keyword) {
         return p -> p.hasKeyword(keyword);
diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java
index d7130dab99a..b13063f585f 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerView.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerView.java
@@ -12,7 +12,6 @@ import forge.card.mana.ManaAtom;
 import forge.game.GameEntityView;
 import forge.game.card.Card;
 import forge.game.card.CardView;
-import forge.game.card.CounterEnumType;
 import forge.game.card.CounterType;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.ZoneType;
@@ -192,9 +191,6 @@ public class PlayerView extends GameEntityView {
         }
         return 0;
     }
-    public int getCounters(CounterEnumType counterType) {
-        return getCounters(CounterType.get(counterType));
-    }
     void updateCounters(Player p) {
         set(TrackableProperty.Counters, p.getCounters());
     }
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
index f81dbb8f47d..a1c82f30a5e 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
@@ -242,7 +242,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
             String desc = AbilityUtils.applyDescriptionTextChangeEffects(getParam("Description"), this);
             ITranslatable nameSource = getHostName(this);
             desc = CardTranslation.translateMultipleDescriptionText(desc, nameSource);
-            String translatedName = CardTranslation.getTranslatedName(nameSource);
+            String translatedName = nameSource.getTranslatedName();
             desc = TextUtil.fastReplace(desc, "CARDNAME", translatedName);
             desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(translatedName));
             if (desc.contains("EFFECTSOURCE")) {
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
index afd07235a24..ac7912a1f44 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
@@ -280,15 +280,8 @@ public class ReplacementHandler {
             host = game.getCardState(host);
         }
 
-        if (replacementEffect.getOverridingAbility() == null && replacementEffect.hasParam("ReplaceWith")) {
-            // TODO: the source of replacement effect should be the source of the original effect
-            effectSA = AbilityFactory.getAbility(host, replacementEffect.getParam("ReplaceWith"), replacementEffect);
-            //replacementEffect.setOverridingAbility(effectSA);
-            //effectSA.setTrigger(true);
-        } else if (replacementEffect.getOverridingAbility() != null) {
-            effectSA = replacementEffect.getOverridingAbility();
-        }
-
+        // TODO: the source of replacement effect should be the source of the original effect
+        effectSA = replacementEffect.ensureAbility();
         if (effectSA != null) {
             SpellAbility tailend = effectSA;
             do {
diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java b/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
index ce10ab07de9..fcdc1b77f54 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
@@ -92,7 +92,7 @@ public abstract class AbilityActivated extends SpellAbility implements Cloneable
             return false;
         }
 
-        if (!(this.getRestrictions().canPlay(c, this))) {
+        if (!getRestrictions().canPlay(c, this)) {
             return false;
         }
 
diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
index 005fed45f76..fd1b57c2969 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -17,7 +17,6 @@
  */
 package forge.game.spellability;
 
-import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import forge.card.ColorSet;
 import forge.card.GamePieceType;
@@ -49,9 +48,9 @@ import forge.game.zone.ZoneType;
 import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -658,8 +657,8 @@ public class AbilityManaPart implements java.io.Serializable {
         }
         // replace Chosen for Spire colors
         if (origProduced.contains("ColorID")) {
-            Iterator<String> colors = Iterators.transform(sa.getHostCard().getMarkedColors().iterator(), MagicColor::toLongString);
-            origProduced = origProduced.replace("ColorID", getChosenColor(sa, () -> colors));
+            String str = sa.getHostCard().getMarkedColors().stream().map(c -> c.getShortName()).collect(Collectors.joining(" "));
+            origProduced = origProduced.replace("ColorID", str);
         }
         if (origProduced.contains("NotedColors")) {
             // Should only be used for Paliano, the High City
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
index 12cc7fb1b68..f404a3bb148 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -174,6 +174,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     private CardZoneTable changeZoneTable;
     private Map<Player, Integer> loseLifeMap;
 
+    private String name = "";
+
     public CardCollection getLastStateBattlefield() {
         return lastStateBattlefield;
     }
@@ -354,7 +356,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     public int totalAmountOfManaGenerated(SpellAbility saPaidFor, boolean multiply) {
         int result = 0;
         AbilityManaPart mp = getManaPart();
-        if (mp != null && metConditions() && mp.meetsManaRestrictions(saPaidFor)) {
+        if (mp != null && mp.meetsManaRestrictions(saPaidFor)) {
             result += amountOfManaGenerated(multiply);
         }
         result += subAbility != null ? subAbility.totalAmountOfManaGenerated(saPaidFor, multiply) : 0;
@@ -671,6 +673,10 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     public final boolean isMadness() {
         return isAlternativeCost(AlternativeCost.Madness);
     }
+    
+    public final boolean isMayhem() {
+        return isAlternativeCost(AlternativeCost.Mayhem);
+    }
 
     public final boolean isMutate() {
         return isAlternativeCost(AlternativeCost.Mutate);
@@ -1115,7 +1121,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             if (node.getHostCard() != null && !desc.isEmpty()) {
                 ITranslatable nameSource = getHostName(node);
                 desc = CardTranslation.translateMultipleDescriptionText(desc, nameSource);
-                String translatedName = CardTranslation.getTranslatedName(nameSource);
+                String translatedName = nameSource.getTranslatedName();
                 desc = TextUtil.fastReplace(desc, "CARDNAME", translatedName);
                 desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(translatedName));
                 if (node.getOriginalHost() != null) {
@@ -1242,6 +1248,9 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             clone.mayChooseNewTargets = false;
 
             clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects);
+            if (!lki) {
+                clone.replacingObjects = AbilityKey.newMap();
+            }
 
             clone.setPayCosts(getPayCosts().copy());
             if (manaPart != null) {
@@ -1500,6 +1509,22 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
                 }
             }
 
+            if (tr.isDifferentCMC() && entity instanceof Card) {
+                for (final Card c : getTargets().getTargetCards()) {
+                    if (entity != c && c.getCMC() == (((Card) entity).getCMC())) {
+                        return false;
+                    }
+                }
+            }
+
+            if (tr.isDifferentNames() && entity instanceof Card) {
+                for (final Card c : getTargets().getTargetCards()) {
+                    if (entity != c && c.sharesNameWith(((Card) entity).getName())) {
+                        return false;
+                    }
+                }
+            }
+
             if (tr.isSameController() && entity instanceof Card) {
                 Player newController;
                 newController = ((Card) entity).getController();
@@ -2655,4 +2680,12 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
     public void clearOptionalKeywordAmount() {
         optionalKeywordAmount.clear();
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
index 0c5f6209adc..5f1713723d5 100644
--- a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
+++ b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
@@ -55,10 +55,10 @@ public class TargetRestrictions {
 
     // Additional restrictions that may not fit into Valid
     private boolean uniqueTargets = false;
-    private boolean singleZone = false;
     private boolean forEachPlayer = false;
     private boolean differentControllers = false;
     private boolean differentCMC = false;
+    private boolean differentNames = false;
     private boolean equalToughness = false;
     private boolean sameController = false;
     private boolean withoutSameCreatureType = false;
@@ -99,7 +99,6 @@ public class TargetRestrictions {
         this.tgtZone = target.getZone();
         this.saValidTargeting = target.getSAValidTargeting();
         this.uniqueTargets = target.isUniqueTargets();
-        this.singleZone = target.isSingleZone();
         this.forEachPlayer = target.isForEachPlayer();
         this.differentControllers = target.isDifferentControllers();
         this.differentCMC = target.isDifferentCMC();
@@ -537,12 +536,6 @@ public class TargetRestrictions {
     public final void setUniqueTargets(final boolean unique) {
         this.uniqueTargets = unique;
     }
-    public final boolean isSingleZone() {
-        return this.singleZone;
-    }
-    public final void setSingleZone(final boolean single) {
-        this.singleZone = single;
-    }
     public boolean isWithoutSameCreatureType() {
         return withoutSameCreatureType;
     }
@@ -621,6 +614,13 @@ public class TargetRestrictions {
         this.differentCMC = different;
     }
 
+    public boolean isDifferentNames() {
+        return differentNames;
+    }
+    public void setDifferentNames(boolean different) {
+        this.differentNames = different;
+    }
+
     /**
      * @return the equalToughness
      */
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
index 957f10a494f..1d362b75a98 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -206,7 +206,7 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
         if (hasParam("Description") && !this.isSuppressed()) {
             ITranslatable nameSource = getHostName(this);
             String desc = CardTranslation.translateSingleDescriptionText(getParam("Description"), nameSource);
-            String translatedName = CardTranslation.getTranslatedName(nameSource);
+            String translatedName = nameSource.getTranslatedName();
             desc = TextUtil.fastReplace(desc, "CARDNAME", translatedName);
             desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(translatedName));
 
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttach.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttach.java
index 8b2ba2bda27..70704f3ac95 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttach.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttach.java
@@ -6,7 +6,7 @@ import forge.game.zone.ZoneType;
 
 public class StaticAbilityCantAttach {
 
-    public static boolean cantAttach(final GameEntity target, final Card card, boolean checkSBA) {
+    public static StaticAbility cantAttach(final GameEntity target, final Card card, boolean checkSBA) {
         // CantTarget static abilities
         for (final Card ca : target.getGame().getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
             for (final StaticAbility stAb : ca.getStaticAbilities()) {
@@ -15,11 +15,11 @@ public class StaticAbilityCantAttach {
                 }
 
                 if (applyCantAttachAbility(stAb, card, target, checkSBA)) {
-                    return true;
+                    return stAb;
                 }
             }
         }
-        return false;
+        return null;
     }
 
     public static boolean applyCantAttachAbility(final StaticAbility stAb, final Card card, final GameEntity target, boolean checkSBA) {
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
index ec214157f55..f96c20095bb 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java
@@ -39,36 +39,20 @@ public class StaticAbilityCantTarget {
 
     static String MODE = "CantTarget";
 
-    public static boolean cantTarget(final Card card, final SpellAbility spellAbility)  {
-        final Game game = card.getGame();
+    public static StaticAbility cantTarget(final GameEntity entity, final SpellAbility spellAbility)  {
+        final Game game = entity.getGame();
         for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
             for (final StaticAbility stAb : ca.getStaticAbilities()) {
                 if (!stAb.checkConditions(StaticAbilityMode.CantTarget)) {
                     continue;
                 }
 
-                if (applyCantTargetAbility(stAb, card, spellAbility)) {
-                    return true;
+                if (applyCantTargetAbility(stAb, entity, spellAbility)) {
+                    return stAb;
                 }
             }
         }
-        return false;
-    }
-
-    public static boolean cantTarget(final Player player, final SpellAbility spellAbility)  {
-        final Game game = player.getGame();
-        for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
-            for (final StaticAbility stAb : ca.getStaticAbilities()) {
-                if (!stAb.checkConditions(StaticAbilityMode.CantTarget)) {
-                    continue;
-                }
-
-                if (applyCantTargetAbility(stAb, player, spellAbility)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return null;
     }
 
     /**
@@ -82,57 +66,27 @@ public class StaticAbilityCantTarget {
      *            the spell/ability
      * @return true, if successful
      */
-    public static boolean applyCantTargetAbility(final StaticAbility stAb, final Card card, final SpellAbility spellAbility) {
-        if (stAb.hasParam("ValidPlayer")) {
-            return false;
-        }
+    public static boolean applyCantTargetAbility(final StaticAbility stAb, final GameEntity entity, final SpellAbility spellAbility) {
+        if (entity instanceof Card card) {
+            if (stAb.hasParam("AffectedZone")) {
+                if (ZoneType.listValueOf(stAb.getParam("AffectedZone")).stream().noneMatch(zt -> card.isInZone(zt))) {
+                    return false;
+                }
+            } else if (!card.isInPlay()) { // default zone is battlefield
+                return false;
+            }
+            Set<ZoneType> zones = stAb.getActiveZone();
 
-        if (stAb.hasParam("AffectedZone")) {
-            boolean inZone = false;
-            for (final ZoneType zt : ZoneType.listValueOf(stAb.getParam("AffectedZone"))) {
-                if (card.isInZone(zt)) {
-                    inZone = true;
-                    break;
+            if (zones != null && zones.contains(ZoneType.Stack)) {
+                // Enthralling Hold: only works if it wasn't already cast
+                if (card.getGame().getStack().getSpellMatchingHost(spellAbility.getHostCard()) != null) {
+                    return false;
                 }
             }
-
-            if (!inZone) {
-                return false;
-            }
-        } else { // default zone is battlefield
-            if (!card.isInPlay()) {
-                return false;
-            }
-        }
-        Set<ZoneType> zones = stAb.getActiveZone();
-
-        if (zones != null && zones.contains(ZoneType.Stack)) {
-            // Enthralling Hold: only works if it wasn't already cast
-            if (card.getGame().getStack().getSpellMatchingHost(spellAbility.getHostCard()) != null) {
-                return false;
-            }
-        }
-
-        if (!stAb.matchesValidParam("ValidCard", card)) {
+        } else if (stAb.hasParam("AffectedZone")) {
             return false;
         }
 
-        return common(stAb, card, spellAbility);
-    }
-
-    public static boolean applyCantTargetAbility(final StaticAbility stAb, final Player player, final SpellAbility spellAbility) {
-        if (stAb.hasParam("ValidCard") || stAb.hasParam("AffectedZone")) {
-            return false;
-        }
-
-        if (!stAb.matchesValidParam("ValidPlayer", player)) {
-            return false;
-        }
-
-        return common(stAb, player, spellAbility);
-    }
-
-    protected static boolean common(final StaticAbility stAb, GameEntity entity, final SpellAbility spellAbility) {
         final Card source = spellAbility.getHostCard();
         final Player activator = spellAbility.getActivatingPlayer();
 
@@ -140,6 +94,10 @@ public class StaticAbilityCantTarget {
             return false;
         }
 
+        if (!stAb.matchesValidParam("ValidTarget", entity)) {
+            return false;
+        }
+
         if (!stAb.matchesValidParam("ValidSA", spellAbility)) {
             return false;
         }
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
index 64c755f6810..bd394802db2 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -170,9 +170,11 @@ public final class StaticAbilityContinuous {
                 addKeywords = Lists.newArrayList(Arrays.asList(params.get("AddKeyword").split(" & ")));
                 final List<String> newKeywords = Lists.newArrayList();
 
-                // update keywords with Chosen parts
-                final String hostCardUID = Integer.toString(hostCard.getId()); // Protection with "doesn't remove" effect
+                // Protection with "doesn't remove" effect
+                final String hostCardUID = Integer.toString(hostCard.getId());
+                final String hostCardControllerUID = Integer.toString(hostCard.getController().getId());
 
+                // update keywords with Chosen parts
                 addKeywords.removeIf(input -> {
                     if (!hostCard.hasChosenColor() && input.contains("ChosenColor")) {
                         return true;
@@ -205,12 +207,12 @@ public final class StaticAbilityContinuous {
                     if (input.contains("CommanderColorID")) {
                         if (!hostCard.getController().getCommanders().isEmpty()) {
                             if (input.contains("NotCommanderColorID")) {
-                                for (Byte color : hostCard.getController().getNotCommanderColorID()) {
-                                    newKeywords.add(input.replace("NotCommanderColorID", MagicColor.toLongString(color)));
+                                for (MagicColor.Color color : hostCard.getController().getNotCommanderColorID()) {
+                                    newKeywords.add(input.replace("NotCommanderColorID", color.getName()));
                                 }
                                 return true;
-                            } else for (Byte color : hostCard.getController().getCommanderColorID()) {
-                                newKeywords.add(input.replace("CommanderColorID", MagicColor.toLongString(color)));
+                            } else for (MagicColor.Color color : hostCard.getController().getCommanderColorID()) {
+                                newKeywords.add(input.replace("CommanderColorID", color.getName()));
                             }
                             return true;
                         }
@@ -218,12 +220,9 @@ public final class StaticAbilityContinuous {
                     }
                     // two variants for Red vs. red in keyword
                     if (input.contains("ColorsYouCtrl") || input.contains("colorsYouCtrl")) {
-                        final ColorSet colorsYouCtrl = CardUtil.getColorsFromCards(controller.getCardsIn(ZoneType.Battlefield));
-
-                        for (byte color : colorsYouCtrl) {
-                            final String colorWord = MagicColor.toLongString(color);
-                            String y = input.replaceAll("ColorsYouCtrl", StringUtils.capitalize(colorWord));
-                            y = y.replaceAll("colorsYouCtrl", colorWord);
+                        for (MagicColor.Color color : CardUtil.getColorsFromCards(controller.getCardsIn(ZoneType.Battlefield))) {
+                            String y = input.replaceAll("ColorsYouCtrl", StringUtils.capitalize(color.getName()));
+                            y = y.replaceAll("colorsYouCtrl", color.getName());
                             newKeywords.add(y);
                         }
                         return true;
@@ -285,6 +284,7 @@ public final class StaticAbilityContinuous {
                         input = input.replaceAll("chosenEvenOdd", hostCard.getChosenEvenOdd().toString().toLowerCase());
                     }
                     input = input.replace("HostCardUID", hostCardUID);
+                    input = input.replace("HostCardControllerUID", hostCardControllerUID);
                     if (params.containsKey("CalcKeywordN")) {
                         input = input.replace("N", String.valueOf(AbilityUtils.calculateAmount(hostCard, params.get("CalcKeywordN"), stAb)));
                     }
@@ -623,7 +623,7 @@ public final class StaticAbilityContinuous {
                         // Mana cost
                         affectedCard.addChangedManaCost(state.getManaCost(), se.getTimestamp(), stAb.getId());
                         // color
-                        affectedCard.addColorByText(ColorSet.fromMask(state.getColor()), se.getTimestamp(), stAb.getId());
+                        affectedCard.addColorByText(ColorSet.fromMask(state.getColor()), se.getTimestamp(), stAb);
                         // type
                         affectedCard.addChangedCardTypesByText(new CardType(state.getType()), se.getTimestamp(), stAb.getId());
                         // abilities
@@ -706,8 +706,8 @@ public final class StaticAbilityContinuous {
                     newKeywords.removeIf(input -> {
                         // replace one Keyword with list of keywords
                         if (input.startsWith("Protection") && input.contains("CardColors")) {
-                            for (Byte color : affectedCard.getColor()) {
-                                extraKeywords.add(input.replace("CardColors", MagicColor.toLongString(color)));
+                            for (MagicColor.Color color : affectedCard.getColor()) {
+                                extraKeywords.add(input.replace("CardColors", color.getName()));
                             }
                             return true;
                         }
@@ -856,7 +856,7 @@ public final class StaticAbilityContinuous {
 
             // add colors
             if (addColors != null) {
-                affectedCard.addColor(addColors, !overwriteColors, se.getTimestamp(), stAb.getId(), stAb.isCharacteristicDefining());
+                affectedCard.addColor(addColors, !overwriteColors, se.getTimestamp(), stAb);
             }
 
             if (layer == StaticAbilityLayer.RULES) {
@@ -921,7 +921,7 @@ public final class StaticAbilityContinuous {
                 addColors = ColorSet.fromNames(hostCard.getChosenColors());
             }
         } else if (colors.equals("All")) {
-            addColors = ColorSet.ALL_COLORS;
+            addColors = ColorSet.WUBRG;
         } else {
             addColors = ColorSet.fromNames(colors.split(" & "));
         }
diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index dbcd5ee48de..21e3ce718ac 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -124,7 +124,7 @@ public abstract class Trigger extends TriggerReplacementBase {
             String desc = getParam("TriggerDescription");
             if (!desc.contains("ABILITY")) {
                 desc = CardTranslation.translateSingleDescriptionText(getParam("TriggerDescription"), nameSource);
-                String translatedName = CardTranslation.getTranslatedName(nameSource);
+                String translatedName = nameSource.getTranslatedName();
                 desc = TextUtil.fastReplace(desc,"CARDNAME", translatedName);
                 desc = TextUtil.fastReplace(desc,"NICKNAME", Lang.getInstance().getNickName(translatedName));
                 if (desc.contains("ORIGINALHOST") && this.getOriginalHost() != null) {
@@ -218,7 +218,7 @@ public abstract class Trigger extends TriggerReplacementBase {
             result = TextUtil.fastReplace(result, "ABILITY", saDesc);
 
             result = CardTranslation.translateMultipleDescriptionText(result, sa.getHostCard());
-            String translatedName = CardTranslation.getTranslatedName(sa.getHostCard());
+            String translatedName = sa.getHostCard().getTranslatedName();
             result = TextUtil.fastReplace(result,"CARDNAME", translatedName);
             result = TextUtil.fastReplace(result,"NICKNAME", Lang.getInstance().getNickName(translatedName));
         }
@@ -392,6 +392,10 @@ public abstract class Trigger extends TriggerReplacementBase {
             }
         }
 
+        if (condition == null) {
+            return true;
+        }
+
         if ("LifePaid".equals(condition)) {
             final SpellAbility trigSA = (SpellAbility) runParams.get(AbilityKey.SpellAbility);
             if (trigSA != null && trigSA.getAmountLifePaid() <= 0) {
@@ -442,7 +446,15 @@ public abstract class Trigger extends TriggerReplacementBase {
             if (game.getCombat().getAttackersAndDefenders().values().containsAll(attacker.getOpponents())) {
                 return false;
             }
+        } else if (condition.startsWith("FromNamedAbility")) {
+            var rest = condition.substring(16);
+            final SpellAbility trigSA = (SpellAbility) runParams.get(AbilityKey.Cause);
+
+            if (trigSA != null && !trigSA.getName().equals(rest)) {
+                return false;
+            }
         }
+        
         return true;
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
index 3f6ada026e7..676283cfffd 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
@@ -21,9 +21,12 @@ import java.util.Map;
 
 import com.google.common.collect.Iterables;
 import forge.game.ability.AbilityKey;
+import forge.game.ability.AbilityUtils;
 import forge.game.card.Card;
+import forge.game.card.CardCollection;
 import forge.game.card.CardLists;
 import forge.game.spellability.SpellAbility;
+import forge.util.Expressions;
 import forge.util.Localizer;
 
 /**
@@ -61,14 +64,10 @@ public class TriggerAttackerBlocked extends Trigger {
         }
 
         if (hasParam("ValidBlocker")) {
-            @SuppressWarnings("unchecked")
-            int count = CardLists.getValidCardCount(
-                    (Iterable<Card>) runParams.get(AbilityKey.Blockers),
-                    getParam("ValidBlocker"),
-                    getHostCard().getController(), getHostCard(), this
-            );
-
-            if (count == 0) {
+            String param = getParamOrDefault("ValidBlockerAmount", "GE1");
+            int attackers = CardLists.getValidCardCount((CardCollection) runParams.get(AbilityKey.Blockers), getParam("ValidBlocker"), getHostCard().getController(), getHostCard(), this);
+            int amount = AbilityUtils.calculateAmount(getHostCard(), param.substring(2), this);
+            if (!Expressions.compare(attackers, param, amount)) {
                 return false;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
index e73c4e112ee..5bf497ec3c7 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -92,6 +92,14 @@ public class TriggerChangesZone extends Trigger {
             }
         }
 
+        if (hasParam("ExcludedOrigins")) {
+            if (ArrayUtils.contains(
+                    getParam("ExcludedOrigins").split(","), runParams.get(AbilityKey.Origin)
+            )) {
+                return false;
+            }
+        }
+
         if (hasParam("ExcludedDestinations")) {
             if (ArrayUtils.contains(
                 getParam("ExcludedDestinations").split(","), runParams.get(AbilityKey.Destination)
@@ -108,9 +116,8 @@ public class TriggerChangesZone extends Trigger {
             }
         }
 
+        Card moved = (Card) runParams.get(AbilityKey.Card);
         if (hasParam("ValidCard")) {
-            Card moved = (Card) runParams.get(AbilityKey.Card);
-
             // CR 603.10a leaves battlefield or GY look back in time
             if ("Battlefield".equals(getParam("Origin"))
                     || ("Graveyard".equals(getParam("Origin")) && !"Battlefield".equals(getParam("Destination")))) {
@@ -147,8 +154,7 @@ public class TriggerChangesZone extends Trigger {
             final Card host = hostCard.getGame().getCardState(hostCard);
             final String comparator = condition.length < 2 ? "GE1" : condition[1];
             final int referenceValue = AbilityUtils.calculateAmount(host, comparator.substring(2), this);
-            final Card triggered = (Card) runParams.get(AbilityKey.Card);
-            final int actualValue = AbilityUtils.calculateAmount(triggered, condition[0], this);
+            final int actualValue = AbilityUtils.calculateAmount(moved, condition[0], this);
             if (!Expressions.compare(actualValue, comparator.substring(0, 2), referenceValue)) {
                 return false;
             }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 4bd193848f2..013e3a5b60a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -302,29 +302,25 @@ public class TriggerHandler {
     }
 
     private boolean runWaitingTrigger(final TriggerWaiting wt) {
-        final TriggerType mode = wt.getMode();
-        final Map<AbilityKey, Object> runParams = wt.getParams();
-
         final Player playerAP = game.getPhaseHandler().getPlayerTurn();
         if (playerAP == null) {
             // This should only happen outside of games, so it's safe to abort.
             return false;
         }
 
+        final TriggerType mode = wt.getMode();
+        final Map<AbilityKey, Object> runParams = wt.getParams();
         // Copy triggers here, so things can be modified just in case
         final List<Trigger> delayedTriggersWorkingCopy = new ArrayList<>(delayedTriggers);
-
         boolean checkStatics = false;
 
-        // Static triggers
+        // Static ones should happen first
         for (final Trigger t : Lists.newArrayList(activeTriggers)) {
             if (t.isStatic() && canRunTrigger(t, mode, runParams)) {
-                int x = 1 + StaticAbilityPanharmonicon.handlePanharmonicon(game, t, runParams);
-
-                for (int i = 0; i < x; ++i) {
+                int trigAmt = 1 + StaticAbilityPanharmonicon.handlePanharmonicon(game, t, runParams);
+                for (int i = 0; i < trigAmt; ++i) {
                     runSingleTrigger(t, runParams);
                 }
-
                 checkStatics = true;
             }
         }
@@ -342,36 +338,17 @@ public class TriggerHandler {
             }
         }
 
-        // AP
-        checkStatics |= runNonStaticTriggersForPlayer(playerAP, wt, delayedTriggersWorkingCopy);
-
-        // NAPs
-        for (final Player nap : game.getNonactivePlayers()) {
-            checkStatics |= runNonStaticTriggersForPlayer(nap, wt, delayedTriggersWorkingCopy);
-        }
-        return checkStatics;
-    }
-
-    public void clearWaitingTriggers() {
-        waitingTriggers.clear();
-    }
-
-    private boolean runNonStaticTriggersForPlayer(final Player player, final TriggerWaiting wt, final List<Trigger> delayedTriggersWorkingCopy) {
-        final TriggerType mode = wt.getMode();
-        final Map<AbilityKey, Object> runParams = wt.getParams();
         final boolean wasCollected = wt.getTriggers() != null;
         final Iterable<Trigger> triggers = wasCollected ? wt.getTriggers() : activeTriggers;
 
-        boolean checkStatics = false;
-
+        // the trigger will be ordered later in MagicStack
         for (final Trigger t : triggers) {
-            if (!t.isStatic() && t.getHostCard().getController().equals(player) && (wasCollected || canRunTrigger(t, mode, runParams))) {
+            if (!t.isStatic() && (wasCollected || canRunTrigger(t, mode, runParams))) {
                 if (wasCollected && !t.checkActivationLimit()) {
                     continue;
                 }
-                int x = 1 + StaticAbilityPanharmonicon.handlePanharmonicon(game, t, runParams);
-
-                for (int i = 0; i < x; ++i) {
+                int trigAmt = 1 + StaticAbilityPanharmonicon.handlePanharmonicon(game, t, runParams);
+                for (int i = 0; i < trigAmt; ++i) {
                     runSingleTrigger(t, runParams, wt.getController(t));
                 }
                 checkStatics = true;
@@ -379,15 +356,19 @@ public class TriggerHandler {
         }
 
         for (final Trigger deltrig : delayedTriggersWorkingCopy) {
-            if (deltrig.getHostCard().getController().equals(player) &&
-                    isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) {
+            if (isTriggerActive(deltrig) && canRunTrigger(deltrig, mode, runParams)) {
                 delayedTriggers.remove(deltrig);
                 runSingleTrigger(deltrig, runParams);
             }
         }
+
         return checkStatics;
     }
 
+    public void clearWaitingTriggers() {
+        waitingTriggers.clear();
+    }
+
     private boolean isTriggerActive(final Trigger regtrig) {
         if (!regtrig.phasesCheck(game)) {
             return false; // It's not the right phase to go off.
@@ -533,11 +514,6 @@ public class TriggerHandler {
             sa.setActivatingPlayer(p);
         }
 
-        if (regtrig.hasParam("RememberTriggeringCard")) {
-            Card triggeredCard = ((Card) sa.getTriggeringObject(AbilityKey.Card));
-            host.addRemembered(triggeredCard);
-        }
-
         if (!sa.getActivatingPlayer().isInGame()) {
             return;
         }
@@ -636,7 +612,7 @@ public class TriggerHandler {
         List<Trigger> lost = new ArrayList<>(delayedTriggers);
         for (Trigger t : lost) {
             // CR 800.4d trigger controller lost game
-            if (t.getHostCard().getOwner().equals(p)) {
+            if (p.equals(t.getSpawningAbility().getActivatingPlayer())) {
                 delayedTriggers.remove(t);
             }
         }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
index 4059b28d8d4..241712e5dc4 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
@@ -139,6 +139,7 @@ public enum TriggerType {
     SpellCast(TriggerSpellAbilityCastOrCopy.class),
     SpellCastOrCopy(TriggerSpellAbilityCastOrCopy.class),
     SpellCopy(TriggerSpellAbilityCastOrCopy.class),
+    Stationed(TriggerCrewedSaddled.class),
     Surveil(TriggerSurveil.class),
     TakesInitiative(TriggerTakesInitiative.class),
     TapAll(TriggerTapAll.class),
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index 6b20d52e089..37f0eec264b 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -331,6 +331,12 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             }
         }
 
+        if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
+            AbilityUtils.resolve(sp);
+            // AbilityStatic should do nothing below
+            return;
+        }
+
         if (si == null && sp.isActivatedAbility() && !sp.isCopied()) {
             // if not already copied use a fresh instance
             SpellAbility original = sp;
@@ -354,12 +360,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             addAbilityActivatedThisTurn(sp, source);
         }
 
-        if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
-            AbilityUtils.resolve(sp);
-            // AbilityStatic should do nothing below
-            return;
-        }
-
         // The ability is added to stack HERE
         si = push(sp, si, id);
 
@@ -453,6 +453,16 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
                     }
                 }
             }
+            if (sp.isKeyword(Keyword.STATION) && (sp.getHostCard().getType().hasSubtype("Spacecraft") || (sp.getHostCard().getType().hasSubtype("Planet")))) {
+                Iterable<Card> crews = sp.getPaidList("Tapped", true);
+                if (crews != null) {
+                    for (Card c : crews) {
+                        Map<AbilityKey, Object> stationParams = AbilityKey.mapFromCard(sp.getHostCard());
+                        stationParams.put(AbilityKey.Crew, c);
+                        game.getTriggerHandler().runTrigger(TriggerType.Stationed, stationParams, false);
+                    }
+                }
+            }
         } else {
             // Run Copy triggers
             if (sp.isSpell()) {
@@ -508,7 +518,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             sp.getActivatingPlayer().commitCrime();
         }
 
-        game.fireEvent(new GameEventZone(ZoneType.Stack, sp.getActivatingPlayer(), EventValueChangeType.Added, source));
+        game.fireEvent(new GameEventZone(ZoneType.Stack, sp, EventValueChangeType.Added));
 
         if (sp.getActivatingPlayer() != null && !game.getCardsPlayerCanActivateInStack().isEmpty()) {
             // This is a bit of a hack that forces the update of externally activatable cards in flashback zone (e.g. Lightning Storm).
@@ -847,32 +857,26 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
     }
 
     public boolean addAllTriggeredAbilitiesToStack() {
-        boolean result = false;
-        Player playerTurn = game.getPhaseHandler().getPlayerTurn();
+        if (!hasSimultaneousStackEntries()) {
+            return false;
+        }
 
+        Player playerTurn = game.getPhaseHandler().getPlayerTurn();
         if (playerTurn == null) {
             // caused by DevTools before first turn
             return false;
         }
-
         if (!playerTurn.isInGame()) {
             playerTurn = game.getNextPlayerAfter(playerTurn);
         }
-
-        // Grab players in turn order starting with the active player
         List<Player> players = game.getPlayersInTurnOrder(playerTurn);
 
+        boolean result = false;
+        // CR 603.3b
         for (Player p : players) {
-            if (p.hasLost()) {
-                continue;
-            }
             result |= chooseOrderOfSimultaneousStackEntry(p, false);
         }
-
         for (Player p : players) {
-            if (p.hasLost()) {
-                continue;
-            }
             result |= chooseOrderOfSimultaneousStackEntry(p, true);
         }
 
@@ -880,10 +884,12 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
     }
 
     private boolean chooseOrderOfSimultaneousStackEntry(final Player activePlayer, boolean isAbilityTriggered) {
-        if (simultaneousStackEntryList.isEmpty()) {
+        if (!activePlayer.isInGame()) {
+            return false;
+        }
+        if (!hasSimultaneousStackEntries()) {
             return false;
         }
-
         activePlayerSAs.clear();
         for (SpellAbility sa : simultaneousStackEntryList) {
             if (isAbilityTriggered != (sa.isTrigger() && sa.getTrigger().getMode() == TriggerType.AbilityTriggered)) {
@@ -961,16 +967,15 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         final Player active = game.getPhaseHandler().getPlayerTurn();
         game.getStackZone().resetCardsAddedThisTurn();
         this.thisTurnActivated.clear();
+        active.resetSpellCastSinceBegOfYourLastTurn();
         if (thisTurnCast.isEmpty()) {
             lastTurnCast = Lists.newArrayList();
-            active.resetSpellCastSinceBegOfYourLastTurn();
             return;
         }
-        for (Player nonActive : game.getNonactivePlayers()) {
-            nonActive.addSpellCastSinceBegOfYourLastTurn(thisTurnCast);
+        for (Player player : game.getPlayers()) {
+            player.addSpellCastSinceBegOfYourLastTurn(thisTurnCast);
         }
         lastTurnCast = Lists.newArrayList(thisTurnCast);
-        active.setSpellCastSinceBegOfYourLastTurn(thisTurnCast);
         thisTurnCast.clear();
         game.updateStackForView();
     }
diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java
index 6f2d4a53d03..04d17364f3c 100644
--- a/forge-game/src/main/java/forge/game/zone/Zone.java
+++ b/forge-game/src/main/java/forge/game/zone/Zone.java
@@ -54,7 +54,7 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
 
     // might support different order via preference later
     private static final Comparator<Card> COMPARATOR = Comparator.comparingInt((Card c) -> c.getCMC())
-            .thenComparing(c -> c.getColor())
+            .thenComparing(c -> c.getColor().getOrderWeight())
             .thenComparing(Comparator.comparing(Card::getName))
             .thenComparing(Card::hasPerpetual);
 
@@ -111,8 +111,7 @@ public class Zone implements java.io.Serializable, Iterable<Card> {
                 final Zone oldZone = game.getZoneOf(c);
                 final ZoneType zt = oldZone == null ? ZoneType.Stack : oldZone.getZoneType();
 
-                // only if the zoneType differs from this
-                // don't go in there is its a control change
+                // don't go in there if its a control change
                 if (zt != zoneType) {
                     c.setTurnInController(getPlayer());
                     c.setTurnInZone(game.getPhaseHandler().getTurn());
diff --git a/forge-game/src/main/java/forge/trackable/TrackableTypes.java b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
index 4b711552ecf..fe2464d90bf 100644
--- a/forge-game/src/main/java/forge/trackable/TrackableTypes.java
+++ b/forge-game/src/main/java/forge/trackable/TrackableTypes.java
@@ -464,7 +464,7 @@ public class TrackableTypes {
     public static final TrackableType<ColorSet> ColorSetType = new TrackableType<ColorSet>() {
         @Override
         public ColorSet getDefaultValue() {
-            return ColorSet.getNullColor();
+            return ColorSet.C;
         }
 
         @Override
diff --git a/forge-game/src/test/java/forge/game/card/CardCopyServiceTest.java b/forge-game/src/test/java/forge/game/card/CardCopyServiceTest.java
deleted file mode 100644
index dcaa6712580..00000000000
--- a/forge-game/src/test/java/forge/game/card/CardCopyServiceTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package forge.game.card;
-
-import org.testng.annotations.Test;
-
-public class CardCopyServiceTest {
-
-    @Test
-    public void testCopyCard() {
-
-    }
-
-    @Test
-    public void testCopyState() {
-
-    }
-
-    @Test
-    public void testCopyStats() {
-
-    }
-
-    @Test
-    public void testGetLKICopy() {
-
-    }
-}
diff --git a/forge-gui-android/assets/database.json b/forge-gui-android/assets/database.json
new file mode 100644
index 00000000000..6545eda2047
--- /dev/null
+++ b/forge-gui-android/assets/database.json
@@ -0,0 +1,770 @@
+{
+  "a32x":{
+    "CPU":"2x Cortex-A76 @ 2GHz 6x Cortex-A55 @ 2GHz",
+    "SoC":"MediaTek Dimensity 720 (MT6853)"
+  },
+  "angler":{
+    "CPU":"4x Cortex-A57 @ 1.95GHz 4x Cortex-A53 @ 1.55GHz",
+    "SoC":"Snapdragon 810 MSM8994"
+  },
+  "ane":{
+    "CPU":"4x Cortex-A54 @ 2.3GHz 4x Cortex-A54 @ 1.7GHz",
+    "SoC":"HiSilicon Kirin 659"
+  },
+  "amar_row_wifi":{
+    "CPU":"8x Cortex-A53 @ 1.8GHz",
+    "SoC":"Mediatek MT8768"
+  }, 
+  "atlas":{
+    "CPU":"-",
+    "SoC":"Intel(R) Core(TM) i5-8200Y @ 1.3GHz"
+  },
+  "apq8084":{
+    "CPU":"4x Krait 450 @ 2.65GHz",
+    "SoC":"Snapdragon 805 APQ8084"
+  },
+  "atoll":{
+    "CPU":"2x Kryo 465 Gold @ 2.3GHz 6x Kryo 465 Silver @ 1.8GHz",
+    "SoC":"Snapdragon 720G (SM7125)"
+  },
+  "art-l29":{
+    "CPU":"4x Cortex-A73 @ 2.2GHz 4x Cortex-A53 @ 1.7GHz",
+    "SoC":"HiSilicon Kirin 710F"
+  },
+  "baylake":{
+    "CPU":"Atom Z3745 @ 1.3GHz",
+    "SoC":"Intel Atom Z3745"
+  },
+  "begonia":{
+    "CPU":"2x Cortex-176 @ 2GHz 6x Cortex-A55 @ 2GHz",
+    "SoC":"MediaTek Helios G90T MT6785T"
+  },
+  "blueline":{
+    "CPU":"4x Kryo 385 Gold @ 2.8GHz 4x Kryo 385 Silver @ 1.75GHz",
+    "SoC":"Snapdragon 845"
+  },
+  "bullhead":{
+    "CPU":"4x Cortex-A57 @ 1.8GHz 4x Cortex-A53 @ 1.44GHz",
+    "SoC":"Snapdragon 808"
+  },
+  "capri":{
+    "CPU":"2x Cortex-A9 @ 1.2GHz",
+    "SoC":"Broadcom BCM28155"
+  },
+  "cepheus":{
+    "CPU":"1x Kryo 485 Gold @ 2.8GHz 3x Kryo 485 Gold @ 2.4GHz 4x Kryo 485 Silver @ 1.7GHz",
+    "SoC":"Snapdragon 855 SM8150"
+  },
+  "cheryl":{
+    "CPU":"4x Kryo 280 HP @ 2.45GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon 835 MSM8998"
+  },
+  "cheryl2":{
+    "CPU":"4x Kryo 385 Gold @ 2.8GHz 4x Kryo 385 Silver @ 1.8GHz",
+    "SoC":"Snapdragon 845 SDM845"
+  },
+  "cheetah":{
+    "CPU":"2x Cortex-X1 @ 2.8GHz 2x Cortex-A78 @ 2.3GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Google Tensor G2 (GS201)"
+  },
+  "comet":{
+    "CPU":"1x Cortex-X4 @ 31.GHz 3x Cortex-A720 @ 2.6GHz 4x Cortex-A520 @ 1.95GHz",
+    "SoC":"Google Tensor G4 (GS401)"
+  },
+  "eureka":{
+    "CPU":"6x Cortex-A78C @ 2.3 GHz",
+    "SoC":"Snapdragon XR2 Gen 2 (SM8550)"
+  },
+  "felix":{
+    "CPU":"2x Cortex-X1 @ 2.8GHz 2x Cortex-A78 @ 2.3GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Google Tensor G2 (GS201)"
+  },
+  "tangorpro":{
+    "CPU":"2x Cortex-X1 @ 2.8GHz 2x Cortex-A78 @ 2.3GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Google Tensor G2 (GS201)"
+  },
+  "codina":{
+    "CPU":"2x Cortex-A9 @ 1.0GHz",
+    "SoC":"NovaThor U8500"
+  },
+  "clovertrail":{
+    "CPU":"2x Atom Z2560 @ 1.6GHz",
+    "SoC":"Intel Atom Z2560"
+  },
+  "clt":{
+    "CPU":"4x Cortex-A73 @ 2.36GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 970"
+  },
+    "els":{
+    "CPU":"4x Cortex-A76 @ 2.8GHz 4x Cortex-A55 @ 1.9GHz",
+    "SoC":"HiSilicon Kirin 990 5G"
+  },
+    "dandelion":{
+    "CPU":"8x Cortex-A54 @ 1.5GHz",
+    "SoC":"MediaTek Helio G25 (MT6762G)"
+  },
+  "darcy":{
+    "CPU":"4x ARM Cortex-A53 4x ARM Cortex-A57",
+    "SoC":"nVIDIA Tegra X1 T210"
+  },
+  "db8520h":{
+    "CPU":"2x Cortex-A9 @ 1.0GHz",
+    "SoC":"NovaThor U8500"
+  },
+  "dragon":{
+    "CPU":"4x Cortex-A57 @ 1.9GHz 4x Cortex-A53 @ 1.3GHz",
+    "SoC":"nVIDIA Tegra X1 T210"
+  },
+  "douglas":{
+    "CPU":"4x Cortex-A53 @ 1.3GHz",
+    "SoC":"MediaTek MT8163"
+  },
+  "eeepad":{
+    "CPU":"4x Atom Z2520 @ 1.2GHz",
+    "SoC":"Intel Atom Z2520"
+  },
+  "endeavoru":{
+    "CPU":"4x Cortex-A9 @ 1.5GHz 1x Cortex-A9 @ 0.5GHz",
+    "SoC":"nVIDIA Tegra 3 AP33"
+  },
+  "eml":{
+    "CPU":"4x Cortex-A73 @ 2.36GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 970"
+  },
+  "eve":{
+    "CPU":"i5-7Y56 @ 1.2GHz",
+    "SoC":"Ambel Lake-Y / Kaby Lake-U/Y"
+  },
+  "eva-l19":{
+    "CPU":"4x Cortex-A72 @ 2.5GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 955"
+  },
+  "exynos990":{
+    "CPU":"4x Cortex-A55 @ 2GHz 2x Cortex-A76 @ 2.5GHz 2x Exynos M5 @ 2.7GHz",
+    "SoC":"Exynos 990"
+  },
+  "exynos9611":{
+    "CPU":"4x Cortex-A73 @ 2.3GHz 4x Cortex-A53 @ 1.7GHz",
+    "SoC":"Exynos 7 Octa (9611)"
+  },
+  "exynos2100":{
+    "CPU":"1x Cortex-X1 @ 2.9GHz 3x Cortex-A78 @ 2.8GHz 4x Cortex-A55 @ 2.2GHz",
+    "SoC":"Exynos 2100"
+  },
+  "exynos9810":{
+    "CPU":"4x Exynos M3 @ 2.7GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Exynos 9 (9810)"
+  },
+    "exynos9820":{
+    "CPU":"2 Exynos M4 @ 2.7GHz 2x Cortex-A75 @ 2.3GHz 4x Cortex-A55 @ 1.9GHz",
+    "SoC":"Exynos 9 (9820)"
+  },
+  "ford":{
+    "CPU":"4x Cortex-A7 @ 1.3GHz",
+    "SoC":"MediaTek MT8127"
+  },
+  "flo":{
+    "CPU":"4x Krait 300 @ 1.5GHz",
+    "SoC":"Snapdragon 600 APQ8064-FLO"
+  },
+  "flame":{
+    "CPU":"1x Kryo 485 Gold @ 2.8GHz 3x Kryo 485 Gold @ 2.4GHz 4x Kryo 485 Silver @ 1.7GHz",
+    "SoC":"Snapdragon 855 SM8150"
+  },
+  "fleur":{
+    "CPU":"2x Cortex-A76 @ 2GHz 6x Cortex-A55 @ 2GHz",
+    "SoC":"MediaTek Helio G96 (MT6781)"
+  },
+  "flounder":{
+    "CPU":"2x nVidia Denver @ 2.5GHz",
+    "SoC":"nVIDIA Tegra K1 T132"
+  },
+  "g3u":{
+    "CPU":"2x Cortex-A5 @ 1.0GHz",
+    "SoC":"Snapdragon S4 Play MSM8225"
+  },
+  "gee":{
+    "CPU":"4x Krait 300 @ 1.5GHz",
+    "SoC":"Snapdragon S4 Pro APQ8064"
+  },
+  "grouper":{
+    "CPU":"4x Cortex-A9 @ 1.3GHz 1x Cortex-A9 @ 0.5GHz",
+    "SoC":"nVIDIA Tegra 3 T30L"
+  },
+  "hammerhead":{
+    "CPU":"4x Krait 400 @ 2.26GHz",
+    "SoC":"Snapdragon 800 MSM8974"
+  },
+  "hawaii_ss_kylepro":{
+    "CPU":"2x Cortex-A9 @ 1.2GHz",
+    "SoC":"Broadcom BCM21664T"
+  },
+  "herring":{
+    "CPU":"1x Cortex-A8 @ 1.0GHz",
+    "SoC":"Exynos 3 Single 3110"
+  },
+  "hollywood":{
+    "CPU":"4x Kryo 280 HP @ 2.4GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon XR2"
+  },
+  "k6853v1_64_titan":{
+    "CPU":"2x Cortex-A76 @ 2Ghz 6x Cortex-A55 @ 2GHz",
+    "SoC":"MediaTek Dimensity 720 (MT6853)"
+  },
+  "kalama":{
+    "CPU":"1x Cortex-X3 @ 3.3GHz 2x Cortex-A710 @ 2.8GHz 2x Cortex-A715 @ 2.8GHz 3x Cortex-A510 @ 2.0GHz",
+    "SoC":"Snapdragon 8 Gen 2 (SM8550)"
+  },
+  "kona":{
+    "CPU":"1x Cortex-A77 @ 3.1GHz 3x Cortex-A77 @ 2.4GHz 4x Kryo 585 Silver @ 1.8GHz",
+    "SoC":"Snapdragon 865 SM8250"
+  },
+  "kohaku":{
+    "CPU":"i5-10210U @ 1.6GHz",
+    "SoC":"Comet Lake-U"
+  },
+   "lahaina":{
+    "CPU":"1x Cortex-X1 @ 2.8GHz 3x Cortex-A78 @ 2.4GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Snapdragon 888"
+  },
+  "liara":{
+    "CPU":"5 Compute cores 2C+3G",
+    "SoC":"AMD A4-9120C Radeon R4"
+  },
+  "lito":{
+    "CPU":"2x Cortex-A77 @ 2.1GHz 6x Kryo 560 Silver @ 1.7GHz",
+    "SoC":"Snapdragon 690 SM6350"
+  },
+  "lya":{
+    "CPU":"2x Cortex-A76 @ 2.6GHz 2x Cortex-A76 @ 1.9GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 980"
+  },
+  "lyo-l01":{
+    "CPU":"4x Cortex-153 @ 1.3GHz",
+    "SoC":"MediaTek MT6735"
+  },
+  "mako":{
+    "CPU":"4x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Pro APQ8064"
+  },
+  "marlin":{
+    "CPU":"2x Kryo HP @ 2.15GHz 2x Kryo @ 1.6GHz",
+    "SoC":"Snapdragon 821 MSM8996 Pro"
+  },
+  "med":{
+    "CPU":"8x Cortex-A54 @ 1.5GHz",
+    "SoC":"MediaTek MT6762R"
+  },
+  "mocha":{
+    "CPU":"4x Cortex-A15 @2.2GHz",
+    "SoC":"nVIDIA Tegra K1 T124"
+  },
+  "msm8225":{
+    "CPU":"2x Cortex-A5 @ 1.2GHz",
+    "SoC":"Snapdragon S4 MSM8225"
+  },
+  "msm8226":{
+    "CPU":"4x Cortex-A7 @ 1.19GHz",
+    "SoC":"Snapdragon 400 MSM8226"
+  },
+  "msm8625":{
+    "CPU":"2x Cortex-A5 @ 1.2GHz",
+    "SoC":"Snapdragon S4 MSM8625"
+  },
+  "MSM8227":{
+    "CPU":"2x Krait @ 1GHz",
+    "SoC":"Snapdragon S4 Plus MSM8227"
+  },
+  "msm8627":{
+    "CPU":"2x Krait @ 1GHz",
+    "SoC":"Snapdragon S4 Plus MSM8627"
+  },
+  "apq8030":{
+    "CPU":"2x Krait @ 1.2GHz",
+    "SoC":"Snapdragon S4 Plus APQ8030"
+  },
+  "msm8230":{
+    "CPU":"2x Krait @ 1.2GHz",
+    "SoC":"Snapdragon S4 Plus MSM8230"
+  },
+  "msm8660_surf":{
+    "CPU":"2x Scorpion @ 1.5GHz",
+    "SoC":"Snapdragon S3 MSM8260"
+  },
+  "msm8630":{
+    "CPU":"2x Krait @ 1.2GHz",
+    "SoC":"Snapdragon S4 Plus MSM8630"
+  },
+  "msm8930":{
+    "CPU":"2x Krait @ 1.2GHz",
+    "SoC":"Snapdragon S4 Plus MSM8930"
+  },
+  "msm8937":{
+    "CPU":"4x Cortex-A53 @ 1.4GHz",
+    "SoC":"Snapdragon 425 MSM8917"
+  },
+  "apq8060a":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Plus APQ8060A"
+  },
+  "msm8260a":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Plus MSM8260A"
+  },
+  "msm8660a":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Plus MSM8660A"
+  },
+  "msm8960":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Plus MSM8960"
+  },
+  "msm8260a-pro":{
+    "CPU":"2x Krait 300 @ 1.7GHz",
+    "SoC":"Snapdragon S4 Pro MSM8260A Pro"
+  },
+  "msm8960t":{
+    "CPU":"2x Krait 300 @ 1.7GHz",
+    "SoC":"Snapdragon S4 Pro MSM8960T"
+  },
+  "msm8960t-pro":{
+    "CPU":"2x Krait 300 @ 1.7GHz",
+    "SoC":"Snapdragon S4 Pro MSM8960T Pro"
+  },
+  "msm8960ab":{
+    "CPU":"2x Krait 300 @ 1.7GHz",
+    "SoC":"Snapdragon S4 Pro MSM8960AB"
+  },
+  "msm8960dt":{
+    "CPU":"2x Krait 300 @ 1.7GHz",
+    "SoC":"Snapdragon S4 Pro MSM8960DT"
+  },
+  "apq8064":{
+    "CPU":"4x Krait 300 @ 1.5GHz",
+    "SoC":"Snapdragon 600 APQ8064"
+  },
+  "msm8916":{
+    "CPU":"4x Cortex-A53 @ 1.2GHz",
+    "SoC":"Snapdragon 410 MSM8916"
+  },
+  "msm8953":{
+    "CPU":"8x Cortex-A53 @ 2.0GHz",
+    "SoC":"Snapdragon 625 MSM8953"
+  },
+  "msm8952":{
+    "CPU":"8x Cortex-A53 @ 1.2GHz",
+    "SoC":"Snapdragon 617 MSM8952"
+  },
+  "msm8956":{
+    "CPU":"2x Cortex-A72 @ 1.8GHz 4x Cortex-A53 @ 1.4GHz",
+    "SoC":"Snapdragon 650 MSM8956"
+  },
+  "msm8974":{
+    "CPU":"4x Krait 400 @ 2.15GHz",
+    "SoC":"Snapdragon 800 MSM8974"
+  },
+  "msm8974pro-ab":{
+    "CPU":"4x Krait 400 @ 2.26GHz",
+    "SoC":"Snapdragon 801 MSM8974PRO-AB"
+  },
+  "msm8974pro-ac":{
+    "CPU":"4x Krait 400 @ 2.45GHz",
+    "SoC":"Snapdragon 801 MSM8974AC"
+  },
+  "msm8976":{
+    "CPU":"4x Cortex-A53 @ 1.4GHz 4x Cortex-A72 @ 1.8GHz",
+    "SoC":"Snapdragon 652 MSM8976"
+  },
+  "msm8976pro":{
+    "CPU":"4x Cortex-A53 @ 1.4GHz 4x Cortex-A72 @ 1.9GHz",
+    "SoC":"Snapdragon 653 MSM8976 Pro"
+  },
+  "msm8992":{
+    "CPU":"4x Cortex-A57 @ 1.8GHz 4x Cortex-A53 @ 1.4GHz",
+    "SoC":"Snapdragon 808 MSM8992"
+  },
+  "msm8994":{
+    "CPU":"4x Cortex-A57 @ 1.95GHz 4x Cortex-A53 @ 1.5GHz",
+    "SoC":"Snapdragon 810 MSM8994"
+  },
+  "msm8996":{
+    "CPU":"2x Kryo HP @ 1.8GHz 2x Kryo LP @ 1.36GHz",
+    "SoC":"Snapdragon 820 MSM8996"
+  },
+  "msm8996pro":{
+    "CPU":"2x Kryo HP @ 2.34GHz 2x Kryo LP @ 2.18GHz",
+    "SoC":"Snapdragon 821 MSM8996 Pro"
+  },
+  "msm8998":{
+    "CPU":"4x Kryo 280 HP @ 2.4GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon 835 MSM8998"
+  },
+  "msmnile":{
+    "CPU":"1x Kryo 485 Gold @ 2.8GHz 3x Kryo 485 Gold @ 2.4GHz 4x Kryo 485 Silver @ 1.8GHz",
+    "SoC":"Snapdragon 855 SM8150"
+  },
+  "mt6795t":{
+    "CPU":"8x Cortex-A53 @ 2.1GHz",
+    "SoC":"MediaTek Helio X10 MT6795T"
+  },
+  "mt6797m":{
+    "CPU":"2x Cortex-A72 @ 2.1GHz 4x Cortex-A53 @ 1.85GHz 4x Cortex-A53 @ 1.4GHz",
+    "SoC":"MediaTek Helio X20 MT6797M"
+  },
+  "mt6750t":{
+    "CPU":"8x Cortex-A53 @ 1.5GHz",
+    "SoC":"MediaTek MT6750T"
+  },  
+  "mx5":{
+    "CPU":"8x Cortex-A53 @ 2.1GHz",
+    "SoC":"MediaTek Helio X10 MT6795T"
+  },
+  "mtk6575":{
+    "CPU":"1x Cortex-A9 @ 1.0GHz",
+    "SoC":"MediaTek MT6575"
+  },
+  "noh":{
+    "CPU":"4x Cortex-A77 @ 3.1GHz 4x Cortex-A55 @ 2.0GHz",
+    "SoC":"HiSilicon Kirin 9000"
+  },
+  "sdm710":{
+    "CPU":"2x Kryo 385 Gold @ 2.2GHz 6x Kryo 385 Silver @ 1.7GHz",
+    "SoC":"Snapdragon 710 SDM710"
+  },
+  "sdm845":{
+    "CPU":"4x Kryo 385 Gold @ 2.8GHz 4x Kryo 385 Silver @ 1.7GHz",
+    "SoC":"Snapdragon 845 SDM845"
+  },
+  "monterey":{
+    "CPU":"4x Kryo 280 HP @ 2.45GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon 835 MSM8998"
+  },
+  "oriole":{
+    "CPU":"2x Cortex-X1 @ 2.8GHz 2x Cortex-A76 @ 2.2GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Google Tensor (Whitechapel)"
+  },
+  "oppo6779_18073":{
+    "CPU":"2x Cortex-A75 @ 2.2GHz 6x Cortex-A55 @ 2GHz",
+    "SoC":"Mediatek MT6779 Helio P90"
+  },
+  "gt-p7510":{
+    "CPU":"2x Cortex-A9 @ 1.0GHz",
+    "SoC":"nVIDIA Tegra 2 T20"
+  },
+  "pacific":{
+    "CPU":"2x @ 2.1GHz 2x @ 1.6GHz",
+    "SoC":"Snapdragon 820E Embedded"
+  },
+  "piranha":{
+    "CPU":"2x Cortex-A9 @ 1.0GHz",
+    "SoC":"Texas Instruments OMAP4430"
+  },
+  "pro5":{
+    "CPU":"4xCortex-56 @ 2.1GHz 4x Cortex-53 @ 1.5GHz",
+    "SoC":"Exynos 7 Octa 7420"
+  },
+  "pro7plus":{
+    "CPU":"2x Cortex-A73 @ 2.6GHz 4x Cortex-A53 @ 2.2GHz 4x Cortex-A35 @ 1.9GHz",
+    "SoC":"MediaTek Helio X30 MT6799"
+  },
+  "pxa986":{
+    "CPU":"2x Cortex-A9 @ 1.2GHz",
+    "SoC":"Marvell PXA988"
+  },
+  "pxa19xx":{
+    "CPU":"4x Cortex-A53 @ 1.25GHz",
+    "SoC":"Maxvell Armada PXA1908"
+  },
+  "rhea_ss_corsicass":{
+    "CPU":"1x Cortex-A9 @ 0.9GHz",
+    "SoC":"Broadcom BCM21654"
+  },
+  "panther":{
+    "CPU":"1x Cortex-X1 @ 2.8GHz 2x Cortex-A78 @ 2.3GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Google Tensor G2"
+  },
+  "prada":{
+    "CPU":"4x Cortex-A53 @ 1.4 GHz 4x Cortex-A53 @ 1.1GHz",
+    "SoC":"Snapdragon 430 MSM8937"
+  },
+  "pro6plus":{
+    "CPU":"4x Exynos M1 @ 1.97GHz 4x Cortex-A53 @ 1.48GHz",
+    "SoC":"Exynos 8 Octa 8890"
+  },
+  "universal3110":{
+    "CPU":"1x Cortex-A8 @ 1.2GHz",
+    "SoC":"Exynos 3 Single 3110"
+  },
+  "universal9820":{
+    "CPU":"2x Exynos M4 @ 2.7GHz 2x Cortex-A75 @ 2.3GHz 4x Cortex-A55 @ 1.95GHz",
+    "SoC":"Exynos 9 9820"
+  },
+  "redfin":{
+    "CPU":"2x Kryo 475 Gold @ 2.4GHz 2x Kryo 475 Gold 2.2GHz 6x Kryo 475 Silver @ 1.8GHz ",
+    "SoC":"Snapdragon 765/765G"
+  },
+  "s5e9925":{
+    "CPU":"1x Cortex-X2 @ 2.8GHZ 3x Cortex-A710 @ 2.5GHz 4x Cortex-A510 @ 1.8GHz",
+    "SoC":"Exynos 2200"
+  },
+  "saturn":{
+    "CPU":"4x Krait 450 @ 2.45GHz",
+    "SoC":"Snapdragon 805 APQ8084"
+  },
+  "sailfish":{
+    "CPU":"2x Kryo HP @ 2.15GHz 2x Kryo @ 1.6GHz",
+    "SoC":"Snapdragon 821 MSM8996 Pro"
+  },
+  "sdm660":{
+    "CPU":"4x Kryo 260 HP @ 2.2GHz 4x Kryo 260 LP @ 1.8GHz",
+    "SoC":"Snapdragon 660"
+  },
+  "sc-02b":{
+    "CPU":"1x Cortex-A8 @ 1.2GHz",
+    "SoC":"Exynos 3 Single 3110"
+  },
+  "sch-i905":{
+    "CPU":"2x Cortex-A9 @ 1.0GHz",
+    "SoC":"nVIDIA Tegra 2 T20"
+  },
+  "sc7730s":{
+    "CPU":"4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Spreadtrum SC7730S"
+  },
+  "shamu":{
+    "CPU":"4x Krai 450 @ 2.65GHz",
+    "SoC":"Snapdragon 805 APQ8084AB"
+  },
+  "shiba":{
+    "CPU":"1x Cortex-X3 @ 2.9GHz 4x Cortex-A715 @ 2.3GHz 4x Cortex-A510 @ 1.7GHz",
+    "SoC":"Google Tensor G3 (GS301)"
+  },
+  "sm6150":{
+    "CPU":"2x Kryo 460 Gold @ 2GHz 6x 460 Kryo Silver @ 1.7GHz",
+    "SoC":"Snapdragon 675 SM6150"
+  },
+  "smdkc110":{
+    "CPU":"1x Cortex-A8 @ 1.2GHz",
+    "SoC":"Exynos 3 Single 3110"
+  },
+  "sun":{
+    "CPU":"2x Oryon @ 4.5GHz 6x Oryon @ 3.5GHz",
+    "SoC":"Snapdragon 9 Elite (SM8750)"
+  },
+  "ums512_25c10": {
+    "CPU":"2 Cortex-A75 @2GHz 6x Cortex-A55 @ 2 GHz",
+    "SoC":"Unisoc Tiger T618"
+  },
+  "universal3250":{
+    "CPU":"2x Cortex-A7 @ 1.0GHz",
+    "SoC":"Exynos 2 Dual 3250"
+  },
+  "universal3470":{
+    "CPU":"4x Cortex-A7 @ 1.4GHz",
+    "SoC":"Exynos 3 Quad 3470"
+  },
+  "universal3475":{
+    "CPU":"4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Exynos 3 Quad 3475"
+  },
+  "universal4210":{
+    "CPU":"2x Cortex-A9 @ 1.4GHz",
+    "SoC":"Exynos 4 Dual 4210"
+  },
+  "universal4212":{
+    "CPU":"2x Cortex-A9 @ 1.5GHz",
+    "SoC":"Exynos 4 Dual 4212"
+  },
+  "universal4412":{
+    "CPU":"4x Cortex-A9 @ 1.4GHz",
+    "SoC":"Exynos 4 Quad 4412"
+  },
+  "smdk4x12":{
+    "CPU":"4x Cortex-A9 @ 1.4GHz",
+    "SoC":"Exynos 4 Quad 4412"
+  },
+  "universal4415":{
+    "CPU":"4x Cortex-A9 @ 1.5GHz",
+    "SoC":"Exynos 4 Quad 4415"
+  },
+  "universal5250":{
+    "CPU":"2x Cortex-A15 @ 1.7GHz",
+    "SoC":"Exynos 5 Dual 5250"
+  },
+  "universal5260":{
+    "CPU":"2x Cortex-A15 @ 1.7GHz 4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Exynos 5 Hexa 5260"
+  },
+  "universal5410":{
+    "CPU":"4x Cortex-A15 @ 1.6GHz 4x Cortex-A7 @ 1.2GHz",
+    "SoC":"Exynos 5 Octa 5410"
+  },
+  "universal5420":{
+    "CPU":"4x Cortex-A15 @ 1.9GHz 4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Exynos 5 Octa 5420"
+  },
+  "universal5422":{
+    "CPU":"4x Cortex-A15 @ 2.1GHz 4x Cortex-A7 @ 1.5GHz",
+    "SoC":"Exynos 5 Octa 5422"
+  },
+  "universal5430":{
+    "CPU":"4x Cortex-A15 @ 1.8GHz 4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Exynos 5 Octa 5430"
+  },
+  "universal5800":{
+    "CPU":"4x Cortex-A15 @ 2.0GHz 4x Cortex-A7 @ 1.3GHz",
+    "SoC":"Exynos 5 Octa 5800"
+  },
+  "universal5433":{
+    "CPU":"4x Cortex-A57 @ 1.9GHz 4x Cortex-A53 @ 1.3GHz",
+    "SoC":"Exynos 7 Octa 5433"
+  },
+  "universal7420":{
+    "CPU":"4x Cortex-A57 @ 2.1GHz 4x Cortex-A53 @ 1.5GHz",
+    "SoC":"Exynos 7 Octa 7420"
+  },
+  "universal7570":{
+    "CPU":"8x Cortex-A53 @ 1.4GHz",
+    "SoC":"Exynos 7 Quad 7570"
+  },
+  "universal7580":{
+    "CPU":"8x Cortex-A53 @ 1.6GHz",
+    "SoC":"Exynos 7 Octa 7580"
+  },
+  "universal7870":{
+    "CPU":"8x Cortex-A53 @ 1.6GHz",
+    "SoC":"Exynos 7 Octa 7870"
+  },
+  "universal7880":{
+    "CPU":"8x Cortex-A53 @ 1.9GHz",
+    "SoC":"Exynos 7 Octa 7880"
+  },
+  "universal7872":{
+    "CPU":"2x Cortex-A73 @ 2.0GHz 4x Cortex-A53 @ 1.6GHz",
+    "SoC":"Exynos 7 Hexa 7872"
+  },
+  "universal7885":{
+    "CPU":"2x Cortex-A73 @ 2.2GHz 6x Cortex-A53 @ 1.6GHz",
+    "SoC":"Exynos 7 Octa 7885"
+  },
+  "universal8890":{
+    "CPU":"4x Cortex-A53 @ 1.6GHz 4x Samsung Exynos M1 @ 2.6GHz",
+    "SoC":"Exynos 8 Octa 8890"
+  },
+  "universal8895":{
+    "CPU":"4x Samsung Exynos M1 @ 2.3GHz 4x Cortex-A53 @ 1.6GHz",
+    "SoC":"Exynos 9 Octa 8895"
+  },
+  "universal9810":{
+    "CPU":"4x Samsung Exynos M3 @ 2.8GHz 4x Cortex-A55 @ 1.7GHz",
+    "SoC":"Exynos 9 Series 9810"
+  },
+  "universal9825":{
+    "CPU":"2x Samsung Exynos M4 @ 2.7GHz 2x Cortex-A75 @ 2.4GHz 4x Cortex-A55 @ 1.9GHz",
+    "SoC":"Exynos 9 Series 9825"
+  },
+  "ville":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 MSM8290"
+  },
+  "vog":{
+    "CPU":"2x Cortex-A76 @ 2.6GHz 2x Cortex-A76 @ 1.9GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 980"
+  },
+  "venus":{
+    "CPU":"1x Cortex-X1 @ 2.8GHz 3x Cortex-A78 @ 2.4GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Snapdragon 888 SM8350"
+  },
+  "vtr":{
+    "CPU":"4x Cortex-A73 @ 2.4GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"HiSilicon Kirin 960"
+  },
+  "taimen":{
+    "CPU":"4x Kryo 280 HP @ 2.45GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon 835 MSM8998"
+  },
+  "tn8":{
+    "CPU":"4x Cortex-A15 @2.2GHz",
+    "SoC":"nVIDIA Tegra K1 T124"
+  },  
+  "taro":{
+    "CPU":"1x Cortex-X2 @ 3GHz 3x Cortex-A710 @ 2.5GHz 4x Cortex-A510 @ 1.8GHz",
+    "SoC":"Snapdragon 8 Gen 1 (SM8450)"
+  },
+  "thebes":{
+    "CPU":"2x Cortex-A15 @ 1.5GHz 2x Cortex-A7 @ 1.2GHz",
+    "SoC":"MediaTek MT8135"
+  },
+  "trinket":{
+    "CPU":"4x Kryo 260 HP @ 2GHz 4x Kryo 260 LP @ 1.8GHz",
+    "SoC":"Snapdragon 665 SM6125"
+  },
+  "tuna":{
+    "CPU":"2x Cortex-A9 @ 1.2GHz",
+    "SoC":"TI OMAP 4460"
+  },
+  "vu2kt":{
+    "CPU":"2x Krait @ 1.5GHz",
+    "SoC":"Snapdragon S4 Plus MSM8960"
+  },
+  "walleye":{
+    "CPU":"4x Kryo 280 HP @ 2.45GHz 4x Kryo 280 LP @ 1.9GHz",
+    "SoC":"Snapdragon 835 MSM8998"
+  },
+  "wikipad":{
+    "CPU":"4x Cortex-A9 @ 1.3GHz 1x Cortex-A9 @ 0.5GHz",
+    "SoC":"nVIDIA Tegra 3 T30L"
+  },
+  "qc_reference_phone":{
+    "CPU":"2x Kryo HP @ 2.15GHz 2x Kryo LP @ 1.36GHz",
+    "SoC":"Snapdragon 820 MSM8996"
+  },
+  "z4u":{
+    "CPU":"4x Cortex-A5 @ 1.2GHz",
+    "SoC":"Snapdragon 200 MSM8225Q"
+  },
+  "zs600kl":{
+    "CPU":"4x Kryo 385 Gold @ 3GHz 4x Kryo 385 Silver @ 1.8GHz",
+    "SoC":"Snapdragon 845"
+  },
+   "mt6765v":{
+    "CPU":"4x Cortex-A53 @ 2.3GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"Mediatek MT6765G Helio G35 (12 nm)"
+  },
+  "k65v1_64_bsp_titan_rat":{
+    "CPU":"4x Cortex-A53 @ 2.3GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"Mediatek MT6765 Helio P35 (12nm)"
+  },
+  "careena":{
+    "CPU":"AMD 670F00h",
+    "SoC":"AMD A4-9120C RADEON R4, 5 COMPUTE CORES 2C+3G"
+  },
+  "sion":{
+    "CPU":"i3-8130U CPU 2.2GHz SoC",
+    "SoC":"i3-8130U CPU 2,2 GHz soc"
+  },
+  "biloba":{
+    "CPU":"2x Cortex-A75 @ 2.0GHz 6x Cortex-A55 @ 1.8GHz",
+    "SoC":"Mediatek MT6769Z Helio G85 (12nm)"
+  },
+  "ele":{
+    "CPU":"2x Cortex-A76 @ 2.6GHz 2x Cortex-A76 @ 1.9GHz 4x Cortex-A55 @ 1.8GHz",
+    "SoC":"Kirin 980 (7 nm)"
+  },
+  "krane":{
+    "CPU":"4x Cortex-A73 @ 2.0GHz + 4x Cortex-A53 @ 2.0GHz",
+    "SoC":"MediaTekHelio P60T (12nm)"
+  },
+  "pineapple":{
+    "CPU":"1x Cortex-X4 @ 3.3GHz 3x Cortex-A720 @ 3.2GHz 2x Cortex-A720 @ 2.6GHz 4x Cortex-A520 @ 2.3GHz", 
+    "SoC":"Qualcomm SM8650-AB Snapdragon 8 Gen 3"
+  },
+  "s5e9945":{
+    "CPU":"1x Cortex-X4 @ 3.2GHz 2x Cortex-A720 @ 2.9GHz 3x Cortex-A720 @ 2.6GHz 4x Cortex-A520 @ 2.0GHz", 
+    "SoC":"Exynos 2400"
+  },
+  "a12":{
+    "CPU":"4x Cortex-A53 @ 2.35GHz 4x Cortex-A53 @ 1.8GHz",
+    "SoC":"MediaTek Helio P35 (MT6765)"
+  }
+}
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 2447d905457..0de3daae9eb 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -97,7 +97,7 @@
             <groupId>org.robolectric</groupId>
             <artifactId>android-all</artifactId>
             <!-- update version: 16-robolectric-13921718 but needs to fix Android 16 Edge to edge enforcement -->
-            <version>15-robolectric-12650502</version>
+            <version>15-robolectric-13954326</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -156,7 +156,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-android</artifactId>
-            <version>8.19.1</version>
+            <version>8.21.1</version>
             <type>aar</type>
             <exclusions>
                 <exclusion>
@@ -177,7 +177,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-android-core</artifactId>
-            <version>8.19.1</version>
+            <version>8.21.1</version>
             <type>aar</type>
             <exclusions>
                 <exclusion>
@@ -201,7 +201,7 @@
         <dependency>
             <groupId>io.sentry</groupId>
             <artifactId>sentry-android-ndk</artifactId>
-            <version>8.19.1</version>
+            <version>8.21.1</version>
             <type>aar</type>
             <exclusions>
                 <exclusion>
@@ -487,7 +487,7 @@
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
-                                            <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
+                                            <fileset dir="${basedir}/../forge-gui-desktop/target/" includes="CHANGES.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="GAMEPAD_README.txt" />
                                             <fileset dir="${basedir}/../forge-gui/" includes="MANUAL.txt" />
                                             <fileset dir="${basedir}/../forge-gui-mobile-dev/" includes="sentry.properties" />
diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java
index a3f90977885..4e3e988bbdf 100644
--- a/forge-gui-android/src/forge/app/Main.java
+++ b/forge-gui-android/src/forge/app/Main.java
@@ -67,10 +67,12 @@ import forge.util.ThreadUtil;
 import io.sentry.protocol.Device;
 import io.sentry.protocol.OperatingSystem;
 import org.apache.commons.lang3.tuple.Pair;
+import org.json.JSONObject;
 import org.jupnp.DefaultUpnpServiceConfiguration;
 import org.jupnp.android.AndroidUpnpServiceConfiguration;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 
@@ -188,7 +190,26 @@ public class Main extends AndroidApplication {
 
         boolean permissiongranted = checkPermission();
         Gadapter = new AndroidAdapter(getContext());
-
+        String cpu = "";
+        String soc = "";
+        boolean getChipset = false;
+        // database.json source: https://github.com/xTheEc0/Android-Device-Hardware-Specs-Database
+        try {
+            InputStream is = getAssets().open("database.json");
+            int size = is.available();
+            byte[] buffer = new byte[size];
+            is.read(buffer);
+            is.close();
+            JSONObject db = new JSONObject(new String(buffer, StandardCharsets.UTF_8));
+            JSONObject board = db.getJSONObject(Build.BOARD);
+            cpu = board.get("CPU").toString();
+            soc = board.get("SoC").toString();
+            getChipset = true;
+        } catch (Exception e) {
+            cpu = getCpuName();
+            soc = Build.BOARD;
+            getChipset = false;
+        }
         // Device Info
         Device device = new Device();
         device.setId(Build.ID);
@@ -197,8 +218,8 @@ public class Main extends AndroidApplication {
         device.setBrand(Build.BRAND);
         device.setManufacturer(Build.MANUFACTURER);
         device.setMemorySize(memInfo.totalMem);
-        device.setCpuDescription(getCpuName());
-        device.setChipset(Build.HARDWARE + " " + Build.BOARD);
+        device.setCpuDescription(cpu);
+        device.setChipset(soc);
         // OS Info
         OperatingSystem os = new OperatingSystem();
         os.setName("Android");
@@ -206,7 +227,7 @@ public class Main extends AndroidApplication {
         os.setBuild(Build.DISPLAY);
         os.setRawDescription(getAndroidOSName());
 
-        initForge(Gadapter, new HWInfo(device, os), permissiongranted, totalMemory, isTabletDevice(getContext()));
+        initForge(Gadapter, new HWInfo(device, os, getChipset), permissiongranted, totalMemory, isTabletDevice(getContext()));
     }
 
     private void crossfade(View contentView, View previousView) {
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index dfe902e6b9a..4e6b5c911a9 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -35,7 +35,6 @@
                             <goal>timestamp-property</goal>
                         </goals>
                         <configuration>
-                            <!-- generate MonthDate code to month.date property -->
                             <name>month.date</name>
                             <pattern>MM.dd</pattern>
                         </configuration>
@@ -47,7 +46,6 @@
                             <goal>regex-property</goal>
                         </goals>
                         <configuration>
-                            <!-- generate versionName from revision property to snapshot-version property  -->
                             <name>snapshot-version</name>
                             <value>${revision}</value>
                             <regex>-SNAPSHOT</regex>
@@ -189,7 +187,7 @@
   java.base/java.nio
   java.base/java.math
   java.base/java.util.concurrent
-  java.base/java.net                                     
+  java.base/java.net
 ]]>
                             </Add-Opens>
                             <Main-Class>forge.view.Main</Main-Class>
@@ -208,6 +206,46 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
+                <executions>
+                    <execution>
+                        <id>get-changelog-from-tag</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+<![CDATA[
+try {
+    def isOnTag = "git describe --exact-match --tags HEAD".execute().waitFor() == 0
+    def tagList = "git tag --sort=-version:refname".execute().text.split("\n")
+        .findAll { it.startsWith("forge-") }
+
+    def tag = "HEAD"
+    if (isOnTag && tagList.size() > 1) {
+        tag = tagList[1]
+    } else if (!isOnTag && tagList.size() > 0) {
+        tag = tagList[0]
+    }
+
+    project.properties['changelog.from.tag'] = tag
+    println "Using changelog from tag: ${tag}"
+} catch (Exception e) {
+    project.properties['changelog.from.tag'] = "HEAD"
+    println "Using changelog from tag: HEAD (fallback)"
+}
+]]>
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>se.bjurr.gitchangelog</groupId>
                 <artifactId>git-changelog-maven-plugin</artifactId>
@@ -220,9 +258,9 @@
                             <goal>git-changelog</goal>
                         </goals>
                         <configuration>
-                            <!-- TODO: insert placeholder for latest version tag -->
-                            <fromRef>forge-1.6.65</fromRef>
-                            <file>../forge-gui/release-files/CHANGES.txt</file>
+                            <!-- Generate changelog from the appropriate tag -->
+                            <fromRef>refs/tags/${changelog.from.tag}</fromRef>
+                            <file>${project.build.directory}/CHANGES.txt</file>
                             <templateContent>
 <![CDATA[
 {{#tags}}
@@ -488,7 +526,7 @@
                                         <mkdir dir="${project.build.directory}/${project.build.finalName}-osx" />
                                         <copy todir="${project.build.directory}/${project.build.finalName}-osx">
                                             <fileset dir="${basedir}/../forge-gui/" includes="LICENSE.txt" />
-                                            <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
+                                            <fileset dir="${basedir}/../forge-gui-desktop/target/" includes="CHANGES.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="CONTRIBUTORS.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
diff --git a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java
index bcd38dd843d..4a57d8fa84a 100644
--- a/forge-gui-desktop/src/main/java/forge/GuiDesktop.java
+++ b/forge-gui-desktop/src/main/java/forge/GuiDesktop.java
@@ -15,6 +15,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import javax.swing.ImageIcon;
@@ -53,7 +54,6 @@ import forge.toolbox.FOptionPane;
 import forge.toolbox.FSkin;
 import forge.toolbox.FSkin.SkinImage;
 import forge.util.BuildInfo;
-import forge.util.Callback;
 import forge.util.FileUtil;
 import forge.util.ImageFetcher;
 import forge.util.OperatingSystem;
@@ -264,7 +264,7 @@ public class GuiDesktop implements IGuiBase {
     }
 
     @Override
-    public void download(final GuiDownloadService service, final Callback<Boolean> callback) {
+    public void download(final GuiDownloadService service, final Consumer<Boolean> callback) {
         new GuiDownloader(service, callback).show();
     }
 
diff --git a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
index 9c53c99f482..04671d2e01e 100644
--- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
+++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
@@ -37,9 +37,10 @@ import forge.toolbox.FRadioButton;
 import forge.toolbox.FSkin;
 import forge.toolbox.FTextField;
 import forge.toolbox.JXButtonPanel;
-import forge.util.Callback;
 import net.miginfocom.swing.MigLayout;
 
+import java.util.function.Consumer;
+
 @SuppressWarnings("serial")
 public class GuiDownloader extends DefaultBoundedRangeModel {
     // Swing components
@@ -57,7 +58,7 @@ public class GuiDownloader extends DefaultBoundedRangeModel {
             SOverlayUtils.hideOverlay();
 
             if (callback != null) {
-                callback.run(btnStart.getText() == "OK"); //determine result based on whether download finished
+                callback.accept(btnStart.getText() == "OK"); //determine result based on whether download finished
             }
         }
     };
@@ -70,12 +71,12 @@ public class GuiDownloader extends DefaultBoundedRangeModel {
     private final FRadioButton radProxyHTTP = new FRadioButton("HTTP Proxy");
 
     private final GuiDownloadService service;
-    private final Callback<Boolean> callback;
+    private final Consumer<Boolean> callback;
 
     public GuiDownloader(final GuiDownloadService service0) {
         this(service0, null);
     }
-    public GuiDownloader(final GuiDownloadService service0, final Callback<Boolean> callback0) {
+    public GuiDownloader(final GuiDownloadService service0, final Consumer<Boolean> callback0) {
         service = service0;
         callback = callback0;
 
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java
index 6735e15f1ec..f449f6e8418 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java
@@ -6,7 +6,7 @@ import java.awt.Graphics;
 import javax.swing.JTable;
 
 import forge.card.ColorSet;
-import forge.card.mana.ManaCostShard;
+import forge.card.MagicColor;
 import forge.toolbox.CardFaceSymbols;
 
 public class ColorSetRenderer extends ItemCellRenderer {
@@ -33,7 +33,7 @@ public class ColorSetRenderer extends ItemCellRenderer {
             this.cs = (ColorSet) value;
         }
         else {
-            this.cs = ColorSet.getNullColor();
+            this.cs = ColorSet.C;
         }
         this.setToolTipText(cs.toString());
         return super.getTableCellRendererComponent(table, "", isSelected, hasFocus, row, column);
@@ -57,8 +57,8 @@ public class ColorSetRenderer extends ItemCellRenderer {
         final int offsetIfNoSpace = cntGlyphs > 1 ? (cellWidth - padding0 - elemtWidth) / (cntGlyphs - 1) : elemtWidth + elemtGap;
         final int dx = Math.min(elemtWidth + elemtGap, offsetIfNoSpace);
 
-        for (final ManaCostShard s : cs.getOrderedShards()) {
-            CardFaceSymbols.drawManaSymbol(s.getImageKey(), g, x, y);
+        for (final MagicColor.Color s : cs.getOrderedColors()) {
+            CardFaceSymbols.drawManaSymbol(s.getShortName(), g, x, y);
             x += dx;
         }
     }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
index 7cff8386751..e2aa334956a 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java
@@ -68,7 +68,7 @@ public class AddBasicLandsDialog {
     private static final int LAND_PANEL_PADDING = 3;
 
     private final FComboBoxPanel<CardEdition> cbLandSet = new FComboBoxPanel<>(Localizer.getInstance().getMessage("lblLandSet") + ":", FlowLayout.CENTER,
-            IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition.Predicates.hasBasicLands));
+            IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition::hasBasicLands));
 
     private final MainPanel panel = new MainPanel();
     private final LandPanel pnlPlains = new LandPanel("Plains");
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
index a572911f12a..54bfaff992e 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/DeckImport.java
@@ -46,7 +46,6 @@ import forge.toolbox.*;
 import forge.util.Localizer;
 import forge.view.FDialog;
 import net.miginfocom.swing.MigLayout;
-import org.apache.commons.lang3.StringUtils;
 
 import static forge.deck.DeckRecognizer.TokenType.*;
 
@@ -523,7 +522,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
                 else
                     deck.setName(currentDeckName);
             }
-            host.getDeckController().loadDeck(deck, controller.getCreateNewDeck());
+            host.getDeckController().loadDeck(deck, controller.getImportBehavior() != DeckImportController.ImportBehavior.MERGE);
             processWindowEvent(new WindowEvent(DeckImport.this, WindowEvent.WINDOW_CLOSING));
         });
 
@@ -531,7 +530,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             this.createNewDeckCheckbox.setSelected(false);
             this.createNewDeckCheckbox.addActionListener(e -> {
                 boolean createNewDeck = createNewDeckCheckbox.isSelected();
-                controller.setCreateNewDeck(createNewDeck);
+                controller.setImportBehavior(createNewDeck ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
                 String cmdAcceptLabel = createNewDeck ? CREATE_NEW_DECK_CMD_LABEL : IMPORT_CARDS_CMD_LABEL;
                 cmdAcceptButton.setText(cmdAcceptLabel);
                 String smartCardArtChboxTooltip = createNewDeck ? SMART_CARDART_TT_NO_DECK : SMART_CARDART_TT_WITH_DECK;
@@ -600,7 +599,7 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             if (token.getType() == LIMITED_CARD)
                 cssClass = WARN_MSG_CLASS;
             String statusMsg = String.format("<span class=\"%s\" style=\"font-size: 9px;\">%s</span>", cssClass,
-                                                                                        getTokenStatusMessage(token));
+                    controller.getTokenStatusMessage(token));
             statusLbl.append(statusMsg);
         }
 
@@ -740,12 +739,12 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
     private String toHTML(final DeckRecognizer.Token token) {
         if (token == null)
             return "";
-        String tokenMsg = getTokenMessage(token);
+        String tokenMsg = controller.getTokenMessage(token);
         if (tokenMsg == null)
             return "";
-        String tokenStatus = getTokenStatusMessage(token);
+        String tokenStatus = controller.getTokenStatusMessage(token);
         String cssClass = getTokenCSSClass(token.getType());
-        if (tokenStatus.length() == 0)
+        if (tokenStatus.isEmpty())
             tokenMsg = padEndWithHTMLSpaces(tokenMsg, 2*PADDING_TOKEN_MSG_LENGTH+10);
         else {
             tokenMsg = padEndWithHTMLSpaces(tokenMsg, PADDING_TOKEN_MSG_LENGTH);
@@ -755,11 +754,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
             tokenMsg = String.format("<a class=\"%s\" href=\"%s\">%s</a>", cssClass,
                     token.getKey().toString(), tokenMsg);
 
-        if (tokenStatus == null) {
-            String tokenTag = String.format("<td colspan=\"2\" class=\"%s\">%s</td>", cssClass, tokenMsg);
-            return String.format("<tr>%s</tr>", tokenTag);
-        }
-
         String tokenTag = "<td class=\"%s\">%s</td>";
         String tokenMsgTag = String.format(tokenTag, cssClass, tokenMsg);
         String tokenStatusTag;
@@ -776,97 +770,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
         return String.format("%s%s", targetMsg, spacer);
     }
 
-    private String getTokenMessage(DeckRecognizer.Token token) {
-        switch (token.getType()) {
-            case LEGAL_CARD:
-            case LIMITED_CARD:
-            case CARD_FROM_NOT_ALLOWED_SET:
-            case CARD_FROM_INVALID_SET:
-                return String.format("%s x %s %s", token.getQuantity(), token.getText(), getTokenFoilLabel(token));
-            // Card Warning Msgs
-            case UNKNOWN_CARD:
-            case UNSUPPORTED_CARD:
-                return token.getQuantity() > 0 ? String.format("%s x %s", token.getQuantity(), token.getText())
-                        : token.getText();
-
-            case UNSUPPORTED_DECK_SECTION:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                                        Localizer.getInstance()
-                                                .getMessage("lblWarnDeckSectionNotAllowedInEditor", token.getText(),
-                                                        this.currentGameType));
-
-            // Special Case of Card moved into another section (e.g. Commander from Sideboard)
-            case WARNING_MESSAGE:
-                return String.format("%s: %s", Localizer.getInstance()
-                                .getMessage("lblWarningMsgPrefix"), token.getText());
-
-            // Placeholders
-            case DECK_SECTION_NAME:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckSection"),
-                                        token.getText());
-
-            case CARD_RARITY:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblRarity"),
-                                        token.getText());
-
-            case CARD_TYPE:
-            case CARD_CMC:
-            case MANA_COLOUR:
-            case COMMENT:
-                return token.getText();
-
-            case DECK_NAME:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckName"),
-                        token.getText());
-
-            case UNKNOWN_TEXT:
-            default:
-                return null;
-
-        }
-    }
-
-    private String getTokenStatusMessage(DeckRecognizer.Token token){
-        if (token == null)
-            return "";
-
-        switch (token.getType()) {
-            case LIMITED_CARD:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                        Localizer.getInstance().getMessage("lblWarnLimitedCard",
-                        StringUtils.capitalize(token.getLimitedCardType().name()), getGameFormatLabel()));
-
-            case CARD_FROM_NOT_ALLOWED_SET:
-                return Localizer.getInstance().getMessage("lblErrNotAllowedCard", getGameFormatLabel());
-
-            case CARD_FROM_INVALID_SET:
-                return Localizer.getInstance().getMessage("lblErrCardEditionDate");
-
-            case UNSUPPORTED_CARD:
-                return Localizer.getInstance().getMessage("lblErrUnsupportedCard", this.currentGameType);
-
-            case UNKNOWN_CARD:
-                return String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
-                        Localizer.getInstance().getMessage("lblWarnUnknownCardMsg"));
-
-            case UNSUPPORTED_DECK_SECTION:
-            case WARNING_MESSAGE:
-            case COMMENT:
-            case CARD_CMC:
-            case MANA_COLOUR:
-            case CARD_TYPE:
-            case DECK_SECTION_NAME:
-            case CARD_RARITY:
-            case DECK_NAME:
-            case LEGAL_CARD:
-            case UNKNOWN_TEXT:
-            default:
-                return "";
-
-        }
-
-    }
-
     private String getTokenCSSClass(DeckRecognizer.TokenType tokenType){
         switch (tokenType){
             case LEGAL_CARD:
@@ -899,17 +802,6 @@ public class DeckImport<TModel extends DeckBase> extends FDialog {
                 return "";
         }
     }
-
-    private String getTokenFoilLabel(DeckRecognizer.Token token) {
-        if (!token.isCardToken())
-            return "";
-        final String foilMarker = "- (Foil)";
-        return token.getCard().isFoil() ? foilMarker : "";
-    }
-
-    private String getGameFormatLabel() {
-         return String.format("\"%s\"", this.controller.getCurrentGameFormatName());
-    }
 }
 
 class GameFormatDropdownRenderer extends JLabel implements ListCellRenderer<GameFormat> {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
index fca5a6aa053..757935d7602 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuDraft.java
@@ -228,9 +228,9 @@ public enum CSubmenuDraft implements ICDoc {
             return;
         }
 
+        final DeckGroup opponentDecks = FModel.getDecks().getDraft().get(humanDeck.getName());
         if (VSubmenuDraft.SINGLETON_INSTANCE.isSingleSelected()) {
             // Single opponent
-            final DeckGroup opponentDecks = FModel.getDecks().getDraft().get(humanDeck.getName());
             int indx = 0;
             for (@SuppressWarnings("unused") Deck d : opponentDecks.getAiDecks()) {
                 indx++;
@@ -242,10 +242,16 @@ public enum CSubmenuDraft implements ICDoc {
             combo.addItem("Gauntlet");
             //combo.addItem("Tournament");
         } else {
+            int size = opponentDecks.getAiDecks().size();
             combo.addItem("2");
-            combo.addItem("3");
-            combo.addItem("4");
-            combo.addItem("5");
+            if (size > 2) {
+                combo.addItem("3");
+            }
+
+            if (size >= 4) {
+                combo.addItem("4");
+                combo.addItem("5");
+            }
         }
     }
 }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
index ccdee8c7efe..2fcecd97e60 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuSealed.java
@@ -120,6 +120,7 @@ public enum VSubmenuSealed implements IVSubmenu<CSubmenuSealed> {
         grpPanel.add(radAll, "w 200px!, h 30px!");
         radSingle.setSelected(true);
         grpPanel.add(cbOpponent, "w 200px!, h 30px!");
+        pnlStart.removeAll();
         pnlStart.setLayout(new MigLayout("insets 0, gap 0, wrap 2"));
         pnlStart.setOpaque(false);
         pnlStart.add(grpPanel, "gapright 20");
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
index 79b3652b991..bd76f15756b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
@@ -1269,15 +1269,15 @@ public final class CMatchUI
 
     @Override
     public void notifyStackAddition(GameEventSpellAbilityCast event) {
-        SpellAbility sa = event.sa;
+        SpellAbility sa = event.sa();
         String stackNotificationPolicy = FModel.getPreferences().getPref(FPref.UI_STACK_EFFECT_NOTIFICATION_POLICY);
         boolean isAi = sa.getActivatingPlayer().isAI();
         boolean isTrigger = sa.isTrigger();
-        int stackIndex = event.stackIndex;
+        int stackIndex = event.stackIndex();
         if (stackIndex == nextNotifiableStackIndex) {
             if (ForgeConstants.STACK_EFFECT_NOTIFICATION_ALWAYS.equals(stackNotificationPolicy) || (ForgeConstants.STACK_EFFECT_NOTIFICATION_AI_AND_TRIGGERED.equals(stackNotificationPolicy) && (isAi || isTrigger))) {
                 // We can go and show the modal
-                SpellAbilityStackInstance si = event.si;
+                SpellAbilityStackInstance si = event.si();
 
                 MigLayout migLayout = new MigLayout("insets 15, left, gap 30, fill");
                 JPanel mainPanel = new JPanel(migLayout);
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java
index 07f46812b09..379a6604456 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java
@@ -214,22 +214,8 @@ public class VAssignGenericAmount {
             pnlTargets.add(mp, "w 145px!, h 170px!, gap 5px 5px 3px 3px, ax center");
             mp.addMouseListener(mad);
             targetsMap.put(mp, at);
-        } else if (at.entity instanceof Byte) {
-            SkinImage manaSymbol;
-            byte color = (Byte) at.entity;
-            if (color == MagicColor.WHITE) {
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_W);
-            } else if (color == MagicColor.BLUE) {
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_U);
-            } else if (color == MagicColor.BLACK) {
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_B);
-            } else if (color == MagicColor.RED) {
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_R);
-            } else if (color == MagicColor.GREEN) {
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_G);
-            } else { // Should never come here, but add this to avoid compile error
-                manaSymbol = FSkin.getImage(FSkinProp.IMG_MANA_COLORLESS);
-            }
+        } else if (at.entity instanceof MagicColor.Color color) {
+            SkinImage manaSymbol = FSkin.getImage(FSkinProp.MANA_IMG.get(color.getShortName()));
             final MiscCardPanel mp = new MiscCardPanel(matchUI, "", manaSymbol);
             mp.setCardBounds(0, 0, 70, 70);
             pnlTargets.add(mp, "w 100px!, h 150px!, gap 5px 5px 3px 3px, ax center");
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
index 5ba9090ad71..59dcd09375f 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
@@ -8,6 +8,7 @@ import java.util.StringTokenizer;
 import com.esotericsoftware.minlog.Log;
 
 import forge.card.ColorSet;
+import forge.card.MagicColor;
 import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
 import forge.gui.GuiBase;
@@ -204,9 +205,9 @@ public class CardFaceSymbols {
     }
 
     public static void drawColorSet(Graphics g, ColorSet colorSet, int x, int y, int imageSize, boolean vertical) {
-        for (final ManaCostShard s : colorSet.getOrderedShards()) {
-            if (DECK_COLORSET.get(s.getImageKey())!=null)
-                FSkin.drawImage(g, DECK_COLORSET.get(s.getImageKey()), x, y, imageSize, imageSize);
+        for (final MagicColor.Color s : colorSet.getOrderedColors()) {
+            if (DECK_COLORSET.get(s.getShortName())!=null)
+                FSkin.drawImage(g, DECK_COLORSET.get(s.getShortName()), x, y, imageSize, imageSize);
             if (!vertical)
                 x += imageSize;
             else
diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
index d04d889a77d..df0d987c483 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/special/PlayerDetailsPanel.java
@@ -69,22 +69,7 @@ public class PlayerDetailsPanel extends JPanel {
     }
 
     public static FSkinProp iconFromZone(ZoneType zoneType) {
-        switch (zoneType) {
-            case Hand: return FSkinProp.IMG_ZONE_HAND;
-            case Library: return FSkinProp.IMG_ZONE_LIBRARY;
-            case Graveyard: return FSkinProp.IMG_ZONE_GRAVEYARD;
-            case Exile: return FSkinProp.IMG_ZONE_EXILE;
-            case Sideboard: return FSkinProp.IMG_ZONE_SIDEBOARD;
-            case Flashback: return FSkinProp.IMG_ZONE_FLASHBACK;
-            case Command: return FSkinProp.IMG_ZONE_COMMAND; //IMG_PLANESWALKER
-            case PlanarDeck: return FSkinProp.IMG_ZONE_PLANAR;
-            case SchemeDeck: return FSkinProp.IMG_ZONE_SCHEME;
-            case AttractionDeck: return FSkinProp.IMG_ZONE_ATTRACTION;
-            case ContraptionDeck: return FSkinProp.IMG_ZONE_CONTRAPTION;
-            case Ante: return FSkinProp.IMG_ZONE_ANTE;
-            case Junkyard: return FSkinProp.IMG_ZONE_JUNKYARD;
-            default: return FSkinProp.IMG_HDZONE_LIBRARY;
-        }
+        return FSkinProp.iconFromZone(zoneType, false);
     }
 
     /** Adds various labels to pool area JPanel container. */
diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
index 6fe9bd2e68b..b573dadf430 100644
--- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
+++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
@@ -130,6 +130,10 @@ public class SimulateMatch {
             }
         }
 
+        if (params.containsKey("c")) {
+            rules.setSimTimeout(Integer.parseInt(params.get("c").get(0)));
+        }
+
         sb.append(" - ").append(Lang.nounWithNumeral(nGames, "game")).append(" of ").append(type);
 
         System.out.println(sb.toString());
@@ -163,6 +167,7 @@ public class SimulateMatch {
         System.out.println("\tT - Type of tournament to run with all provided decks (Bracket, RoundRobin, Swiss)");
         System.out.println("\tP - Amount of players per match (used only with Tournaments, defaults to 2)");
         System.out.println("\tF - format of games, defaults to constructed");
+        System.out.println("\tc - Clock flag. Set the maximum time in seconds before calling the match a draw, defaults to 120.");
         System.out.println("\tq - Quiet flag. Output just the game result, not the entire game log.");
     }
 
@@ -176,7 +181,7 @@ public class SimulateMatch {
             TimeLimitedCodeBlock.runWithTimeout(() -> {
                 mc.startGame(g1);
                 sw.stop();
-            }, 120, TimeUnit.SECONDS);
+            }, mc.getRules().getSimTimeout(), TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             System.out.println("Stopping slow match as draw");
         } catch (Exception | StackOverflowError e) {
diff --git a/forge-gui-desktop/src/test/java/forge/ai/AIIntegrationTests.java b/forge-gui-desktop/src/test/java/forge/ai/AIIntegrationTests.java
new file mode 100644
index 00000000000..9f24117977f
--- /dev/null
+++ b/forge-gui-desktop/src/test/java/forge/ai/AIIntegrationTests.java
@@ -0,0 +1,80 @@
+package forge.ai;
+
+import forge.game.Game;
+import forge.game.phase.PhaseType;
+import forge.game.player.Player;
+import forge.game.zone.ZoneType;
+import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
+
+public class AIIntegrationTests extends AITest {
+    @Test
+    public void testSwingForLethal() {
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(1);
+        p.setTeam(0);
+        addCard("Nest Robber", p);
+        addCard("Nest Robber", p);
+
+        Player opponent = game.getPlayers().get(0);
+        opponent.setTeam(1);
+
+        addCard("Runeclaw Bear", opponent);
+        opponent.setLife(2, null);
+
+        this.playUntilPhase(game, PhaseType.END_OF_TURN);
+
+        AssertJUnit.assertTrue(game.isGameOver());
+    }
+
+    @Test
+    public void testSuspendAI() {
+        // Test that the AI can cast a suspend spell
+        // They should suspend it, then deal three damage to their opponent
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(1);
+        p.setTeam(0);
+        addCard("Mountain", p);
+        addCardToZone("Rift Bolt", p, ZoneType.Hand);
+
+        Player opponent = game.getPlayers().get(0);
+        opponent.setTeam(1);
+
+        // Fill deck with lands so we can goldfish a few turns
+        for (int i = 0; i < 60; i++) {
+            addCardToZone("Island", opponent, ZoneType.Library);
+            // Add something they can't cast
+            addCardToZone("Stone Golem", p, ZoneType.Library);
+        }
+
+        for (int i = 0; i < 3; i++) {
+            this.playUntilNextTurn(game);
+        }
+
+        AssertJUnit.assertEquals(17, opponent.getLife());
+    }
+
+    @Test
+    public void testAttackTriggers() {
+        // Test that attack triggers actually trigger
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(1);
+        p.setTeam(0);
+        addCard("Hellrider", p);
+        addCard("Raging Goblin", p);
+
+        Player opponent = game.getPlayers().get(0);
+        opponent.setTeam(1);
+
+        // Fill deck with lands so we can goldfish a few turns
+        for (int i = 0; i < 60; i++) {
+            addCardToZone("Island", opponent, ZoneType.Library);
+            // Add something they can't cast
+            addCardToZone("Stone Golem", p, ZoneType.Library);
+        }
+
+        this.playUntilNextTurn(game);
+
+        AssertJUnit.assertEquals(14, opponent.getLife());
+    }
+}
diff --git a/forge-gui-desktop/src/test/java/forge/ai/AITest.java b/forge-gui-desktop/src/test/java/forge/ai/AITest.java
new file mode 100644
index 00000000000..23588815a25
--- /dev/null
+++ b/forge-gui-desktop/src/test/java/forge/ai/AITest.java
@@ -0,0 +1,190 @@
+package forge.ai;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import forge.GuiDesktop;
+import forge.StaticData;
+import forge.deck.Deck;
+import forge.game.Game;
+import forge.game.GameRules;
+import forge.game.GameStage;
+import forge.game.GameType;
+import forge.game.Match;
+import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
+import forge.game.card.CardFactory;
+import forge.game.phase.PhaseType;
+import forge.game.player.Player;
+import forge.game.player.RegisteredPlayer;
+import forge.game.spellability.SpellAbility;
+import forge.game.zone.ZoneType;
+import forge.gui.GuiBase;
+import forge.item.IPaperCard;
+import forge.item.PaperToken;
+import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.model.FModel;
+
+public class AITest {
+    private static boolean initialized = false;
+
+    public Game resetGame() {
+        // need to be done after FModel.initialize, or the Localizer isn't loaded yet
+        List<RegisteredPlayer> players = Lists.newArrayList();
+        Deck d1 = new Deck();
+        players.add(new RegisteredPlayer(d1).setPlayer(new LobbyPlayerAi("p2", null)));
+        players.add(new RegisteredPlayer(d1).setPlayer(new LobbyPlayerAi("p1", null)));
+        GameRules rules = new GameRules(GameType.Constructed);
+        Match match = new Match(rules, players, "Test");
+        Game game = new Game(players, rules, match);
+        Player p = game.getPlayers().get(1);
+        game.setAge(GameStage.Play);
+        game.getPhaseHandler().devModeSet(PhaseType.MAIN1, p);
+        game.getPhaseHandler().onStackResolved();
+        // game.getAction().checkStateEffects(true);
+
+        return game;
+    }
+
+    protected Game initAndCreateGame() {
+        if (!initialized) {
+            GuiBase.setInterface(new GuiDesktop());
+            FModel.initialize(null, preferences -> {
+                preferences.setPref(FPref.LOAD_CARD_SCRIPTS_LAZILY, false);
+                preferences.setPref(FPref.UI_LANGUAGE, "en-US");
+                return null;
+            });
+            initialized = true;
+        }
+
+        return resetGame();
+    }
+
+    protected int countCardsWithName(Game game, String name) {
+        int i = 0;
+        for (Card c : game.getCardsIn(ZoneType.Battlefield)) {
+            if (c.getName().equals(name)) {
+                i++;
+            }
+        }
+        return i;
+    }
+
+    protected Card findCardWithName(Game game, String name) {
+        for (Card c : game.getCardsIn(ZoneType.Battlefield)) {
+            if (c.getName().equals(name)) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+
+    protected SpellAbility findSAWithPrefix(Card c, String prefix) {
+        return findSAWithPrefix(c.getSpellAbilities(), prefix);
+    }
+
+    protected SpellAbility findSAWithPrefix(Iterable<SpellAbility> abilities, String prefix) {
+        for (SpellAbility sa : abilities) {
+            if (sa.getDescription().startsWith(prefix)) {
+                return sa;
+            }
+        }
+        return null;
+    }
+
+    protected Card createCard(String name, Player p) {
+        IPaperCard paperCard = FModel.getMagicDb().getCommonCards().getCard(name);
+        if (paperCard == null) {
+            StaticData.instance().attemptToLoadCard(name);
+            paperCard = FModel.getMagicDb().getCommonCards().getCard(name);
+        }
+        return Card.fromPaperCard(paperCard, p);
+    }
+
+    protected Card addCardToZone(String name, Player p, ZoneType zone) {
+        Card c = createCard(name, p);
+        // card need a new Timestamp otherwise Static Abilities might collide
+        c.setGameTimestamp(p.getGame().getNextTimestamp());
+        p.getZone(zone).add(c);
+        return c;
+    }
+
+    protected Card addCard(String name, Player p) {
+        return addCardToZone(name, p, ZoneType.Battlefield);
+    }
+
+    protected List<Card> addCards(String name, int count, Player p) {
+        List<Card> cards = Lists.newArrayList();
+        for (int i = 0; i < count; i++) {
+            cards.add(addCard(name, p));
+        }
+        return cards;
+    }
+
+    protected Card createToken(String name, Player p) {
+        PaperToken token = FModel.getMagicDb().getAllTokens().getToken(name);
+        if (token == null) {
+            System.out.println("Failed to find token name " + name);
+            return null;
+        }
+        return CardFactory.getCard(token, p, p.getGame());
+    }
+
+    protected List<Card> addTokens(String name, int amount, Player p) {
+        List<Card> cards = new ArrayList<>();
+
+        for(int i = 0; i < amount; i++) {
+            cards.add(addToken(name, p));
+        }
+
+        return cards;
+    }
+
+    protected Card addToken(String name, Player p) {
+        Card c = createToken(name, p);
+        // card need a new Timestamp otherwise Static Abilities might collide
+        c.setGameTimestamp(p.getGame().getNextTimestamp());
+        p.getZone(ZoneType.Battlefield).add(c);
+        return c;
+    }
+
+    void playUntilStackClear(Game game) {
+        do {
+            game.getPhaseHandler().mainLoopStep();
+        } while (!game.isGameOver() && !game.getStack().isEmpty());
+    }
+
+    void playUntilPhase(Game game, PhaseType phase) {
+        do {
+            game.getPhaseHandler().mainLoopStep();
+        } while (!game.isGameOver() && !game.getPhaseHandler().is(phase));
+    }
+
+    void playUntilNextTurn(Game game) {
+        Player current = game.getPhaseHandler().getPlayerTurn();
+        do {
+            game.getPhaseHandler().mainLoopStep();
+        } while (!game.isGameOver() && game.getPhaseHandler().getPlayerTurn().equals(current));
+    }
+
+    protected String gameStateToString(Game game) {
+        StringBuilder sb = new StringBuilder();
+        for (ZoneType zone : ZoneType.values()) {
+            CardCollectionView cards = game.getCardsIn(zone);
+            if (!cards.isEmpty()) {
+                sb.append("Zone ").append(zone.name()).append(":\n");
+                for (Card c : game.getCardsIn(zone)) {
+                    sb.append("  ").append(c);
+                    if (c.isTapped()) {
+                        sb.append(" (T)");
+                    }
+                    sb.append("\n");
+                }
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
index d3481d2b46b..89a5551180e 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/SimulationTest.java
@@ -1,15 +1,13 @@
 package forge.ai.simulation;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import com.google.common.collect.Lists;
 
-import forge.GuiDesktop;
-import forge.StaticData;
 import forge.ai.AIOption;
+import forge.ai.AITest;
 import forge.ai.LobbyPlayerAi;
 import forge.ai.simulation.GameStateEvaluator.Score;
 import forge.deck.Deck;
@@ -18,21 +16,12 @@ import forge.game.GameRules;
 import forge.game.GameStage;
 import forge.game.GameType;
 import forge.game.Match;
-import forge.game.card.Card;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardFactory;
 import forge.game.player.Player;
 import forge.game.player.RegisteredPlayer;
-import forge.game.spellability.SpellAbility;
-import forge.game.zone.ZoneType;
-import forge.gui.GuiBase;
-import forge.item.IPaperCard;
-import forge.item.PaperToken;
 import forge.localinstance.properties.ForgePreferences.FPref;
 import forge.model.FModel;
 
-public class SimulationTest {
-    private static boolean initialized = false;
+public class SimulationTest extends AITest {
 
     public Game resetGame() {
         // need to be done after FModel.initialize, or the Localizer isn't loaded yet
@@ -53,19 +42,6 @@ public class SimulationTest {
         return game;
     }
 
-    protected Game initAndCreateGame() {
-        if (!initialized) {
-            GuiBase.setInterface(new GuiDesktop());
-            FModel.initialize(null, preferences -> {
-                preferences.setPref(FPref.LOAD_CARD_SCRIPTS_LAZILY, false);
-                preferences.setPref(FPref.UI_LANGUAGE, "en-US");
-                return null;
-            });
-            initialized = true;
-        }
-
-        return resetGame();
-    }
 
     protected GameSimulator createSimulator(Game game, Player p) {
         return new GameSimulator(new SimulationController(new Score(0)) {
@@ -75,106 +51,4 @@ public class SimulationTest {
             }
         }, game, p, null);
     }
-
-    protected int countCardsWithName(Game game, String name) {
-        int i = 0;
-        for (Card c : game.getCardsIn(ZoneType.Battlefield)) {
-            if (c.getName().equals(name)) {
-                i++;
-            }
-        }
-        return i;
-    }
-
-    protected Card findCardWithName(Game game, String name) {
-        for (Card c : game.getCardsIn(ZoneType.Battlefield)) {
-            if (c.getName().equals(name)) {
-                return c;
-            }
-        }
-        return null;
-    }
-
-    protected String gameStateToString(Game game) {
-        StringBuilder sb = new StringBuilder();
-        for (ZoneType zone : ZoneType.values()) {
-            CardCollectionView cards = game.getCardsIn(zone);
-            if (!cards.isEmpty()) {
-                sb.append("Zone ").append(zone.name()).append(":\n");
-                for (Card c : game.getCardsIn(zone)) {
-                    sb.append("  ").append(c).append("\n");
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    protected SpellAbility findSAWithPrefix(Card c, String prefix) {
-        return findSAWithPrefix(c.getSpellAbilities(), prefix);
-    }
-
-    protected SpellAbility findSAWithPrefix(Iterable<SpellAbility> abilities, String prefix) {
-        for (SpellAbility sa : abilities) {
-            if (sa.getDescription().startsWith(prefix)) {
-                return sa;
-            }
-        }
-        return null;
-    }
-
-    protected Card createCard(String name, Player p) {
-        IPaperCard paperCard = FModel.getMagicDb().getCommonCards().getCard(name);
-        if (paperCard == null) {
-            StaticData.instance().attemptToLoadCard(name);
-            paperCard = FModel.getMagicDb().getCommonCards().getCard(name);
-        }
-        return Card.fromPaperCard(paperCard, p);
-    }
-
-    protected Card addCardToZone(String name, Player p, ZoneType zone) {
-        Card c = createCard(name, p);
-        // card need a new Timestamp otherwise Static Abilities might collide
-        c.setGameTimestamp(p.getGame().getNextTimestamp());
-        p.getZone(zone).add(c);
-        return c;
-    }
-
-    protected Card addCard(String name, Player p) {
-        return addCardToZone(name, p, ZoneType.Battlefield);
-    }
-
-    protected List<Card> addCards(String name, int count, Player p) {
-        List<Card> cards = Lists.newArrayList();
-        for (int i = 0; i < count; i++) {
-            cards.add(addCard(name, p));
-        }
-        return cards;
-    }
-
-    protected Card createToken(String name, Player p) {
-        PaperToken token = FModel.getMagicDb().getAllTokens().getToken(name);
-        if (token == null) {
-            System.out.println("Failed to find token name " + name);
-            return null;
-        }
-        return CardFactory.getCard(token, p, p.getGame());
-    }
-
-    protected List<Card> addTokens(String name, int amount, Player p) {
-        List<Card> cards = new ArrayList<>();
-
-        for(int i = 0; i < amount; i++) {
-            cards.add(addToken(name, p));
-        }
-
-        return cards;
-    }
-
-    protected Card addToken(String name, Player p) {
-        Card c = createToken(name, p);
-        // card need a new Timestamp otherwise Static Abilities might collide
-        c.setGameTimestamp(p.getGame().getNextTimestamp());
-        p.getZone(ZoneType.Battlefield).add(c);
-        return c;
-    }
 }
diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
index f4869226e1b..4d84a599a72 100644
--- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
+++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
@@ -471,12 +471,12 @@ public class PlayerControllerForTests extends PlayerController {
 
     @Override
     public byte chooseColor(String message, SpellAbility sa, ColorSet colors) {
-        return Iterables.getFirst(colors, MagicColor.WHITE);
+        return Iterables.getFirst(colors, MagicColor.Color.WHITE).getColorMask();
     }
 
     @Override
     public byte chooseColorAllowColorless(String message, Card card, ColorSet colors) {
-        return Iterables.getFirst(colors, (byte)0);
+        return Iterables.getFirst(colors, MagicColor.Color.COLORLESS).getColorMask();
     }
 
     private CardCollection chooseItems(CardCollectionView items, int amount) {
@@ -556,7 +556,7 @@ public class PlayerControllerForTests extends PlayerController {
 
     @Override
     public CounterType chooseCounterType(List<CounterType> options, SpellAbility sa, String prompt, Map<String, Object> params) {
-        return Iterables.getFirst(options, CounterType.get(CounterEnumType.P1P1));
+        return Iterables.getFirst(options, CounterEnumType.P1P1);
     }
 
     @Override
@@ -664,6 +664,11 @@ public class PlayerControllerForTests extends PlayerController {
         // TODO test this!
     }
 
+    @Override
+    public void revealUnsupported(Map<Player, List<PaperCard>> unsupported) {
+        // test this!
+    }
+
     @Override
     public List<PaperCard> chooseCardsYouWonToAddToDeck(List<PaperCard> losses) {
         // TODO Auto-generated method stub
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 1c287064cdb..34ac5a2cfca 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -242,7 +242,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>6.8.3</version>
+            <version>6.9.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/forge-gui-mobile-dev/src/forge/app/GameLauncher.java b/forge-gui-mobile-dev/src/forge/app/GameLauncher.java
index 08950da1eca..e6cda554356 100644
--- a/forge-gui-mobile-dev/src/forge/app/GameLauncher.java
+++ b/forge-gui-mobile-dev/src/forge/app/GameLauncher.java
@@ -51,7 +51,7 @@ public class GameLauncher {
             os.setBuild(si.getOperatingSystem().getVersionInfo().getBuildNumber());
             os.setRawDescription(si.getOperatingSystem() + " x" + si.getOperatingSystem().getBitness());
             totalRAM = Math.round(si.getHardware().getMemory().getTotal() / 1024f / 1024f);
-            hw = new HWInfo(device, os);
+            hw = new HWInfo(device, os, false);
         } catch (Exception e) {
              e.printStackTrace();
         }
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index d04cb4c62d8..70baa9480c6 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -53,6 +53,7 @@ import io.sentry.Sentry;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.function.Consumer;
 
 public class Forge implements ApplicationListener {
     private static ApplicationListener app = null;
@@ -100,6 +101,7 @@ public class Forge implements ApplicationListener {
     public static boolean allowCardBG = false;
     public static boolean altPlayerLayout = false;
     public static boolean altZoneTabs = false;
+    public static String altZoneTabMode = "Off";
     public static boolean animatedCardTapUntap = false;
     public static String enableUIMask = "Crop";
     public static String selector = "Default";
@@ -149,7 +151,7 @@ public class Forge implements ApplicationListener {
                     scope.getContexts().setOperatingSystem(hwInfo.os());
                 });
             }
-            GuiBase.setDeviceInfo(hwInfo, AndroidAPI, totalRAM);
+            GuiBase.setDeviceInfo(hwInfo, AndroidAPI, totalRAM, deviceAdapter.getDownloadsDir());
         }
         return app;
     }
@@ -170,18 +172,7 @@ public class Forge implements ApplicationListener {
         //install our error handler
         ExceptionHandler.registerErrorHandling();
         //init hwInfo to log
-        HWInfo info = GuiBase.getHWInfo();
-        if (info != null) {
-            System.out.println(
-                "##########################################\n" +
-                "APP: Forge v." + GuiBase.getInterface().getCurrentVersion() +
-                "\nDEV: " + info.device().getName() +
-                "\nCPU: " + info.device().getCpuDescription() +
-                "\nRAM: " + GuiBase.getDeviceRAM() + " MB" +
-                "\nOS: " + info.os().getRawDescription() +
-                "\n##########################################"
-            );
-        }
+        System.out.println(GuiBase.getHWInfo());
         // closeSplashScreen() is called early on non-Windows OS so it will not crash, LWJGL3 bug on AWT Splash.
         if (OperatingSystem.isWindows())
             getDeviceAdapter().closeSplashScreen();
@@ -232,7 +223,7 @@ public class Forge implements ApplicationListener {
         reversedPrompt = getForgePreferences().getPrefBoolean(FPref.UI_REVERSE_PROMPT_BUTTON);
         autoAIDeckSelection = getForgePreferences().getPrefBoolean(FPref.UI_AUTO_AIDECK_SELECTION);
         altPlayerLayout = getForgePreferences().getPrefBoolean(FPref.UI_ALT_PLAYERINFOLAYOUT);
-        altZoneTabs = getForgePreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS);
+        setAltZoneTabMode(getForgePreferences().getPref(FPref.UI_ALT_PLAYERZONETABS));
         animatedCardTapUntap = getForgePreferences().getPrefBoolean(FPref.UI_ANIMATED_CARD_TAPUNTAP);
         enableUIMask = getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING);
         if (getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("true")) //override old settings if not updated
@@ -270,6 +261,17 @@ public class Forge implements ApplicationListener {
             FThreads.invokeInBackgroundThread(() -> AssetsDownloader.checkForUpdates(exited, runnable));
         }
     }
+    public static void setAltZoneTabMode(String mode) {
+        Forge.altZoneTabMode = mode;
+        switch (Forge.altZoneTabMode) {
+            case "Vertical", "Horizontal" -> Forge.altZoneTabs = true;
+            case "Off" -> Forge.altZoneTabs = false;
+            default -> Forge.altZoneTabs = false;
+        }
+    }
+    public static boolean isHorizontalTabLayout() {
+        return Forge.altZoneTabs && "Horizontal".equalsIgnoreCase(Forge.altZoneTabMode);
+    }
     public static boolean hasGamepad() {
         //Classic Mode Various Screen GUI are not yet supported, needs control mapping for each screens
         if (isMobileAdventureMode) {
@@ -347,8 +349,11 @@ public class Forge implements ApplicationListener {
         GuiBase.setIsAdventureMode(true);
         advStartup = false;
         isMobileAdventureMode = true;
-        if (GuiBase.isAndroid()) //force it for adventure mode
-            altZoneTabs = true;
+        //force it for adventure mode if the prefs is not updated from boolean value to string value
+        if ("true".equalsIgnoreCase(FModel.getPreferences().getPref(FPref.UI_ALT_PLAYERZONETABS)) ||
+            "false".equalsIgnoreCase(FModel.getPreferences().getPref(FPref.UI_ALT_PLAYERZONETABS))) {
+            setAltZoneTabMode("Vertical");
+        }
         //pixl cursor for adventure
         setCursor(null, "0");
         if (!GuiBase.isAndroid() || !getDeviceAdapter().getGamepads().isEmpty())
@@ -599,22 +604,19 @@ public class Forge implements ApplicationListener {
         }
         if(currentScreen == null)
             return;
-        currentScreen.onClose(new Callback<>() {
-            @Override
-            public void run(Boolean result) {
-                if (result) {
-                    Dscreens.pollFirst();
-                    setCurrentScreen(Dscreens.peekFirst());
-                    if (clearLastMatch) {
-                        try {
-                            Dscreens.remove(lastMatch);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        //check
-                        /*for (FScreen fScreen : Dscreens)
-                            System.out.println(fScreen.toString());*/
+        currentScreen.onClose(result -> {
+            if (result) {
+                Dscreens.pollFirst();
+                setCurrentScreen(Dscreens.peekFirst());
+                if (clearLastMatch) {
+                    try {
+                        Dscreens.remove(lastMatch);
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
+                    //check
+                    /*for (FScreen fScreen : Dscreens)
+                        System.out.println(fScreen.toString());*/
                 }
             }
         });
@@ -639,19 +641,16 @@ public class Forge implements ApplicationListener {
             return;
         } //don't allow exiting multiple times
 
-        Callback<Boolean> callback = new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                if (result) {
-                    exited = true;
-                    exitAnimation(true);
-                }
+        Consumer<Boolean> callback = result -> {
+            if (result) {
+                exited = true;
+                exitAnimation(true);
             }
         };
 
 
         if (silent) {
-            callback.run(true);
+            callback.accept(true);
         } else {
             FOptionPane.showConfirmDialog(
                     getLocalizer().getMessage("lblAreYouSureYouWishRestartForge"), getLocalizer().getMessage("lblRestartForge"),
@@ -668,18 +667,15 @@ public class Forge implements ApplicationListener {
         options.add(getLocalizer().getMessage("lblExit"));
         options.add(getLocalizer().getMessage("lblCancel"));
 
-        Callback<Integer> callback = new Callback<Integer>() {
-            @Override
-            public void run(Integer result) {
-                if (result == 0) {
-                    exited = true;
-                    exitAnimation(false);
-                }
+        Consumer<Integer> callback = result -> {
+            if (result == 0) {
+                exited = true;
+                exitAnimation(false);
             }
         };
 
         if (silent) {
-            callback.run(0);
+            callback.accept(0);
         } else {
             FOptionPane.showOptionDialog(getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), "",
                     FOptionPane.QUESTION_ICON, options, 0, callback);
@@ -701,30 +697,27 @@ public class Forge implements ApplicationListener {
             return;
         }
 
-        currentScreen.onSwitchAway(new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                if (result) {
-                    if (replaceBackScreen && !Dscreens.isEmpty()) {
-                        Dscreens.removeFirst();
-                    }
-                    if (Dscreens.peekFirst() != screen0) { //prevent screen being its own back screen
-                        Dscreens.addFirst(screen0);
-                    }
-                    setCurrentScreen(screen0);
-                    if (screen0 instanceof MatchScreen) {
-                        //set cursor for classic mode
-                        if (!isMobileAdventureMode) {
-                            if (magnifyToggle) {
-                                setCursor(FSkin.getCursor().get(1), "1");
-                            } else {
-                                setCursor(FSkin.getCursor().get(2), "2");
-                            }
+        currentScreen.onSwitchAway(result -> {
+            if (result) {
+                if (replaceBackScreen && !Dscreens.isEmpty()) {
+                    Dscreens.removeFirst();
+                }
+                if (Dscreens.peekFirst() != screen0) { //prevent screen being its own back screen
+                    Dscreens.addFirst(screen0);
+                }
+                setCurrentScreen(screen0);
+                if (screen0 instanceof MatchScreen) {
+                    //set cursor for classic mode
+                    if (!isMobileAdventureMode) {
+                        if (magnifyToggle) {
+                            setCursor(FSkin.getCursor().get(1), "1");
+                        } else {
+                            setCursor(FSkin.getCursor().get(2), "2");
                         }
                     }
-                    deltaTime = 0f;
-                    hueFragTime = 0f;
                 }
+                deltaTime = 0f;
+                hueFragTime = 0f;
             }
         });
     }
@@ -777,7 +770,7 @@ public class Forge implements ApplicationListener {
             isMobileAdventureMode = false;
             GuiBase.setIsAdventureMode(false);
             setCursor(FSkin.getCursor().get(0), "0");
-            altZoneTabs = FModel.getPreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS);
+            setAltZoneTabMode(FModel.getPreferences().getPref(FPref.UI_ALT_PLAYERZONETABS));
             Gdx.input.setInputProcessor(getInputProcessor());
             clearTransitionScreen();
             openHomeDefault();
@@ -1490,7 +1483,7 @@ public class Forge implements ApplicationListener {
 
             boolean handled;
             if (KeyInputAdapter.isShiftKeyDown()) {
-                handled = pan(mouseMovedX, mouseMovedY, -Utils.AVG_FINGER_WIDTH * amountX, 0, false);
+                handled = pan(mouseMovedX, mouseMovedY, -Utils.AVG_FINGER_WIDTH * amountY, 0, false);
             } else {
                 handled = pan(mouseMovedX, mouseMovedY, 0, -Utils.AVG_FINGER_HEIGHT * amountY, true);
             }
diff --git a/forge-gui-mobile/src/forge/GuiMobile.java b/forge-gui-mobile/src/forge/GuiMobile.java
index 2af4a82bf0a..e63362a1182 100644
--- a/forge-gui-mobile/src/forge/GuiMobile.java
+++ b/forge-gui-mobile/src/forge/GuiMobile.java
@@ -32,6 +32,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.jupnp.DefaultUpnpServiceConfiguration;
@@ -282,7 +283,7 @@ public class GuiMobile implements IGuiBase {
     }
 
     @Override
-    public void download(final GuiDownloadService service, final Callback<Boolean> callback) {
+    public void download(final GuiDownloadService service, final Consumer<Boolean> callback) {
         new GuiDownloader(service, callback).show();
     }
 
diff --git a/forge-gui-mobile/src/forge/adventure/character/EntryActor.java b/forge-gui-mobile/src/forge/adventure/character/EntryActor.java
index 94d30e9de2f..299b26b7e75 100644
--- a/forge-gui-mobile/src/forge/adventure/character/EntryActor.java
+++ b/forge-gui-mobile/src/forge/adventure/character/EntryActor.java
@@ -43,7 +43,7 @@ public class EntryActor extends MapActor{
     {
         if(targetMap==null||targetMap.isEmpty())
         {
-            stage.exitDungeon(false);
+            stage.exitDungeon(false, false);
         }
         else
         {
diff --git a/forge-gui-mobile/src/forge/adventure/character/PortalActor.java b/forge-gui-mobile/src/forge/adventure/character/PortalActor.java
index b3ad332b674..99d1dba680a 100644
--- a/forge-gui-mobile/src/forge/adventure/character/PortalActor.java
+++ b/forge-gui-mobile/src/forge/adventure/character/PortalActor.java
@@ -39,7 +39,7 @@ public class PortalActor extends EntryActor {
         }
         if (currentAnimationType == PortalAnimationTypes.Active) {
             if (targetMap == null || targetMap.isEmpty()) {
-                stage.exitDungeon(false);
+                stage.exitDungeon(false, false);
             } else {
                 if (targetMap.equals(currentMap)) {
                     stage.spawn(entryTargetObject);
diff --git a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
index fa96f36809d..9faae9e41d4 100644
--- a/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/AdventureEventData.java
@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
 public class AdventureEventData implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
+    private static final int JUMPSTART_TO_PICK_FROM = 6;
     public transient BoosterDraft draft;
     public AdventureEventParticipant[] participants;
     public int rounds;
@@ -80,7 +81,6 @@ public class AdventureEventData implements Serializable {
         matchesLost = other.matchesLost;
     }
 
-
     public Deck[] getRewardPacks(int count) {
         Deck[] ret = new Deck[count];
         for (int i = 0; i < count; i++) {
@@ -113,164 +113,12 @@ public class AdventureEventData implements Serializable {
             return;
         cardBlockName = cardBlock.getName();
         if (format == AdventureEventController.EventFormat.Draft) {
-            //Below all to be fully generated in later release
-            rewardPacks = getRewardPacks(3);
-            generateParticipants(7);
-            packConfiguration = getBoosterConfiguration(cardBlock);
-
-            rewards = new AdventureEventReward[4];
-            AdventureEventReward r0 = new AdventureEventReward();
-            AdventureEventReward r1 = new AdventureEventReward();
-            AdventureEventReward r2 = new AdventureEventReward();
-            AdventureEventReward r3 = new AdventureEventReward();
-            r0.minWins = 0;
-            r0.maxWins = 0;
-            r0.cardRewards = new Deck[]{rewardPacks[0]};
-            rewards[0] = r0;
-            r1.minWins = 1;
-            r1.maxWins = 3;
-            r1.cardRewards = new Deck[]{rewardPacks[1], rewardPacks[2]};
-            rewards[1] = r1;
-            r2.minWins = 2;
-            r2.maxWins = 3;
-            r2.itemRewards = new String[]{"Challenge Coin"};
-            rewards[2] = r2;
+            setupDraftRewards();
         } else if (format == AdventureEventController.EventFormat.Jumpstart) {
-            int numPacksToPickFrom = 6;
-            generateParticipants(7);
-            jumpstartBoosters = AdventureEventController.instance().getJumpstartBoosters(cardBlock, numPacksToPickFrom);
-
+            jumpstartBoosters = AdventureEventController.instance().getJumpstartBoosters(cardBlock, JUMPSTART_TO_PICK_FROM);
             packConfiguration = new String[]{cardBlock.getLandSet().getCode(), cardBlock.getLandSet().getCode(), cardBlock.getLandSet().getCode()};
 
-            for (AdventureEventParticipant participant : participants) {
-                List<Deck> availableOptions = AdventureEventController.instance().getJumpstartBoosters(cardBlock, numPacksToPickFrom);
-                List<Deck> chosenPacks = new ArrayList<>();
-
-                Map<String, List<Deck>> themeMap = new HashMap<>();
-
-                //1. Search for matching themes from deck names, fill deck with them if possible
-                for (Deck option : availableOptions) {
-                    // This matches up theme for all except DMU - with only 2 per color the next part will handle that
-                    String theme = option.getName().replaceAll("\\d$", "").trim();
-                    if (!themeMap.containsKey(theme)) {
-                        themeMap.put(theme, new ArrayList<>());
-                    }
-                    themeMap.get(theme).add(option);
-                }
-
-                String themeAdded = "";
-                boolean done = false;
-                while (!done) {
-                    for (int i = packConfiguration.length - chosenPacks.size(); i > 1; i--) {
-                        if (themeAdded.isEmpty()) {
-                            for (String theme : themeMap.keySet()) {
-                                if (themeMap.get(theme).size() >= i) {
-                                    themeAdded = theme;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    if (themeAdded.isEmpty()) {
-                        done = true;
-                    } else {
-                        chosenPacks.addAll(themeMap.get(themeAdded).subList(0, Math.min(themeMap.get(themeAdded).size(), packConfiguration.length - chosenPacks.size())));
-                        availableOptions.removeAll(themeMap.get(themeAdded));
-                        themeMap.remove(themeAdded);
-                        themeAdded = "";
-                    }
-                }
-
-                //2. Fill remaining slots with colors already picked whenever possible
-                Map<String, List<Deck>> colorMap = new HashMap<>();
-                for (Deck option : availableOptions) {
-                    if (option.getTags().contains("black"))
-                        colorMap.computeIfAbsent("black", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("blue"))
-                        colorMap.computeIfAbsent("blue", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("green"))
-                        colorMap.computeIfAbsent("green", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("red"))
-                        colorMap.computeIfAbsent("red", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("white"))
-                        colorMap.computeIfAbsent("white", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("multicolor"))
-                        colorMap.computeIfAbsent("multicolor", (k) -> new ArrayList<>()).add(option);
-                    if (option.getTags().contains("colorless"))
-                        colorMap.computeIfAbsent("colorless", (k) -> new ArrayList<>()).add(option);
-                }
-
-                done = false;
-                String colorAdded = "";
-                while (!done) {
-                    List<String> colorsAlreadyPicked = new ArrayList<>();
-                    for (Deck picked : chosenPacks) {
-                        if (picked.getTags().contains("black")) colorsAlreadyPicked.add("black");
-                        if (picked.getTags().contains("blue")) colorsAlreadyPicked.add("blue");
-                        if (picked.getTags().contains("green")) colorsAlreadyPicked.add("green");
-                        if (picked.getTags().contains("red")) colorsAlreadyPicked.add("red");
-                        if (picked.getTags().contains("white")) colorsAlreadyPicked.add("white");
-                        if (picked.getTags().contains("multicolor")) colorsAlreadyPicked.add("multicolor");
-                        if (picked.getTags().contains("colorless")) colorsAlreadyPicked.add("colorless");
-                    }
-
-                    while (colorAdded.isEmpty() && !colorsAlreadyPicked.isEmpty()) {
-                        String colorToTry = Aggregates.removeRandom(colorsAlreadyPicked);
-                        for (Deck toCheck : availableOptions) {
-                            if (toCheck.getTags().contains(colorToTry)) {
-                                colorAdded = colorToTry;
-                                chosenPacks.add(toCheck);
-                                availableOptions.remove(toCheck);
-                                break;
-                            }
-                        }
-                    }
-                    //3. If no matching color found and need more packs, add any available at random.
-                    if (packConfiguration.length > chosenPacks.size() && colorAdded.isEmpty() && !availableOptions.isEmpty()) {
-                        chosenPacks.add(Aggregates.removeRandom(availableOptions));
-                    } else {
-                        done = colorAdded.isEmpty() || packConfiguration.length <= chosenPacks.size();
-                    }
-                    colorAdded = "";
-
-                }
-                participant.registeredDeck = new Deck();
-                for (Deck chosen : chosenPacks) {
-                    participant.registeredDeck.getMain().addAllFlat(chosen.getMain().toFlatList());
-                }
-            }
-
-            rewards = new AdventureEventData.AdventureEventReward[4];
-            AdventureEventData.AdventureEventReward r0 = new AdventureEventData.AdventureEventReward();
-            AdventureEventData.AdventureEventReward r1 = new AdventureEventData.AdventureEventReward();
-            AdventureEventData.AdventureEventReward r2 = new AdventureEventData.AdventureEventReward();
-            AdventureEventData.AdventureEventReward r3 = new AdventureEventData.AdventureEventReward();
-
-            RewardData r0gold = new RewardData();
-            r0gold.count = 100;
-            r0gold.type = "gold";
-            r0.rewards = new RewardData[]{r0gold};
-            r0.minWins = 1;
-            r0.maxWins = 1;
-            rewards[0] = r0;
-            RewardData r1gold = new RewardData();
-            r1gold.count = 200;
-            r1gold.type = "gold";
-            r1.rewards = new RewardData[]{r1gold};
-            r1.minWins = 2;
-            r1.maxWins = 2;
-            rewards[1] = r1;
-            r2.minWins = 3;
-            r2.maxWins = 3;
-            RewardData r2gold = new RewardData();
-            r2gold.count = 500;
-            r2gold.type = "gold";
-            r2.rewards = new RewardData[]{r2gold};
-            rewards[2] = r2;
-            r3.minWins = 0;
-            r3.maxWins = 3;
-            rewards[3] = r3;
-            //r3 will be the selected card packs
+            setupJumpstartRewards();
         }
 
         switch (style) {
@@ -302,7 +150,7 @@ public class AdventureEventData implements Serializable {
         Random placeholder = MyRandom.getRandom();
         MyRandom.setRandom(getEventRandom());
         if (draft == null && (eventStatus == AdventureEventController.EventStatus.Available || eventStatus == AdventureEventController.EventStatus.Entered)) {
-            draft = BoosterDraft.createDraft(LimitedPoolType.Block, getCardBlock(), packConfiguration);
+            draft = BoosterDraft.createDraft(LimitedPoolType.Block, getCardBlock(), packConfiguration, participants.length);
             registeredDeck = draft.getHumanPlayer().getDeck();
             assignPlayerNames(draft);
         }
@@ -328,6 +176,7 @@ public class AdventureEventData implements Serializable {
     private static final Predicate<CardEdition> filterStandard = FModel.getFormats().getStandard().editionLegalPredicate;
 
     public static Predicate<CardEdition> selectSetPool() {
+        // Should we negate any of these to avoid overlap?
         final int rollD100 = MyRandom.getRandom().nextInt(100);
         Predicate<CardEdition> rolledFilter;
         if (rollD100 < 30) {
@@ -440,6 +289,66 @@ public class AdventureEventData implements Serializable {
         return legalBlocks.isEmpty() ? null : Aggregates.random(legalBlocks);
     }
 
+    private void setupDraftRewards() {
+        //Below all to be fully generated in later release
+        rewardPacks = getRewardPacks(3);
+        if (cardBlock != null) {
+            packConfiguration = getBoosterConfiguration(cardBlock);
+
+            rewards = new AdventureEventData.AdventureEventReward[4];
+            AdventureEventData.AdventureEventReward r0 = new AdventureEventData.AdventureEventReward();
+            AdventureEventData.AdventureEventReward r1 = new AdventureEventData.AdventureEventReward();
+            AdventureEventData.AdventureEventReward r2 = new AdventureEventData.AdventureEventReward();
+            AdventureEventData.AdventureEventReward r3 = new AdventureEventData.AdventureEventReward();
+            r0.minWins = 0;
+            r0.maxWins = 0;
+            r0.cardRewards = new Deck[]{rewardPacks[0]};
+            rewards[0] = r0;
+            r1.minWins = 1;
+            r1.maxWins = 3;
+            r1.cardRewards = new Deck[]{rewardPacks[1], rewardPacks[2]};
+            rewards[1] = r1;
+            r2.minWins = 2;
+            r2.maxWins = 3;
+            r2.itemRewards = new String[]{"Challenge Coin"};
+            rewards[2] = r2;
+        }
+    }
+
+    private void setupJumpstartRewards() {
+        rewards = new AdventureEventData.AdventureEventReward[4];
+        AdventureEventData.AdventureEventReward r0 = new AdventureEventData.AdventureEventReward();
+        AdventureEventData.AdventureEventReward r1 = new AdventureEventData.AdventureEventReward();
+        AdventureEventData.AdventureEventReward r2 = new AdventureEventData.AdventureEventReward();
+        AdventureEventData.AdventureEventReward r3 = new AdventureEventData.AdventureEventReward();
+
+        RewardData r0gold = new RewardData();
+        r0gold.count = 100;
+        r0gold.type = "gold";
+        r0.rewards = new RewardData[]{r0gold};
+        r0.minWins = 1;
+        r0.maxWins = 1;
+        rewards[0] = r0;
+        RewardData r1gold = new RewardData();
+        r1gold.count = 200;
+        r1gold.type = "gold";
+        r1.rewards = new RewardData[]{r1gold};
+        r1.minWins = 2;
+        r1.maxWins = 2;
+        rewards[1] = r1;
+        r2.minWins = 3;
+        r2.maxWins = 3;
+        RewardData r2gold = new RewardData();
+        r2gold.count = 500;
+        r2gold.type = "gold";
+        r2.rewards = new RewardData[]{r2gold};
+        rewards[2] = r2;
+        r3.minWins = 0;
+        r3.maxWins = 3;
+        rewards[3] = r3;
+        //r3 will be the selected card packs
+    }
+
 
     public String[] getBoosterConfiguration(CardBlock selectedBlock) {
         Random placeholder = MyRandom.getRandom();
@@ -473,6 +382,105 @@ public class AdventureEventData implements Serializable {
         }
 
         participants[numberOfOpponents] = getHumanPlayer();
+
+        if (format == AdventureEventController.EventFormat.Jumpstart) {
+            for (AdventureEventParticipant participant : participants) {
+                List<Deck> availableOptions = AdventureEventController.instance().getJumpstartBoosters(cardBlock, JUMPSTART_TO_PICK_FROM);
+                List<Deck> chosenPacks = new ArrayList<>();
+
+                Map<String, List<Deck>> themeMap = new HashMap<>();
+
+                //1. Search for matching themes from deck names, fill deck with them if possible
+                for (Deck option : availableOptions) {
+                    // This matches up theme for all except DMU - with only 2 per color the next part will handle that
+                    String theme = option.getName().replaceAll("\\d$", "").trim();
+                    if (!themeMap.containsKey(theme)) {
+                        themeMap.put(theme, new ArrayList<>());
+                    }
+                    themeMap.get(theme).add(option);
+                }
+
+                String themeAdded = "";
+                boolean done = false;
+                while (!done) {
+                    for (int i = packConfiguration.length - chosenPacks.size(); i > 1; i--) {
+                        if (themeAdded.isEmpty()) {
+                            for (String theme : themeMap.keySet()) {
+                                if (themeMap.get(theme).size() >= i) {
+                                    themeAdded = theme;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (themeAdded.isEmpty()) {
+                        done = true;
+                    } else {
+                        chosenPacks.addAll(themeMap.get(themeAdded).subList(0, Math.min(themeMap.get(themeAdded).size(), packConfiguration.length - chosenPacks.size())));
+                        availableOptions.removeAll(themeMap.get(themeAdded));
+                        themeMap.remove(themeAdded);
+                        themeAdded = "";
+                    }
+                }
+
+                //2. Fill remaining slots with colors already picked whenever possible
+                Map<String, List<Deck>> colorMap = new HashMap<>();
+                for (Deck option : availableOptions) {
+                    if (option.getTags().contains("black"))
+                        colorMap.computeIfAbsent("black", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("blue"))
+                        colorMap.computeIfAbsent("blue", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("green"))
+                        colorMap.computeIfAbsent("green", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("red"))
+                        colorMap.computeIfAbsent("red", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("white"))
+                        colorMap.computeIfAbsent("white", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("multicolor"))
+                        colorMap.computeIfAbsent("multicolor", (k) -> new ArrayList<>()).add(option);
+                    if (option.getTags().contains("colorless"))
+                        colorMap.computeIfAbsent("colorless", (k) -> new ArrayList<>()).add(option);
+                }
+
+                done = false;
+                String colorAdded = "";
+                while (!done) {
+                    List<String> colorsAlreadyPicked = new ArrayList<>();
+                    for (Deck picked : chosenPacks) {
+                        if (picked.getTags().contains("black")) colorsAlreadyPicked.add("black");
+                        if (picked.getTags().contains("blue")) colorsAlreadyPicked.add("blue");
+                        if (picked.getTags().contains("green")) colorsAlreadyPicked.add("green");
+                        if (picked.getTags().contains("red")) colorsAlreadyPicked.add("red");
+                        if (picked.getTags().contains("white")) colorsAlreadyPicked.add("white");
+                        if (picked.getTags().contains("multicolor")) colorsAlreadyPicked.add("multicolor");
+                        if (picked.getTags().contains("colorless")) colorsAlreadyPicked.add("colorless");
+                    }
+
+                    while (colorAdded.isEmpty() && !colorsAlreadyPicked.isEmpty()) {
+                        String colorToTry = Aggregates.removeRandom(colorsAlreadyPicked);
+                        for (Deck toCheck : availableOptions) {
+                            if (toCheck.getTags().contains(colorToTry)) {
+                                colorAdded = colorToTry;
+                                chosenPacks.add(toCheck);
+                                availableOptions.remove(toCheck);
+                                break;
+                            }
+                        }
+                    }
+                    //3. If no matching color found and need more packs, add any available at random.
+                    if (packConfiguration.length > chosenPacks.size() && colorAdded.isEmpty() && !availableOptions.isEmpty()) {
+                        chosenPacks.add(Aggregates.removeRandom(availableOptions));
+                    } else {
+                        done = colorAdded.isEmpty() || packConfiguration.length <= chosenPacks.size();
+                    }
+                    colorAdded = "";
+                }
+                participant.registeredDeck = new Deck();
+                for (Deck chosen : chosenPacks) {
+                    participant.registeredDeck.getMain().addAllFlat(chosen.getMain().toFlatList());
+                }
+            }
+        }
     }
 
     private void assignPlayerNames(BoosterDraft draft) {
@@ -525,6 +533,31 @@ public class AdventureEventData implements Serializable {
                 }
                 matches.get(round).add(match);
             }
+        } else if (style == AdventureEventController.EventStyle.RoundRobin) {
+            // In a roundrobin everyone plays everyone else once
+            // We do have this logic already in ForgeTOurnament, we should see if we could reuse it
+            matches.put(round, new ArrayList<>());
+            activePlayers = Arrays.stream(participants).collect(Collectors.toList());
+
+            if (round > 1) {
+                AdventureEventParticipant pivot = activePlayers.remove(0);
+                for(int i = 1; i < round; i++) {
+                    // Rotate X amount of players, where X is the current round-1
+                    AdventureEventParticipant rotate = activePlayers.remove(0);
+                    activePlayers.add(rotate);
+                }
+                activePlayers.add(0, pivot);
+            }
+
+            int numPlayers = activePlayers.size();
+            for (int i = 0; i < numPlayers / 2; i++) {
+                AdventureEventMatch match = new AdventureEventMatch();
+                match.p1 = activePlayers.get(i);
+                match.p2 = activePlayers.get(numPlayers - i - 1);
+                matches.get(round).add(match);
+            }
+        } else {
+            System.out.println(style + " not yet implemented!!!");
         }
         return matches.get(currentRound);
     }
@@ -587,7 +620,58 @@ public class AdventureEventData implements Serializable {
         }
 
         //todo: more robust logic for event types that can be won without perfect record (Swiss w/cut, round robin)
-        playerWon = matchesLost == 0 || matchesWon == rounds;
+        if (style == AdventureEventController.EventStyle.Bracket) {
+            playerWon = matchesLost == 0 || matchesWon == rounds;
+        } else if (style == AdventureEventController.EventStyle.RoundRobin) {
+            if (matchesWon == rounds) {
+                playerWon = true;
+            } else {
+                //If multiple players are tied for first, only the one with the best tiebreaker wins
+                List<AdventureEventParticipant> topPlayers = new ArrayList<>();
+                int bestRecord = 0;
+                for (AdventureEventParticipant p : participants) {
+                    if (p.wins > bestRecord) {
+                        bestRecord = p.wins;
+                        topPlayers.clear();
+                        topPlayers.add(p);
+                    } else if (p.wins == bestRecord) {
+                        topPlayers.add(p);
+                    }
+                }
+                if (topPlayers.size() == 1) {
+                    playerWon = topPlayers.get(0).getName().equals(getHumanPlayer().getName());
+                } else {
+                    //multiple players tied for first, use tiebreaker
+                    Map<AdventureEventParticipant, Integer> tiebreakers = new HashMap<>();
+                    for (AdventureEventParticipant p : topPlayers) {
+                        int tb = 0;
+                        for (AdventureEventMatch m : matches.values().stream().flatMap(List::stream).collect(Collectors.toList())) {
+                            if (m.p1 == p && m.winner != null && m.winner != p) {
+                                tb += m.p2.wins;
+                            } else if (m.p2 == p && m.winner != null && m.winner != p) {
+                                tb += m.p1.wins;
+                            }
+                        }
+                        tiebreakers.put(p, tb);
+                    }
+                    int bestTiebreaker = 0;
+                    AdventureEventParticipant winner = null;
+                    boolean tie = false;
+                    for (AdventureEventParticipant p : tiebreakers.keySet()) {
+                        if (tiebreakers.get(p) > bestTiebreaker) {
+                            bestTiebreaker = tiebreakers.get(p);
+                            winner = p;
+                            tie = false;
+                        } else if (tiebreakers.get(p) == bestTiebreaker) {
+                            tie = true;
+                        }
+                    }
+                    playerWon = !tie && winner != null && winner.getName().equals(getHumanPlayer().getName());
+                }
+            }
+        } else {
+            playerWon = false;
+        }
 
         eventStatus = AdventureEventController.EventStatus.Awarded;
     }
@@ -599,15 +683,18 @@ public class AdventureEventData implements Serializable {
             description += "Block: " + getCardBlock() + "\n";
             description += "Boosters: " + String.join(", ", packConfiguration) + "\n";
             description += "Competition Style: " + participants.length + " players, matches played as best of " + eventRules.gamesPerMatch + ", " + (eventRules.getPairingDescription()) + "\n\n";
-            description += String.format("Pay 1 Entry Fee\n- Gold %d[][+Gold][BLACK]\n- Mana Shards %d[][+Shards][BLACK]\n", Math.round(eventRules.goldToEnter * townPriceModifier), Math.round(eventRules.shardsToEnter * townPriceModifier));
-            if (eventRules.acceptsBronzeChallengeCoin) {
-                description += "- Bronze Challenge Coin [][+BronzeChallengeCoin][BLACK]\n\n";
-            } else if (eventRules.acceptsSilverChallengeCoin) {
-                description += "- Silver Challenge Coin [][+SilverChallengeCoin][BLACK]\n\n";
-            } else if (eventRules.acceptsChallengeCoin) {
-                description += "- Gold Challenge Coin [][+ChallengeCoin][BLACK]\n\n";
-            } else {
-                description += "\n";
+
+            if (eventStatus == AdventureEventController.EventStatus.Available) {
+                description += String.format("Pay 1 Entry Fee\n- Gold %d[][+Gold][BLACK]\n- Mana Shards %d[][+Shards][BLACK]\n", Math.round(eventRules.goldToEnter * townPriceModifier), Math.round(eventRules.shardsToEnter * townPriceModifier));
+                if (eventRules.acceptsBronzeChallengeCoin) {
+                    description += "- Bronze Challenge Coin [][+BronzeChallengeCoin][BLACK]\n\n";
+                } else if (eventRules.acceptsSilverChallengeCoin) {
+                    description += "- Silver Challenge Coin [][+SilverChallengeCoin][BLACK]\n\n";
+                } else if (eventRules.acceptsChallengeCoin) {
+                    description += "- Gold Challenge Coin [][+ChallengeCoin][BLACK]\n\n";
+                } else {
+                    description += "\n";
+                }
             }
             description += String.format("Prizes\nChampion: Keep drafted deck\n2+ round wins: Challenge Coin \n1+ round wins: %s Booster, %s Booster\n0 round wins: %s Booster", rewardPacks[0].getComment(), rewardPacks[1].getComment(), rewardPacks[2].getComment());
         } else if (format == AdventureEventController.EventFormat.Jumpstart) {
diff --git a/forge-gui-mobile/src/forge/adventure/data/DialogData.java b/forge-gui-mobile/src/forge/adventure/data/DialogData.java
index 4064188e420..fedd70b6839 100644
--- a/forge-gui-mobile/src/forge/adventure/data/DialogData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/DialogData.java
@@ -1,10 +1,9 @@
 package forge.adventure.data;
 
-import forge.util.Callback;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * Dialog Data JSON loader class.
@@ -22,7 +21,7 @@ public class DialogData implements Serializable {
     public DialogData[] options = new DialogData[0];      //List of sub-dialogs. Show up as options in the current one.
     public boolean isDisabled = false;
 
-    public transient Callback callback;
+    public transient Consumer callback;
 
     public DialogData(){}
     public DialogData(DialogData other){
diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
index b0dc93ce141..6ae9bbe6bda 100644
--- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
@@ -2,12 +2,14 @@ package forge.adventure.data;
 
 import com.badlogic.gdx.utils.Array;
 import com.google.common.collect.Iterables;
+import forge.ImageKeys;
 import forge.StaticData;
 import forge.adventure.util.*;
 import forge.adventure.world.WorldSave;
 import forge.card.CardEdition;
 import forge.deck.Deck;
 import forge.item.PaperCard;
+import forge.item.PaperCardPredicates;
 import forge.model.FModel;
 import forge.util.IterableUtil;
 import forge.util.StreamUtil;
@@ -16,7 +18,6 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.function.Predicate;
 
-
 /**
  * Data class that will be used to read Json configuration files
  * BiomeData
@@ -96,11 +97,23 @@ public class RewardData implements Serializable {
         ConfigData configData = Config.instance().getConfigData();
         RewardData legals = configData.legalCards;
 
-        if(legals==null)
-            allCards = CardUtil.getFullCardPool(false); // we need unique cards only here, so that a unique card can be chosen before a set variant is determined
-        else
-            allCards = IterableUtil.filter(CardUtil.getFullCardPool(false), new CardUtil.CardPredicate(legals, true));
-        //Filter out specific cards.
+        allCards = CardUtil.getFullCardPool(false);
+
+        if(legals != null)
+            allCards = IterableUtil.filter(allCards, new CardUtil.CardPredicate(legals, true));
+
+        // Filter out by editions and obtainability
+        if (configData.allowedEditions != null && configData.allowedEditions.length > 0) {
+            allCards = IterableUtil.filter(allCards, PaperCardPredicates.printedInAnyEditions(configData.allowedEditions));
+        } else if (configData.restrictedEditions != null && configData.restrictedEditions.length > 0) {
+            allCards = IterableUtil.filter(allCards, PaperCardPredicates.onlyPrintedInEditions(configData.restrictedEditions).negate());
+        } else {
+            allCards = IterableUtil.filter(allCards, PaperCardPredicates.isObtainableAnyEdition());
+        }
+
+        Set<String> restrictedCards = new HashSet<>(Arrays.asList(configData.restrictedCards));
+
+        // Filter out specific cards.
         allCards = IterableUtil.filter(allCards, input -> {
             if (input == null)
                 return false;
@@ -108,16 +121,13 @@ public class RewardData implements Serializable {
                 return false;
             if (input.getRules().getAiHints().getRemNonCommanderDecks())
                 return false;
-            if (configData.allowedEditions != null) {
-                if (!Arrays.asList(configData.allowedEditions).contains(input.getEdition()))
-                    return false;
-            } else if (Arrays.asList(configData.restrictedEditions).contains(input.getEdition()))
+            if (input.getRules().isCustom() &&
+                    input.getImageKey(false).startsWith(ImageKeys.ADVENTURECARD_PREFIX)) {
                 return false;
-            return !Arrays.asList(configData.restrictedCards).contains(input.getName());
-        });
+            }
 
-        // Only allow obtainable cards
-        allCards = IterableUtil.filter(allCards, input -> StaticData.instance().getCardEdition(input.getEdition()).isCardObtainable(input.getCardName()));
+            return !restrictedCards.contains(input.getName());
+        });
 
         //Filter AI cards for enemies.
         allEnemyCards = IterableUtil.filter(allCards, input -> {
diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index ccc0cd279c2..450d98d328e 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -31,6 +31,7 @@ import forge.util.ItemPool;
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * Class that represents the player (not the player sprite)
@@ -44,7 +45,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     private int heroRace;
     private int avatarIndex;
     private boolean isFemale;
-    private ColorSet colorIdentity = ColorSet.ALL_COLORS;
+    private ColorSet colorIdentity = ColorSet.WUBRG;
 
     // Deck data
     private Deck deck;
@@ -70,6 +71,9 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     private final HashMap<String, Long> equippedItems = new HashMap<>();
     private final List<AdventureQuestData> quests = new ArrayList<>();
     private final List<AdventureEventData> events = new ArrayList<>();
+    private final Set<PaperCard> unsupportedCards = new HashSet<>();
+    private final Predicate<PaperCard> isUnsupported = pc -> pc != null && pc.getRules() != null && pc.getRules().isUnsupported();
+    private final Predicate<PaperCard> isValid = pc -> pc != null && pc.getRules() != null && !pc.getRules().isUnsupported();
 
     // Fantasy/Chaos mode settings.
     private boolean fantasyMode = false;
@@ -130,6 +134,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         favoriteCards.clear();
         AdventureEventController.clear();
         AdventureQuestController.clear();
+        unsupportedCards.clear();
     }
 
     static public AdventurePlayer current() {
@@ -307,6 +312,10 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return colorIdentity.toString();
     }
 
+    public Collection<PaperCard> getUnsupportedCards() {
+        return unsupportedCards;
+    }
+
 
     //Setters
     public void setWorldPosX(float worldPosX) {
@@ -387,9 +396,9 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
             if (temp != null)
                 setColorIdentity(temp);
             else
-                colorIdentity = ColorSet.ALL_COLORS;
+                colorIdentity = ColorSet.WUBRG;
         } else
-            colorIdentity = ColorSet.ALL_COLORS;
+            colorIdentity = ColorSet.WUBRG;
 
         gold = data.readInt("gold");
         maxLife = data.readInt("maxLife");
@@ -478,14 +487,24 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         }
 
         deck = new Deck(data.readString("deckName"));
-        deck.getMain().addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deckCards"))));
-        if (data.containsKey("sideBoardCards"))
-            deck.getOrCreate(DeckSection.Sideboard).addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards"))));
-        if(data.containsKey("attractionDeckCards"))
-            deck.getOrCreate(DeckSection.Attractions).addAll(CardPool.fromCardList(List.of((String[]) data.readObject("attractionDeckCards"))));
-        if(data.containsKey("contraptionDeckCards")) //TODO: Generalize this. Can't we just serialize the whole deck?
-            deck.getOrCreate(DeckSection.Contraptions).addAll(CardPool.fromCardList(List.of((String[]) data.readObject("contraptionDeckCards"))));
-
+        CardPool deckCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deckCards")));
+        deck.getMain().addAll(deckCards.getFilteredPool(isValid));
+        unsupportedCards.addAll(deckCards.getFilteredPool(isUnsupported).toFlatList());
+        if (data.containsKey("sideBoardCards")) {
+            CardPool sideBoardCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards")));
+            deck.getOrCreate(DeckSection.Sideboard).addAll(sideBoardCards.getFilteredPool(isValid));
+            unsupportedCards.addAll(sideBoardCards.getFilteredPool(isUnsupported).toFlatList());
+        }
+        if (data.containsKey("attractionDeckCards")) {
+            CardPool attractionDeckCards = CardPool.fromCardList(List.of((String[]) data.readObject("attractionDeckCards")));
+            deck.getOrCreate(DeckSection.Attractions).addAll(attractionDeckCards.getFilteredPool(isValid));
+            unsupportedCards.addAll(attractionDeckCards.getFilteredPool(isUnsupported).toFlatList());
+        }
+        if (data.containsKey("contraptionDeckCards")) {//TODO: Generalize this. Can't we just serialize the whole deck?
+            CardPool contraptionDeckCards = CardPool.fromCardList(List.of((String[]) data.readObject("contraptionDeckCards")));
+            deck.getOrCreate(DeckSection.Contraptions).addAll(contraptionDeckCards.getFilteredPool(isValid));
+            unsupportedCards.addAll(contraptionDeckCards.getFilteredPool(isUnsupported).toFlatList());
+        }
         if (data.containsKey("characterFlagsKey") && data.containsKey("characterFlagsValue")) {
             String[] keys = (String[]) data.readObject("characterFlagsKey");
             Byte[] values = (Byte[]) data.readObject("characterFlagsValue");
@@ -536,13 +555,24 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
                 else {
                     decks.add(new Deck(data.readString("deck_name_" + i)));
                 }
-                decks.get(i).getMain().addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deck_" + i))));
-                if (data.containsKey("sideBoardCards_" + i))
-                    decks.get(i).getOrCreate(DeckSection.Sideboard).addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards_" + i))));
-                if (data.containsKey("attractionDeckCards_" + i))
-                    decks.get(i).getOrCreate(DeckSection.Attractions).addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("attractionDeckCards_" + i))));
-                if (data.containsKey("contraptionDeckCards_" + i))
-                    decks.get(i).getOrCreate(DeckSection.Contraptions).addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("contraptionDeckCards_" + i))));
+                CardPool mainCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deck_" + i)));
+                decks.get(i).getMain().addAll(mainCards.getFilteredPool(isValid));
+                unsupportedCards.addAll(mainCards.getFilteredPool(isUnsupported).toFlatList());
+                if (data.containsKey("sideBoardCards_" + i)) {
+                    CardPool sideBoardCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards_" + i)));
+                    decks.get(i).getOrCreate(DeckSection.Sideboard).addAll(sideBoardCards.getFilteredPool(isValid));
+                    unsupportedCards.addAll(sideBoardCards.getFilteredPool(isUnsupported).toFlatList());
+                }
+                if (data.containsKey("attractionDeckCards_" + i)) {
+                    CardPool attractionCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("attractionDeckCards_" + i)));
+                    decks.get(i).getOrCreate(DeckSection.Attractions).addAll(attractionCards.getFilteredPool(isValid));
+                    unsupportedCards.addAll(attractionCards.getFilteredPool(isUnsupported).toFlatList());
+                }
+                if (data.containsKey("contraptionDeckCards_" + i)) {
+                    CardPool contraptionCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("contraptionDeckCards_" + i)));
+                    decks.get(i).getOrCreate(DeckSection.Contraptions).addAll(contraptionCards.getFilteredPool(isValid));
+                    unsupportedCards.addAll(contraptionCards.getFilteredPool(isUnsupported).toFlatList());
+                }
             }
             // In case we allow removing decks from the deck selection GUI, populate up to the minimum
             for (int i = dynamicDeckCount++; i < MIN_DECK_COUNT; i++) {
@@ -557,26 +587,43 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
                     continue;
                 }
                 decks.set(i, new Deck(data.readString("deck_name_" + i)));
-                decks.get(i).getMain().addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deck_" + i))));
-                if (data.containsKey("sideBoardCards_" + i))
-                    decks.get(i).getOrCreate(DeckSection.Sideboard).addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards_" + i))));
+                CardPool mainCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("deck_" + i)));
+                decks.get(i).getMain().addAll(mainCards.getFilteredPool(isValid));
+                unsupportedCards.addAll(mainCards.getFilteredPool(isUnsupported).toFlatList());
+                if (data.containsKey("sideBoardCards_" + i)) {
+                    CardPool sideBoardCards = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("sideBoardCards_" + i)));
+                    decks.get(i).getOrCreate(DeckSection.Sideboard).addAll(sideBoardCards.getFilteredPool(isValid));
+                    unsupportedCards.addAll(sideBoardCards.getFilteredPool(isUnsupported).toFlatList());
+                }
             }
         }
 
         setSelectedDeckSlot(data.readInt("selectedDeckIndex"));
-        cards.addAll(CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("cards"))));
+        CardPool cardPool = CardPool.fromCardList(Lists.newArrayList((String[]) data.readObject("cards")));
+        cards.addAll(cardPool.getFilteredPool(isValid));
+        unsupportedCards.addAll(cardPool.getFilteredPool(isUnsupported).toFlatList());
 
         if (data.containsKey("newCards")) {
             InventoryItem[] items = (InventoryItem[]) data.readObject("newCards");
             for (InventoryItem item : items) {
-                newCards.add((PaperCard) item);
+                if (item instanceof PaperCard pc) {
+                    if (isUnsupported.test(pc))
+                        unsupportedCards.add(pc);
+                    else
+                        newCards.add(pc);
+                }
             }
         }
         if (data.containsKey("noSellCards")) {
             // Legacy list of unsellable cards. Now done via CardRequest flags. Convert the corresponding cards.
             PaperCard[] items = (PaperCard[]) data.readObject("noSellCards");
             CardPool noSellPool = new CardPool();
-            noSellPool.addAllFlat(List.of(items));
+            for (PaperCard pc : items) {
+                if (isUnsupported.test(pc))
+                    unsupportedCards.add(pc);
+                else
+                    noSellPool.add(pc);
+            }
             for (Map.Entry<PaperCard, Integer> noSellEntry : noSellPool) {
                 PaperCard item = noSellEntry.getKey();
                 if (item == null)
@@ -614,11 +661,21 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         }
         if (data.containsKey("autoSellCards")) {
             PaperCard[] items = (PaperCard[]) data.readObject("autoSellCards");
-            autoSellCards.addAllFlat(Arrays.asList(items));
+            for (PaperCard pc : items) {
+                if (isUnsupported.test(pc))
+                    unsupportedCards.add(pc);
+                else
+                    autoSellCards.add(pc);
+            }
         }
         if (data.containsKey("favoriteCards")) {
             PaperCard[] items = (PaperCard[]) data.readObject("favoriteCards");
-            favoriteCards.addAll(Arrays.asList(items));
+            for (PaperCard pc : items) {
+                if (isUnsupported.test(pc))
+                    unsupportedCards.add(pc);
+                else
+                    favoriteCards.add(pc);
+            }
         }
 
         fantasyMode = data.containsKey("fantasyMode") && data.readBool("fantasyMode");
@@ -1020,6 +1077,25 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return items.random();
     }
 
+    public boolean hasEquippedItem() {
+        for (Long id : equippedItems.values()) {
+            ItemData item = getEquippedItem(id);
+            if (item == null)
+                continue;
+            if (isHardorInsaneDifficulty()) {
+                return true;
+            } else {
+                switch (item.equipmentSlot) {
+                    // limit to these for easy and normal
+                    case "Boots", "Body", "Neck" -> {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     public ItemData getEquippedAbility1() {
         for (Long id : equippedItems.values()) {
             ItemData data = getEquippedItem(id);
@@ -1118,9 +1194,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     }
 
     public void removeItem(String name) {
-        ItemData item = ItemListData.getItem(name);
-        if (item != null)
-            removeItem(item);
+        inventoryItems.stream().filter(itemData -> name.equalsIgnoreCase(itemData.name)).findFirst().ifPresent(this::removeItem);
     }
 
     public void removeItem(ItemData item) {
@@ -1134,7 +1208,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     }
 
     public void equip(ItemData item) {
-        if (equippedItems.get(item.equipmentSlot) != null && equippedItems.get(item.equipmentSlot) == item.longID) {
+        Long itemID = equippedItems.get(item.equipmentSlot);
+        if (itemID != null && itemID.equals(item.longID)) {
             item.isEquipped = false;
             equippedItems.remove(item.equipmentSlot);
         } else {
@@ -1186,16 +1261,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     }
 
     public int countItem(String name) {
-        int count = 0;
-        if (!hasItem(name))
-            return count;
-        for (ItemData i : inventoryItems) {
-            if (i == null)
-                continue;
-            if (i.name.equals(name))
-                count++;
-        }
-        return count;
+        return (int) inventoryItems.stream().filter(Objects::nonNull).filter(i -> i.name.equals(name)).count();
     }
 
     public boolean addItem(String name) {
@@ -1212,11 +1278,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
     }
 
     public void removeAllQuestItems(){
-        for (ItemData data : inventoryItems) {
-            if(data != null && data.questItem){
-                removeItem(data);
-            }
-        }
+        inventoryItems.removeIf(data -> data != null && data.questItem);
     }
 
     public boolean addBooster(Deck booster) {
@@ -1374,6 +1436,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
      */
     public int copyDeck() {
         for (int i = 0; i < MAX_DECK_COUNT; i++) {
+            if (i >= getDeckCount()) addDeck();
             if (isEmptyDeck(i)) {
                 decks.set(i, (Deck) deck.copyTo(deck.getName() + " (" + Forge.getLocalizer().getMessage("lblCopy") + ")"));
                 return i;
diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
index dc32be79757..d3425a17e33 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
@@ -27,27 +27,41 @@ import forge.item.PaperCard;
 import forge.itemmanager.*;
 import forge.itemmanager.filters.CardColorFilter;
 import forge.itemmanager.filters.CardTypeFilter;
-import forge.localinstance.properties.ForgePreferences;
-import forge.menu.FCheckBoxMenuItem;
 import forge.menu.FDropDownMenu;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
 import forge.model.FModel;
 import forge.toolbox.*;
-import forge.util.Callback;
 import forge.util.ItemPool;
 import forge.util.Localizer;
 import forge.util.Utils;
 
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class AdventureDeckEditor extends FDeckEditor {
     protected static class AdventureEditorConfig extends DeckEditorConfig {
-        @Override public GameType getGameType() { return GameType.Adventure; }
-        @Override public DeckFormat getDeckFormat() { return DeckFormat.Adventure; }
-        @Override protected IDeckController getController() { return ADVENTURE_DECK_CONTROLLER; }
-        @Override public boolean usePlayerInventory() { return true; }
+        @Override
+        public GameType getGameType() {
+            return GameType.Adventure;
+        }
+
+        @Override
+        public DeckFormat getDeckFormat() {
+            return DeckFormat.Adventure;
+        }
+
+        @Override
+        protected IDeckController getController() {
+            return ADVENTURE_DECK_CONTROLLER;
+        }
+
+        @Override
+        public boolean usePlayerInventory() {
+            return true;
+        }
 
         @Override
         protected DeckEditorPage[] getInitialPages() {
@@ -111,18 +125,34 @@ public class AdventureDeckEditor extends FDeckEditor {
 
     protected static class DeckPreviewConfig extends AdventureEditorConfig {
         private final Deck deckToPreview;
+
         public DeckPreviewConfig(Deck deckToPreview) {
             this.deckToPreview = deckToPreview;
         }
 
-        @Override public boolean usePlayerInventory() { return false; }
-        @Override public boolean isLimited() { return true; }
-        @Override public ItemPool<PaperCard> getCardPool(boolean wantUnique) { return deckToPreview.getAllCardsInASinglePool(true, true); }
-        @Override public boolean allowsCardReplacement() { return false; }
+        @Override
+        public boolean usePlayerInventory() {
+            return false;
+        }
+
+        @Override
+        public boolean isLimited() {
+            return true;
+        }
+
+        @Override
+        public ItemPool<PaperCard> getCardPool(boolean wantUnique) {
+            return deckToPreview.getAllCardsInASinglePool(true, true);
+        }
+
+        @Override
+        public boolean allowsCardReplacement() {
+            return false;
+        }
 
         @Override
         protected DeckEditorPage[] getInitialPages() {
-            return new DeckEditorPage[] {new ContentPreviewPage(deckToPreview)};
+            return new DeckEditorPage[]{new ContentPreviewPage(deckToPreview)};
         }
     }
 
@@ -135,19 +165,39 @@ public class AdventureDeckEditor extends FDeckEditor {
             this.controller = new AdventureEventDeckController(event);
         }
 
-        @Override public GameType getGameType() { return GameType.AdventureEvent; }
-        @Override public DeckFormat getDeckFormat() { return DeckFormat.Limited; }
-        @Override public boolean isLimited() { return true; }
-        @Override public boolean isDraft() { return event.getDraft() != null; }
-        @Override protected IDeckController getController() { return this.controller; }
+        @Override
+        public GameType getGameType() {
+            return GameType.AdventureEvent;
+        }
+
+        @Override
+        public DeckFormat getDeckFormat() {
+            return DeckFormat.Limited;
+        }
+
+        @Override
+        public boolean isLimited() {
+            return true;
+        }
+
+        @Override
+        public boolean isDraft() {
+            return event.getDraft() != null;
+        }
+
+        @Override
+        protected IDeckController getController() {
+            return this.controller;
+        }
 
         @Override
         public List<CardEdition> getBasicLandSets(Deck currentDeck) {
-            if(event.cardBlock != null) {
-                if(event.cardBlock.getLandSet() != null)
+            if (event.cardBlock != null) {
+                if (event.cardBlock.getLandSet() != null)
                     return List.of(event.cardBlock.getLandSet());
-                List<CardEdition> eventSets = event.cardBlock.getSets();
-                if(!eventSets.isEmpty())
+                List<CardEdition> eventSets = new ArrayList<>(event.cardBlock.getSets());
+                eventSets.removeIf(Predicate.not(CardEdition::hasBasicLands));
+                if (!eventSets.isEmpty())
                     return eventSets;
             }
             return List.of(DeckProxy.getDefaultLandSet(event.registeredDeck));
@@ -170,9 +220,9 @@ public class AdventureDeckEditor extends FDeckEditor {
                     case Entered:
                         if (event.getDraft() != null)
                             return new DeckEditorPage[]{
-                                new DraftPackPage(new AdventureCardManager()),
-                                new AdventureDeckSectionPage(DeckSection.Main, ItemManagerConfig.DRAFT_POOL),
-                                new AdventureDeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.SIDEBOARD)
+                                    new DraftPackPage(new AdventureCardManager()),
+                                    new AdventureDeckSectionPage(DeckSection.Main, ItemManagerConfig.DRAFT_POOL),
+                                    new AdventureDeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.SIDEBOARD)
                             };
                     default:
                         return new DeckEditorPage[]{
@@ -242,7 +292,7 @@ public class AdventureDeckEditor extends FDeckEditor {
             Localizer localizer = Forge.getLocalizer();
             String label = localizer.getMessage("lblSellFor") + " " + Current.player().cardSellPrice(card);
             int sellable = cardManager.getItemCount(card);
-            if(sellable <= 0)
+            if (sellable <= 0)
                 return;
             String prompt = card + " - " + label + " " + localizer.getMessage("lblHowMany");
 
@@ -250,7 +300,7 @@ public class AdventureDeckEditor extends FDeckEditor {
                 int sold = Current.player().sellCard(card, result);
                 removeCard(card, sold);
             }));
-            if(cardIsFavorite(card))
+            if (cardIsFavorite(card))
                 sellItem.setTextColor(255, 0, 0);
             menu.addItem(sellItem);
         }
@@ -292,16 +342,13 @@ public class AdventureDeckEditor extends FDeckEditor {
                 value += Current.player().cardSellPrice(entry.getKey()) * entry.getValue();
             }
 
-            if(toSell.isEmpty())
+            if (toSell.isEmpty())
                 return;
 
-            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblSellAllConfirm", toSell.countAll(), value), Forge.getLocalizer().getMessage("lblSellCurrentFilters"), Forge.getLocalizer().getMessage("lblSell"), Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<>() {
-                @Override
-                public void run(Boolean result) {
-                    if (result) {
-                        Current.player().doBulkSell(toSell);
-                        refresh();
-                    }
+            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblSellAllConfirm", toSell.countAll(), value), Forge.getLocalizer().getMessage("lblSellCurrentFilters"), Forge.getLocalizer().getMessage("lblSell"), Forge.getLocalizer().getMessage("lblCancel"), false, result -> {
+                if (result) {
+                    Current.player().doBulkSell(toSell);
+                    refresh();
                 }
             });
         }
@@ -309,13 +356,21 @@ public class AdventureDeckEditor extends FDeckEditor {
         @Override
         public void setCardFavorited(PaperCard card, boolean isFavorite) {
             AdventurePlayer player = Current.player();
-            if(isFavorite)
+            if (isFavorite)
                 player.favoriteCards.add(card);
             else
                 player.favoriteCards.remove(card);
         }
-        @Override protected boolean cardIsFavorite(PaperCard card) { return Current.player().favoriteCards.contains(card); }
-        @Override protected boolean allowFavoriteCards() { return true; }
+
+        @Override
+        protected boolean cardIsFavorite(PaperCard card) {
+            return Current.player().favoriteCards.contains(card);
+        }
+
+        @Override
+        protected boolean allowFavoriteCards() {
+            return true;
+        }
     }
 
     private static class CollectionCatalogPage extends CatalogPage {
@@ -354,9 +409,18 @@ public class AdventureDeckEditor extends FDeckEditor {
             int autoSellCount = Current.player().autoSellCards.count(card); //Number currently in auto-sell.
             int canMoveToAutoSell = safeToSellCount - autoSellCount; //Number that can be moved to auto-sell from here.
 
+            if (card.getRules().isUnsupported()) {
+                menu.clearItems();
+                FMenuItem removeItem = new FMenuItem(localizer.getMessage("lblRemoveUnsupportedCard"), FSkinImage.HDDELETE, e ->
+                        removeCard(card, safeToSellCount));
+                menu.addItem(removeItem);
+                return;
+            }
+
             if (copiesUsedInDecks > 0) {
                 String text = localizer.getMessage("lblCopiesInUse", copiesUsedInDecks);
-                FMenuItem usedHint = new FMenuItem(text, FSkinImage.HDLIBRARY, n -> {});
+                FMenuItem usedHint = new FMenuItem(text, FSkinImage.HDLIBRARY, n -> {
+                });
                 usedHint.setEnabled(false);
                 menu.addItem(usedHint);
             }
@@ -393,13 +457,21 @@ public class AdventureDeckEditor extends FDeckEditor {
         @Override
         public void setCardFavorited(PaperCard card, boolean isFavorite) {
             AdventurePlayer player = Current.player();
-            if(isFavorite)
+            if (isFavorite)
                 player.favoriteCards.add(card);
             else
                 player.favoriteCards.remove(card);
         }
-        @Override protected boolean cardIsFavorite(PaperCard card) { return Current.player().favoriteCards.contains(card); }
-        @Override protected boolean allowFavoriteCards() { return true; }
+
+        @Override
+        protected boolean cardIsFavorite(PaperCard card) {
+            return Current.player().favoriteCards.contains(card);
+        }
+
+        @Override
+        protected boolean allowFavoriteCards() {
+            return true;
+        }
 
         @Override
         public void buildDeckMenu(FPopupMenu menu) {
@@ -420,15 +492,12 @@ public class AdventureDeckEditor extends FDeckEditor {
                     continue;
                 toMove.add(entry.getKey(), entry.getValue());
             }
-            if(toMove.isEmpty())
+            if (toMove.isEmpty())
                 return;
 
-            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblAutoSellCurrentFiltersConfirm", toMove.countAll()), Forge.getLocalizer().getMessage("lblAutoSellCurrentFilters"), Forge.getLocalizer().getMessage("lblAutoSell"), Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<>() {
-                @Override
-                public void run(Boolean result) {
-                    if (result) {
-                        moveCards(toMove, autoSellPage);
-                    }
+            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblAutoSellCurrentFiltersConfirm", toMove.countAll()), Forge.getLocalizer().getMessage("lblAutoSellCurrentFilters"), Forge.getLocalizer().getMessage("lblAutoSell"), Forge.getLocalizer().getMessage("lblCancel"), false, result -> {
+                if (result) {
+                    moveCards(toMove, autoSellPage);
                 }
             });
         }
@@ -478,20 +547,20 @@ public class AdventureDeckEditor extends FDeckEditor {
             super.buildMenu(menu, card);
             Localizer localizer = Forge.getLocalizer();
             AdventurePlayer player = Current.player();
-            if(isShop()) {
+            if (isShop()) {
                 String label = localizer.getMessage("lblSellFor") + " " + player.cardSellPrice(card);
                 int sellable = cardManager.getItemCount(card);
-                if(sellable <= 0)
+                if (sellable <= 0)
                     return;
                 String prompt = card + " - " + label + " " + localizer.getMessage("lblHowMany");
 
                 menu.addItem(new FMenuItem(label, SIDEBOARD_ICON, new MoveQuantityPrompt(prompt, sellable, result -> {
-                        int sold = player.sellCard(card, result);
-                        removeCard(card, sold);
-                    })
+                    int sold = player.sellCard(card, result);
+                    removeCard(card, sold);
+                })
                 ));
             }
-            if(parentScreen instanceof AdventureDeckEditor adventureEditor && adventureEditor.getCatalogPage() != null) {
+            if (parentScreen instanceof AdventureDeckEditor adventureEditor && adventureEditor.getCatalogPage() != null) {
                 CatalogPage catalogPage = adventureEditor.getCatalogPage();
                 int autoSellCount = cardManager.getItemCount(card);
                 int amountInCollection = player.getCards().count(card);
@@ -499,9 +568,7 @@ public class AdventureDeckEditor extends FDeckEditor {
 
                 String action = localizer.getMessage("lblFromAutoSell", autoSellCount, safeToSellCount);
                 String prompt = String.format("%s - %s %s", card, action, localizer.getMessage("lblHowMany"));
-                FMenuItem moveToCatalog = new FMenuItem(action, CATALOG_ICON, new MoveQuantityPrompt(prompt, autoSellCount, amount -> {
-                    moveCard(card, catalogPage, amount);
-                }));
+                FMenuItem moveToCatalog = new FMenuItem(action, CATALOG_ICON, new MoveQuantityPrompt(prompt, autoSellCount, amount -> moveCard(card, catalogPage, amount)));
                 menu.addItem(moveToCatalog);
             }
 
@@ -509,7 +576,7 @@ public class AdventureDeckEditor extends FDeckEditor {
 
         @Override
         protected void onCardActivated(PaperCard card) {
-            if(isShop()) {
+            if (isShop()) {
                 Current.player().sellCard(card, 1);
                 removeCard(card, 1);
             }
@@ -519,7 +586,7 @@ public class AdventureDeckEditor extends FDeckEditor {
 
     public AdventureEventData getCurrentEvent() {
         IDeckController controller = getDeckController();
-        if(!(controller instanceof AdventureEventDeckController eventController))
+        if (!(controller instanceof AdventureEventDeckController eventController))
             return null;
         return eventController.currentEvent;
     }
@@ -527,7 +594,7 @@ public class AdventureDeckEditor extends FDeckEditor {
     @Override
     public BoosterDraft getDraft() {
         AdventureEventData currentEvent = getCurrentEvent();
-        if(currentEvent == null)
+        if (currentEvent == null)
             return null;
         return currentEvent.getDraft();
     }
@@ -535,7 +602,7 @@ public class AdventureDeckEditor extends FDeckEditor {
     @Override
     public boolean isDrafting() {
         AdventureEventData currentEvent = getCurrentEvent();
-        if(currentEvent == null)
+        if (currentEvent == null)
             return false;
         return currentEvent.draft != null && !currentEvent.isDraftComplete;
     }
@@ -550,7 +617,7 @@ public class AdventureDeckEditor extends FDeckEditor {
     public void completeDraft() {
         super.completeDraft();
         AdventureEventData currentEvent = getCurrentEvent();
-        if(currentEvent == null)
+        if (currentEvent == null)
             return;
         currentEvent.isDraftComplete = true;
         Deck[] opponentDecks = currentEvent.getDraft().getComputerDecks();
@@ -558,7 +625,7 @@ public class AdventureDeckEditor extends FDeckEditor {
             currentEvent.participants[i].setDeck(opponentDecks[i]);
         }
         currentEvent.draftedDeck = (Deck) currentEvent.registeredDeck.copyTo("Draft Deck");
-        if (allowsAddBasic()) {
+        if (allowAddBasic()) {
             showAddBasicLandsDialog();
             //Might be annoying if you haven't pruned your deck yet, but best to remind player that
             //this probably needs to be done since it's there since it's not normally part of Adventure
@@ -624,9 +691,9 @@ public class AdventureDeckEditor extends FDeckEditor {
     private static final FImage AUTO_SELL_ICON = FSkinImage.HDEXILE; //to-maybe-do: Custom adventure icon for this? Adventure should really just have its own skin.
 
     public static FImage iconFromDeckSection(DeckSection deckSection) {
-        if(deckSection == DeckSection.Main)
+        if (deckSection == DeckSection.Main)
             return MAIN_DECK_ICON;
-        if(deckSection == DeckSection.Sideboard)
+        if (deckSection == DeckSection.Sideboard)
             return FDeckEditor.SIDEBOARD_ICON;
         return FDeckEditor.iconFromDeckSection(deckSection);
     }
@@ -656,6 +723,15 @@ public class AdventureDeckEditor extends FDeckEditor {
 //            if (currentEvent.registeredDeck!=null && !currentEvent.registeredDeck.isEmpty()){
 //                //Use this deck instead of selected deck
 //            }
+
+        for (TabPage<FDeckEditor> page : tabPages) {
+            if (page instanceof CollectionCatalogPage) {
+                if (!Current.player().getUnsupportedCards().isEmpty())
+                    GuiChoose.getChoices(Forge.getLocalizer().getMessage("lblRemoveAllUnsupportedCards"),
+                            -1, -1, Current.player().getUnsupportedCards(), result -> Current.player().getUnsupportedCards().clear());
+                break;
+            }
+        }
     }
 
     public void refresh() {
@@ -679,7 +755,7 @@ public class AdventureDeckEditor extends FDeckEditor {
     public AdventureDeckEditor(boolean createAsShop) {
         super(createAsShop ? new ShopConfig() : new AdventureEditorConfig(),
                 createAsShop ? null : Current.player().getSelectedDeck());
-        if(createAsShop)
+        if (createAsShop)
             setHeaderText(Forge.getLocalizer().getMessage("lblSell"));
     }
 
@@ -687,7 +763,7 @@ public class AdventureDeckEditor extends FDeckEditor {
         super(new AdventureEventEditorConfig(event), event.registeredDeck);
         currentEvent = event;
 
-        if(event.getDraft() != null && event.getDraft().shouldShowDraftLog()) {
+        if (event.getDraft() != null && event.getDraft().shouldShowDraftLog()) {
             this.draftLog = new FDraftLog();
             event.getDraft().setLogEntry(this.draftLog);
             deckHeader.initDraftLog(this.draftLog, this);
@@ -705,68 +781,58 @@ public class AdventureDeckEditor extends FDeckEditor {
     }
 
     @Override
-    protected FPopupMenu createMoreOptionsMenu() {
-        return new FPopupMenu() {
-            @Override
-            protected void buildMenu() {
-                Localizer localizer = Forge.getLocalizer();
-                addItem(new FMenuItem(localizer.getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, e1 -> FDeckViewer.copyDeckToClipboard(getDeck())));
-                if (allowsAddBasic()) {
-                    FMenuItem addBasic = new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, e1 -> showAddBasicLandsDialog());
-                    addItem(addBasic);
-                }
-                if(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.DEV_MODE_ENABLED)) {
-                    addItem(new FCheckBoxMenuItem(localizer.getMessage("cbEnforceDeckLegality"), shouldEnforceConformity(), e -> toggleConformity()));
-                    String devSuffix = " (" + localizer.getMessage("lblDev") + ")";
-                    addItem(new FMenuItem(localizer.getMessage("lblAddcard") + devSuffix, FSkinImage.HDPLUS, e -> showDevAddCardDialog()));
-                }
-                ((DeckEditorPage) getSelectedPage()).buildDeckMenu(this);
+    protected void addChosenBasicLands(CardPool landsToAdd) {
+        if (isLimitedEditor())
+            super.addChosenBasicLands(landsToAdd);
+
+        //Take the basic lands from the player's collection if they have them. If they need more, create unsellable copies.
+        CatalogPage catalog = getCatalogPage();
+        if (catalog != null) { // TODO find out why this is null on some devices since it shouldn't be null
+            CardPool requiredNewLands = new CardPool();
+            CardPool landsToMove = new CardPool();
+            ItemPool<PaperCard> availablePool = catalog.getCardPool();
+            for (Map.Entry<PaperCard, Integer> entry : landsToAdd) {
+                int needed = entry.getValue();
+                PaperCard card = entry.getKey();
+                int moveableSellable = Math.min(availablePool.count(card), needed);
+                landsToMove.add(card, moveableSellable);
+                needed -= moveableSellable;
+                if (needed <= 0)
+                    continue;
+                PaperCard unsellable = card.getNoSellVersion();
+                //It'd probably be better to do some kind of fuzzy search that matches prints but ignores flags.
+                //But for now, unsellable is the only one that should matter here.
+                int moveableUnsellable = Math.min(availablePool.count(unsellable), needed);
+                landsToMove.add(unsellable, needed); //We'll acquire the rest later.
+                if (needed > moveableUnsellable)
+                    requiredNewLands.add(unsellable, needed - moveableUnsellable);
             }
-        };
+            if (!requiredNewLands.isEmpty())
+                Current.player().addCards(requiredNewLands);
+            catalog.refresh();
+            catalog.moveCards(landsToMove, getMainDeckPage());
+        }
     }
 
     @Override
-    protected void addChosenBasicLands(CardPool landsToAdd) {
-        if(isLimitedEditor())
-            super.addChosenBasicLands(landsToAdd);
-        //Take the basic lands from the player's collection if they have them. If they need more, create unsellable copies.
-        CardPool requiredNewLands = new CardPool();
-        CardPool landsToMove = new CardPool();
-        CatalogPage catalog = getCatalogPage();
-        ItemPool<PaperCard> availablePool = catalog.getCardPool();
-        for(Map.Entry<PaperCard, Integer> entry : landsToAdd) {
-            int needed = entry.getValue();
-            PaperCard card = entry.getKey();
-            int moveableSellable = Math.min(availablePool.count(card), needed);
-            landsToMove.add(card, moveableSellable);
-            needed -= moveableSellable;
-            if(needed <= 0)
-                continue;
-            PaperCard unsellable = card.getNoSellVersion();
-            //It'd probably be better to do some kind of fuzzy search that matches prints but ignores flags.
-            //But for now, unsellable is the only one that should matter here.
-            int moveableUnsellable = Math.min(availablePool.count(unsellable), needed);
-            landsToMove.add(unsellable, needed); //We'll acquire the rest later.
-            if(needed > moveableUnsellable)
-                requiredNewLands.add(unsellable, needed - moveableUnsellable);
-        }
-        if(!requiredNewLands.isEmpty())
-            Current.player().addCards(requiredNewLands);
-        catalog.refresh();
-        catalog.moveCards(landsToMove, getMainDeckPage());
+    protected PaperCard supplyPrintForImporter(PaperCard missingCard) {
+        PaperCard out = super.supplyPrintForImporter(missingCard);
+        return out == null ? null : out.getNoSellVersion();
     }
 
     @Override
     protected void cacheTabPages() {
         super.cacheTabPages();
-        for(TabPage<FDeckEditor> page : tabPages) {
-            if(page instanceof CollectionAutoSellPage)
+        for (TabPage<FDeckEditor> page : tabPages) {
+            if (page instanceof CollectionAutoSellPage)
                 this.autoSellPage = (CollectionAutoSellPage) page;
         }
     }
 
     @Override
-    protected boolean allowsAddBasic() {
+    protected boolean allowAddBasic() {
+        if (getEditorConfig() instanceof DeckPreviewConfig)
+            return false;
         AdventureEventData currentEvent = getCurrentEvent();
         if (currentEvent == null)
             return true;
@@ -815,23 +881,17 @@ public class AdventureDeckEditor extends FDeckEditor {
     }
 
     @Override
-    public void onClose(final Callback<Boolean> canCloseCallback) {
-        if(canCloseCallback == null) {
+    public void onClose(final Consumer<Boolean> canCloseCallback) {
+        if (canCloseCallback == null) {
             resolveClose(null, true);
             return;
         }
 
         Localizer localizer = Forge.getLocalizer();
         if (isDrafting()) {
-            FOptionPane.showConfirmDialog(localizer.getMessage("lblEndAdventureEventConfirm"), localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false, new Callback<>() {
-                @Override
-                public void run(Boolean result) {
-                    resolveClose(canCloseCallback, result == true);
-                }
-            });
+            FOptionPane.showConfirmDialog(localizer.getMessage("lblEndAdventureEventConfirm"), localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false, result -> resolveClose(canCloseCallback, result == true));
             return;
-        }
-        else if(getEditorConfig().isLimited() || getDeck().isEmpty()) {
+        } else if (getEditorConfig().isLimited() || getDeck().isEmpty()) {
             resolveClose(canCloseCallback, true);
             return;
         }
@@ -840,31 +900,26 @@ public class AdventureDeckEditor extends FDeckEditor {
         if (deckError != null) {
             //Allow the player to close the editor with an invalid deck, but warn them that cards may be swapped out.
             String warning = localizer.getMessage("lblAdventureDeckError", deckError);
-            FOptionPane.showConfirmDialog(warning, localizer.getMessage("lblInvalidDeck"), false, new Callback<>() {
-                @Override
-                public void run(Boolean result) {
-                    resolveClose(canCloseCallback, result == true);
-                }
-            });
+            FOptionPane.showConfirmDialog(warning, localizer.getMessage("lblInvalidDeck"), false, result -> resolveClose(canCloseCallback, result == true));
             return;
         }
 
         resolveClose(canCloseCallback, true);
     }
 
-    private void resolveClose(final Callback<Boolean> canCloseCallback, boolean result) {
-        if(result) {
+    private void resolveClose(final Consumer<Boolean> canCloseCallback, boolean result) {
+        if (result) {
             Current.player().newCards.clear();
-            if(isDrafting())
+            if (isDrafting())
                 getCurrentEvent().eventStatus = AdventureEventController.EventStatus.Abandoned;
         }
-        if(canCloseCallback != null)
-            canCloseCallback.run(result);
+        if (canCloseCallback != null)
+            canCloseCallback.accept(result);
     }
 
     @Override
     protected void devAddCards(CardPool cards) {
-        if(!getEditorConfig().usePlayerInventory()) {
+        if (!getEditorConfig().usePlayerInventory()) {
             //Drafting.
             super.devAddCards(cards);
             return;
@@ -889,9 +944,9 @@ public class AdventureDeckEditor extends FDeckEditor {
         protected String getItemSuffix(Map.Entry<PaperCard, Integer> item) {
             PaperCard card = item.getKey();
             String parentSuffix = super.getItemSuffix(item);
-            if(card.hasNoSellValue()) {
+            if (card.hasNoSellValue()) {
                 String valueText = " [NO VALUE]";
-                if(parentSuffix == null)
+                if (parentSuffix == null)
                     return valueText;
                 return String.join(" ", valueText, parentSuffix);
             }
@@ -905,7 +960,7 @@ public class AdventureDeckEditor extends FDeckEditor {
                 public void drawValue(Graphics g, Map.Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) {
                     super.drawValue(g, value, font, foreColor, backColor, pressed, x, y, w, h);
 
-                    if(showPriceInfo()) {
+                    if (showPriceInfo()) {
                         float totalHeight = h + 2 * FList.PADDING;
                         float cardArtWidth = totalHeight * CardRenderer.CARD_ART_RATIO;
 
@@ -972,6 +1027,7 @@ public class AdventureDeckEditor extends FDeckEditor {
     }
 
     private static final AdventureDeckController ADVENTURE_DECK_CONTROLLER = new AdventureDeckController();
+
     /**
      * Barebones deck controller. Doesn't really need to do anything since Adventure Decks are updated in real time
      * while they're edited, and they're only saved when the adventure is saved.
@@ -983,29 +1039,41 @@ public class AdventureDeckEditor extends FDeckEditor {
         @Override
         public void setEditor(FDeckEditor editor) {
             this.editor = editor;
-            if(editor != null)
-               editor.notifyNewControllerModel();
-        }
-
-        @Override public void setDeck(Deck deck) {
-            this.currentDeck = deck;
-            if(editor != null)
+            if (editor != null)
                 editor.notifyNewControllerModel();
         }
-        @Override public Deck getDeck() { return currentDeck; }
-        @Override public void newDeck() {
+
+        @Override
+        public void setDeck(Deck deck) {
+            this.currentDeck = deck;
+            if (editor != null)
+                editor.notifyNewControllerModel();
+        }
+
+        @Override
+        public Deck getDeck() {
+            return currentDeck;
+        }
+
+        @Override
+        public void newDeck() {
             setDeck(new Deck("Adventure Deck"));
         }
 
         @Override
         public String getDeckDisplayName() {
-            if(currentDeck == null)
+            if (currentDeck == null)
                 return "New Deck";
             return currentDeck.getName();
         }
 
-        @Override public void notifyModelChanged() {} //
-        @Override public void exitWithoutSaving() {} //Too many external variables to just revert the deck. Not supported for now.
+        @Override
+        public void notifyModelChanged() {
+        } //
+
+        @Override
+        public void exitWithoutSaving() {
+        } //Too many external variables to just revert the deck. Not supported for now.
     }
 
     private static class AdventureEventDeckController implements IDeckController {
@@ -1019,26 +1087,40 @@ public class AdventureDeckEditor extends FDeckEditor {
         @Override
         public void setEditor(FDeckEditor editor) {
             this.editor = editor;
-            if(editor != null)
+            if (editor != null)
                 editor.notifyNewControllerModel();
         }
 
-        @Override public void setDeck(Deck deck) {this.newDeck();} //Deck is supplied by the event.
-        @Override public void newDeck() {
-            if(editor != null)
+        @Override
+        public void setDeck(Deck deck) {
+            this.newDeck();
+        } //Deck is supplied by the event.
+
+        @Override
+        public void newDeck() {
+            if (editor != null)
                 editor.notifyNewControllerModel();
         }
-        @Override public Deck getDeck() { return currentEvent.registeredDeck; }
+
+        @Override
+        public Deck getDeck() {
+            return currentEvent.registeredDeck;
+        }
 
         @Override
         public String getDeckDisplayName() {
-            if(getDeck() == null)
+            if (getDeck() == null)
                 return "Uninitialized Deck";
             return getDeck().getName();
         }
 
-        @Override public void notifyModelChanged() {} //
-        @Override public void exitWithoutSaving() {} //Too many external variables to just revert the deck. Not supported for now.
+        @Override
+        public void notifyModelChanged() {
+        } //
+
+        @Override
+        public void exitWithoutSaving() {
+        } //Too many external variables to just revert the deck. Not supported for now.
     }
 
 }
diff --git a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
index ba43cc72113..691dc35c0c4 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/ArenaScene.java
@@ -157,7 +157,7 @@ public class ArenaScene extends UIScene implements IAfterMatch {
     }
 
     @Override
-    public void setWinner(boolean winner) {
+    public void setWinner(boolean winner, boolean isArena) {
         enable = false;
         Array<ArenaRecord> winners = new Array<>();
         Array<EnemySprite> winnersEnemies = new Array<>();
diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
index a1f3e853834..a6da1bb0d81 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java
@@ -83,7 +83,7 @@ public class DeckSelectScene extends UIScene {
 
     private void layoutDeckButtons() {
         for (int i = 0; i < AdventurePlayer.current().getDeckCount(); i++)
-            addDeckButton(Forge.getLocalizer().getMessage("lblDeck") + ": " + (i + 1), i);
+            addDeckButton(i);
     }
 
     private void addDeck(){
@@ -144,6 +144,7 @@ public class DeckSelectScene extends UIScene {
     }
 
     private void updateDeckButton(int index) {
+        if (!buttons.containsKey(index)) addDeckButton(index);
         buttons.get(index).setText(Current.player().getDeck(index).getName());
         buttons.get(index).getTextraLabel().layout();
         buttons.get(index).layout();
@@ -177,8 +178,9 @@ public class DeckSelectScene extends UIScene {
         }
     }
 
-    private TextraButton addDeckButton(String name, int i) {
+    private TextraButton addDeckButton(int i) {
         TextraButton button = Controls.newTextButton("-");
+        String name = Forge.getLocalizer().getMessage("lblDeck") + ": " + (i + 1);
         button.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent event, float x, float y) {
diff --git a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
index 74afd0a9732..c974b02e9c1 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
@@ -39,7 +39,6 @@ import forge.sound.MusicPlaylist;
 import forge.toolbox.FOptionPane;
 import forge.trackable.TrackableCollection;
 import forge.util.Aggregates;
-import forge.util.Callback;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
@@ -143,7 +142,7 @@ public class DuelScene extends ForgeScene {
             Current.player().getStatistic().setResult(enemyName, winner);
 
             if (last instanceof IAfterMatch) {
-                ((IAfterMatch) last).setWinner(winner);
+                ((IAfterMatch) last).setWinner(winner, isArena);
             }
         });
     }
@@ -153,12 +152,9 @@ public class DuelScene extends ForgeScene {
     }
 
     private FOptionPane createFOption(String message, String title, FBufferedImage icon, Runnable runnable) {
-        return new FOptionPane(message, null, title, icon, null, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), -1, new Callback<Integer>() {
-            @Override
-            public void run(Integer result) {
-                if (runnable != null)
-                    runnable.run();
-            }
+        return new FOptionPane(message, null, title, icon, null, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), -1, result -> {
+            if (runnable != null)
+                runnable.run();
         });
     }
 
@@ -196,18 +192,21 @@ public class DuelScene extends ForgeScene {
     @Override
     public void enter() {
         GameHUD.getInstance().unloadAudio();
-        Set<GameType> appliedVariants = new HashSet<>();
+        GameType mainGameType;
+        boolean isDeckMissing = false;
+        String isDeckMissingMsg = "";
         if (eventData != null && eventData.eventRules != null) {
-            appliedVariants.add(eventData.eventRules.gameType);
+            mainGameType = eventData.eventRules.gameType;
         } else {
-            appliedVariants.add(GameType.Adventure);
+            mainGameType = GameType.Adventure;
         }
+        Set<GameType> appliedVariants = EnumSet.of(mainGameType);
 
         AdventurePlayer advPlayer = Current.player();
 
         List<RegisteredPlayer> players = new ArrayList<>();
 
-        applyAdventureDeckRules();
+        applyAdventureDeckRules(mainGameType.getDeckFormat());
         int playerCount = 1;
         EnemyData currentEnemy = enemy.getData();
         for (int i = 0; i < 8 && currentEnemy != null; i++) {
@@ -278,7 +277,7 @@ public class DuelScene extends ForgeScene {
 
         currentEnemy = enemy.getData();
         boolean bossBattle = currentEnemy.boss;
-        for (int i = 0; i < 8 && currentEnemy != null; i++) {
+        for (int i = 0; i < playerCount && currentEnemy != null; i++) {
             Deck deck;
 
             if (this.chaosBattle) { //random challenge for chaos mode
@@ -298,6 +297,12 @@ public class DuelScene extends ForgeScene {
             } else {
                 deck = currentEnemy.copyPlayerDeck ? this.playerDeck : currentEnemy.generateDeck(Current.player().isFantasyMode(), Current.player().isUsingCustomDeck() || Current.player().isHardorInsaneDifficulty());
             }
+            if (deck == null) {
+                isDeckMissing = true;
+                isDeckMissingMsg = "Deck for " + currentEnemy.getName() + " is missing! " + (this.eventData == null ? "Genetic AI deck will be used." : "Player deck will be used.");
+                System.err.println(isDeckMissingMsg);
+                deck = this.eventData == null ? Aggregates.random(DeckProxy.getAllGeneticAIDecks()).getDeck() : this.playerDeck;
+            }
             RegisteredPlayer aiPlayer = RegisteredPlayer.forVariants(playerCount, appliedVariants, deck, null, false, null, null);
 
             LobbyPlayer enemyPlayer = GamePlayerUtil.createAiPlayer(currentEnemy.getName(), selectAI(currentEnemy.ai));
@@ -371,9 +376,9 @@ public class DuelScene extends ForgeScene {
         hostedMatch.startMatch(rules, appliedVariants, players, guiMap, bossBattle ? MusicPlaylist.BOSS : MusicPlaylist.MATCH);
         MatchController.instance.setGameView(hostedMatch.getGameView());
         boolean showMessages = enemy.getData().boss || (enemy.getData().copyPlayerDeck && Current.player().isUsingCustomDeck());
-        if (chaosBattle || showMessages) {
+        if (chaosBattle || showMessages || isDeckMissing) {
             final FBufferedImage fb = getFBEnemyAvatar();
-            bossDialogue = createFOption(Forge.getLocalizer().getMessage("AdvBossIntro" + Aggregates.randomInt(1, 35)),
+            bossDialogue = createFOption(isDeckMissing ? isDeckMissingMsg : Forge.getLocalizer().getMessage("AdvBossIntro" + Aggregates.randomInt(1, 35)),
                     enemy.getName(), fb, fb::dispose);
             matchOverlay = new LoadingOverlay(() -> FThreads.delayInEDT(300, () -> FThreads.invokeInEdtNowOrLater(() ->
                     bossDialogue.show())), false, true);
@@ -397,16 +402,25 @@ public class DuelScene extends ForgeScene {
     private static final String PLACEHOLDER_ATTRACTION = "Coin-Operated Pony";
     private static final String PLACEHOLDER_CONTRAPTION = "Automatic Fidget Spinner";
 
-    private void applyAdventureDeckRules() {
+    private void applyAdventureDeckRules(DeckFormat format) {
         //Can't just keep the player from entering a battle if their deck is invalid. So instead we'll just edit their deck.
         CardPool mainSection = playerDeck.getMain(), attractions = playerDeck.get(DeckSection.Attractions), contraptions = playerDeck.get(DeckSection.Contraptions);
-        DeckFormat format = DeckFormat.Adventure;
 
         removeExcessCopies(mainSection, format);
         removeExcessCopies(attractions, format);
         removeExcessCopies(contraptions, format);
 
-        int missingCards = Config.instance().getConfigData().minDeckSize - mainSection.countAll();
+        int mainSize = mainSection.countAll();
+
+        int maxDeckSize = format == DeckFormat.Adventure ? Integer.MAX_VALUE : format.getMainRange().getMaximum();
+        int excessCards = mainSize - maxDeckSize;
+        if (excessCards > 0) {
+            List<PaperCard> removals = Aggregates.random(mainSection.toFlatList(), excessCards);
+            mainSection.removeAllFlat(removals);
+        }
+
+        int minDeckSize = format == DeckFormat.Adventure ? Config.instance().getConfigData().minDeckSize : format.getMainRange().getMinimum();
+        int missingCards = minDeckSize - mainSize;
         if (missingCards > 0) //Replace unknown cards for a Wastes.
             mainSection.add(PLACEHOLDER_MAIN, missingCards);
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java
index 0d7e692b61a..1c7c1828d6b 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/EventScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/EventScene.java
@@ -29,7 +29,6 @@ import forge.adventure.world.WorldSave;
 import forge.deck.Deck;
 import forge.gui.FThreads;
 import forge.screens.TransitionScreen;
-import forge.util.Callback;
 import forge.util.MyRandom;
 
 import java.util.Arrays;
@@ -52,6 +51,7 @@ public class EventScene extends MenuScene implements IAfterMatch {
     static PointOfInterestChanges changes;
 
     private Array<DialogData> entryDialog;
+    private AdventureEventData.AdventureEventMatch humanMatch = null;
 
     private int packsSelected = 0; //Used for meta drafts, booster drafts will use existing logic.
 
@@ -124,26 +124,17 @@ public class EventScene extends MenuScene implements IAfterMatch {
         //todo: add translation
         decline.name = "Do not enter event";
 
-        enterWithCoin.callback = new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
-                refresh();
-            }
+        enterWithCoin.callback = (result) -> {
+            currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
+            refresh();
         };
-        enterWithShards.callback = new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
-                refresh();
-            }
+        enterWithShards.callback = (result) -> {
+            currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
+            refresh();
         };
-        enterWithGold.callback = new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
-                refresh();
-            }
+        enterWithGold.callback = (result) -> {
+            currentEvent.eventStatus = AdventureEventController.EventStatus.Entered;
+            refresh();
         };
 
         introDialog.options = new DialogData[4];
@@ -500,7 +491,7 @@ public class EventScene extends MenuScene implements IAfterMatch {
     }
 
     public void startRound() {
-        for (AdventureEventData.AdventureEventMatch match : currentEvent.matches.get(currentEvent.currentRound)) {
+        for (AdventureEventData.AdventureEventMatch match : currentEvent.getMatches(currentEvent.currentRound)) {
             match.round = currentEvent.currentRound;
             if (match.winner != null) continue;
 
@@ -549,9 +540,7 @@ public class EventScene extends MenuScene implements IAfterMatch {
         }
     }
 
-    AdventureEventData.AdventureEventMatch humanMatch = null;
-
-    public void setWinner(boolean winner) {
+    public void setWinner(boolean winner, boolean isArena) {
         if (winner) {
             humanMatch.winner = humanMatch.p1;
             humanMatch.p1.wins++;
diff --git a/forge-gui-mobile/src/forge/adventure/scene/HudScene.java b/forge-gui-mobile/src/forge/adventure/scene/HudScene.java
index c832752a584..a157ad24fda 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/HudScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/HudScene.java
@@ -181,8 +181,8 @@ public abstract class HudScene extends Scene implements InputProcessor, IAfterMa
     }
 
     @Override
-    public void setWinner(boolean winner) {
-        stage.setWinner(winner);
+    public void setWinner(boolean winner, boolean isArena) {
+        stage.setWinner(winner, isArena);
     }
 
     public boolean isInHudOnlyMode() {
diff --git a/forge-gui-mobile/src/forge/adventure/scene/MenuScene.java b/forge-gui-mobile/src/forge/adventure/scene/MenuScene.java
index 41e1930bd73..4f8a1a1b1c3 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/MenuScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/MenuScene.java
@@ -157,7 +157,7 @@ public class MenuScene extends UIScene {
                         loadDialog(option);
 
                         if (option.callback != null) {
-                            option.callback.run(true);
+                            option.callback.accept(true);
                         }
                     });
                     B.getTextraLabel().setWrap(true); //We want this to wrap in case it's a wordy choice.
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
index dac7c6279ad..d91ece8176f 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
@@ -259,7 +259,7 @@ public class SettingsScene extends UIScene {
 
         if (!GuiBase.isAndroid()) {
             addCheckBox(Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"), ForgePreferences.FPref.UI_LIBGDX_TEXTURE_FILTERING);
-            addCheckBox(Forge.getLocalizer().getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
+            //addCheckBox(Forge.getLocalizer().getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
         } else {
             addCheckBox(Forge.getLocalizer().getMessage("lblLandscapeMode") + " (" +
                 Forge.getLocalizer().getMessage("lblRestartRequired") + ")",
diff --git a/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java b/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java
index 58f3bbdf5de..fc3ebbfe8f8 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/ShopScene.java
@@ -10,7 +10,6 @@ import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
 import forge.screens.FScreen;
 import forge.toolbox.FOptionPane;
-import forge.util.Callback;
 import forge.util.ItemPool;
 
 /**
@@ -65,12 +64,9 @@ public class ShopScene extends ForgeScene {
                 return;
             FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblSellAllConfirm", cards, profit),
                 Forge.getLocalizer().getMessage("lblAutoSellable"), Forge.getLocalizer().getMessage("lblSell"),
-                Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<Boolean>() {
-                    @Override
-                    public void run(Boolean result) {
-                        if (result) {
-                            doAutosell();
-                        }
+                Forge.getLocalizer().getMessage("lblCancel"), false, result -> {
+                    if (result) {
+                        doAutosell();
                     }
                 }
             );
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
index 31d77f9e2dd..690d7cbc271 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
@@ -401,7 +401,7 @@ public class SpellSmithScene extends UIScene {
         if (cost_low > -1) totalCost *= 2.5f; //And CMC cost multiplier.
 
         cardPool = StreamUtil.stream(P).collect(Collectors.toList());
-        poolSize.setText(((cardPool.size() > 0 ? "[/][FOREST]" : "[/][RED]")) + cardPool.size() + " possible card" + (cardPool.size() != 1 ? "s" : ""));
+        poolSize.setText(((cardPool.size() > 0 ? "[/][FOREST]" : "[/][RED]")) + cardPool.size() + " possible card" + (cardPool.size() > 1 ? "s" : ""));
         currentPrice = (int) totalCost;
         currentShardPrice = (int) (totalCost * 0.2f); //Intentionally rounding up via the cast to int
         pullUsingGold.setText("[+Pull][+goldcoin] "+ currentPrice);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/Console.java b/forge-gui-mobile/src/forge/adventure/stage/Console.java
index 2d320614c98..5bc67052d15 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/Console.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/Console.java
@@ -1,22 +1,26 @@
 package forge.adventure.stage;
 
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Array;
 import forge.Forge;
 import forge.adventure.util.Controls;
 
 public class Console extends Window {
     private final ScrollPane scroll;
-    private  String last = "";
+    private String last = "";
     private final InputLine input;
     private final Table content;
 
     public void toggle() {
-        if(isVisible()) {
+        if (isVisible()) {
             setVisible(false);
             getStage().unfocus(input);
+            Gdx.input.setOnscreenKeyboardVisible(false);
         } else {
             if (!Forge.advFreezePlayerControls) {
                 setVisible(true);
@@ -27,47 +31,117 @@ public class Console extends Window {
 
     static class InputLine extends TextField {
         private final Console console;
+        private final Array<String> commands = new Array<>();
+        private int index;
+        private final TextField textField;
 
         public InputLine(Console console) {
             super("", Controls.getSkin());
             this.console = console;
-            writeEnters=true;
+            writeEnters = true;
+            textField = this;
         }
 
         @Override
-        protected InputListener createInputListener () {
-            TextField self = this;
-            return new TextFieldClickListener()
-            {
+        protected InputListener createInputListener() {
+            return new TextFieldClickListener() {
                 @Override
-                public boolean keyTyped (InputEvent event, char character) {
-                // Disallow "typing" most ASCII control characters, which would show up as a space when onlyFontChars is true.
-                switch (character) {
-                    case BACKSPACE:
-                        break;
-                    case TAB:
-                        if(self.getText().isEmpty())
-                        {
-                            self.setText(console.last);
-                        }
-                        else
-                        {
-                            self.setText(console.complete(self.getText()));
-                            self.setCursorPosition(Integer.MAX_VALUE);
-                        }
-                        break;
-                    case NEWLINE:
-                    case CARRIAGE_RETURN:
-                        console.command(self.getText());
-                        self.setText("");
-                        return false;
-                    default:
-                        if (character < 32) return false;
+                public boolean keyUp(InputEvent event, int keycode) {
+                    switch (keycode) {
+                        case Input.Keys.UP:
+                            if (!textField.getText().isEmpty()) {
+                                index = commands.indexOf(textField.getText(), false) - 1;
+                                if (index >= 0 && index < commands.size) {
+                                    textField.setText(commands.get(index));
+                                    console.last = textField.getText();
+                                    index = commands.indexOf(console.last, false);
+                                    textField.setCursorPosition(Integer.MAX_VALUE);
+                                } else {
+                                    index = 0;
+                                    textField.setText(commands.get(index));
+                                    textField.setCursorPosition(Integer.MAX_VALUE);
+                                }
+                            } else if (!commands.isEmpty()) {
+                                textField.setText(commands.get(commands.size - 1));
+                                console.last = textField.getText();
+                                index = commands.indexOf(console.last, false);
+                                textField.setCursorPosition(Integer.MAX_VALUE);
+                            }
+                            break;
+                        case Input.Keys.DOWN:
+                            if (!textField.getText().isEmpty()) {
+                                index = commands.indexOf(textField.getText(), false) + 1;
+                                if (index >= 0 && index < commands.size) {
+                                    textField.setText(commands.get(index));
+                                    console.last = textField.getText();
+                                    index = commands.indexOf(console.last, false);
+                                    textField.setCursorPosition(Integer.MAX_VALUE);
+                                } else {
+                                    index = commands.size - 1;
+                                    textField.setText(commands.get(index));
+                                    textField.setCursorPosition(Integer.MAX_VALUE);
+                                }
+                            } else if (!commands.isEmpty()) {
+                                textField.setText(commands.get(0));
+                                console.last = textField.getText();
+                                index = commands.indexOf(console.last, false);
+                                textField.setCursorPosition(Integer.MAX_VALUE);
+                            }
+                            break;
+                        case Input.Keys.LEFT:
+                            if (!textField.getText().isEmpty()) {
+                                if ((textField.getCursorPosition() - 1) >= 0)
+                                    textField.setCursorPosition(textField.getCursorPosition() - 1);
+                            }
+                            break;
+                        case Input.Keys.RIGHT:
+                            if (!textField.getText().isEmpty()) {
+                                if ((textField.getCursorPosition() + 1) <= textField.getText().length())
+                                    textField.setCursorPosition(textField.getCursorPosition() + 1);
+                            }
+                            break;
+                        case Input.Keys.V:
+                            if (Gdx.input.isKeyPressed(Input.Keys.CONTROL_LEFT)) {
+                                if (Forge.getClipboard().hasContents()) {
+                                    textField.appendText(Forge.getClipboard().getContents());
+                                    textField.setCursorPosition(Integer.MAX_VALUE);
+                                }
+                            }
+                        default:
+                            break;
+                    }
+                    return super.keyUp(event, keycode);
                 }
-                return super.keyTyped(event,character);
+
+                @Override
+                public boolean keyTyped(InputEvent event, char character) {
+                    // Disallow "typing" most ASCII control characters, which would show up as a space when onlyFontChars is true.
+                    switch (character) {
+                        case BACKSPACE:
+                            break;
+                        case TAB:
+                            if (textField.getText().isEmpty()) {
+                                textField.setText(console.last);
+                            } else {
+                                textField.setText(console.complete(textField.getText()));
+                                textField.setCursorPosition(Integer.MAX_VALUE);
+                            }
+                            break;
+                        case NEWLINE:
+                        case CARRIAGE_RETURN:
+                            commands.add(textField.getText());
+                            console.command(textField.getText());
+                            textField.setText("");
+                            return false;
+                        default:
+                            if (character < 32)
+                                return false;
+                    }
+                    return super.keyTyped(event, character);
                 }
             };
         }
+
     }
 
     private String complete(String text) {
@@ -79,13 +153,13 @@ public class Console extends Window {
             toggle();
             return;
         }
-        Cell<Label> newLine=content.add(text);
-        newLine.getActor().setColor(1,1,1,1);
-        newLine.growX().align(Align.left|Align.bottom).row();
+        Cell<Label> newLine = content.add(text);
+        newLine.getActor().setColor(1, 1, 1, 1);
+        newLine.growX().align(Align.left | Align.bottom).row();
         last = text; //Preserve last command.
-        newLine=content.add(ConsoleCommandInterpreter.getInstance().command(text));
-        newLine.getActor().setColor(0.6f,0.6f,0.6f,1);
-        newLine.growX().align(Align.left|Align.bottom).row();
+        newLine = content.add(ConsoleCommandInterpreter.getInstance().command(text));
+        newLine.getActor().setColor(0.6f, 0.6f, 0.6f, 1);
+        newLine.growX().align(Align.left | Align.bottom).row();
         scroll.layout();
         scroll.scrollTo(0, 0, 0, 0);
     }
@@ -93,8 +167,8 @@ public class Console extends Window {
     public Console() {
         super("", Controls.getSkin());
         content = new Table(Controls.getSkin());
-        input   = new InputLine(this);
-        scroll  = new ScrollPane(content,new ScrollPane.ScrollPaneStyle());
+        input = new InputLine(this);
+        scroll = new ScrollPane(content, new ScrollPane.ScrollPaneStyle());
 
         add(scroll).grow().row();
         add(input).growX();
diff --git a/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java b/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
index 40a7743d82b..924d3e6e46e 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
@@ -207,7 +207,7 @@ public class ConsoleCommandInterpreter {
         });
         registerCommand(new String[]{"leave"}, s -> {
             if (!MapStage.getInstance().isInMap()) return "not on a map";
-            MapStage.getInstance().exitDungeon(false);
+            MapStage.getInstance().exitDungeon(false, false);
             return "Got out";
         });
         registerCommand(new String[]{"debug", "collision"}, s -> {
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index c83a83a40e3..927491c7d87 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -893,7 +893,7 @@ public class GameHUD extends Stage {
             @Override
             public boolean act(float v) {
                 if (exitDungeon) {
-                    MapStage.getInstance().exitDungeon(false);
+                    MapStage.getInstance().exitDungeon(false, false);
                     setDisabled(exitToWorldMapActor, true, "[%120][+ExitToWorldMap]", "\u2613");
                     setDisabled(bookmarkActor, true, "[%120][+Bookmark]", "\u2613");
                 }
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameStage.java b/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
index 5dbacf8604b..398a4102592 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameStage.java
@@ -74,8 +74,8 @@ public abstract class GameStage extends Stage {
     private float touchY = -1;
     private final float timer = 0;
     private float animationTimeout = 0;
-    public static float maximumScrollDistance=1.5f;
-    public static float minimumScrollDistance=0.3f;
+    public static float maximumScrollDistance = 1.5f;
+    public static float minimumScrollDistance = 0.3f;
 
     private String extraAnnouncement = "";
 
@@ -97,8 +97,9 @@ public abstract class GameStage extends Stage {
     public void setDialogStage(Stage dialogStage) {
         this.dialogStage = dialogStage;
     }
+
     public void showDialog() {
-        if (dialogStage == null){
+        if (dialogStage == null) {
             setDialogStage(GameHUD.getInstance());
         }
         GameHUD.getInstance().playerIdle();
@@ -123,6 +124,7 @@ public abstract class GameStage extends Stage {
 
     /**
      * Triggered when the hud is showing a dialog, which is tracked separately
+     *
      * @param isShowing Whether a dialog is currently showing
      */
     public void hudIsShowingDialog(boolean isShowing) {
@@ -248,24 +250,21 @@ public abstract class GameStage extends Stage {
         showDialog();
     }
 
-    
 
     public boolean axisMoved(Controller controller, int axisIndex, float value) {
 
-        if (MapStage.getInstance().isDialogOnlyInput()||isPaused()) {
+        if (MapStage.getInstance().isDialogOnlyInput() || isPaused()) {
             return true;
         }
         player.getMovementDirection().x = controller.getAxis(0);
         player.getMovementDirection().y = -controller.getAxis(1);
-        if(player.getMovementDirection().len()<0.2)
-        {
+        if (player.getMovementDirection().len() < 0.2) {
             player.stop();
         }
         return true;
     }
 
-    enum PlayerModification
-    {
+    enum PlayerModification {
         Sprint,
         Hide,
         Fly
@@ -273,29 +272,32 @@ public abstract class GameStage extends Stage {
     }
 
 
-    HashMap<PlayerModification,Float> currentModifications=new HashMap<>();
-    public void modifyPlayer(PlayerModification mod,float value) {
-        float currentValue=0;
-        if(currentModifications.containsKey(mod))
-        {
-            currentValue=currentModifications.get(mod);
+    HashMap<PlayerModification, Float> currentModifications = new HashMap<>();
+
+    public void modifyPlayer(PlayerModification mod, float value) {
+        float currentValue = 0;
+        if (currentModifications.containsKey(mod)) {
+            currentValue = currentModifications.get(mod);
         }
-        currentModifications.put(mod,currentValue+value);
+        currentModifications.put(mod, currentValue + value);
     }
 
     public void flyFor(float value) {
-        modifyPlayer(PlayerModification.Fly,value);
+        modifyPlayer(PlayerModification.Fly, value);
         player.playEffect(Paths.EFFECT_FLY);
     }
+
     public void hideFor(float value) {
-        modifyPlayer(PlayerModification.Hide,value);
-        player.setColor(player.getColor().r,player.getColor().g,player.getColor().b,0.5f);
+        modifyPlayer(PlayerModification.Hide, value);
+        player.setColor(player.getColor().r, player.getColor().g, player.getColor().b, 0.5f);
         player.playEffect(Paths.EFFECT_HIDE);
     }
+
     public void sprintFor(float value) {
-        modifyPlayer(PlayerModification.Sprint,value);
+        modifyPlayer(PlayerModification.Sprint, value);
         player.playEffect(Paths.EFFECT_SPRINT);
     }
+
     public void startPause(float i) {
         startPause(i, null);
     }
@@ -305,6 +307,7 @@ public abstract class GameStage extends Stage {
         animationTimeout = i;
         player.setMovementDirection(Vector2.Zero);
     }
+
     public boolean isPaused() {
         return animationTimeout > 0;
     }
@@ -330,7 +333,7 @@ public abstract class GameStage extends Stage {
         dialog = Controls.newDialog("");
     }
 
-    public void setWinner(boolean b) {
+    public void setWinner(boolean b, boolean a) {
     }
 
     public void setBounds(float width, float height) {
@@ -365,15 +368,13 @@ public abstract class GameStage extends Stage {
             animationTimeout -= delta;
             return;
         }
-        Array<PlayerModification> modsToRemove=new Array<>();
-        for(Map.Entry<PlayerModification, Float> mod:currentModifications.entrySet())
-        {
-            mod.setValue(mod.getValue()-delta);
-            if(mod.getValue()<0)
+        Array<PlayerModification> modsToRemove = new Array<>();
+        for (Map.Entry<PlayerModification, Float> mod : currentModifications.entrySet()) {
+            mod.setValue(mod.getValue() - delta);
+            if (mod.getValue() < 0)
                 modsToRemove.add(mod.getKey());
         }
-        for(PlayerModification mod:modsToRemove)
-        {
+        for (PlayerModification mod : modsToRemove) {
             currentModifications.remove(mod);
             onRemoveEffect(mod);
         }
@@ -408,10 +409,9 @@ public abstract class GameStage extends Stage {
     }
 
     private void onRemoveEffect(PlayerModification mod) {
-        switch (mod)
-        {
+        switch (mod) {
             case Hide:
-                player.setColor(player.getColor().r,player.getColor().g,player.getColor().b,1f);
+                player.setColor(player.getColor().r, player.getColor().g, player.getColor().b, 1f);
                 break;
             case Fly:
                 player.removeEffect(Paths.EFFECT_FLY);
@@ -430,20 +430,16 @@ public abstract class GameStage extends Stage {
         super.keyDown(keycode);
         if (isPaused())
             return true;
-        if (KeyBinding.Left.isPressed(keycode))
-        {
+        if (KeyBinding.Left.isPressed(keycode)) {
             player.getMovementDirection().x = -1;
         }
-        if (KeyBinding.Right.isPressed(keycode) )
-        {
+        if (KeyBinding.Right.isPressed(keycode)) {
             player.getMovementDirection().x = +1;
         }
-        if (KeyBinding.Up.isPressed(keycode))
-        {
+        if (KeyBinding.Up.isPressed(keycode)) {
             player.getMovementDirection().y = +1;
         }
-        if (KeyBinding.Down.isPressed(keycode))
-        {
+        if (KeyBinding.Down.isPressed(keycode)) {
             player.getMovementDirection().y = -1;
         }
         if (keycode == Input.Keys.F5)//todo config
@@ -483,9 +479,8 @@ public abstract class GameStage extends Stage {
             if (GameHUD.getInstance().isDebugMap()) {
                 TileMapScene S = TileMapScene.instance();
                 PointOfInterestData P = PointOfInterestData.getPointOfInterest("DEBUGZONE");
-                if( P != null)
-                {
-                    PointOfInterest PoI = new PointOfInterest(P,new Vector2(0,0), MyRandom.getRandom());
+                if (P != null) {
+                    PointOfInterest PoI = new PointOfInterest(P, new Vector2(0, 0), MyRandom.getRandom());
                     S.load(PoI);
                     Forge.switchScene(S);
                 }
@@ -571,14 +566,12 @@ public abstract class GameStage extends Stage {
     public boolean keyUp(int keycode) {
         if (isPaused())
             return true;
-        if (KeyBinding.Left.isPressed(keycode)||KeyBinding.Right.isPressed(keycode))
-        {
+        if (KeyBinding.Left.isPressed(keycode) || KeyBinding.Right.isPressed(keycode)) {
             player.getMovementDirection().x = 0;
             if (!player.isMoving())
                 stop();
         }
-        if (KeyBinding.Down.isPressed(keycode)||KeyBinding.Up.isPressed(keycode))
-        {
+        if (KeyBinding.Down.isPressed(keycode) || KeyBinding.Up.isPressed(keycode)) {
             player.getMovementDirection().y = 0;
             if (!player.isMoving())
                 stop();
@@ -658,17 +651,16 @@ public abstract class GameStage extends Stage {
         return Vector2.Zero.cpy();
     }
 
-    protected void teleported(Vector2 position)
-    {
+    protected void teleported(Vector2 position) {
 
     }
+
     public void setPosition(Vector2 position) {
         getPlayerSprite().setPosition(position);
         teleported(position);
     }
 
-    public void resetPlayerLocation()
-    {
+    public void resetPlayerLocation() {
         PointOfInterest poi = Current.world().findPointsOfInterest("Spawn");
         if (poi != null) {
             Forge.advFreezePlayerControls = true;
@@ -677,7 +669,7 @@ public abstract class GameStage extends Stage {
             Timer.schedule(new Timer.Task() {
                 @Override
                 public void run() {
-                showImageDialog(Current.generateDefeatMessage(), getDefeatBadge(),
+                showImageDialog(Current.generateDefeatMessage(true), getDefeatBadge(),
                     () -> FThreads.invokeInEdtNowOrLater(() -> Forge.setTransitionScreen(new CoverScreen(() -> {
                         Forge.advFreezePlayerControls = false;
                         WorldStage.getInstance().setPosition(new Vector2(poi.getPosition().x - 16f, poi.getPosition().y + 16f));
@@ -689,6 +681,21 @@ public abstract class GameStage extends Stage {
             }, 1f);
         }//Spawn shouldn't be null
     }
+
+    public void defeatedFromBoss() {
+        if (!Current.player().hasEquippedItem())
+            return;
+        Forge.advFreezePlayerControls = true;
+        getPlayerSprite().setAnimation(CharacterSprite.AnimationTypes.Hit);
+        getPlayerSprite().playEffect(Paths.EFFECT_BLOOD, 0.5f);
+        Timer.schedule(new Timer.Task() {
+            @Override
+            public void run() {
+                showImageDialog(Current.generateDefeatMessage(false), getDefeatBadge(), () -> Forge.advFreezePlayerControls = false);
+            }
+        }, 1f);
+    }
+
     private FBufferedImage getDefeatBadge() {
         FileHandle defeat = Config.instance().getFile("ui/defeat.png");
         if (defeat.exists()) {
diff --git a/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java b/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
index 08494e82760..941a367d5de 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/IAfterMatch.java
@@ -1,5 +1,5 @@
 package forge.adventure.stage;
 
 public interface IAfterMatch {
-    void setWinner(boolean winner);
+    void setWinner(boolean winner, boolean isArena);
 }
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index 3b408bcd475..11e8b744e16 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -608,7 +608,7 @@ public class MapStage extends GameStage {
                         }));
                         break;
                     case "exit":
-                        addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false)));
+                        addMapActor(obj, new OnCollide(() -> MapStage.this.exitDungeon(false, false)));
                         break;
                     case "dialog":
                         if (obj instanceof TiledMapTileMapObject) {
@@ -760,7 +760,7 @@ public class MapStage extends GameStage {
         return InnScene.instance(TileMapScene.instance(), TileMapScene.instance().rootPoint.getID(), changes, localInnID);
     }
 
-    public boolean exitDungeon(boolean defeated) {
+    public boolean exitDungeon(boolean defeated, boolean defeatedByBoss) {
         AdventureQuestController.instance().updateQuestsLeave();
         clearIsInMap();
         AdventureQuestController.instance().showQuestDialogs(this);
@@ -768,6 +768,8 @@ public class MapStage extends GameStage {
         effect = null; //Reset dungeon effects.
         if (defeated)
             WorldStage.getInstance().resetPlayerLocation();
+        else if (defeatedByBoss)
+            WorldStage.getInstance().defeatedFromBoss();
         Forge.switchScene(GameScene.instance());
         isPlayerLeavingDungeon = false;
         dialogOnlyInput = false;
@@ -776,7 +778,7 @@ public class MapStage extends GameStage {
 
 
     @Override
-    public void setWinner(boolean playerWins) {
+    public void setWinner(boolean playerWins, boolean isArena) {
         isLoadingMatch = false;
         freezeAllEnemyBehaviors = true;
         if (playerWins) {
@@ -815,16 +817,16 @@ public class MapStage extends GameStage {
                 boolean defeated = Current.player().defeated();
                 //If hardcore mode is added, check and redirect to game over screen here
                 if (canFailDungeon && !defeated)
-                    dungeonFailedDialog(true);
+                    dungeonFailedDialog(true, currentMob.getData().boss && !isArena);
                 else
-                    exitDungeon(defeated);
+                    exitDungeon(defeated, currentMob.getData().boss && !isArena);
                 MapStage.this.stop();
                 currentMob = null;
             });
         }
     }
 
-    private void dungeonFailedDialog(boolean exit) {
+    private void dungeonFailedDialog(boolean exit, boolean defeatedByBoss) {
         dialog.getButtonTable().clear();
         dialog.getContentTable().clear();
         dialog.clearListeners();
@@ -844,7 +846,7 @@ public class MapStage extends GameStage {
                 L.skipToTheEnd();
                 super.clicked(event, x, y);
                 if (exit)
-                    exitDungeon(false);
+                    exitDungeon(false, defeatedByBoss);
             }
         });
         dialog.getButtonTable().add(ok).width(240f);
diff --git a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
index 284ab62286b..2cdc86cee7e 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/WorldStage.java
@@ -162,7 +162,7 @@ public class WorldStage extends GameStage implements SaveFileContent {
     }
 
     @Override
-    public void setWinner(boolean playerIsWinner) {
+    public void setWinner(boolean playerIsWinner, boolean isArena) {
         if (playerIsWinner) {
             currentMob.clearCollisionHeight();
             Current.player().win();
@@ -192,10 +192,13 @@ public class WorldStage extends GameStage implements SaveFileContent {
                 boolean defeated = Current.player().defeated();
                 AdventureQuestController.instance().updateQuestsLose(currentMob);
                 AdventureQuestController.instance().showQuestDialogs(MapStage.getInstance());
+                boolean defeatedFromBoss = currentMob.getData().boss && !isArena;
                 WorldStage.this.removeEnemy(currentMob);
                 currentMob = null;
                 if (defeated) {
                     WorldStage.getInstance().resetPlayerLocation();
+                } else if (defeatedFromBoss) {
+                    WorldStage.getInstance().defeatedFromBoss();
                 }
             });
         }
diff --git a/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java b/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
index bc57fc631ac..7a9cd093f88 100644
--- a/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
+++ b/forge-gui-mobile/src/forge/adventure/util/AdventureEventController.java
@@ -1,10 +1,10 @@
 package forge.adventure.util;
 
-import com.badlogic.gdx.utils.Array;
 import forge.StaticData;
 import forge.adventure.data.AdventureEventData;
 import forge.adventure.player.AdventurePlayer;
 import forge.adventure.pointofintrest.PointOfInterestChanges;
+import forge.card.CardEdition;
 import forge.deck.Deck;
 import forge.item.BoosterPack;
 import forge.item.PaperCard;
@@ -20,11 +20,9 @@ import java.time.LocalDate;
 import java.util.*;
 
 public class AdventureEventController implements Serializable {
-
     public void finalizeEvent(AdventureEventData completedEvent) {
         Current.player().getStatistic().setResult(completedEvent);
         Current.player().removeEvent(completedEvent);
-
     }
 
     public enum EventFormat {
@@ -47,13 +45,13 @@ public class AdventureEventController implements Serializable {
     }
 
     public enum EventStatus {
-        Available, //New event
-        Entered, //Entry fee paid, deck not locked in
-        Ready,   //Deck is registered but can still be edited
-        Started, //Matches available
-        Completed, //All matches complete, rewards pending
-        Awarded, //Rewards distributed
-        Abandoned //Ended without completing all matches
+        Available, // New event
+        Entered,   // Entry fee paid, deck not locked in
+        Ready,     // Deck is registered but can still be edited
+        Started,   // Matches available
+        Completed, // All matches complete, rewards pending
+        Awarded,   // Rewards distributed
+        Abandoned  // Ended without completing all matches
     }
 
     private static AdventureEventController object;
@@ -69,16 +67,7 @@ public class AdventureEventController implements Serializable {
 
     }
 
-    private transient Array<AdventureEventData> allEvents = new Array<>();
-    private Map<String, Long> nextEventDate = new HashMap<>();
-
-    public AdventureEventController(AdventureEventController other) {
-        if (object == null) {
-            object = this;
-        } else {
-            System.out.println("Could not initialize AdventureEventController. An instance already exists and cannot be merged.");
-        }
-    }
+    private final Map<String, Long> nextEventDate = new HashMap<>();
 
     public static void clear() {
         object = null;
@@ -86,7 +75,7 @@ public class AdventureEventController implements Serializable {
 
     public AdventureEventData createEvent(EventStyle style, String pointID) {
         if (nextEventDate.containsKey(pointID) && nextEventDate.get(pointID) >= LocalDate.now().toEpochDay()) {
-            //No event currently available here
+            // No event currently available here
             return null;
         }
 
@@ -94,8 +83,9 @@ public class AdventureEventController implements Serializable {
         Random random = new Random(eventSeed);
 
         AdventureEventData e;
-        // TODO After a certain amount of wins, stop offering jump start events
-        if (random.nextInt(10) <= 2) {
+        // After a certain number of wins, stop offering Jumpstart events
+        if (Current.player().getStatistic().totalWins() < 10 &&
+                random.nextInt(10) <= 2) {
             e = new AdventureEventData(eventSeed, EventFormat.Jumpstart, style);
         } else {
             e = new AdventureEventData(eventSeed, EventFormat.Draft, style);
@@ -131,9 +121,27 @@ public class AdventureEventController implements Serializable {
     }
 
     public void initializeEvent(AdventureEventData e, String pointID, int eventOrigin, PointOfInterestChanges changes) {
+        // If the chosen event seed recommends a four-person pod, run it as a RoundRobin
+        // Set can be null when it is only a meta set such as some Jumpstart events.
+        ///TODO: Move some of this into the event
+        CardEdition firstSet = e.cardBlock.getSets().isEmpty() ? null : e.cardBlock.getSets().get(0);
+        int podSize = firstSet == null ? 8 : firstSet.getDraftOptions().getRecommendedPodSize();
+
         e.sourceID = pointID;
         e.eventOrigin = eventOrigin;
-        e.eventRules = new AdventureEventData.AdventureEventRules(e.format, changes == null ? 1f : changes.getTownPriceModifier());
+        if(podSize == 4)
+            e.style = EventStyle.RoundRobin;
+
+        AdventureEventData.PairingStyle pairingStyle;
+        if (e.style == EventStyle.RoundRobin) {
+            pairingStyle = AdventureEventData.PairingStyle.RoundRobin;
+        } else {
+            pairingStyle = AdventureEventData.PairingStyle.SingleElimination;
+        }
+
+        e.eventRules = new AdventureEventData.AdventureEventRules(e.format, pairingStyle, changes == null ? 1f : changes.getTownPriceModifier());
+
+        e.generateParticipants(podSize - 1); //-1 to account for the player
 
         AdventurePlayer.current().addEvent(e);
         nextEventDate.put(pointID, LocalDate.now().toEpochDay() + new Random().nextInt(2)); //next local event availability date
@@ -148,8 +156,7 @@ public class AdventureEventController implements Serializable {
         output.setComment(setCode);
         return output;
     }
-    public Deck generateBoosterByColor(String color)
-    {
+    public Deck generateBoosterByColor(String color) {
         List<PaperCard> cards = BoosterPack.fromColor(color).getCards();
         Deck output = new Deck();
         output.getMain().add(cards);
@@ -160,8 +167,8 @@ public class AdventureEventController implements Serializable {
     }
 
     public List<Deck> getJumpstartBoosters(CardBlock block, int count) {
-        //Get all candidates then remove at random until no more than count are included
-        //This will prevent duplicate choices within a round of a Jumpstart draft
+        // Get all candidates, then remove at random until no more than count are included
+        // This will prevent duplicate choices within a round of a Jumpstart draft
         List<Deck> packsAsDecks = new ArrayList<>();
         for (SealedTemplate template : StaticData.instance().getSpecialBoosters()) {
             if (!template.getEdition().contains(block.getLandSet().getCode()))
diff --git a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java
index 95735027514..7e551f2f407 100644
--- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java
+++ b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java
@@ -9,6 +9,8 @@ import forge.adventure.data.GeneratedDeckData;
 import forge.adventure.data.GeneratedDeckTemplateData;
 import forge.adventure.data.RewardData;
 import forge.card.*;
+import forge.card.DeckHints.Type;
+import forge.card.mana.ManaCost;
 import forge.card.mana.ManaCostShard;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -36,32 +38,32 @@ import static forge.adventure.data.RewardData.generateAllCards;
  */
 public class CardUtil {
     public static final class CardPredicate implements Predicate<PaperCard> {
-        enum ColorType
-        {
+        enum ColorType {
             Any,
             Colorless,
             MultiColor,
             MonoColor
         }
-        private final List<CardRarity> rarities=new ArrayList<>();
-        private final List<String> editions=new ArrayList<>();
-        private final List<String> subType=new ArrayList<>();
-        private final List<String> keyWords=new ArrayList<>();
-        private final List<CardType.CoreType> type=new ArrayList<>();
-        private final List<CardType.Supertype> superType=new ArrayList<>();
-        private final List<Integer> manaCosts =new ArrayList<>();
+
+        private final List<CardRarity> rarities = new ArrayList<>();
+        private final List<String> editions = new ArrayList<>();
+        private final List<String> subType = new ArrayList<>();
+        private final List<String> keyWords = new ArrayList<>();
+        private final List<CardType.CoreType> type = new ArrayList<>();
+        private final List<CardType.Supertype> superType = new ArrayList<>();
+        private final List<Integer> manaCosts = new ArrayList<>();
         private final Pattern text;
         private final boolean matchAllSubTypes;
         private final boolean matchAllColors;
-        private  int colors;
+        private int colors;
         private final ColorType colorType;
         private final boolean shouldBeEqual;
-        private final List<String> deckNeeds=new ArrayList<>();
+        private final List<String> deckNeeds = new ArrayList<>();
         private final String minDate;
         private final static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 
         private static Date parseDate(String date) {
-            if( date.length() <= 7 )
+            if (date.length() <= 7)
                 date = date + "-01";
             try {
                 return formatter.parse(date);
@@ -72,12 +74,12 @@ public class CardUtil {
 
         @Override
         public boolean test(final PaperCard card) {
-            if(!this.rarities.isEmpty()&&!this.rarities.contains(card.getRarity()))
+            if (!this.rarities.isEmpty() && !this.rarities.contains(card.getRarity()))
                 return !this.shouldBeEqual;
-            if(!this.editions.isEmpty()&&!this.editions.contains(card.getEdition())) {
+            if (!this.editions.isEmpty() && !this.editions.contains(card.getEdition())) {
                 boolean found = false;
                 List<PaperCard> allPrintings = FModel.getMagicDb().getCommonCards().getAllCards(card.getCardName());
-                for (PaperCard c : allPrintings){
+                for (PaperCard c : allPrintings) {
                     if (this.editions.contains(c.getEdition())) {
                         found = true;
                         break;
@@ -86,7 +88,7 @@ public class CardUtil {
                 if (!found)
                     return !this.shouldBeEqual;
             }
-            if(!this.minDate.isEmpty()) {
+            if (!this.minDate.isEmpty()) {
                 boolean found = false;
                 List<PaperCard> allPrintings = FModel.getMagicDb().getCommonCards().getAllCards(card.getCardName());
                 List<CardEdition> cardEditionList = new ArrayList<>();
@@ -99,7 +101,7 @@ public class CardUtil {
                     cardEditionList.add(e);
                 }
 
-                for (PaperCard c : allPrintings){
+                for (PaperCard c : allPrintings) {
                     for (CardEdition e : cardEditionList) {
                         if (e.getCode().equals(c.getEdition())) {
                             found = true;
@@ -110,144 +112,120 @@ public class CardUtil {
                 if (!found)
                     return !this.shouldBeEqual;
             }
-            if(!this.manaCosts.isEmpty()&&!this.manaCosts.contains(card.getRules().getManaCost().getCMC()))
+            if (!this.manaCosts.isEmpty() && !this.manaCosts.contains(card.getRules().getManaCost().getCMC()))
                 return !this.shouldBeEqual;
-            if(this.text!=null&& !this.text.matcher(card.getRules().getOracleText()).find())
+            if (this.text != null && !this.text.matcher(card.getRules().getOracleText()).find())
                 return !this.shouldBeEqual;
 
-            if(this.matchAllColors)
-            {
-                if(!card.getRules().getColor().hasAllColors(this.colors))
-                {
+            if (this.matchAllColors) {
+                if (!card.getRules().getColor().hasAllColors(this.colors)) {
                     return !this.shouldBeEqual;
                 }
             }
 
-            if(this.colors!= MagicColor.ALL_COLORS)
-            {
-                if(!card.getRules().getColor().hasNoColorsExcept(this.colors)||(this.colors != MagicColor.COLORLESS && card.getRules().getColor().isColorless()))
+            if (this.colors != MagicColor.ALL_COLORS) {
+                if (!card.getRules().getColor().hasNoColorsExcept(this.colors)
+                        || (this.colors != MagicColor.COLORLESS && card.getRules().getColor().isColorless()))
                     return !this.shouldBeEqual;
             }
-            if(colorType!=ColorType.Any)
-            {
-                switch (colorType)
-                {
+            if (colorType != ColorType.Any) {
+                switch (colorType) {
                     case Colorless:
-                        if(!card.getRules().getColor().isColorless())
+                        if (!card.getRules().getColor().isColorless())
                             return !this.shouldBeEqual;
                         break;
                     case MonoColor:
-                        if(!card.getRules().getColor().isMonoColor())
+                        if (!card.getRules().getColor().isMonoColor())
                             return !this.shouldBeEqual;
                         break;
                     case MultiColor:
-                        if(!card.getRules().getColor().isMulticolor())
+                        if (!card.getRules().getColor().isMulticolor())
                             return !this.shouldBeEqual;
                         break;
                 }
             }
-            if(!this.type.isEmpty())
-            {
-                boolean found=false;
-                for(CardType.CoreType type:card.getRules().getType().getCoreTypes())
-                {
-                    if(this.type.contains(type))
-                    {
-                        found=true;
+            if (!this.type.isEmpty()) {
+                boolean found = false;
+                for (CardType.CoreType type : card.getRules().getType().getCoreTypes()) {
+                    if (this.type.contains(type)) {
+                        found = true;
                         break;
                     }
                 }
-                if(!found)
+                if (!found)
                     return !this.shouldBeEqual;
             }
-            if(!this.superType.isEmpty())
-            {
-                boolean found=false;
-                for(CardType.Supertype type:card.getRules().getType().getSupertypes())
-                {
-                    if(this.superType.contains(type))
-                    {
-                        found=true;
+            if (!this.superType.isEmpty()) {
+                boolean found = false;
+                for (CardType.Supertype type : card.getRules().getType().getSupertypes()) {
+                    if (this.superType.contains(type)) {
+                        found = true;
                         break;
                     }
                 }
-                if(!found)
+                if (!found)
                     return !this.shouldBeEqual;
             }
-            if(this.matchAllSubTypes)
-            {
-                if(!this.subType.isEmpty())
-                {
-                    if(this.subType.size()!= Iterables.size(card.getRules().getType().getSubtypes()))
+            if (this.matchAllSubTypes) {
+                if (!this.subType.isEmpty()) {
+                    if (this.subType.size() != Iterables.size(card.getRules().getType().getSubtypes()))
                         return !this.shouldBeEqual;
-                    for(String subtype:card.getRules().getType().getSubtypes())
-                    {
-                        if(!this.subType.contains(subtype))
-                        {
+                    for (String subtype : card.getRules().getType().getSubtypes()) {
+                        if (!this.subType.contains(subtype)) {
                             return !this.shouldBeEqual;
                         }
                     }
                 }
-            }
-            else
-            {
-                if(!this.subType.isEmpty())
-                {
-                    boolean found=false;
-                    for(String subtype:card.getRules().getType().getSubtypes())
-                    {
-                        if(this.subType.contains(subtype))
-                        {
-                            found=true;
+            } else {
+                if (!this.subType.isEmpty()) {
+                    boolean found = false;
+                    for (String subtype : card.getRules().getType().getSubtypes()) {
+                        if (this.subType.contains(subtype)) {
+                            found = true;
                             break;
                         }
                     }
-                    if(!found)
+                    if (!found)
                         return !this.shouldBeEqual;
                 }
             }
 
-            if(!this.keyWords.isEmpty())
-            {
-                boolean found=false;
-                for(String keyWord:this.keyWords)
-                {
-                    if(card.getRules().hasKeyword(keyWord))
-                    {
-                        found=true;
+            if (!this.keyWords.isEmpty()) {
+                boolean found = false;
+                for (String keyWord : this.keyWords) {
+                    if (card.getRules().hasKeyword(keyWord)) {
+                        found = true;
                         break;
                     }
                 }
-                if(!found)
+                if (!found)
                     return !this.shouldBeEqual;
             }
 
-            if(!this.deckNeeds.isEmpty())
-            {
+            if (!this.deckNeeds.isEmpty()) {
                 boolean found = false;
-                for(String need:this.deckNeeds)
-                {
-                    //FormatExpected: X$Y, where X is DeckHints.Type and Y is a string descriptor
+                for (String need : this.deckNeeds) {
+                    // FormatExpected: X$Y, where X is DeckHints.Type and Y is a string descriptor
                     String[] parts = need.split("\\$");
 
-                    if (parts.length != 2){
+                    if (parts.length != 2) {
                         continue;
                     }
                     DeckHints.Type t = DeckHints.Type.valueOf(parts[0].toUpperCase());
 
                     DeckHints hints = card.getRules().getAiHints().getDeckHints();
-                    if (hints != null && hints.contains(t, parts[1])){
-                        found=true;
+                    if (hints != null && hints.contains(t, parts[1])) {
+                        found = true;
                         break;
                     }
                 }
-                if(!found)
+                if (!found)
                     return !this.shouldBeEqual;
             }
 
-
             return this.shouldBeEqual;
         }
+
         private Pattern getPattern(RewardData type) {
             if (type.cardText == null || type.cardText.isEmpty())
                 return null;
@@ -258,106 +236,88 @@ public class CardUtil {
                 return null;
             }
         }
+
         public CardPredicate(final RewardData type, final boolean wantEqual) {
-            this.matchAllSubTypes=type.matchAllSubTypes;
-            this.matchAllColors=type.matchAllColors;
+            this.matchAllSubTypes = type.matchAllSubTypes;
+            this.matchAllColors = type.matchAllColors;
             this.shouldBeEqual = wantEqual;
-            for(int i=0;type.manaCosts!=null&&i<type.manaCosts.length;i++)
+            for (int i = 0; type.manaCosts != null && i < type.manaCosts.length; i++)
                 manaCosts.add(type.manaCosts[i]);
             text = getPattern(type);
-            if(type.colors==null||type.colors.length==0)
-            {
-                this.colors=MagicColor.ALL_COLORS;
-            }
-            else
-            {
-                this.colors=0;
-                for(String color:type.colors)
-                {
-                    if("colorID".equals(color))
-                        for (byte c : Current.player().getColorIdentity())
-                            colors |= c;
+            if (type.colors == null || type.colors.length == 0) {
+                this.colors = MagicColor.ALL_COLORS;
+            } else {
+                this.colors = 0;
+                for (String color : type.colors) {
+                    if ("colorID".equals(color))
+                        colors |= Current.player().getColorIdentity().getColor();
                     else
                         colors |= MagicColor.fromName(color.toLowerCase());
                 }
             }
-            if(type.keyWords!=null&&type.keyWords.length!=0)
-            {
+            if (type.keyWords != null && type.keyWords.length != 0) {
                 keyWords.addAll(Arrays.asList(type.keyWords));
             }
-            if(type.rarity!=null&&type.rarity.length!=0)
-            {
-                for(String rarity:type.rarity)
-                {
+            if (type.rarity != null) {
+                for (String rarity : type.rarity) {
                     rarities.add(CardRarity.smartValueOf(rarity));
                 }
             }
 
-            if(type.subTypes!=null&&type.subTypes.length!=0)
-            {
+            if (type.subTypes != null && type.subTypes.length != 0) {
                 subType.addAll(Arrays.asList(type.subTypes));
             }
-            if(type.editions!=null&&type.editions.length!=0)
-            {
+            if (type.editions != null && type.editions.length != 0) {
                 editions.addAll(Arrays.asList(type.editions));
             }
-            if(type.superTypes!=null&&type.superTypes.length!=0)
-            {
-                for(String string:type.superTypes)
+            if (type.superTypes != null) {
+                for (String string : type.superTypes)
                     superType.add(CardType.Supertype.getEnum(string));
             }
-            if(type.cardTypes!=null&&type.cardTypes.length!=0)
-            {
-                for(String string:type.cardTypes)
+            if (type.cardTypes != null) {
+                for (String string : type.cardTypes)
                     this.type.add(CardType.CoreType.getEnum(string));
             }
-            if(type.colorType!=null&&!type.colorType.isEmpty())
-            {
-                this.colorType=ColorType.valueOf(type.colorType);
+            if (type.colorType != null && !type.colorType.isEmpty()) {
+                this.colorType = ColorType.valueOf(type.colorType);
+            } else {
+                this.colorType = ColorType.Any;
             }
-            else
-            {
-                this.colorType=ColorType.Any;
-            }
-            if(type.deckNeeds!=null&&type.deckNeeds.length!=0){
+            if (type.deckNeeds != null && type.deckNeeds.length != 0) {
                 deckNeeds.addAll(Arrays.asList(type.deckNeeds));
             }
-            if(type.minDate!=null&&!type.minDate.isEmpty())
-            {
-                this.minDate=type.minDate;
-            }
-            else
-            {
-                this.minDate="";
+            if (type.minDate != null && !type.minDate.isEmpty()) {
+                this.minDate = type.minDate;
+            } else {
+                this.minDate = "";
             }
         }
     }
 
-    public static List<PaperCard> getPredicateResult(Iterable<PaperCard> cards,final RewardData data)
-    {
+    public static List<PaperCard> getPredicateResult(Iterable<PaperCard> cards, final RewardData data) {
         List<PaperCard> result = new ArrayList<>();
         CardPredicate pre = new CardPredicate(data, true);
 
-        for (final PaperCard item : cards)
-        {
-            if(pre.test(item))
+        for (final PaperCard item : cards) {
+            if (pre.test(item))
                 result.add(item);
         }
         return result;
     }
 
-    public static List<PaperCard> generateCards(Iterable<PaperCard> cards,final RewardData data, final int count, Random r)
-    {
+    public static List<PaperCard> generateCards(Iterable<PaperCard> cards, final RewardData data, final int count,
+            Random r) {
         boolean allCardVariants = Config.instance().getSettingData().useAllCardVariants;
 
         final List<PaperCard> result = new ArrayList<>();
         List<PaperCard> pool = getPredicateResult(cards, data);
-        if (pool.size() > 0) {
+        if (!pool.isEmpty()) {
             for (int i = 0; i < count; i++) {
                 PaperCard candidate = pool.get(r.nextInt(pool.size()));
                 if (candidate != null) {
                     if (allCardVariants) {
-                        PaperCard finalCandidate = CardUtil.getCardByName(candidate.getCardName()); // get a random set variant
+                        // Get a random set variant
+                        PaperCard finalCandidate = CardUtil.getCardByName(candidate.getCardName());
                         result.add(finalCandidate);
                     } else {
                         result.add(candidate);
@@ -367,113 +327,102 @@ public class CardUtil {
         }
         return result;
     }
-    public static int getCardPrice(PaperCard card)
-    {
-        if(card==null)
-            return 0;
-        switch (card.getRarity())
-        {
-            case BasicLand:
-                return 5;
-            case Common:
-                return 50;
-            case Uncommon:
-                return 150;
-            case Rare:
-                return 300;
-            case MythicRare:
-                return 500;
-            default:
-                return 600;
-        }
-    }
-    public static int getRewardPrice(Reward reward)
-    {
-        PaperCard card=reward.getCard();
-        if(card!=null)
-            return getCardPrice(card);
-        if(reward.getItem()!=null)
-            return reward.getItem().cost;
-        if(reward.getType()== Reward.Type.Life)
-            return reward.getCount()*500;
-        if(reward.getType()== Reward.Type.Shards)
-            return reward.getCount()*500;
-        if(reward.getType()== Reward.Type.Gold)
-            return reward.getCount();
-        /*if(reward.getType() == Reward.Type.CardPack)
-            return reward.getDeck().get(DeckSection.Main).countAll()*70;*/
-        //TODO: Heitor - Price by card count and type of boosterPack.
 
+    public static int getCardPrice(PaperCard card) {
+        if (card == null)
+            return 0;
+
+        return switch (card.getRarity()) {
+            case BasicLand -> 5;
+            case Common -> 50;
+            case Uncommon -> 150;
+            case Rare -> 300;
+            case MythicRare -> 500;
+            default -> 600;
+        };
+    }
+
+    public static int getRewardPrice(Reward reward) {
+        PaperCard card = reward.getCard();
+        if (card != null)
+            return getCardPrice(card);
+        if (reward.getItem() != null)
+            return reward.getItem().cost;
+        if (reward.getType() == Reward.Type.Life)
+            return reward.getCount() * 500;
+        if (reward.getType() == Reward.Type.Shards)
+            return reward.getCount() * 500;
+        if (reward.getType() == Reward.Type.Gold)
+            return reward.getCount();
+        /*
+         * if(reward.getType() == Reward.Type.CardPack)
+         * return reward.getDeck().get(DeckSection.Main).countAll()*70;
+         */
+        // TODO: Heitor - Price by card count and type of boosterPack.
 
         return 1000;
     }
 
-    public static Deck generateDeck(GeneratedDeckData data, CardEdition starterEdition, boolean discourageDuplicates)
-    {
-        List<String> editionCodes = (starterEdition != null)?Arrays.asList(starterEdition.getCode(), starterEdition.getCode2()):Arrays.asList("JMP", "J22", "DMU", "BRO", "ONE", "MOM");
-        Deck deck= new Deck(data.name);
-        if(data.mainDeck!=null)
-        {
+    public static Deck generateDeck(GeneratedDeckData data, CardEdition starterEdition, boolean discourageDuplicates) {
+        List<String> editionCodes = (starterEdition != null)
+                ? Arrays.asList(starterEdition.getCode(), starterEdition.getCode2())
+                : Arrays.asList("JMP", "J22", "DMU", "BRO", "ONE", "MOM");
+        Deck deck = new Deck(data.name);
+        if (data.mainDeck != null) {
             deck.getOrCreate(DeckSection.Main).addAllFlat(generateAllCards(Arrays.asList(data.mainDeck), true));
-            if(data.sideBoard!=null)
-                deck.getOrCreate(DeckSection.Sideboard).addAllFlat(generateAllCards(Arrays.asList(data.sideBoard), true));
+            if (data.sideBoard != null)
+                deck.getOrCreate(DeckSection.Sideboard)
+                        .addAllFlat(generateAllCards(Arrays.asList(data.sideBoard), true));
             return deck;
         }
-        if(data.jumpstartPacks!=null)
-        {
+        if (data.jumpstartPacks != null) {
             deck.getOrCreate(DeckSection.Main);
 
-            Map <String, List<PaperCard>> packCandidates=null;
-            List<String> usedPackNames=new ArrayList<String>();
-
-            for(int i=0;i<data.jumpstartPacks.length;i++)
-            {
+            Map<String, List<PaperCard>> packCandidates = null;
+            List<String> usedPackNames = new ArrayList<String>();
 
+            for (int i = 0; i < data.jumpstartPacks.length; i++) {
                 final byte targetColor = MagicColor.fromName(data.jumpstartPacks[i]);
-                String targetName;
-                switch (targetColor)
-                {
-                    default:
-                    case MagicColor.WHITE:  targetName = "Plains";  break;
-                    case MagicColor.BLUE:   targetName = "Island";  break;
-                    case MagicColor.BLACK:  targetName = "Swamp";   break;
-                    case MagicColor.RED:    targetName = "Mountain";break;
-                    case MagicColor.GREEN:  targetName = "Forest";  break;
-                }
+                String targetName = switch (targetColor) {
+                    case MagicColor.BLUE -> "Island";
+                    case MagicColor.BLACK -> "Swamp";
+                    case MagicColor.RED -> "Mountain";
+                    case MagicColor.GREEN -> "Forest";
+                    default -> "Plains";
+                };
 
-                packCandidates=new HashMap<>();
-                for(SealedTemplate template : StaticData.instance().getSpecialBoosters())
-                {
-                    if (!editionCodes.contains(template.getEdition().split("\\s",2)[0]))
+                packCandidates = new HashMap<>();
+                for (SealedTemplate template : StaticData.instance().getSpecialBoosters()) {
+                    if (!editionCodes.contains(template.getEdition().split("\\s", 2)[0]))
                         continue;
                     List<PaperCard> packContents = new UnOpenedProduct(template).get();
                     if (packContents.size() < 18 | packContents.size() > 25)
                         continue;
-                    if (packContents.stream().filter(x -> x.getName().equals(targetName)).count() >=3)
+                    if (packContents.stream().filter(x -> x.getName().equals(targetName)).count() >= 3)
                         packCandidates.putIfAbsent(template.getEdition(), packContents);
                 }
                 List<PaperCard> selectedPack;
                 if (discourageDuplicates) {
-                    Map <String, List<PaperCard>> filteredPackCandidates= new HashMap<>();
-                    for (java.util.Map.Entry<String, List<PaperCard>>  entry: packCandidates.entrySet()){
-                        if (!usedPackNames.contains(entry.getKey())){
-                            filteredPackCandidates.put(entry.getKey(), entry.getValue()); //deep copy so that packCandidates can be used if filtered ends up being empty
+                    Map<String, List<PaperCard>> filteredPackCandidates = new HashMap<>();
+                    for (java.util.Map.Entry<String, List<PaperCard>> entry : packCandidates.entrySet()) {
+                        if (!usedPackNames.contains(entry.getKey())) {
+                            // Deep copy so that packCandidates can be used if filtered ends up being empty
+                            filteredPackCandidates.put(entry.getKey(), entry.getValue());
                         }
                     }
-                    //Only re-use a pack if all possibilities have already been chosen
-                    if (filteredPackCandidates.size() == 0)
+                    // Only re-use a pack if all possibilities have already been chosen
+                    if (filteredPackCandidates.isEmpty())
                         filteredPackCandidates = packCandidates;
                     Object[] keys = filteredPackCandidates.keySet().toArray();
 
-                    String keyName = (String)keys[Current.world().getRandom().nextInt(keys.length)];
+                    String keyName = (String) keys[Current.world().getRandom().nextInt(keys.length)];
                     usedPackNames.add(keyName);
                     selectedPack = filteredPackCandidates.remove(keyName);
-                }
-                else{
+                } else {
                     Object[] keys = packCandidates.keySet().toArray();
-                    selectedPack = packCandidates.get((String)keys[Current.world().getRandom().nextInt(keys.length)]);
+                    selectedPack = packCandidates.get((String) keys[Current.world().getRandom().nextInt(keys.length)]);
                 }
-                //if the packContents size above is below 20, just get random card
+                // If the packContents size above is below 20, add random cards
                 int size = 20 - selectedPack.size();
                 for (int c = 0; c < size; c++) {
                     selectedPack.add(Aggregates.random(selectedPack));
@@ -482,180 +431,186 @@ public class CardUtil {
             }
             return deck;
         }
-       if(data.template!=null)
-       {
-           float count=data.template.count;
-           float lands=count*0.4f;
-           float spells=count-lands;
-           List<RewardData> dataArray= generateRewards(data.template,spells*0.5f,new int[]{1,2});
-           dataArray.addAll(generateRewards(data.template,spells*0.3f,new int[]{3,4,5}));
-           dataArray.addAll(generateRewards(data.template,spells*0.2f,new int[]{6,7,8}));
-           List<PaperCard>  nonLand= generateAllCards(dataArray, true);
+        if (data.template != null) {
+            float count = data.template.count;
+            float lands = count * 0.4f;
+            float spells = count - lands;
+            List<RewardData> dataArray = generateRewards(data.template, spells * 0.5f, new int[] { 1, 2 });
+            dataArray.addAll(generateRewards(data.template, spells * 0.3f, new int[] { 3, 4, 5 }));
+            dataArray.addAll(generateRewards(data.template, spells * 0.2f, new int[] { 6, 7, 8 }));
+            List<PaperCard> nonLand = generateAllCards(dataArray, true);
 
-           nonLand.addAll(fillWithLands(nonLand,data.template));
-           deck.getOrCreate(DeckSection.Main).addAllFlat(nonLand);
-       }
+            nonLand.addAll(fillWithLands(nonLand, data.template));
+            deck.getOrCreate(DeckSection.Main).addAllFlat(nonLand);
+        }
         return deck;
     }
 
     private static List<PaperCard> fillWithLands(List<PaperCard> nonLands, GeneratedDeckTemplateData template) {
-        int red=0;
-        int blue=0;
-        int green=0;
-        int white=0;
-        int black=0;
-        int colorLess=0;
-        int cardCount=nonLands.size();
-        List<PaperCard> cards=new ArrayList<>();
-        boolean allCardVariants=Config.instance().getSettingData().useAllCardVariants;
+        int red = 0, blue = 0, green = 0, white = 0, black = 0, colorless = 0;
+        int cardCount = nonLands.size();
+        List<PaperCard> cards = new ArrayList<>();
+        boolean allCardVariants = Config.instance().getSettingData().useAllCardVariants;
+        boolean useSnowLands = false;
 
-        for(PaperCard nonLand:nonLands)
-        {
-            red+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.RED);
-            green+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.GREEN);
-            white+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.WHITE);
-            blue+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.BLUE);
-            black+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.BLACK);
-            colorLess+=nonLand.getRules().getManaCost().getShardCount(ManaCostShard.GENERIC);
+        for (PaperCard nonLand : nonLands) {
+            CardRules rules = nonLand.getRules();
+            ManaCost manaCost = rules.getManaCost();
+
+            red += manaCost.getShardCount(ManaCostShard.RED);
+            green += manaCost.getShardCount(ManaCostShard.GREEN);
+            white += manaCost.getShardCount(ManaCostShard.WHITE);
+            blue += manaCost.getShardCount(ManaCostShard.BLUE);
+            black += manaCost.getShardCount(ManaCostShard.BLACK);
+            colorless += manaCost.getShardCount(ManaCostShard.COLORLESS);
+
+            // Check for Snow lands requirement
+            if (!useSnowLands) {
+                if (manaCost.getShardCount(ManaCostShard.S) > 0) {
+                    useSnowLands = true;
+                    continue;
+                }
+
+                if (rules.getAiHints() != null && rules.getAiHints().getDeckHints() != null) {
+                    useSnowLands = rules.getAiHints().getDeckHints().contains(Type.TYPE, "Snow");
+                }
+            }
         }
-        float sum= red+ blue+ green+ white+ black;
-        int neededLands=template.count-cardCount;
-        int neededDualLands= Math.round (neededLands*template.rares);
-        int neededBase=neededLands-neededDualLands;
+
+        float sumColoredCost = red + blue + green + white + black;
+        int neededLands = template.count - cardCount;
+        int neededDualLands = Math.round(neededLands * template.rares);
+        int neededBase = neededLands - neededDualLands;
         String edition = "";
+
         if (allCardVariants) {
             PaperCard templateLand = CardUtil.getCardByName("Plains");
             edition = templateLand.getEdition();
         }
-        if(sum==0.)
-        {
-            cards.addAll(generateLands("Wastes",neededLands));
-        }
-        else
-        {
-            int mount=Math.round(neededBase*(red/sum));
-            int island=Math.round(neededBase*(blue/sum));
-            int forest=Math.round(neededBase*(green/sum));
-            int plains=Math.round(neededBase*(white/sum));
-            int swamp=Math.round(neededBase*(black/sum));
-            cards.addAll(generateLands("Plains",plains,edition));
-            cards.addAll(generateLands("Island",island,edition));
-            cards.addAll(generateLands("Forest",forest,edition));
-            cards.addAll(generateLands("Mountain",mount,edition));
-            cards.addAll(generateLands("Swamp",swamp,edition));
-            List<String> landTypes=new ArrayList<>();
-            if(mount>0)
-                landTypes.add("Mountain");
-            if(island>0)
-                landTypes.add("Island");
-            if(plains>0)
-                landTypes.add("Plains");
-            if(swamp>0)
-                landTypes.add("Swamp");
-            if(forest>0)
-                landTypes.add("Forest");
-            cards.addAll(generateDualLands(landTypes,neededDualLands));
 
+        if (sumColoredCost == 0) {
+            cards.addAll(generateLands("Wastes", neededLands));
+        } else {
+            float sumTotalCost = sumColoredCost + colorless;
+
+            int mountain = Math.round(neededBase * (red / sumTotalCost));
+            int island = Math.round(neededBase * (blue / sumTotalCost));
+            int forest = Math.round(neededBase * (green / sumTotalCost));
+            int plains = Math.round(neededBase * (white / sumTotalCost));
+            int swamp = Math.round(neededBase * (black / sumTotalCost));
+            int wastes = Math.round(neededBase * (colorless / sumTotalCost));
+
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Plains" : "Plains", plains, edition));
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Island" : "Island", island, edition));
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Forest" : "Forest", forest, edition));
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Mountain" : "Mountain", mountain, edition));
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Swamp" : "Swamp", swamp, edition));
+            cards.addAll(generateLands(useSnowLands ? "Snow-Covered Wastes" : "Wastes", wastes, edition));
+
+            List<String> landTypes = new ArrayList<>();
+            if (mountain > 0)
+                landTypes.add("Mountain");
+            if (island > 0)
+                landTypes.add("Island");
+            if (plains > 0)
+                landTypes.add("Plains");
+            if (swamp > 0)
+                landTypes.add("Swamp");
+            if (forest > 0)
+                landTypes.add("Forest");
+
+            cards.addAll(generateDualLands(landTypes, neededDualLands));
         }
+
         return cards;
     }
 
     private static Collection<PaperCard> generateDualLands(List<String> landName, int count) {
-        ArrayList<RewardData> rewards=new ArrayList<>();
-        RewardData base= new RewardData();
+        ArrayList<RewardData> rewards = new ArrayList<>();
+        RewardData base = new RewardData();
         rewards.add(base);
-        base.cardTypes=new String[]{"Land"};
-        base.count=count;
-        base.matchAllSubTypes=true;
-        if(landName.size()==1)
-        {
-            base.subTypes=new String[]{landName.get(0)};
-        }
-        else if(landName.size()==2)
-        {
-            base.subTypes=new String[]{landName.get(0),landName.get(1)};
-        }
-        else if(landName.size()==3)
-        {
-            RewardData sub1= new RewardData(base);
-            RewardData sub2= new RewardData(base);
-            sub1.count/=3;
-            sub2.count/=3;
-            base.count-=sub1.count;
-            base.count-=sub2.count;
+        base.cardTypes = new String[] { "Land" };
+        base.count = count;
+        base.matchAllSubTypes = true;
+        if (landName.size() == 1) {
+            base.subTypes = new String[] { landName.get(0) };
+        } else if (landName.size() == 2) {
+            base.subTypes = new String[] { landName.get(0), landName.get(1) };
+        } else if (landName.size() == 3) {
+            RewardData sub1 = new RewardData(base);
+            RewardData sub2 = new RewardData(base);
+            sub1.count /= 3;
+            sub2.count /= 3;
+            base.count -= sub1.count;
+            base.count -= sub2.count;
 
-            base.subTypes=new String[]{landName.get(0),landName.get(1)};
-            sub1.subTypes=new String[]{landName.get(1),landName.get(2)};
-            sub2.subTypes=new String[]{landName.get(0),landName.get(2)};
-            rewards.addAll(Arrays.asList(sub1,sub2));
-        }
-        else if(landName.size()==4)
-        {
-            RewardData sub1= new RewardData(base);
-            RewardData sub2= new RewardData(base);
-            RewardData sub3= new RewardData(base);
-            RewardData sub4= new RewardData(base);
-            sub1.count/=5;
-            sub2.count/=5;
-            sub3.count/=5;
-            sub4.count/=5;
-            base.count-=sub1.count;
-            base.count-=sub2.count;
-            base.count-=sub3.count;
-            base.count-=sub4.count;
+            base.subTypes = new String[] { landName.get(0), landName.get(1) };
+            sub1.subTypes = new String[] { landName.get(1), landName.get(2) };
+            sub2.subTypes = new String[] { landName.get(0), landName.get(2) };
+            rewards.addAll(Arrays.asList(sub1, sub2));
+        } else if (landName.size() == 4) {
+            RewardData sub1 = new RewardData(base);
+            RewardData sub2 = new RewardData(base);
+            RewardData sub3 = new RewardData(base);
+            RewardData sub4 = new RewardData(base);
+            sub1.count /= 5;
+            sub2.count /= 5;
+            sub3.count /= 5;
+            sub4.count /= 5;
+            base.count -= sub1.count;
+            base.count -= sub2.count;
+            base.count -= sub3.count;
+            base.count -= sub4.count;
 
-            base.subTypes = new String[]{landName.get(0),landName.get(1)};
-            sub1.subTypes = new String[]{landName.get(0),landName.get(2)};
-            sub2.subTypes = new String[]{landName.get(0),landName.get(3)};
-            sub3.subTypes = new String[]{landName.get(1),landName.get(2)};
-            sub4.subTypes = new String[]{landName.get(1),landName.get(3)};
-            rewards.addAll(Arrays.asList(sub1,sub2,sub3,sub4));
-        }
-        else if(landName.size()==5)
-        {
-            RewardData sub1= new RewardData(base);
-            RewardData sub2= new RewardData(base);
-            RewardData sub3= new RewardData(base);
-            RewardData sub4= new RewardData(base);
-            RewardData sub5= new RewardData(base);
-            RewardData sub6= new RewardData(base);
-            RewardData sub7= new RewardData(base);
-            RewardData sub8= new RewardData(base);
-            RewardData sub9= new RewardData(base);
-            sub1.count/=10;
-            sub2.count/=10;
-            sub3.count/=10;
-            sub4.count/=10;
-            sub5.count/=10;
-            sub6.count/=10;
-            sub7.count/=10;
-            sub8.count/=10;
-            sub9.count/=10;
-            base.count-=sub1.count;
-            base.count-=sub2.count;
-            base.count-=sub3.count;
-            base.count-=sub4.count;
-            base.count-=sub5.count;
-            base.count-=sub6.count;
-            base.count-=sub7.count;
-            base.count-=sub8.count;
-            base.count-=sub9.count;
+            base.subTypes = new String[] { landName.get(0), landName.get(1) };
+            sub1.subTypes = new String[] { landName.get(0), landName.get(2) };
+            sub2.subTypes = new String[] { landName.get(0), landName.get(3) };
+            sub3.subTypes = new String[] { landName.get(1), landName.get(2) };
+            sub4.subTypes = new String[] { landName.get(1), landName.get(3) };
+            rewards.addAll(Arrays.asList(sub1, sub2, sub3, sub4));
+        } else if (landName.size() == 5) {
+            RewardData sub1 = new RewardData(base);
+            RewardData sub2 = new RewardData(base);
+            RewardData sub3 = new RewardData(base);
+            RewardData sub4 = new RewardData(base);
+            RewardData sub5 = new RewardData(base);
+            RewardData sub6 = new RewardData(base);
+            RewardData sub7 = new RewardData(base);
+            RewardData sub8 = new RewardData(base);
+            RewardData sub9 = new RewardData(base);
+            sub1.count /= 10;
+            sub2.count /= 10;
+            sub3.count /= 10;
+            sub4.count /= 10;
+            sub5.count /= 10;
+            sub6.count /= 10;
+            sub7.count /= 10;
+            sub8.count /= 10;
+            sub9.count /= 10;
+            base.count -= sub1.count;
+            base.count -= sub2.count;
+            base.count -= sub3.count;
+            base.count -= sub4.count;
+            base.count -= sub5.count;
+            base.count -= sub6.count;
+            base.count -= sub7.count;
+            base.count -= sub8.count;
+            base.count -= sub9.count;
 
-            base.subTypes=new String[]{landName.get(0),landName.get(1)};
-            sub1.subTypes=new String[]{landName.get(0),landName.get(2)};
-            sub2.subTypes=new String[]{landName.get(0),landName.get(3)};
-            sub3.subTypes=new String[]{landName.get(0),landName.get(4)};
-            sub4.subTypes=new String[]{landName.get(1),landName.get(2)};
-            sub5.subTypes=new String[]{landName.get(1),landName.get(3)};
-            sub6.subTypes=new String[]{landName.get(1),landName.get(4)};
-            sub7.subTypes=new String[]{landName.get(2),landName.get(3)};
-            sub8.subTypes=new String[]{landName.get(2),landName.get(4)};
-            sub9.subTypes=new String[]{landName.get(3),landName.get(4)};
-            rewards.addAll(Arrays.asList(sub1,sub2,sub3,sub4,sub5,sub6,sub7,sub8,sub9));
+            base.subTypes = new String[] { landName.get(0), landName.get(1) };
+            sub1.subTypes = new String[] { landName.get(0), landName.get(2) };
+            sub2.subTypes = new String[] { landName.get(0), landName.get(3) };
+            sub3.subTypes = new String[] { landName.get(0), landName.get(4) };
+            sub4.subTypes = new String[] { landName.get(1), landName.get(2) };
+            sub5.subTypes = new String[] { landName.get(1), landName.get(3) };
+            sub6.subTypes = new String[] { landName.get(1), landName.get(4) };
+            sub7.subTypes = new String[] { landName.get(2), landName.get(3) };
+            sub8.subTypes = new String[] { landName.get(2), landName.get(4) };
+            sub9.subTypes = new String[] { landName.get(3), landName.get(4) };
+            rewards.addAll(Arrays.asList(sub1, sub2, sub3, sub4, sub5, sub6, sub7, sub8, sub9));
         }
 
-        Collection<PaperCard> ret = new ArrayList<>(generateAllCards(rewards, true));
-        return ret;
+        return new ArrayList<>(generateAllCards(rewards, true));
     }
 
     private static Collection<PaperCard> generateLands(String landName, int count) {
@@ -683,43 +638,44 @@ public class CardUtil {
     }
 
     private static List<RewardData> generateRewards(GeneratedDeckTemplateData template, float count, int[] manaCosts) {
-        ArrayList<RewardData> ret=new ArrayList<>();
-        ret.addAll(templateGenerate(template,count-(count*template.rares),manaCosts,new String[]{"Uncommon","Common"}));
-        ret.addAll(templateGenerate(template,count*template.rares,manaCosts,new String[]{"Rare","Mythic Rare"}));
+        ArrayList<RewardData> ret = new ArrayList<>();
+        ret.addAll(templateGenerate(template, count - (count * template.rares), manaCosts,
+                new String[] { "Uncommon", "Common" }));
+        ret.addAll(
+                templateGenerate(template, count * template.rares, manaCosts, new String[] { "Rare", "Mythic Rare" }));
         return ret;
     }
 
-    private static ArrayList<RewardData> templateGenerate(GeneratedDeckTemplateData template, float count, int[] manaCosts, String[] strings) {
-        ArrayList<RewardData> ret=new ArrayList<>();
-        RewardData base= new RewardData();
-        base.manaCosts=manaCosts;
-        base.rarity=strings;
-        base.colors=template.colors;
-        if(template.tribe!=null&&!template.tribe.isEmpty())
-        {
-            RewardData caresAbout= new RewardData(base);
-            caresAbout.cardText="\\b"+template.tribe+"\\b";
-            caresAbout.count=  Math.round(count*template.tribeSynergyCards);
+    private static ArrayList<RewardData> templateGenerate(GeneratedDeckTemplateData template, float count,
+            int[] manaCosts, String[] strings) {
+        ArrayList<RewardData> ret = new ArrayList<>();
+        RewardData base = new RewardData();
+        base.manaCosts = manaCosts;
+        base.rarity = strings;
+        base.colors = template.colors;
+        if (template.tribe != null && !template.tribe.isEmpty()) {
+            RewardData caresAbout = new RewardData(base);
+            caresAbout.cardText = "\\b" + template.tribe + "\\b";
+            caresAbout.count = Math.round(count * template.tribeSynergyCards);
             ret.add(caresAbout);
 
-            base.subTypes=new String[]{template.tribe};
-            base.count=  Math.round(count*(1-template.tribeSynergyCards));
-        }
-        else
-        {
-            base.count=  Math.round(count);
+            base.subTypes = new String[] { template.tribe };
+            base.count = Math.round(count * (1 - template.tribeSynergyCards));
+        } else {
+            base.count = Math.round(count);
         }
         ret.add(base);
-        return  ret;
+        return ret;
     }
 
-    public static Deck getDeck(String path, boolean forAI, boolean isFantasyMode, String colors, boolean isTheme, boolean useGeneticAI) {
-        return getDeck(path, forAI, isFantasyMode, colors, isTheme, useGeneticAI, null,true);
+    public static Deck getDeck(String path, boolean forAI, boolean isFantasyMode, String colors, boolean isTheme,
+            boolean useGeneticAI) {
+        return getDeck(path, forAI, isFantasyMode, colors, isTheme, useGeneticAI, null, true);
     }
 
-    public static Deck getDeck(String path, boolean forAI, boolean isFantasyMode, String colors, boolean isTheme, boolean useGeneticAI, CardEdition starterEdition, boolean discourageDuplicates)
-    {
-        if(path.endsWith(".dck")) {
+    public static Deck getDeck(String path, boolean forAI, boolean isFantasyMode, String colors, boolean isTheme,
+            boolean useGeneticAI, CardEdition starterEdition, boolean discourageDuplicates) {
+        if (path.endsWith(".dck")) {
             FileHandle fileHandle = Config.instance().getFile(path);
             Deck deck = null;
             if (fileHandle != null) {
@@ -732,56 +688,54 @@ public class CardUtil {
             return deck;
         }
 
-        if(forAI && (isFantasyMode||useGeneticAI)) {
-            Deck deck = DeckgenUtil.getRandomOrPreconOrThemeDeck(colors, forAI, isTheme, useGeneticAI);
-            if (deck != null)
-                return deck;
+        if (forAI && (isFantasyMode || useGeneticAI)) {
+            return DeckgenUtil.getRandomOrPreconOrThemeDeck(colors, forAI, isTheme, useGeneticAI);
         }
+
         Json json = new Json();
         FileHandle handle = Config.instance().getFile(path);
         if (handle.exists())
             return generateDeck(json.fromJson(GeneratedDeckData.class, handle), starterEdition, discourageDuplicates);
         Deck deck = DeckgenUtil.getRandomOrPreconOrThemeDeck(colors, true, false, true);
-        System.err.println("Error loading JSON: " + handle.path() + "\nGenerating random deck: "+deck.getName());
+        System.err.println("Error loading JSON: " + handle.path() + "\nGenerating random deck: " + deck.getName());
         return deck;
-
     }
 
-    private static final GameFormat.Collection  formats   = FModel.getFormats();
-
-
-
-
+    private static final GameFormat.Collection formats = FModel.getFormats();
 
     private static final Predicate<CardEdition> filterPioneer = formats.getPioneer().editionLegalPredicate;
-    private static final Predicate<CardEdition> filterModern= formats.getModern().editionLegalPredicate;
+    private static final Predicate<CardEdition> filterModern = formats.getModern().editionLegalPredicate;
     private static final Predicate<CardEdition> filterVintage = formats.getVintage().editionLegalPredicate;
     private static final Predicate<CardEdition> filterStandard = formats.getStandard().editionLegalPredicate;
-    public static Deck generateStandardBoosterAsDeck(){
+
+    public static Deck generateStandardBoosterAsDeck() {
         return generateRandomBoosterPackAsDeck(filterStandard);
     }
-    public static Deck generatePioneerBoosterAsDeck(){
+
+    public static Deck generatePioneerBoosterAsDeck() {
         return generateRandomBoosterPackAsDeck(filterPioneer);
     }
-    public static Deck generateModernBoosterAsDeck(){
+
+    public static Deck generateModernBoosterAsDeck() {
         return generateRandomBoosterPackAsDeck(filterModern);
     }
-    public static Deck generateVintageBoosterAsDeck(){
+
+    public static Deck generateVintageBoosterAsDeck() {
         return generateRandomBoosterPackAsDeck(filterVintage);
     }
 
-    public static Deck generateBoosterPackAsDeck(String code){
+    public static Deck generateBoosterPackAsDeck(String code) {
         ConfigData configData = Config.instance().getConfigData();
         if (configData.allowedEditions != null) {
-            if (!Arrays.asList(configData.allowedEditions).contains(code)){
+            if (!Arrays.asList(configData.allowedEditions).contains(code)) {
                 System.err.println("Cannot generate booster pack, '" + code + "' is not an allowed edition");
             }
-        } else if (Arrays.asList(configData.restrictedEditions).contains(code)){
+        } else if (Arrays.asList(configData.restrictedEditions).contains(code)) {
             System.err.println("Cannot generate booster pack, '" + code + "' is a restricted edition");
         }
 
         CardEdition edition = StaticData.instance().getEditions().get(code);
-        if (edition == null){
+        if (edition == null) {
             System.err.println("Set code '" + code + "' not found.");
             return new Deck();
         }
@@ -789,7 +743,7 @@ public class CardUtil {
         return generateBoosterPackAsDeck(edition);
     }
 
-    public static Deck generateBoosterPackAsDeck(CardEdition edition){
+    public static Deck generateBoosterPackAsDeck(CardEdition edition) {
         Deck d = new Deck("Booster pack");
         d.setComment(edition.getCode());
         d.getMain().add(BoosterPack.fromSet(edition).getCards());
@@ -809,14 +763,23 @@ public class CardUtil {
         return generateBoosterPackAsDeck(edition);
     }
 
+    private static PaperCard getReplacement(String missingCard, String replacementCard) {
+        System.err.println(missingCard + " : Not found in the database.\nReplacement card: " + replacementCard);
+        return FModel.getMagicDb().getCommonCards().getCard(replacementCard);
+    }
+
     public static PaperCard getCardByName(String cardName) {
         List<PaperCard> validCards;
-        //Faster to ask the CardDB for a card name than it is to search the pool.
+        // Faster to ask the CardDB for a card name than it is to search the pool.
         if (Config.instance().getSettingData().useAllCardVariants)
             validCards = FModel.getMagicDb().getCommonCards().getAllCards(cardName);
         else
             validCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt(cardName);
 
+        if (validCards.isEmpty()) {
+            return getReplacement(cardName, "Wastes");
+        }
+
         return validCards.get(Current.world().getRandom().nextInt(validCards.size()));
     }
 
@@ -828,7 +791,9 @@ public class CardUtil {
                 .filter(input -> input.getEdition().equals(edition)).collect(Collectors.toList());
 
         if (validCards.isEmpty()) {
-            System.err.println("Unexpected behavior: tried to call getCardByNameAndEdition for card " + cardName + " from the edition " + edition + ", but didn't find it in the DB. A random existing instance will be returned.");
+            System.err.println("Unexpected behavior: tried to call getCardByNameAndEdition for card " + cardName
+                    + " from the edition " + edition
+                    + ", but didn't find it in the DB. A random existing instance will be returned if found.");
             return getCardByName(cardName);
         }
 
@@ -836,7 +801,8 @@ public class CardUtil {
     }
 
     public static Collection<PaperCard> getFullCardPool(boolean allCardVariants) {
-        return allCardVariants ? FModel.getMagicDb().getCommonCards().getAllCards() : FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt();
+        return allCardVariants
+            ? FModel.getMagicDb().getCommonCards().getAllCards()
+            : FModel.getMagicDb().getCommonCards().getUniqueCardsNoAlt();
     }
 }
-
diff --git a/forge-gui-mobile/src/forge/adventure/util/Current.java b/forge-gui-mobile/src/forge/adventure/util/Current.java
index edae8752d88..d2698ff5aab 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Current.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Current.java
@@ -27,8 +27,9 @@ public class Current {
     public static void setLatestDeck(Deck generateDeck) {
         deck=generateDeck;
     }
-    public static String generateDefeatMessage() {
-        String message = Forge.getLocalizer().getMessage("lblYouDied", player().getName());
+    public static String generateDefeatMessage(boolean hasDied) {
+        String key = hasDied ? "lblYouDied" : "lblYouLostTheLastGame";
+        String message = Forge.getLocalizer().getMessage(key, player().getName());
         ItemData itemData = player().getRandomEquippedItem();
         if (itemData != null) {
             itemData.isCracked = true;
diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
index 2725516b378..58b6977afb8 100644
--- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
@@ -261,30 +261,35 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
 
                 if (ImageCache.getInstance().imageKeyFileExists(reward.getCard().getImageKey(false)) && !Forge.enableUIMask.equals("Art")) {
                     int count = 0;
-                    PaperCard card = ImageUtil.getPaperCardFromImageKey(reward.getCard().getImageKey(false));
-                    File frontFace = ImageKeys.getImageFile(card.getCardImageKey());
-                    if (frontFace != null) {
-                        try {
-                            Texture front = Forge.getAssets().manager().get(frontFace.getPath(), Texture.class, false);
-                            if (front == null) {
-                                Forge.getAssets().manager().load(frontFace.getPath(), Texture.class, Forge.getAssets().getTextureFilter());
-                                Forge.getAssets().manager().finishLoadingAsset(frontFace.getPath());
-                                front = Forge.getAssets().manager().get(frontFace.getPath(), Texture.class, false);
-                            }
-                            if (front != null) {
-                                count += 1;
-                                setCardImage(front);
-                            } else {
+                    try {
+                        PaperCard card = ImageUtil.getPaperCardFromImageKey(reward.getCard().getImageKey(false));
+                        File frontFace = ImageKeys.getImageFile(card.getCardImageKey());
+                        if (frontFace != null) {
+                            try {
+                                Texture front = Forge.getAssets().manager().get(frontFace.getPath(), Texture.class, false);
+                                if (front == null) {
+                                    Forge.getAssets().manager().load(frontFace.getPath(), Texture.class, Forge.getAssets().getTextureFilter());
+                                    Forge.getAssets().manager().finishLoadingAsset(frontFace.getPath());
+                                    front = Forge.getAssets().manager().get(frontFace.getPath(), Texture.class, false);
+                                }
+                                if (front != null) {
+                                    count += 1;
+                                    setCardImage(front);
+                                } else {
+                                    loaded = false;
+                                }
+                            } catch (Exception e) {
+                                System.err.println("Failed to load image: " + frontFace.getPath());
                                 loaded = false;
                             }
-                        } catch (Exception e) {
-                            System.err.println("Failed to load image: " + frontFace.getPath());
+                        } else {
                             loaded = false;
                         }
-                    } else {
+                        ImageCache.getInstance().updateSynqCount(frontFace, count);
+                    } catch (Exception e) {
+                        System.err.println("Failed to load image: " + reward.getCard());
                         loaded = false;
                     }
-                    ImageCache.getInstance().updateSynqCount(frontFace, count);
                 } else {
                     String imagePath = ImageUtil.getImageRelativePath(reward.getCard(), "", true, false);
                     File lookup = ImageKeys.hasSetLookup(imagePath) ? ImageKeys.setLookUpFile(imagePath, imagePath + "border") : null;
@@ -322,8 +327,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
                                     }
                                     ImageCache.getInstance().updateSynqCount(file, 1);
                                 }
-                            } catch (Exception e) {
-                            }
+                            } catch (Exception ignored) {}
                         }
                         T = renderPlaceholder(new Graphics(), reward.getCard(), false); //Now we can render the card.
                         setCardImage(T);
@@ -587,7 +591,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
             } catch (Exception e) {
                 System.err.println("Failed to load image: " + backFace.getPath());
             }
-        };
+        }
     }
 
     private void switchTooltip() {
diff --git a/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java b/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
index 333a2f21e3f..b23f52ed9c0 100644
--- a/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
+++ b/forge-gui-mobile/src/forge/adventure/util/SaveFileData.java
@@ -20,6 +20,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             captureException(e, key, subData);
         }
     }
@@ -33,6 +34,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -45,6 +47,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -57,6 +60,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -69,6 +73,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -81,6 +86,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -95,6 +101,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             stream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -107,6 +114,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             captureException(e, key, subData);
         }
     }
@@ -119,6 +127,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             captureException(e, key, subData);
         }
     }
@@ -132,6 +141,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
@@ -147,6 +157,7 @@ public class SaveFileData extends HashMap<String, byte[]> {
             objStream.flush();
             put(key, stream.toByteArray());
         } catch (IOException e) {
+            put("IOException", e.toString().getBytes());
             e.printStackTrace();
         }
     }
diff --git a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
index 3985e16df2b..ecb951c1f86 100644
--- a/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
+++ b/forge-gui-mobile/src/forge/adventure/world/WorldSave.java
@@ -26,53 +26,50 @@ import java.util.zip.InflaterInputStream;
 /**
  * Represents everything that will be saved, like the player and the world.
  */
-public class WorldSave   {
+public class WorldSave {
 
-    static final public int AUTO_SAVE_SLOT =-1;
-    static final public int QUICK_SAVE_SLOT =-2;
-    static final public int INVALID_SAVE_SLOT =-3;
-    static final WorldSave currentSave=new WorldSave();
+    static final public int AUTO_SAVE_SLOT = -1;
+    static final public int QUICK_SAVE_SLOT = -2;
+    static final public int INVALID_SAVE_SLOT = -3;
+    static final WorldSave currentSave = new WorldSave();
     public WorldSaveHeader header = new WorldSaveHeader();
-    private final AdventurePlayer player=new AdventurePlayer();
-    private final World world=new World();
-    private final PointOfInterestChanges.Map pointOfInterestChanges=  new PointOfInterestChanges.Map();
+    private final AdventurePlayer player = new AdventurePlayer();
+    private final World world = new World();
+    private final PointOfInterestChanges.Map pointOfInterestChanges = new PointOfInterestChanges.Map();
 
 
-    private final SignalList onLoadList=new SignalList();
+    private final SignalList onLoadList = new SignalList();
 
-    public final World getWorld()
-    {
+    public final World getWorld() {
         return world;
     }
-    public AdventurePlayer getPlayer()
-    {
+
+    public AdventurePlayer getPlayer() {
         return player;
     }
 
-    public void onLoad(Runnable run)
-    {
+    public void onLoad(Runnable run) {
         onLoadList.add(run);
     }
-    public PointOfInterestChanges getPointOfInterestChanges(String id)
-    {
-        if(!pointOfInterestChanges.containsKey(id))
-            pointOfInterestChanges.put(id,new PointOfInterestChanges());
+
+    public PointOfInterestChanges getPointOfInterestChanges(String id) {
+        if (!pointOfInterestChanges.containsKey(id))
+            pointOfInterestChanges.put(id, new PointOfInterestChanges());
         return pointOfInterestChanges.get(id);
     }
 
     static public boolean load(int currentSlot) {
 
         String fileName = WorldSave.getSaveFile(currentSlot);
-        if(!new File(fileName).exists())
+        if (!new File(fileName).exists())
             return false;
         new File(getSaveDir()).mkdirs();
         try {
-            try(FileInputStream fos  = new FileInputStream(fileName);
-                InflaterInputStream inf = new InflaterInputStream(fos);
-                ObjectInputStream oos = new ObjectInputStream(inf))
-            {
+            try (FileInputStream fos = new FileInputStream(fileName);
+                 InflaterInputStream inf = new InflaterInputStream(fos);
+                 ObjectInputStream oos = new ObjectInputStream(inf)) {
                 currentSave.header = (WorldSaveHeader) oos.readObject();
-                SaveFileData mainData=(SaveFileData)oos.readObject();
+                SaveFileData mainData = (SaveFileData) oos.readObject();
                 currentSave.player.load(mainData.readSubData("player"));
                 GamePlayerUtil.getGuiPlayer().setName(currentSave.player.getName());
                 try {
@@ -95,9 +92,11 @@ public class WorldSave   {
         }
         return true;
     }
+
     public static boolean isSafeFile(String name) {
-        return filenameToSlot(name)!= INVALID_SAVE_SLOT;
+        return filenameToSlot(name) != INVALID_SAVE_SLOT;
     }
+
     static public int filenameToSlot(String name) {
         if (name.equals("auto_save.sav"))
             return AUTO_SAVE_SLOT;
@@ -131,10 +130,10 @@ public class WorldSave   {
     public static WorldSave generateNewWorld(String name, boolean male, int race, int avatarIndex, ColorSet startingColorIdentity, DifficultyData diff, AdventureModes mode, int customDeckIndex, CardEdition starterEdition, long seed) {
         currentSave.world.generateNew(seed);
         currentSave.pointOfInterestChanges.clear();
-        boolean chaos=mode==AdventureModes.Chaos;
-        boolean custom=mode==AdventureModes.Custom;
-        Deck starterDeck = Config.instance().starterDeck(startingColorIdentity,diff,mode,customDeckIndex,starterEdition);
-        currentSave.player.create(name,  starterDeck, male, race, avatarIndex, chaos, custom, diff);
+        boolean chaos = mode == AdventureModes.Chaos;
+        boolean custom = mode == AdventureModes.Custom;
+        Deck starterDeck = Config.instance().starterDeck(startingColorIdentity, diff, mode, customDeckIndex, starterEdition);
+        currentSave.player.create(name, starterDeck, male, race, avatarIndex, chaos, custom, diff);
         currentSave.player.setWorldPosY((int) (currentSave.world.getData().playerStartPosY * currentSave.world.getData().height * currentSave.world.getTileSize()));
         currentSave.player.setWorldPosX((int) (currentSave.world.getData().playerStartPosX * currentSave.world.getData().width * currentSave.world.getTileSize()));
         currentSave.onLoadList.emit();
@@ -142,46 +141,103 @@ public class WorldSave   {
     }
 
     public boolean autoSave() {
-        return save("auto save"+ SaveLoadScene.instance().getSaveFileSuffix(),AUTO_SAVE_SLOT);
+        return save("auto save" + SaveLoadScene.instance().getSaveFileSuffix(), AUTO_SAVE_SLOT);
     }
+
     public boolean quickSave() {
-        return save("quick save"+ SaveLoadScene.instance().getSaveFileSuffix(),QUICK_SAVE_SLOT);
+        return save("quick save" + SaveLoadScene.instance().getSaveFileSuffix(), QUICK_SAVE_SLOT);
     }
+
     public boolean quickLoad() {
         return load(QUICK_SAVE_SLOT);
     }
+
     public boolean save(String text, int currentSlot) {
         header.name = text;
 
         String fileName = WorldSave.getSaveFile(currentSlot);
+        String oldFileName = fileName.replace(".sav", ".old");
         new File(getSaveDir()).mkdirs();
+        File currentFile = new File(fileName);
+        File backupFile = new File(oldFileName);
+        if (currentFile.exists())
+            currentFile.renameTo(backupFile);
 
         try {
-            try(FileOutputStream fos =  new FileOutputStream(fileName);
-                DeflaterOutputStream def= new DeflaterOutputStream(fos);
-                ObjectOutputStream oos = new ObjectOutputStream(def))
-            {
-                header.saveDate= new Date();
-                oos.writeObject(header);
-                SaveFileData mainData=new SaveFileData();
-                mainData.store("player",currentSave.player.save());
-                mainData.store("world",currentSave.world.save());
-                mainData.store("worldStage", WorldStage.getInstance().save());
-                mainData.store("pointOfInterestChanges",currentSave.pointOfInterestChanges.save());
+            try (FileOutputStream fos = new FileOutputStream(fileName);
+                 DeflaterOutputStream def = new DeflaterOutputStream(fos);
+                 ObjectOutputStream oos = new ObjectOutputStream(def)) {
+                SaveFileData player = currentSave.player.save();
+                SaveFileData world = currentSave.world.save();
+                SaveFileData worldStage = WorldStage.getInstance().save();
+                SaveFileData poiChanges = currentSave.pointOfInterestChanges.save();
 
+                String message = getExceptionMessage(player, world, worldStage, poiChanges);
+                if (!message.isEmpty()) {
+                    oos.close();
+                    fos.close();
+                    restoreBackup(oldFileName, fileName);
+                    announceError(message);
+                    return true;
+                }
+
+                SaveFileData mainData = new SaveFileData();
+                mainData.store("player", player);
+                mainData.store("world", world);
+                mainData.store("worldStage", worldStage);
+                mainData.store("pointOfInterestChanges", poiChanges);
+
+                if (mainData.readString("IOException") != null) {
+                    oos.close();
+                    fos.close();
+                    restoreBackup(oldFileName, fileName);
+                    announceError("Please check forge.log for errors.");
+                    return true;
+                }
+
+                header.saveDate = new Date();
+                oos.writeObject(header);
                 oos.writeObject(mainData);
             }
 
         } catch (IOException e) {
-            e.printStackTrace();
-            return false;
+            restoreBackup(oldFileName, fileName);
+            announceError("Please check forge.log for errors.");
+            return true;
         }
 
         Config.instance().getSettingData().lastActiveSave = WorldSave.filename(currentSlot);
         Config.instance().saveSettings();
+        if (backupFile.exists())
+            backupFile.delete();
         return true;
     }
 
+    public void restoreBackup(String oldFilename, String currentFilename) {
+        File f = new File(currentFilename);
+        if (f.exists())
+            f.delete();
+        File b = new File(oldFilename);
+        if (b.exists())
+            b.renameTo(new File(currentFilename));
+    }
+
+    public String getExceptionMessage(SaveFileData... datas) {
+        StringBuilder message = new StringBuilder();
+
+        for (SaveFileData data : datas) {
+          String s = data.readString("IOException");
+          if (s != null)
+              message.append(s).append("\n");
+        }
+
+        return message.toString();
+    }
+
+    private void announceError(String message) {
+        currentSave.player.getCurrentGameStage().setExtraAnnouncement("Error Saving File!\n" + message);
+    }
+
     public void clearChanges() {
         pointOfInterestChanges.clear();
     }
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index fd6a9c11419..c0177e07a16 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -537,17 +537,6 @@ public class ImageCache {
         return Pair.of(c, brightness > 155);
     }
 
-    private static class ImageRecord {
-        String colorValue;
-        Boolean isCloserToWhite;
-        Integer cardRadius;
-        boolean isFullBorder;
-
-        ImageRecord(String colorString, Boolean closetoWhite, int radius, boolean fullborder) {
-            colorValue = colorString;
-            isCloserToWhite = closetoWhite;
-            cardRadius = radius;
-            isFullBorder = fullborder;
-        }
+    private record ImageRecord(String colorValue, Boolean isCloserToWhite, int cardRadius, boolean isFullBorder) {
     }
 }
diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
index 75ffcb74b25..5d182b3a907 100644
--- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
+++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
@@ -186,8 +186,8 @@ public class CardFaceSymbols {
     public static void drawColorSet(Graphics g, ColorSet colorSet, float x, float y, final float imageSize, boolean vertical) {
         final float dx = imageSize;
 
-        for (final ManaCostShard s : colorSet.getOrderedShards()) {
-            drawSymbol(s.getImageKey(), g, x, y, imageSize, imageSize);
+        for (final MagicColor.Color s : colorSet.getOrderedColors()) {
+            drawSymbol(s.getShortName(), g, x, y, imageSize, imageSize);
             if (!vertical)
                 x += dx;
             else
diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index 265901d3b19..6df633e82be 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -49,6 +49,24 @@ public class CardImageRenderer {
         return FSkinColor.fromRGB(detailColor.r, detailColor.g, detailColor.b);
     }
 
+    private static float getCapHeight(FSkinFont fSkinFont) {
+        if (fSkinFont == null)
+            return 0f;
+        return fSkinFont.getCapHeight();
+    }
+
+    private static float getAscent(FSkinFont fSkinFont) {
+        if (fSkinFont == null)
+            return 0f;
+        return fSkinFont.getAscent();
+    }
+
+    private static float getBoundsWidth(String sequence, FSkinFont fSkinFont) {
+        if (fSkinFont == null)
+            return 0f;
+        return fSkinFont.getBounds(sequence).width;
+    }
+
     public static void forceStaticFieldUpdate() {
         //force static fields to be updated the next time a card image is rendered
         prevImageWidth = 0;
@@ -143,7 +161,7 @@ public class CardImageRenderer {
         x += outerBorderThickness;
         y += outerBorderThickness;
         w -= 2 * outerBorderThickness;
-        float headerHeight = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * NAME_FONT.getCapHeight()) + 2;
+        float headerHeight = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * getCapHeight(NAME_FONT)) + 2;
 
         //draw header containing name and mana cost
         Color[] headerColors = FSkinColor.tintColors(Color.WHITE, colors, CardRenderer.NAME_BOX_TINT);
@@ -158,15 +176,15 @@ public class CardImageRenderer {
 
         float artWidth = w - 2 * artInset;
         float artHeight = !showArtBox ? 0f : artWidth / CardRenderer.CARD_ART_RATIO;
-        float typeBoxHeight = 2 * TYPE_FONT.getCapHeight();
+        float typeBoxHeight = 2 * getCapHeight(TYPE_FONT);
         float ptBoxHeight = 0;
         float textBoxHeight = h - headerHeight - artHeight - typeBoxHeight - outerBorderThickness - artInset;
 
         if (state.isCreature() || state.isPlaneswalker() || state.hasPrintedPT() || state.isBattle()) {
-            ptBoxHeight = 2 * PT_FONT.getCapHeight();
+            ptBoxHeight = 2 * getCapHeight(PT_FONT);
         }
         //space for artist
-        textBoxHeight -= 2 * PT_FONT.getCapHeight();
+        textBoxHeight -= 2 * getCapHeight(PT_FONT);
         PaperCard paperCard = null;
         try {
             paperCard = ImageUtil.getPaperCardFromImageKey(state.getImageKey());
@@ -246,7 +264,7 @@ public class CardImageRenderer {
         }
         //draw artist
         if (showArtist)
-            g.drawOutlinedText(artist, TEXT_FONT, Color.WHITE, Color.DARK_GRAY, x + (TYPE_FONT.getCapHeight() / 2), y + (TYPE_FONT.getCapHeight() / 2), w, h, false, Align.left, false);
+            g.drawOutlinedText(artist, TEXT_FONT, Color.WHITE, Color.DARK_GRAY, x + (getCapHeight(TYPE_FONT) / 2), y + (getCapHeight(TYPE_FONT) / 2), w, h, false, Align.left, false);
     }
     private static void drawOutlineColor(Graphics g, ColorSet colors, float x, float y, float w, float h) {
         if (colors == null)
@@ -296,7 +314,7 @@ public class CardImageRenderer {
                 manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, manaSymbolSize) + HEADER_PADDING;
                 CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth, y + (h - manaSymbolSize) / 2, manaSymbolSize);
                 //draw "//" between two parts of mana cost
-                manaCostWidth += NAME_FONT.getBounds("//").width + HEADER_PADDING;
+                manaCostWidth += getBoundsWidth("//", NAME_FONT) + HEADER_PADDING;
                 g.drawText("//", NAME_FONT, Color.BLACK, x + w - manaCostWidth, y, w, h, false, Align.left, true);
             }
             manaCostWidth += CardFaceSymbols.getWidth(mainManaCost, manaSymbolSize) + HEADER_PADDING;
@@ -517,7 +535,7 @@ public class CardImageRenderer {
             } else {
                 //left
                 //float headerHeight = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * TYPE_FONT.getCapHeight()) + 2;
-                float typeBoxHeight = 2 * TYPE_FONT.getCapHeight();
+                float typeBoxHeight = 2 * getCapHeight(TYPE_FONT);
                 drawHeader(g, card, card.getState(true), altcolors, x, y, w - (w / 2), typeBoxHeight, noText, true);
                 drawTypeLine(g, card.getState(true), canShow, altcolors, x, y + typeBoxHeight, w - (w / 2), typeBoxHeight, noText, true, true);
                 float mod = (typeBoxHeight + typeBoxHeight);
@@ -714,7 +732,7 @@ public class CardImageRenderer {
                 return;
             }
 
-            float padding = TEXT_FONT.getCapHeight() * 0.75f;
+            float padding = getCapHeight(TEXT_FONT) * 0.75f;
             x += padding;
             y += padding;
             w -= 2 * padding;
@@ -747,15 +765,15 @@ public class CardImageRenderer {
             return;
         }
 
-        float padding = Math.round(PT_FONT.getCapHeight() / 4);
+        float padding = Math.round(getCapHeight(PT_FONT) / 4);
         float totalPieceWidth = -padding;
         float[] pieceWidths = new float[pieces.size()];
         for (int i = 0; i < pieces.size(); i++) {
-            float pieceWidth = PT_FONT.getBounds(pieces.get(i)).width + padding;
+            float pieceWidth = getBoundsWidth(pieces.get(i), PT_FONT) + padding;
             pieceWidths[i] = pieceWidth;
             totalPieceWidth += pieceWidth;
         }
-        float boxHeight = PT_FONT.getCapHeight() + PT_FONT.getAscent() + 3 * padding;
+        float boxHeight = getCapHeight(PT_FONT) + getAscent(PT_FONT) + 3 * padding;
 
         float boxWidth = Math.max(PT_BOX_WIDTH, totalPieceWidth + 2 * padding);
         x += w - boxWidth;
@@ -951,14 +969,14 @@ public class CardImageRenderer {
         x += outerBorderThickness;
         y += outerBorderThickness;
         w -= 2 * outerBorderThickness;
-        float cardNameBoxHeight = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * NAME_FONT.getCapHeight()) + 2 * TYPE_FONT.getCapHeight() + 2;
+        float cardNameBoxHeight = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * getCapHeight(NAME_FONT)) + 2 * getCapHeight(TYPE_FONT) + 2;
 
         //draw name/type box
         Color[] nameBoxColors = FSkinColor.tintColors(Color.WHITE, colors, CardRenderer.NAME_BOX_TINT);
         drawDetailsNameBox(g, card, state, canShow, nameBoxColors, x, y, w, cardNameBoxHeight);
 
         float innerBorderThickness = outerBorderThickness / 2;
-        float ptBoxHeight = 2 * PT_FONT.getCapHeight();
+        float ptBoxHeight = 2 * getCapHeight(PT_FONT);
         float textBoxHeight = h - cardNameBoxHeight - ptBoxHeight - outerBorderThickness - 3 * innerBorderThickness;
 
         y += cardNameBoxHeight + innerBorderThickness;
@@ -1141,7 +1159,7 @@ public class CardImageRenderer {
         float padding = h / 8;
 
         //make sure name/mana cost row height is tall enough for both
-        h = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * NAME_FONT.getCapHeight());
+        h = Math.max(MANA_SYMBOL_SIZE + 2 * HEADER_PADDING, 2 * getCapHeight(NAME_FONT));
 
         //draw mana cost for card
         float manaCostWidth = 0;
@@ -1154,7 +1172,7 @@ public class CardImageRenderer {
                 manaCostWidth = CardFaceSymbols.getWidth(otherManaCost, MANA_SYMBOL_SIZE) + HEADER_PADDING;
                 CardFaceSymbols.drawManaCost(g, otherManaCost, x + w - manaCostWidth, y + (h - MANA_SYMBOL_SIZE) / 2, MANA_SYMBOL_SIZE);
                 //draw "//" between two parts of mana cost
-                manaCostWidth += NAME_FONT.getBounds("//").width + HEADER_PADDING;
+                manaCostWidth += getBoundsWidth("//", NAME_FONT) + HEADER_PADDING;
                 g.drawText("//", NAME_FONT, Color.BLACK, x + w - manaCostWidth, y, w, h, false, Align.left, true);
             }
             manaCostWidth += CardFaceSymbols.getWidth(mainManaCost, MANA_SYMBOL_SIZE) + HEADER_PADDING;
@@ -1168,7 +1186,7 @@ public class CardImageRenderer {
 
         //draw type and set label for card
         y += h;
-        h = 2 * TYPE_FONT.getCapHeight();
+        h = 2 * getCapHeight(TYPE_FONT);
 
         String set = state.getSetCode();
         CardRarity rarity = state.getRarity();
@@ -1189,7 +1207,7 @@ public class CardImageRenderer {
         fillColorBackground(g, colors, x, y, w, h);
         g.drawRect(BORDER_THICKNESS, Color.BLACK, x, y, w, h);
 
-        float padX = TEXT_FONT.getCapHeight() / 2;
+        float padX = getCapHeight(TEXT_FONT) / 2;
         float padY = padX + Utils.scale(2); //add a little more vertical padding
         x += padX;
         y += padY;
@@ -1202,8 +1220,8 @@ public class CardImageRenderer {
         float idWidth = 0;
         if (canShow) {
             String idText = CardDetailUtil.formatCardId(state);
-            g.drawText(idText, TYPE_FONT, idForeColor, x, y + TYPE_FONT.getCapHeight() / 2, w, h, false, Align.left, false);
-            idWidth = TYPE_FONT.getBounds(idText).width;
+            g.drawText(idText, TYPE_FONT, idForeColor, x, y + getCapHeight(TYPE_FONT) / 2, w, h, false, Align.left, false);
+            idWidth = getBoundsWidth(idText, TYPE_FONT);
         }
 
         String ptText = CardDetailUtil.formatPrimaryCharacteristic(state, canShow);
@@ -1212,7 +1230,7 @@ public class CardImageRenderer {
         }
 
         TextBounds bounds = cardTextRenderer.getBounds(ptText, PT_FONT);
-        float padding = PT_FONT.getCapHeight() / 2;
+        float padding = getCapHeight(PT_FONT) / 2;
         float boxWidth = Math.min(bounds.width + 2 * padding,
                 w - idWidth - padding); //prevent box overlapping ID
         x += w - boxWidth;
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index 627dd19b46d..af3b1e5dfe9 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -220,6 +220,10 @@ public class CardRenderer {
         if (pc.getRules() == null)
             return getCardArt(pc.getImageKey(backFace), false, false, false, false, false, false, false, false, true, false);
 
+        if (pc.getRules().isUnsupported()) {
+            return CardImageRenderer.forgeArt;
+        }
+
         CardType type = pc.getRules().getType();
         return getCardArt(pc.getImageKey(backFace), pc.getRules().getSplitType() == CardSplitType.Split,
                 type.isPlane() || type.isPhenomenon(), pc.getRules().getOracleText().contains("Aftermath"),
diff --git a/forge-gui-mobile/src/forge/card/ColorSetImage.java b/forge-gui-mobile/src/forge/card/ColorSetImage.java
deleted file mode 100644
index de8b20020ce..00000000000
--- a/forge-gui-mobile/src/forge/card/ColorSetImage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package forge.card;
-
-import forge.Forge;
-import forge.Graphics;
-import forge.assets.FImage;
-import forge.localinstance.skin.FSkinProp;
-
-public class ColorSetImage implements FImage {
-    private final ColorSet colorSet;
-    private final int shardCount;
-
-    public ColorSetImage(ColorSet colorSet0) {
-        colorSet = colorSet0;
-        shardCount = colorSet.getOrderedShards().length;
-    }
-
-    @Override
-    public float getWidth() {
-        return Forge.getAssets().images().get(FSkinProp.IMG_MANA_W).getWidth() * shardCount;
-    }
-
-    @Override
-    public float getHeight() {
-        return Forge.getAssets().images().get(FSkinProp.IMG_MANA_W).getHeight();
-    }
-
-    @Override
-    public void draw(Graphics g, float x, float y, float w, float h) {
-        float imageSize = w / shardCount;
-        if (imageSize > h) {
-            imageSize = h;
-            float w0 = imageSize * shardCount;
-            x += (w - w0) / 2;
-            w = w0;
-        }
-        CardFaceSymbols.drawColorSet(g, colorSet, x, y, imageSize);
-    }
-}
diff --git a/forge-gui-mobile/src/forge/card/GameEntityPicker.java b/forge-gui-mobile/src/forge/card/GameEntityPicker.java
index 2591e8a670e..8146a8c1f85 100644
--- a/forge-gui-mobile/src/forge/card/GameEntityPicker.java
+++ b/forge-gui-mobile/src/forge/card/GameEntityPicker.java
@@ -3,6 +3,7 @@ package forge.card;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 
 import com.google.common.collect.ImmutableList;
 
@@ -20,12 +21,11 @@ import forge.toolbox.FEvent;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextField;
-import forge.util.Callback;
 
 public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
     private final FOptionPane optionPane;
 
-    public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Callback<GameEntityView> callback) {
+    public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Consumer<GameEntityView> callback) {
         super(new PickerTab[] {
                 new PickerTab(choiceList, Forge.getLocalizer().getMessage("lblChoices"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, 1),
                 new PickerTab(revealList, revealListCaption, revealListImage, 0)
@@ -34,15 +34,12 @@ public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
         setHeight(FOptionPane.getMaxDisplayObjHeight());
 
         optionPane = new FOptionPane(null, null, title, null, this,
-                isOptional ? ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")) : ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, new Callback<Integer>() {
-                    @Override
-                    public void run(Integer result) {
-                        if (result == 0) {
-                            callback.run(((PickerTab) tabPages.get(0)).list.getSelectedItem());
-                        }
-                        else {
-                            callback.run(null);
-                        }
+                isOptional ? ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")) : ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, result -> {
+                    if (result == 0) {
+                        callback.accept(((PickerTab) tabPages.get(0)).list.getSelectedItem());
+                    }
+                    else {
+                        callback.accept(null);
                     }
                 }) {
             @Override
diff --git a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
index 1e82406728d..d7709e5cee8 100644
--- a/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
+++ b/forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
@@ -21,6 +21,7 @@ import java.text.NumberFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -55,10 +56,10 @@ public class AddBasicLandsDialog extends FDialog {
 
     private final Deck currentDeck;
 
-    private final Callback<CardPool> callback;
+    private final Consumer<CardPool> callback;
 
     private final FLabel lblLandSet = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblLandSet") + ":").font(FSkinFont.get(12)).textColor(FLabel.getInlineLabelColor()).build());
-    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(IterableUtil.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands)));
+    private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(IterableUtil.filter(StaticData.instance().getSortedEditions(), CardEdition::hasBasicLands)));
 
     private final FScrollPane scroller = add(new FScrollPane() {
         @Override
@@ -113,7 +114,7 @@ public class AddBasicLandsDialog extends FDialog {
     private int nonLandCount, oldLandCount;
     private CardEdition landSet;
 
-    public AddBasicLandsDialog(Deck deck, CardEdition defaultLandSet, final Callback<CardPool> callback0, List<CardEdition> editionOptions) {
+    public AddBasicLandsDialog(Deck deck, CardEdition defaultLandSet, final Consumer<CardPool> callback0, List<CardEdition> editionOptions) {
         super(Forge.getLocalizer().getMessage("lblAddBasicLandsAutoSuggest").replace("%s", deck.getName()), 2);
 
         callback = callback0;
@@ -149,7 +150,7 @@ public class AddBasicLandsDialog extends FDialog {
             hide();
 
             if (landsToAdd.countAll() > 0) {
-                callback.run(landsToAdd);
+                callback.accept(landsToAdd);
             }
         });
         initButton(1, Forge.getLocalizer().getMessage("lblCancel"), e -> hide());
diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 5297a42472e..f3ee6bbe455 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.function.Consumer;
 
 import forge.game.GameFormat;
 import forge.util.MyRandom;
@@ -52,7 +53,6 @@ import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.GuiChoose;
 import forge.toolbox.ListChooser;
-import forge.util.Callback;
 import forge.util.Utils;
 import forge.util.storage.IStorage;
 
@@ -62,7 +62,7 @@ public class FDeckChooser extends FScreen {
     private FComboBox<DeckType> cmbDeckTypes;
     private DeckType selectedDeckType;
     private boolean needRefreshOnActivate;
-    private Callback<Deck> callback;
+    private Consumer<Deck> callback;
     private NetDeckCategory netDeckCategory;
     private NetDeckArchiveStandard NetDeckArchiveStandard;
     private NetDeckArchivePioneer NetDeckArchivePioneer;
@@ -88,7 +88,7 @@ public class FDeckChooser extends FScreen {
     private FOptionPane optionPane;
 
     //Show dialog to select a deck
-    public static void promptForDeck(String title, GameType gameType, boolean forAi, final Callback<Deck> callback) {
+    public static void promptForDeck(String title, GameType gameType, boolean forAi, final Consumer<Deck> callback) {
         FThreads.assertExecutedByEdt(true);
 
         final FDeckChooser deckChooser = new FDeckChooser(gameType, forAi, null);
@@ -109,13 +109,10 @@ public class FDeckChooser extends FScreen {
         container.add(deckChooser.lstDecks);
         container.setHeight(FOptionPane.getMaxDisplayObjHeight());
 
-        deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblOK"), Forge.getLocalizer().getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
-            @Override
-            public void run(Integer result) {
-                if (result == 0) {
-                    if (callback != null) {
-                        callback.run(deckChooser.getDeck());
-                    }
+        deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblOK"), Forge.getLocalizer().getInstance().getMessage("lblCancel")), 0, result -> {
+            if (result == 0) {
+                if (callback != null) {
+                    callback.accept(deckChooser.getDeck());
                 }
             }
         }) {
@@ -230,7 +227,7 @@ public class FDeckChooser extends FScreen {
         if (optionPane == null) {
             Forge.back();
             if (callback != null) {
-                callback.run(getDeck());
+                callback.accept(getDeck());
             }
         }
         else {
@@ -429,36 +426,33 @@ public class FDeckChooser extends FScreen {
 
             //prompt to duplicate deck if deck doesn't exist already
             FOptionPane.showConfirmDialog(selectedDeckType + " " + Forge.getLocalizer().getMessage("lblCannotEditDuplicateCustomDeck").replace("%s", deck.getName()),
-                    Forge.getLocalizer().getMessage("lblDuplicateDeck"), Forge.getLocalizer().getMessage("lblDuplicate"), Forge.getLocalizer().getMessage("lblCancel"), new Callback<Boolean>() {
-                @Override
-                public void run(Boolean result) {
-                    if (result) {
-                        Deck copiedDeck = (Deck)deck.getDeck().copyTo(deck.getName());
-                        IStorage<Deck> storage;
+                    Forge.getLocalizer().getMessage("lblDuplicateDeck"), Forge.getLocalizer().getMessage("lblDuplicate"), Forge.getLocalizer().getMessage("lblCancel"), result -> {
+                        if (result) {
+                            Deck copiedDeck = (Deck)deck.getDeck().copyTo(deck.getName());
+                            IStorage<Deck> storage;
 
-                        switch(lstDecks.getGameType()) {
-                            case Commander:
-                                storage = FModel.getDecks().getCommander();
-                                break;
-                            case Brawl:
-                                storage = FModel.getDecks().getBrawl();
-                                break;
-                            case TinyLeaders:
-                                storage = FModel.getDecks().getTinyLeaders();
-                                break;
-                            case Oathbreaker:
-                                storage = FModel.getDecks().getOathbreaker();
-                                break;
-                            default:
-                                storage = FModel.getDecks().getConstructed();
-                                break;
+                            switch(lstDecks.getGameType()) {
+                                case Commander:
+                                    storage = FModel.getDecks().getCommander();
+                                    break;
+                                case Brawl:
+                                    storage = FModel.getDecks().getBrawl();
+                                    break;
+                                case TinyLeaders:
+                                    storage = FModel.getDecks().getTinyLeaders();
+                                    break;
+                                case Oathbreaker:
+                                    storage = FModel.getDecks().getOathbreaker();
+                                    break;
+                                default:
+                                    storage = FModel.getDecks().getConstructed();
+                                    break;
+                            }
+                            storage.add(copiedDeck);
+                            setSelectedDeckType(fallbackType);
+                            editDeck(new DeckProxy(copiedDeck, "Constructed", lstDecks.getGameType(), storage));
                         }
-                        storage.add(copiedDeck);
-                        setSelectedDeckType(fallbackType);
-                        editDeck(new DeckProxy(copiedDeck, "Constructed", lstDecks.getGameType(), storage));
-                    }
-                }
-            });
+                    });
             break;
         }
     }
@@ -1421,50 +1415,46 @@ public class FDeckChooser extends FScreen {
             return;
         }
 
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 1, 50, new Callback<Integer>() {
-            @Override
-            public void run(final Integer numOpponents) {
-                if (numOpponents == null) { return; }
-                List<DeckType> deckTypes = Lists.newArrayList(
-                        DeckType.CUSTOM_DECK,
-                        DeckType.PRECONSTRUCTED_DECK,
-                        DeckType.QUEST_OPPONENT_DECK,
-                        DeckType.COLOR_DECK,
-                        DeckType.STANDARD_COLOR_DECK,
-                        DeckType.STANDARD_CARDGEN_DECK,
-                        DeckType.MODERN_COLOR_DECK,
-                        DeckType.PAUPER_COLOR_DECK,
-                        DeckType.PIONEER_CARDGEN_DECK,
-                        DeckType.HISTORIC_CARDGEN_DECK,
-                        DeckType.MODERN_CARDGEN_DECK,
-                        DeckType.LEGACY_CARDGEN_DECK,
-                        DeckType.VINTAGE_CARDGEN_DECK,
-                        DeckType.PAUPER_CARDGEN_DECK,
-                        DeckType.THEME_DECK,
-                        DeckType.NET_DECK,
-                        DeckType.NET_ARCHIVE_STANDARD_DECK,
-                        DeckType.NET_ARCHIVE_PIONEER_DECK,
-                        DeckType.NET_ARCHIVE_MODERN_DECK,
-                        DeckType.NET_ARCHIVE_PAUPER_DECK,
-                        DeckType.NET_ARCHIVE_VINTAGE_DECK,
-                        DeckType.NET_ARCHIVE_LEGACY_DECK,
-                        DeckType.NET_ARCHIVE_BLOCK_DECK
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 1, 50, numOpponents -> {
+            if (numOpponents == null) { return; }
+            List<DeckType> deckTypes = Lists.newArrayList(
+                    DeckType.CUSTOM_DECK,
+                    DeckType.PRECONSTRUCTED_DECK,
+                    DeckType.QUEST_OPPONENT_DECK,
+                    DeckType.COLOR_DECK,
+                    DeckType.STANDARD_COLOR_DECK,
+                    DeckType.STANDARD_CARDGEN_DECK,
+                    DeckType.MODERN_COLOR_DECK,
+                    DeckType.PAUPER_COLOR_DECK,
+                    DeckType.PIONEER_CARDGEN_DECK,
+                    DeckType.HISTORIC_CARDGEN_DECK,
+                    DeckType.MODERN_CARDGEN_DECK,
+                    DeckType.LEGACY_CARDGEN_DECK,
+                    DeckType.VINTAGE_CARDGEN_DECK,
+                    DeckType.PAUPER_CARDGEN_DECK,
+                    DeckType.THEME_DECK,
+                    DeckType.NET_DECK,
+                    DeckType.NET_ARCHIVE_STANDARD_DECK,
+                    DeckType.NET_ARCHIVE_PIONEER_DECK,
+                    DeckType.NET_ARCHIVE_MODERN_DECK,
+                    DeckType.NET_ARCHIVE_PAUPER_DECK,
+                    DeckType.NET_ARCHIVE_VINTAGE_DECK,
+                    DeckType.NET_ARCHIVE_LEGACY_DECK,
+                    DeckType.NET_ARCHIVE_BLOCK_DECK
 
-                );
-                if (!FModel.isdeckGenMatrixLoaded()) {
-                    deckTypes.remove(DeckType.STANDARD_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.PIONEER_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.HISTORIC_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.MODERN_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.LEGACY_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.VINTAGE_CARDGEN_DECK);
-                    deckTypes.remove(DeckType.PAUPER_CARDGEN_DECK);
-                }
+            );
+            if (!FModel.isdeckGenMatrixLoaded()) {
+                deckTypes.remove(DeckType.STANDARD_CARDGEN_DECK);
+                deckTypes.remove(DeckType.PIONEER_CARDGEN_DECK);
+                deckTypes.remove(DeckType.HISTORIC_CARDGEN_DECK);
+                deckTypes.remove(DeckType.MODERN_CARDGEN_DECK);
+                deckTypes.remove(DeckType.LEGACY_CARDGEN_DECK);
+                deckTypes.remove(DeckType.VINTAGE_CARDGEN_DECK);
+                deckTypes.remove(DeckType.PAUPER_CARDGEN_DECK);
+            }
 
-                ListChooser<DeckType> chooser = new ListChooser<>(
-                        Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
-                    @Override
-                    public void run(final List<DeckType> allowedDeckTypes) {
+            ListChooser<DeckType> chooser = new ListChooser<>(
+                    Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, deckTypes.size(), deckTypes, null, allowedDeckTypes -> {
                         if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
                             return;
                         }
@@ -1490,38 +1480,33 @@ public class FDeckChooser extends FScreen {
                                 gauntlet.startRound(players, humanPlayer);
                             }));
                         });
-                    }
-                });
-                chooser.show(null, false); /*setting selectMax to true will select all available option*/
-            }
+                    });
+            chooser.show(null, false); /*setting selectMax to true will select all available option*/
         });
     }
 
     private void testVariantDeck(final Deck userDeck, final GameType variant) {
-        promptForDeck(Forge.getLocalizer().getMessage("lblSelectOpponentDeck"), variant, true, new Callback<Deck>() {
-            @Override
-            public void run(final Deck aiDeck) {
-                if (aiDeck == null) { return; }
+        promptForDeck(Forge.getLocalizer().getMessage("lblSelectOpponentDeck"), variant, true, aiDeck -> {
+            if (aiDeck == null) { return; }
 
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
-                    Set<GameType> appliedVariants = new HashSet<>();
-                    appliedVariants.add(variant);
+            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                Set<GameType> appliedVariants = new HashSet<>();
+                appliedVariants.add(variant);
 
-                    List<RegisteredPlayer> players = new ArrayList<>();
-                    RegisteredPlayer humanPlayer = RegisteredPlayer.forVariants(2, appliedVariants, userDeck, null, false, null, null);
-                    humanPlayer.setPlayer(GamePlayerUtil.getGuiPlayer());
-                    RegisteredPlayer aiPlayer = RegisteredPlayer.forVariants(2, appliedVariants, aiDeck, null, false, null, null);
-                    aiPlayer.setPlayer(GamePlayerUtil.createAiPlayer());
-                    players.add(humanPlayer);
-                    players.add(aiPlayer);
+                List<RegisteredPlayer> players = new ArrayList<>();
+                RegisteredPlayer humanPlayer = RegisteredPlayer.forVariants(2, appliedVariants, userDeck, null, false, null, null);
+                humanPlayer.setPlayer(GamePlayerUtil.getGuiPlayer());
+                RegisteredPlayer aiPlayer = RegisteredPlayer.forVariants(2, appliedVariants, aiDeck, null, false, null, null);
+                aiPlayer.setPlayer(GamePlayerUtil.createAiPlayer());
+                players.add(humanPlayer);
+                players.add(aiPlayer);
 
-                    final Map<RegisteredPlayer, IGuiGame> guiMap = new HashMap<>();
-                    guiMap.put(humanPlayer, MatchController.instance);
+                final Map<RegisteredPlayer, IGuiGame> guiMap = new HashMap<>();
+                guiMap.put(humanPlayer, MatchController.instance);
 
-                    final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
-                    hostedMatch.startMatch(GameType.Constructed, appliedVariants, players, guiMap);
-                });
-            }
+                final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
+                hostedMatch.startMatch(GameType.Constructed, appliedVariants, players, guiMap);
+            });
         });
     }
 
diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index d9da6455b96..0307b1a9f7d 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -30,6 +30,7 @@ import forge.itemmanager.ItemManager.ContextMenuBuilder;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.filters.ItemFilter;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.menu.*;
 import forge.model.FModel;
 import forge.screens.FScreen;
@@ -81,13 +82,21 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         public boolean allowsCardReplacement() { return hasInfiniteCardPool() || usePlayerInventory(); }
 
         public List<CardEdition> getBasicLandSets(Deck currentDeck) {
+            if(hasInfiniteCardPool())
+                return FModel.getMagicDb().getSortedEditions().stream().filter(CardEdition::hasBasicLands).collect(Collectors.toList());
             return List.of(DeckProxy.getDefaultLandSet(currentDeck));
         }
 
         protected abstract IDeckController getController();
         protected abstract DeckEditorPage[] getInitialPages();
 
-        protected DeckSection[] getExtraSections() {
+        public DeckSection[] getPrimarySections() {
+            if(getGameType() != null)
+                return getGameType().getPrimaryDeckSections().toArray(new DeckSection[0]);
+            return new DeckSection[]{DeckSection.Main, DeckSection.Sideboard};
+        }
+
+        public DeckSection[] getExtraSections() {
             if(getGameType() != null)
                 return getGameType().getSupplimentalDeckSections().toArray(new DeckSection[0]);
             return new DeckSection[]{DeckSection.Attractions, DeckSection.Contraptions};
@@ -144,7 +153,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         ItemManagerConfig catalogConfig = null;
         ItemManagerConfig mainSectionConfig = null;
         ItemManagerConfig sideboardConfig = null;
-        Function<Deck, CardEdition> fnGetBasicLandSet = null;
+        Function<Deck, Collection<CardEdition>> fnGetBasicLandSet = null;
         Supplier<ItemPool<PaperCard>> itemPoolSupplier = null;
         String catalogCaption = null;
 
@@ -196,7 +205,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             this.sideboardConfig = sideboardConfig;
             return this;
         }
-        public GameTypeDeckEditorConfig setBasicLandSetFunction(Function<Deck, CardEdition> fnGetBasicLandSet) {
+        public GameTypeDeckEditorConfig setBasicLandSetFunction(Function<Deck, Collection<CardEdition>> fnGetBasicLandSet) {
             this.fnGetBasicLandSet = fnGetBasicLandSet;
             return this;
         }
@@ -296,9 +305,21 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         }
 
         @Override
-        protected DeckSection[] getExtraSections() {
+        public DeckSection[] getPrimarySections() {
+            return gameType.getPrimaryDeckSections().toArray(new DeckSection[0]);
+        }
+
+        @Override
+        public DeckSection[] getExtraSections() {
             return gameType.getSupplimentalDeckSections().toArray(new DeckSection[0]);
         }
+
+        @Override
+        public List<CardEdition> getBasicLandSets(Deck currentDeck) {
+            if(this.fnGetBasicLandSet != null)
+                return List.copyOf(fnGetBasicLandSet.apply(currentDeck));
+            return super.getBasicLandSets(currentDeck);
+        }
     }
 
     public static DeckEditorConfig EditorConfigConstructed = new GameTypeDeckEditorConfig(GameType.Constructed,
@@ -348,18 +369,19 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             .setMainSectionConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setSideboardConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setPlayerInventorySupplier(() -> FModel.getQuest().getCards().getCardpool())
-            .setBasicLandSetFunction(d -> FModel.getQuest().getDefaultLandSet());
+            .setBasicLandSetFunction(d -> FModel.getQuest().getAvailableLandSets());
     public static DeckEditorConfig EditorConfigQuestCommander = new GameTypeDeckEditorConfig(GameType.QuestCommander, DECK_CONTROLLER_QUEST)
             .setCatalogConfig(ItemManagerConfig.QUEST_EDITOR_POOL)
             .setMainSectionConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setSideboardConfig(ItemManagerConfig.QUEST_DECK_EDITOR)
             .setPlayerInventorySupplier(() -> FModel.getQuest().getCards().getCardpool())
-            .setBasicLandSetFunction(d -> FModel.getQuest().getDefaultLandSet());
+            .setBasicLandSetFunction(d -> FModel.getQuest().getAvailableLandSets());
     public static DeckEditorConfig EditorConfigQuestDraft = new GameTypeDeckEditorConfig(GameType.QuestDraft, DECK_CONTROLLER_QUEST_DRAFT);
     public static DeckEditorConfig EditorConfigPlanarConquest = new GameTypeDeckEditorConfig(GameType.PlanarConquest, DECK_CONTROLLER_PLANAR_CONQUEST)
             .setCatalogConfig(ItemManagerConfig.CONQUEST_COLLECTION)
             .setMainSectionConfig(ItemManagerConfig.CONQUEST_DECK_EDITOR)
-            .setPlayerInventorySupplier(ConquestUtil::getAvailablePool);
+            .setPlayerInventorySupplier(ConquestUtil::getAvailablePool)
+            .setBasicLandSetFunction(ConquestUtil::getBasicLandSets);
 
     protected static DeckSectionPage createPageForExtraSection(DeckSection deckSection, DeckEditorConfig editorConfig) {
         CardManager cm = new CardManager(false);
@@ -388,18 +410,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     }
 
     public static FImage iconFromDeckSection(DeckSection deckSection) {
-        return switch (deckSection) {
-            case Main -> MAIN_DECK_ICON;
-            case Sideboard -> SIDEBOARD_ICON;
-            case Commander -> FSkinImage.COMMAND;
-            case Avatar -> FSkinImage.AVATAR;
-            case Conspiracy -> FSkinImage.CONSPIRACY;
-            case Planes -> FSkinImage.PLANAR;
-            case Schemes -> FSkinImage.SCHEME;
-            case Attractions -> FSkinImage.ATTRACTION;
-            case Contraptions -> FSkinImage.CONTRAPTION;
-            default -> FSkinImage.HDSIDEBOARD;
-        };
+        return FSkin.getImages().get(FSkinProp.iconFromDeckSection(deckSection, Forge.hdbuttons));
     }
 
     private final DeckEditorConfig editorConfig;
@@ -542,74 +553,73 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             @Override
             protected void buildMenu() {
                 final Localizer localizer = Forge.getLocalizer();
-                if (allowsAddBasic())
+                if (allowAddBasic())
                     addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, e -> showAddBasicLandsDialog()));
                 if (showAddExtraSectionOption()) {
                     addItem(new FMenuItem(localizer.getMessage("lblAddDeckSection"), FSkinImage.CHAOS, e -> {
                         List<String> options = hiddenExtraSections.stream().map(DeckSection::getLocalizedName).collect(Collectors.toList());
-                        GuiChoose.oneOrNone(localizer.getMessage("lblAddDeckSectionSelect"), options, new Callback<>() {
-                            @Override
-                            public void run(String result) {
-                                if (result == null || !options.contains(result))
-                                    return;
-                                DeckSection newSection = hiddenExtraSections.get(options.indexOf(result));
-                                showExtraSectionTab(newSection);
-                                filterCatalogForExtraSection(newSection);
-                                getCatalogPage().scheduleRefresh();
-                                setSelectedPage(getCatalogPage());
-                            }
+                        GuiChoose.oneOrNone(localizer.getMessage("lblAddDeckSectionSelect"), options, result -> {
+                            if (result == null || !options.contains(result))
+                                return;
+                            DeckSection newSection = hiddenExtraSections.get(options.indexOf(result));
+                            showExtraSectionTab(newSection);
+                            filterCatalogForExtraSection(newSection);
+                            getCatalogPage().scheduleRefresh();
+                            setSelectedPage(getCatalogPage());
                         });
                     }));
                 }
-                if (editorConfig.getGameType() != null && editorConfig.hasInfiniteCardPool()) {
+                if (editorConfig.hasInfiniteCardPool() || editorConfig.usePlayerInventory()) {
                     addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDIMPORT : FSkinImage.OPEN, e -> {
-                        FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), FDeckEditor.this.editorConfig);
-                        dialog.setCallback(new Callback<>() {
-                            @Override
-                            public void run(Deck importedDeck) {
-                                if (deck != null && importedDeck.hasName()) {
-                                    deck.setName(importedDeck.getName());
-                                    setHeaderText(importedDeck.getName());
-                                }
-                                if (dialog.createNewDeck()) {
-                                    for (Entry<DeckSection, CardPool> section : importedDeck) {
-                                        DeckSectionPage page = getPageForSection(section.getKey());
-                                        if (page != null)
-                                            page.setCards(section.getValue());
+                        FDeckImportDialog dialog = new FDeckImportDialog(deck, FDeckEditor.this.editorConfig);
+                        if(editorConfig.usePlayerInventory())
+                            dialog.setFreePrintConverter(FDeckEditor.this::supplyPrintForImporter);
+                        dialog.setImportBannedCards(!FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY));
+                        dialog.setCallback(importedDeck -> {
+                            if (deck != null && importedDeck.hasName()) {
+                                deck.setName(importedDeck.getName());
+                                setHeaderText(importedDeck.getName());
+                            }
+                            switch (dialog.getImportBehavior()) {
+                                case REPLACE_CURRENT:
+                                    for(DeckSectionPage page : pagesBySection.values()) {
+                                        if(importedDeck.has(page.deckSection)) {
+                                            page.setCards(importedDeck.get(page.deckSection));
+                                            if(hiddenExtraSections.contains(page.deckSection))
+                                                showExtraSectionTab(page.deckSection);
+                                        }
+                                        else
+                                            page.setCards(new CardPool());
                                     }
-                                } else {
+                                    break;
+                                case CREATE_NEW:
+                                    deckController.setDeck(importedDeck);
+                                    break;
+                                case MERGE:
                                     for (Entry<DeckSection, CardPool> section : importedDeck) {
                                         DeckSectionPage page = getPageForSection(section.getKey());
                                         if (page != null)
                                             page.addCards(section.getValue());
                                     }
-                                }
                             }
                         });
+                        dialog.initParse();
                         dialog.show();
                         setSelectedPage(getMainDeckPage()); //select main deck page if needed so main deck if visible below dialog
                     }));
                     if (allowSaveAs())
                         addItem(new FMenuItem(localizer.getMessage("lblSaveAs"), Forge.hdbuttons ? FSkinImage.HDSAVEAS : FSkinImage.SAVEAS, e -> {
                             String defaultName = deckController.getNextAvailableName();
-                            FOptionPane.showInputDialog(localizer.getMessage("lblNameNewCopyDeck"), defaultName, new Callback<>() {
-                                @Override
-                                public void run(String result) {
-                                    if (!StringUtils.isEmpty(result)) {
-                                        deckController.saveAs(result);
-                                    }
+                            FOptionPane.showInputDialog(localizer.getMessage("lblNameNewCopyDeck"), defaultName, result -> {
+                                if (!StringUtils.isEmpty(result)) {
+                                    deckController.saveAs(result);
                                 }
                             });
                         }));
                 }
                 if (allowRename()) {
                     addItem(new FMenuItem(localizer.getMessage("lblRenameDeck"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, e -> FOptionPane.showInputDialog(
-                            localizer.getMessage("lblNewNameDeck"), deck.getName(), new Callback<>() {
-                                @Override
-                                public void run(String result) {
-                                    deckController.rename(result);
-                                }
-                            }))
+                            localizer.getMessage("lblNewNameDeck"), deck.getName(), deckController::rename))
                     );
                 }
                 if (allowDelete()) {
@@ -618,13 +628,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                             localizer.getMessage("lblDeleteDeck"),
                             localizer.getMessage("lblDelete"),
                             localizer.getMessage("lblCancel"), false,
-                            new Callback<>() {
-                                @Override
-                                public void run(Boolean result) {
-                                    if (result) {
-                                        deckController.delete();
-                                        Forge.back();
-                                    }
+                            result -> {
+                                if (result) {
+                                    deckController.delete();
+                                    Forge.back();
                                 }
                             }))
                     );
@@ -649,12 +656,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         CardEdition defaultLandSet = allowedLandSets.get(0);
         List<CardEdition> finalAllowedLandSets = allowedLandSets;
         FThreads.invokeInEdtNowOrLater(() -> {
-            AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, new Callback<>() {
-                @Override
-                public void run(CardPool landsToAdd) {
-                    addChosenBasicLands(landsToAdd);
-                }
-            }, editorConfig.hasInfiniteCardPool() ? null : finalAllowedLandSets); //Null allows any lands to be selected
+            AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, this::addChosenBasicLands, editorConfig.hasInfiniteCardPool() ? null : finalAllowedLandSets); //Null allows any lands to be selected
             dialog.show();
 
         });
@@ -665,6 +667,20 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         getMainDeckPage().addCards(landsToAdd);
     }
 
+    /**
+     * If a card is missing from a player's inventory while importing a deck, it gets run through here.
+     * Returning a PaperCard will let unlimited copies of that card be used as a substitute. Returning null
+     * will leave the card missing from the import.
+     */
+    protected PaperCard supplyPrintForImporter(PaperCard missingCard) {
+        //Could support dungeons here too? Not that we really use them in the editor...
+        if(!missingCard.isVeryBasicLand())
+            return null;
+        List<CardEdition> basicSets = editorConfig.getBasicLandSets(deck);
+        String setCode = basicSets.isEmpty() ? "JMP" : basicSets.get(0).getCode();
+        return FModel.getMagicDb().fetchCard(missingCard.getCardName(), setCode, null);
+    }
+
     protected boolean shouldEnforceConformity() {
         if(FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY))
             return true;
@@ -686,14 +702,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     }
 
     protected void showDevAddCardDialog() {
-        FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblPromptCardRequest"), new Callback<>() {
-            @Override
-            public void run(String result) {
-                if(StringUtils.isBlank(result))
-                    return;
-                CardPool requested = CardPool.fromSingleCardRequest(result);
-                devAddCards(requested);
-            }
+        FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblPromptCardRequest"), result -> {
+            if(StringUtils.isBlank(result))
+                return;
+            CardPool requested = CardPool.fromSingleCardRequest(result);
+            devAddCards(requested);
         });
     }
 
@@ -720,6 +733,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             showExtraSectionTab(section);
         if(pagesBySection.containsKey(section))
             setSelectedPage(pagesBySection.get(section));
+        else if(section == DeckSection.Main && pagesBySection.containsKey(mainDeckPage.deckSection))
+            //Tried to switch to the Main page in a Planar or Scheme deck.
+            setSelectedPage(pagesBySection.get(mainDeckPage.deckSection));
     }
 
     public void notifyNewControllerModel() {
@@ -914,7 +930,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         saveHandler = saveHandler0;
     }
 
-    public void save(final Callback<Boolean> callback) {
+    public void save(final Consumer<Boolean> callback) {
         IDeckController deckController = getDeckController();
         if(deckController.supportsSave()) {
             if (!StringUtils.isEmpty(deck.getName())) {
@@ -924,15 +940,12 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 List<PaperCard> commanders = deck.getCommanders(); //use commander name as default deck name
                 String initialInput = commanders.isEmpty() ? "New Deck" : Lang.joinHomogenous(commanders);
                 FThreads.invokeInEdtNowOrLater(() -> {
-                    FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblNameNewDeck"), initialInput, new Callback<>() {
-                        @Override
-                        public void run(String result) {
-                            if (StringUtils.isEmpty(result)) { return; }
+                    FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblNameNewDeck"), initialInput, result -> {
+                        if (StringUtils.isEmpty(result)) { return; }
 
-                            deckController.saveAs(result);
-                            if (callback != null) {
-                                callback.run(true);
-                            }
+                        deckController.saveAs(result);
+                        if (callback != null) {
+                            callback.accept(true);
                         }
                     });
                 });
@@ -941,7 +954,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         }
 
         if (callback != null) {
-            callback.run(true);
+            callback.accept(true);
         }
     }
 
@@ -973,23 +986,20 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     );
 
     @Override
-    public void onClose(final Callback<Boolean> canCloseCallback) {
+    public void onClose(final Consumer<Boolean> canCloseCallback) {
         if (getDeckController().isSaved() || !allowSave() || canCloseCallback == null) {
             super.onClose(canCloseCallback); //can skip prompt if draft saved
             return;
         }
         FOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblSaveChangesCurrentDeck"), "",
-                FOptionPane.QUESTION_ICON, onCloseOptions, new Callback<>() {
-                    @Override
-                    public void run(Integer result) {
-                        if (result == 0) {
-                            save(canCloseCallback);
-                        } else if (result == 1) {
-                            getDeckController().exitWithoutSaving(); //reload if not saving changes
-                            canCloseCallback.run(true);
-                        } else {
-                            canCloseCallback.run(false);
-                        }
+                FOptionPane.QUESTION_ICON, onCloseOptions, result -> {
+                    if (result == 0) {
+                        save(canCloseCallback);
+                    } else if (result == 1) {
+                        getDeckController().exitWithoutSaving(); //reload if not saving changes
+                        canCloseCallback.accept(true);
+                    } else {
+                        canCloseCallback.accept(false);
                     }
                 });
     }
@@ -1058,7 +1068,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
     protected boolean allowSaveAs() {
         return allowSave() && allowRename();
     }
-    protected boolean allowsAddBasic() {
+    protected boolean allowAddBasic() {
         return !isDrafting();
     }
 
@@ -1346,7 +1356,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
         protected abstract void onCardActivated(PaperCard card);
         protected abstract void buildMenu(final FDropDownMenu menu, final PaperCard card);
 
-        protected void addMoveCardMenuItem(FDropDownMenu menu, CardManagerPage source, CardManagerPage destination, final Callback<Integer> callback) {
+        protected void addMoveCardMenuItem(FDropDownMenu menu, CardManagerPage source, CardManagerPage destination, final Consumer<Integer> callback) {
             //Determine how many we can actually move.
             ItemPool<PaperCard> selectedItemPool = parentScreen.getAllowedAdditions(cardManager.getSelectedItemPool(), source, destination);
 
@@ -1409,7 +1419,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             final int max = maxMovable;
             menu.addItem(new FMenuItem(label, icon, (e) -> {
                 if(max < 2)
-                    callback.run(1);
+                    callback.accept(1);
                 else
                     GuiChoose.getInteger(prompt, 1, max, 20, callback);
             }));
@@ -1431,7 +1441,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             this.addMoveCardMenuItem(menu, source, destination, new MoveCardCallback(card, source, destination));
         }
 
-        protected static class MoveCardCallback extends Callback<Integer> {
+        protected static class MoveCardCallback implements Consumer<Integer> {
             public final PaperCard card;
             public final CardManagerPage from;
             public final CardManagerPage to;
@@ -1442,7 +1452,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 this.to = to;
             }
             @Override
-            public void run(Integer result) {
+            public void accept(Integer result) {
                 if(result == null || result == 0)
                     return;
                 from.moveCard(card, to, result);
@@ -1465,13 +1475,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 if(max < 2)
                     callback.accept(1);
                 else
-                    GuiChoose.getInteger(prompt, 1, max, 20, new Callback<>() {
-                        @Override
-                        public void run(Integer result) {
-                            if (result == null || result == 0)
-                                return;
-                            callback.accept(result);
-                        }
+                    GuiChoose.getInteger(prompt, 1, max, 20, result -> {
+                        if (result == null || result == 0)
+                            return;
+                        callback.accept(result);
                     });
             }
         }
@@ -1859,16 +1866,13 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                                 sortedOptions.add(option);
                             }
                         }
-                        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, new Callback<>() {
-                            @Override
-                            public void run(PaperCard result) {
-                                if (result != null) {
-                                    if (result != card) {
-                                        cardManager.replaceAll(card, result);
-                                    }
-                                    prefs.setPreferredArt(result.getEdition(), result.getArtIndex());
-                                    CardPreferences.save();
+                        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, result -> {
+                            if (result != null) {
+                                if (result != card) {
+                                    cardManager.replaceAll(card, result);
                                 }
+                                prefs.setPreferredArt(result.getEdition(), result.getArtIndex());
+                                CardPreferences.save();
                             }
                         });
                     }));
@@ -2024,14 +2028,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 break;
             case Commander:
                 if (canEditMainCommander() || isPartnerCommander(card)) {
-                    addMoveCardMenuItem(menu, this, cardSourcePage, new Callback<>() {
-                        @Override
-                        public void run(Integer result) {
-                            moveCard(card, cardSourcePage, result);
-                            if(cardSourcePage == parentScreen.getCatalogPage()) {
-                                parentScreen.getCatalogPage().refresh(); //refresh so commander options shown again
-                                parentScreen.setSelectedPage(parentScreen.getCatalogPage());
-                            }
+                    addMoveCardMenuItem(menu, this, cardSourcePage, result -> {
+                        moveCard(card, cardSourcePage, result);
+                        if(cardSourcePage == parentScreen.getCatalogPage()) {
+                            parentScreen.getCatalogPage().refresh(); //refresh so commander options shown again
+                            parentScreen.setSelectedPage(parentScreen.getCatalogPage());
                         }
                     });
                     addReplaceVariantItems(menu, card);
@@ -2063,12 +2064,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                     else
                         currentColors = null;
                     String prompt = Forge.getLocalizer().getMessage("lblChooseAColor", Lang.getNumeral(markedColorCount));
-                    GuiChoose.getChoices(prompt, markedColorCount, markedColorCount, MagicColor.Constant.ONLY_COLORS, currentColors, null, new Callback<>() {
-                        @Override
-                        public void run(List<String> result) {
-                            addCard(card.copyWithMarkedColors(ColorSet.fromNames(result)));
-                            removeCard(card);
-                        }
+                    GuiChoose.getChoices(prompt, markedColorCount, markedColorCount, MagicColor.Constant.ONLY_COLORS, currentColors, null, result -> {
+                        addCard(card.copyWithMarkedColors(ColorSet.fromNames(result)));
+                        removeCard(card);
                     });
                 }));
             }
@@ -2109,21 +2107,18 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             String prompt = localizer.getMessage("lblSelectReplacementCard") + " " + card.getName();
             String promptQuantity = String.format("%s - %s %s", card, lblReplaceCard, localizer.getMessage("lblHowMany"));
             //First have the player choose which card to swap in.
-            GuiChoose.oneOrNone(prompt, sortedOptions, new Callback<>() {
-                @Override
-                public void run(PaperCard replacement) {
-                    if (replacement == null || replacement == card)
-                        return;
-                    //Next, ask how many copies they'd like to swap, taking into account the number available.
-                    int available = parentScreen.getCardSourcePage().cardManager.isInfinite() ? Integer.MAX_VALUE : cardOptions.count(replacement);
-                    int maxMovable = Math.min(available, cardManager.getItemCount(card));
-                    new MoveQuantityPrompt(promptQuantity, maxMovable, (amount) -> {
-                        CardManagerPage sourcePage = parentScreen.getCardSourcePage();
-                        //Finally, swap the cards.
-                        DeckSectionPage.this.moveCard(card, sourcePage, amount);
-                        sourcePage.moveCard(replacement, DeckSectionPage.this, amount);
-                    }).handleEvent(e);
-                }
+            GuiChoose.oneOrNone(prompt, sortedOptions, replacement -> {
+                if (replacement == null || replacement == card)
+                    return;
+                //Next, ask how many copies they'd like to swap, taking into account the number available.
+                int available = parentScreen.getCardSourcePage().cardManager.isInfinite() ? Integer.MAX_VALUE : cardOptions.count(replacement);
+                int maxMovable = Math.min(available, cardManager.getItemCount(card));
+                new MoveQuantityPrompt(promptQuantity, maxMovable, (amount) -> {
+                    CardManagerPage sourcePage = parentScreen.getCardSourcePage();
+                    //Finally, swap the cards.
+                    DeckSectionPage.this.moveCard(card, sourcePage, amount);
+                    sourcePage.moveCard(replacement, DeckSectionPage.this, amount);
+                }).handleEvent(e);
             });
         }
 
@@ -2294,29 +2289,23 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
             if(!cardManager.isEnabled())
                 return;
             if(draftingFaceDown) {
-                addMoveCardMenuItem(menu, this, parentScreen.getSideboardPage(), new Callback<>() {
-                    @Override
-                    public void run(Integer result) { //ignore quantity
-                        PaperCard realCard = getDraftPlayer().pickFromArchdemonCurse(getDraftPlayer().nextChoice());
-                        moveCard(realCard, parentScreen.getSideboardPage());
-                    }
+                addMoveCardMenuItem(menu, this, parentScreen.getSideboardPage(), result -> { //ignore quantity
+                    PaperCard realCard = getDraftPlayer().pickFromArchdemonCurse(getDraftPlayer().nextChoice());
+                    moveCard(realCard, parentScreen.getSideboardPage());
                 });
                 return;
             }
             DeckSection destination = DeckSection.matchingSection(card);
             final DeckSectionPage destinationPage = parentScreen.getPageForSection(destination, true);
-            addMoveCardMenuItem(menu, this, destinationPage, new Callback<>() {
-                @Override
-                public void run(Integer result) { //ignore quantity
-                    moveCard(card, destinationPage);
-                }
-            });
-            addMoveCardMenuItem(menu, this, parentScreen.getSideboardPage(), new Callback<>() {
-                @Override
-                public void run(Integer result) { //ignore quantity
-                    moveCard(card, parentScreen.getSideboardPage());
-                }
+            addMoveCardMenuItem(menu, this, destinationPage, result -> { //ignore quantity
+                moveCard(card, destinationPage);
             });
+            addMoveCardMenuItem(menu,
+                    this,
+                    parentScreen.getSideboardPage(),
+                    result -> { //ignore quantity
+                        moveCard(card, parentScreen.getSideboardPage());
+                    });
         }
 
         @Override
diff --git a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
index a9f4b564f19..9202258fbb9 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
@@ -18,10 +18,12 @@
 package forge.deck;
 
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 
 import forge.Forge;
 import forge.Graphics;
@@ -30,22 +32,25 @@ import forge.deck.DeckRecognizer.TokenType;
 import forge.game.GameType;
 import forge.gui.FThreads;
 import forge.gui.util.SOptionPane;
+import forge.item.PaperCard;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBox;
 import forge.toolbox.FDialog;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextArea;
-import forge.util.Callback;
+import forge.util.ItemPool;
+import forge.util.Localizer;
+import org.apache.commons.lang3.StringUtils;
 
 
 public class FDeckImportDialog extends FDialog {
-    private Callback<Deck> callback;
+    private Consumer<Deck> callback;
 
     private final FTextArea txtInput = add(new FTextArea(true));
     private final FCheckBox newEditionCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblImportLatestVersionCard"), false));
     private final FCheckBox dateTimeCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseOnlySetsReleasedBefore"), false));
     private final FCheckBox smartCardArtCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseSmartCardArt"), false));
-    private final FCheckBox createNewDeckCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblNewDeckCheckbox"), false));
+    private final FCheckBox createNewDeckCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblReplaceDeckCheckbox"), false));
 //    private final FCheckBox importInDeck = add(new FCheckBox()
     /*setting onlyCoreExpCheck to false allow the copied cards to pass the check of deck contents
       forge-core\src\main\java\forge\deck\Deck.javaDeck.java starting @ Line 320 which is called by
@@ -57,100 +62,60 @@ public class FDeckImportDialog extends FDialog {
     private final FComboBox<String> monthDropdown = add(new FComboBox<>()); //don't need wrappers since skin can't change while this dialog is open
     private final FComboBox<Integer> yearDropdown = add(new FComboBox<>());
 
-    private final boolean showOptions;
-    private final boolean currentDeckIsEmpty;
+    private boolean showOptions;
+    private final Deck currentDeck;
     private boolean createNewDeckControl;
     private final DeckImportController controller;
+    private final FDeckEditor.DeckEditorConfig editorConfig;
 
     private final static ImmutableList<String> importOrCancel = ImmutableList.of(Forge.getLocalizer().getMessage("lblImport"), Forge.getLocalizer().getMessage("lblCancel"));
 
-    public FDeckImportDialog(final boolean replacingDeck, final FDeckEditor.DeckEditorConfig editorConfig) {
+    public FDeckImportDialog(final Deck currentDeck, final FDeckEditor.DeckEditorConfig editorConfig) {
         super(Forge.getLocalizer().getMessage("lblImportFromClipboard"), 2);
+        boolean usingInventory = editorConfig.usePlayerInventory();
+        boolean replacingDeck = !currentDeck.isEmpty() || usingInventory;
+        this.currentDeck = currentDeck;
+        this.editorConfig = editorConfig;
+        ItemPool<PaperCard> cardPool = editorConfig.getCardPool(false);
         controller = new DeckImportController(dateTimeCheck, monthDropdown, yearDropdown, replacingDeck);
         String contents = Forge.getClipboard().getContents();
         if (contents == null)
             contents = ""; //prevent NPE
         txtInput.setText(contents);
 
-        if (editorConfig.allowsCardReplacement()) {
-            GameType gameType = editorConfig.getGameType();
-            controller.setGameFormat(gameType);
-            List<DeckSection> supportedSections = new ArrayList<>();
-            supportedSections.add(DeckSection.Main);
-            supportedSections.add(DeckSection.Sideboard);
-            if (editorConfig.hasCommander())
-                supportedSections.add(DeckSection.Commander);
-            supportedSections.addAll(Lists.newArrayList(editorConfig.getExtraSections()));
-            controller.setAllowedSections(supportedSections);
-        }
+        GameType gameType = editorConfig.getGameType();
+        controller.setGameFormat(gameType);
+        List<DeckSection> supportedSections = new ArrayList<>();
+        supportedSections.addAll(List.of(editorConfig.getPrimarySections()));
+        supportedSections.addAll(List.of(editorConfig.getExtraSections()));
+        controller.setAllowedSections(supportedSections);
+        controller.setCurrentDeckInEditor(currentDeck);
+        if(usingInventory)
+            controller.setPlayerInventory(cardPool);
 
         onlyCoreExpCheck.setSelected(StaticData.instance().isCoreExpansionOnlyFilterSet());
         newEditionCheck.setSelected(StaticData.instance().cardArtPreferenceIsLatest());
         smartCardArtCheck.setSelected(StaticData.instance().isEnabledCardArtSmartSelection());
         createNewDeckCheck.setSelected(replacingDeck);
-        this.currentDeckIsEmpty = !replacingDeck;
         this.createNewDeckControl = replacingDeck;
 
-        initButton(0, Forge.getLocalizer().getMessage("lblImport"), e -> FThreads.invokeInBackgroundThread(() -> {
-            List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText()); //ensure deck updated based on any changes to options
+        if(usingInventory)
+            controller.setImportBehavior(DeckImportController.ImportBehavior.REPLACE_CURRENT);
+        else
+            controller.setImportBehavior(createNewDeckControl ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
 
-            if (controller.isSmartCardArtEnabled())
-                tokens = controller.optimiseCardArtInTokens();
-
-            //if there are any cards that cannot be imported, let user know this and give them the option to cancel
-            StringBuilder sb = new StringBuilder();
-            for (DeckRecognizer.Token token : tokens) {
-                if (token.getType() == TokenType.CARD_FROM_NOT_ALLOWED_SET
-                        || token.getType() == TokenType.CARD_FROM_INVALID_SET
-                        || token.getType() == TokenType.UNKNOWN_CARD
-                        || token.getType() == TokenType.UNSUPPORTED_CARD) {
-                    if (sb.length() > 0)
-                        sb.append("\n");
-                    sb.append(token.getQuantity()).append(" ").append(token.getText());
-                }
-            }
-            if (sb.length() > 0) {
-                if (SOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, Forge.getLocalizer().getMessage("lblImportRemainingCards"), SOptionPane.INFORMATION_ICON, importOrCancel) == 1) {
-                    return;
-                }
-            }
-
-            final Deck deck = controller.accept(); //must accept in background thread in case a dialog is shown
-            if (deck == null) { return; }
-
-            FThreads.invokeInEdtLater(() -> {
-                hide();
-                if (callback != null)
-                    callback.run(deck);
-            });
-        }));
+        initButton(0, Forge.getLocalizer().getMessage("lblImport"), e -> FThreads.invokeInBackgroundThread(this::performImport));
         initButton(1, Forge.getLocalizer().getMessage("lblCancel"), e -> hide());
 
-        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText());
-        if (controller.isSmartCardArtEnabled())
-            tokens = controller.optimiseCardArtInTokens();
-        //ensure at least one known card found on clipboard
-        for (DeckRecognizer.Token token : tokens) {
-            if (token.getType() == TokenType.LEGAL_CARD) {
-                showOptions = true;
-
-                dateTimeCheck.setCommand(e -> updateDropDownEnabled());
-                newEditionCheck.setCommand(e -> setArtPreferenceInController());
-                onlyCoreExpCheck.setCommand(e -> setArtPreferenceInController());
-                smartCardArtCheck.setCommand(e -> controller.setSmartCardArtOptimisation(smartCardArtCheck.isSelected()));
-                createNewDeckCheck.setCommand(e -> {
-                    createNewDeckControl = createNewDeckCheck.isSelected();
-                    controller.setCreateNewDeck(createNewDeckControl);
-                });
-                updateDropDownEnabled();
-                setArtPreferenceInController();
-                return;
-            }
-        }
-
-        showOptions = false;
-        setButtonEnabled(0, false);
-        txtInput.setText(Forge.getLocalizer().getMessage("lblNoKnownCardsOnClipboard"));
+        dateTimeCheck.setCommand(e -> updateDropDownEnabled());
+        newEditionCheck.setCommand(e -> setArtPreferenceInController());
+        onlyCoreExpCheck.setCommand(e -> setArtPreferenceInController());
+        smartCardArtCheck.setCommand(e -> controller.setSmartCardArtOptimisation(smartCardArtCheck.isSelected()));
+        createNewDeckCheck.setCommand(e -> {
+            createNewDeckControl = createNewDeckCheck.isSelected();
+            controller.setImportBehavior(createNewDeckControl ? DeckImportController.ImportBehavior.CREATE_NEW : DeckImportController.ImportBehavior.MERGE);
+        });
+        setShowOptions(false);
     }
 
     private void setArtPreferenceInController() {
@@ -160,16 +125,66 @@ public class FDeckImportDialog extends FDialog {
     }
 
     private void updateDropDownEnabled() {
-        boolean enabled = dateTimeCheck.isSelected();
+        boolean enabled = dateTimeCheck.isSelected() && this.showOptions;
         monthDropdown.setEnabled(enabled);
         yearDropdown.setEnabled(enabled);
     }
 
-    public void setCallback(Callback<Deck> callback0){
+    private void setShowOptions(boolean showOptions) {
+        this.showOptions = showOptions;
+        dateTimeCheck.setEnabled(showOptions);
+        newEditionCheck.setEnabled(showOptions);
+        onlyCoreExpCheck.setEnabled(showOptions);
+        newEditionCheck.setEnabled(showOptions);
+        smartCardArtCheck.setEnabled(showOptions);
+        createNewDeckCheck.setEnabled(showOptions);
+        updateDropDownEnabled();
+    }
+
+    public void setCallback(Consumer<Deck> callback0){
         callback = callback0;
     }
 
-    public boolean createNewDeck(){ return this.createNewDeckControl; }
+    public void setFreePrintConverter(Function<PaperCard, PaperCard> freePrintConverter) {
+        this.controller.setFreePrintConverter(freePrintConverter);
+    }
+
+    public DeckImportController.ImportBehavior getImportBehavior() {
+        return controller.getImportBehavior();
+    }
+
+    public void setImportBannedCards(boolean importBannedCards) {
+        controller.importBannedAndRestrictedCards(importBannedCards);
+    }
+
+    public void initParse() {
+        boolean usingInventory = editorConfig.usePlayerInventory();
+        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText());
+        if (usingInventory)
+            tokens = controller.constrainTokensToInventory();
+        else if (controller.isSmartCardArtEnabled())
+            tokens = controller.optimiseCardArtInTokens();
+        //ensure at least one known card found on clipboard
+        for (DeckRecognizer.Token token : tokens) {
+            if (token.getType() == TokenType.LEGAL_CARD || token.getType() == TokenType.FREE_CARD_NOT_IN_INVENTORY) {
+
+                if(usingInventory) {
+                    //Settings aren't compatible with player inventories.
+                    setShowOptions(false);
+                    return;
+                }
+
+                setShowOptions(true);
+
+                updateDropDownEnabled();
+                setArtPreferenceInController();
+                return;
+            }
+        }
+
+        setButtonEnabled(0, false);
+        txtInput.setText(Forge.getLocalizer().getMessage("lblNoKnownCardsOnClipboard"));
+    }
 
     @Override
     public void drawOverlay(Graphics g) {
@@ -202,7 +217,7 @@ public class FDeckImportDialog extends FDialog {
             yearDropdown.setBounds(x + dropDownWidth + fieldPadding, y, dropDownWidth, h);
             y += h + fieldPadding;
 
-            if (!this.currentDeckIsEmpty){
+            if (!this.currentDeck.isEmpty()){
                 smartCardArtCheck.setBounds(x, y, w/2, h);
                 createNewDeckCheck.setBounds(x + w/2, y, w/2, h);
             } else
@@ -222,4 +237,50 @@ public class FDeckImportDialog extends FDialog {
         }
         return y;
     }
+
+    private static final EnumSet<TokenType> MISSING_TOKENS = EnumSet.of(TokenType.CARD_FROM_NOT_ALLOWED_SET,
+            TokenType.CARD_FROM_INVALID_SET, TokenType.UNKNOWN_CARD, TokenType.UNSUPPORTED_CARD,
+            TokenType.WARNING_MESSAGE, TokenType.CARD_NOT_IN_INVENTORY);
+
+    private void performImport() {
+        List<DeckRecognizer.Token> tokens = controller.parseInput(txtInput.getText()); //ensure deck updated based on any changes to options
+
+        if (editorConfig.usePlayerInventory())
+            tokens = controller.constrainTokensToInventory();
+        else if (controller.isSmartCardArtEnabled())
+            tokens = controller.optimiseCardArtInTokens();
+
+        //if there are any cards that cannot be imported, let user know this and give them the option to cancel
+        // Android API StringBuilder isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+        StringBuilder sb = new StringBuilder();
+        for (DeckRecognizer.Token token : tokens) {
+            if (MISSING_TOKENS.contains(token.getType())) {
+                if (sb.length() != 0)
+                    sb.append("\n");
+                String message = controller.getTokenMessage(token);
+                String statusMessage = controller.getTokenStatusMessage(token);
+                if(!StringUtils.isBlank(statusMessage))
+                    sb.append(String.format("%s - (%s)", message, statusMessage));
+                else
+                    sb.append(statusMessage);
+            }
+        }
+        if (sb.length() != 0) {
+            Localizer localizer = Forge.getLocalizer();
+            if (SOptionPane.showOptionDialog(localizer.getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, localizer.getMessage("lblImportRemainingCards"), SOptionPane.WARNING_ICON, importOrCancel) == 1) {
+                return;
+            }
+        }
+
+        final Deck deck = controller.accept(currentDeck.getName()); //must accept in background thread in case a dialog is shown
+        if (deck == null) {
+            return;
+        }
+
+        FThreads.invokeInEdtLater(() -> {
+            hide();
+            if (callback != null)
+                callback.accept(deck);
+        });
+    }
 }
diff --git a/forge-gui-mobile/src/forge/deck/FSideboardDialog.java b/forge-gui-mobile/src/forge/deck/FSideboardDialog.java
index cb7b63411b5..ea3c04ed42b 100644
--- a/forge-gui-mobile/src/forge/deck/FSideboardDialog.java
+++ b/forge-gui-mobile/src/forge/deck/FSideboardDialog.java
@@ -1,6 +1,7 @@
 package forge.deck;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import forge.Forge;
 import org.apache.commons.lang3.StringUtils;
@@ -16,13 +17,12 @@ import forge.screens.FScreen;
 import forge.screens.TabPageScreen;
 import forge.toolbox.FDialog;
 import forge.toolbox.GuiChoose;
-import forge.util.Callback;
 
 public class FSideboardDialog extends FDialog {
     private final SideboardTabs tabs;
-    private final Callback<List<PaperCard>> callback;
+    private final Consumer<List<PaperCard>> callback;
 
-    public FSideboardDialog(CardPool sideboard, CardPool main, final Callback<List<PaperCard>> callback0, String message) {
+    public FSideboardDialog(CardPool sideboard, CardPool main, final Consumer<List<PaperCard>> callback0, String message) {
         super(String.format(Forge.getLocalizer().getMessage("lblUpdateMainFromSideboard"), message), 1);
 
         callback = callback0;
@@ -37,7 +37,7 @@ public class FSideboardDialog extends FDialog {
     public void setVisible(boolean visible0) {
         super.setVisible(visible0);
         if (!visible0) { //do callback when hidden to ensure you don't get stuck if Back pressed
-            callback.run(tabs.getMainDeckPage().cardManager.getPool().toFlatList());
+            callback.accept(tabs.getMainDeckPage().cardManager.getPool().toFlatList());
         }
     }
 
@@ -104,7 +104,7 @@ public class FSideboardDialog extends FDialog {
                 updateCaption();
             }
 
-            protected void addItem(FDropDownMenu menu, final String verb, String dest, FImage icon, final Callback<Integer> callback) {
+            protected void addItem(FDropDownMenu menu, final String verb, String dest, FImage icon, final Consumer<Integer> callback) {
                 String label = verb;
                 if (!StringUtils.isEmpty(dest)) {
                     label += " " + dest;
@@ -113,7 +113,7 @@ public class FSideboardDialog extends FDialog {
                     PaperCard card = cardManager.getSelectedItem();
                     int max = cardManager.getItemCount(card);
                     if (max == 1) {
-                        callback.run(max);
+                        callback.accept(max);
                     }
                     else {
                         GuiChoose.getInteger(card + " - " + verb + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
@@ -150,14 +150,11 @@ public class FSideboardDialog extends FDialog {
 
             @Override
             protected void buildMenu(FDropDownMenu menu, final PaperCard card) {
-                addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lblToMainDeck"), FDeckEditor.MAIN_DECK_ICON, new Callback<Integer>() {
-                    @Override
-                    public void run(Integer result) {
-                        if (result == null || result <= 0) { return; }
+                addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lblToMainDeck"), FDeckEditor.MAIN_DECK_ICON, result -> {
+                    if (result == null || result <= 0) { return; }
 
-                        removeCard(card, result);
-                        parent.getMainDeckPage().addCard(card, result);
-                    }
+                    removeCard(card, result);
+                    parent.getMainDeckPage().addCard(card, result);
                 });
             }
         }
@@ -181,14 +178,11 @@ public class FSideboardDialog extends FDialog {
 
             @Override
             protected void buildMenu(FDropDownMenu menu, final PaperCard card) {
-                addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lbltosideboard"), FDeckEditor.SIDEBOARD_ICON, new Callback<Integer>() {
-                    @Override
-                    public void run(Integer result) {
-                        if (result == null || result <= 0) { return; }
+                addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lbltosideboard"), FDeckEditor.SIDEBOARD_ICON, result -> {
+                    if (result == null || result <= 0) { return; }
 
-                        removeCard(card, result);
-                        parent.getSideboardPage().addCard(card, result);
-                    }
+                    removeCard(card, result);
+                    parent.getSideboardPage().addCard(card, result);
                 });
             }
         }
diff --git a/forge-gui-mobile/src/forge/error/BugReportDialog.java b/forge-gui-mobile/src/forge/error/BugReportDialog.java
index 9e8cf14ace1..e56e4d7c377 100644
--- a/forge-gui-mobile/src/forge/error/BugReportDialog.java
+++ b/forge-gui-mobile/src/forge/error/BugReportDialog.java
@@ -12,10 +12,11 @@ import forge.screens.FScreen;
 import forge.toolbox.FButton;
 import forge.toolbox.FScrollPane;
 import forge.toolbox.FTextArea;
-import forge.util.Callback;
 import forge.util.TextBounds;
 import forge.util.Utils;
 
+import java.util.function.Consumer;
+
 public class BugReportDialog extends FScreen { //use screen rather than dialog so screen with bug isn't rendered
     private static final float PADDING = Utils.scale(5);
     private static final float BUTTON_HEIGHT = Utils.AVG_FINGER_HEIGHT * 0.75f;
@@ -43,7 +44,10 @@ public class BugReportDialog extends FScreen { //use screen rather than dialog s
             BugReporter.sendSentry();
             Forge.back();
         });
-        btnSave.setCommand(e -> BugReporter.saveToFile(tvDetails.text));
+        btnSave.setCommand(e -> {
+            BugReporter.saveToFile(tvDetails.text);
+            Forge.back();
+        });
         btnDiscard.setCommand(e -> Forge.back());
         if (showExitAppBtn) {
             btnExit.setCommand(e -> Forge.exit(true));
@@ -59,7 +63,7 @@ public class BugReportDialog extends FScreen { //use screen rather than dialog s
     }
 
     @Override
-    public void onClose(Callback<Boolean> canCloseCallback) {
+    public void onClose(Consumer<Boolean> canCloseCallback) {
         super.onClose(canCloseCallback);
         isOpen = false;
     }
diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
index 4cc6b63ae7b..3b548f5cf06 100644
--- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
@@ -915,7 +915,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
 
             Iterable<Entry<T, Integer>> items = pool;
             if (useFilter) {
-                Predicate<Entry<T, Integer>> pred = x -> filterPredicate.test(x.getKey());
+                Predicate<Entry<T, Integer>> pred = x -> x != null && filterPredicate.test(x.getKey());
                 items = IterableUtil.filter(pool, pred);
             }
             model.addItems(items);
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
index 7ed493e4ed7..08f391bac7a 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
@@ -24,8 +24,8 @@ import forge.toolbox.FLabel;
 import forge.toolbox.FList;
 import forge.toolbox.FScrollPane;
 import forge.toolbox.FTextField;
-import forge.util.Callback;
 
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 
@@ -211,7 +211,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
         }
 
         @Override
-        public void onClose(Callback<Boolean> canCloseCallback) {
+        public void onClose(Consumer<Boolean> canCloseCallback) {
             onFilterChange.run();
             super.onClose(canCloseCallback);
         }
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
index cb3d1d6ec26..596a7b91a64 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
@@ -3,6 +3,7 @@ package forge.itemmanager.filters;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -16,7 +17,6 @@ import forge.screens.FScreen;
 import forge.screens.settings.SettingsScreen;
 import forge.toolbox.FGroupList;
 import forge.toolbox.FList;
-import forge.util.Callback;
 import forge.util.Utils;
 
 /**
@@ -95,7 +95,7 @@ public class ArchivedFormatSelect extends FScreen {
     }
 
     @Override
-    public void onClose(Callback<Boolean> canCloseCallback) {
+    public void onClose(Consumer<Boolean> canCloseCallback) {
         if (selectedFormat != null) {
             if (onCloseCallBack != null) {
                 onCloseCallBack.run();
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
index fdc85a1b652..f8479733c9a 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -24,7 +25,6 @@ import forge.toolbox.FComboBox;
 import forge.toolbox.FDisplayObject;
 import forge.toolbox.FGroupList;
 import forge.toolbox.FList;
-import forge.util.Callback;
 import forge.util.TextUtil;
 import forge.util.Utils;
 
@@ -199,7 +199,7 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
         }
 
         @Override
-        public void onClose(Callback<Boolean> canCloseCallback) {
+        public void onClose(Consumer<Boolean> canCloseCallback) {
             if (selectedSets.size() > 0) {
                 List<String> setCodes = new ArrayList<>();
                 List<CardEdition> sortedSets = new ArrayList<>(selectedSets);
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
index 4e74e9fabf5..324a6460923 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
@@ -16,7 +16,6 @@ import forge.assets.*;
 import forge.assets.FSkinColor.Colors;
 import forge.card.*;
 import forge.card.CardRenderer.CardStackPosition;
-import forge.card.mana.ManaCostShard;
 import forge.deck.*;
 import forge.deck.io.DeckPreferences;
 import forge.game.card.CardView;
@@ -37,7 +36,6 @@ import forge.util.Utils;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static forge.assets.FSkin.getDefaultSkinFile;
@@ -78,6 +76,64 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     private Supplier<List<Group>> groups = Suppliers.memoize(ArrayList::new);
     private Function<Entry<? extends InventoryItem, Integer>, ?> fnIsFavorite = ColumnDef.FAVORITE.fnDisplay, fnPrice = null;
 
+    private class SafeList<T> {
+        private final List<T> internalList;
+        private final Object lock = new Object(); // Object for synchronization
+
+        private SafeList() {
+            this.internalList = new ArrayList<>();
+        }
+
+        private void add(T element) {
+            synchronized (lock) {
+                internalList.add(element);
+            }
+        }
+
+        private T get(int index) {
+            synchronized (lock) {
+                try {
+                    // TODO: Find cause why index is invalid on some cases...
+                    return internalList.get(index);
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        }
+
+        private T remove(int index) {
+            synchronized (lock) {
+                return internalList.remove(index);
+            }
+        }
+
+        private int size() {
+            synchronized (lock) {
+                return internalList.size();
+            }
+        }
+
+        private void clear() {
+            synchronized (lock) {
+                internalList.clear();
+            }
+        }
+
+        private boolean isEmpty() {
+            synchronized (lock) {
+                return internalList.isEmpty();
+            }
+        }
+
+        private boolean addAll(Collection c) {
+            synchronized (lock) {
+                return internalList.addAll(c);
+            }
+        }
+
+        // Add other list operations as needed, ensuring synchronization
+    }
+
     private class ExpandCollapseButton extends FLabel {
         private boolean isAllCollapsed;
 
@@ -330,11 +386,17 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             if (group.getBottom() < visibleTop) {
                 continue;
             }
-            for (Pile pile : group.piles) {
+            for (int i = 0; i < group.piles.size(); i++) {
+                Pile pile = group.piles.get(i);
+                if (pile == null)
+                    continue;
                 if (group.getBottom() < visibleTop) {
                     continue;
                 }
-                for (ItemInfo item : pile.items) {
+                for (int j = 0; j < pile.items.size(); j++) {
+                    ItemInfo item = pile.items.get(j);
+                    if (item == null)
+                        continue;
                     if (item.getTop() >= visibleTop) {
                         return item;
                     }
@@ -362,7 +424,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         clearSelection();
 
         if (model.getOrderedList() != null) {
-            for (Entry<T, Integer> itemEntry : model.getOrderedList()) {
+            for (Entry<T, Integer> itemEntry : new ArrayList<>(model.getOrderedList())) {
                 T item = itemEntry.getKey();
                 int qty = itemEntry.getValue();
                 int groupIndex = groupBy == null ? -1 : groupBy.getItemGroupIndex(item);
@@ -454,7 +516,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 //use TreeMap to build pile set so iterating below sorts on key
                 ColumnDef groupPileBy = groupBy == null ? pileBy : groupBy.getGroupPileBy(i, pileBy);
                 Map<Comparable<?>, Pile> piles = new TreeMap<>();
-                for (ItemInfo itemInfo : group.items) {
+                for (int j = 0; j < group.items.size(); j++) {
+                    ItemInfo itemInfo = group.items.get(j);
+                    if (itemInfo == null)
+                        continue;
                     Comparable<?> key = groupPileBy.fnSort.apply(itemInfo);
                     if (key != null && !piles.containsKey(key)) {
                         piles.put(key, new Pile());
@@ -490,7 +555,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 Pile pile = new Pile();
                 x = 0;
 
-                for (ItemInfo itemInfo : group.items) {
+                for (int j = 0; j < group.items.size(); j++) {
+                    ItemInfo itemInfo = group.items.get(j);
+                    if (itemInfo == null)
+                        continue;
                     itemInfo.pos = CardStackPosition.Top;
 
                     if (pile.items.size() == columnCount) {
@@ -516,13 +584,21 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 maxPileHeight = 0;
                 for (int j = 0; j < group.piles.size(); j++) {
                     Pile pile = group.piles.get(j);
+                    if (pile == null)
+                        continue;
                     y = pileY;
-                    for (ItemInfo itemInfo : pile.items) {
+                    for (int k = 0; k < pile.items.size(); k++) {
+                        ItemInfo itemInfo = pile.items.get(k);
+                        if (itemInfo == null)
+                            continue;
                         itemInfo.pos = CardStackPosition.BehindVert;
                         itemInfo.setBounds(x, y, itemWidth, itemHeight);
                         y += dy;
                     }
-                    pile.items.get(pile.items.size() - 1).pos = CardStackPosition.Top;
+                    ItemInfo itemInfo = pile.items.get(pile.items.size() - 1);
+                    if (itemInfo == null)
+                        continue;
+                    itemInfo.pos = CardStackPosition.Top;
                     pileHeight = y + itemHeight - dy - pileY;
                     if (pileHeight > maxPileHeight) {
                         maxPileHeight = pileHeight;
@@ -549,15 +625,24 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
 
                 if (group.isCollapsed && pileBy == null) {
                     //Piles won't have been generated in this case.
-                    for(ItemInfo itemInfo : group.items) {
+                    for (int i = 0; i < group.items.size(); i++) {
+                        ItemInfo itemInfo = group.items.get(i);
+                        if (itemInfo == null)
+                            continue;
                         itemInfo.index = index++;
                         orderedItems.get().add(itemInfo);
                     }
                     continue;
                 }
 
-                for (Pile pile : group.piles) {
-                    for (ItemInfo itemInfo : pile.items) {
+                for (int i = 0; i < group.piles.size(); i++) {
+                    Pile pile = group.piles.get(i);
+                    if (pile == null)
+                        continue;
+                    for (int j = 0; j < pile.items.size(); j++) {
+                        ItemInfo itemInfo = pile.items.get(j);
+                        if (itemInfo == null)
+                            continue;
                         itemInfo.index = index++;
                         orderedItems.get().add(itemInfo);
                     }
@@ -630,9 +715,13 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                     float relX = x + group.getScrollLeft() - group.getLeft();
                     float relY = y + getScrollValue();
                     Pile pile = group.piles.get(j);
+                    if (pile == null)
+                        continue;
                     if (pile.contains(relX, relY)) {
                         for (int k = pile.items.size() - 1; k >= 0; k--) {
                             ItemInfo item = pile.items.get(k);
+                            if (item == null)
+                                continue;
                             if (item.contains(relX, relY)) {
                                 return item;
                             }
@@ -655,7 +744,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     @Override
     public int getIndexOfItem(T item) {
         for (Group group : groups.get()) {
-            for (ItemInfo itemInfo : group.items) {
+            for (int i = 0; i <  group.items.size(); i++) {
+                ItemInfo itemInfo =  group.items.get(i);
+                if (itemInfo == null)
+                    continue;
                 if (itemInfo.item == item) {
                     //if group containing item is collapsed, expand it so the item can be selected and has a valid index
                     if (group.isCollapsed) {
@@ -838,8 +930,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     }
 
     private class Group extends FScrollPane {
-        private final List<ItemInfo> items = new ArrayList<>();
-        private final List<Pile> piles = new ArrayList<>();
+        private final SafeList<ItemInfo> items = new SafeList<>();
+        private final SafeList<Pile> piles = new SafeList<>();
         private final String name;
         private boolean isCollapsed;
         private float scrollWidth;
@@ -896,7 +988,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
 
             float visibleLeft = getScrollLeft();
             float visibleRight = visibleLeft + getWidth();
-            for (Pile pile : piles) {
+            for (int i = 0; i < piles.size(); i++) {
+                Pile pile = piles.get(i);
+                if (pile == null)
+                    continue;
                 if (pile.getRight() < visibleLeft) {
                     continue;
                 }
@@ -962,7 +1057,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     }
 
     private class Pile extends FDisplayObject {
-        private final List<ItemInfo> items = new ArrayList<>();
+        private final SafeList<ItemInfo> items = new SafeList<>();
 
         @Override
         public void draw(Graphics g) {
@@ -970,7 +1065,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
             final float visibleBottom = visibleTop + getScroller().getHeight();
 
             ItemInfo skippedItem = null;
-            for (ItemInfo itemInfo : items) {
+            for (int i = 0; i < items.size(); i++) {
+                ItemInfo itemInfo = items.get(i);
+                if (itemInfo == null)
+                    continue;
                 if (itemInfo.getBottom() < visibleTop) {
                     continue;
                 }
@@ -1014,10 +1112,10 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 deckSelectMode = true;
                 deckProxy = (DeckProxy) item;
             }
-            if (item instanceof PaperCard) {
+            if (item instanceof PaperCard pc) {
                 showRanking = itemManager.getShowRanking() && FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_OVERLAY_DRAFT_RANKING);
                 if (showRanking) {
-                    double score = CardRanker.getRawScore((PaperCard) item);
+                    double score = CardRanker.getRawScore(pc);
                     draftRank = score <= 0 ? 0 : score > 99 ? 99 : (int) Math.round(CardRanker.getRawScore((PaperCard) item));
                     if (draftRank >= 90) {
                         draftRankImage = FSkinImage.DRAFTRANK_S;
@@ -1029,10 +1127,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                         draftRankImage = FSkinImage.DRAFTRANK_C;
                     }
                 }
-                if (((PaperCard) item).getMarkedColors() != null) {
-                    markedColors = Arrays.stream(((PaperCard) item).getMarkedColors().getOrderedShards())
-                            .map(ManaCostShard::toString)
-                            .collect(Collectors.joining());
+                if (pc.getMarkedColors() != null) {
+                    markedColors = pc.getMarkedColors().toString();
                 }
             }
             if(fnPrice != null) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
index a46007cad95..92855e9d3dc 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
@@ -192,7 +192,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
 
     @Override
     protected void onRefresh() {
-        list.setListData(model.getOrderedList());
+        list.setListData(new ArrayList<>(model.getOrderedList()));
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/menu/FDropDownMenu.java b/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
index 725426fdc87..1301cfea13c 100644
--- a/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
+++ b/forge-gui-mobile/src/forge/menu/FDropDownMenu.java
@@ -69,6 +69,11 @@ public abstract class FDropDownMenu extends FDropDown {
         }
     }
 
+    public void clearItems() {
+        clear();
+        items.clear();
+    }
+
     @Override
     public boolean tap(float x, float y, int count) {
         super.tap(x, y, count);
diff --git a/forge-gui-mobile/src/forge/screens/FScreen.java b/forge-gui-mobile/src/forge/screens/FScreen.java
index b28586b1124..16ab256fcd0 100644
--- a/forge-gui-mobile/src/forge/screens/FScreen.java
+++ b/forge-gui-mobile/src/forge/screens/FScreen.java
@@ -1,6 +1,7 @@
 package forge.screens;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Color;
@@ -23,7 +24,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FEvent;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
-import forge.util.Callback;
 import forge.util.Utils;
 
 public abstract class FScreen extends FContainer {
@@ -66,13 +66,13 @@ public abstract class FScreen extends FContainer {
         Forge.startContinuousRendering();
     }
 
-    public void onSwitchAway(Callback<Boolean> canSwitchCallback) {
-        canSwitchCallback.run(true);
+    public void onSwitchAway(Consumer<Boolean> canSwitchCallback) {
+        canSwitchCallback.accept(true);
     }
 
-    public void onClose(Callback<Boolean> canCloseCallback) {
+    public void onClose(Consumer<Boolean> canCloseCallback) {
         if (canCloseCallback != null) { //will be null if app exited
-            canCloseCallback.run(true);
+            canCloseCallback.accept(true);
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
index d7aca56fd97..a68ad339324 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
@@ -2,6 +2,7 @@ package forge.screens.constructed;
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Align;
@@ -15,7 +16,6 @@ import forge.screens.FScreen;
 import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.MyRandom;
 import forge.util.Utils;
 
@@ -28,7 +28,7 @@ public class AvatarSelector extends FScreen {
         return random;
     }
 
-    public static void show(final String playerName, final int currentIndex0, final List<Integer> usedAvatars0, final Callback<Integer> callback0) {
+    public static void show(final String playerName, final int currentIndex0, final List<Integer> usedAvatars0, final Consumer<Integer> callback0) {
         AvatarSelector selector = new AvatarSelector(playerName, currentIndex0, usedAvatars0, callback0);
         Forge.openScreen(selector);
     }
@@ -38,7 +38,7 @@ public class AvatarSelector extends FScreen {
 
     private final int currentIndex;
     private final List<Integer> usedAvatars;
-    private final Callback<Integer> callback;
+    private final Consumer<Integer> callback;
     private final FScrollPane scroller = new FScrollPane() {
         @Override
         protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
@@ -60,7 +60,7 @@ public class AvatarSelector extends FScreen {
         }
     };
 
-    private AvatarSelector(final String playerName, final int currentIndex0, final List<Integer> usedAvatars0, final Callback<Integer> callback0) {
+    private AvatarSelector(final String playerName, final int currentIndex0, final List<Integer> usedAvatars0, final Consumer<Integer> callback0) {
         super(Forge.getLocalizer().getMessage("lblSelectAvatarFor").replace("%s",playerName));
 
         currentIndex = currentIndex0;
@@ -91,13 +91,13 @@ public class AvatarSelector extends FScreen {
 
         if (index == -1) {
             lbl.setCommand(e -> {
-                callback.run(getRandomAvatar(usedAvatars));
+                callback.accept(getRandomAvatar(usedAvatars));
                 Forge.back();
             });
         }
         else {
             lbl.setCommand(e -> {
-                callback.run(index);
+                callback.accept(index);
                 Forge.back();
             });
         }
diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index b05df5549a8..67aa9d77944 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -3,6 +3,7 @@ package forge.screens.constructed;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import forge.gamemodes.net.event.UpdateLobbyPlayerEvent;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +42,6 @@ import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextField;
 import forge.toolbox.FToggleSwitch;
-import forge.util.Callback;
 import forge.util.Lang;
 import forge.util.NameGenerator;
 import forge.util.TextUtil;
@@ -534,18 +534,15 @@ public class PlayerPanel extends FContainer {
     private FEventHandler avatarCommand = new FEventHandler() {
         @Override
         public void handleEvent(FEvent e) {
-            AvatarSelector.show(getPlayerName(), avatarIndex, screen.getUsedAvatars(), new Callback<Integer>() {
-                @Override
-                public void run(Integer result) {
-                    setAvatarIndex(result);
+            AvatarSelector.show(getPlayerName(), avatarIndex, screen.getUsedAvatars(), result -> {
+                setAvatarIndex(result);
 
-                    if (index < 2) {
-                        screen.updateAvatar(index, result);
-                        screen.updateAvatarPrefs();
-                    }
-                    if (allowNetworking) {
-                        screen.firePlayerChangeListener(index);
-                    }
+                if (index < 2) {
+                    screen.updateAvatar(index, result);
+                    screen.updateAvatarPrefs();
+                }
+                if (allowNetworking) {
+                    screen.firePlayerChangeListener(index);
                 }
             });
         }
@@ -554,18 +551,15 @@ public class PlayerPanel extends FContainer {
     private FEventHandler sleeveCommand = new FEventHandler() {
         @Override
         public void handleEvent(FEvent e) {
-            SleevesSelector.show(getPlayerName(), sleeveIndex, screen.getUsedSleeves(), new Callback<Integer>() {
-                @Override
-                public void run(Integer result) {
-                    setSleeveIndex(result);
+            SleevesSelector.show(getPlayerName(), sleeveIndex, screen.getUsedSleeves(), result -> {
+                setSleeveIndex(result);
 
-                    if (index < 2) {
-                        screen.updateSleeve(index, result);
-                        screen.updateSleevePrefs();
-                    }
-                    if (allowNetworking) {
-                        screen.firePlayerChangeListener(index);
-                    }
+                if (index < 2) {
+                    screen.updateSleeve(index, result);
+                    screen.updateSleevePrefs();
+                }
+                if (allowNetworking) {
+                    screen.firePlayerChangeListener(index);
                 }
             });
         }
@@ -804,21 +798,18 @@ public class PlayerPanel extends FContainer {
     private FLabel createNameRandomizer() {
         final FLabel newNameBtn = new FLabel.Builder().iconInBackground(false)
                 .icon(Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT).opaque(false).build();
-        newNameBtn.setCommand(e -> getNewName(new Callback<String>() {
-            @Override
-            public void run(String newName) {
-                if (newName == null) { return; }
+        newNameBtn.setCommand(e -> getNewName(newName -> {
+            if (newName == null) { return; }
 
-                txtPlayerName.setText(newName);
+            txtPlayerName.setText(newName);
 
-                if (index == 0) {
-                    prefs.setPref(FPref.PLAYER_NAME, newName);
-                    prefs.save();
-                    screen.getLobby().applyToSlot(index, UpdateLobbyPlayerEvent.nameUpdate(newName));
-                }
-                if (allowNetworking) {
-                    screen.firePlayerChangeListener(index);
-                }
+            if (index == 0) {
+                prefs.setPref(FPref.PLAYER_NAME, newName);
+                prefs.save();
+                screen.getLobby().applyToSlot(index, UpdateLobbyPlayerEvent.nameUpdate(newName));
+            }
+            if (allowNetworking) {
+                screen.firePlayerChangeListener(index);
             }
         }));
         return newNameBtn;
@@ -1063,48 +1054,39 @@ public class PlayerPanel extends FContainer {
         return new FLabel.Builder().text(title).font(LABEL_FONT).align(Align.right).build();
     }
     
-    private static final ImmutableList<String> genderOptions = ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblMale"), Forge.getLocalizer().getInstance().getMessage("lblFemale"), Forge.getLocalizer().getInstance().getMessage("lblAny"));
-    private static final ImmutableList<String> typeOptions   = ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblFantasy"), Forge.getLocalizer().getInstance().getMessage("lblGeneric"), Forge.getLocalizer().getInstance().getMessage("lblAny"));
-    private void getNewName(final Callback<String> callback) {
+    private static final ImmutableList<String> genderOptions = ImmutableList.of(Forge.getLocalizer().getMessage("lblMale"), Forge.getLocalizer().getMessage("lblFemale"), Forge.getLocalizer().getMessage("lblAny"));
+    private static final ImmutableList<String> typeOptions   = ImmutableList.of(Forge.getLocalizer().getMessage("lblFantasy"), Forge.getLocalizer().getMessage("lblGeneric"), Forge.getLocalizer().getMessage("lblAny"));
+    private void getNewName(final Consumer<String> callback) {
         final String title = Forge.getLocalizer().getMessage("lblGetNewRandomName");
         final String message = Forge.getLocalizer().getMessage("lbltypeofName");
         final FSkinImage icon = FOptionPane.QUESTION_ICON;
 
-        FOptionPane.showOptionDialog(message, title, icon, genderOptions, 2, new Callback<Integer>() {
-            @Override
-            public void run(final Integer genderIndex) {
-                if (genderIndex == null || genderIndex < 0) {
-                    callback.run(null);
+        FOptionPane.showOptionDialog(message, title, icon, genderOptions, 2, genderIndex -> {
+            if (genderIndex == null || genderIndex < 0) {
+                callback.accept(null);
+                return;
+            }
+
+            FOptionPane.showOptionDialog(message, title, icon, typeOptions, 2, typeIndex -> {
+                if (typeIndex == null || typeIndex < 0) {
+                    callback.accept(null);
                     return;
                 }
-                
-                FOptionPane.showOptionDialog(message, title, icon, typeOptions, 2, new Callback<Integer>() {
-                    @Override
-                    public void run(final Integer typeIndex) {
-                        if (typeIndex == null || typeIndex < 0) {
-                            callback.run(null);
-                            return;
-                        }
 
-                        generateRandomName(genderOptions.get(genderIndex), typeOptions.get(typeIndex), screen.getPlayerNames(), title, callback);
-                    }
-                });
-            }
+                generateRandomName(genderOptions.get(genderIndex), typeOptions.get(typeIndex), screen.getPlayerNames(), title, callback);
+            });
         });
     }
 
-    private void generateRandomName(final String gender, final String type, final List<String> usedNames, final String title, final Callback<String> callback) {
+    private void generateRandomName(final String gender, final String type, final List<String> usedNames, final String title, final Consumer<String> callback) {
         final String newName = NameGenerator.getRandomName(gender, type, usedNames);
         String confirmMsg = Forge.getLocalizer().getMessage("lblconfirmName").replace("%s", newName);
-        FOptionPane.showConfirmDialog(confirmMsg, title, Forge.getLocalizer().getMessage("lblUseThisName"), Forge.getLocalizer().getMessage("lblTryAgain"), true, new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
-                if (result) {
-                    callback.run(newName);
-                }
-                else {
-                    generateRandomName(gender, type, usedNames, title, callback);
-                }
+        FOptionPane.showConfirmDialog(confirmMsg, title, Forge.getLocalizer().getMessage("lblUseThisName"), Forge.getLocalizer().getMessage("lblTryAgain"), true, result -> {
+            if (result) {
+                callback.accept(newName);
+            }
+            else {
+                generateRandomName(gender, type, usedNames, title, callback);
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java b/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java
index 5cfb8bbc95e..e957529da34 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java
@@ -2,6 +2,7 @@ package forge.screens.constructed;
 
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Align;
@@ -15,7 +16,6 @@ import forge.screens.FScreen;
 import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.MyRandom;
 import forge.util.Utils;
 
@@ -28,7 +28,7 @@ public class SleevesSelector  extends FScreen {
         return random;
     }
 
-    public static void show(final String playerName, final int currentIndex0, final List<Integer> usedSleeves0, final Callback<Integer> callback0) {
+    public static void show(final String playerName, final int currentIndex0, final List<Integer> usedSleeves0, final Consumer<Integer> callback0) {
         SleevesSelector selector = new SleevesSelector(playerName, currentIndex0, usedSleeves0, callback0);
         Forge.openScreen(selector);
     }
@@ -38,7 +38,7 @@ public class SleevesSelector  extends FScreen {
 
     private final int currentIndex;
     private final List<Integer> usedSleeves;
-    private final Callback<Integer> callback;
+    private final Consumer<Integer> callback;
     private final FScrollPane scroller = new FScrollPane() {
         @Override
         protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
@@ -60,7 +60,7 @@ public class SleevesSelector  extends FScreen {
         }
     };
 
-    private SleevesSelector(final String playerName, final int currentIndex0, final List<Integer> usedSleeves0, final Callback<Integer> callback0) {
+    private SleevesSelector(final String playerName, final int currentIndex0, final List<Integer> usedSleeves0, final Consumer<Integer> callback0) {
         super(Forge.getLocalizer().getMessage("lblSelectSleevesFroPlayer", playerName));
 
         currentIndex = currentIndex0;
@@ -91,13 +91,13 @@ public class SleevesSelector  extends FScreen {
 
         if (index == -1) {
             lbl.setCommand(e -> {
-                callback.run(getRandomSleeves(usedSleeves));
+                callback.accept(getRandomSleeves(usedSleeves));
                 Forge.back();
             });
         }
         else {
             lbl.setCommand(e -> {
-                callback.run(index);
+                callback.accept(index);
                 Forge.back();
             });
         }
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
index ae4dce37928..8149acb920f 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
@@ -32,7 +32,6 @@ import forge.screens.settings.SettingsScreen;
 import forge.toolbox.FButton;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
-import forge.util.Callback;
 import forge.util.ThreadUtil;
 import forge.util.Utils;
 
@@ -107,15 +106,12 @@ public class LoadGauntletScreen extends LaunchScreen {
         if (userDeck == null) {
             //give user a chance to select a deck if none saved with gauntlet
             FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectGauntletDeck"), gauntlet.isCommanderGauntlet()
-                    ? GameType.CommanderGauntlet : GameType.Gauntlet, false, new Callback<Deck>() {
-                @Override
-                public void run(Deck result) {
-                    if (result != null) {
-                        gauntlet.setUserDeck(result);
-                        GauntletIO.saveGauntlet(gauntlet);
-                    }
-                }
-            });
+                    ? GameType.CommanderGauntlet : GameType.Gauntlet, false, result -> {
+                        if (result != null) {
+                            gauntlet.setUserDeck(result);
+                            GauntletIO.saveGauntlet(gauntlet);
+                        }
+                    });
             return;
         }
 
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
index 2503ed864b2..ace5d598736 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
@@ -7,7 +7,6 @@ import java.util.List;
 
 import forge.Forge;
 import forge.assets.FSkinFont;
-import forge.deck.Deck;
 import forge.deck.DeckType;
 import forge.deck.FDeckChooser;
 import forge.game.GameType;
@@ -23,7 +22,6 @@ import forge.toolbox.FLabel;
 import forge.toolbox.FTextArea;
 import forge.toolbox.GuiChoose;
 import forge.toolbox.ListChooser;
-import forge.util.Callback;
 import forge.util.Utils;
 
 public class NewGauntletScreen extends LaunchScreen {
@@ -58,158 +56,125 @@ public class NewGauntletScreen extends LaunchScreen {
                 Forge.getLocalizer().getMessage("lblGauntletContest"),
                 Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet"),
                 Forge.getLocalizer().getMessage("lblCustomCommanderGauntlet"),
-        }, new Callback<String>() {
-            @Override
-            public void run(String result) {
-                if (result == null) { return; }
+        }, result -> {
+            if (result == null) { return; }
 
-                if (Forge.getLocalizer().getMessage("lblQuickGauntlet").equals(result)) {
-                    createQuickGauntlet();
-                } else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) {
-                    createCustomGauntlet();
-                } else if(Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet").equals(result)) {
-                    createQuickCommandGauntlet();
-                } else if(Forge.getLocalizer().getMessage("lblCustomCommanderGauntlet").equals(result)) {
-                    createCustomCommanderGauntlet();
-                } else {
-                    createGauntletContest();
-                }
+            if (Forge.getLocalizer().getMessage("lblQuickGauntlet").equals(result)) {
+                createQuickGauntlet();
+            } else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) {
+                createCustomGauntlet();
+            } else if(Forge.getLocalizer().getMessage("lblQuickCommanderGauntlet").equals(result)) {
+                createQuickCommandGauntlet();
+            } else if(Forge.getLocalizer().getMessage("lblCustomCommanderGauntlet").equals(result)) {
+                createCustomCommanderGauntlet();
+            } else {
+                createGauntletContest();
             }
         });
     }
 
     private void createQuickCommandGauntlet() {
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
-            @Override
-            public void run(final Integer numOpponents) {
-                if (numOpponents == null) { return; }
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, numOpponents -> {
+            if (numOpponents == null) { return; }
 
-                ListChooser<DeckType> chooser = new ListChooser<>(
-                        Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.COMMANDER_DECK,
-                        DeckType.PRECON_COMMANDER_DECK,
-                        DeckType.RANDOM_COMMANDER_DECK), null, new Callback<List<DeckType>>() {
-                    @Override
-                    public void run(final List<DeckType> allowedDeckTypes) {
+            ListChooser<DeckType> chooser = new ListChooser<>(
+                    Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.COMMANDER_DECK,
+                    DeckType.PRECON_COMMANDER_DECK,
+                    DeckType.RANDOM_COMMANDER_DECK), null, allowedDeckTypes -> {
                         if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
                             return;
                         }
 
-                        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Commander, false, new Callback<Deck>() {
-                            @Override
-                            public void run(Deck userDeck) {
-                                if (userDeck == null) {
-                                    return;
-                                }
-
-                                GauntletData gauntlet = GauntletUtil.createCommanderGauntlet(userDeck, numOpponents, allowedDeckTypes, null);
-                                launchGauntlet(gauntlet);
+                        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Commander, false, userDeck -> {
+                            if (userDeck == null) {
+                                return;
                             }
+
+                            GauntletData gauntlet = GauntletUtil.createCommanderGauntlet(userDeck, numOpponents, allowedDeckTypes, null);
+                            launchGauntlet(gauntlet);
                         });
-                    }
-                });
-                chooser.show(null, false); /*setting selectMax to true will select all available option*/
-            }
+                    });
+            chooser.show(null, false); /*setting selectMax to true will select all available option*/
         });
     }
 
     private void createQuickGauntlet() {
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
-            @Override
-            public void run(final Integer numOpponents) {
-                if (numOpponents == null) { return; }
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, numOpponents -> {
+            if (numOpponents == null) { return; }
 
-                ListChooser<DeckType> chooser = new ListChooser<>(
-                        Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.CUSTOM_DECK,
-                        DeckType.PRECONSTRUCTED_DECK,
-                        DeckType.QUEST_OPPONENT_DECK,
-                        DeckType.COLOR_DECK,
-                        DeckType.STANDARD_COLOR_DECK,
-                        DeckType.STANDARD_CARDGEN_DECK,
-                        DeckType.MODERN_COLOR_DECK,
-                        DeckType.PIONEER_CARDGEN_DECK,
-                        DeckType.HISTORIC_CARDGEN_DECK,
-                        DeckType.MODERN_CARDGEN_DECK,
-                        DeckType.LEGACY_CARDGEN_DECK,
-                        DeckType.VINTAGE_CARDGEN_DECK,
-                        DeckType.PAUPER_CARDGEN_DECK,
-                        DeckType.THEME_DECK), null, new Callback<List<DeckType>>() {
-                    @Override
-                    public void run(final List<DeckType> allowedDeckTypes) {
+            ListChooser<DeckType> chooser = new ListChooser<>(
+                    Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.CUSTOM_DECK,
+                    DeckType.PRECONSTRUCTED_DECK,
+                    DeckType.QUEST_OPPONENT_DECK,
+                    DeckType.COLOR_DECK,
+                    DeckType.STANDARD_COLOR_DECK,
+                    DeckType.STANDARD_CARDGEN_DECK,
+                    DeckType.MODERN_COLOR_DECK,
+                    DeckType.PIONEER_CARDGEN_DECK,
+                    DeckType.HISTORIC_CARDGEN_DECK,
+                    DeckType.MODERN_CARDGEN_DECK,
+                    DeckType.LEGACY_CARDGEN_DECK,
+                    DeckType.VINTAGE_CARDGEN_DECK,
+                    DeckType.PAUPER_CARDGEN_DECK,
+                    DeckType.THEME_DECK), null, allowedDeckTypes -> {
                         if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
                             return;
                         }
 
-                        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
-                            @Override
-                            public void run(Deck userDeck) {
-                                if (userDeck == null) {
-                                    return;
-                                }
-
-                                GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, null);
-                                launchGauntlet(gauntlet);
+                        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, userDeck -> {
+                            if (userDeck == null) {
+                                return;
                             }
+
+                            GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, null);
+                            launchGauntlet(gauntlet);
                         });
-                    }
-                });
-                chooser.show(null, false); /*setting selectMax to true will select all available option*/
-            }
+                    });
+            chooser.show(null, false); /*setting selectMax to true will select all available option*/
         });
     }
 
     private void createCustomGauntlet() {
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
-            @Override
-            public void run(final Integer numOpponents) {
-                if (numOpponents == null) { return; }
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, numOpponents -> {
+            if (numOpponents == null) { return; }
 
-                GauntletData gauntlet = new GauntletData();
-                gauntlet.setDecks(new ArrayList<>());
-                promptForAiDeck(gauntlet, numOpponents);
-            }
+            GauntletData gauntlet = new GauntletData();
+            gauntlet.setDecks(new ArrayList<>());
+            promptForAiDeck(gauntlet, numOpponents);
         });
     }
 
     private void createCustomCommanderGauntlet() {
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
-            @Override
-            public void run(final Integer numOpponents) {
-                if (numOpponents == null) { return; }
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, numOpponents -> {
+            if (numOpponents == null) { return; }
 
-                GauntletData gauntlet = new GauntletData(true);
-                gauntlet.setDecks(new ArrayList<>());
-                promptForAiDeck(gauntlet, numOpponents);
-            }
+            GauntletData gauntlet = new GauntletData(true);
+            gauntlet.setDecks(new ArrayList<>());
+            promptForAiDeck(gauntlet, numOpponents);
         });
     }
 
     private void promptForAiDeck(final GauntletData gauntlet, final int numOpponents) {
         final int opponentNum = gauntlet.getDecks().size() + 1;
         final GameType gameType = gauntlet.isCommanderGauntlet() ? GameType.CommanderGauntlet : GameType.Gauntlet;
-        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectDeckForOpponent") + " " + opponentNum + " / " + numOpponents, gameType, true, new Callback<Deck>() {
-            @Override
-            public void run(Deck aiDeck) {
-                if (aiDeck == null) { return; }
+        FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectDeckForOpponent") + " " + opponentNum + " / " + numOpponents, gameType, true, aiDeck -> {
+            if (aiDeck == null) { return; }
 
-                gauntlet.getDecks().add(aiDeck);
-                gauntlet.getEventNames().add(aiDeck.getName());
+            gauntlet.getDecks().add(aiDeck);
+            gauntlet.getEventNames().add(aiDeck.getName());
 
-                if (opponentNum < numOpponents) {
-                    promptForAiDeck(gauntlet, numOpponents);
-                }
-                else {
-                    //once all ai decks have been selected, prompt for user deck
-                    FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), gameType, false, new Callback<Deck>() {
-                        @Override
-                        public void run(Deck userDeck) {
-                            if (userDeck == null) { return; }
+            if (opponentNum < numOpponents) {
+                promptForAiDeck(gauntlet, numOpponents);
+            }
+            else {
+                //once all ai decks have been selected, prompt for user deck
+                FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), gameType, false, userDeck -> {
+                    if (userDeck == null) { return; }
 
-                            gauntlet.setUserDeck(userDeck);
-                            GauntletUtil.setDefaultGauntletName(gauntlet, GauntletIO.PREFIX_CUSTOM);
-                            launchGauntlet(gauntlet);
-                        }
-                    });
-                }
+                    gauntlet.setUserDeck(userDeck);
+                    GauntletUtil.setDefaultGauntletName(gauntlet, GauntletIO.PREFIX_CUSTOM);
+                    launchGauntlet(gauntlet);
+                });
             }
         });
     }
@@ -224,26 +189,20 @@ public class NewGauntletScreen extends LaunchScreen {
             }
         }
 
-        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectGauntletContest"), contests, new Callback<GauntletData>() {
-            @Override
-            public void run(final GauntletData contest) {
-                if (contest == null) { return; }
+        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectGauntletContest"), contests, contest -> {
+            if (contest == null) { return; }
 
-                FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
-                    @Override
-                    public void run(final Deck userDeck) {
-                        if (userDeck == null) { return; }
+            FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, userDeck -> {
+                if (userDeck == null) { return; }
 
-                        //create copy of contest to use as gauntlet
-                        GauntletData gauntlet = new GauntletData();
-                        gauntlet.setDecks(new ArrayList<>(contest.getDecks()));
-                        gauntlet.setEventNames(new ArrayList<>(contest.getEventNames()));
-                        gauntlet.setUserDeck(userDeck);
-                        GauntletUtil.setDefaultGauntletName(gauntlet, contest.getDisplayName() + "_");
-                        launchGauntlet(gauntlet);
-                    }
-                });
-            }
+                //create copy of contest to use as gauntlet
+                GauntletData gauntlet = new GauntletData();
+                gauntlet.setDecks(new ArrayList<>(contest.getDecks()));
+                gauntlet.setEventNames(new ArrayList<>(contest.getEventNames()));
+                gauntlet.setUserDeck(userDeck);
+                GauntletUtil.setDefaultGauntletName(gauntlet, contest.getDisplayName() + "_");
+                launchGauntlet(gauntlet);
+            });
         });
     }
 
diff --git a/forge-gui-mobile/src/forge/screens/home/AdventureScreen.java b/forge-gui-mobile/src/forge/screens/home/AdventureScreen.java
index 9e7f7bbd770..16b6c64bfd0 100644
--- a/forge-gui-mobile/src/forge/screens/home/AdventureScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/AdventureScreen.java
@@ -9,9 +9,10 @@ import forge.localinstance.properties.ForgeConstants;
 import forge.screens.LaunchScreen;
 import forge.toolbox.FLabel;
 import forge.toolbox.FTextArea;
-import forge.util.Callback;
 import forge.util.Utils;
 
+import java.util.function.Consumer;
+
 public class AdventureScreen extends LaunchScreen {
     private static final float PADDING = Utils.scale(10);
     private boolean loaded = false;
@@ -46,7 +47,7 @@ public class AdventureScreen extends LaunchScreen {
     }
 
     @Override
-    public void onSwitchAway(Callback<Boolean> canSwitchCallback) {
+    public void onSwitchAway(Consumer<Boolean> canSwitchCallback) {
         if (animation != null) {
             animation.stop();
         }
diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
index 3177ef541c2..4fcd3a21f4f 100644
--- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java
@@ -28,7 +28,6 @@ import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.Utils;
 
 public class HomeScreen extends FScreen {
@@ -115,19 +114,16 @@ public class HomeScreen extends FScreen {
         addButton(Forge.getLocalizer().getMessage("lblHelp"), e -> FThreads.invokeInEdtLater(() -> {
             try {
                 if (Forge.getDeviceAdapter().isConnectedToInternet()) {
-                    FOptionPane.showOptionDialog("Join Discord option will open the invite link to join Forge Discord server. Forge Support option will open the Forge Support Channel.", "Choose option", FOptionPane.INFORMATION_ICON, ImmutableList.of("Join Discord", "Forge Support"), -1, new Callback<Integer>() {
-                        @Override
-                        public void run(Integer result) {
-                            switch (result) {
-                                case 0:
-                                    Gdx.net.openURI("https://discord.gg/3v9JCVr");
-                                    break;
-                                case 1:
-                                    Gdx.net.openURI("https://discord.com/channels/267367946135928833/692000787856883752");
-                                    break;
-                                default:
-                                    break;
-                            }
+                    FOptionPane.showOptionDialog("Join Discord option will open the invite link to join Forge Discord server. Forge Support option will open the Forge Support Channel.", "Choose option", FOptionPane.INFORMATION_ICON, ImmutableList.of("Join Discord", "Forge Support"), -1, result -> {
+                        switch (result) {
+                            case 0:
+                                Gdx.net.openURI("https://discord.gg/3v9JCVr");
+                                break;
+                            case 1:
+                                Gdx.net.openURI("https://discord.com/channels/267367946135928833/692000787856883752");
+                                break;
+                            default:
+                                break;
                         }
                     });
                 } else {
diff --git a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
index 46ca4eb881f..e318b0b1c92 100644
--- a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
@@ -23,7 +23,6 @@ import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextArea;
 import forge.toolbox.GuiChoose;
-import forge.util.Callback;
 import forge.util.Utils;
 
 public class PuzzleScreen extends LaunchScreen {
@@ -56,32 +55,29 @@ public class PuzzleScreen extends LaunchScreen {
         final ArrayList<Puzzle> puzzles = PuzzleIO.loadPuzzles(ForgeConstants.PUZZLE_DIR);
         Collections.sort(puzzles);
 
-        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseAPuzzle"), puzzles, new Callback<Puzzle>() {
-            @Override
-            public void run(final Puzzle chosen) {
-                if (chosen != null) {
-                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingThePuzzle"), true, () -> {
-                        // Load selected puzzle
-                        final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
-                        hostedMatch.setStartGameHook(() -> chosen.applyToGame(hostedMatch.getGame()));
+        GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseAPuzzle"), puzzles, chosen -> {
+            if (chosen != null) {
+                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingThePuzzle"), true, () -> {
+                    // Load selected puzzle
+                    final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
+                    hostedMatch.setStartGameHook(() -> chosen.applyToGame(hostedMatch.getGame()));
 
-                        hostedMatch.setEndGameHook((() -> chosen.savePuzzleSolve(hostedMatch.getGame().getOutcome().isWinner(GamePlayerUtil.getGuiPlayer()))));
+                    hostedMatch.setEndGameHook((() -> chosen.savePuzzleSolve(hostedMatch.getGame().getOutcome().isWinner(GamePlayerUtil.getGuiPlayer()))));
 
-                        final List<RegisteredPlayer> players = new ArrayList<>();
-                        final RegisteredPlayer human = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.getGuiPlayer());
-                        human.setStartingHand(0);
-                        players.add(human);
+                    final List<RegisteredPlayer> players = new ArrayList<>();
+                    final RegisteredPlayer human = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.getGuiPlayer());
+                    human.setStartingHand(0);
+                    players.add(human);
 
-                        final RegisteredPlayer ai = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.createAiPlayer());
-                        ai.setStartingHand(0);
-                        players.add(ai);
+                    final RegisteredPlayer ai = new RegisteredPlayer(new Deck()).setPlayer(GamePlayerUtil.createAiPlayer());
+                    ai.setStartingHand(0);
+                    players.add(ai);
 
-                        GameRules rules = new GameRules(GameType.Puzzle);
-                        rules.setGamesPerMatch(1);
-                        hostedMatch.startMatch(rules, null, players, human, GuiBase.getInterface().getNewGuiGame());
-                        FOptionPane.showMessageDialog(chosen.getGoalDescription(), chosen.getName());
-                    });
-                }
+                    GameRules rules = new GameRules(GameType.Puzzle);
+                    rules.setGamesPerMatch(1);
+                    hostedMatch.startMatch(rules, null, players, human, GuiBase.getInterface().getNewGuiGame());
+                    FOptionPane.showMessageDialog(chosen.getGoalDescription(), chosen.getName());
+                });
             }
         });
 
diff --git a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java
index e33dfb0f298..33d608fdeb8 100644
--- a/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java
@@ -14,7 +14,8 @@ import forge.gui.FThreads;
 import forge.model.FModel;
 import forge.screens.home.LoadGameMenu.LoadGameScreen;
 import forge.toolbox.FOptionPane;
-import forge.util.Callback;
+
+import java.util.function.Consumer;
 
 public class DraftingProcessScreen extends FDeckEditor {
     private boolean isDraftSaved;
@@ -54,7 +55,7 @@ public class DraftingProcessScreen extends FDeckEditor {
     }
 
     @Override
-    public void save(final Callback<Boolean> callback) {
+    public void save(final Consumer<Boolean> callback) {
         if (isDraftSaved) { //if draft itself is saved, let base class handle saving deck changes
             super.save(callback);
             return;
@@ -63,46 +64,40 @@ public class DraftingProcessScreen extends FDeckEditor {
         if (isQuestDraft()) {
             finishSave(QuestEventDraft.DECK_NAME);
             if (callback != null) {
-                callback.run(true);
+                callback.accept(true);
             }
             return;
         }
 
         FThreads.invokeInEdtNowOrLater(() -> {
-            FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblSaveDraftAs") + "?", new Callback<>() {
-                @Override
-                public void run(final String name) {
-                    if (StringUtils.isEmpty(name)) {
-                        save(callback); //re-prompt if user doesn't pick a name
+            FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblSaveDraftAs") + "?", name -> {
+                if (StringUtils.isEmpty(name)) {
+                    save(callback); //re-prompt if user doesn't pick a name
+                    return;
+                }
+
+                // Check for overwrite case
+                for (DeckGroup d : FModel.getDecks().getDraft()) {
+                    if (name.equalsIgnoreCase(d.getName())) {
+                        FOptionPane.showConfirmDialog(
+                                Forge.getLocalizer().getMessage("lblAlreadyDeckName") + name + Forge.getLocalizer().getMessage("lblOverwriteConfirm"),
+                                Forge.getLocalizer().getMessage("lblOverwriteDeck"), false, result -> {
+                                    if (result) {
+                                        finishSave(name);
+                                        if (callback != null) {
+                                            callback.accept(true);
+                                        }
+                                    } else {
+                                        save(callback); //If no overwrite, recurse
+                                    }
+                                });
                         return;
                     }
+                }
 
-                    // Check for overwrite case
-                    for (DeckGroup d : FModel.getDecks().getDraft()) {
-                        if (name.equalsIgnoreCase(d.getName())) {
-                            FOptionPane.showConfirmDialog(
-                                    Forge.getLocalizer().getMessage("lblAlreadyDeckName") + name + Forge.getLocalizer().getMessage("lblOverwriteConfirm"),
-                                    Forge.getLocalizer().getMessage("lblOverwriteDeck"), false, new Callback<>() {
-                                        @Override
-                                        public void run(Boolean result) {
-                                            if (result) {
-                                                finishSave(name);
-                                                if (callback != null) {
-                                                    callback.run(true);
-                                                }
-                                            } else {
-                                                save(callback); //If no overwrite, recurse
-                                            }
-                                        }
-                                    });
-                            return;
-                        }
-                    }
-
-                    finishSave(name);
-                    if (callback != null) {
-                        callback.run(true);
-                    }
+                finishSave(name);
+                if (callback != null) {
+                    callback.accept(true);
                 }
             });
         });
@@ -137,7 +132,7 @@ public class DraftingProcessScreen extends FDeckEditor {
     }
 
     @Override
-    public void onClose(final Callback<Boolean> canCloseCallback) {
+    public void onClose(final Consumer<Boolean> canCloseCallback) {
         if (isDraftSaved || canCloseCallback == null) {
             super.onClose(canCloseCallback); //can skip prompt if draft saved
             return;
@@ -146,7 +141,7 @@ public class DraftingProcessScreen extends FDeckEditor {
         if (isQuestDraft()) {
             FThreads.invokeInBackgroundThread(() -> {
                 if (questDraftController.cancelDraft()) {
-                    FThreads.invokeInEdtLater(() -> canCloseCallback.run(true));
+                    FThreads.invokeInEdtLater(() -> canCloseCallback.accept(true));
                 }
             });
             return;
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
index abb4e739a48..9bba36f5872 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
@@ -113,7 +113,10 @@ public class LoadDraftScreen extends LaunchScreen {
         FThreads.invokeInBackgroundThread(() -> {
             final DeckProxy humanDeck = lstDecks.getSelectedItem();
             if (humanDeck == null) {
-                FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingDeck"), Forge.getLocalizer().getMessage("lblNoDeck"));
+                FThreads.invokeInEdtLater(() -> { //should be in EDT...
+                    FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingDeck"),
+                        Forge.getLocalizer().getMessage("lblNoDeck"));
+                });
                 return;
             }
 
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index 45e47ff423b..510b9e5ec2d 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -174,10 +174,13 @@ public class MatchController extends AbstractGuiGame {
             final VPlayerPanel playerPanel = new VPlayerPanel(p, isLocal || noHumans, players.size());
             if (isLocal && !init) {
                 playerPanels.add(0, playerPanel); //ensure local player always first among player panels
+                playerPanel.setBottomPlayer(true);
                 init = true;
             }
             else {
                 playerPanels.add(playerPanel);
+                if (playerPanel.equals(playerPanels.get(0)))
+                    playerPanel.setBottomPlayer(true);
             }
         }
         view = new MatchScreen(playerPanels);
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index 61801a1049f..00d6b7648be 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -5,6 +5,7 @@ import static forge.Forge.getLocalizer;
 import forge.toolbox.FOptionPane;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.math.Vector2;
 import forge.adventure.scene.GameScene;
@@ -67,7 +68,6 @@ import forge.sound.MusicPlaylist;
 import forge.sound.SoundSystem;
 import forge.toolbox.FCardPanel;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 
 public class MatchScreen extends FScreen {
     public static FSkinColor getBorderColor() {
@@ -314,7 +314,7 @@ public class MatchScreen extends FScreen {
     }
 
     @Override
-    public void onClose(Callback<Boolean> canCloseCallback) {
+    public void onClose(Consumer<Boolean> canCloseCallback) {
         MatchController.writeMatchPreferences();
         SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
         super.onClose(canCloseCallback);
@@ -1188,12 +1188,9 @@ public class MatchScreen extends FScreen {
     }
 
     private void confirmUserConcedes() {
-        final Callback<Boolean> callback = new Callback<>() {
-            @Override
-            public void run(Boolean result) {
-                if (result) {
-                    getGameController().concede();
-                }
+        final Consumer<Boolean> callback = result -> {
+            if (result) {
+                getGameController().concede();
             }
         };
 
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
index fb784fd4127..8d7cb41c3cb 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -44,7 +45,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.CardTranslation;
 import forge.util.TextUtil;
 import forge.util.Utils;
@@ -54,7 +54,7 @@ public class VAssignCombatDamage extends FDialog {
     private static final float CARD_GAP_X = Utils.scale(10);
     private static final float ADD_BTN_HEIGHT = Utils.AVG_FINGER_HEIGHT * 0.75f;
 
-    private final Callback<Map<CardView, Integer>> callback;
+    private final Consumer<Map<CardView, Integer>> callback;
     private final int totalDamageToAssign;
 
     private boolean attackerHasDeathtouch = false;
@@ -421,7 +421,7 @@ public class VAssignCombatDamage extends FDialog {
             return;
         }
         hide();
-        callback.run(getDamageMap());
+        callback.accept(getDamageMap());
     }
 
     private int getDamageToKill(CardView source) {
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java b/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java
index 9fc02058b6a..1b92d31e27f 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -36,7 +37,6 @@ import forge.card.CardZoom;
 import forge.card.MagicColor;
 import forge.game.card.CardView;
 import forge.game.player.PlayerView;
-import forge.localinstance.skin.FSkinProp;
 import forge.screens.match.MatchController;
 import forge.toolbox.FCardPanel;
 import forge.toolbox.FContainer;
@@ -45,7 +45,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.CardTranslation;
 import forge.util.TextUtil;
 import forge.util.Utils;
@@ -55,7 +54,7 @@ public class VAssignGenericAmount extends FDialog {
     private static final float CARD_GAP_X = Utils.scale(10);
     private static final float ADD_BTN_HEIGHT = Utils.AVG_FINGER_HEIGHT * 0.75f;
 
-    private final Callback<Map<Object, Integer>> callback;
+    private final Consumer<Map<Object, Integer>> callback;
     private final int totalAmountToAssign;
 
     private final String lblAmount;
@@ -165,25 +164,10 @@ public class VAssignGenericAmount extends FDialog {
             max = max0;
             if (entity instanceof CardView) {
                 obj = add(new EffectSourcePanel((CardView)entity));
-            } else if (entity instanceof PlayerView) {
-                PlayerView player = (PlayerView)entity;
+            } else if (entity instanceof PlayerView player) {
                 obj = add(new MiscTargetPanel(player.getName(), MatchController.getPlayerAvatar(player), null));
-            } else if (entity instanceof Byte) {
-                FSkinImageInterface manaSymbol;
-                byte color = (Byte) entity;
-                if (color == MagicColor.WHITE) {
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_W);
-                } else if (color == MagicColor.BLUE) {
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_U);
-                } else if (color == MagicColor.BLACK) {
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_B);
-                } else if (color == MagicColor.RED) {
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_R);
-                } else if (color == MagicColor.GREEN) {
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_G);
-                } else { // Should never come here, but add this to avoid compile error
-                    manaSymbol = Forge.getAssets().images().get(FSkinProp.IMG_MANA_COLORLESS);
-                }
+            } else if (entity instanceof MagicColor.Color color) {
+                FSkinImageInterface manaSymbol = Forge.getAssets().manaImages().get(color.getShortName());
                 obj = add(new MiscTargetPanel("", manaSymbol, entity));
             } else {
                 obj = add(new MiscTargetPanel(entity.toString(), FSkinImage.UNKNOWN, null));
@@ -360,7 +344,7 @@ public class VAssignGenericAmount extends FDialog {
             return;
         }
         hide();
-        callback.run(getAssignedMap());
+        callback.accept(getAssignedMap());
     }
 
     public Map<Object, Integer> getAssignedMap() {
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
index 424f0ccfddd..0cd8d1da1d6 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
@@ -124,7 +124,7 @@ public class VAvatar extends FDisplayObject {
         float w = isHovered() ? getWidth()/16f+getWidth() : getWidth();
         float h = isHovered() ? getWidth()/16f+getHeight() : getHeight();
 
-        if (avatarAnimation != null && !MatchController.instance.getGameView().isMatchOver()) {
+        if (avatarAnimation != null && MatchController.instance.getGameView() != null && !MatchController.instance.getGameView().isMatchOver()) {
             if (player.wasAvatarLifeChanged()) {
                 avatarAnimation.start();
                 avatarAnimation.drawAvatar(g, image, 0, 0, w, h);
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
index 9f58e34ed43..5e489265129 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java
@@ -53,6 +53,12 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         rotateCards180 = b0;
     }
 
+    private float getCardStackOffset() {
+        if (Forge.isHorizontalTabLayout())
+            return 0.125f;
+        return CARD_STACK_OFFSET;
+    }
+
     protected void refreshCardPanels(Iterable<CardView> model) {
         clear();
 
@@ -78,7 +84,9 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
     @Override
     public void setVisible(boolean b0) {
-        if (isVisible() == b0) { return; }
+        if (isVisible() == b0) {
+            return;
+        }
         super.setVisible(b0);
         if (b0) { //when zone becomes visible, ensure display area of panels is updated and panels layed out
             for (CardAreaPanel pnl : cardPanels.get()) {
@@ -146,7 +154,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
                 CardAreaPanel attachedPanel = attachedPanels.get(i);
                 if (attachedPanel != null) {
                     int count = addCards(attachedPanel, x, y, cardWidth, cardHeight);
-                    x += count * cardWidth * CARD_STACK_OFFSET;
+                    x += count * cardWidth * getCardStackOffset();
                     totalCount += count;
                 }
             }
@@ -156,7 +164,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         cardPanel.setBounds(x, y, cardWidth, cardHeight);
 
         if (cardPanel.getNextPanelInStack() != null) { //add next panel in stack if needed
-            x += cardWidth * CARD_STACK_OFFSET;
+            x += cardWidth * getCardStackOffset();
             totalCount += addCards(cardPanel.getNextPanelInStack(), x, y, cardWidth, cardHeight);
         }
         return totalCount + 1;
@@ -165,6 +173,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
     protected float getCardWidth(float cardHeight) {
         return (cardHeight - 2 * FCardPanel.PADDING) / FCardPanel.ASPECT_RATIO + 2 * FCardPanel.PADDING; //ensure aspect ratio maintained after padding applied
     }
+
     protected float getCardHeight(float cardWidth) {
         return (cardWidth - 2 * FCardPanel.PADDING) * FCardPanel.ASPECT_RATIO + 2 * FCardPanel.PADDING; //ensure aspect ratio maintained after padding applied
     }
@@ -181,7 +190,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         for (CardAreaPanel cardPanel : new ArrayList<>(cardPanels.get())) {
             if (cardPanel != null) {
                 int count = addCards(cardPanel, x, y, cardWidth, cardHeight);
-                x += cardWidth + (count - 1) * cardWidth * CARD_STACK_OFFSET;
+                x += cardWidth + (count - 1) * cardWidth * getCardStackOffset();
             }
         }
 
@@ -197,7 +206,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
     @Override
     public String getActivateAction(int index) {
-        if(!GuiBase.isNetworkplay()) {
+        if (!GuiBase.isNetworkplay()) {
             //causes lag on netplay client side, also index shouldn't be out of bounds
             if (index >= 0 && index < orderedCards.get().size())
                 return MatchController.instance.getGameController().getActivateDescription(orderedCards.get().get(index));
@@ -266,9 +275,11 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         public CardAreaPanel getAttachedToPanel() {
             return attachedToPanel;
         }
+
         public void setAttachedToPanel(final CardAreaPanel attachedToPanel0) {
             attachedToPanel = attachedToPanel0;
         }
+
         public List<CardAreaPanel> getAttachedPanels() {
             if (attachedPanels == null) {
                 attachedPanels = new ArrayList<>();
@@ -278,15 +289,19 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
             }
             return attachedPanels;
         }
+
         public CardAreaPanel getNextPanelInStack() {
             return nextPanelInStack;
         }
+
         public void setNextPanelInStack(CardAreaPanel nextPanelInStack0) {
             nextPanelInStack = nextPanelInStack0;
         }
+
         public CardAreaPanel getPrevPanelInStack() {
             return prevPanelInStack;
         }
+
         public void setPrevPanelInStack(CardAreaPanel prevPanelInStack0) {
             prevPanelInStack = prevPanelInStack0;
         }
@@ -324,8 +339,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
                     attachedPanels.remove(CardAreaPanel.get(getAttachedto));
                     setAttachedToPanel(null);
                 }
-            }
-            else {
+            } else {
                 setAttachedToPanel(null);
             }
         }
@@ -423,7 +437,9 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         }
 
         public void showZoom() {
-            if (displayArea == null) { return; }
+            if (displayArea == null) {
+                return;
+            }
 
             final List<CardView> cards = displayArea.orderedCards.get();
             CardZoom.show(cards, cards.indexOf(getCard()), displayArea);
@@ -444,10 +460,14 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
         }
 
         private List<CardView> getOtherCardsToSelect(boolean selectOtherCardsInStack) {
-            if (!selectOtherCardsInStack) { return null; }
+            if (!selectOtherCardsInStack) {
+                return null;
+            }
 
             //on double-tap select all other cards in stack if any
-            if (prevPanelInStack == null && nextPanelInStack == null) { return null; }
+            if (prevPanelInStack == null && nextPanelInStack == null) {
+                return null;
+            }
 
             List<CardView> cards = new ArrayList<>();
 
@@ -490,7 +510,9 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
 
         public Vector2 getTargetingArrowOrigin() {
             //don't show targeting arrow unless in display area that's visible
-            if (displayArea == null || !displayArea.isVisible()) { return null; }
+            if (displayArea == null || !displayArea.isVisible()) {
+                return null;
+            }
 
             return getTargetingArrowOrigin(this, isTapped());
         }
@@ -517,8 +539,7 @@ public abstract class VCardDisplayArea extends VDisplayArea implements ActivateH
                 g.startRotateTransform(x + w / 2, y + h / 2, 180);
                 super.draw(g);
                 g.endTransform();
-            }
-            else {
+            } else {
                 super.draw(g);
             }
         }
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VField.java b/forge-gui-mobile/src/forge/screens/match/views/VField.java
index 12ee0821968..c562bc5c832 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VField.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VField.java
@@ -2,6 +2,7 @@ package forge.screens.match.views;
 
 import java.util.*;
 
+import forge.Forge;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.player.PlayerView;
@@ -33,6 +34,7 @@ public class VField extends FContainer {
     public boolean isFlipped() {
         return flipped;
     }
+
     public void setFlipped(boolean flipped0) {
         flipped = flipped0;
     }
@@ -61,7 +63,9 @@ public class VField extends FContainer {
             clear();
 
             Iterable<CardView> model = player.getBattlefield();
-            if (model == null) { return; }
+            if (model == null) {
+                return;
+            }
 
             for (CardView card : model) {
                 CardAreaPanel cardPanel = CardAreaPanel.get(card);
@@ -84,18 +88,15 @@ public class VField extends FContainer {
                         if (!tryStackCard(card, creatures)) {
                             creatures.add(card);
                         }
-                    }
-                    else if (details.isLand()) {
+                    } else if (details.isLand()) {
                         if (!tryStackCard(card, lands)) {
                             lands.add(card);
                         }
-                    }
-                    else if (details.isArtifact() && (details.isContraption() || details.isAttraction())) {
+                    } else if (details.isArtifact() && (details.isContraption() || details.isAttraction())) {
                         if (contraptions == null)
                             contraptions = new ArrayList<>();
                         contraptions.add(card); //Arrange these later.
-                    }
-                    else {
+                    } else {
                         if (!tryStackCard(card, otherPermanents)) {
                             otherPermanents.add(card);
                         }
@@ -103,7 +104,7 @@ public class VField extends FContainer {
                 }
             }
 
-            if(contraptions != null) {
+            if (contraptions != null) {
                 contraptions = arrangeContraptions(contraptions);
                 otherPermanents.addAll(contraptions);
             }
@@ -111,8 +112,7 @@ public class VField extends FContainer {
             if (creatures.isEmpty()) {
                 row1.refreshCardPanels(otherPermanents);
                 row2.refreshCardPanels(lands);
-            }
-            else {
+            } else {
                 row1.refreshCardPanels(creatures);
                 lands.addAll(otherPermanents);
                 row2.refreshCardPanels(lands);
@@ -173,13 +173,14 @@ public class VField extends FContainer {
         TreeSet<CardView> row = new TreeSet<>((c1, c2) -> {
             //Order is sprocket-less cards, then sprocket 1, sprocket 2, sprocket 3, and finally attractions.
             int sprocket1 = c1.getSprocket(), sprocket2 = c2.getSprocket();
-            if(sprocket1 == 0 && c1.getCurrentState().isAttraction())
+            if (sprocket1 == 0 && c1.getCurrentState().isAttraction())
                 sprocket1 = 4;
-            if(sprocket2 == 0 && c2.getCurrentState().isAttraction())
+            if (sprocket2 == 0 && c2.getCurrentState().isAttraction())
                 sprocket2 = 4;
             return sprocket1 - sprocket2;
         });
-        outer: for (CardView card : contraptions) {
+        outer:
+        for (CardView card : contraptions) {
             if (card.hasCardAttachments()) {
                 row.add(card); //Don't stack contraptions or attractions with attachments.
                 continue;
@@ -187,7 +188,7 @@ public class VField extends FContainer {
             if (card.getCurrentState().isAttraction()) {
                 //Stack attractions with other attractions.
                 for (CardView c : row) {
-                    if(c.getCurrentState().isAttraction() && !c.hasCardAttachments()) {
+                    if (c.getCurrentState().isAttraction() && !c.hasCardAttachments()) {
                         stackOnto(card, c);
                         continue outer;
                     }
@@ -240,13 +241,17 @@ public class VField extends FContainer {
         if (flipped) {
             y1 = cardSize;
             y2 = 0;
-        }
-        else {
+        } else {
             y1 = 0;
             y2 = cardSize;
         }
-        row1.setBounds(0, y1, width-fieldModifier, cardSize);
-        row2.setBounds(0, y2, (width - commandZoneWidth)-fieldModifier, cardSize);
+        if (Forge.isHorizontalTabLayout()) {
+            row1.setBounds(0, y1, width, cardSize);
+            row2.setBounds(0, y2, width, cardSize);
+        } else {
+            row1.setBounds(0, y1, width - fieldModifier, cardSize);
+            row2.setBounds(0, y2, (width - commandZoneWidth) - fieldModifier, cardSize);
+        }
     }
 
     public class FieldRow extends VCardDisplayArea {
@@ -270,13 +275,14 @@ public class VField extends FContainer {
         public void setNextSelected(int val) {
             this.selected++;
             if (this.selected >= this.getChildCount())
-                this.selected = this.getChildCount()-1;
+                this.selected = this.getChildCount() - 1;
             if (this.selectedChild != null)
                 this.selectedChild.setHovered(false);
             this.selectedChild = getChildAt(this.selected);
             this.selectedChild.setHovered(true);
             MatchScreen.setPotentialListener(Arrays.asList(this.selectedChild));
         }
+
         public void selectCurrent() {
             if (this.selectedChild != null) {
                 this.selectedChild.setHovered(true);
@@ -285,6 +291,7 @@ public class VField extends FContainer {
                 this.setNextSelected(1);
             }
         }
+
         public void unselectCurrent() {
             if (this.selectedChild != null) {
                 this.selectedChild.setHovered(false);
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
index 8531c6291f5..b5e601b8dd4 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
@@ -28,6 +28,7 @@ public class VManaPool extends VDisplayArea {
             return FSkinColor.get(Colors.ADV_CLR_TEXT);
         return FSkinColor.get(Colors.CLR_TEXT);
     }
+
     private static final FSkinFont FONT = FSkinFont.get(16);
 
     private final PlayerView player;
@@ -37,7 +38,7 @@ public class VManaPool extends VDisplayArea {
     public VManaPool(PlayerView player0) {
         player = player0;
 
-        addManaLabel(FSkinProp.IMG_MANA_COLORLESS, (byte)ManaAtom.COLORLESS);
+        addManaLabel(FSkinProp.IMG_MANA_COLORLESS, (byte) ManaAtom.COLORLESS);
         addManaLabel(FSkinProp.IMG_MANA_W, MagicColor.WHITE);
         addManaLabel(FSkinProp.IMG_MANA_U, MagicColor.BLUE);
         addManaLabel(FSkinProp.IMG_MANA_B, MagicColor.BLACK);
@@ -69,7 +70,7 @@ public class VManaPool extends VDisplayArea {
         float x = 0;
         float y = 0;
 
-        if (Forge.isLandscapeMode()) {
+        if (Forge.isLandscapeMode() && (!Forge.altZoneTabs || !"Horizontal".equalsIgnoreCase(Forge.altZoneTabMode))) {
             float labelWidth = visibleWidth / 2;
             float labelHeight = visibleHeight / 3;
 
@@ -79,13 +80,11 @@ public class VManaPool extends VDisplayArea {
                 if (++count % 2 == 0) {
                     x = 0;
                     y += labelHeight;
-                }
-                else {
+                } else {
                     x += labelWidth;
                 }
             }
-        }
-        else {
+        } else {
             float labelWidth = visibleWidth / manaLabels.size();
             float labelHeight = visibleHeight;
 
@@ -113,14 +112,16 @@ public class VManaPool extends VDisplayArea {
             activate();
             return true;
         }
+
         public void activate() {
-            if(!(MatchController.instance.getGameController() instanceof PlayerControllerHuman))
+            if (!(MatchController.instance.getGameController() instanceof PlayerControllerHuman))
                 return;
             PlayerControllerHuman controller = (PlayerControllerHuman) MatchController.instance.getGameController();
             final Input ipm = controller.getInputQueue().getInput();
-            if(ipm instanceof InputPayMana && ipm.getOwner().equals(player))
+            if (ipm instanceof InputPayMana && ipm.getOwner().equals(player))
                 controller.useMana(colorCode);
         }
+
         @Override
         public boolean flick(float x, float y) {
             if (player.isLobbyPlayer(GamePlayerUtil.getGuiPlayer())) {
@@ -146,17 +147,18 @@ public class VManaPool extends VDisplayArea {
             if (h > maxImageHeight) {
                 h /= 2;
             }
-            float w = image.getWidth() * h / image.getHeight();
+            float modifier = Forge.isHorizontalTabLayout() ? 0.7f : 1f;
+            float w = image.getWidth() * h * modifier / image.getHeight();
             while (w > getWidth()) {
                 h /= 2;
-                w = image.getWidth() * h / image.getHeight();
+                w = image.getWidth() * h * modifier / image.getHeight();
             }
             float x = (getWidth() - w) / 2;
             float y = gapY + (maxImageHeight - h) / 2;
 
             if (isHovered())
                 g.fillRect(FSkinColor.getStandardColor(50, 200, 150).alphaColor(0.3f), 0, 0, getWidth(), getHeight());
-            g.drawImage(image, x, y, w, h);
+            g.drawImage(image, x, y, w, Forge.isHorizontalTabLayout() ? w : h);
 
             x = 0;
             y += h + gapY;
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
index 5e6cba4eda2..b80b3ce3930 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
@@ -9,6 +9,7 @@ import com.badlogic.gdx.utils.Align;
 
 import forge.Forge;
 import forge.Graphics;
+import forge.assets.FSkin;
 import forge.assets.FSkinColor;
 import forge.assets.FSkinColor.Colors;
 import forge.assets.FSkinFont;
@@ -19,6 +20,7 @@ import forge.game.card.CounterEnumType;
 import forge.game.player.PlayerView;
 import forge.game.zone.ZoneType;
 import forge.localinstance.properties.ForgePreferences.FPref;
+import forge.localinstance.skin.FSkinProp;
 import forge.menu.FMenuBar;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
@@ -38,21 +40,31 @@ public class VPlayerPanel extends FContainer {
     private static final FSkinFont LIFE_FONT_ALT = FSkinFont.get(22);
     private static final FSkinFont INFO_FONT = FSkinFont.get(12);
     private static final FSkinFont INFO2_FONT = FSkinFont.get(14);
+
     private static FSkinColor getInfoForeColor() {
         if (Forge.isMobileAdventureMode)
             return FSkinColor.get(Colors.ADV_CLR_TEXT);
         return FSkinColor.get(Colors.CLR_TEXT);
     }
+
     private static FSkinColor getDisplayAreaBackColor() {
         if (Forge.isMobileAdventureMode)
             return FSkinColor.get(Colors.ADV_CLR_INACTIVE).alphaColor(0.5f);
         return FSkinColor.get(Colors.CLR_INACTIVE).alphaColor(0.5f);
     }
+
+    private static FSkinColor getAltDisplayAreaBackColor() {
+        if (Forge.isMobileAdventureMode)
+            return FSkinColor.get(Colors.ADV_CLR_PHASE_INACTIVE_ENABLED).alphaColor(0.3f);
+        return FSkinColor.get(Colors.CLR_PHASE_INACTIVE_ENABLED).alphaColor(0.3f);
+    }
+
     private static FSkinColor getDeliriumHighlight() {
         if (Forge.isMobileAdventureMode)
             return FSkinColor.get(Colors.ADV_CLR_PHASE_ACTIVE_ENABLED).alphaColor(0.5f);
         return FSkinColor.get(Colors.CLR_PHASE_ACTIVE_ENABLED).alphaColor(0.5f);
     }
+
     private static final float INFO_TAB_PADDING_X = Utils.scale(2);
     private static final float INFO_TAB_PADDING_Y = Utils.scale(2);
 
@@ -79,11 +91,13 @@ public class VPlayerPanel extends FContainer {
     private boolean forMultiPlayer = false;
     public int adjustHeight = 1;
     private int selected = 0;
+    private boolean isBottomPlayer = false;
+
     public VPlayerPanel(PlayerView player0, boolean showHand, int playerCount) {
         player = player0;
         phaseIndicator = add(new VPhaseIndicator());
 
-        if(playerCount > 2){
+        if (playerCount > 2) {
             forMultiPlayer = true;
             avatarHeight *= 0.5f;
             //displayAreaHeightFactor *= 0.7f;
@@ -116,6 +130,10 @@ public class VPlayerPanel extends FContainer {
         return player;
     }
 
+    public void setBottomPlayer(boolean val) {
+        isBottomPlayer = val;
+    }
+
     public void addZoneDisplay(ZoneType zoneType) {
         VZoneDisplay zoneDisplay = add(new VZoneDisplay(player, zoneType));
         InfoTabZone zoneTab = add(new InfoTabZone(zoneDisplay, zoneType));
@@ -123,23 +141,8 @@ public class VPlayerPanel extends FContainer {
         tabs.add(zoneTab);
     }
 
-    public static FSkinImage iconFromZone(ZoneType zoneType) {
-        switch (zoneType) {
-            case Hand: return Forge.hdbuttons ? FSkinImage.HDHAND : FSkinImage.HAND;
-            case Library: return Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.LIBRARY;
-            case Graveyard: return Forge.hdbuttons ? FSkinImage.HDGRAVEYARD : FSkinImage.GRAVEYARD;
-            case Exile: return Forge.hdbuttons ? FSkinImage.HDEXILE : FSkinImage.EXILE;
-            case Sideboard: return Forge.hdbuttons ? FSkinImage.HDSIDEBOARD :FSkinImage.SIDEBOARD;
-            case Flashback: return Forge.hdbuttons ? FSkinImage.HDFLASHBACK :FSkinImage.FLASHBACK;
-            case Command: return FSkinImage.COMMAND;
-            case PlanarDeck: return FSkinImage.PLANAR;
-            case SchemeDeck: return FSkinImage.SCHEME;
-            case AttractionDeck: return FSkinImage.ATTRACTION;
-            case ContraptionDeck: return FSkinImage.CONTRAPTION;
-            case Ante: return FSkinImage.ANTE;
-            case Junkyard: return FSkinImage.JUNKYARD;
-            default: return FSkinImage.HDLIBRARY;
-        }
+    public static FSkinImageInterface iconFromZone(ZoneType zoneType) {
+        return FSkin.getImages().get(FSkinProp.iconFromZone(zoneType, Forge.hdbuttons));
     }
 
     public Iterable<InfoTab> getTabs() {
@@ -151,12 +154,12 @@ public class VPlayerPanel extends FContainer {
     }
 
     public void resetZoneTabs() {
-        for(InfoTab tab : tabs)
+        for (InfoTab tab : tabs)
             tab.reset();
     }
 
     public void setSelectedZone(ZoneType zoneType) {
-        if(zoneTabs.containsKey(zoneType))
+        if (zoneTabs.containsKey(zoneType))
             setSelectedTab(zoneTabs.get(zoneType));
         else {
             extraTab.setActiveZone(zoneType);
@@ -189,6 +192,7 @@ public class VPlayerPanel extends FContainer {
             MatchController.getView().revalidate();
         }
     }
+
     public void setNextSelectedTab(boolean change) {
         if (change) {
             if (selectedTab != null) {
@@ -207,13 +211,13 @@ public class VPlayerPanel extends FContainer {
         int numExtraTabs = extraTab.displayAreas.size();
         if (selected < 0 || selected >= numTabs + numExtraTabs)
             selected = 0;
-        if(selected >= numTabs) {
+        if (selected >= numTabs) {
             extraTab.setActiveZoneByIndex(selected - numTabs);
             setSelectedTab(extraTab);
-        }
-        else
+        } else
             setSelectedTab(tabs.get(selected));
     }
+
     public void closeSelectedTab() {
         if (selectedTab != null) {
             selectedTab.setDisplayVisible(false);
@@ -234,6 +238,7 @@ public class VPlayerPanel extends FContainer {
     public boolean isFlipped() {
         return field.isFlipped();
     }
+
     public void setFlipped(boolean flipped0) {
         field.setFlipped(flipped0);
     }
@@ -254,9 +259,11 @@ public class VPlayerPanel extends FContainer {
     public VField getField() {
         return field;
     }
+
     public VField.FieldRow getSelectedRow() {
         return selectedRow;
     }
+
     public void switchRow() {
         if (selectedRow == field.getRow1())
             selectedRow = field.getRow2();
@@ -288,30 +295,24 @@ public class VPlayerPanel extends FContainer {
         tabManaPool.update();
     }
 
+    @SuppressWarnings("incomplete-switch")
     public void updateZone(ZoneType zoneType) {
-        if (zoneType == ZoneType.Battlefield ) {
+        if (zoneType == ZoneType.Battlefield) {
             field.update(true);
-        }
-        else if (zoneType == ZoneType.Command) {
+        } else if (zoneType == ZoneType.Command) {
             commandZone.update();
-        }
-        else {
-            if(zoneTabs.containsKey(zoneType))
+            if (selectedTab != null && Forge.isHorizontalTabLayout())
+                updateTabLayout(initW, initH);
+        } else {
+            if (zoneTabs.containsKey(zoneType))
                 zoneTabs.get(zoneType).update();
-            else if(EXTRA_ZONES.contains(zoneType)) {
+            else if (EXTRA_ZONES.contains(zoneType)) {
                 extraTab.update(zoneType);
             }
 
             //update flashback zone when graveyard, library, exile, or stack zones updated
             switch (zoneType) {
-            case Graveyard:
-            case Library:
-            case Exile:
-            case Stack:
-                zoneTabs.get(ZoneType.Flashback).update();
-                break;
-            default:
-                break;
+                case Graveyard, Library, Exile, Stack -> zoneTabs.get(ZoneType.Flashback).update();
             }
         }
     }
@@ -327,7 +328,7 @@ public class VPlayerPanel extends FContainer {
         float x = avatarHeight;
         float w = width - avatarHeight;
         float indicatorScale = 1f;
-        if(avatarHeight<VAvatar.HEIGHT){
+        if (avatarHeight < VAvatar.HEIGHT) {
             indicatorScale = 0.6f;
         }
         float h = phaseIndicator.getPreferredHeight(w) * indicatorScale;
@@ -366,8 +367,7 @@ public class VPlayerPanel extends FContainer {
             commandZone.setBounds(width - commandZoneWidth, y - commandZoneHeight, commandZoneWidth, commandZoneHeight);
 
             field.setCommandZoneWidth(commandZoneWidth + 1); //ensure second row of field accounts for width of command zone and its border
-        }
-        else {
+        } else {
             field.setCommandZoneWidth(0);
         }
 
@@ -383,18 +383,23 @@ public class VPlayerPanel extends FContainer {
         field.setFieldModifier(0);
     }
 
+    private float initW, initH, commandZoneWidth, commandZoneCount, avatarWidth, prefWidth;
+    private final float mod = 2.4f;
+
     private void doLandscapeLayout(float width, float height) {
+        initW = width;
+        initH = height;
         float x = 0;
         float y = 0;
         float yAlt = 0;
-        float avatarWidth = Forge.altZoneTabs ? avatar.getWidth() : 0;
+        avatarWidth = Forge.altZoneTabs ? avatar.getWidth() : 0;
         avatar.setPosition(x, y);
         y += avatar.getHeight();
 
         lblLife.setBounds(x, (Forge.altPlayerLayout && !Forge.altZoneTabs) ? 0 : y, avatar.getWidth(), (Forge.altPlayerLayout && !Forge.altZoneTabs) ? INFO_FONT.getLineHeight() : Forge.altZoneTabs ? LIFE_FONT_ALT.getLineHeight() : LIFE_FONT.getLineHeight());
         if (Forge.altPlayerLayout && !Forge.altZoneTabs) {
             if (adjustHeight > 2)
-                y += INFO_FONT.getLineHeight()/2;
+                y += INFO_FONT.getLineHeight() / 2;
         } else
             y += lblLife.getHeight();
 
@@ -412,12 +417,16 @@ public class VPlayerPanel extends FContainer {
                     tab.setBounds(x, y, infoTabWidth, infoTabHeight);
                     y += infoTabHeight;
                 } else {
-                    tab.setBounds(x+width-avatarWidth, yAlt, avatarWidth, infoTabHeightAlt);
+                    tab.setBounds(x + width - avatarWidth, yAlt, avatarWidth, infoTabHeightAlt);
                     yAlt += infoTabHeightAlt;
                 }
             }
         }
-        x = avatar.getRight();
+        updateTabLayout(width, height);
+    }
+
+    private void updateTabLayout(float width, float height) {
+        float x = avatar.getRight();
         phaseIndicator.resetFont();
         phaseIndicator.setBounds(x, 0, avatar.getWidth() * 0.6f, height);
         x += phaseIndicator.getWidth();
@@ -429,38 +438,77 @@ public class VPlayerPanel extends FContainer {
         }
 
         //account for command zone if needed
-        int commandZoneCount = commandZone.getCount();
+        commandZoneWidth = 0f;
+        commandZoneCount = commandZone.getCount();
         if (commandZoneCount > 0) {
             float commandZoneHeight = height / 2;
-            float commandZoneWidth = Math.min(commandZoneCount, 2) * commandZone.getCardWidth(commandZoneHeight);
-            commandZone.setBounds(x + fieldWidth - commandZoneWidth, height - commandZoneHeight, commandZoneWidth, commandZoneHeight);
+            float minCommandCards = Forge.isHorizontalTabLayout() ? 5 : 2;
+            commandZoneWidth = Math.min(commandZoneCount, minCommandCards) * commandZone.getCardWidth(commandZoneHeight);
+            float x2 = x + fieldWidth - commandZoneWidth;
+            float y2 = height - commandZoneHeight;
+            if (Forge.isHorizontalTabLayout()) {
+                x2 = width - avatarWidth - commandZoneWidth;
+                y2 = 0;
+            }
+            commandZone.setBounds(x2, y2, commandZoneWidth, commandZoneHeight);
             if (isFlipped()) { //flip across x-axis if needed
                 commandZone.setTop(height - commandZone.getBottom());
             }
 
             field.setCommandZoneWidth(commandZoneWidth + 1); //ensure second row of field accounts for width of command zone and its border
-        }
-        else {
+        } else {
             field.setCommandZoneWidth(0);
         }
+        prefWidth = width / mod;
+        if (Forge.isHorizontalTabLayout()) {
+            field.setBounds(x, 0, width - avatarWidth, height);
+            field.getRow1().setWidth(width - (commandZoneCount > 0 ? commandZone.getWidth() + (avatarWidth * commandZoneCount) : avatarWidth));
+            field.getRow2().setWidth(width - (avatarWidth / 4f) - (selectedTab == null ? 0 : selectedTab.getIdealWidth(prefWidth) + 1) - avatarWidth * mod);
+        } else
+            field.setBounds(x, 0, fieldWidth, height);
 
-        field.setBounds(x, 0, fieldWidth, height);
-
-        x = width - displayAreaWidth-avatarWidth;
+        x = width - displayAreaWidth - avatarWidth;
         for (InfoTab tab : tabs) {
-            tab.setDisplayBounds(x, 0, displayAreaWidth, height);
+            if (Forge.isHorizontalTabLayout()) {
+                float w = tab.getIdealWidth(prefWidth);
+                float h = height / 2f;
+                tab.setDisplayBounds(width - w - avatarWidth, isBottomPlayer ? h : 0, w, h);
+            } else {
+                tab.setDisplayBounds(x, 0, displayAreaWidth, height);
+            }
         }
 
-        if (!Forge.altZoneTabs)
+        if (!Forge.altZoneTabs) {
             field.setFieldModifier(0);
-        else
-            field.setFieldModifier(avatarWidth/16);
+        } else {
+            if (!"Horizontal".equalsIgnoreCase(Forge.altZoneTabMode))
+                field.setFieldModifier(avatarWidth / 16);
+        }
+    }
+
+    @Override
+    protected void drawOverlay(Graphics g) {
+        if (Forge.isHorizontalTabLayout()) {
+            InfoTab infoTab = selectedTab;
+            if (infoTab != null) {
+                VDisplayArea selectedDisplayArea = infoTab.getDisplayArea();
+                if (selectedDisplayArea != null && selectedDisplayArea.getCount() > 0) {
+                    float scale = avatarWidth / 2f;
+                    float x = selectedDisplayArea.getLeft();
+                    float y = selectedDisplayArea.getBottom() - scale;
+                    g.fillRect(getAltDisplayAreaBackColor(), x, y, scale, scale);
+                    infoTab.icon.draw(g, x, y, scale, scale);
+                }
+            }
+        }
+        super.drawOverlay(g);
     }
 
     @Override
     public void drawBackground(Graphics g) {
         float y;
         InfoTab infoTab = selectedTab;
+        float pad = Forge.isHorizontalTabLayout() ? avatarWidth / 16f : 0f;
         if (infoTab != null) { //draw background and border for selected zone if needed
             VDisplayArea selectedDisplayArea = infoTab.getDisplayArea();
             float x = selectedDisplayArea == null ? 0 : selectedDisplayArea.getLeft();
@@ -468,12 +516,13 @@ public class VPlayerPanel extends FContainer {
             float top = selectedDisplayArea == null ? 0 : selectedDisplayArea.getTop();
             float h = selectedDisplayArea == null ? 0 : selectedDisplayArea.getHeight();
             float bottom = selectedDisplayArea == null ? 0 : selectedDisplayArea.getBottom();
-            g.fillRect(getDisplayAreaBackColor(), x, top, w, h);
+            g.fillRect(Forge.isHorizontalTabLayout() ? getAltDisplayAreaBackColor() : getDisplayAreaBackColor(), x - pad, top, w + pad, h + pad);
+            if (Forge.isHorizontalTabLayout())
+                g.drawLine(1, MatchScreen.getBorderColor(), x, isFlipped() ? bottom : top, x + w, isFlipped() ? bottom : top);
 
             if (Forge.isLandscapeMode()) {
                 g.drawLine(1, MatchScreen.getBorderColor(), x, top, x, bottom);
-            }
-            else {
+            } else {
                 y = isFlipped() ? top + 1 : bottom;
                 //don't know why infotab gets null here, either way don't crash the gui..
                 float left = infoTab == null ? 0 : infoTab.getLeft();
@@ -487,6 +536,8 @@ public class VPlayerPanel extends FContainer {
             float x = commandZone.getLeft();
             y = commandZone.getTop();
             g.drawLine(1, MatchScreen.getBorderColor(), x, y, x, y + commandZone.getHeight());
+            /*if (Forge.isHorizontalTabLayout())
+                g.fillRect(getAltDisplayAreaBackColor(), x - pad, y, commandZoneWidth + pad, commandZone.getHeight() + pad);*/
             if (isFlipped()) {
                 y += commandZone.getHeight();
             }
@@ -499,7 +550,7 @@ public class VPlayerPanel extends FContainer {
         ArrayList<FScrollPane> out = new ArrayList<>();
         out.add(field.getRow1());
         out.add(field.getRow2());
-        for(InfoTabZone tab : zoneTabs.values())
+        for (InfoTabZone tab : zoneTabs.values())
             out.add(tab.displayArea);
         out.add(commandZone);
         out.addAll(extraTab.displayAreas.values());
@@ -522,7 +573,7 @@ public class VPlayerPanel extends FContainer {
         private void update() {
             int vibrateDuration = 0;
             int delta = player.getLife() - life;
-            player.setAvatarLifeDifference(player.getAvatarLifeDifference()+delta);
+            player.setAvatarLifeDifference(player.getAvatarLifeDifference() + delta);
             if (delta != 0) {
                 if (delta < 0) {
                     vibrateDuration += delta * -100;
@@ -553,6 +604,7 @@ public class VPlayerPanel extends FContainer {
                 Gdx.input.vibrate(Math.min(vibrateDuration, 2000));
             }
         }
+
         private void updateShards() {
             manaShards = player.getNumManaShards();
         }
@@ -567,55 +619,55 @@ public class VPlayerPanel extends FContainer {
         public void draw(Graphics g) {
             adjustHeight = 1;
             float divider = Gdx.app.getGraphics().getHeight() > 900 ? 1.2f : 2f;
-            if(Forge.altPlayerLayout && !Forge.altZoneTabs && Forge.isLandscapeMode()) {
+            if (Forge.altPlayerLayout && !Forge.altZoneTabs && Forge.isLandscapeMode()) {
                 if (poisonCounters == 0 && energyCounters == 0 && experienceCounters == 0 && ticketCounters == 0 && radCounters == 0 && manaShards == 0) {
-                    g.fillRect(Color.DARK_GRAY, 0, 0, INFO2_FONT.getBounds(lifeStr).width+1, INFO2_FONT.getBounds(lifeStr).height+1);
+                    g.fillRect(Color.DARK_GRAY, 0, 0, INFO2_FONT.getBounds(lifeStr).width + 1, INFO2_FONT.getBounds(lifeStr).height + 1);
                     g.drawText(lifeStr, INFO2_FONT, getInfoForeColor().getColor(), 0, 0, getWidth(), getHeight(), false, Align.left, false);
                 } else {
                     float halfHeight = getHeight() / divider;
                     float textStart = halfHeight + Utils.scale(1);
                     float textWidth = getWidth() - textStart;
                     int mod = 1;
-                    g.fillRect(Color.DARK_GRAY, 0, 0, INFO_FONT.getBounds(lifeStr).width+halfHeight+1, INFO_FONT.getBounds(lifeStr).height+1);
+                    g.fillRect(Color.DARK_GRAY, 0, 0, INFO_FONT.getBounds(lifeStr).width + halfHeight + 1, INFO_FONT.getBounds(lifeStr).height + 1);
                     g.drawImage(FSkinImage.QUEST_LIFE, 0, 0, halfHeight, halfHeight);
                     g.drawText(lifeStr, INFO_FONT, getInfoForeColor().getColor(), textStart, 0, textWidth, halfHeight, false, Align.left, false);
                     if (poisonCounters > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, halfHeight+2, INFO_FONT.getBounds(String.valueOf(poisonCounters)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(poisonCounters)).height+1);
-                        g.drawImage(FSkinImage.POISON, 0, halfHeight+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(poisonCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, halfHeight+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, halfHeight + 2, INFO_FONT.getBounds(String.valueOf(poisonCounters)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(poisonCounters)).height + 1);
+                        g.drawImage(FSkinImage.POISON, 0, halfHeight + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(poisonCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, halfHeight + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
                     if (energyCounters > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(energyCounters)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(energyCounters)).height+1);
-                        g.drawImage(FSkinImage.ENERGY, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(energyCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight * mod) + 2, INFO_FONT.getBounds(String.valueOf(energyCounters)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(energyCounters)).height + 1);
+                        g.drawImage(FSkinImage.ENERGY, 0, (halfHeight * mod) + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(energyCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight * mod) + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
                     if (experienceCounters > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(experienceCounters)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(experienceCounters)).height+1);
-                        g.drawImage(FSkinImage.COMMANDER, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(experienceCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight * mod) + 2, INFO_FONT.getBounds(String.valueOf(experienceCounters)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(experienceCounters)).height + 1);
+                        g.drawImage(FSkinImage.COMMANDER, 0, (halfHeight * mod) + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(experienceCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight * mod) + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
                     if (radCounters > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(radCounters)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(radCounters)).height+1);
-                        g.drawImage(FSkinImage.RAD, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(radCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight * mod) + 2, INFO_FONT.getBounds(String.valueOf(radCounters)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(radCounters)).height + 1);
+                        g.drawImage(FSkinImage.RAD, 0, (halfHeight * mod) + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(radCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight * mod) + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
                     if (ticketCounters > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(ticketCounters)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(ticketCounters)).height+1);
-                        g.drawImage(FSkinImage.TICKET, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(ticketCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight * mod) + 2, INFO_FONT.getBounds(String.valueOf(ticketCounters)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(ticketCounters)).height + 1);
+                        g.drawImage(FSkinImage.TICKET, 0, (halfHeight * mod) + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(ticketCounters), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight * mod) + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
                     if (manaShards > 0) {
-                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight*mod)+2, INFO_FONT.getBounds(String.valueOf(manaShards)).width+halfHeight+1, INFO_FONT.getBounds(String.valueOf(manaShards)).height+1);
-                        g.drawImage(FSkinImage.AETHER_SHARD, 0, (halfHeight*mod)+2, halfHeight, halfHeight);
-                        g.drawText(String.valueOf(manaShards), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight*mod)+2, textWidth, halfHeight, false, Align.left, false);
-                        mod+=1;
+                        g.fillRect(Color.DARK_GRAY, 0, (halfHeight * mod) + 2, INFO_FONT.getBounds(String.valueOf(manaShards)).width + halfHeight + 1, INFO_FONT.getBounds(String.valueOf(manaShards)).height + 1);
+                        g.drawImage(FSkinImage.AETHER_SHARD, 0, (halfHeight * mod) + 2, halfHeight, halfHeight);
+                        g.drawText(String.valueOf(manaShards), INFO_FONT, getInfoForeColor().getColor(), textStart, (halfHeight * mod) + 2, textWidth, halfHeight, false, Align.left, false);
+                        mod += 1;
                     }
-                    adjustHeight = (mod > 2) && (avatar.getHeight() < halfHeight*mod)? mod : 1;
+                    adjustHeight = (mod > 2) && (avatar.getHeight() < halfHeight * mod) ? mod : 1;
                 }
             } else {
                 if (poisonCounters == 0 && energyCounters == 0 && manaShards == 0) {
@@ -632,8 +684,7 @@ public class VPlayerPanel extends FContainer {
                     } else if (energyCounters > 0) { //prioritize showing energy counters over mana shards
                         g.drawImage(FSkinImage.ENERGY, 0, halfHeight, halfHeight, halfHeight);
                         g.drawText(String.valueOf(energyCounters), INFO_FONT, getInfoForeColor(), textStart, halfHeight, textWidth, halfHeight, false, Align.center, true);
-                    }
-                    else {
+                    } else {
                         g.drawImage(FSkinImage.MANASHARD, 0, halfHeight, halfHeight, halfHeight);
                         g.drawText(String.valueOf(manaShards), INFO_FONT, getInfoForeColor(), textStart, halfHeight, textWidth, halfHeight, false, Align.center, true);
                     }
@@ -658,18 +709,27 @@ public class VPlayerPanel extends FContainer {
         }
 
         public abstract VDisplayArea getDisplayArea();
+
         public abstract void setDisplayVisible(boolean visible);
+
         public abstract void setDisplayBounds(float x, float y, float width, float height);
+
         public abstract void setRotate180(boolean rotate180);
+
         public abstract void update();
+
         public abstract void reset();
 
+        public abstract float getIdealWidth(float pref);
+
         protected boolean isSelected() {
             return selectedTab == this;
         }
+
         protected FSkinColor getSelectedBackgroundColor() {
             return getDisplayAreaBackColor();
         }
+
         protected boolean isAlignedRightForAltDisplay() {
             return false;
         }
@@ -745,8 +805,8 @@ public class VPlayerPanel extends FContainer {
                 if (lblLife.getRotate180()) {
                     g.startRotateTransform(x + w / 2, y + h / 2, 180);
                 }
-                float mod = isHovered() ? w/8f:0;
-                g.drawImage(icon, x-mod/2, y-mod/2, w+mod, h+mod);
+                float mod = isHovered() ? w / 8f : 0;
+                g.drawImage(icon, x - mod / 2, y - mod / 2, w + mod, h + mod);
                 if (lblLife.getRotate180()) {
                     g.endTransform();
                 }
@@ -773,8 +833,8 @@ public class VPlayerPanel extends FContainer {
                 h = icon.getHeight() * w / icon.getWidth();
                 x = (getWidth() - w) / 2;
                 y = INFO_TAB_PADDING_Y;
-                float mod = isHovered() ? w/8f:0;
-                g.drawImage(icon, x-mod/2, y-mod/2, w+mod, h+mod);
+                float mod = isHovered() ? w / 8f : 0;
+                g.drawImage(icon, x - mod / 2, y - mod / 2, w + mod, h + mod);
 
                 y += h + INFO_TAB_PADDING_Y;
                 g.drawText(value, INFO_FONT, getInfoForeColor(), 0, y, getWidth(), getHeight() - y + 1, false, Align.center, false);
@@ -827,7 +887,13 @@ public class VPlayerPanel extends FContainer {
         }
 
         @Override
-        public void reset() {} //Mana Display does not get cleared.
+        public void reset() {
+        } //Mana Display does not get cleared.
+
+        @Override
+        public float getIdealWidth(float pref) {
+            return pref;
+        }
     }
 
     /**
@@ -842,6 +908,7 @@ public class VPlayerPanel extends FContainer {
         }
 
         private final EnumSet<ZoneType> altDisplayZones = EnumSet.of(ZoneType.Hand, ZoneType.Library, ZoneType.Graveyard, ZoneType.Exile);
+
         public boolean isAlignedRightForAltDisplay() {
             return altDisplayZones.contains(this.zoneType);
         }
@@ -857,6 +924,23 @@ public class VPlayerPanel extends FContainer {
         public void reset() {
             displayArea.clear();
         }
+
+        @Override
+        public float getIdealWidth(float pref) {
+            if (displayArea instanceof VCardDisplayArea vCardDisplayArea) {
+                float cardWidth = vCardDisplayArea.getCardWidth(vCardDisplayArea.getHeight());
+                float size = vCardDisplayArea.getCount();
+                return Math.min(cardWidth * size, pref);
+            }
+            return pref;
+        }
+
+        @Override
+        public void update() {
+            super.update();
+            if (selectedTab != null && Forge.isHorizontalTabLayout())
+                updateTabLayout(initW, initH);
+        }
     }
 
     /**
@@ -873,9 +957,9 @@ public class VPlayerPanel extends FContainer {
         private InfoTabExtra() {
             super(DEFAULT_ICON);
             this.displayAreas = new EnumMap<>(ZoneType.class);
-            for(ZoneType zoneType : EXTRA_ZONES) {
+            for (ZoneType zoneType : EXTRA_ZONES) {
                 FCollectionView<CardView> cards = player.getCards(zoneType);
-                if(cards == null || cards.isEmpty())
+                if (cards == null || cards.isEmpty())
                     continue;
                 createZoneIfMissing(zoneType);
                 hasCardsInExtraZone = true;
@@ -887,38 +971,39 @@ public class VPlayerPanel extends FContainer {
         }
 
         public void createZoneIfMissing(ZoneType zone) {
-            if(this.displayAreas.containsKey(zone))
+            if (this.displayAreas.containsKey(zone))
                 return;
             VZoneDisplay display = VPlayerPanel.this.add(new VZoneDisplay(player, zone));
             this.displayAreas.put(zone, display);
             this.hasCardsInExtraZone = true;
-            if(zone == ZoneType.AttractionDeck || zone == ZoneType.ContraptionDeck)
+            if (zone == ZoneType.AttractionDeck || zone == ZoneType.ContraptionDeck)
                 createZoneIfMissing(ZoneType.Junkyard); //If the game uses one, it uses both.
         }
 
         public void setActiveZone(ZoneType zone) {
-            if(this.activeZone == zone)
+            if (this.activeZone == zone)
                 return;
             createZoneIfMissing(zone);
             getDisplayArea().setVisible(false);
             this.activeZone = zone;
-            if(isSelected())
+            if (isSelected())
                 getDisplayArea().setVisible(true);
             updateTab();
         }
+
         public void setActiveZoneByIndex(int index) {
             List<ZoneType> keyList = List.copyOf(displayAreas.keySet());
             setActiveZone(keyList.get(index % keyList.size()));
         }
 
         private void updateTab() {
-            if(!hasCardsInExtraZone)
+            if (!hasCardsInExtraZone)
                 this.value = "";
-            else if(!getDisplayArea().isVisible())
+            else if (!getDisplayArea().isVisible())
                 this.value = "+";
             else
                 this.value = String.valueOf(displayAreas.get(this.activeZone).getCount());
-            if(getDisplayArea().isVisible())
+            if (getDisplayArea().isVisible())
                 this.icon = iconFromZone(this.activeZone);
             else
                 this.icon = DEFAULT_ICON;
@@ -932,7 +1017,7 @@ public class VPlayerPanel extends FContainer {
 
         @Override
         public void setDisplayVisible(boolean visible) {
-            if(!visible)
+            if (!visible)
                 displayAreas.values().forEach(d -> d.setVisible(false));
             else
                 getDisplayArea().setVisible(true);
@@ -954,12 +1039,13 @@ public class VPlayerPanel extends FContainer {
             displayAreas.values().forEach(VDisplayArea::update);
             updateTab();
         }
+
         public void update(ZoneType zoneType) {
-            if(!displayAreas.containsKey(zoneType)) {
-                if(!EXTRA_ZONES.contains(zoneType))
+            if (!displayAreas.containsKey(zoneType)) {
+                if (!EXTRA_ZONES.contains(zoneType))
                     return;
                 FCollectionView<CardView> cards = player.getCards(zoneType);
-                if(cards == null || cards.isEmpty())
+                if (cards == null || cards.isEmpty())
                     return;
                 createZoneIfMissing(zoneType);
             }
@@ -987,18 +1073,28 @@ public class VPlayerPanel extends FContainer {
             activeZone = ZoneType.Sideboard;
         }
 
+        @Override
+        public float getIdealWidth(float pref) {
+            if (getDisplayArea() instanceof VCardDisplayArea vCardDisplayArea) {
+                float cardWidth = vCardDisplayArea.getCardWidth(vCardDisplayArea.getHeight());
+                float size = vCardDisplayArea.getCount();
+                return Math.min(cardWidth * size, pref);
+            }
+            return pref;
+        }
+
         @Override
         public boolean tap(float x, float y, int count) {
-            if(this.displayAreas.isEmpty())
+            if (this.displayAreas.isEmpty())
                 return false;
-            if(count >= 2) {
+            if (count >= 2) {
                 onClickZone(this.activeZone);
                 return true;
             }
             FPopupMenu menu = new FPopupMenu() {
                 @Override
                 protected void buildMenu() {
-                    for(ZoneType zone : displayAreas.keySet()) {
+                    for (ZoneType zone : displayAreas.keySet()) {
                         String label = WordUtils.capitalize(zone.getTranslatedName());
                         addItem(new FMenuItem(label, iconFromZone(zone), (e) -> onClickZone(zone)));
                     }
@@ -1009,7 +1105,7 @@ public class VPlayerPanel extends FContainer {
         }
 
         public void onClickZone(ZoneType zone) {
-            if(activeZone == zone && this.isSelected()) {
+            if (activeZone == zone && this.isSelected()) {
                 setSelectedTab(null);
                 return;
             }
@@ -1042,7 +1138,7 @@ public class VPlayerPanel extends FContainer {
 
     @Override
     public boolean keyDown(int keyCode) {
-        if (MatchController.getView().selectedPlayerPanel() == this && !((FMenuBar)MatchController.getView().getHeader()).isShowingMenu(true)) {
+        if (MatchController.getView().selectedPlayerPanel() == this && !((FMenuBar) MatchController.getView().getHeader()).isShowingMenu(true)) {
             if (keyCode == Input.Keys.BUTTON_B) {
                 MatchScreen.nullPotentialListener();
                 closeSelectedTab();
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VStack.java b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
index 6a88375b573..22fa22d1771 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VStack.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VStack.java
@@ -224,17 +224,17 @@ public class VStack extends FDropDown {
                     activeItem.getLeft() + VStack.CARD_WIDTH * FCardPanel.TARGET_ORIGIN_FACTOR_X + VStack.PADDING + VStack.BORDER_THICKNESS,
                     activeItem.getTop() + VStack.CARD_HEIGHT * FCardPanel.TARGET_ORIGIN_FACTOR_Y + VStack.PADDING + VStack.BORDER_THICKNESS);
 
-            PlayerView activator = activeStackInstance.getActivatingPlayer();
+            PlayerView activator = activeStackInstance == null ? null : activeStackInstance.getActivatingPlayer();
             arrowOrigin = arrowOrigin.add(screenPos.x, screenPos.y);
 
             StackItemView instance = activeStackInstance;
             while (instance != null) {
                 for (CardView c : instance.getTargetCards()) {
-                    TargetingOverlay.ArcConnection conn = activator.isOpponentOf(c.getController()) ? TargetingOverlay.ArcConnection.FoesStackTargeting : TargetingOverlay.ArcConnection.FriendsStackTargeting;
+                    TargetingOverlay.ArcConnection conn = activator != null && activator.isOpponentOf(c.getController()) ? TargetingOverlay.ArcConnection.FoesStackTargeting : TargetingOverlay.ArcConnection.FriendsStackTargeting;
                     TargetingOverlay.drawArrow(g, arrowOrigin, VCardDisplayArea.CardAreaPanel.get(c).getTargetingArrowOrigin(), conn);
                 }
                 for (PlayerView p : instance.getTargetPlayers()) {
-                    TargetingOverlay.ArcConnection conn = activator.isOpponentOf(p) ? TargetingOverlay.ArcConnection.FoesStackTargeting : TargetingOverlay.ArcConnection.FriendsStackTargeting;
+                    TargetingOverlay.ArcConnection conn = activator != null && activator.isOpponentOf(p) ? TargetingOverlay.ArcConnection.FoesStackTargeting : TargetingOverlay.ArcConnection.FriendsStackTargeting;
                     TargetingOverlay.drawArrow(g, arrowOrigin, MatchScreen.getPlayerPanel(p).getAvatar().getTargetingArrowOrigin(), conn);
                 }
                 instance = instance.getSubInstance();
diff --git a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
index 02f5dde97c3..f919270df28 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
@@ -113,7 +113,7 @@ public class VZoneDisplay extends VCardDisplayArea {
     }
 
     protected boolean layoutVerticallyForLandscapeMode() {
-        return true;
+        return !Forge.altZoneTabs || !"Horizontal".equalsIgnoreCase(Forge.altZoneTabMode);
     }
 
     @Override
diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
index bcd8ea48ef6..ca767d2b423 100644
--- a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
+++ b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
@@ -13,7 +13,6 @@ import forge.menu.FPopupMenu;
 import forge.model.FModel;
 import forge.screens.FScreen;
 import forge.toolbox.FOptionPane;
-import forge.util.Callback;
 
 public class OnlineMenu extends FPopupMenu {
     public enum OnlineScreen {
@@ -31,23 +30,20 @@ public class OnlineMenu extends FPopupMenu {
                 if(screenClass == null) {
                     FOptionPane.showConfirmDialog(
                             Forge.getLocalizer().getMessage("lblLeaveLobbyDescription"),
-                            Forge.getLocalizer().getMessage("lblDisconnect"), new Callback<Boolean>() {
-                                @Override
-                                public void run(Boolean result) {
-                                    if (result) {
-                                        if (FServerManager.getInstance() != null)
-                                            if(FServerManager.getInstance().isHosting()) {
-                                                FServerManager.getInstance().unsetReady();
-                                                FServerManager.getInstance().stopServer();
-                                            }
+                            Forge.getLocalizer().getMessage("lblDisconnect"), result -> {
+                                if (result) {
+                                    if (FServerManager.getInstance() != null)
+                                        if(FServerManager.getInstance().isHosting()) {
+                                            FServerManager.getInstance().unsetReady();
+                                            FServerManager.getInstance().stopServer();
+                                        }
 
-                                        if (OnlineLobbyScreen.getfGameClient() != null)
-                                            OnlineLobbyScreen.closeClient();
+                                    if (OnlineLobbyScreen.getfGameClient() != null)
+                                        OnlineLobbyScreen.closeClient();
 
-                                        Forge.back();
-                                        screen = null;
-                                        OnlineLobbyScreen.clearGameLobby();
-                                    }
+                                    Forge.back();
+                                    screen = null;
+                                    OnlineLobbyScreen.clearGameLobby();
                                 }
                             });
                     return;
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
index a8adcd9ad24..797dc82bd62 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
@@ -1,9 +1,13 @@
 package forge.screens.planarconquest;
 
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Rectangle;
@@ -14,25 +18,27 @@ import com.google.common.collect.Iterables;
 import forge.Forge;
 import forge.Graphics;
 import forge.animation.ForgeAnimation;
+import forge.assets.FImage;
 import forge.assets.FSkin;
 import forge.assets.FSkinColor;
 import forge.assets.FSkinFont;
 import forge.assets.FSkinTexture;
 import forge.assets.TextRenderer;
+import forge.card.CardFaceSymbols;
 import forge.card.CardRarity;
 import forge.card.CardRenderer;
 import forge.card.CardRenderer.CardStackPosition;
 import forge.card.CardZoom;
 import forge.card.ColorSet;
-import forge.card.ColorSetImage;
+import forge.card.MagicColor;
 import forge.gamemodes.planarconquest.ConquestCommander;
 import forge.gamemodes.planarconquest.ConquestData;
 import forge.gamemodes.planarconquest.ConquestPlane;
 import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
 import forge.gamemodes.planarconquest.ConquestUtil;
-import forge.gamemodes.planarconquest.ConquestUtil.AEtherFilter;
 import forge.item.PaperCard;
 import forge.localinstance.skin.FSkinProp;
+import forge.localinstance.skin.IHasSkinProp;
 import forge.model.FModel;
 import forge.screens.FScreen;
 import forge.toolbox.FCardPanel;
@@ -54,10 +60,10 @@ public class ConquestAEtherScreen extends FScreen {
     private final Set<PaperCard> filteredPool = new HashSet<>();
     private final Set<PaperCard> strictPool = new HashSet<>();
 
-    private final FilterButton btnColorFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblColor"), ConquestUtil.COLOR_FILTERS));
-    private final FilterButton btnTypeFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblType"), ConquestUtil.TYPE_FILTERS));
-    private final FilterButton btnRarityFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblRarity"), ConquestUtil.RARITY_FILTERS));
-    private final FilterButton btnCMCFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblCMC"), ConquestUtil.CMC_FILTERS));
+    private final ColorButton btnColorFilter = add(new ColorButton(Forge.getLocalizer().getMessage("lblColor")));
+    private final FilterButton<ConquestUtil.TypeFilter> btnTypeFilter = add(new FilterButton<ConquestUtil.TypeFilter>(Forge.getLocalizer().getMessage("lblType"), ConquestUtil.TypeFilter.values()));
+    private final FilterButton<ConquestUtil.RarityFilter> btnRarityFilter = add(new FilterButton<ConquestUtil.RarityFilter>(Forge.getLocalizer().getMessage("lblRarity"), ConquestUtil.RarityFilter.values()));
+    private final FilterButton<ConquestUtil.CMCFilter> btnCMCFilter = add(new FilterButton<ConquestUtil.CMCFilter>(Forge.getLocalizer().getMessage("lblCMC"), ConquestUtil.CMCFilter.values()));
 
     private final FLabel lblShards = add(new FLabel.Builder().font(LABEL_FONT).align(Align.center).parseSymbols().build());
 
@@ -93,24 +99,24 @@ public class ConquestAEtherScreen extends FScreen {
     }
 
     private void resetFilters() {
-        btnColorFilter.setSelectedOption(ConquestUtil.getColorFilter(commander.getCard().getRules().getColorIdentity()));
-        btnTypeFilter.setSelectedOption(AEtherFilter.CREATURE);
-        btnRarityFilter.setSelectedOption(AEtherFilter.COMMON);
-        btnCMCFilter.setSelectedOption(AEtherFilter.CMC_LOW_MID);
+        btnColorFilter.setSelectedOption(commander.getCard().getRules().getColorIdentity());
+        btnTypeFilter.setSelectedOption(ConquestUtil.TypeFilter.CREATURE);
+        btnRarityFilter.setSelectedOption(ConquestUtil.RarityFilter.COMMON);
+        btnCMCFilter.setSelectedOption(ConquestUtil.CMCFilter.CMC_LOW_MID);
     }
 
     private void updateFilteredPool() {
-        Predicate<PaperCard> predicate = btnColorFilter.buildFilterPredicate(null);
-        predicate = btnTypeFilter.buildFilterPredicate(predicate);
-        predicate = btnRarityFilter.buildFilterPredicate(predicate);
-        predicate = btnCMCFilter.buildFilterPredicate(predicate);
+        Predicate<PaperCard> predicate = btnColorFilter
+                .and(btnTypeFilter)
+                .and(btnRarityFilter)
+                .and(btnCMCFilter);
 
         final CardRarity selectedRarity = btnRarityFilter.selectedOption.getRarity();
 
         filteredPool.clear();
         strictPool.clear();
         for (PaperCard card : pool) {
-            if (predicate == null || predicate.test(card)) {
+            if (predicate.test(card)) {
                 filteredPool.add(card);
                 if (selectedRarity == card.getRarity()) {
                     strictPool.add(card);
@@ -344,54 +350,32 @@ public class ConquestAEtherScreen extends FScreen {
         }
     }
 
-    private class FilterButton extends FLabel {
+    private abstract class AbstractFilterButton<T> extends FLabel implements Predicate<PaperCard> {
         private final String caption;
-        private final List<AEtherFilter> options;
-        private AEtherFilter selectedOption;
+        private final List<T> options;
+        protected T selectedOption;
 
-        private FilterButton(String caption0, AEtherFilter[] options0) {
+        private AbstractFilterButton(String caption0, T[] options0, final Function<T, String> display) {
             super(new FLabel.Builder().iconInBackground().pressedColor(FILTER_BUTTON_PRESSED_COLOR)
                     .textColor(FILTER_BUTTON_TEXT_COLOR).alphaComposite(1f).align(Align.center));
             caption = caption0;
             options = ImmutableList.copyOf(options0);
             setSelectedOption(options.get(0));
-            setCommand(e -> GuiChoose.getChoices(Forge.getLocalizer().getMessage("lblSelectCaptionFilter", caption), 0, 1, options, Set.of(selectedOption), null, new Callback<>() {
-                @Override
-                public void run(List<AEtherFilter> result) {
-                    if (!result.isEmpty()) {
-                        setSelectedOption(result.get(0));
-                        updateFilteredPool();
-                    }
+            setCommand(e -> GuiChoose.getChoices(Forge.getLocalizer().getMessage("lblSelectCaptionFilter", caption), 0, 1, options, Set.of(selectedOption), display, result -> {
+                if (!result.isEmpty()) {
+                    setSelectedOption(result.get(0));
+                    updateFilteredPool();
                 }
             }));
         }
 
-        private void setSelectedOption(AEtherFilter selectedOption0) {
-            if (selectedOption == selectedOption0) { return; }
+        public void setSelectedOption(T selectedOption0) {
+            if (selectedOption == selectedOption0) {
+                return;
+            }
             selectedOption = selectedOption0;
-
-            FSkinProp skinProp = selectedOption.getSkinProp();
-            if (skinProp != null) {
-                setIcon(FSkin.getImages().get(skinProp));
-            }
-            else {
-                ColorSet color = selectedOption.getColor();
-                if (color != null) {
-                    setIcon(new ColorSetImage(color));
-                }
-                else {
-                    System.out.println("No icon for filter " + selectedOption.name());
-                    setIcon(null);
-                }
-            }
         }
 
-        private Predicate<PaperCard> buildFilterPredicate(Predicate<PaperCard> predicate) {
-            if (predicate == null) {
-                return selectedOption.getPredicate();
-            }
-            return predicate.and(selectedOption.getPredicate());
-        }
 
         @Override
         protected void drawContent(Graphics g, float w, float h, final boolean pressed) {
@@ -401,4 +385,69 @@ public class ConquestAEtherScreen extends FScreen {
             super.drawContent(g, w, h, pressed);
         }
     }
+
+    private class ColorButton extends AbstractFilterButton<ColorSet> {
+        private ColorButton(String caption0) {
+            super(caption0, Arrays.stream(ColorSet.values()).sorted(Comparator.comparing(ColorSet::getOrderWeight)).toArray(ColorSet[]::new),
+                    c -> "Playable in " + c.stream().map(MagicColor.Color::getSymbol).collect(Collectors.joining()));
+        }
+
+        @Override
+        public void setSelectedOption(ColorSet selectedOption0) {
+            super.setSelectedOption(selectedOption0);
+
+            setIcon(new ColorSetImage(selectedOption));
+        }
+
+        @Override
+        public boolean test(PaperCard card) {
+            return card.getRules().getColorIdentity().hasNoColorsExcept(selectedOption);
+        }
+
+        private record ColorSetImage(ColorSet colorSet, int shardCount) implements FImage {
+            public ColorSetImage(ColorSet colorSet0) {
+                this(colorSet0, colorSet0.getOrderedColors().size());
+            }
+
+            @Override
+            public float getWidth() {
+                return Forge.getAssets().images().get(FSkinProp.IMG_MANA_W).getWidth() * shardCount;
+            }
+
+            @Override
+            public float getHeight() {
+                return Forge.getAssets().images().get(FSkinProp.IMG_MANA_W).getHeight();
+            }
+
+            @Override
+            public void draw(Graphics g, float x, float y, float w, float h) {
+                float imageSize = w / shardCount;
+                if (imageSize > h) {
+                    imageSize = h;
+                    float w0 = imageSize * shardCount;
+                    x += (w - w0) / 2;
+                    w = w0;
+                }
+                CardFaceSymbols.drawColorSet(g, colorSet, x, y, imageSize);
+            }
+        }
+    }
+
+    private class FilterButton<T extends Enum<T> & IHasSkinProp & Predicate<PaperCard>> extends AbstractFilterButton<T> {
+        private FilterButton(String caption0, T[] options0) {
+            super(caption0, options0, null);
+        }
+
+        @Override
+        public void setSelectedOption(T selectedOption0) {
+            super.setSelectedOption(selectedOption0);
+
+            setIcon(FSkin.getImages().get(selectedOption.getSkinProp()));
+        }
+
+        @Override
+        public boolean test(PaperCard card) {
+            return selectedOption.test(card);
+        }
+    }
 }
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java
index c24ac7370d4..cbe80952a7b 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestChaosWheel.java
@@ -11,19 +11,20 @@ import forge.gamemodes.planarconquest.ConquestEvent.ChaosWheelOutcome;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FOverlay;
 import forge.util.Aggregates;
-import forge.util.Callback;
 import forge.util.PhysicsObject;
 
+import java.util.function.Consumer;
+
 public class ConquestChaosWheel extends FOverlay {
-    public static void spin(Callback<ChaosWheelOutcome> callback0) {
+    public static void spin(Consumer<ChaosWheelOutcome> callback0) {
         ConquestChaosWheel wheel = new ConquestChaosWheel(callback0);
         wheel.show();
     }
 
     private final WheelSpinAnimation animation = new WheelSpinAnimation();
-    private final Callback<ChaosWheelOutcome> callback;
+    private final Consumer<ChaosWheelOutcome> callback;
 
-    private ConquestChaosWheel(Callback<ChaosWheelOutcome> callback0) {
+    private ConquestChaosWheel(Consumer<ChaosWheelOutcome> callback0) {
         callback = callback0;
     }
 
@@ -97,7 +98,7 @@ public class ConquestChaosWheel extends FOverlay {
         @Override
         protected void onEnd(boolean endingAll) {
             hide();
-            callback.run(ChaosWheelOutcome.getWheelOutcome(getWheelRotation()));
+            callback.accept(ChaosWheelOutcome.getWheelOutcome(getWheelRotation()));
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
index 429f9c56ca9..3578dd88cd2 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
@@ -1,6 +1,7 @@
 package forge.screens.planarconquest;
 
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import com.badlogic.gdx.utils.Align;
@@ -38,7 +39,6 @@ import forge.toolbox.FList;
 import forge.toolbox.FList.CompactModeHandler;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FTextField;
-import forge.util.Callback;
 
 public class ConquestCommandersScreen extends FScreen {
     private static final float PADDING = FDeckChooser.PADDING;
@@ -83,24 +83,19 @@ public class ConquestCommandersScreen extends FScreen {
     }
 
     @Override
-    public void onClose(final Callback<Boolean> canCloseCallback) {
+    public void onClose(final Consumer<Boolean> canCloseCallback) {
         if (canCloseCallback == null) { return; }
 
         final ConquestCommander commander = lstCommanders.getSelectedItem();
         if (commander == null) {
-            canCloseCallback.run(true); //shouldn't happen, but don't block closing screen if no commanders
+            canCloseCallback.accept(true); //shouldn't happen, but don't block closing screen if no commanders
             return;
         }
 
         String problem = DeckFormat.PlanarConquest.getDeckConformanceProblem(commander.getDeck());
         if (problem != null) {
             //prevent selecting a commander with an invalid deck
-            FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblCantSelectDeckBecause", commander.getName(), problem), Forge.getLocalizer().getMessage("lblInvalidDeck"), FOptionPane.INFORMATION_ICON, new Callback<Integer>() {
-                @Override
-                public void run(Integer result) {
-                    canCloseCallback.run(false);
-                }
-            });
+            FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblCantSelectDeckBecause", commander.getName(), problem), Forge.getLocalizer().getMessage("lblInvalidDeck"), FOptionPane.INFORMATION_ICON, result -> canCloseCallback.accept(false));
             return;
         }
 
@@ -109,7 +104,7 @@ public class ConquestCommandersScreen extends FScreen {
             model.setSelectedCommander(commander);
             model.saveData();
         }
-        canCloseCallback.run(true);
+        canCloseCallback.accept(true);
     }
 
     private void refreshCommanders() {
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
index fbe7327925c..55de463ad31 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
@@ -28,7 +28,6 @@ import forge.gamemodes.planarconquest.ConquestBattle;
 import forge.gamemodes.planarconquest.ConquestChaosBattle;
 import forge.gamemodes.planarconquest.ConquestData;
 import forge.gamemodes.planarconquest.ConquestEvent;
-import forge.gamemodes.planarconquest.ConquestEvent.ChaosWheelOutcome;
 import forge.gamemodes.planarconquest.ConquestEvent.ConquestEventRecord;
 import forge.gamemodes.planarconquest.ConquestLocation;
 import forge.gamemodes.planarconquest.ConquestPlane;
@@ -50,7 +49,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
-import forge.util.Callback;
 import forge.util.Utils;
 import forge.util.collect.FCollectionView;
 
@@ -130,38 +128,30 @@ public class ConquestMultiverseScreen extends FScreen {
     }
 
     private void spinChaosWheel() {
-        ConquestChaosWheel.spin(new Callback<ChaosWheelOutcome>() {
-            @Override
-            public void run(ChaosWheelOutcome outcome) {
-                switch (outcome) {
-                case BOOSTER:
-                    awardBoosters(model.getCurrentPlane().getAwardPool(), 1);
-                    break;
-                case DOUBLE_BOOSTER:
-                    awardBoosters(model.getCurrentPlane().getAwardPool(), 2);
-                    break;
-                case SHARDS:
-                    awardShards(FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_WHEEL_SHARDS), false);
-                    break;
-                case DOUBLE_SHARDS:
-                    awardShards(2 * FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_WHEEL_SHARDS), false);
-                    break;
-                case PLANESWALK:
-                    if (model.getUnlockedPlaneCount() == model.getAccessiblePlaneCount()) {
-                        FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblAllPlanesUnlockedNotify"), Forge.getLocalizer().getMessage("lblAllPlanesUnlocked"), EMBLEM_IMAGE, new Callback<Integer>() {
-                            @Override
-                            public void run(Integer result) {
-                                launchChaosBattle();
-                            }
-                        });
-                    } else {
-                        awardBonusPlaneswalkEmblems(FModel.getConquestPreferences().getPrefInt(CQPref.PLANESWALK_WHEEL_EMBLEMS));
-                    }
-                    break;
-                case CHAOS:
-                    launchChaosBattle();
-                    break;
+        ConquestChaosWheel.spin(outcome -> {
+            switch (outcome) {
+            case BOOSTER:
+                awardBoosters(model.getCurrentPlane().getAwardPool(), 1);
+                break;
+            case DOUBLE_BOOSTER:
+                awardBoosters(model.getCurrentPlane().getAwardPool(), 2);
+                break;
+            case SHARDS:
+                awardShards(FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_WHEEL_SHARDS), false);
+                break;
+            case DOUBLE_SHARDS:
+                awardShards(2 * FModel.getConquestPreferences().getPrefInt(CQPref.AETHER_WHEEL_SHARDS), false);
+                break;
+            case PLANESWALK:
+                if (model.getUnlockedPlaneCount() == model.getAccessiblePlaneCount()) {
+                    FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblAllPlanesUnlockedNotify"), Forge.getLocalizer().getMessage("lblAllPlanesUnlocked"), EMBLEM_IMAGE, result -> launchChaosBattle());
+                } else {
+                    awardBonusPlaneswalkEmblems(FModel.getConquestPreferences().getPrefInt(CQPref.PLANESWALK_WHEEL_EMBLEMS));
                 }
+                break;
+            case CHAOS:
+                launchChaosBattle();
+                break;
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java
index 5ce19d9cc88..49b77076c3a 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkersScreen.java
@@ -10,7 +10,8 @@ import forge.localinstance.achievements.PlaneswalkerAchievements;
 import forge.model.FModel;
 import forge.screens.FScreen;
 import forge.toolbox.FChoiceList;
-import forge.util.Callback;
+
+import java.util.function.Consumer;
 
 public class ConquestPlaneswalkersScreen extends FScreen {
     private static final float PADDING = FDeckChooser.PADDING;
@@ -39,12 +40,12 @@ public class ConquestPlaneswalkersScreen extends FScreen {
     }
 
     @Override
-    public void onClose(final Callback<Boolean> canCloseCallback) {
+    public void onClose(final Consumer<Boolean> canCloseCallback) {
         if (canCloseCallback == null) { return; }
 
         final PaperCard planeswalker = lstPlaneswalkers.getSelectedItem();
         if (planeswalker == null) {
-            canCloseCallback.run(true); // Shouldn't happen, but don't block closing screen if no commanders
+            canCloseCallback.accept(true); // Shouldn't happen, but don't block closing screen if no commanders
             return;
         }
 
@@ -53,7 +54,7 @@ public class ConquestPlaneswalkersScreen extends FScreen {
             model.setPlaneswalker(planeswalker);
             model.saveData();
         }
-        canCloseCallback.run(true);
+        canCloseCallback.accept(true);
     }
 
     private void refreshPlaneswalkers() {
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
index 5ba210eef8d..0a0bb5f2284 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
@@ -5,6 +5,7 @@ import java.text.NumberFormat;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.utils.Align;
 
@@ -32,7 +33,6 @@ import forge.toolbox.FDisplayObject;
 import forge.toolbox.FLabel;
 import forge.toolbox.FTextArea;
 import forge.toolbox.GuiChoose;
-import forge.util.Callback;
 import forge.util.ItemPool;
 import forge.util.Utils;
 
@@ -80,7 +80,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
         return true;
     }
 
-    public void onClose(Callback<Boolean> canCloseCallback) {
+    public void onClose(Consumer<Boolean> canCloseCallback) {
         FModel.getQuest().save();
         super.onClose(canCloseCallback);
     }
@@ -205,22 +205,19 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
             final int max = itemManager.getItemCount(item);
             if (max == 0) { return; }
 
-            final Callback<Integer> callback = new Callback<Integer>() {
-                @Override
-                public void run(final Integer result) {
-                    if (result == null || result <= 0) { return; }
+            final Consumer<Integer> callback = result -> {
+                if (result == null || result <= 0) { return; }
 
-                    //invoke in background thread so other dialogs can be shown properly
-                    FThreads.invokeInBackgroundThread(() -> {
-                        ItemPool<InventoryItem> items = new ItemPool<>(InventoryItem.class);
-                        items.add(item, result);
-                        activateItems(items);
-                        FThreads.invokeInEdtLater(() -> parentScreen.updateCreditsLabel());
-                    });
-                }
+                //invoke in background thread so other dialogs can be shown properly
+                FThreads.invokeInBackgroundThread(() -> {
+                    ItemPool<InventoryItem> items = new ItemPool<>(InventoryItem.class);
+                    items.add(item, result);
+                    activateItems(items);
+                    FThreads.invokeInEdtLater(() -> parentScreen.updateCreditsLabel());
+                });
             };
             if (max == 1) {
-                callback.run(max);
+                callback.accept(max);
             }
             else {
                 GuiChoose.getInteger(item + " - " + getVerb() + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
index bce5a794ba4..a2fcfe4fe40 100644
--- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
@@ -36,7 +36,6 @@ import forge.toolbox.FGroupList;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.GuiChoose;
-import forge.util.Callback;
 import forge.util.FileUtil;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -61,38 +60,35 @@ public class FilesPage extends TabPage<SettingsScreen> {
                     Forge.getDeviceAdapter().requestFileAcces();
                     return;
                 }
-                FOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblPlsSelectActions"), "", FOptionPane.QUESTION_ICON, ImmutableList.of(Forge.getLocalizer().getMessage("lblBackup"), Forge.getLocalizer().getMessage("lblRestore"), Forge.getLocalizer().getMessage("lblCancel")), 2, new Callback<Integer>() {
-                    @Override
-                    public void run(Integer result) {
-                    switch (result) {
-                        case 0:
-                            FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblBackupMsg"), true, () -> {
-                                File source = new FileHandle(ForgeProfileProperties.getUserDir()).file();
-                                File target = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir()).file();
-                                try {
-                                    ZipUtil.zip(source, target, ZipUtil.backupClsFile);
-                                    FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblSuccess") + "\n" + target.getAbsolutePath() + File.separator + ZipUtil.backupClsFile, Forge.getLocalizer().getMessage("lblBackup"), FOptionPane.INFORMATION_ICON);
-                                } catch (IOException e) {
-                                    FOptionPane.showMessageDialog(e.toString(), Forge.getLocalizer().getMessage("lblError"), FOptionPane.ERROR_ICON);
-                                 }
-                            }));
-                            break;
-                        case 1:
-                            FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblRestoreMsg"), true, () -> {
-                                File source = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir() + ZipUtil.backupClsFile).file();
-                                File target = new FileHandle(ForgeProfileProperties.getUserDir()).file().getParentFile();
-                                try {
-                                    String msg = ZipUtil.unzip(source, target);
-                                    FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblSuccess") + "\n" + msg, Forge.getLocalizer().getMessage("lblRestore"), FOptionPane.INFORMATION_ICON);
-                                } catch (IOException e) {
-                                    FOptionPane.showMessageDialog(e.toString(), Forge.getLocalizer().getMessage("lblError"), FOptionPane.ERROR_ICON);
-                                }
-                            }));
-                            break;
-                        default:
-                            break;
-                    }
-                    }
+                FOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblPlsSelectActions"), "", FOptionPane.QUESTION_ICON, ImmutableList.of(Forge.getLocalizer().getMessage("lblBackup"), Forge.getLocalizer().getMessage("lblRestore"), Forge.getLocalizer().getMessage("lblCancel")), 2, result -> {
+                switch (result) {
+                    case 0:
+                        FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblBackupMsg"), true, () -> {
+                            File source = new FileHandle(ForgeProfileProperties.getUserDir()).file();
+                            File target = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir()).file();
+                            try {
+                                ZipUtil.zip(source, target, ZipUtil.backupClsFile);
+                                FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblSuccess") + "\n" + target.getAbsolutePath() + File.separator + ZipUtil.backupClsFile, Forge.getLocalizer().getMessage("lblBackup"), FOptionPane.INFORMATION_ICON);
+                            } catch (IOException e) {
+                                FOptionPane.showMessageDialog(e.toString(), Forge.getLocalizer().getMessage("lblError"), FOptionPane.ERROR_ICON);
+                             }
+                        }));
+                        break;
+                    case 1:
+                        FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblRestoreMsg"), true, () -> {
+                            File source = new FileHandle(Forge.getDeviceAdapter().getDownloadsDir() + ZipUtil.backupClsFile).file();
+                            File target = new FileHandle(ForgeProfileProperties.getUserDir()).file().getParentFile();
+                            try {
+                                String msg = ZipUtil.unzip(source, target);
+                                FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblSuccess") + "\n" + msg, Forge.getLocalizer().getMessage("lblRestore"), FOptionPane.INFORMATION_ICON);
+                            } catch (IOException e) {
+                                FOptionPane.showMessageDialog(e.toString(), Forge.getLocalizer().getMessage("lblError"), FOptionPane.ERROR_ICON);
+                            }
+                        }));
+                        break;
+                    default:
+                        break;
+                }
                 });
             }
         }, 0);
@@ -107,16 +103,13 @@ public class FilesPage extends TabPage<SettingsScreen> {
                     Pair<Integer, Integer> totalAudit = StaticData.instance().audit(nifSB, cniSB);
                     String msg = nifSB.toString();
                     String title = "Missing images: " + totalAudit.getLeft() + "\nUnimplemented cards: " + totalAudit.getRight();
-                    FOptionPane.showOptionDialog(msg, title, FOptionPane.INFORMATION_ICON, ImmutableList.of(Forge.getLocalizer().getMessage("lblCopy"), Forge.getLocalizer().getMessage("lblClose")), -1, new Callback<Integer>() {
-                        @Override
-                        public void run(Integer result) {
-                            switch (result) {
-                                case 0:
-                                    Forge.getClipboard().setContents(msg);
-                                    break;
-                                default:
-                                    break;
-                            }
+                    FOptionPane.showOptionDialog(msg, title, FOptionPane.INFORMATION_ICON, ImmutableList.of(Forge.getLocalizer().getMessage("lblCopy"), Forge.getLocalizer().getMessage("lblClose")), -1, result -> {
+                        switch (result) {
+                            case 0:
+                                Forge.getClipboard().setContents(msg);
+                                break;
+                            default:
+                                break;
                         }
                     });
                 }));
@@ -296,12 +289,9 @@ public class FilesPage extends TabPage<SettingsScreen> {
 
         @Override
         public void select() {
-            new GuiDownloader(createService(), new Callback<Boolean>() {
-                @Override
-                public void run(Boolean finished) {
-                    if (finished) {
-                        finishCallback();
-                    }
+            new GuiDownloader(createService(), finished -> {
+                if (finished) {
+                    finishCallback();
                 }
             }).show();
         }
@@ -322,20 +312,14 @@ public class FilesPage extends TabPage<SettingsScreen> {
         @Override
         public void select() {
             final Map<String, String> categories = getCategories();
-            GuiChoose.one(prompt, categories.keySet(), new Callback<String>() {
-                @Override
-                public void run(String result) {
-                    final String url = categories.get(result);
-                    final String name = url.substring(url.lastIndexOf("/") + 2);
-                    new GuiDownloader(new GuiDownloadZipService(name, name, url, ForgeConstants.FONTS_DIR, null, null), new Callback<Boolean>() {
-                        @Override
-                        public void run(Boolean finished) {
-                            if (finished) {
-                                finishCallback();
-                            }
-                        }
-                    }).show();
-                }
+            GuiChoose.one(prompt, categories.keySet(), result -> {
+                final String url = categories.get(result);
+                final String name = url.substring(url.lastIndexOf("/") + 2);
+                new GuiDownloader(new GuiDownloadZipService(name, name, url, ForgeConstants.FONTS_DIR, null, null), finished -> {
+                    if (finished) {
+                        finishCallback();
+                    }
+                }).show();
             });
         }
         protected abstract Map<String, String> getCategories();
@@ -355,14 +339,11 @@ public class FilesPage extends TabPage<SettingsScreen> {
 
         @Override
         public void select() {
-            FFileChooser.show(Forge.getLocalizer().getMessage("lblSelect").replace("%s", label), ChoiceType.GetDirectory, description, new Callback<String>() {
-                @Override
-                public void run(String result) {
-                    if (StringUtils.isEmpty(result) || description.equals(result)) { return; }
-                    updateDir(result);
-                    onDirectoryChanged(result);
-                    FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblRestartForgeMoveFilesNewLocation"), Forge.getLocalizer().getMessage("lblRestartRequired"), FOptionPane.INFORMATION_ICON);
-                }
+            FFileChooser.show(Forge.getLocalizer().getMessage("lblSelect").replace("%s", label), ChoiceType.GetDirectory, description, result -> {
+                if (StringUtils.isEmpty(result) || description.equals(result)) { return; }
+                updateDir(result);
+                onDirectoryChanged(result);
+                FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblRestartForgeMoveFilesNewLocation"), Forge.getLocalizer().getMessage("lblRestartRequired"), FOptionPane.INFORMATION_ICON);
             });
         }
         protected abstract void onDirectoryChanged(String newDir);
diff --git a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java
index af33caf3763..ea92bd04841 100644
--- a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java
+++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java
@@ -18,6 +18,7 @@
 package forge.screens.settings;
 
 import java.net.Proxy;
+import java.util.function.Consumer;
 
 import forge.Forge;
 import forge.gui.UiCommand;
@@ -30,7 +31,6 @@ import forge.toolbox.FProgressBar;
 import forge.toolbox.FRadioButton;
 import forge.toolbox.FRadioButton.RadioButtonGroup;
 import forge.toolbox.FTextField;
-import forge.util.Callback;
 import forge.util.Utils;
 
 public class GuiDownloader extends FDialog {
@@ -52,18 +52,18 @@ public class GuiDownloader extends FDialog {
             service.setCancel(true);
             hide();
             if (callback != null) {
-                callback.run(getButton(0).getText() == "OK"); //determine result based on whether download finished
+                callback.accept(getButton(0).getText() == "OK"); //determine result based on whether download finished
             }
         }
     };
 
     private final GuiDownloadService service;
-    private final Callback<Boolean> callback;
+    private final Consumer<Boolean> callback;
 
     public GuiDownloader(final GuiDownloadService service0) {
         this(service0, null);
     }
-    public GuiDownloader(final GuiDownloadService service0, final Callback<Boolean> callback0) {
+    public GuiDownloader(final GuiDownloadService service0, final Consumer<Boolean> callback0) {
         super(service0.getTitle(), 2);
         service = service0;
         callback = callback0;
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index 202b1e8c135..defc485631f 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -28,7 +28,6 @@ import forge.toolbox.FCheckBox;
 import forge.toolbox.FGroupList;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
-import forge.util.Callback;
 import forge.util.Utils;
 
 import java.util.*;
@@ -75,12 +74,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
 
                 FLanguage.changeLanguage(newValue);
 
-                FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                    @Override
-                    public void run(Boolean result) {
-                        if (result) {
-                            Forge.restart(true);
-                        }
+                FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), result -> {
+                    if (result) {
+                        Forge.restart(true);
                     }
                 });
             }
@@ -125,12 +121,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         boolean landscapeMode = FModel.getPreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE);
                         Forge.getDeviceAdapter().setLandscapeMode(landscapeMode); //ensure device able to save off ini file so landscape change takes effect
                         if (Forge.isLandscapeMode() != landscapeMode) {
-                            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                                @Override
-                                public void run(Boolean result) {
-                                    if (result) {
-                                        Forge.restart(true);
-                                    }
+                            FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), result -> {
+                                if (result) {
+                                    Forge.restart(true);
                                 }
                             });
                         }
@@ -281,14 +274,15 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         MatchController.instance.resetPlayerPanels();
                 }
             }, 1);
-        lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_PLAYERZONETABS,
+        lstSettings.addItem(new CustomSelectSetting(FPref.UI_ALT_PLAYERZONETABS,
             Forge.getLocalizer().getMessage("lblAltZoneTabs"),
-            Forge.getLocalizer().getMessage("nlAltZoneTabs")) {
+            Forge.getLocalizer().getMessage("nlAltZoneTabs"),
+            Lists.newArrayList("Off", "Vertical", "Horizontal")) {
                 @Override
-                public void select() {
-                    super.select();
+                public void valueChanged(String newValue) {
+                    super.valueChanged(newValue);
                     //update
-                    Forge.altZoneTabs = FModel.getPreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS);
+                    Forge.setAltZoneTabMode(FModel.getPreferences().getPref(FPref.UI_ALT_PLAYERZONETABS));
                     if (MatchController.instance != null)
                         MatchController.instance.resetPlayerPanels();
                 }
@@ -376,12 +370,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                             Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
                             Forge.getLocalizer().getMessage("lblRestartForge"),
                             Forge.getLocalizer().getMessage("lblRestart"),
-                            Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                                @Override
-                                public void run(Boolean result) {
-                                    if (result) {
-                                        Forge.restart(true);
-                                    }
+                            Forge.getLocalizer().getMessage("lblLater"), result -> {
+                                if (result) {
+                                    Forge.restart(true);
                                 }
                             }
                         );
@@ -397,12 +388,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
                         Forge.getLocalizer().getMessage("lblRestartForge"),
                         Forge.getLocalizer().getMessage("lblRestart"),
-                        Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                            @Override
-                            public void run(Boolean result) {
-                                if (result) {
-                                    Forge.restart(true);
-                                }
+                        Forge.getLocalizer().getMessage("lblLater"), result -> {
+                            if (result) {
+                                Forge.restart(true);
                             }
                         }
                     );
@@ -418,12 +406,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
                         Forge.getLocalizer().getMessage("lblRestartForge"),
                         Forge.getLocalizer().getMessage("lblRestart"),
-                        Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                            @Override
-                            public void run(Boolean result) {
-                                if (result) {
-                                    Forge.restart(true);
-                                }
+                        Forge.getLocalizer().getMessage("lblLater"), result -> {
+                            if (result) {
+                                Forge.restart(true);
                             }
                         }
                     );
@@ -458,12 +443,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                             Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
                             Forge.getLocalizer().getMessage("lblRestartForge"),
                             Forge.getLocalizer().getMessage("lblRestart"),
-                            Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                                @Override
-                                public void run(Boolean result) {
-                                    if (result) {
-                                        Forge.restart(true);
-                                    }
+                            Forge.getLocalizer().getMessage("lblLater"), result -> {
+                                if (result) {
+                                    Forge.restart(true);
                                 }
                             }
                         );
@@ -495,12 +477,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                         Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
                         Forge.getLocalizer().getMessage("lblRestartForge"),
                         Forge.getLocalizer().getMessage("lblRestart"),
-                        Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
-                            @Override
-                            public void run(Boolean result) {
-                                if (result) {
-                                    Forge.restart(true);
-                                }
+                        Forge.getLocalizer().getMessage("lblLater"), result -> {
+                            if (result) {
+                                Forge.restart(true);
                             }
                         }
                     );
@@ -958,21 +937,18 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     description,
                     currentValue,
                     null,
-                    new Callback<String>() {
-                        @Override
-                        public void run(String input) {
-                            if (input == null) return; // cancelled
-                            if (!input.matches("\\d+")) {
-                                FOptionPane.showMessageDialog("Please enter a valid number.", "Invalid Input");
-                                return;
-                            }
-                            int value = Integer.parseInt(input);
-                            if (value < minValue || value > maxValue) {
-                                FOptionPane.showMessageDialog("Value must be between " + minValue + " and " + maxValue + ".", "Invalid Input");
-                                return;
-                            }
-                            valueChanged(input);
+                    input -> {
+                        if (input == null) return; // cancelled
+                        if (!input.matches("\\d+")) {
+                            FOptionPane.showMessageDialog("Please enter a valid number.", "Invalid Input");
+                            return;
                         }
+                        int value = Integer.parseInt(input);
+                        if (value < minValue || value > maxValue) {
+                            FOptionPane.showMessageDialog("Value must be between " + minValue + " and " + maxValue + ".", "Invalid Input");
+                            return;
+                        }
+                        valueChanged(input);
                     },
                     true // isNumeric
             );
diff --git a/forge-gui-mobile/src/forge/toolbox/DualListBox.java b/forge-gui-mobile/src/forge/toolbox/DualListBox.java
index efa699d9de3..0128f439769 100644
--- a/forge-gui-mobile/src/forge/toolbox/DualListBox.java
+++ b/forge-gui-mobile/src/forge/toolbox/DualListBox.java
@@ -3,6 +3,7 @@ package forge.toolbox;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.utils.Align;
@@ -10,7 +11,6 @@ import com.badlogic.gdx.utils.Align;
 import forge.Forge;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FEvent.FEventType;
-import forge.util.Callback;
 
 // An input box for handling the order of choices.
 // Left box has the original choices
@@ -36,11 +36,11 @@ public class DualListBox<T> extends FDialog {
     private final int targetRemainingSourcesMin;
     private final int targetRemainingSourcesMax;
 
-    public DualListBox(String title, int remainingSources, List<T> sourceElements, List<T> destElements, final Callback<List<T>> callback) {
+    public DualListBox(String title, int remainingSources, List<T> sourceElements, List<T> destElements, final Consumer<List<T>> callback) {
         this(title, remainingSources, remainingSources, sourceElements, destElements, callback);
     }
     
-    public DualListBox(String title, int remainingSourcesMin, int remainingSourcesMax, List<T> sourceElements, List<T> destElements, final Callback<List<T>> callback) {
+    public DualListBox(String title, int remainingSourcesMin, int remainingSourcesMax, List<T> sourceElements, List<T> destElements, final Consumer<List<T>> callback) {
         super(title, 2);
         targetRemainingSourcesMin = remainingSourcesMin;
         targetRemainingSourcesMax = remainingSourcesMax;
@@ -101,7 +101,7 @@ public class DualListBox<T> extends FDialog {
         
         final FEventHandler onAccept = e -> {
             hide();
-            callback.run(destList.extractListData());
+            callback.accept(destList.extractListData());
         };
 
         // Dual List Complete Buttons
diff --git a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java
index 0c4521706c5..b8e0c2405fb 100644
--- a/forge-gui-mobile/src/forge/toolbox/FFileChooser.java
+++ b/forge-gui-mobile/src/forge/toolbox/FFileChooser.java
@@ -2,6 +2,7 @@ package forge.toolbox;
 
 import java.io.File;
 import java.io.FilenameFilter;
+import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -15,7 +16,6 @@ import forge.assets.FSkinFont;
 import forge.assets.FSkinImage;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
-import forge.util.Callback;
 import forge.util.FileUtil;
 import forge.util.Utils;
 
@@ -28,25 +28,25 @@ public class FFileChooser extends FDialog {
         GetDirectory
     }
 
-    public static void show(String title0, ChoiceType choiceType0, Callback<String> callback0) {
+    public static void show(String title0, ChoiceType choiceType0, Consumer<String> callback0) {
         show(title0, choiceType0, "", "", callback0);
     }
-    public static void show(String title0, ChoiceType choiceType0, String defaultFilename0, Callback<String> callback0) {
+    public static void show(String title0, ChoiceType choiceType0, String defaultFilename0, Consumer<String> callback0) {
         show(title0, choiceType0, defaultFilename0, "", callback0);
     }
-    public static void show(String title0, ChoiceType choiceType0, String defaultFilename0, String baseDir0, Callback<String> callback0) {
+    public static void show(String title0, ChoiceType choiceType0, String defaultFilename0, String baseDir0, Consumer<String> callback0) {
         FFileChooser dialog = new FFileChooser(title0, choiceType0, defaultFilename0, baseDir0, callback0);
         dialog.show();
     }
 
     private final ChoiceType choiceType;
     private final String baseDir;
-    private final Callback<String> callback;
+    private final Consumer<String> callback;
 
     private final FList<File> lstFiles   = add(new FileList());
     private final FTextField txtFilename = add(new FilenameField());
 
-    private FFileChooser(String title0, ChoiceType choiceType0, String defaultFilename0, String baseDir0, Callback<String> callback0) {
+    private FFileChooser(String title0, ChoiceType choiceType0, String defaultFilename0, String baseDir0, Consumer<String> callback0) {
         super(title0, 3);
         choiceType = choiceType0;
         if (choiceType == ChoiceType.GetDirectory) {
@@ -66,24 +66,21 @@ public class FFileChooser extends FDialog {
                 return;
             }
 
-            FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewFolderName"), new Callback<String>() {
-                @Override
-                public void run(String result) {
-                    if (StringUtils.isEmpty(result)) { return; }
-
-                    try {
-                        File newDir = new File(dir, result);
-                        if (newDir.mkdirs()) {
-                            txtFilename.setText(newDir.getAbsolutePath());
-                            refreshFileList();
-                            return;
-                        }
-                    }
-                    catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterFolderNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
+            FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewFolderName"), result -> {
+                if (StringUtils.isEmpty(result)) { 
+                    return;
                 }
+                try {
+                    File newDir = new File(dir, result);
+                    if (newDir.mkdirs()) {
+                        txtFilename.setText(newDir.getAbsolutePath());
+                        refreshFileList();
+                        return;
+                    }
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
+                FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterFolderNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
             });
         });
         initButton(2, Forge.getLocalizer().getMessage("lblCancel"), e -> hide());
@@ -195,7 +192,7 @@ public class FFileChooser extends FDialog {
         if (returnDirectory) {
             filename += File.separator; //re-append separator if returning directory
         }
-        callback.run(filename);
+        callback.accept(filename);
     }
 
     private void back() {
@@ -220,33 +217,29 @@ public class FFileChooser extends FDialog {
         else {
             title = Forge.getLocalizer().getMessage("lblEnterNewNameForFile");
         }
-        FOptionPane.showInputDialog(title, file.getName(), new Callback<String>() {
-            @Override
-            public void run(String result) {
-                if (StringUtils.isEmpty(result)) { return; }
-
-                try {
-                    File newFile = new File(dir, result);
-                    if (file.renameTo(newFile)) {
-                        txtFilename.setText(newFile.getAbsolutePath());
-                        refreshFileList();
-                        return;
-                    }
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-                FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
+        FOptionPane.showInputDialog(title, file.getName(), result -> {
+            if (StringUtils.isEmpty(result)) {
+                return;
             }
+            try {
+                File newFile = new File(dir, result);
+                if (file.renameTo(newFile)) {
+                    txtFilename.setText(newFile.getAbsolutePath());
+                    refreshFileList();
+                    return;
+                }
+            }
+            catch (Exception e2) {
+                e2.printStackTrace();
+            }
+            FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
         });
     }
 
     private void deleteFile(final Integer index, final File file) {
         final String deleteBehavior = file.isDirectory() ? Forge.getLocalizer().getMessage("lblDeleteFolder") : Forge.getLocalizer().getMessage("lblDeleteFile");
         FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblAreYouSureProceedDelete"), deleteBehavior,
-                Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"), new Callback<Boolean>() {
-            @Override
-            public void run(Boolean result) {
+            Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"), result -> {
                 if (result) {
                     try {
                         if (FileUtil.deleteDirectory(file)) { //this will ensure directory or file deleted
@@ -266,12 +259,11 @@ public class FFileChooser extends FDialog {
                             return;
                         }
                     }
-                    catch (Exception ex) {
-                        ex.printStackTrace();
+                    catch (Exception e3) {
+                        e3.printStackTrace();
                     }
                     FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblCouldBotDeleteFile"));
                 }
-            }
         });
     }
 
diff --git a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
index fd3cf7262bc..433e5f931ff 100644
--- a/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
+++ b/forge-gui-mobile/src/forge/toolbox/FOptionPane.java
@@ -1,6 +1,7 @@
 package forge.toolbox;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -21,7 +22,6 @@ import forge.card.CardZoom;
 import forge.game.card.CardView;
 import forge.localinstance.skin.FSkinProp;
 import forge.screens.match.views.VPrompt;
-import forge.util.Callback;
 import forge.util.Utils;
 import forge.util.WaitCallback;
 
@@ -61,45 +61,40 @@ public class FOptionPane extends FDialog {
         showOptionDialog(message, messageFont, title, icon, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, null);
     }
 
-    public static void showMessageDialog(final String message, final String title, final FImage icon, final Callback<Integer> callback) {
+    public static void showMessageDialog(final String message, final String title, final FImage icon, final Consumer<Integer> callback) {
         showOptionDialog(message, title, icon, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, callback);
     }
 
-    public static void showConfirmDialog(final String message, final Callback<Boolean> callback) {
+    public static void showConfirmDialog(final String message, final Consumer<Boolean> callback) {
         showConfirmDialog(message, "", callback);
     }
 
-    public static void showConfirmDialog(final String message, final String title, final Callback<Boolean> callback) {
+    public static void showConfirmDialog(final String message, final String title, final Consumer<Boolean> callback) {
         showConfirmDialog(message, title, Forge.getLocalizer().getMessage("lblYes"), Forge.getLocalizer().getMessage("lblNo"), true, callback);
     }
 
-    public static void showConfirmDialog(final String message, final String title, final boolean defaultYes, final Callback<Boolean> callback) {
+    public static void showConfirmDialog(final String message, final String title, final boolean defaultYes, final Consumer<Boolean> callback) {
         showConfirmDialog(message, title, Forge.getLocalizer().getMessage("lblYes"), Forge.getLocalizer().getMessage("lblNo"), defaultYes, callback);
     }
 
-    public static void showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText, final Callback<Boolean> callback) {
+    public static void showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText, final Consumer<Boolean> callback) {
         showConfirmDialog(message, title, yesButtonText, noButtonText, true, callback);
     }
 
-    public static void showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText, final boolean defaultYes, final Callback<Boolean> callback) {
+    public static void showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText, final boolean defaultYes, final Consumer<Boolean> callback) {
         final List<String> options = ImmutableList.of(yesButtonText, noButtonText);
-        showOptionDialog(message, title, QUESTION_ICON, options, defaultYes ? 0 : 1, new Callback<Integer>() {
-            @Override
-            public void run(final Integer result) {
-                callback.run(result == 0);
-            }
-        });
+        showOptionDialog(message, title, QUESTION_ICON, options, defaultYes ? 0 : 1, result -> callback.accept(result == 0));
     }
 
-    public static void showOptionDialog(final String message, final String title, final FImage icon, final List<String> options, final Callback<Integer> callback) {
+    public static void showOptionDialog(final String message, final String title, final FImage icon, final List<String> options, final Consumer<Integer> callback) {
         showOptionDialog(message, title, icon, options, 0, callback);
     }
     
-    public static void showOptionDialog(final String message, final String title, final FImage icon, final List<String> options, final int defaultOption, final Callback<Integer> callback) {
+    public static void showOptionDialog(final String message, final String title, final FImage icon, final List<String> options, final int defaultOption, final Consumer<Integer> callback) {
         showOptionDialog(message, null, title, icon, options, defaultOption, callback);
     }
 
-    public static void showOptionDialog(final String message, final FSkinFont messageFont, final String title, final FImage icon, final List<String> options, final int defaultOption, final Callback<Integer> callback) {
+    public static void showOptionDialog(final String message, final FSkinFont messageFont, final String title, final FImage icon, final List<String> options, final int defaultOption, final Consumer<Integer> callback) {
         final FOptionPane optionPane = new FOptionPane(message, messageFont, title, icon, null, options, defaultOption, callback);
         optionPane.show();
     }
@@ -113,7 +108,7 @@ public class FOptionPane extends FDialog {
         }.invokeAndWait();
     }
 
-    public static void showCardOptionDialog(final CardView card, String message, String title, FImage icon, final List<String> options, final int defaultOption, final Callback<Integer> callback) {
+    public static void showCardOptionDialog(final CardView card, String message, String title, FImage icon, final List<String> options, final int defaultOption, final Consumer<Integer> callback) {
         final FDisplayObject cardDisplay;
         if (card != null) {
             cardDisplay = new FDisplayObject() {
@@ -154,13 +149,13 @@ public class FOptionPane extends FDialog {
         optionPane.show();
     }
 
-    public static void showInputDialog(final String title, final Callback<String> callback) {
+    public static void showInputDialog(final String title, final Consumer<String> callback) {
         showInputDialog(null, title, "", null, callback, false);
     }
-    public static <T> void showInputDialog(final String title, final T initialInput, final Callback<T> callback) {
+    public static <T> void showInputDialog(final String title, final T initialInput, final Consumer<T> callback) {
         showInputDialog(null, title, initialInput, null, callback, false);
     }
-    public static <T> void showInputDialog(final String message, final String title, final T initialInput, final List<T> inputOptions, final Callback<T> callback, final boolean isNumeric) {
+    public static <T> void showInputDialog(final String message, final String title, final T initialInput, final List<T> inputOptions, final Consumer<T> callback, final boolean isNumeric) {
         final FDisplayObject inputField;
         final FTextField txtInput;
         final FComboBox<T> cbInput;
@@ -189,19 +184,15 @@ public class FOptionPane extends FDialog {
         container.add(inputField);
         container.setHeight(inputField.getHeight() + padTop + PADDING);
 
-        final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")), 0, new Callback<Integer>() {
-            @SuppressWarnings("unchecked")
-            @Override
-            public void run(final Integer result) {
-                if (result == 0) {
-                    if (txtInput != null) {
-                        callback.run((T)txtInput.getText());
-                    } else {
-                        callback.run(cbInput.getSelectedItem());
-                    }
+        final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")), 0, result -> {
+            if (result == 0) {
+                if (txtInput != null) {
+                    callback.accept((T)txtInput.getText());
                 } else {
-                    callback.run(null);
+                    callback.accept(cbInput.getSelectedItem());
                 }
+            } else {
+                callback.accept(null);
             }
         }) {
             @Override
@@ -228,11 +219,11 @@ public class FOptionPane extends FDialog {
     private final FLabel lblIcon;
     private final FTextArea prompt;
     protected final FDisplayObject displayObj;
-    private final Callback<Integer> callback;
+    private final Consumer<Integer> callback;
     private final int defaultOption;
     private final boolean centerIcon;
 
-    public FOptionPane(final String message, final FSkinFont messageFont, final String title, final FImage icon, final FDisplayObject displayObj0, final List<String> options, final int defaultOption0, final Callback<Integer> callback0) {
+    public FOptionPane(final String message, final FSkinFont messageFont, final String title, final FImage icon, final FDisplayObject displayObj0, final List<String> options, final int defaultOption0, final Consumer<Integer> callback0) {
         super(title, options.size());
 
         if (icon != null) {
@@ -276,7 +267,7 @@ public class FOptionPane extends FDialog {
     public void setResult(final int option) {
         hide();
         if (callback != null) {
-            callback.run(option);
+            callback.accept(option);
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/toolbox/FSpinner.java b/forge-gui-mobile/src/forge/toolbox/FSpinner.java
index 694408b87b6..efe671380bb 100644
--- a/forge-gui-mobile/src/forge/toolbox/FSpinner.java
+++ b/forge-gui-mobile/src/forge/toolbox/FSpinner.java
@@ -2,7 +2,6 @@ package forge.toolbox;
 
 import forge.Forge;
 import forge.toolbox.FEvent.FEventType;
-import forge.util.Callback;
 
 
 public class FSpinner extends FTextField {
@@ -36,16 +35,13 @@ public class FSpinner extends FTextField {
 
     @Override
     public boolean tap(float x, float y, int count) {
-        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblSelectANumber"), minValue, maxValue, new Callback<Integer>() {
-            @Override
-            public void run(Integer result) {
-                if (result != null && result != value) {
-                    int oldValue = value;
-                    setValue(result);
-                    if (getChangedHandler() != null) {
-                        //handle change event if value changed from input
-                        getChangedHandler().handleEvent(new FEvent(FSpinner.this, FEventType.CHANGE, oldValue));
-                    }
+        GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblSelectANumber"), minValue, maxValue, result -> {
+            if (result != null && result != value) {
+                int oldValue = value;
+                setValue(result);
+                if (getChangedHandler() != null) {
+                    //handle change event if value changed from input
+                    getChangedHandler().handleEvent(new FEvent(FSpinner.this, FEventType.CHANGE, oldValue));
                 }
             }
         });
diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
index ab5f95b4f71..12c7b2346f3 100644
--- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
+++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import com.google.common.collect.Iterables;
@@ -12,7 +13,6 @@ import forge.Forge;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.game.card.CardView;
-import forge.util.Callback;
 
 public class GuiChoose {
 
@@ -30,30 +30,20 @@ public class GuiChoose {
      *         getChoices.
      * @see #getChoices(String, int, int, Object...)
      */
-    public static <T> void oneOrNone(final String message, final T[] choices, final Callback<T> callback) {
+    public static <T> void oneOrNone(final String message, final T[] choices, final Consumer<T> callback) {
         if ((choices == null) || (choices.length == 0)) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        getChoices(message, 0, 1, choices, new Callback<List<T>>() {
-            @Override
-            public void run(final List<T> result) {
-                callback.run(result.isEmpty() ? null : result.get(0));
-            }
-        });
+        getChoices(message, 0, 1, choices, result -> callback.accept(result.isEmpty() ? null : result.get(0)));
     }
 
-    public static <T> void oneOrNone(final String message, final Collection<T> choices, final Callback<T> callback) {
+    public static <T> void oneOrNone(final String message, final Collection<T> choices, final Consumer<T> callback) {
         if ((choices == null) || choices.isEmpty()) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        getChoices(message, 0, 1, choices, new Callback<List<T>>() {
-            @Override
-            public void run(final List<T> result) {
-                callback.run(result.isEmpty() ? null : result.get(0));
-            }
-        });
+        getChoices(message, 0, 1, choices, result -> callback.accept(result.isEmpty() ? null : result.get(0)));
     } // getChoiceOptional(String,T...)
 
     // returned Object will never be null
@@ -70,45 +60,39 @@ public class GuiChoose {
      *            a T object.
      * @return a T object.
      */
-    public static <T> void one(final String message, final T[] choices, final Callback<T> callback) {
+    public static <T> void one(final String message, final T[] choices, final Consumer<T> callback) {
         if (choices == null || choices.length == 0) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
         if (choices.length == 1) {
-            callback.run(choices[0]);
+            callback.accept(choices[0]);
             return;
         }
 
-        getChoices(message, 1, 1, choices, new Callback<List<T>>() {
-            @Override
-            public void run(final List<T> result) {
-                assert result.size() == 1;
-                callback.run(result.get(0));
-            }
+        getChoices(message, 1, 1, choices, result -> {
+            assert result.size() == 1;
+            callback.accept(result.get(0));
         });
     }
 
-    public static <T> void one(final String message, final Collection<T> choices, final Callback<T> callback) {
+    public static <T> void one(final String message, final Collection<T> choices, final Consumer<T> callback) {
         if (choices == null || choices.isEmpty()) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
         if (choices.size() == 1) {
-            callback.run(Iterables.getFirst(choices, null));
+            callback.accept(Iterables.getFirst(choices, null));
             return;
         }
 
-        getChoices(message, 1, 1, choices, new Callback<List<T>>() {
-            @Override
-            public void run(final List<T> result) {
-                assert result.size() == 1;
-                callback.run(result.get(0));
-            }
+        getChoices(message, 1, 1, choices, result -> {
+            assert result.size() == 1;
+            callback.accept(result.get(0));
         });
     }
 
-    public static <T> void noneOrMany(final String message, final Collection<T> choices, final Callback<List<T>> callback) {
+    public static <T> void noneOrMany(final String message, final Collection<T> choices, final Consumer<List<T>> callback) {
         getChoices(message, 0, choices.size(), choices, null, null, callback);
     }
 
@@ -126,15 +110,15 @@ public class GuiChoose {
     }
 
     // Get Integer in range
-    public static void getInteger(final String message, final Callback<Integer> callback) {
+    public static void getInteger(final String message, final Consumer<Integer> callback) {
         getInteger(message, 0, Integer.MAX_VALUE, callback);
     }
-    public static void getInteger(final String message, int min, final Callback<Integer> callback) {
+    public static void getInteger(final String message, int min, final Consumer<Integer> callback) {
         getInteger(message, min, Integer.MAX_VALUE, callback);
     }
-    public static void getInteger(final String message, int min, int max, final Callback<Integer> callback) {
+    public static void getInteger(final String message, int min, int max, final Consumer<Integer> callback) {
         if (max <= min) { //just return min if max <= min
-            callback.run(min);
+            callback.accept(min);
             return;
         }
 
@@ -155,9 +139,9 @@ public class GuiChoose {
         }
         oneOrNone(message, choices, callback);
     }
-    public static void getInteger(final String message, final int min, final int max, final int cutoff, final Callback<Integer> callback) {
+    public static void getInteger(final String message, final int min, final int max, final int cutoff, final Consumer<Integer> callback) {
         if (max <= min || cutoff < min) { //just return min if max <= min or cutoff < min
-            callback.run(min);
+            callback.accept(min);
             return;
         }
 
@@ -172,68 +156,62 @@ public class GuiChoose {
         }
         choices.add(Forge.getLocalizer().getMessage("lblOther") + "...");
 
-        oneOrNone(message, choices, new Callback<Object>() {
-            @Override
-            public void run(Object choice) {
-                if (choice instanceof Integer || choice == null) {
-                    callback.run((Integer)choice);
-                    return;
-                }
-
-                //if Other option picked, prompt for number input
-                String prompt = "Enter a number";
-                if (min != Integer.MIN_VALUE) {
-                    if (max != Integer.MAX_VALUE) {
-                        prompt += " between " + min + " and " + max;
-                    }
-                    else {
-                        prompt += " greater than or equal to " + min;
-                    }
-                }
-                else if (max != Integer.MAX_VALUE) {
-                    prompt += " less than or equal to " + max;
-                }
-                prompt += ":";
-                getNumberInput(prompt, message, min, max, callback);
+        oneOrNone(message, choices, choice -> {
+            if (choice instanceof Integer || choice == null) {
+                callback.accept((Integer)choice);
+                return;
             }
+
+            //if Other option picked, prompt for number input
+            String prompt = "Enter a number";
+            if (min != Integer.MIN_VALUE) {
+                if (max != Integer.MAX_VALUE) {
+                    prompt += " between " + min + " and " + max;
+                }
+                else {
+                    prompt += " greater than or equal to " + min;
+                }
+            }
+            else if (max != Integer.MAX_VALUE) {
+                prompt += " less than or equal to " + max;
+            }
+            prompt += ":";
+            getNumberInput(prompt, message, min, max, callback);
         });
     }
     
-    private static void getNumberInput(final String prompt, final String message, final int min, final int max, final Callback<Integer> callback) {
-        FOptionPane.showInputDialog(prompt, message, new Callback<String>() {
-            @Override
-            public void run(String result) {
-                if (result == null) { //that is 'cancel'
-                    callback.run(null);
+    private static void getNumberInput(final String prompt, final String message, final int min, final int max, final Consumer<Integer> callback) {
+        FOptionPane.showInputDialog(prompt, message, result -> {
+            if (result == null) { //that is 'cancel'
+                callback.accept(null);
+                return;
+            }
+            if (StringUtils.isNumeric(result)) {
+                int val = Integer.parseInt(result);
+                if (val >= min && val <= max) {
+                    callback.accept(val);
                     return;
                 }
-                if (StringUtils.isNumeric(result)) {
-                    int val = Integer.parseInt(result);
-                    if (val >= min && val <= max) {
-                        callback.run(val);
-                        return;
-                    }
-                }
-
-                //re-prompt if invalid input
-                getNumberInput(prompt, message, min, max, callback);
             }
+
+            //re-prompt if invalid input
+            getNumberInput(prompt, message, min, max, callback);
         });
     }
 
     // returned Object will never be null
-    public static <T> void getChoices(final String message, final int min, final int max, final T[] choices, final Callback<List<T>> callback) {
+    public static <T> void getChoices(final String message, final int min, final int max, final T[] choices, final Consumer<List<T>> callback) {
         getChoices(message, min, max, Arrays.asList(choices), null, null, callback);
     }
 
-    public static <T> void getChoices(final String message, final int min, final int max, final Collection<T> choices, final Callback<List<T>> callback) {
+    public static <T> void getChoices(final String message, final int min, final int max, final Collection<T> choices, final Consumer<List<T>> callback) {
         getChoices(message, min, max, choices, null, null, callback);
     }
 
-    public static <T> void getChoices(final String message, final int min, final int max, final Collection<T> choices, final Collection<T> selected, final Function<T, String> display, final Callback<List<T>> callback) {
+    public static <T> void getChoices(final String message, final int min, final int max, final Collection<T> choices, final Collection<T> selected, final Function<T, String> display, final Consumer<List<T>> callback) {
         if (choices == null || choices.isEmpty()) {
             if (min == 0) {
-                callback.run(new ArrayList<>());
+                callback.accept(new ArrayList<>());
                 return;
             }
             throw new RuntimeException("choice required from empty list");
@@ -243,22 +221,22 @@ public class GuiChoose {
         c.show(selected, false);
     }
 
-    public static <T> void many(final String title, final String topCaption, int cnt, final List<T> sourceChoices, CardView referenceCard, final Callback<List<T>> callback) {
+    public static <T> void many(final String title, final String topCaption, int cnt, final List<T> sourceChoices, CardView referenceCard, final Consumer<List<T>> callback) {
         order(title, topCaption, cnt, cnt, sourceChoices, null, referenceCard, callback);
     }
 
-    public static <T> void many(final String title, final String topCaption, int min, int max, final List<T> sourceChoices, CardView referenceCard, final Callback<List<T>> callback) {
+    public static <T> void many(final String title, final String topCaption, int min, int max, final List<T> sourceChoices, CardView referenceCard, final Consumer<List<T>> callback) {
         int m1 = max >= 0 ? sourceChoices.size() - max : -1;
         int m2 = min >= 0 ? sourceChoices.size() - min : -1;
         order(title, topCaption, m1, m2, sourceChoices, null, referenceCard, callback);
     }
 
-    public static <T> void order(final String title, final String top, final List<T> sourceChoices, CardView referenceCard, final Callback<List<T>> callback) {
+    public static <T> void order(final String title, final String top, final List<T> sourceChoices, CardView referenceCard, final Consumer<List<T>> callback) {
         order(title, top, 0, 0, sourceChoices, null, referenceCard, callback);
     }
 
     public static <T> void order(final String title, final String top, final int remainingObjectsMin, final int remainingObjectsMax,
-            final List<T> sourceChoices, final List<T> destChoices, final CardView referenceCard, final Callback<List<T>> callback) {
+            final List<T> sourceChoices, final List<T> destChoices, final CardView referenceCard, final Consumer<List<T>> callback) {
         // An input box for handling the order of choices.
         DualListBox<T> dual = new DualListBox<>(title, remainingObjectsMin, remainingObjectsMax, sourceChoices, destChoices, callback);
         dual.setSecondColumnLabelText(top);
@@ -266,77 +244,61 @@ public class GuiChoose {
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedOneOrNone(final String message, final T[] choices, Comparator<T> comparer, final Callback<T> callback) {
+    public static <T> void sortedOneOrNone(final String message, final T[] choices, Comparator<T> comparer, final Consumer<T> callback) {
         if ((choices == null) || (choices.length == 0)) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        sortedGetChoices(message, 0, 1, choices, comparer, new Callback<List<T>>() {
-            @Override
-            public void run(List<T> result) {
-                callback.run(result.isEmpty() ? null : result.get(0));
-            }
-        });
+        sortedGetChoices(message, 0, 1, choices, comparer, result -> callback.accept(result.isEmpty() ? null : result.get(0)));
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedOneOrNone(final String message, final List<T> choices, Comparator<T> comparer, final Callback<T> callback) {
+    public static <T> void sortedOneOrNone(final String message, final List<T> choices, Comparator<T> comparer, final Consumer<T> callback) {
         if ((choices == null) || choices.isEmpty()) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        sortedGetChoices(message, 0, 1, choices, comparer, new Callback<List<T>>() {
-            @Override
-            public void run(List<T> result) {
-                callback.run(result.isEmpty() ? null : result.get(0));
-            }
-        });
+        sortedGetChoices(message, 0, 1, choices, comparer, result -> callback.accept(result.isEmpty() ? null : result.get(0)));
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedOne(final String message, final T[] choices, Comparator<T> comparer, final Callback<T> callback) {
+    public static <T> void sortedOne(final String message, final T[] choices, Comparator<T> comparer, final Consumer<T> callback) {
         if ((choices == null) || (choices.length == 0)) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        sortedGetChoices(message, 1, 1, choices, comparer, new Callback<List<T>>() {
-            @Override
-            public void run(List<T> result) {
-                assert result.size() == 1;
-                callback.run(result.get(0));
-            }
+        sortedGetChoices(message, 1, 1, choices, comparer, result -> {
+            assert result.size() == 1;
+            callback.accept(result.get(0));
         });
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedOne(final String message, final List<T> choices, Comparator<T> comparer, final Callback<T> callback) {
+    public static <T> void sortedOne(final String message, final List<T> choices, Comparator<T> comparer, final Consumer<T> callback) {
         if ((choices == null) || (choices.size() == 0)) {
-            callback.run(null);
+            callback.accept(null);
             return;
         }
-        sortedGetChoices(message, 1, 1, choices, comparer, new Callback<List<T>>() {
-            @Override
-            public void run(List<T> result) {
-                assert result.size() == 1;
-                callback.run(result.get(0));
-            }
+        sortedGetChoices(message, 1, 1, choices, comparer, result -> {
+            assert result.size() == 1;
+            callback.accept(result.get(0));
         });
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedNoneOrMany(final String message, final List<T> choices, Comparator<T> comparer, final Callback<List<T>> callback) {
+    public static <T> void sortedNoneOrMany(final String message, final List<T> choices, Comparator<T> comparer, final Consumer<List<T>> callback) {
         sortedGetChoices(message, 0, choices.size(), choices, comparer, callback);
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedGetChoices(final String message, final int min, final int max, final T[] choices, Comparator<T> comparer, final Callback<List<T>> callback) {
+    public static <T> void sortedGetChoices(final String message, final int min, final int max, final T[] choices, Comparator<T> comparer, final Consumer<List<T>> callback) {
         // You may create a copy of source array if callers expect the collection to be unchanged
         Arrays.sort(choices, comparer);
         getChoices(message, min, max, choices, callback);
     }
 
     // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine
-    public static <T> void sortedGetChoices(final String message, final int min, final int max, final List<T> choices, Comparator<T> comparer, final Callback<List<T>> callback) {
+    public static <T> void sortedGetChoices(final String message, final int min, final int max, final List<T> choices, Comparator<T> comparer, final Consumer<List<T>> callback) {
         // You may create a copy of source list if callers expect the collection to be unchanged
         choices.sort(comparer);
         getChoices(message, min, max, choices, callback);
diff --git a/forge-gui-mobile/src/forge/toolbox/GuiDialog.java b/forge-gui-mobile/src/forge/toolbox/GuiDialog.java
index 1a454e73d20..1fe5d810933 100644
--- a/forge-gui-mobile/src/forge/toolbox/GuiDialog.java
+++ b/forge-gui-mobile/src/forge/toolbox/GuiDialog.java
@@ -1,13 +1,13 @@
 package forge.toolbox;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.ImmutableList;
 
 import forge.game.card.CardView;
-import forge.util.Callback;
 
 /** 
  * Holds player interactions using standard windows 
@@ -15,25 +15,21 @@ import forge.util.Callback;
 public class GuiDialog {
     private static final ImmutableList<String> defaultConfirmOptions = ImmutableList.of("Yes", "No");
 
-    public static void confirm(final CardView c, final String question, final Callback<Boolean> callback) {
+    public static void confirm(final CardView c, final String question, final Consumer<Boolean> callback) {
         GuiDialog.confirm(c, question, true, null, callback);
     }
-    public static void confirm(final CardView c, final String question, final boolean defaultChoice, final Callback<Boolean> callback) {
+    public static void confirm(final CardView c, final String question, final boolean defaultChoice, final Consumer<Boolean> callback) {
         GuiDialog.confirm(c, question, defaultChoice, null, callback);
     }
-    public static void confirm(final CardView c, final String question, final List<String> options, final Callback<Boolean> callback) {
+    public static void confirm(final CardView c, final String question, final List<String> options, final Consumer<Boolean> callback) {
         GuiDialog.confirm(c, question, true, options, callback);
     }
 
-    public static void confirm(final CardView c, final String question, final boolean defaultIsYes, final List<String> options, final Callback<Boolean> callback) {
+    public static void confirm(final CardView c, final String question, final boolean defaultIsYes, final List<String> options, final Consumer<Boolean> callback) {
         final String title = c == null ? "Question" : c + " - Ability";
         String questionToUse = StringUtils.isBlank(question) ? "Activate card's ability?" : question;
         final List<String> opts = options == null ? defaultConfirmOptions : options;
-        FOptionPane.showCardOptionDialog(c, questionToUse, title, FOptionPane.QUESTION_ICON, opts, defaultIsYes ? 0 : 1, new Callback<Integer>() {
-            @Override public void run(final Integer result) {
-                callback.run(result == 0);
-            }
-        });
+        FOptionPane.showCardOptionDialog(c, questionToUse, title, FOptionPane.QUESTION_ICON, opts, defaultIsYes ? 0 : 1, result -> callback.accept(result == 0));
     }
 
     /**
diff --git a/forge-gui-mobile/src/forge/toolbox/ListChooser.java b/forge-gui-mobile/src/forge/toolbox/ListChooser.java
index 1d8f6cf717a..153ff540f97 100644
--- a/forge-gui-mobile/src/forge/toolbox/ListChooser.java
+++ b/forge-gui-mobile/src/forge/toolbox/ListChooser.java
@@ -21,6 +21,7 @@ package forge.toolbox;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
@@ -77,10 +78,10 @@ public class ListChooser<T> extends FContainer {
     private FOptionPane optionPane;
     private final Collection<T> list;
     private final Function<T, String> display;
-    private final Callback<List<T>> callback;
+    private final Consumer<List<T>> callback;
     private AdvancedSearchFilter<? extends InventoryItem> advancedSearchFilter;
 
-    public ListChooser(final String title, final int minChoices, final int maxChoices, final Collection<T> list0, final Function<T, String> display0, final Callback<List<T>> callback0) {
+    public ListChooser(final String title, final int minChoices, final int maxChoices, final Collection<T> list0, final Function<T, String> display0, final Consumer<List<T>> callback0) {
         FThreads.assertExecutedByEdt(true);
         list = list0;
         lstChoices = add(new ChoiceList(list, minChoices, maxChoices));
@@ -120,19 +121,16 @@ public class ListChooser<T> extends FContainer {
 
         updateHeight();
 
-        optionPane = new FOptionPane(null, null, title, null, this, options, 0, new Callback<Integer>() {
-            @Override
-            public void run(Integer result) {
-                called = false;
-                if (result == 0) {
-                    callback.run(lstChoices.getSelectedItems());
-                }
-                else if (minChoices > 0) {
-                    show(); //show if user tries to cancel when input is mandatory
-                }
-                else {
-                    callback.run(new ArrayList<>());
-                }
+        optionPane = new FOptionPane(null, null, title, null, this, options, 0, result -> {
+            called = false;
+            if (result == 0) {
+                callback.accept(lstChoices.getSelectedItems());
+            }
+            else if (minChoices > 0) {
+                show(); //show if user tries to cancel when input is mandatory
+            }
+            else {
+                callback.accept(new ArrayList<>());
             }
         }) {
             @Override
diff --git a/forge-gui/release-files/CHANGES.txt b/forge-gui/release-files/CHANGES.txt
deleted file mode 100644
index 05f0bf1829e..00000000000
--- a/forge-gui/release-files/CHANGES.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Bug fixes -
-As always, this release of Forge features an assortment of bug fixes and improvements based on user feedback during the previous release run.
diff --git a/forge-gui/release-files/CONTRIBUTORS.txt b/forge-gui/release-files/CONTRIBUTORS.txt
index 3f2b373d0d7..54fb8bcb486 100644
--- a/forge-gui/release-files/CONTRIBUTORS.txt
+++ b/forge-gui/release-files/CONTRIBUTORS.txt
@@ -1,66 +1,237 @@
+0nderzeeboot
+Adajone
+add-le
 Agetian
+allentiak
 Alumi
+Alwayssnarky
+amang876
+amikano
+Ampersandnz
+antoniomartinelli
 Aoki-Kujo
 apantel
+Arguas
+ArtjomsPorss
+asvitkine
+austeregrim
 Austinio7116
+autumnmyst
+AvacynAngel
+Ayora29
+beemaisonp
 Benjamin
+BigCrunch22
+BlindGuyNW
+bountygiver
+brngl
+brockfanning
 CCTV-1
+cdietschrun
+ChristopherLoper
 Churrufli
+cicoa
+CodeOfTheRing
+CollinJ
+Compterra
+CTimmerman
+Cyantime
+datuilabs
+davidjdiebold
+davison-cf
+dennisfriedrichsen
+dennisvlahos
+DerpaholicRex
+dev-id
+Dnaynu
+DorkmasterFlek
 Dracontes
+drdemp72
 DrDev
+Drecon84
+earno12
+edg444
+EfourC
+EldritchBimbo
+Ellios77
 Elwin
+entrailmix
+Eradev
+EvanMurawski
 excessum
+fernandomfgomes
+FLAREdirector-mse
 Flair
 Fregnor
+Fulgur14
+gabrielmop
+Gadget2013
+Glorax
 Gos
 Grimm
+GroundThing
+gsonnier333
 guytrash
 Hanmac
+HassanSky81
+HeitorBittenc
+Heitorpayao
+henges
+hovergoat
+hungriestPigeon
+hypercross
+Hythonia
+IceBen4444
+icy-
+imakunee
 Indigo Dragon
+invalidCards
+isaacbutterfield
+Ivniinvi
+JakeLoustone
 Jamin Collins
+jcb936
+jeb886
+Jefik37
+Jetz72
+jjayers99
+jkarlsson
+jochemvanthull-cpu
 John
+JohnWilliams77
+joongiealexkim
+Jorilx
+jpvorenk
+jumpinjackie
+junytang
+jyockey
+karlek
+keineahnungking
+kenizl86
+Kev-inBacon
 kevlahnota
 klaxnek
+Klisz
+kms70847
+krafczyk
 KrazyTheFox
+kvn1338
+LAHardman
+LargeGutSalesman
+lemtom
 leriomaggio
+loud1990
 Luke
+lukeway
+Lykrast
+MAC-GH
+maforget
 Magpie
+magpie514
+magusnebula
+MarcoFazioRandom
 Marek14
+marthinwurer
 Marvel
+maulet218
 mcrawford
 mctubbies
+MD200210
 medusa
 Meerkov
+mewtwo15026
+MIC132
+MikeS-NZ
+misha-colbourne
+MisterVitoPro
+mmw125
 Monkey Gland Sauce
+Morgenmvffel
+mousep
+mtwilliams14
 Myrd
+myyk
+NCat39
 nefigah
+neoFuzz
+NicolasCunha
+NikolayXHD
+NimSpork
 Nionios
+NishacIroCode
 Northmoc
+nshcat
+nthoron
+NuWiSan
 OgreBattlecruiser
 pakoito
+paulsnoops
+pduran5
+petersul
+pferreir
+pfirpfel
 pfps
+pochiel
+pvishalkeerthan
+rawbeans
+remggo
+rikimbo
+riku4470
 Ral
+Robbatog
+rpg2014
+rsnively
 Ryan1729
+ryanehamil
+SapphiCat
+schnautzr
 Seravy
+SeravySensei
+SethMilliken
+Shedletsky
+shenshinoman
+Simisays
 Sirspud
 SladeWilson
 Sloth
 slyfox7777777
 Snoops
 Sol
+SprinkleMeTimbers
 squee1968
+stubobis1
+Sunnovah
 Swordshine
+Swordshinehjy
 Suthro
 Svaldan
+t-w-o-s-a-t
+tehdiplomat
 The Cheese Stands Alone
+The-Wolverine28
+TheBlackMarvel
+thedevnull
+TheLastNarwhal
 thenobletheif
+Tillerino
+timmermac
+TimothyWright95
 tjtillman
 tojammot
+tool4ever
 torridus
+TrueFuFLeaderG
+TwentyToedToad
 twosat
+Valensior
+verifiedtm
+wcoldren
+Wild-W
+xanxer6rB
+XavierMD
 Xyx
+ZacharyDeganutti
 Zimtente
 Zuchinni
-XavierMD
 
 (If you think your name should be on this list, add it with your next contribution)
diff --git a/forge-gui/res/adventure/Amonkhet/world/shops.json b/forge-gui/res/adventure/Amonkhet/world/shops.json
index 575c86f6a9e..cbbeff52fb3 100644
--- a/forge-gui/res/adventure/Amonkhet/world/shops.json
+++ b/forge-gui/res/adventure/Amonkhet/world/shops.json
@@ -170,13 +170,13 @@
   "rewards": [
     {
       "count":6,
-	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure ",
+	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure",
 	  "colors": ["blue"],
       "editions":["AKH","HOU","MP2","AKR"]
     },
 	{
       "count":2,
-	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure ",
+	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure",
       "editions":["AKH","HOU","MP2","AKR"]
     }]
 },
@@ -1391,7 +1391,7 @@
     }]
 },{                                    
 "name":"Azorius",      
-"description":"Azorious Shop, LLC",
+"description":"Azorius Shop, LLC",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"AzoriusShop",
   "rewards": [
diff --git a/forge-gui/res/adventure/Crystal_Kingdoms/world/quests.json b/forge-gui/res/adventure/Crystal_Kingdoms/world/quests.json
index fd558d2620a..c0c6ab66522 100644
--- a/forge-gui/res/adventure/Crystal_Kingdoms/world/quests.json
+++ b/forge-gui/res/adventure/Crystal_Kingdoms/world/quests.json
@@ -6347,7 +6347,7 @@
 											"POIReference": ""
 										}
 									],
-									"name": "I'll take care of it, note the location of the factory on my map.(Accept Quest) (WARNING HARD QUEST)",
+									"name": "I'll take care of it. If you'd note the location of the factory on my map... (Accept Quest) (WARNING HARD QUEST)",
 									"text": "Once you have vanquished the mechanical threat and quelled the chaos within the factory, return to me, Maven the Alchemist, and you shall be rewarded handsomely for your bravery and service to our community. Be warned, however, for the path ahead will test your mettle, cunning, and combat prowess. May fortune favor you on this perilous undertaking!"
 								},
 								{
@@ -7095,7 +7095,7 @@
 											"options": [
 												{
 													"name": "\"What was the spell?\"",
-													"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam.... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
+													"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
 													"options": [
 														{
 															"name": "\"So, a portal?\"",
diff --git a/forge-gui/res/adventure/Crystal_Kingdoms/world/shops.json b/forge-gui/res/adventure/Crystal_Kingdoms/world/shops.json
index c4daabc2a53..fda46190466 100644
--- a/forge-gui/res/adventure/Crystal_Kingdoms/world/shops.json
+++ b/forge-gui/res/adventure/Crystal_Kingdoms/world/shops.json
@@ -1439,7 +1439,7 @@
     }]
 },{                                    
 "name":"Azorius",      
-"description":"Azorious Shop, LLC",
+"description":"Azorius Shop, LLC",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"AzoriusShop",
   "rewards": [
diff --git a/forge-gui/res/adventure/Crystal_Kingdoms/world/town_names_blue.txt b/forge-gui/res/adventure/Crystal_Kingdoms/world/town_names_blue.txt
index c7bf62dbd28..565a46be16b 100644
--- a/forge-gui/res/adventure/Crystal_Kingdoms/world/town_names_blue.txt
+++ b/forge-gui/res/adventure/Crystal_Kingdoms/world/town_names_blue.txt
@@ -335,7 +335,7 @@ Fourmill Run
 Port Rachkham
 Cloudy Shallows
 Slumnis
-Silver Pointe
+Silver Point
 Abjuration Point
 Crow's Nest
 The Rookery
diff --git a/forge-gui/res/adventure/Innistrad/config.json b/forge-gui/res/adventure/Innistrad/config.json
index 8118b5b6b0d..3fe454ec59c 100644
--- a/forge-gui/res/adventure/Innistrad/config.json
+++ b/forge-gui/res/adventure/Innistrad/config.json
@@ -7,96 +7,12 @@
   "colorIds":["W","U","B","R","G"],
   "colorIdNames":["tr(lblWhite) [+W]","tr(lblBlue) [+U]","tr(lblBlack) [+B]","tr(lblRed) [+R]","tr(lblGreen) [+G]"],
   "restrictedCards": [
-    "Black Lotus",
-    "Mox Emerald",
-    "Mox Pearl",
-    "Mox Ruby",
-    "Mox Sapphire",
-    "Mox Jet",
-    "Ancestral Recall",
-    "Timetwister",
-    "Time Walk",
-    "Command Tower",
-    "Arcane Signet",
-    "Opal Palace",
-    "Path of Ancestry",
-    "War Room",
-    "Commander's Plate",
-    "Campfire",
-    "Cloudkill",
-    "Command Beacon",
-    "Commander's Insignia",
-    "Forge of Heroes",
-    "Imposing Grandeur",
-    "Jeweled Lotus",
-    "Myth Unbound",
-    "Netherborn Altar",
-    "Sanctum of Eternity",
-    "Stinging Study",
-    "Study Hall",
-    "Witch's Clinic",
-    "Time Vault",
-    "Sol Ring",
-    "Mana Crypt",
-    "Tolarian Academy",
-    "Tinker",
-    "Demonic Tutor",
-    "Vampiric Tutor",
-    "Bazaar of Baghdad",
-    "Library of Alexandria",
-    "Mana Vault",
-    "Fastbond",
-    "Mishra's Workshop",
-    "Yawgmoth's Bargain",
-    "Gaea's Cradle",
-    "Commander's Sphere",
-    "Drake Stone",
-    "Wrenn and One",
-    "Under-Construction Skyscraper",
-    "Temur Elevator",
-    "Slumbering Waterways",
-    "Omenpath to Naya",
-    "The Heron Moon",
-    "Gobland",
-    "Fetching Garden",
-    "Mox Poison",
-    "Wisedrafter's Will",
-    "New Master of Arms",
-    "Halving Season",
-    "Questing Cosplayer",
-    "Teferi, Druid of Argoth",
-    "Anax and Cymede & Kynaios and Tiro",
-    "Call from the Grave",
-    "Mise"
   ],
   "restrictedEditions": [
-    "HTR",
-    "HTR17",
-    "HTR18",
-    "HTR19",
-    "HTR20",
-    "PCEL",
-    "HHO",
-    "CMB1",
-    "UST",
-    "UGL",
-    "UNH",
-    "PPC1",
-    "UND",
-    "PUST",
-    "DA1",
-    "UNF"
+
   ],
   "restrictedEvents": [
-    "LEA",
-    "LEB",
-    "2ED",
-    "30A",
-    "CNS",
-    "CN2",
-    "CMR",
-    "CLB",
-    "CMM"
+
   ],
   "allowedEditions": [
     "ISD",
diff --git a/forge-gui/res/adventure/Innistrad/decks/shops/inn_Missionaries.dck b/forge-gui/res/adventure/Innistrad/decks/shops/inn_Missionaries.dck
index 6c0b5337885..1f58bf6f208 100644
--- a/forge-gui/res/adventure/Innistrad/decks/shops/inn_Missionaries.dck
+++ b/forge-gui/res/adventure/Innistrad/decks/shops/inn_Missionaries.dck
@@ -13,7 +13,7 @@ Name=INN_Missionaries
 2 Blazing Torch|ISD|1
 1 Burn at the Stake|AVR|1
 1 Chapel Geist|ISD|1
-2 Chaplain of ALms|MID|1
+2 Chaplain of Alms|MID|1
 1 Chaplain's Blessing|SOI|1
 1 Cloistered Youth|ISD|1
 2 Crossroads Consecrator|EMN|1
@@ -32,7 +32,7 @@ Name=INN_Missionaries
 1 Forsaken Sanctuary|SOI|1
 1 Geist of the Lonely Vigil|EMN|1
 1 Isolated Chapel|ISD|1
-1 Jerren. Corrupted Bishop|MID|1
+1 Jerren, Corrupted Bishop|MID|1
 1 Kindly Ancestor|VOW|1
 1 Mad Prophet|SOI|1
 1 Make a Wish|ISD|1
diff --git a/forge-gui/res/adventure/Innistrad/decks/shops/inn_Peasants.dck b/forge-gui/res/adventure/Innistrad/decks/shops/inn_Peasants.dck
index 489270b1e9a..65e9743589d 100644
--- a/forge-gui/res/adventure/Innistrad/decks/shops/inn_Peasants.dck
+++ b/forge-gui/res/adventure/Innistrad/decks/shops/inn_Peasants.dck
@@ -1,7 +1,7 @@
 [metadata]
 Name=INN_Peasants
 [Main]
-1 Alchemists's Apprentice|AVR|1
+1 Alchemist's Apprentice|AVR|1
 3 Ambitious Farmhand|MID|1
 1 Apothecary Geist|SOI|1
 3 Baithook Angler|MID|1
diff --git a/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_peasant_easy.dck b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_peasant_easy.dck
new file mode 100644
index 00000000000..11bc4451108
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_peasant_easy.dck
@@ -0,0 +1,33 @@
+[metadata]
+Name=INN_peasant_easy
+[Avatar]
+
+[Main]
+2 Angel's Mercy|AVR|1
+3 Ambitious Farmhand|MID|1
+2 Beloved Beggar|MID|1
+2 Bereaved Survivor|MID|1
+2 Doomed Traveler|ISD|1
+2 Bar the Door|DKA|1
+2 Gather the Townsfolk|DKA|1
+2 Gavony Ironwright|DKA|1
+2 Lunarch Veteran|MID|1
+2 Slayer of the Wicked|ISD|1
+4 Unruly Mob|ISD|1
+12 Plains|ISD|3
+7 Plains|ISD|2
+5 Plains|ISD|3
+2 Village Bell-Ringer|ISD|1
+3 Zealous Strike|AVR|1
+3 Homestead Courage|MID|1
+3 Sharpened Pitchfork|ISD|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_scarecrow_easy.dck b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_scarecrow_easy.dck
new file mode 100644
index 00000000000..6f4ab30d8f9
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_scarecrow_easy.dck
@@ -0,0 +1,30 @@
+[metadata]
+Name=INN_scarecrow_easy
+[Avatar]
+
+[Main]
+2 Crossroads Candleguide|MID|1
+4 Field Creeper|EMN|1
+1 Geist-Fueled Scarecrow|EMN|1
+3 Harvest Hand|SOI|1
+2 One-Eyed Scarecrow|ISD|1
+1 Scarecrone|JMP|1
+2 Traveler's Amulet|ISD|1
+3 Scarecrow|ME4|1
+2 Wild-Field Scarecrow|SOI|1
+2 Jack-o'-Lantern|MID|1
+2 Wicker Witch|SOI|1
+5 Island|ISD|2
+5 Mountain|ISD|2
+5 Swamp|ISD|2
+5 Plains|ISD|2
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_the_whisperers.dck b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_the_whisperers.dck
index bd63094a76b..df72a6bc53c 100644
--- a/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_the_whisperers.dck
+++ b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_the_whisperers.dck
@@ -11,7 +11,7 @@ Name=INN_The_Whisperers
 2 Battleground Geist|ISD|1
 2 Drogskol Captain|DKA|1
 2 Gallows Warden|ISD|1
-2 Midknight Haunting|ISD|1
+2 Midnight Haunting|ISD|1
 2 Malevolent Hermit|MID|1
 2 Thing in the Ice|SOI|1
 2 Ambitious Farmhand|MID|1
diff --git a/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_zombie_easy.dck b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_zombie_easy.dck
new file mode 100644
index 00000000000..db75eaa37d5
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/decks/standard/INN/inn_zombie_easy.dck
@@ -0,0 +1,28 @@
+[metadata]
+Name=INN_zombie_easy
+[Avatar]
+
+[Main]
+2 Crawl from the Cellar|MID|1
+3 Hobbling Zombie|MID|1
+2 Diregraf Ghoul|ISD|1
+2 Gravecrawler|DKA|1
+2 Hunted Ghoul|AVR|1
+2 No Way Out|MID|1
+2 Rotten Reunion|MID|1
+2 Walking Corpse|ISD|1
+2 Shamble Back|SOI|1
+2 Sightless Ghoul|DKA|1
+2 Rancid Rats|SOI|1
+10 Swamp|ISD|3
+7 Swamp|ISD|2
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Innistrad/decks/starter/inn/Adventure - INN Low Red.dck b/forge-gui/res/adventure/Innistrad/decks/starter/inn/Adventure - INN Low Red.dck
index 8ab672e7ea3..abcb735cc91 100644
--- a/forge-gui/res/adventure/Innistrad/decks/starter/inn/Adventure - INN Low Red.dck	
+++ b/forge-gui/res/adventure/Innistrad/decks/starter/inn/Adventure - INN Low Red.dck	
@@ -16,7 +16,7 @@ Name=Adventure - INN Low Red
 1 Brimstone Vandal|MID|1
 2 Festival Crasher|MID|1
 2 Pyre Hound|SOI|1
-1 Curse of BLoodletting|DKA|1
+1 Curse of Bloodletting|DKA|1
 1 Incendiary Flow|EMN|1
 1 Rage Thrower|ISD|1
 1 Spellrune Painter|MID|1
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx
index a5e8167f30b..567fcfa8363 100644
--- a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx
@@ -268,7 +268,7 @@
 0,4901,4902,4748,782,3146,1259,621,782,782,3146,1259,621,3146,1259,1259,1259,621,782,462,4743,4744,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="7" name="High CLutter" width="32" height="40">
+ <layer id="7" name="High Clutter" width="32" height="40">
   <data encoding="csv">
 0,0,22705,0,0,0,0,0,0,0,0,0,0,0,0,0,7082,0,0,22547,0,24596,0,0,0,0,0,0,0,0,0,0,
 22550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/dark_forest.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/dark_forest.tmx
new file mode 100644
index 00000000000..aacd7ba49e6
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/dark_forest.tmx
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="36" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="45">
+ <tileset firstgid="1" source="../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="10113" source="../../../tileset/Inn_Dungeon.tsx"/>
+ <layer id="1" name="Ground" width="36" height="24">
+  <data encoding="csv">
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,1259,1259,1259,1259,1259,2515,2516,2516,2517,1259,2357,2678,2518,2673,2674,2514,2678,2676,2359,1259,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2374,2374,
+2374,2374,2358,2358,2359,1259,2357,2513,2362,2360,2514,2358,2678,2516,2518,1259,1259,2515,2516,2360,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2672,2358,2671,2675,2673,2672,2513,2674,2361,2362,2676,2359,1259,2673,2674,2675,1259,1259,1259,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2517,2515,2516,2517,1259,1259,2515,2517,1259,1259,2673,2674,2672,2359,1259,1259,2357,2358,2359,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2677,2677,2374,2374,
+2374,2374,2516,2517,2673,2674,2675,1259,1259,2673,2675,1259,1259,1259,1259,2673,2514,2358,2358,2678,2516,2676,2359,2673,2675,1259,2673,2674,2672,2359,2515,2516,2360,2361,2374,2374,
+2374,2374,2360,2675,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2515,2516,2516,2516,2360,2361,2675,2357,2358,2358,2358,2358,2513,2514,2678,2516,2517,1259,2374,2374,
+2374,2374,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2515,2360,2361,2362,2518,1259,1259,2515,2516,2516,2516,2516,2676,2513,2361,2361,2672,2677,2374,2374,
+2374,2374,1259,1259,2356,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2673,2672,2359,2673,2514,2359,1259,2515,2516,2516,2360,2361,2674,2675,1259,1259,2673,2362,2374,2374,
+2374,2374,1259,1259,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2359,1259,2357,2671,2675,1259,2520,2518,1259,2673,2674,2674,2514,2677,2677,2359,1259,1259,1259,2520,2374,2374,
+2374,2374,2359,1259,1259,2673,2675,1259,2673,2674,2672,2359,2515,2516,2676,2677,2513,2675,1259,1259,2520,2676,2677,2359,1259,1259,2515,2516,2516,2676,2359,1259,1259,2673,2374,2374,
+2374,2374,2676,2358,2359,1259,1259,1259,1259,1259,2673,2514,2678,2516,2516,2516,2517,2357,2358,2358,2678,2516,2360,2675,1259,1259,2673,2362,2516,2516,2517,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2675,1259,1259,2357,2359,1259,1259,2520,2516,2516,2516,2360,2675,2673,2362,2360,2361,2674,2675,1259,1259,1259,1259,2515,2516,2360,2675,1259,1259,2357,2374,2374,
+2374,2374,2516,2517,2357,2677,2677,2671,2675,2357,2359,2673,2674,2362,2360,2514,2677,2359,2673,2672,2359,1259,1259,2357,2358,2677,2359,2515,2516,2517,2357,2677,2677,2671,2374,2374,
+2374,2374,2674,2675,2515,2516,2516,2518,2357,2678,2517,1259,1259,2673,2672,2671,2674,2675,1259,2673,2675,1259,2357,2678,2516,2360,2675,2673,2674,2675,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2515,2516,2516,2518,2515,2360,2675,1259,2356,1259,2673,2514,2358,2359,1259,1259,1259,2357,2671,2361,2361,2675,1259,1259,1259,1259,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2673,2362,2360,2672,2513,2675,2357,2359,1259,1259,2357,2671,2674,2675,1259,1259,1259,2515,2676,2677,2677,2359,1259,1259,1259,1259,2673,2362,2360,2672,2374,2374,
+2374,2374,2356,1259,1259,2673,2675,2673,2514,2358,2678,2517,1259,1259,2515,2518,1259,1259,2357,2359,1259,2673,2361,2362,2516,2517,1259,1259,2356,1259,1259,2673,2675,2673,2374,2374,
+2374,2374,2358,2358,2359,1259,1259,1259,2673,2362,2516,2517,1259,2357,2678,2676,2359,1259,2673,2675,1259,1259,1259,2520,2516,2517,1259,1259,2358,2358,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2359,1259,1259,2357,2678,2516,2517,1259,2515,2516,2516,2517,1259,1259,1259,2357,2359,1259,2673,2674,2675,1259,1259,2516,2516,2516,2359,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2672,2358,2359,2515,2516,2516,2517,1259,2673,2674,2674,2675,1259,2357,2358,2678,2517,1259,1259,1259,1259,1259,1259,2516,2516,2516,2672,2358,2359,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1237,1555,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1080,1397,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1553,1080,1080,1080,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3629,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,4082,0,0,0,0,0,0,0,0,77,0,0,0,0,0,
+0,0,0,3450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4244,0,0,0,0,70,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3306,0,0,0,0,0,0,231,0,5364,0,199,0,0,0,0,231,0,0,7537,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,41,0,0,0,0,63,0,0,0,4399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4713,4406,0,4557,0,0,0,0,0,0,0,0,0,0,217,0,0,0,0,0,11802,0,11803,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4724,4717,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4248,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,
+0,0,0,0,0,0,0,3307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,
+0,0,0,0,59,0,0,0,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3451,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,7538,0,0,0,0,0,0,0,0,0,0,0,0,0,218,0,0,0,0,0,0,59,0,0,0,0,0,
+0,0,0,59,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,73,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,220,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3930,3934,3932,0,0,0,58,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,77,0,0,0,3450,3925,4244,4250,4245,3935,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3925,4240,4085,3933,4244,4251,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="36" height="24">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4084,4087,4243,3630,3628,3623,3470,3628,3318,4397,3316,3623,3312,3627,4724,4719,3627,3628,4718,4722,4090,4083,4092,4244,4251,4399,4714,4561,4724,4719,4402,4558,0,0,
+0,0,4084,4093,0,0,3629,3633,3634,3629,3631,0,3474,3475,3467,3622,4406,4720,4719,3623,4403,4406,4245,4240,4092,4093,0,4720,4724,4719,4406,4720,4560,4558,0,0,
+0,0,4081,4251,0,0,0,0,0,0,4404,4409,3629,3465,3464,4556,4564,0,4557,3464,3631,4564,4241,4242,4247,4251,4404,4406,0,4720,4719,4406,4565,3470,0,0,
+0,0,4093,0,0,4404,4406,0,0,4404,4718,4722,0,3466,4567,4720,4722,0,3629,3628,4718,4722,0,3308,3315,4399,4718,4719,4405,4406,4720,4722,4565,3473,0,0,
+0,0,4251,0,0,4565,4403,4406,4404,4718,4722,0,0,3627,4722,4404,4406,0,0,3624,3631,0,0,4720,4719,4402,3476,4720,4560,4567,0,4404,4714,3312,0,0,
+0,0,3924,3924,0,4720,4721,4719,4714,4564,0,0,0,4559,4404,3627,4719,3314,3315,0,3313,3315,0,0,4715,4560,3476,0,4720,4725,0,4562,4555,4556,0,0,
+0,0,3933,3935,0,0,0,4402,4555,4722,4398,0,4720,4719,4714,3468,3629,3630,3631,3313,3627,3628,3318,0,0,3629,3631,4404,4406,0,0,4720,4719,3311,0,0,
+0,0,4081,4248,0,4404,4714,4558,4564,0,3308,3315,0,4720,4724,3628,3315,0,3313,3623,3312,3627,3631,0,4404,3315,0,4562,4403,4405,4406,0,4720,4560,0,0,
+0,0,3315,0,0,4562,4558,4561,4717,0,3624,3628,0,3313,3315,3629,3631,3313,3627,3633,3633,3628,3315,4404,4714,3312,3315,4720,4721,4560,4403,4405,4406,4565,0,0,
+0,0,3476,0,0,4715,4716,4722,0,0,0,3629,3628,3627,3631,0,3313,3627,3631,0,0,3629,3631,4565,4566,3470,3631,0,0,4720,4556,4561,4722,4565,0,0,
+0,0,3312,3315,0,0,0,3316,3315,0,3308,3315,3629,3628,4406,0,4720,4719,3315,0,3313,3317,3315,4720,3469,4559,4404,4401,0,4404,4718,4725,0,4723,0,0,
+0,0,3467,3468,0,3451,3316,3623,3312,3314,3627,3628,3315,3466,4713,4406,0,4720,4719,3317,3627,3465,3473,0,3629,3628,4714,4559,4404,4402,4567,0,0,4405,0,0,
+0,0,3627,3631,0,0,3629,3633,3465,3472,3473,3629,3631,3474,3475,4564,0,0,4562,4558,3476,3629,3631,0,0,3471,4561,4719,4718,4724,4722,0,4565,3470,0,0,
+0,0,3634,0,3313,3309,3315,0,3629,3625,3631,3313,3317,3311,3470,4722,0,4404,4718,4716,3631,0,0,0,3313,3627,4719,4718,4722,4404,4406,4404,3627,3628,0,0,
+0,0,0,0,3632,3465,3622,3315,0,0,3313,3627,3630,3630,3628,4406,0,4723,4725,0,0,0,0,0,3471,3476,4720,4719,4406,4565,4567,4565,3622,3627,0,0,
+0,0,3315,0,0,3629,3633,3628,3314,3309,3627,3631,0,0,3629,4719,4406,0,0,0,3313,3315,0,0,3632,3634,0,4720,4722,4720,4719,4718,3465,3473,0,0,
+0,0,3476,0,3313,3315,0,3629,3633,3465,3622,3317,3318,0,0,4720,4722,4404,4401,4404,3627,3631,0,3313,3318,0,0,0,0,0,4720,4722,3632,3465,0,0,
+0,0,3312,3317,3627,3631,0,3313,3315,3629,3633,3625,3631,3313,3315,0,4404,4718,4719,4402,3473,0,3313,3311,3476,0,0,0,0,0,0,0,3313,3623,0,0,
+0,0,3469,3470,3628,3315,3313,3627,3628,3317,3315,0,3313,3623,3622,3314,4718,4719,4718,4560,3476,3313,3311,3470,3631,0,0,0,0,0,0,3313,3627,3465,0,0,
+0,0,3627,3628,3623,3312,3627,3628,3627,3465,3622,3309,3627,3465,3467,3467,4403,4718,4719,4718,3628,3627,3469,3312,3315,0,0,0,0,0,3307,3624,3628,3315,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="2" template="../../../../../common/maps/obj/entry_left.tx" x="32" y="279.5" width="14.25" height="23.5"/>
+  <object id="4" template="../../../../../common/maps/obj/gold.tx" x="97.2727" y="208.182">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 20,
+    &quot;addMaxCount&quot;: 50
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="5" template="../../../../../common/maps/obj/enemy.tx" x="68.1818" y="122.727">
+   <properties>
+    <property name="enemy" value="Hobbling Zombie"/>
+    <property name="pursueRange" type="int" value="12"/>
+    <property name="threatRange" type="int" value="25"/>
+    <property name="waypoints" value="32,33,34"/>
+   </properties>
+  </object>
+  <object id="6" template="../../../../../common/maps/obj/enemy.tx" x="171.394" y="241.091">
+   <properties>
+    <property name="enemy" value="Scarecrow"/>
+    <property name="threatRange" type="int" value="10"/>
+   </properties>
+  </object>
+  <object id="7" template="../../../../../common/maps/obj/enemy.tx" x="187.636" y="334.364">
+   <properties>
+    <property name="enemy" value="Hobbling Zombie"/>
+    <property name="pursueRange" type="int" value="50"/>
+    <property name="threatRange" type="int" value="50"/>
+    <property name="waypoints" value="30, 31"/>
+   </properties>
+  </object>
+  <object id="8" template="../../../../../common/maps/obj/enemy.tx" x="173.455" y="120.182">
+   <properties>
+    <property name="enemy" value="Howlpack Exile"/>
+    <property name="pursueRange" type="int" value="60"/>
+    <property name="threatRange" type="int" value="80"/>
+   </properties>
+  </object>
+  <object id="9" template="../../../../../common/maps/obj/enemy.tx" x="160.364" y="191.636">
+   <properties>
+    <property name="enemy" value="Bog Hermit"/>
+    <property name="fleeRange" value="10"/>
+    <property name="threatRange" type="int" value="60"/>
+   </properties>
+  </object>
+  <object id="10" template="../../../../../common/maps/obj/enemy.tx" x="302" y="129.091">
+   <properties>
+    <property name="enemy" value="Borderland Ranger"/>
+    <property name="threatRange" type="int" value="60"/>
+   </properties>
+  </object>
+  <object id="11" template="../../../../../common/maps/obj/enemy.tx" x="321.455" y="187.091">
+   <properties>
+    <property name="enemy" value="Loam Dryad"/>
+   </properties>
+  </object>
+  <object id="12" template="../../../../../common/maps/obj/enemy.tx" x="329.636" y="267.091">
+   <properties>
+    <property name="enemy" value="Loam Dryad"/>
+    <property name="pursueRange" type="int" value="29"/>
+    <property name="threatRange" type="int" value="100"/>
+    <property name="waypoints" value="35,36,37"/>
+   </properties>
+  </object>
+  <object id="13" template="../../../../../common/maps/obj/enemy.tx" x="412.364" y="155.455">
+   <properties>
+    <property name="enemy" value="Wandering Geist"/>
+    <property name="threatRange" type="int" value="25"/>
+    <property name="waypoints" value="38,36,39,40"/>
+   </properties>
+  </object>
+  <object id="14" template="../../../../../common/maps/obj/enemy.tx" x="435.818" y="301.091">
+   <properties>
+    <property name="enemy" value="Watcher in the Web"/>
+    <property name="pursueRange" type="int" value="10"/>
+    <property name="threatRange" type="int" value="90"/>
+    <property name="waypoints" value="43,44"/>
+   </properties>
+  </object>
+  <object id="15" template="../../../../../common/maps/obj/enemy.tx" x="515.273" y="167.273">
+   <properties>
+    <property name="enemy" value="Wandering Geist"/>
+    <property name="fleeRange" value="60"/>
+    <property name="threatRange" type="int" value="30"/>
+    <property name="waypoints" value="39,41,42,41"/>
+   </properties>
+  </object>
+  <object id="16" template="../../../../../common/maps/obj/enemy.tx" x="479.545" y="128.909">
+   <properties>
+    <property name="enemy" value="Watcher in the Web"/>
+    <property name="hidden" type="bool" value="true"/>
+    <property name="threatRange" type="int" value="20"/>
+   </properties>
+  </object>
+  <object id="17" template="../../../../../common/maps/obj/manashards.tx" x="486" y="60.7273">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;shards&quot;,
+    &quot;count&quot;: 1,
+    &quot;addMaxCount&quot;: 5
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="18" template="../../../../../common/maps/obj/scroll.tx" x="412.182" y="64.7273">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;count&quot;: 3 } ]"/>
+   </properties>
+  </object>
+  <object id="19" template="../../../../../common/maps/obj/scroll.tx" x="450.727" y="203.455">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;count&quot;: 3 } ]"/>
+   </properties>
+  </object>
+  <object id="20" template="../../../../../common/maps/obj/scroll.tx" x="331.455" y="334.364">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;count&quot;: 3 } ]"/>
+   </properties>
+  </object>
+  <object id="21" template="../../../../../common/maps/obj/manashards.tx" x="393.455" y="320.364">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;shards&quot;,
+    &quot;count&quot;: 1,
+    &quot;addMaxCount&quot;: 5
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="22" template="../../../../../common/maps/obj/gold.tx" x="494.909" y="323.636">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 120,
+    &quot;addMaxCount&quot;: 40
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="23" template="../../../../../common/maps/obj/gold.tx" x="254.625" y="56.375">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 50,
+    &quot;addMaxCount&quot;: 40
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="24" template="../../../../../common/maps/obj/scroll.tx" x="226.875" y="107.5">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;subTypes&quot;: [&quot;Scarecrow&quot;], &quot;count&quot;: 1 } ]"/>
+   </properties>
+  </object>
+  <object id="25" template="../../../../../common/maps/obj/booster.tx" x="144" y="156.727">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;editions&quot;: [ &quot;ISD&quot;,&quot;DKA&quot;,&quot;SOI&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 4,
+    &quot;rarity&quot;: [ &quot;Common&quot; ]
+  },
+  {
+    &quot;editions&quot;: [ &quot;ISD&quot;,&quot;DKA&quot;,&quot;SOI&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 2,
+    &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
+  },
+  {
+    &quot;editions&quot;: [ &quot;ISD&quot;,&quot;DKA&quot;,&quot;SOI&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 1,
+    &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot;, &quot;Uncommon&quot; ]
+  }
+]
+</property>
+   </properties>
+  </object>
+  <object id="26" template="../../../../../common/maps/obj/gold.tx" x="121.667" y="110.667">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 15,
+    &quot;addMaxCount&quot;: 40
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="27" template="../../../../../common/maps/obj/gold.tx" x="179" y="293.333">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 15,
+    &quot;addMaxCount&quot;: 40
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="28" template="../../../../../common/maps/obj/gold.tx" x="87.6667" y="336.333">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 1,
+    &quot;addMaxCount&quot;: 20
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="29" template="../../../../../common/maps/obj/gold.tx" x="296" y="192.667"/>
+  <object id="30" template="../../../../../common/maps/obj/waypoint.tx" x="99.6667" y="305.667"/>
+  <object id="31" template="../../../../../common/maps/obj/waypoint.tx" x="224" y="294"/>
+  <object id="32" template="../../../../../common/maps/obj/waypoint.tx" x="71.6667" y="171"/>
+  <object id="33" template="../../../../../common/maps/obj/waypoint.tx" x="89.3333" y="56"/>
+  <object id="34" template="../../../../../common/maps/obj/waypoint.tx" x="65.6667" y="93"/>
+  <object id="35" template="../../../../../common/maps/obj/waypoint.tx" x="304" y="283.667"/>
+  <object id="36" template="../../../../../common/maps/obj/waypoint.tx" x="390" y="226"/>
+  <object id="37" template="../../../../../common/maps/obj/waypoint.tx" x="362" y="280"/>
+  <object id="38" template="../../../../../common/maps/obj/waypoint.tx" x="368" y="156"/>
+  <object id="39" template="../../../../../common/maps/obj/waypoint.tx" x="435.333" y="129.333"/>
+  <object id="40" template="../../../../../common/maps/obj/waypoint.tx" x="425.667" y="184.333"/>
+  <object id="41" template="../../../../../common/maps/obj/waypoint.tx" x="518.333" y="203"/>
+  <object id="42" template="../../../../../common/maps/obj/waypoint.tx" x="487" y="272.333"/>
+  <object id="43" template="../../../../../common/maps/obj/waypoint.tx" x="417" y="288.667"/>
+  <object id="44" template="../../../../../common/maps/obj/waypoint.tx" x="478.333" y="313.333"/>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_dungeon.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_dungeon.tmx
deleted file mode 100644
index 009f446d6a8..00000000000
--- a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_dungeon.tmx
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="35" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="13">
- <tileset firstgid="1" source="../../../tileset/Inn_Dungeon.tsx"/>
- <tileset firstgid="4481" source="../../../tileset/inn_dungeon_floor.tsx"/>
- <tileset firstgid="5106" source="../../../tileset/inn_main.tsx"/>
- <tileset firstgid="15218" source="../../../../../common/maps/tileset/main.tsx"/>
- <tileset firstgid="25330" source="../../../tileset/buildings.tsx"/>
- <layer id="1" name="Ground" width="35" height="40">
-  <data encoding="csv">
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7465,7466,7466,7466,7466,7466,7466,7466,7466,7466,7466,7466,7466,7467,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7465,7466,7466,7466,7466,7466,7466,7780,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7778,7467,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7622,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7465,7466,7466,7466,7466,7466,7466,7466,7780,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7778,7466,7466,7467,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7781,7782,7463,7463,7464,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7462,7782,7782,7783,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7462,7782,7782,7782,7782,7782,7782,7782,7782,7782,7783,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7781,7782,7782,7782,7782,7782,7782,7782,7782,7782,7782,7782,7782,7782,7782,7783,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
-7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621
-</data>
- </layer>
- <layer id="2" name="Ground Clutter" width="35" height="40">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19937,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19936,19625,19935,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5253,19937,19777,19784,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,7765,7765,7765,7765,7765,7766,0,0,0,19937,19942,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,8988,0,0,18673,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,6181,6181,0,19624,19625,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19935,19777,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19939,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8235,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,8235,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,8235,7765,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,18688,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,7765,7766,18688,
-0,0,0,8080,8081,8081,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,8393,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8082,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8081,8081,8081,8081,8081,8081,8081,8394,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,8393,8081,8081,8081,8081,8081,8397,8081,8081,8398,8081,8081,8081,8082,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,6180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18844,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,19621,19623,0,19614,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,19614,0,19621,19626,0,0,19614,0,0,19615,19937,19936,19623,0,18676,18672,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,19621,7922,7923,7923,7924,19615,19621,19931,19784,0,0,0,0,0,0,0,19937,19936,19622,19623,19621,19622,19623
-</data>
- </layer>
- <layer id="3" name="Medium Ground" width="35" height="40">
-  <data encoding="csv">
-0,0,0,0,0,18682,18690,18523,18524,18841,18842,18843,18530,18844,18850,18842,18850,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,18846,18845,18535,0,0,0,0,18849,18848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,18846,18848,18530,18532,0,0,0,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11111,11112,0,0,6803,6803,0,0,
-18530,18844,18848,0,18523,0,0,0,18688,18693,0,18530,18527,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,10623,0,0,0,0,
-18682,18693,18530,18526,18844,18847,18845,18532,18846,18845,18531,18844,18845,18535,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11431,11434,0,0,0,0,0,
-18844,18848,18683,18687,18845,18532,18846,18851,0,18846,18682,18690,18849,18851,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,
-18690,0,18849,18848,18846,18845,18532,0,0,0,0,0,0,0,0,0,0,0,11110,11587,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,22299,0,
-18851,0,0,18530,18532,18846,18848,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11112,0,0,0,0,0,
-18845,18531,18532,18846,18845,18532,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18844,18686,18693,0,18846,18845,18535,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,18846,18682,18529,18532,18691,18693,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18845,18532,18846,18682,18693,18846,18851,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18528,18685,18530,18844,18848,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18681,18848,18846,18848,0,0,18524,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,18523,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,7913,18530,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,22456,
-18693,0,0,0,11426,11427,11427,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11111,11111,11112,0,22456,
-18693,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,11426,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11428,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11427,11427,11427,11427,11427,11427,11427,11427,11428,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,11426,11427,11427,11427,11427,11427,11429,11429,11427,11427,11427,11427,11428,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,11432,11432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8238,6181,6181,6181,6181,6181,6181,6181,6181,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18690,
-18693,0,0,0,0,0,0,0,22297,22139,22296,22295,22298,0,0,0,0,22453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18530,18528,18529,
-18845,18532,0,0,0,0,0,0,18671,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18849,18847,18847,
-18840,18839,18532,0,0,0,18677,0,0,19621,19625,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18684,18684,18690,18523,18672,18524,0,18676,18673,19779,19772,19936,19622,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="4" name="Medium Clutter" width="35" height="40">
-  <data encoding="csv">
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20594,20595,20592,20595,20592,20595,20595,20596,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,3001,20906,0,20752,0,3003,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,20914,0,0,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20749,20911,20593,0,20749,20595,20911,20751,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,20914,0,20914,0,0,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20594,20595,20595,20595,20596,20753,20753,20753,20753,20752,3002,20752,0,20752,3002,0,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,20910,20911,20911,20911,20595,20750,20911,20909,0,20749,20911,20911,20751,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,0,0,0,0,2428,20906,0,0,0,20914,0,0,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,20590,0,0,0,0,0,0,0,0,20752,0,3001,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,20754,0,0,0,0,20590,0,0,0,20752,0,0,20754,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,12644,20754,0,0,20594,20595,20908,20595,20595,20595,20908,20911,20911,20912,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20910,20911,20592,20911,20912,0,21065,20751,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,11761,0,0,0,20754,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,0,20754,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,0,20754,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,0,20754,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20752,0,0,0,0,20754,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20910,20911,20911,20911,20911,20912,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,
-20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753
-</data>
- </layer>
- <layer id="5" name="Walls" width="35" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,20753,20753,0,0,0,0,0,0,0,0,0,0,20753,20753,20753,20753,20753,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,0,0,
-0,0,0,0,0,0,0,20753,20753,20753,20753,20753,20753,20753,20753,20753,20753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,0,20753,
-0,0,0,0,0,0,0,20753,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20753,20753,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <objectgroup id="7" name="Object Layer 1">
-  <object id="2" template="../../../obj/entry_right.tx" x="255.273" y="304.182">
-   <properties>
-    <property name="teleport" value="../Innistrad/maps/map/main_story/inn_approaches/davriels_mansion.tmx.tmx"/>
-   </properties>
-  </object>
-  <object id="3" template="../../../obj/manashards.tx" x="335.727" y="253.061"/>
-  <object id="4" template="../../../obj/scroll.tx" x="271.375" y="329.875" width="10.25" height="9.625">
-   <properties>
-    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Ransack the Lab&quot;, &quot;count&quot;: 2 } ]"/>
-   </properties>
-  </object>
-  <object id="5" template="../../../obj/gold.tx" x="304.75" y="381.625">
-   <properties>
-    <property name="reward">[
-  {
-    &quot;type&quot;: &quot;gold&quot;,
-    &quot;count&quot;: 80,
-    &quot;addMaxCount&quot;: 50
- }
-]</property>
-   </properties>
-  </object>
-  <object id="6" template="../../../obj/gold.tx" x="370.25" y="171.25">
-   <properties>
-    <property name="reward">[
-  {
-    &quot;type&quot;: &quot;gold&quot;,
-    &quot;count&quot;: 10,
-    &quot;addMaxCount&quot;: 60
- }
-]</property>
-   </properties>
-  </object>
-  <object id="7" template="../../../obj/enemy.tx" x="287.875" y="332.5">
-   <properties>
-    <property name="enemy" value="Brerig"/>
-    <property name="threatRange" type="int" value="10"/>
-    <property name="waypoints" value="9,12"/>
-   </properties>
-  </object>
-  <object id="8" template="../../../obj/enemy.tx" x="335" y="270.25">
-   <properties>
-    <property name="enemy" value="Hobblefiend"/>
-    <property name="pursueRange" type="int" value="-1"/>
-    <property name="threatRange" type="int" value="15"/>
-    <property name="waypoints" value="9,10,11,10,9,10,"/>
-   </properties>
-  </object>
-  <object id="9" template="../../../obj/waypoint.tx" x="297.5" y="261.25"/>
-  <object id="10" template="../../../obj/waypoint.tx" x="396.5" y="273.75"/>
-  <object id="11" template="../../../obj/waypoint.tx" x="393.5" y="175.5"/>
-  <object id="12" template="../../../obj/waypoint.tx" x="289.5" y="346.75"/>
- </objectgroup>
- <layer id="6" name="above" width="35" height="40">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,11280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11280,0,2364,0,11280,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11603,11280,0,11605,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11763,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11606,11607,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11764,11765,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11615,11616,11617,11618,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11773,11774,11775,11776,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx
index 0b9363732ff..45a693d0027 100644
--- a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/library/inn_library.tmx
@@ -199,7 +199,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer id="6" name="Walls Suplementary" width="40" height="35">
+ <layer id="6" name="Walls Supplementary" width="40" height="35">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davirels_forest.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davirels_forest.tmx
new file mode 100644
index 00000000000..41921a78bdd
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davirels_forest.tmx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="36" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="5">
+ <tileset firstgid="1" source="../../../../tileset/inn_main.tsx"/>
+ <layer id="1" name="Ground" width="36" height="24">
+  <data encoding="csv">
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,1259,1259,1259,1259,1259,2515,2516,2516,2517,1259,2357,2678,2518,2673,2674,2514,2678,2676,2359,1259,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2374,2374,
+2374,2374,2358,2358,2359,1259,2357,2513,2362,2360,2514,2358,2678,2516,2518,1259,1259,2515,2516,2360,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2672,2358,2671,2675,2673,2672,2513,2674,2361,2362,2676,2359,1259,2673,2674,2675,1259,1259,1259,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2517,2515,2516,2517,1259,1259,2515,2517,1259,1259,2673,2674,2672,2359,1259,1259,2357,2358,2359,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2677,2677,2374,2374,
+2374,2374,2516,2517,2673,2674,2675,1259,1259,2673,2675,1259,1259,1259,1259,2673,2514,2358,2358,2678,2516,2676,2359,2673,2675,1259,2673,2674,2672,2359,2515,2516,2360,2361,2374,2374,
+2374,2374,2360,2675,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2515,2516,2516,2516,2360,2361,2675,2357,2358,2358,2358,2358,2513,2514,2678,2516,2517,1259,2374,2374,
+2374,2374,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2515,2360,2361,2362,2518,1259,1259,2515,2516,2516,2516,2516,2676,2513,2361,2361,2672,2677,2374,2374,
+2374,2374,1259,1259,2356,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2673,2672,2359,2673,2514,2359,1259,2515,2516,2516,2360,2361,2674,2675,1259,1259,2673,2362,2374,2374,
+2374,2374,1259,1259,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2359,1259,2357,2671,2675,1259,2520,2518,1259,2673,2674,2674,2514,2677,2677,2359,1259,1259,1259,2520,2374,2374,
+2374,2374,2359,1259,1259,2673,2675,1259,2673,2674,2672,2359,2515,2516,2676,2677,2513,2675,1259,1259,2520,2676,2677,2359,1259,1259,2515,2516,2516,2676,2359,1259,1259,2673,2374,2374,
+2374,2374,2676,2358,2359,1259,1259,1259,1259,1259,2673,2514,2678,2516,2516,2516,2517,2357,2358,2358,2678,2516,2360,2675,1259,1259,2673,2362,2516,2516,2517,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2675,1259,1259,2357,2359,1259,1259,2520,2516,2516,2516,2360,2675,2673,2362,2360,2361,2674,2675,1259,1259,1259,1259,2515,2516,2360,2675,1259,1259,2357,2374,2374,
+2374,2374,2516,2517,2357,2677,2677,2671,2675,2357,2359,2673,2674,2362,2360,2514,2677,2359,2673,2672,2359,1259,1259,2357,2358,2677,2359,2515,2516,2517,2357,2677,2677,2671,2374,2374,
+2374,2374,2674,2675,2515,2516,2516,2518,2357,2678,2517,1259,1259,2673,2672,2671,2674,2675,1259,2673,2675,1259,2357,2678,2516,2360,2675,2673,2674,2675,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2515,2516,2516,2518,2515,2360,2675,1259,2356,1259,2673,2514,2358,2359,1259,1259,1259,2357,2671,2361,2361,2675,1259,1259,1259,1259,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2673,2362,2360,2672,2513,2675,2357,2359,1259,1259,2357,2671,2674,2675,1259,1259,1259,2515,2676,2677,2677,2359,1259,1259,1259,1259,2673,2362,2360,2672,2374,2374,
+2374,2374,2356,1259,1259,2673,2675,2673,2514,2358,2678,2517,1259,1259,2515,2518,1259,1259,2357,2359,1259,2673,2361,2362,2516,2517,1259,1259,2356,1259,1259,2673,2675,2673,2374,2374,
+2374,2374,2358,2358,2359,1259,1259,1259,2673,2362,2516,2517,1259,2357,2678,2676,2359,1259,2673,2675,1259,1259,1259,2520,2516,2517,1259,1259,2358,2358,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2359,1259,1259,2357,2678,2516,2517,1259,2515,2516,2516,2517,1259,1259,1259,2357,2359,1259,2673,2674,2675,1259,1259,2516,2516,2516,2359,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2672,2358,2359,2515,2516,2516,2517,1259,2673,2674,2674,2675,1259,2357,2358,2678,2517,1259,1259,1259,1259,1259,1259,2516,2516,2516,2672,2358,2359,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1237,1555,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1080,1397,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1553,1080,1080,1080,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3629,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,4082,0,0,0,0,0,0,0,0,77,0,0,0,0,0,
+0,0,0,3450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4244,0,0,0,0,70,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3306,0,0,0,0,0,0,231,0,0,0,199,0,0,0,0,231,0,0,7537,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,41,0,0,0,0,63,0,0,0,4399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4713,4406,0,4557,0,0,0,0,0,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4724,4717,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4248,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,
+0,0,0,0,0,0,0,3307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,
+0,0,0,0,59,0,0,0,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3451,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,7538,0,0,0,0,0,0,0,0,0,0,0,0,0,218,0,0,0,0,0,0,59,0,0,0,0,0,
+0,0,0,59,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,73,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,220,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3930,3934,3932,0,0,0,58,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,77,0,0,0,3450,3925,4244,4250,4245,3935,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3925,4240,4085,3933,4244,4251,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="36" height="24">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4084,4087,4243,3630,3628,3623,3470,3628,3318,4397,3316,3623,3312,3627,4724,4719,3627,3628,4718,4722,4090,4083,4092,4244,4251,4399,4714,4561,4724,4719,4402,4558,0,0,
+0,0,4084,4093,0,0,3629,3633,3634,3629,3631,0,3474,3475,3467,3622,4406,4720,4719,3623,4403,4406,4245,4240,4092,4093,0,4720,4724,4719,4406,4720,4560,4558,0,0,
+0,0,4081,4251,0,0,0,0,0,0,4404,4409,3629,3465,3464,4556,4564,0,4557,3464,3631,4564,4241,4242,4247,4251,4404,4406,0,4720,4719,4406,4565,3470,0,0,
+0,0,4093,0,0,4404,4406,0,0,4404,4718,4722,0,3466,4567,4720,4722,0,3629,3628,4718,4722,0,3308,3315,4399,4718,4719,4405,4406,4720,4722,4565,3473,0,0,
+0,0,4251,0,0,4565,4403,4406,4404,4718,4722,0,0,3627,4722,4404,4406,0,0,3624,3631,0,0,4720,4719,4402,3476,4720,4560,4567,0,4404,4714,3312,0,0,
+0,0,3924,3924,0,4720,4721,4719,4714,4564,0,0,0,4559,4404,3627,4719,3314,3315,0,3313,3315,0,0,4715,4560,3476,0,4720,4725,0,4562,4555,4556,0,0,
+0,0,3933,3935,0,0,0,4402,4555,4722,4398,0,4720,4719,4714,3468,3629,3630,3631,3313,3627,3628,3318,0,0,3629,3631,4404,4406,0,0,4720,4719,3311,0,0,
+0,0,4081,4248,0,4404,4714,4558,4564,0,3308,3315,0,4720,4724,3628,3315,0,3313,3623,3312,3627,3631,0,4404,3315,0,4562,4403,4405,4406,0,4720,4560,0,0,
+0,0,3315,0,0,4562,4558,4561,4717,0,3624,3628,0,3313,3315,3629,3631,3313,3627,3633,3633,3628,3315,4404,4714,3312,3315,4720,4721,4560,4403,4405,4406,4565,0,0,
+0,0,3476,0,0,4715,4716,4722,0,0,0,3629,3628,3627,3631,0,3313,3627,3631,0,0,3629,3631,4565,4566,3470,3631,0,0,4720,4556,4561,4722,4565,0,0,
+0,0,3312,3315,0,0,0,3316,3315,0,3308,3315,3629,3628,4406,0,4720,4719,3315,0,3313,3317,3315,4720,3469,4559,4404,4401,0,4404,4718,4725,0,4723,0,0,
+0,0,3467,3468,0,3451,3316,3623,3312,3314,3627,3628,3315,3466,4713,4406,0,4720,4719,3317,3627,3465,3473,0,3629,3628,4714,4559,4404,4402,4567,0,0,4405,0,0,
+0,0,3627,3631,0,0,3629,3633,3465,3472,3473,3629,3631,3474,3475,4564,0,0,4562,4558,3476,3629,3631,0,0,3471,4561,4719,4718,4724,4722,0,4565,3470,0,0,
+0,0,3634,0,3313,3309,3315,0,3629,3625,3631,3313,3317,3311,3470,4722,0,4404,4718,4716,3631,0,0,0,3313,3627,4719,4718,4722,4404,4406,4404,3627,3628,0,0,
+0,0,0,0,3632,3465,3622,3315,0,0,3313,3627,3630,3630,3628,4406,0,4723,4725,0,0,0,0,0,3471,3476,4720,4719,4406,4565,4567,4565,3622,3627,0,0,
+0,0,3315,0,0,3629,3633,3628,3314,3309,3627,3631,0,0,3629,4719,4406,0,0,0,3313,3315,0,0,3632,3634,0,4720,4722,4720,4719,4718,3465,3473,0,0,
+0,0,3476,0,3313,3315,0,3629,3633,3465,3622,3317,3318,0,0,4720,4722,4404,4401,4404,3627,3631,0,3313,3318,0,0,0,0,0,4720,4722,3632,3465,0,0,
+0,0,3312,3317,3627,3631,0,3313,3315,3629,3633,3625,3631,3313,3315,0,4404,4718,4719,4402,3473,0,3313,3311,3476,0,0,0,0,0,0,0,3313,3623,0,0,
+0,0,3469,3470,3628,3315,3313,3627,3628,3317,3315,0,3313,3623,3622,3314,4718,4719,4718,4560,3476,3313,3311,3470,3631,0,0,0,0,0,0,3313,3627,3465,0,0,
+0,0,3627,3628,3623,3312,3627,3628,3627,3465,3622,3309,3627,3465,3467,3467,4403,4718,4719,4718,3628,3627,3469,3312,3315,0,0,0,0,0,0,3624,3628,3315,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="2" template="../../../../../../common/maps/obj/entry_left.tx" x="32" y="279.5" width="14.25" height="23.5"/>
+  <object id="3" template="../../../../../../common/maps/obj/entry_up.tx" x="481.125" y="352.375" width="16" height="8.5"/>
+  <object id="4" template="../../../../../../common/maps/obj/gate.tx" x="480.375" y="350.375" width="18.5" height="14.125"/>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion.tmx
similarity index 62%
rename from forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx
rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion.tmx
index f84b9e721bd..3f8eee2d9ec 100644
--- a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion.tmx
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion.tmx
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="35" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="39">
- <tileset firstgid="1" source="../../../tileset/Inn_Dungeon.tsx"/>
- <tileset firstgid="4481" source="../../../tileset/inn_dungeon_floor.tsx"/>
- <tileset firstgid="5106" source="../../../tileset/inn_main.tsx"/>
- <tileset firstgid="15218" source="../../../../../common/maps/tileset/main.tsx"/>
- <tileset firstgid="25330" source="../../../tileset/buildings.tsx"/>
+ <tileset firstgid="1" source="../../../../tileset/Inn_Dungeon.tsx"/>
+ <tileset firstgid="4481" source="../../../../tileset/inn_dungeon_floor.tsx"/>
+ <tileset firstgid="5106" source="../../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="15218" source="../../../../tileset/buildings.tsx"/>
  <layer id="1" name="Ground" width="35" height="40">
   <data encoding="csv">
 7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
@@ -51,13 +50,13 @@
  </layer>
  <layer id="2" name="Ground Clutter" width="35" height="40">
   <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19937,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19936,19625,19935,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5253,19937,19777,19784,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,7765,7765,7765,7765,7765,7766,0,0,0,19937,19942,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,8988,0,0,18673,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,6181,6181,0,19624,19625,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19935,19777,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19939,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9825,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9824,9513,9823,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5253,9825,9665,9672,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,7765,7765,7765,7765,7765,7766,0,0,0,9825,9830,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,8988,0,0,8561,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,6181,6181,0,9512,9513,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,9823,9665,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,9827,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8235,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
@@ -72,113 +71,113 @@
 0,0,0,8235,7765,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,18688,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,7765,7766,18688,
-0,0,0,8080,8081,8081,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,8393,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8082,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8081,8081,8081,8081,8081,8081,8081,8394,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,8393,8081,8081,8081,8081,8081,8397,8081,8081,8398,8081,8081,8081,8082,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,6180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18844,
+0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,8576,
+0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,7765,7766,8576,
+0,0,0,8080,8081,8081,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,8393,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8082,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8081,8081,8081,8081,8081,8081,8081,8394,0,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,8393,8081,8081,8081,8081,8081,8397,8081,8081,8398,8081,8081,8081,8082,0,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,6180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8732,
 0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,19621,19623,0,19614,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,19614,0,19621,19626,0,0,19614,0,0,19615,19937,19936,19623,0,18676,18672,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,19621,7922,7923,7923,7924,19615,19621,19931,19784,0,0,0,0,0,0,0,19937,19936,19622,19623,19621,19622,19623
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,9509,9511,0,9502,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,9502,0,9509,9514,0,0,9502,0,0,9503,9825,9824,9511,0,8564,8560,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,9509,7922,7923,7923,7924,9503,9509,9819,9672,0,0,0,0,0,0,0,9825,9824,9510,9511,9509,9510,9511
 </data>
  </layer>
  <layer id="3" name="Medium Ground" width="35" height="40">
   <data encoding="csv">
-0,0,0,0,0,18682,18690,18523,18524,18841,18842,18843,18530,18844,18850,18842,18850,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,18846,18845,18535,0,0,0,0,18849,18848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,18846,18848,18530,18532,0,0,0,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11111,11112,0,0,6803,6803,0,0,
-18530,18844,18848,0,18523,0,0,0,18688,18693,0,18530,18527,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,10623,0,0,0,0,
-18682,18693,18530,18526,18844,18847,18845,18532,18846,18845,18531,18844,18845,18535,0,0,0,0,0,11268,11269,4217,4218,4219,4220,11269,11269,11269,11431,11434,0,0,0,0,0,
-18844,18848,18683,18687,18845,18532,18846,18851,0,18846,18682,18690,18849,18851,0,0,0,0,0,11268,11269,4281,4282,4283,4284,11269,11269,11269,11270,0,0,0,0,0,0,
-18690,0,18849,18848,18846,18845,18532,0,0,0,0,0,0,0,0,0,0,0,11110,11587,11269,4345,4346,4347,4348,11269,11269,11269,11270,0,0,0,0,22299,0,
-18851,0,0,18530,18532,18846,18848,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,4409,4410,4411,4412,11269,11269,11269,11584,11112,0,0,0,0,0,
-18845,18531,18532,18846,18845,18532,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18844,18686,18693,0,18846,18845,18535,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,1493,1493,2201,2202,2202,2202,2202,2203,11269,11270,0,0,0,0,0,
-18693,18846,18682,18529,18532,18691,18693,0,0,0,0,0,11268,11269,11269,11269,1493,1493,1493,1493,1493,1493,2265,2139,2141,2140,2138,2267,11269,11270,0,0,0,0,0,
-18845,18532,18846,18682,18693,18846,18851,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,1493,2265,2140,2139,2140,2137,2267,11269,11270,0,0,0,0,0,
-18528,18685,18530,18844,18848,0,0,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,11269,2265,2140,2140,2141,2137,2267,11269,11270,0,0,0,0,0,
-18681,18848,18846,18848,0,0,18524,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,1493,2265,2140,2139,2138,2137,2267,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,18523,0,0,0,0,0,0,11268,11269,11269,11269,11269,1493,1493,11269,1493,1493,2329,2330,2330,2330,2330,2331,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,7913,18530,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,22456,
-18693,0,0,0,11426,11427,11427,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11111,11111,11112,0,22456,
-18693,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,11426,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11428,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11427,11427,11427,11427,11427,11427,11427,11427,11428,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,11426,11427,11427,11427,11427,11427,11429,11429,11427,11427,11427,11427,11428,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,11432,11432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8238,6181,6181,6181,6181,6181,6181,6181,6181,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18690,
-18693,0,0,0,0,0,0,0,22297,22139,22296,22295,22298,0,0,0,0,22453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18530,18528,18529,
-18845,18532,0,0,0,0,0,0,18671,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18849,18847,18847,
-18840,18839,18532,0,0,0,18677,0,0,19621,19625,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18684,18684,18690,18523,18672,18524,0,18676,18673,19779,19772,19936,19622,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,8570,8578,8411,8412,8729,8730,8731,8418,8732,8738,8730,8738,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,8734,8733,8423,0,0,0,0,8737,8736,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,8734,8736,8418,8420,0,0,0,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11111,11112,0,0,6803,6803,0,0,
+8418,8732,8736,0,8411,0,0,0,8576,8581,0,8418,8415,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,10623,0,0,0,0,
+8570,8581,8418,8414,8732,8735,8733,8420,8734,8733,8419,8732,8733,8423,0,0,0,0,0,11268,11269,4217,4218,4219,4220,11269,11269,11269,11431,11434,0,0,0,0,0,
+8732,8736,8571,8575,8733,8420,8734,8739,0,8734,8570,8578,8737,8739,0,0,0,0,0,11268,11269,4281,4282,4283,4284,11269,11269,11269,11270,0,0,0,0,0,0,
+8578,0,8737,8736,8734,8733,8420,0,0,0,0,0,0,0,0,0,0,0,11110,11587,11269,4345,4346,4347,4348,11269,11269,11269,11270,0,0,0,0,12187,0,
+8739,0,0,8418,8420,8734,8736,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,4409,4410,4411,4412,11269,11269,11269,11584,11112,0,0,0,0,0,
+8733,8419,8420,8734,8733,8420,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8732,8574,8581,0,8734,8733,8423,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,1493,1493,2201,2202,2202,2202,2202,2203,11269,11270,0,0,0,0,0,
+8581,8734,8570,8417,8420,8579,8581,0,0,0,0,0,11268,11269,11269,11269,1493,1493,1493,1493,1493,1493,2265,2139,2141,2140,2138,2267,11269,11270,0,0,0,0,0,
+8733,8420,8734,8570,8581,8734,8739,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,1493,2265,2140,2139,2140,2137,2267,11269,11270,0,0,0,0,0,
+8416,8573,8418,8732,8736,0,0,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,11269,2265,2140,2140,2141,2137,2267,11269,11270,0,0,0,0,0,
+8569,8736,8734,8736,0,0,8412,0,0,0,0,0,11268,11269,1493,1493,1493,1493,1493,1493,1493,1493,2265,2140,2139,2138,2137,2267,11269,11270,0,0,0,0,0,
+8578,0,0,0,0,8411,0,0,0,0,0,0,11268,11269,11269,11269,11269,1493,1493,11269,1493,1493,2329,2330,2330,2330,2330,2331,11269,11270,0,0,0,0,0,
+8581,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8578,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8578,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,7913,8418,
+8578,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,12344,
+8581,0,0,0,11426,11427,11427,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11111,11111,11112,0,12344,
+8581,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,12344,
+8581,0,0,0,0,0,0,11426,11586,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11428,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11427,11427,11427,11427,11427,11427,11427,11427,11428,0,0,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,11426,11427,11427,11427,11427,11427,11429,11429,11427,11427,11427,11427,11428,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,0,0,0,0,0,0,11432,11432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8581,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8581,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8238,6181,6181,6181,6181,6181,6181,6181,6181,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8578,
+8581,0,0,0,0,0,0,0,12185,12027,12184,12183,12186,0,0,0,0,12341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8418,8416,8417,
+8733,8420,0,0,0,0,0,0,8559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8737,8735,8735,
+8728,8727,8420,0,0,0,8565,0,0,9509,9513,9511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8572,8572,8578,8411,8560,8412,0,8564,8561,9667,9660,9824,9510,9511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="4" name="Medium Clutter" width="35" height="40">
   <data encoding="csv">
-18681,18845,18844,18850,18850,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18535,18846,18848,18530,18532,0,0,0,0,0,0,0,0,0,0,19103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18693,18530,18532,18849,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8046,8047,8047,8047,8047,8047,8047,8048,0,0,0,0,5254,5413,0,0,
-18523,0,18632,0,18530,18534,18532,18634,0,0,0,0,0,0,0,0,0,0,0,8204,24944,24468,25257,24470,24469,24471,8206,0,0,10962,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,24626,0,24628,24627,24629,8206,0,0,0,0,0,6340,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18946,0,0,0,8204,25107,24950,25110,0,0,0,8206,0,0,10646,0,0,6495,0,0,
+8569,8733,8732,8738,8738,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8423,8734,8736,8418,8420,0,0,0,0,0,0,0,0,0,0,8991,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8581,8418,8420,8737,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8046,8047,8047,8047,8047,8047,8047,8048,0,0,0,0,5254,5413,0,0,
+8411,0,8520,0,8418,8422,8420,8522,0,0,0,0,0,0,0,0,0,0,0,8204,14832,14356,15145,14358,14357,14359,8206,0,0,10962,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,14514,0,14516,14515,14517,8206,0,0,0,0,0,6340,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8834,0,0,0,8204,14995,14838,14998,0,0,0,8206,0,0,10646,0,0,6495,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,0,4204,8206,0,0,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,25103,0,0,0,0,24941,8206,0,0,0,0,0,6495,0,0,
-0,0,18792,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,8204,8047,4209,0,0,8047,4209,8049,8047,8048,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,1109,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,1401,1402,0,0,0,0,1109,8363,8363,8363,8363,8364,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,1465,1466,0,0,0,0,4261,0,0,0,0,0,0,0,8206,0,0,0,524,525,8206,0,0,0,6495,0,0,
-0,0,0,0,18524,0,0,22456,1529,1530,0,0,0,0,8206,0,4278,4279,4279,4279,4279,4280,0,0,0,0,716,717,8206,0,1401,1402,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,8206,8047,8047,4199,4200,0,0,4323,8206,0,0,0,0,24787,8206,0,1465,1466,6495,0,0,
-0,0,0,18632,0,0,0,22456,0,0,0,0,0,0,8206,0,12644,4263,4264,1238,8047,4387,8047,24941,0,8047,526,24945,8206,0,1529,1530,6495,0,0,
-0,0,22453,22296,22139,22137,22137,22613,0,0,0,0,0,0,8206,0,0,1107,1235,1235,1235,1108,8206,0,4150,4151,8204,0,0,0,0,0,6495,0,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1171,1236,1236,1236,1172,0,0,0,0,0,0,0,0,0,0,6495,0,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,24944,25110,0,8206,0,0,0,8204,0,0,0,0,0,6495,0,0,
-0,0,22456,0,0,8046,8047,8047,8047,8047,8047,8047,8047,0,8206,0,12486,8047,0,25109,0,8363,8363,8363,8363,8363,8363,8363,8363,8206,0,0,6495,0,0,
-0,18630,22456,0,0,8207,0,0,4212,4213,4275,4212,4213,0,4198,4198,1111,1239,1239,1112,8206,0,0,0,8206,0,0,0,0,8206,0,0,6495,0,0,
-0,0,22456,0,0,8206,0,0,0,0,0,0,0,0,0,0,1303,1496,1496,1304,0,0,0,0,0,0,0,0,0,8206,0,0,6654,0,8559,
-0,0,22456,0,0,8049,0,0,4212,4213,4275,0,0,0,4212,4213,1303,1496,1496,1304,8206,0,0,0,0,0,0,0,0,8206,0,0,0,6495,0,
-0,0,22456,0,0,8362,8363,8363,8363,8363,8363,8363,4342,4342,4342,8363,1303,1496,1496,1304,8206,0,4271,4272,0,4271,4272,0,0,8049,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,0,4154,4154,4154,0,1303,1496,1496,1304,8206,0,0,0,0,0,0,0,0,8362,8049,8048,0,6495,0,
-0,18792,22456,0,0,0,0,0,0,0,8204,0,4154,4154,4154,8204,1175,1240,1240,1176,0,0,4271,4272,0,4271,4272,0,4271,4272,0,8206,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,0,4154,4154,4154,8204,8047,8047,8047,8047,8206,0,0,0,0,0,0,0,0,0,0,8206,0,6495,0,
-0,0,22456,0,0,1401,1402,0,0,0,8204,0,4154,4154,4154,8204,0,0,0,0,0,0,4271,4272,0,4271,4272,0,0,0,8207,8364,0,6495,0,
-0,0,22456,0,0,1465,1466,0,0,0,8204,0,4154,4154,4154,8204,4278,4279,4280,8204,0,0,0,0,0,0,0,0,0,8207,8364,0,0,6495,0,
-0,0,22456,0,0,1529,1530,0,0,0,8204,0,4406,4406,4406,0,0,0,0,8207,8363,8363,8363,8363,8363,8363,8363,8363,8363,8364,0,0,0,6495,0,
-18523,0,22456,0,0,0,0,0,0,0,8204,0,0,4214,4215,4216,4341,0,0,8206,0,0,0,0,1401,1402,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8362,8363,8363,8363,8364,8362,8363,8363,8363,8364,0,0,0,0,1465,1466,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1529,1530,0,0,0,0,0,0,19615,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,11122,0,0,11122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,18629,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7449,0,0,0,0,0,0,0,6181,6181,6181,6181,6181,6181,6181,6181,6656,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,22296,22297,22137,22296,22140,22138,0,0,0,0,0,0,0,0,0,0,22137,22138,22140,22296,22137,22137,22297,22137,22137,22295,22137,22137,22140,22296,22297,22297,22613,
-0,0,0,0,0,0,0,0,0,0,0,0,22612,0,0,0,0,22613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,19100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18792,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18946,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,14991,0,0,0,0,14829,8206,0,0,0,0,0,6495,0,0,
+0,0,8680,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,8204,8047,4209,0,0,8047,4209,8049,8047,8048,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,1109,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,1401,1402,0,0,0,0,1109,8363,8363,8363,8363,8364,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,1465,1466,0,0,0,0,4261,0,0,0,0,0,0,0,8206,0,0,0,524,525,8206,0,0,0,6495,0,0,
+0,0,0,0,8412,0,0,12344,1529,1530,0,0,0,0,8206,0,4278,4279,4279,4279,4279,4280,0,0,0,0,716,717,8206,0,1401,1402,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,8206,8047,8047,4199,4200,0,0,4323,8206,0,0,0,0,14675,8206,0,1465,1466,6495,0,0,
+0,0,0,8520,0,0,0,12344,0,0,0,0,0,0,8206,0,12644,4263,4264,1238,8047,4387,8047,14829,0,8047,526,14833,8206,0,1529,1530,6495,0,0,
+0,0,12341,12184,12027,12025,12025,12501,0,0,0,0,0,0,8206,0,0,1107,1235,1235,1235,1108,8206,0,4150,4151,8204,0,0,0,0,0,6495,0,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1171,1236,1236,1236,1172,0,0,0,0,0,0,0,0,0,0,6495,0,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,14832,14998,0,8206,0,0,0,8204,0,0,0,0,0,6495,0,0,
+0,0,12344,0,0,8046,8047,8047,8047,8047,8047,8047,8047,0,8206,0,12486,8047,0,14997,0,8363,8363,8363,8363,8363,8363,8363,8363,8206,0,0,6495,0,0,
+0,8518,12344,0,0,8207,0,0,4212,4213,4275,4212,4213,0,4198,4198,1111,1239,1239,1112,8206,0,0,0,8206,0,0,0,0,8206,0,0,6495,0,0,
+0,0,12344,0,0,8206,0,0,0,0,0,0,0,0,0,0,1303,1496,1496,1304,0,0,0,0,0,0,0,0,0,8206,0,0,6654,0,8559,
+0,0,12344,0,0,8049,0,0,4212,4213,4275,0,0,0,4212,4213,1303,1496,1496,1304,8206,0,0,0,0,0,0,0,0,8206,0,0,0,6495,0,
+0,0,12344,0,0,8362,8363,8363,8363,8363,8363,8363,4342,4342,4342,8363,1303,1496,1496,1304,8206,0,4271,4272,0,4271,4272,0,0,8049,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,0,4154,4154,4154,0,1303,1496,1496,1304,8206,0,0,0,0,0,0,0,0,8362,8049,8048,0,6495,0,
+0,8680,12344,0,0,0,0,0,0,0,8204,0,4154,4154,4154,8204,1175,1240,1240,1176,0,0,4271,4272,0,4271,4272,0,4271,4272,0,8206,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,0,4154,4154,4154,8204,8047,8047,8047,8047,8206,0,0,0,0,0,0,0,0,0,0,8206,0,6495,0,
+0,0,12344,0,0,1401,1402,0,0,0,8204,0,4154,4154,4154,8204,0,0,0,0,0,0,4271,4272,0,4271,4272,0,0,0,8207,8364,0,6495,0,
+0,0,12344,0,0,1465,1466,0,0,0,8204,0,4154,4154,4154,8204,4278,4279,4280,8204,0,0,0,0,0,0,0,0,0,8207,8364,0,0,6495,0,
+0,0,12344,0,0,1529,1530,0,0,0,8204,0,4406,4406,4406,0,0,0,0,8207,8363,8363,8363,8363,8363,8363,8363,8363,8363,8364,0,0,0,6495,0,
+8411,0,12344,0,0,0,0,0,0,0,8204,0,0,4214,4215,4216,4341,0,0,8206,0,0,0,0,1401,1402,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8362,8363,8363,8363,8364,8362,8363,8363,8363,8364,0,0,0,0,1465,1466,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1529,1530,0,0,0,0,0,0,9503,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,11122,0,0,11122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,8517,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7449,0,0,0,0,0,0,0,6181,6181,6181,6181,6181,6181,6181,6181,6656,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,12184,12185,12025,12184,12028,12026,0,0,0,0,0,0,0,0,0,0,12025,12026,12028,12184,12025,12025,12185,12025,12025,12183,12025,12025,12028,12184,12185,12185,12501,
+0,0,0,0,0,0,0,0,0,0,0,0,12500,0,0,0,0,12501,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,8988,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8680,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8834,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="5" name="Walls" width="35" height="40">
@@ -188,25 +187,25 @@
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22453,22137,22137,0,0,0,0,0,0,0,0,0,0,22137,22137,22613,22612,22137,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19621,0,0,
-0,0,0,0,0,0,0,22453,22295,22296,22137,22137,22137,22137,22137,22137,22613,0,0,0,0,0,0,0,0,4207,0,0,0,0,0,0,19937,0,22453,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,0,0,8047,8047,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8207,0,0,4196,0,0,0,24951,24468,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8207,4194,4333,4334,4203,0,0,0,4260,0,0,0,0,24626,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,4258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,8047,8047,0,0,8047,8206,8047,0,24785,8047,8047,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4341,25108,0,24943,25108,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,4336,25109,4336,25109,4336,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,8047,8206,0,8047,8207,0,0,0,8206,0,0,0,8,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,8047,0,8047,8047,8047,0,8047,8048,136,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8049,25109,0,0,0,0,0,22456,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12341,12025,12025,0,0,0,0,0,0,0,0,0,0,12025,12025,12501,12500,12025,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9509,0,0,
+0,0,0,0,0,0,0,12341,12183,12184,12025,12025,12025,12025,12025,12025,12501,0,0,0,0,0,0,0,0,4207,0,0,0,0,0,0,9825,0,12341,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,0,0,8047,8047,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8207,0,0,4196,0,0,0,14839,14356,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8207,4194,4333,4334,4203,0,0,0,4260,0,0,0,0,14514,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,4258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,8047,8047,0,0,8047,8206,8047,0,14673,8047,8047,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4341,14996,0,14831,14996,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,4336,14997,4336,14997,4336,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,8047,8206,0,8047,8207,0,0,0,8206,0,0,0,8,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,8047,0,8047,8047,8047,0,8047,8048,136,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8049,14997,0,0,0,0,0,12344,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,0,0,0,0,0,0,0,8362,8363,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,8049,4197,0,0,8363,8204,0,0,0,0,0,0,0,0,0,0,0,0,0,3363,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,0,0,0,0,0,0,0,0,0,3427,0,0,0,0,0,
@@ -222,69 +221,69 @@
 0,0,0,0,758,759,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,822,823,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,758,759,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,822,823,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18530,18534,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8418,8422,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <objectgroup id="7" name="Object Layer 1">
-  <object id="1" template="../../../../../common/maps/obj/entry_left.tx" x="256" y="302.75">
+  <object id="1" template="../../../../../../common/maps/obj/entry_left.tx" x="256" y="302.75">
    <properties>
     <property name="teleport" value="../Innistrad/maps/map/main_story/inn_approaches/davriels_mansion_dungeon.tmx.tmx"/>
    </properties>
   </object>
-  <object id="2" template="../../../../../common/maps/obj/entry_left.tx" x="253.75" y="240.25">
+  <object id="2" template="../../../../../../common/maps/obj/entry_left.tx" x="253.75" y="240.25">
    <properties>
     <property name="teleport" value="../Innistrad/maps/map/main_story/inn_approaches/davriels_mansion_2.tmx.tmx"/>
    </properties>
   </object>
-  <object id="4" template="../../../../../common/maps/obj/entry_up.tx" x="214.667" y="640.667" width="54.6667" height="14"/>
-  <object id="5" template="../../../../../common/maps/obj/enemy.tx" x="233" y="490.333">
+  <object id="4" template="../../../../../../common/maps/obj/entry_up.tx" x="214.667" y="640.667" width="54.6667" height="14"/>
+  <object id="5" template="../../../../../../common/maps/obj/enemy.tx" x="233" y="490.333">
    <properties>
     <property name="enemy" value="charmbreaker devil"/>
     <property name="pursueRange" type="int" value="30"/>
     <property name="threatRange" type="int" value="10"/>
    </properties>
   </object>
-  <object id="6" template="../../../../../common/maps/obj/enemy.tx" name="Enemy" x="479.333" y="75" rotation="0">
+  <object id="6" template="../../../../../../common/maps/obj/enemy.tx" name="Enemy" x="479.333" y="75" rotation="0">
    <properties>
     <property name="enemy" value="hobblefiend"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="8,9"/>
    </properties>
   </object>
-  <object id="7" template="../../../../../common/maps/obj/enemy.tx" x="437.667" y="69">
+  <object id="7" template="../../../../../../common/maps/obj/enemy.tx" x="437.667" y="69">
    <properties>
     <property name="enemy" value="pitchburn_devil"/>
     <property name="threatRange" type="int" value="15"/>
     <property name="waypoints" value="10,11,10,12"/>
    </properties>
   </object>
-  <object id="8" template="../../../../../common/maps/obj/waypoint.tx" x="511" y="131.667"/>
-  <object id="9" template="../../../../../common/maps/obj/waypoint.tx" x="464.333" y="80.3333"/>
-  <object id="10" template="../../../../../common/maps/obj/waypoint.tx" x="423.333" y="53.3333"/>
-  <object id="11" template="../../../../../common/maps/obj/waypoint.tx" x="443.667" y="53.3333"/>
-  <object id="12" template="../../../../../common/maps/obj/waypoint.tx" x="421.333" y="113.667"/>
-  <object id="13" template="../../../../../common/maps/obj/enemy.tx" x="303" y="256.25">
+  <object id="8" template="../../../../../../common/maps/obj/waypoint.tx" x="511" y="131.667"/>
+  <object id="9" template="../../../../../../common/maps/obj/waypoint.tx" x="464.333" y="80.3333"/>
+  <object id="10" template="../../../../../../common/maps/obj/waypoint.tx" x="423.333" y="53.3333"/>
+  <object id="11" template="../../../../../../common/maps/obj/waypoint.tx" x="443.667" y="53.3333"/>
+  <object id="12" template="../../../../../../common/maps/obj/waypoint.tx" x="421.333" y="113.667"/>
+  <object id="13" template="../../../../../../common/maps/obj/enemy.tx" x="303" y="256.25">
    <properties>
     <property name="pursueRange" type="int" value="10000"/>
     <property name="threatRange" type="int" value="15"/>
     <property name="waypoints" value="19,14,19,15,17,16,17,18,19,20,21,22,23,24,20"/>
    </properties>
   </object>
-  <object id="14" template="../../../../../common/maps/obj/waypoint.tx" x="257" y="256.25"/>
-  <object id="15" template="../../../../../common/maps/obj/waypoint.tx" x="319.5" y="180"/>
-  <object id="16" template="../../../../../common/maps/obj/waypoint.tx" x="375.75" y="95.75"/>
-  <object id="17" template="../../../../../common/maps/obj/waypoint.tx" x="387.75" y="199.75"/>
-  <object id="18" template="../../../../../common/maps/obj/waypoint.tx" x="384" y="271.25"/>
-  <object id="19" template="../../../../../common/maps/obj/waypoint.tx" x="288.5" y="259.25"/>
-  <object id="20" template="../../../../../common/maps/obj/waypoint.tx" x="289.5" y="336"/>
-  <object id="21" template="../../../../../common/maps/obj/waypoint.tx" x="128" y="336.25"/>
-  <object id="22" template="../../../../../common/maps/obj/waypoint.tx" x="384.25" y="336.5"/>
-  <object id="23" template="../../../../../common/maps/obj/waypoint.tx" x="384" y="414.75"/>
-  <object id="24" template="../../../../../common/maps/obj/waypoint.tx" x="317.5" y="400.75"/>
-  <object id="25" template="../../../../../common/maps/obj/booster.tx" x="119.5" y="336.5">
+  <object id="14" template="../../../../../../common/maps/obj/waypoint.tx" x="257" y="256.25"/>
+  <object id="15" template="../../../../../../common/maps/obj/waypoint.tx" x="319.5" y="180"/>
+  <object id="16" template="../../../../../../common/maps/obj/waypoint.tx" x="375.75" y="95.75"/>
+  <object id="17" template="../../../../../../common/maps/obj/waypoint.tx" x="387.75" y="199.75"/>
+  <object id="18" template="../../../../../../common/maps/obj/waypoint.tx" x="384" y="271.25"/>
+  <object id="19" template="../../../../../../common/maps/obj/waypoint.tx" x="288.5" y="259.25"/>
+  <object id="20" template="../../../../../../common/maps/obj/waypoint.tx" x="289.5" y="336"/>
+  <object id="21" template="../../../../../../common/maps/obj/waypoint.tx" x="128" y="336.25"/>
+  <object id="22" template="../../../../../../common/maps/obj/waypoint.tx" x="384.25" y="336.5"/>
+  <object id="23" template="../../../../../../common/maps/obj/waypoint.tx" x="384" y="414.75"/>
+  <object id="24" template="../../../../../../common/maps/obj/waypoint.tx" x="317.5" y="400.75"/>
+  <object id="25" template="../../../../../../common/maps/obj/booster.tx" x="119.5" y="336.5">
    <properties>
     <property name="reward">[
   {
@@ -309,16 +308,16 @@
 </property>
    </properties>
   </object>
-  <object id="26" template="../../../../../common/maps/obj/gold.tx" x="177.5" y="415.25"/>
-  <object id="27" template="../../../../../common/maps/obj/gold.tx" x="256" y="409.5"/>
-  <object id="28" template="../../../../../common/maps/obj/gold.tx" x="366.5" y="316"/>
-  <object id="29" template="../../../../../common/maps/obj/scroll.tx" x="430.5" y="306.75">
+  <object id="26" template="../../../../../../common/maps/obj/gold.tx" x="177.5" y="415.25"/>
+  <object id="27" template="../../../../../../common/maps/obj/gold.tx" x="256" y="409.5"/>
+  <object id="28" template="../../../../../../common/maps/obj/gold.tx" x="366.5" y="316"/>
+  <object id="29" template="../../../../../../common/maps/obj/scroll.tx" x="430.5" y="306.75">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Curse of Opulence&quot;, &quot;count&quot;: 1 } ]"/>
    </properties>
   </object>
-  <object id="30" template="../../../../../common/maps/obj/gold.tx" x="479.75" y="417.75"/>
-  <object id="31" template="../../../../../common/maps/obj/booster.tx" x="262.75" y="176.5">
+  <object id="30" template="../../../../../../common/maps/obj/gold.tx" x="479.75" y="417.75"/>
+  <object id="31" template="../../../../../../common/maps/obj/booster.tx" x="262.75" y="176.5">
    <properties>
     <property name="reward">[
   {
@@ -343,7 +342,7 @@
 </property>
    </properties>
   </object>
-  <object id="32" template="../../../../../common/maps/obj/treasure.tx" x="398" y="96">
+  <object id="32" template="../../../../../../common/maps/obj/treasure.tx" x="398" y="96">
    <properties>
     <property name="reward">[{
   &quot;type&quot;: &quot;randomCard&quot;,
@@ -364,17 +363,17 @@
 }]</property>
    </properties>
   </object>
-  <object id="33" template="../../../../../common/maps/obj/scroll.tx" x="144.25" y="384.5">
+  <object id="33" template="../../../../../../common/maps/obj/scroll.tx" x="144.25" y="384.5">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Vile Rebirth&quot;, &quot;count&quot;: 2 } ]"/>
    </properties>
   </object>
-  <object id="34" template="../../../../../common/maps/obj/scroll.tx" x="12.5" y="40.25">
+  <object id="34" template="../../../../../../common/maps/obj/scroll.tx" x="12.5" y="40.25">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Reprobation&quot;, &quot;count&quot;: 2 } ]"/>
    </properties>
   </object>
-  <object id="35" template="../../../../../common/maps/obj/gold.tx" x="97" y="101.5">
+  <object id="35" template="../../../../../../common/maps/obj/gold.tx" x="97" y="101.5">
    <properties>
     <property name="reward">[
   {
@@ -385,12 +384,12 @@
 ]</property>
    </properties>
   </object>
-  <object id="36" template="../../../../../common/maps/obj/scroll.tx" x="223.5" y="95.25" width="11.5" height="12.75">
+  <object id="36" template="../../../../../../common/maps/obj/scroll.tx" x="223.5" y="95.25" width="11.5" height="12.75">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Scaretiller&quot;, &quot;count&quot;: 1 } ]"/>
    </properties>
   </object>
-  <object id="38" template="../../../../../common/maps/obj/scroll.tx" x="466.25" y="105.25">
+  <object id="38" template="../../../../../../common/maps/obj/scroll.tx" x="466.25" y="105.25">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Moderation&quot;, &quot;count&quot;: 1 } ]"/>
    </properties>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_2.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_2.tmx
similarity index 64%
rename from forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_2.tmx
rename to forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_2.tmx
index 86056ad0198..c09ea8d0108 100644
--- a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/inn_approaches/davriels_mansion_2.tmx
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_2.tmx
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="35" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="13">
- <tileset firstgid="1" source="../../../tileset/Inn_Dungeon.tsx"/>
- <tileset firstgid="4481" source="../../../tileset/inn_dungeon_floor.tsx"/>
- <tileset firstgid="5106" source="../../../tileset/inn_main.tsx"/>
- <tileset firstgid="15218" source="../../../../../common/maps/tileset/main.tsx"/>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="35" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="13">
+ <tileset firstgid="1" source="../../../../tileset/Inn_Dungeon.tsx"/>
+ <tileset firstgid="4481" source="../../../../tileset/inn_dungeon_floor.tsx"/>
+ <tileset firstgid="5106" source="../../../../tileset/inn_main.tsx"/>
  <layer id="1" name="Ground" width="35" height="40">
   <data encoding="csv">
 7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,7621,
@@ -50,13 +49,13 @@
  </layer>
  <layer id="2" name="Ground Clutter" width="35" height="40">
   <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19937,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19938,19936,19625,19935,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5253,19937,19777,19784,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,7765,7765,7765,7765,7765,7766,0,0,0,19937,19942,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,8988,0,0,18673,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,6181,6181,0,19624,19625,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19935,19777,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,19939,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9825,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9826,9824,9513,9823,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5253,9825,9665,9672,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,7765,7765,7765,7765,7765,7766,0,0,0,9825,9830,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,8988,0,0,8561,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,6181,6181,0,9512,9513,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,9823,9665,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,9827,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8235,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,7764,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
@@ -71,113 +70,113 @@
 0,0,0,8235,7765,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
 0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,0,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,7923,7923,7923,8240,8236,0,0,18688,
-0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,8240,7765,7766,18688,
-0,0,0,8080,8081,8081,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,7923,4154,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,8393,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8082,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8081,8081,8081,8081,8081,8081,8081,8394,0,0,0,18688,
-0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,8393,8081,8081,8081,8081,8081,8397,8081,8081,8398,8081,8081,8081,8082,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18688,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,6180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18844,
+0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,7923,7923,7923,8240,8236,0,0,8576,
+0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,8240,7765,7766,8576,
+0,0,0,8080,8081,8081,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,7923,4154,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,8393,8397,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,4154,4154,4154,4154,4154,4154,7923,7923,7923,7923,7923,7923,7924,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8082,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8081,8081,8081,8081,8081,8081,8081,8081,8394,0,0,0,8576,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398,8394,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,8393,8081,8081,8081,8081,8081,8397,8081,8081,8398,8081,8081,8081,8082,0,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8576,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,6180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8732,
 0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,19621,19623,0,19614,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,19614,0,19621,19626,0,0,19614,0,0,19615,19937,19936,19623,0,18676,18672,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,19621,7922,7923,7923,7924,19615,19621,19931,19784,0,0,0,0,0,0,0,19937,19936,19622,19623,19621,19622,19623
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,0,0,0,0,0,0,0,0,0,0,9509,9511,0,9502,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,7922,7923,7923,7924,9502,0,9509,9514,0,0,9502,0,0,9503,9825,9824,9511,0,8564,8560,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,9509,7922,7923,7923,7924,9503,9509,9819,9672,0,0,0,0,0,0,0,9825,9824,9510,9511,9509,9510,9511
 </data>
  </layer>
  <layer id="3" name="Medium Ground" width="35" height="40">
   <data encoding="csv">
-0,0,0,0,0,18682,18690,18523,18524,18841,18842,18843,18530,18844,18850,18842,18850,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,18846,18845,18535,0,0,0,0,18849,18848,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,18846,18848,18530,18532,0,0,0,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11111,11112,0,0,6803,6803,0,0,
-18530,18844,18848,0,18523,0,0,0,18688,18693,0,18530,18527,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,10623,0,0,0,0,
-18682,18693,18530,18526,18844,18847,18845,18532,18846,18845,18531,18844,18845,18535,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11431,11434,0,0,0,0,0,
-18844,18848,18683,18687,18845,18532,18846,18851,0,18846,18682,18690,18849,18851,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,
-18690,0,18849,18848,18846,18845,18532,0,0,0,0,0,0,0,0,0,0,0,11110,11587,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,22299,0,
-18851,0,0,18530,18532,18846,18848,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11112,0,0,0,0,0,
-18845,18531,18532,18846,18845,18532,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18844,18686,18693,0,18846,18845,18535,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,18846,18682,18529,18532,18691,18693,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18845,18532,18846,18682,18693,18846,18851,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,4217,4218,4219,4220,11269,11269,11270,0,0,0,0,0,
-18528,18685,18530,18844,18848,0,0,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,11269,11269,4281,4282,4283,4284,11269,11269,11270,0,0,0,0,0,
-18681,18848,18846,18848,0,0,18524,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,4345,4346,4347,4348,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,18523,0,0,0,0,0,0,11268,11269,11269,11269,11269,1491,1363,11269,1364,1491,11269,4409,4410,4411,4412,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18690,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
-18693,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,0,0,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,0,0,
-18693,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,7913,18530,
-18690,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4152,4154,1495,1496,1495,1496,1495,4154,4154,11270,0,0,0,0,22456,
-18693,0,0,0,11426,11427,11427,11586,11269,11269,11269,4152,11269,11269,4154,4153,11269,11269,11269,11269,11269,1303,1495,1496,1495,1496,1495,4154,4154,11584,11111,11111,11112,0,22456,
-18693,0,0,0,0,0,0,11268,11269,11269,11269,11269,4154,4154,4154,4153,11269,11269,11269,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,11426,11586,11269,11269,11269,4154,4154,4154,4153,11269,2205,2139,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,4153,11269,11269,11269,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,11269,11269,11269,11269,11269,4152,1175,1240,1240,1240,1240,1240,4154,4154,11269,11269,11269,11270,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11269,11585,11427,11428,0,22456,
-18690,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11427,11427,11427,11427,11427,11427,11427,11427,11428,0,0,0,22456,
-18693,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,11426,11427,11427,11427,11427,11427,11429,11429,11427,11427,11427,11427,11428,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,11432,11432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-18693,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8238,6181,6181,6181,6181,6181,6181,6181,6181,0,0,0,0,0,0,0,0,0,22456,
-18690,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18690,
-18693,0,0,0,0,0,0,0,22297,22139,22296,22295,22298,0,0,0,0,22453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18530,18528,18529,
-18845,18532,0,0,0,0,0,0,18671,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18849,18847,18847,
-18840,18839,18532,0,0,0,18677,0,0,19621,19625,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18684,18684,18690,18523,18672,18524,0,18676,18673,19779,19772,19936,19622,19623,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,8570,8578,8411,8412,8729,8730,8731,8418,8732,8738,8730,8738,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,8734,8733,8423,0,0,0,0,8737,8736,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,8734,8736,8418,8420,0,0,0,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11111,11112,0,0,6803,6803,0,0,
+8418,8732,8736,0,8411,0,0,0,8576,8581,0,8418,8415,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,10623,0,0,0,0,
+8570,8581,8418,8414,8732,8735,8733,8420,8734,8733,8419,8732,8733,8423,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11431,11434,0,0,0,0,0,
+8732,8736,8571,8575,8733,8420,8734,8739,0,8734,8570,8578,8737,8739,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,
+8578,0,8737,8736,8734,8733,8420,0,0,0,0,0,0,0,0,0,0,0,11110,11587,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,12187,0,
+8739,0,0,8418,8420,8734,8736,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11112,0,0,0,0,0,
+8733,8419,8420,8734,8733,8420,0,0,0,0,0,0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8732,8574,8581,0,8734,8733,8423,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,8734,8570,8417,8420,8579,8581,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8733,8420,8734,8570,8581,8734,8739,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,4217,4218,4219,4220,11269,11269,11270,0,0,0,0,0,
+8416,8573,8418,8732,8736,0,0,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,11269,11269,4281,4282,4283,4284,11269,11269,11270,0,0,0,0,0,
+8569,8736,8734,8736,0,0,8412,0,0,0,0,0,11268,11269,1491,1491,1491,1491,1491,1491,1491,1491,11269,4345,4346,4347,4348,11269,11269,11270,0,0,0,0,0,
+8578,0,0,0,0,8411,0,0,0,0,0,0,11268,11269,11269,11269,11269,1491,1363,11269,1364,1491,11269,4409,4410,4411,4412,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8578,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,0,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,
+8581,0,0,0,11110,11111,11111,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,0,0,
+8578,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,0,0,
+8581,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4154,4154,4154,4154,4154,4154,4154,4154,11270,0,0,0,7913,8418,
+8578,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,4152,4154,1495,1496,1495,1496,1495,4154,4154,11270,0,0,0,0,12344,
+8581,0,0,0,11426,11427,11427,11586,11269,11269,11269,4152,11269,11269,4154,4153,11269,11269,11269,11269,11269,1303,1495,1496,1495,1496,1495,4154,4154,11584,11111,11111,11112,0,12344,
+8581,0,0,0,0,0,0,11268,11269,11269,11269,11269,4154,4154,4154,4153,11269,11269,11269,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,12344,
+8581,0,0,0,0,0,0,11426,11586,11269,11269,11269,4154,4154,4154,4153,11269,2205,2139,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,4153,11269,11269,11269,11269,4152,1303,1495,1496,1495,1496,1495,4154,4154,11269,11269,11269,11270,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,11269,11269,11269,11269,11269,4152,1175,1240,1240,1240,1240,1240,4154,4154,11269,11269,11269,11270,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,4154,4154,4154,11269,11269,11269,11269,11269,4152,4154,4154,4154,4154,4154,4154,4154,4154,11269,11585,11427,11428,0,12344,
+8578,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427,11427,11427,11427,11427,11427,11427,11427,11427,11428,0,0,0,12344,
+8581,0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,11426,11427,11427,11427,11427,11427,11429,11429,11427,11427,11427,11427,11428,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,0,0,0,0,0,0,11432,11432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8581,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+8581,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8238,6181,6181,6181,6181,6181,6181,6181,6181,0,0,0,0,0,0,0,0,0,12344,
+8578,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8578,
+8581,0,0,0,0,0,0,0,12185,12027,12184,12183,12186,0,0,0,0,12341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8418,8416,8417,
+8733,8420,0,0,0,0,0,0,8559,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8737,8735,8735,
+8728,8727,8420,0,0,0,8565,0,0,9509,9513,9511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8572,8572,8578,8411,8560,8412,0,8564,8561,9667,9660,9824,9510,9511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="4" name="Medium Clutter" width="35" height="40">
   <data encoding="csv">
-18681,18845,18844,18850,18850,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18535,18846,18848,18530,18532,0,0,0,0,0,0,0,0,0,0,19103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-18693,18530,18532,18849,18851,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5254,5413,0,0,
-18523,0,18632,0,18530,18534,18532,18634,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10962,0,0,0,0,0,
+8569,8733,8732,8738,8738,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8423,8734,8736,8418,8420,0,0,0,0,0,0,0,0,0,0,8991,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+8581,8418,8420,8737,8739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5254,5413,0,0,
+8411,0,8520,0,8418,8422,8420,8522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10962,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6340,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18946,0,0,0,0,0,0,0,0,0,0,0,0,0,10646,0,0,6495,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8834,0,0,0,0,0,0,0,0,0,0,0,0,0,10646,0,0,6495,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,0,
-0,0,18792,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,8047,8047,0,8047,8048,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,8363,8363,8363,8363,8363,8363,8363,8363,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,8206,2168,2169,0,0,2108,0,1363,14995,0,0,0,0,4332,8206,0,0,0,6495,0,0,
-0,0,0,0,18524,0,0,22456,0,0,0,0,0,0,8206,2232,2233,2106,2107,0,0,1300,0,0,0,0,0,14998,8206,0,0,0,6495,0,0,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,8206,8047,8047,8048,0,0,0,1427,0,0,0,0,0,14832,8206,0,0,0,6495,0,0,
-0,0,0,18632,0,0,0,22456,0,0,0,0,0,0,8206,0,12486,8206,8047,1236,8047,8047,1230,1231,1232,0,0,14998,8206,0,0,0,6495,0,0,
-0,0,22453,22296,22139,22137,22137,22613,0,0,0,0,0,0,8206,0,0,1105,1233,1233,1233,1106,0,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1297,1490,1489,1490,1298,0,0,0,0,0,0,8206,0,0,0,6495,0,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1169,1234,1234,1234,1170,905,906,906,906,906,907,8206,0,0,0,6495,0,0,
-0,0,22456,0,0,8046,8047,8047,8047,8047,8047,8047,8047,8047,8206,0,0,8047,0,0,1417,1418,8363,8363,8363,8363,8363,8363,8363,8206,0,0,6495,0,0,
-0,18630,22456,0,0,8207,0,1763,1764,1765,3672,0,0,0,0,0,0,0,0,0,1545,1546,0,0,0,0,0,0,0,8206,0,0,6495,0,0,
-0,0,22456,0,0,8206,0,1827,1828,1829,0,0,0,0,0,0,0,0,0,0,4152,1111,1239,1239,1239,1239,1239,1112,0,8206,0,0,6654,0,8559,
-0,0,22456,0,0,8049,4392,1891,1892,1893,0,0,0,0,0,0,2201,2202,2202,2203,8206,1303,0,0,0,0,0,1304,1923,8206,0,0,0,6495,0,
-0,0,22456,0,0,8362,8363,8363,8363,8363,8363,8363,4342,4342,8363,8363,2265,2138,2140,2267,4152,0,0,0,0,0,0,1304,1987,8206,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,2139,2137,2267,0,0,0,0,0,0,0,1304,4332,8206,0,0,0,6495,0,
-0,18792,22456,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,1045,1046,2267,1356,1357,0,0,0,0,0,1304,0,8206,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,2140,2140,2267,4271,4272,0,0,0,0,0,1304,0,8206,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,4152,0,0,0,4153,2265,2137,2138,2267,4336,4206,0,0,0,0,0,1176,4200,8206,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8204,4152,0,0,0,4153,2329,2330,2330,2331,8206,0,0,0,0,0,4336,0,0,8206,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,8362,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8364,0,0,0,6495,0,
-18523,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19615,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,11122,0,0,11122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
-0,18629,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7449,0,0,0,0,0,0,0,6181,6181,6181,6181,6181,6181,6181,6181,6656,0,
-0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,22296,22297,22137,22296,22140,22138,0,0,0,0,0,0,0,0,0,0,22137,22138,22140,22296,22137,22137,22297,22137,22137,22295,22137,22137,22140,22296,22297,22297,22613,
-0,0,0,0,0,0,0,0,0,0,0,0,22612,0,0,0,0,22613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,19100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18792,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18946,0,0,0,0,0,0,0,0,0,0,0,0,0
+0,0,8680,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,8047,8047,8047,0,8047,8048,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,8363,8363,8363,8363,8363,8363,8363,8363,8206,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,8206,2168,2169,0,0,2108,0,1363,14995,0,0,0,0,4332,8206,0,0,0,6495,0,0,
+0,0,0,0,8412,0,0,12344,0,0,0,0,0,0,8206,2232,2233,2106,2107,0,0,1300,0,0,0,0,0,14998,8206,0,0,0,6495,0,0,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,8206,8047,8047,8048,0,0,0,1427,0,0,0,0,0,14832,8206,0,0,0,6495,0,0,
+0,0,0,8520,0,0,0,12344,0,0,0,0,0,0,8206,0,12486,8206,8047,1236,8047,8047,1230,1231,1232,0,0,14998,8206,0,0,0,6495,0,0,
+0,0,12341,12184,12027,12025,12025,12501,0,0,0,0,0,0,8206,0,0,1105,1233,1233,1233,1106,0,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1297,1490,1489,1490,1298,0,0,0,0,0,0,8206,0,0,0,6495,0,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,1169,1234,1234,1234,1170,905,906,906,906,906,907,8206,0,0,0,6495,0,0,
+0,0,12344,0,0,8046,8047,8047,8047,8047,8047,8047,8047,8047,8206,0,0,8047,0,0,1417,1418,8363,8363,8363,8363,8363,8363,8363,8206,0,0,6495,0,0,
+0,8518,12344,0,0,8207,0,1763,1764,1765,3672,0,0,0,0,0,0,0,0,0,1545,1546,0,0,0,0,0,0,0,8206,0,0,6495,0,0,
+0,0,12344,0,0,8206,0,1827,1828,1829,0,0,0,0,0,0,0,0,0,0,4152,1111,1239,1239,1239,1239,1239,1112,0,8206,0,0,6654,0,8559,
+0,0,12344,0,0,8049,4392,1891,1892,1893,0,0,0,0,0,0,2201,2202,2202,2203,8206,1303,0,0,0,0,0,1304,1923,8206,0,0,0,6495,0,
+0,0,12344,0,0,8362,8363,8363,8363,8363,8363,8363,4342,4342,8363,8363,2265,2138,2140,2267,4152,0,0,0,0,0,0,1304,1987,8206,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,2139,2137,2267,0,0,0,0,0,0,0,1304,4332,8206,0,0,0,6495,0,
+0,8680,12344,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,1045,1046,2267,1356,1357,0,0,0,0,0,1304,0,8206,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,4152,0,0,0,8204,2265,2140,2140,2267,4271,4272,0,0,0,0,0,1304,0,8206,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,4152,0,0,0,4153,2265,2137,2138,2267,4336,4206,0,0,0,0,0,1176,4200,8206,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8204,4152,0,0,0,4153,2329,2330,2330,2331,8206,0,0,0,0,0,4336,0,0,8206,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,8362,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8363,8364,0,0,0,6495,0,
+8411,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9503,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,11122,0,0,11122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6495,0,
+0,8517,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7449,0,0,0,0,0,0,0,6181,6181,6181,6181,6181,6181,6181,6181,6656,0,
+0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,12184,12185,12025,12184,12028,12026,0,0,0,0,0,0,0,0,0,0,12025,12026,12028,12184,12025,12025,12185,12025,12025,12183,12025,12025,12028,12184,12185,12185,12501,
+0,0,0,0,0,0,0,0,0,0,0,0,12500,0,0,0,0,12501,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,8988,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8680,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8834,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <layer id="5" name="Walls" width="35" height="40">
@@ -187,25 +186,25 @@
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22453,22137,22137,0,0,0,0,0,0,0,0,0,0,22137,22137,22613,22612,22137,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19621,0,0,
-0,0,0,0,0,0,0,22453,22295,22296,22137,22137,22137,22137,22137,22137,22613,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19937,0,22453,
-0,0,0,0,0,0,0,22456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1801,1802,1802,1802,1802,1803,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1865,1866,1866,1866,1866,1867,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1929,1930,1930,1930,1930,1931,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,1993,1994,1994,1994,1994,1995,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,8047,0,0,8206,0,0,4332,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,4341,8206,0,0,0,0,0,0,0,0,0,0,0,22456,
-0,0,0,0,0,0,142,143,144,0,0,0,0,0,8047,8047,8047,8206,0,8047,8363,8363,0,0,337,0,0,1547,1420,0,0,0,0,0,22456,
-0,0,0,0,0,0,206,207,208,0,8204,0,0,0,0,8204,0,0,0,0,8206,0,0,4274,4209,4332,0,1545,1546,0,0,0,0,0,22456,
-0,0,0,0,0,1529,1530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22456,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12341,12025,12025,0,0,0,0,0,0,0,0,0,0,12025,12025,12501,12500,12025,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9509,0,0,
+0,0,0,0,0,0,0,12341,12183,12184,12025,12025,12025,12025,12025,12025,12501,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9825,0,12341,
+0,0,0,0,0,0,0,12344,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1801,1802,1802,1802,1802,1803,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1865,1866,1866,1866,1866,1867,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1929,1930,1930,1930,1930,1931,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,1993,1994,1994,1994,1994,1995,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8047,0,8047,0,0,8206,0,0,4332,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8206,0,0,0,4341,8206,0,0,0,0,0,0,0,0,0,0,0,12344,
+0,0,0,0,0,0,142,143,144,0,0,0,0,0,8047,8047,8047,8206,0,8047,8363,8363,0,0,337,0,0,1547,1420,0,0,0,0,0,12344,
+0,0,0,0,0,0,206,207,208,0,8204,0,0,0,0,8204,0,0,0,0,8206,0,0,4274,4209,4332,0,1545,1546,0,0,0,0,0,12344,
+0,0,0,0,0,1529,1530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12344,
 0,0,0,0,0,0,0,0,0,0,8204,0,0,0,0,8204,8363,8363,8363,8363,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,8204,4268,1045,1046,4324,4325,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,4335,0,0,4388,4389,0,0,0,0,8206,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -221,15 +220,15 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18530,18534,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8418,8422,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <objectgroup id="7" name="Object Layer 1">
-  <object id="2" template="../../../obj/entry_right.tx" x="254.333" y="240.333"/>
-  <object id="3" template="../../../obj/gold.tx" x="253.333" y="213">
+  <object id="2" template="../../../../../../common/maps/obj/entry_right.tx" x="254.333" y="240.333"/>
+  <object id="3" template="../../../../../../common/maps/obj/gold.tx" x="253.333" y="213">
    <properties>
     <property name="reward">[
   {
@@ -240,7 +239,7 @@
 ]</property>
    </properties>
   </object>
-  <object id="4" template="../../../obj/gold.tx" x="274.667" y="195.333">
+  <object id="4" template="../../../../../../common/maps/obj/gold.tx" x="274.667" y="195.333">
    <properties>
     <property name="reward">[
   {
@@ -251,7 +250,7 @@
 ]</property>
    </properties>
   </object>
-  <object id="5" template="../../../obj/gold.tx" x="283.667" y="225.333">
+  <object id="5" template="../../../../../../common/maps/obj/gold.tx" x="283.667" y="225.333">
    <properties>
     <property name="reward">[
   {
@@ -262,7 +261,7 @@
 ]</property>
    </properties>
   </object>
-  <object id="6" template="../../../obj/gold.tx" x="298.333" y="208.667">
+  <object id="6" template="../../../../../../common/maps/obj/gold.tx" x="298.333" y="208.667">
    <properties>
     <property name="reward">[
   {
@@ -273,7 +272,7 @@
 ]</property>
    </properties>
   </object>
-  <object id="7" template="../../../obj/treasure.tx" x="328.667" y="183.333">
+  <object id="7" template="../../../../../../common/maps/obj/treasure.tx" x="328.667" y="183.333">
    <properties>
     <property name="reward">[{
   &quot;type&quot;: &quot;randomCard&quot;,
@@ -301,17 +300,17 @@
 }]</property>
    </properties>
   </object>
-  <object id="8" template="../../../obj/scroll.tx" x="418" y="174.333">
+  <object id="8" template="../../../../../../common/maps/obj/scroll.tx" x="418" y="174.333">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Crusader of Odric&quot;, &quot;count&quot;: 2 } ]"/>
    </properties>
   </object>
-  <object id="9" template="../../../obj/scroll.tx" x="108" y="335.667">
+  <object id="9" template="../../../../../../common/maps/obj/scroll.tx" x="108" y="335.667">
    <properties>
     <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Curse of Opulence&quot;, &quot;count&quot;: 1 } ]"/>
    </properties>
   </object>
-  <object id="10" template="../../../obj/enemy.tx" name="enemy" x="392.667" y="377">
+  <object id="10" template="../../../../../../common/maps/obj/enemy.tx" name="enemy" x="392.667" y="377">
    <properties>
     <property name="deckOverride" value=""/>
     <property name="displayNameOverride" value="Davriel Cane"/>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_dungeon.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_dungeon.tmx
new file mode 100644
index 00000000000..9eeb11fe2d4
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/davriels_mansion_dungeon.tmx
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="21" height="23" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="13">
+ <tileset firstgid="1" source="../../../../tileset/Inn_Dungeon.tsx"/>
+ <tileset firstgid="4481" source="../../../../tileset/inn_dungeon_floor.tsx"/>
+ <tileset firstgid="5106" source="../../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="15218" source="../../../../tileset/buildings.tsx"/>
+ <layer id="1" name="Ground" width="21" height="23">
+  <data encoding="csv">
+7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,
+7621,7621,7621,7621,7621,7621,7623,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,7621,
+7466,7466,7466,7466,7466,7466,7780,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7778,7467,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7625,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,7778,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,
+6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364,6364
+</data>
+ </layer>
+ <layer id="2" name="Ground Clutter" width="21" height="23">
+  <data encoding="csv">
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,
+0,0,0,0,0,0,0,7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,0,
+0,0,0,0,0,0,8235,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,0,
+7764,7765,7765,7765,7765,7765,8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7922,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+8239,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7924,0,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,8236,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8240,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,
+7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,7923,8398
+</data>
+ </layer>
+ <layer id="3" name="Medium Ground" width="21" height="23">
+  <data encoding="csv">
+8578,8737,8739,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,
+0,0,0,0,0,0,0,11110,11587,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,0,
+0,0,0,0,0,0,0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11112,0,0,
+0,11110,11111,11111,11111,11111,11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+0,11268,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+11111,11587,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11270,0,0,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11584,11111,11111,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,
+11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11269,11585,11427
+</data>
+ </layer>
+ <layer id="4" name="Medium Clutter" width="21" height="23">
+  <data encoding="csv">
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10482,10483,10480,10483,10480,10483,10483,10484,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10640,3001,10794,0,10640,0,3003,10642,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10640,0,0,0,10802,0,0,10642,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10637,10799,10481,0,10637,10483,10799,10639,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10640,0,10802,0,10802,0,0,10642,10641,10641,
+10641,10641,10482,10483,10483,10483,10484,10641,10641,10641,10641,10640,3002,10640,0,10640,3002,0,10642,10641,10641,
+10641,10641,10640,0,0,0,10798,10799,10799,10799,10483,10638,10799,10797,0,10637,10799,10799,10639,10641,10641,
+10641,10641,10640,0,0,0,0,0,0,0,2428,10794,0,0,0,10802,0,0,10642,10641,10641,
+10641,10641,10640,0,0,0,10478,0,0,0,0,0,0,0,0,10640,0,3001,10642,10641,10641,
+10641,10641,10640,0,0,0,10642,0,0,0,0,10478,0,0,0,10640,0,0,10642,10641,10641,
+10641,10641,10640,0,0,12644,10642,0,0,10482,10483,10796,10483,10483,10483,10796,10799,10799,10800,10641,10641,
+10641,10641,10798,10799,10480,10799,10800,0,10953,10639,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10640,11761,0,0,0,10642,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10640,0,0,0,0,10642,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10640,0,0,0,0,10642,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10640,0,0,0,0,10642,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10640,0,0,0,0,10642,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10798,10799,10799,10799,10799,10800,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,
+10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641,10641
+</data>
+ </layer>
+ <layer id="5" name="Walls" width="21" height="23">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,10641,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+10641,10641,10641,10641,10641,10641,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="7" name="Object Layer 1">
+  <object id="2" template="../../../../../../common/maps/obj/entry_right.tx" x="79.273" y="224.182">
+   <properties>
+    <property name="teleport" value="../Innistrad/maps/map/main_story/inn_approaches/davriels_mansion.tmx.tmx"/>
+   </properties>
+  </object>
+  <object id="3" template="../../../../../../common/maps/obj/manashards.tx" x="159.727" y="173.061"/>
+  <object id="4" template="../../../../../../common/maps/obj/scroll.tx" x="95.375" y="249.875" width="10.25" height="9.625">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Ransack the Lab&quot;, &quot;count&quot;: 2 } ]"/>
+   </properties>
+  </object>
+  <object id="5" template="../../../../../../common/maps/obj/gold.tx" x="128.75" y="301.625">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 80,
+    &quot;addMaxCount&quot;: 50
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="6" template="../../../../../../common/maps/obj/gold.tx" x="194.25" y="91.25">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 10,
+    &quot;addMaxCount&quot;: 60
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="7" template="../../../../../../common/maps/obj/enemy.tx" x="111.875" y="252.5">
+   <properties>
+    <property name="enemy" value="Brerig"/>
+    <property name="threatRange" type="int" value="10"/>
+    <property name="waypoints" value="9,12"/>
+   </properties>
+  </object>
+  <object id="8" template="../../../../../../common/maps/obj/enemy.tx" x="159" y="190.25">
+   <properties>
+    <property name="enemy" value="Hobblefiend"/>
+    <property name="pursueRange" type="int" value="-1"/>
+    <property name="threatRange" type="int" value="15"/>
+    <property name="waypoints" value="9,10,11,10,9,10,"/>
+   </properties>
+  </object>
+  <object id="9" template="../../../../../../common/maps/obj/waypoint.tx" x="121.5" y="181.25"/>
+  <object id="10" template="../../../../../../common/maps/obj/waypoint.tx" x="220.5" y="193.75"/>
+  <object id="11" template="../../../../../../common/maps/obj/waypoint.tx" x="217.5" y="95.5"/>
+  <object id="12" template="../../../../../../common/maps/obj/waypoint.tx" x="113.5" y="266.75"/>
+ </objectgroup>
+ <layer id="6" name="above" width="21" height="23">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,11280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,11280,0,2364,0,11280,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,11603,11280,0,11605,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,11763,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,11606,11607,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,11764,11765,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,11615,11616,11617,11618,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,11773,11774,11775,11776,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/tacenda.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/tacenda.tmx
new file mode 100644
index 00000000000..f64425f257d
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/main_story/approaches/tacenda.tmx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="36" height="24" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="5">
+ <tileset firstgid="1" source="../../../../tileset/inn_main.tsx"/>
+ <layer id="1" name="Ground" width="36" height="24">
+  <data encoding="csv">
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,1259,1259,1259,1259,1259,2515,2516,2516,2517,1259,2357,2678,2518,2673,2674,2514,2678,2676,2359,1259,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2374,2374,
+2374,2374,2358,2358,2359,1259,2357,2513,2362,2360,2514,2358,2678,2516,2518,1259,1259,2515,2516,2360,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2672,2358,2671,2675,2673,2672,2513,2674,2361,2362,2676,2359,1259,2673,2674,2675,1259,1259,1259,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2517,2515,2516,2517,1259,1259,2515,2517,1259,1259,2673,2674,2672,2359,1259,1259,2357,2358,2359,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2677,2677,2374,2374,
+2374,2374,2516,2517,2673,2674,2675,1259,1259,2673,2675,1259,1259,1259,1259,2673,2514,2358,2358,2678,2516,2676,2359,2673,2675,1259,2673,2674,2672,2359,2515,2516,2360,2361,2374,2374,
+2374,2374,2360,2675,1259,2357,2359,1259,2357,2358,2359,2357,2359,2356,1259,1259,2515,2516,2516,2516,2360,2361,2675,2357,2358,2358,2358,2358,2513,2514,2678,2516,2517,1259,2374,2374,
+2374,2374,2675,1259,1259,2673,2672,2358,2678,2516,2676,2671,2675,1259,1259,1259,2515,2360,2361,2362,2518,1259,1259,2515,2516,2516,2516,2516,2676,2513,2361,2361,2672,2677,2374,2374,
+2374,2374,1259,1259,2356,1259,2515,2516,2516,2516,2360,2514,2359,1259,1259,1259,2673,2672,2359,2673,2514,2359,1259,2515,2516,2516,2360,2361,2674,2675,1259,1259,2673,2362,2374,2374,
+2374,2374,1259,1259,1259,2357,2513,2674,2362,2516,2517,2673,2514,2358,2359,1259,2357,2671,2675,1259,2520,2518,1259,2673,2674,2674,2514,2677,2677,2359,1259,1259,1259,2520,2374,2374,
+2374,2374,2359,1259,1259,2673,2675,1259,2673,2674,2672,2359,2515,2516,2676,2677,2513,2675,1259,1259,2520,2676,2677,2359,1259,1259,2515,2516,2516,2676,2359,1259,1259,2673,2374,2374,
+2374,2374,2676,2358,2359,1259,1259,1259,1259,1259,2673,2514,2678,2516,2516,2516,2517,2357,2358,2358,2678,2516,2360,2675,1259,1259,2673,2362,2516,2516,2517,1259,1259,1259,2374,2374,
+2374,2374,2516,2360,2675,1259,1259,2357,2359,1259,1259,2520,2516,2516,2516,2360,2675,2673,2362,2360,2361,2674,2675,1259,1259,1259,1259,2515,2516,2360,2675,1259,1259,2357,2374,2374,
+2374,2374,2516,2517,2357,2677,2677,2671,2675,2357,2359,2673,2674,2362,2360,2514,2677,2359,2673,2672,2359,1259,1259,2357,2358,2677,2359,2515,2516,2517,2357,2677,2677,2671,2374,2374,
+2374,2374,2674,2675,2515,2516,2516,2518,2357,2678,2517,1259,1259,2673,2672,2671,2674,2675,1259,2673,2675,1259,2357,2678,2516,2360,2675,2673,2674,2675,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2515,2516,2516,2518,2515,2360,2675,1259,2356,1259,2673,2514,2358,2359,1259,1259,1259,2357,2671,2361,2361,2675,1259,1259,1259,1259,2515,2516,2516,2518,2374,2374,
+2374,2374,1259,1259,2673,2362,2360,2672,2513,2675,2357,2359,1259,1259,2357,2671,2674,2675,1259,1259,1259,2515,2676,2677,2677,2359,1259,1259,1259,1259,2673,2362,2360,2672,2374,2374,
+2374,2374,2356,1259,1259,2673,2675,2673,2514,2358,2678,2517,1259,1259,2515,2518,1259,1259,2357,2359,1259,2673,2361,2362,2516,2517,1259,1259,2356,1259,1259,2673,2675,2673,2374,2374,
+2374,2374,2358,2358,2359,1259,1259,1259,2673,2362,2516,2517,1259,2357,2678,2676,2359,1259,2673,2675,1259,1259,1259,2520,2516,2517,1259,1259,2358,2358,2359,1259,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2359,1259,1259,2357,2678,2516,2517,1259,2515,2516,2516,2517,1259,1259,1259,2357,2359,1259,2673,2674,2675,1259,1259,2516,2516,2516,2359,1259,1259,2374,2374,
+2374,2374,2516,2516,2516,2672,2358,2359,2515,2516,2516,2517,1259,2673,2674,2674,2675,1259,2357,2358,2678,2517,1259,1259,1259,1259,1259,1259,2516,2516,2516,2672,2358,2359,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,
+2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374,2374
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1236,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1237,1555,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1080,1397,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,1553,1080,1080,1080,1239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,1552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="36" height="24">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,3629,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,4082,0,0,0,0,0,0,0,0,77,0,0,0,0,0,
+0,0,0,3450,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4244,0,0,0,0,70,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4562,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3306,0,0,0,0,0,0,231,0,0,0,199,0,0,0,0,231,0,0,7537,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,41,0,0,0,0,63,0,0,0,4399,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4713,4406,0,4557,0,0,0,0,0,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,4724,4717,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,0,0,216,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4248,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,
+0,0,0,0,0,0,0,3307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,
+0,0,0,0,59,0,0,0,0,0,0,0,0,0,215,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3451,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,7538,0,0,0,0,0,0,0,0,0,0,0,0,0,218,0,0,0,0,0,0,59,0,0,0,0,0,
+0,0,0,59,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,218,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,217,0,0,73,0,0,0,0,0,217,0,0,0,0,0,0,0,0,0,0,0,0,220,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3930,3934,3932,0,0,0,58,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,77,0,0,0,3450,3925,4244,4250,4245,3935,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3925,4240,4085,3933,4244,4251,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="36" height="24">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,4084,4087,4243,3630,3628,3623,3470,3628,3318,0,3316,3623,3312,3627,4724,4719,3627,3628,4718,4722,4090,4083,4092,4244,4251,4399,4714,4561,4724,4719,4402,4558,0,0,
+0,0,4084,4093,0,0,3629,3633,3634,3629,3631,0,3474,3475,3467,3622,4406,4720,4719,3623,4403,4406,4245,4240,4092,4093,0,4720,4724,4719,4406,4720,4560,4558,0,0,
+0,0,4081,4251,0,0,0,0,0,0,4404,4409,3629,3465,3464,4556,4564,0,4557,3464,3631,4564,4241,4242,4247,4251,4404,4406,0,4720,4719,4406,4565,3470,0,0,
+0,0,4093,0,0,4404,4406,0,0,4404,4718,4722,0,3466,4567,4720,4722,0,3629,3628,4718,4722,0,3308,3315,4399,4718,4719,4405,4406,4720,4722,4565,3473,0,0,
+0,0,4251,0,0,4565,4403,4406,4404,4718,4722,0,0,3627,4722,4404,4406,0,0,3624,3631,0,0,4720,4719,4402,3476,4720,4560,4567,0,4404,4714,3312,0,0,
+0,0,3924,3924,0,4720,4721,4719,4714,4564,0,0,0,4559,4404,3627,4719,3314,3315,0,3313,3315,0,0,4715,4560,3476,0,4720,4725,0,4562,4555,4556,0,0,
+0,0,3933,3935,0,0,0,4402,4555,4722,4398,0,4720,4719,4714,3468,3629,3630,3631,3313,3627,3628,3318,0,0,3629,3631,4404,4406,0,0,4720,4719,3311,0,0,
+0,0,4081,4248,0,4404,4714,4558,4564,0,3308,3315,0,4720,4724,3628,3315,0,3313,3623,3312,3627,3631,0,4404,3315,0,4562,4403,4405,4406,0,4720,4560,0,0,
+0,0,3315,0,0,4562,4558,4561,4717,0,3624,3628,0,3313,3315,3629,3631,3313,3627,3633,3633,3628,3315,4404,4714,3312,3315,4720,4721,4560,4403,4405,4406,4565,0,0,
+0,0,3476,0,0,4715,4716,4722,0,0,0,3629,3628,3627,3631,0,3313,3627,3631,0,0,3629,3631,4565,4566,3470,3631,0,0,4720,4556,4561,4722,4565,0,0,
+0,0,3312,3315,0,0,0,3316,3315,0,3308,3315,3629,3628,4406,0,4720,4719,3315,0,3313,3317,3315,4720,3469,4559,4404,4401,0,4404,4718,4725,0,4723,0,0,
+0,0,3467,3468,0,3451,3316,3623,3312,3314,3627,3628,3315,3466,4713,4406,0,4720,4719,3317,3627,3465,3473,0,3629,3628,4714,4559,4404,4402,4567,0,0,4405,0,0,
+0,0,3627,3631,0,0,3629,3633,3465,3472,3473,3629,3631,3474,3475,4564,0,0,4562,4558,3476,3629,3631,0,0,3471,4561,4719,4718,4724,4722,0,4565,3470,0,0,
+0,0,3634,0,3313,3309,3315,0,3629,3625,3631,3313,3317,3311,3470,4722,0,4404,4718,4716,3631,0,0,0,3313,3627,4719,4718,4722,4404,4406,4404,3627,3628,0,0,
+0,0,0,0,3632,3465,3622,3315,0,0,3313,3627,3630,3630,3628,4406,0,4723,4725,0,0,0,0,0,3471,3476,4720,4719,4406,4565,4567,4565,3622,3627,0,0,
+0,0,3315,0,0,3629,3633,3628,3314,3309,3627,3631,0,0,3629,4719,4406,0,0,0,3313,3315,0,0,3632,3634,0,4720,4722,4720,4719,4718,3465,3473,0,0,
+0,0,3476,0,3313,3315,0,3629,3633,3465,3622,3317,3318,0,0,4720,4722,4404,4401,4404,3627,3631,0,3313,3318,0,0,0,0,0,4720,4722,3632,3465,0,0,
+0,0,3312,3317,3627,3631,0,3313,3315,3629,3633,3625,3631,3313,3315,0,4404,4718,4719,4402,3473,0,3313,3311,3476,0,0,0,0,0,0,0,3313,3623,0,0,
+0,0,3469,3470,3628,3315,3313,3627,3628,3317,3315,0,3313,3623,3622,3314,4718,4719,4718,4560,3476,3313,3311,3470,3631,0,0,0,0,0,0,3313,3627,3465,0,0,
+0,0,3627,3628,3623,3312,3627,3628,3627,3465,3622,3309,3627,3465,3467,3467,4403,4718,4719,4718,3628,3627,3469,3312,3315,0,0,0,0,0,3307,3624,3628,3315,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="2" template="../../../../../../common/maps/obj/entry_left.tx" x="32" y="279.5" width="14.25" height="23.5"/>
+  <object id="3" template="../../../../../../common/maps/obj/entry_down.tx" x="172.875" y="41.7955" width="21.5" height="9.54545"/>
+  <object id="4" template="../../../../../../common/maps/obj/dialog.tx" x="173.273" y="49.2727" width="21.2727" height="16"/>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn__gavony_parish.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn__gavony_parish.tmx
new file mode 100644
index 00000000000..b81aaacf408
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn__gavony_parish.tmx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="25" height="19" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="19">
+ <tileset firstgid="1" source="../../../../../common/maps/tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="20225" source="../../../tileset/INN_dungen_crawler_tileset.tsx"/>
+ <tileset firstgid="32513" source="../../../tileset/buildings.tsx"/>
+ <tileset firstgid="34305" source="../../../../../common/maps/tileset/buildings.tsx"/>
+ <layer id="1" name="Ground" width="25" height="19">
+  <data encoding="csv">
+23560,23682,23681,23559,23560,23682,23681,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,23560,23682,23681,23559,23560,23682,23681,23681,
+23559,23682,23687,23683,23559,23694,23559,23560,23681,23559,23682,23687,23683,23559,23694,23559,23560,23559,23682,23687,23683,23559,23694,23559,23560,
+23559,23682,23549,24052,24047,24048,24049,24052,24047,24048,24049,24050,24052,24047,24048,24049,24052,24052,24047,24048,24049,24050,23682,23681,23566,
+23559,23559,23421,23924,23919,23920,23921,23924,23919,23920,23921,23922,23924,23919,23920,23921,23924,23924,23919,23920,23921,23922,23694,23559,23682,
+23559,23682,23549,24052,24047,24048,24049,24050,24047,24048,24049,24050,24047,24048,24049,24050,23920,24052,24047,24048,24049,24050,23688,23681,23681,
+23559,23683,23564,23924,23919,23920,23921,23922,23919,23920,23921,23922,23919,23920,23921,23922,23920,23924,23919,23920,23921,23922,23420,23686,23560,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,23543,23543,23544,23545,23546,23547,23543,23544,23545,23546,23547,23548,23547,23543,23544,23545,23546,23547,23548,23691,23565,23566,
+23559,23549,23683,23553,23554,23555,23554,23555,23553,23554,23555,23422,23415,23416,23565,23554,23555,23553,23554,23555,23553,23554,23555,23693,23694,
+23682,23561,23681,23681,23682,23683,23682,23683,23681,23682,23683,23550,23415,23416,23693,23682,23683,23681,23682,23683,23681,23682,23683,23559,23682,
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23422,23415,23416,23565,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,
+23682,23683,23681,23559,23694,23559,23682,23681,23559,23682,23561,23550,23543,23544,23693,23682,23681,23559,23682,23687,23683,23559,23694,23559,23560
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="25" height="19">
+  <data encoding="csv">
+0,10502,10503,10823,0,0,10822,10503,10503,10823,0,0,0,10822,10504,0,10502,10503,10504,0,0,10504,0,0,0,
+0,10823,0,0,0,0,0,0,0,0,0,0,0,0,10822,10503,10823,0,10822,10503,10823,10822,10504,0,0,
+10823,0,0,0,14390,14392,14390,14390,14392,14390,14390,14392,14390,14392,14390,14390,14392,14390,14390,14392,0,0,10822,10504,0,
+0,0,0,0,0,0,0,0,0,33008,0,0,0,0,33008,0,0,0,0,0,0,0,0,10822,10504,
+0,0,0,0,0,0,11342,11342,0,0,0,11342,11342,0,0,11342,11342,0,0,0,0,0,0,10664,10820,
+0,0,14231,0,11339,11181,11500,11500,11181,11181,11181,11500,11500,11181,11181,11500,11500,11181,11340,0,0,0,0,10662,0,
+10665,0,14231,0,11495,0,0,0,0,0,0,0,0,0,0,0,0,0,11495,0,0,0,14233,10662,0,
+10818,10665,14231,11339,11336,11340,0,14534,0,11337,0,33008,0,0,33008,0,14846,0,11495,14527,0,0,14233,10662,0,
+0,10660,14231,11495,11653,11495,0,11337,0,11494,11181,0,0,0,14682,11181,11336,11181,11338,11182,0,0,14233,10822,10504,
+0,10660,14231,11495,14839,11336,11181,11813,0,11495,0,14523,33008,33008,14523,0,11495,0,14843,0,0,0,14233,10664,10820,
+10502,10823,14231,11494,11182,11494,14846,0,11180,11336,11181,11182,0,0,14681,11181,11336,11181,11338,11182,0,0,17592,10662,0,
+10660,0,14231,11495,0,11494,14845,11337,11180,11652,0,33008,0,0,33008,0,11494,14844,0,0,0,0,10664,10820,0,
+10660,0,14231,11494,11338,11336,11181,11336,11181,11336,11181,11181,11656,11657,11181,11181,11338,11496,11181,11182,0,0,10822,10504,0,
+10818,10665,14231,14843,0,14841,0,14843,0,14845,0,11654,11658,11659,11655,0,0,11653,0,0,0,0,17592,10662,0,
+0,10818,10665,14390,14392,14390,14390,14392,14390,14390,14392,14390,12419,12419,14390,17278,17278,17278,10664,10665,14390,14390,14391,10822,10504,
+0,0,10818,10819,10819,10819,10819,10819,10819,10665,0,0,0,0,0,0,10664,10819,10820,10818,10819,10819,10665,10664,10820,
+0,0,0,0,0,0,0,0,0,10821,0,0,0,0,0,0,10824,0,0,0,0,0,10818,10820,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,13687,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="25" height="19">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,14859,14860,0,0,0,14859,14860,0,14859,14860,0,0,0,14859,14860,0,0,0,0,0,0,
+0,0,0,0,15017,15018,0,0,0,15017,15018,0,15017,15018,0,0,0,15017,15018,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,17278,17278,17278,17278,0,0,0,0,0,0,0,0,0,0,0,
+0,14855,14856,15316,15315,15315,14525,14526,15315,0,0,0,0,0,0,15472,15314,15475,15314,15314,15316,15316,0,0,0,
+0,15013,15014,15316,15315,15315,14683,14684,15315,15315,0,0,0,0,15315,14690,14691,15474,15473,15315,15316,15316,0,0,0,
+0,0,0,15316,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15315,15316,15316,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,14530,14531,0,14847,12623,0,0,0,14527,12623,0,0,0,0,8433,0,14859,14860,0,
+0,0,0,0,14842,0,14688,14689,0,0,0,14845,0,0,0,0,0,0,0,14682,8278,8278,15017,15018,0,
+0,0,0,0,0,0,0,0,0,0,12623,0,0,0,0,12623,0,0,0,8275,8276,8277,0,0,0,
+0,0,0,0,14842,0,0,0,14841,0,0,14681,0,0,0,0,0,0,0,14841,8279,8281,0,0,0,
+0,14859,14860,0,14839,0,0,14843,14842,0,12623,0,0,0,0,12623,0,0,0,14523,8437,8439,0,0,0,
+0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14681,0,8432,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14078,0,0,14080,0,0,14841,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14236,0,0,14238,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14859,14860,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15017,15018,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="25" height="19">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,33573,33574,33575,33576,0,0,0,0,0,0,0,0,0,0,0,
+0,0,17435,17278,17278,17278,17278,17278,17278,17278,33601,33602,33603,33604,17278,17278,17278,17278,17278,17278,17278,17278,17437,0,0,
+0,0,17592,0,0,0,0,0,0,0,33629,33630,33631,33632,0,14532,14533,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,33657,33658,33659,33660,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,14390,0,14390,14390,14392,14390,14390,14390,14390,14392,14390,14390,14390,14390,14392,0,14390,14392,14390,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8434,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,32937,32938,0,0,0,0,0,0,0,0,0,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,32965,32966,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,14079,14079,0,0,0,0,0,0,0,3729,0,0,0,
+0,0,17751,17278,17278,17278,17278,17278,17278,17278,17278,17279,14237,14237,17277,0,0,0,17278,17278,17278,17278,17753,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6340,0,0,4747,4748,0,0,0,0,0,
+0,0,0,0,0,0,4743,4744,0,0,0,0,0,0,0,0,0,0,4905,4906,0,0,0,0,0,
+0,0,0,0,0,0,4901,4902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3575,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="6" template="../../../../../common/maps/obj/quest.tx" x="175.625" y="82.8333" width="33.625" height="16"/>
+  <object id="8" template="../../../../../common/maps/obj/entry_up.tx" x="180.727" y="304.409" width="60.1818" height="34"/>
+  <object id="9" template="../../../../../common/maps/obj/shop.tx" x="302" y="207" width="17.3333" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="10" template="../../../../../common/maps/obj/shop.tx" x="301.334" y="143" width="18.3333" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="11" template="../../../../../common/maps/obj/shop.tx" x="225" y="144.667" width="18.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="12" template="../../../../../common/maps/obj/RotatingShop.tx" x="175" y="176.667" width="17.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="13" template="../../../../../common/maps/obj/inn.tx" x="239.334" y="83.3337" width="33" height="19.3333"/>
+  <object id="14" template="../../../../../common/maps/obj/shardtrader.tx" x="95.6667" y="144.333" width="33" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="16" template="../../../../../common/maps/obj/spellsmith.tx" x="94.6667" y="81.6667" width="34" height="17.6667">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="18" template="../../../../../common/maps/obj/RotatingShop.tx" x="226.333" y="177" width="18.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_abbey.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_abbey.tmx
new file mode 100644
index 00000000000..271e06815be
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_abbey.tmx
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="25" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="9">
+ <tileset firstgid="1" source="../../../../../common/maps/tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="20225" source="../../../tileset/INN_dungen_crawler_tileset.tsx"/>
+ <tileset firstgid="32513" source="../../../tileset/buildings.tsx"/>
+ <layer id="1" name="Ground" width="25" height="17">
+  <data encoding="csv">
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23566,
+23682,23561,23681,23559,23694,23559,23682,23681,23559,23682,23559,23681,23559,23694,23559,23682,23681,23559,23682,23560,23681,23559,23694,23559,23682,
+23559,23560,23682,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23564,23688,23681,23681,
+23682,23683,23564,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23420,23686,23560,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,23543,23543,23544,23545,23546,23547,23543,23544,23545,23546,23547,23548,23547,23543,23544,23545,23546,23547,23548,23691,23565,23566,
+23559,23549,23683,23553,23554,23555,23554,23555,23553,23554,23555,23422,23415,23416,23565,23554,23555,23553,23554,23555,23553,23554,23555,23693,23694,
+23682,23561,23681,23681,23682,23683,23682,23683,23681,23682,23683,23550,23415,23416,23693,23682,23683,23681,23682,23683,23681,23682,23683,23559,23682,
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23422,23415,23416,23565,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,
+23682,23683,23681,23559,23694,23559,23682,23681,23559,23682,23561,23550,23543,23544,23693,23682,23681,23559,23682,23687,23683,23559,23694,23559,23560
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="25" height="17">
+  <data encoding="csv">
+0,10502,10503,10503,10504,0,0,10502,10823,0,10822,10503,10503,10504,0,0,0,0,0,0,0,0,0,0,0,
+10502,10823,0,0,10822,10503,10503,10823,0,0,0,0,0,10822,10504,0,0,0,10502,10503,10504,0,0,0,0,
+10823,0,0,0,0,0,0,0,0,0,0,0,0,0,10822,10503,10503,10503,10823,0,10822,10503,10504,0,0,
+0,0,14231,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,10822,10504,0,
+10665,0,14231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,10662,0,
+10818,10665,14231,11339,11181,11340,0,14534,0,11337,0,0,0,0,0,0,11337,0,0,0,0,0,14233,10662,0,
+0,10660,14231,11495,0,11495,0,14692,0,11495,0,0,0,0,0,0,11494,11181,11181,11182,0,0,14233,10822,10504,
+0,10660,14231,11495,0,11494,11181,11181,11181,11652,0,0,0,0,0,0,11495,0,0,0,0,0,14233,10664,10820,
+10502,10823,14231,11495,0,11495,0,0,0,11495,0,33008,32655,32656,33008,0,11494,11181,11181,11182,0,0,14233,10662,0,
+10660,0,14231,11495,0,11495,0,0,0,11495,0,0,32683,32684,0,0,11495,0,0,0,0,0,10664,10820,0,
+10660,0,14231,11497,11181,11338,11181,11181,11181,11338,11181,11181,11656,11657,11181,11181,11338,11181,11181,11182,0,0,10822,10504,0,
+10818,10665,14231,0,0,0,0,0,0,0,0,11654,11658,11659,11655,0,0,0,0,0,0,0,14233,10662,0,
+0,10818,10665,14390,14392,14390,14390,14392,14390,14390,14392,14390,12419,12419,14390,14392,14390,14390,10664,10665,14390,14390,14391,10822,10504,
+0,0,10818,10819,10819,10819,10819,10819,10819,10665,0,0,0,0,0,0,10664,10819,10820,10818,10819,10819,10665,10664,10820,
+0,0,0,0,0,0,0,0,0,10821,0,0,0,0,0,0,10824,0,0,0,0,0,10818,10820,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,13687,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="25" height="17">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,14855,14856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,14855,14856,0,14859,14860,0,0,15013,15014,0,14859,14860,0,0,0,0,0,0,0,0,0,0,0,0,
+0,15013,15014,0,15017,15018,0,0,0,0,0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,15314,15473,15472,0,0,0,0,0,0,0,0,0,0,14527,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,14525,14526,0,0,12623,0,0,0,0,12623,14685,0,0,14524,0,0,14859,14860,0,
+0,0,0,0,15315,0,14683,14684,33008,0,0,0,0,0,0,0,0,0,0,14682,0,0,15017,15018,0,
+0,0,0,0,15315,0,0,0,0,0,12623,0,0,0,0,12623,0,0,0,14523,0,0,0,0,0,
+0,0,0,0,15315,0,15316,15316,15316,0,0,0,0,0,0,0,0,0,0,14681,0,0,0,0,0,
+0,14859,14860,0,15315,0,15316,15316,15316,0,12623,0,0,0,0,12623,0,0,0,14527,0,0,0,0,0,
+0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14685,0,0,0,0,0,
+0,0,0,15475,15474,15314,0,0,0,0,0,14078,0,0,14080,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14236,0,0,14238,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="25" height="17">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,0,8278,8437,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32937,32938,0,0,0,0,0,0,8280,8434,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32965,32966,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,14079,14079,0,0,0,0,0,0,0,3729,0,0,0,
+0,0,14389,0,0,0,0,0,0,0,0,0,14237,14237,0,0,0,0,14392,14390,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6340,0,0,4747,4748,0,0,0,0,0,
+0,0,0,0,0,0,4743,4744,0,0,0,0,0,0,0,0,0,0,4905,4906,0,0,0,0,0,
+0,0,0,0,0,0,4901,4902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3575,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="1" template="../../../../../common/maps/obj/shop.tx" x="255.364" y="95.6061" width="17.3636" height="16.2727">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="2" template="../../../../../common/maps/obj/shop.tx" x="303.182" y="111.091" width="17.1818" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="3" template="../../../../../common/maps/obj/shop.tx" x="303.091" y="143.818" width="16.7273" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="4" template="../../../../../common/maps/obj/shop.tx" x="302.091" y="173.818" width="17.7273" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="6" template="../../../../../common/maps/obj/quest.tx" x="198.625" y="162.5" width="18.625" height="16"/>
+  <object id="7" template="../../../../../common/maps/obj/shardtrader.tx" x="97.5" y="114" width="27.25" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="8" template="../../../../../common/maps/obj/entry_up.tx" x="180.727" y="272.409" width="60.1818" height="34"/>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_chapelry.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_chapelry.tmx
new file mode 100644
index 00000000000..54318d93e38
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_chapelry.tmx
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="25" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="15">
+ <tileset firstgid="1" source="../../../../../common/maps/tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="20225" source="../../../tileset/INN_dungen_crawler_tileset.tsx"/>
+ <tileset firstgid="32513" source="../../../tileset/buildings.tsx"/>
+ <layer id="1" name="Ground" width="25" height="17">
+  <data encoding="csv">
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23681,23566,
+23682,23561,23681,23559,23694,23559,23682,23681,23559,23682,23559,23681,23559,23694,23559,23682,23681,23559,23682,23560,23681,23559,23694,23559,23682,
+23559,23560,23682,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23687,23688,23689,23564,23688,23681,23681,
+23682,23683,23564,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23420,23686,23560,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,23543,23543,23544,23545,23546,23547,23543,23544,23545,23546,23547,23548,23547,23543,23544,23545,23546,23547,23548,23691,23565,23566,
+23559,23549,23683,23553,23554,23555,23554,23555,23553,23554,23555,23422,23415,23416,23565,23554,23555,23553,23554,23555,23553,23554,23555,23693,23694,
+23682,23561,23681,23681,23682,23683,23682,23683,23681,23682,23683,23550,23415,23416,23693,23682,23683,23681,23682,23683,23681,23682,23683,23559,23682,
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23422,23415,23416,23565,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,
+23682,23683,23681,23559,23694,23559,23682,23681,23559,23682,23561,23550,23543,23544,23693,23682,23681,23559,23682,23687,23683,23559,23694,23559,23560
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="25" height="17">
+  <data encoding="csv">
+0,10502,10503,10503,10504,0,0,10502,10823,0,10822,10503,10503,10504,0,0,0,0,0,0,0,0,0,0,0,
+10502,10823,0,0,10822,10503,10503,10823,0,0,0,0,0,10822,10504,0,0,0,10502,10503,10504,0,0,0,0,
+10823,0,0,0,0,0,0,0,0,0,0,0,0,0,10822,10503,10503,10503,10823,0,10822,10503,10504,0,0,
+0,0,14231,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,14392,14390,14390,10822,10504,0,
+10665,0,14231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,10662,0,
+10818,10665,14231,11339,11496,11340,0,14534,0,11337,0,0,0,0,14524,0,14846,14843,0,14527,0,0,14233,10662,0,
+0,10660,14231,11495,11653,11495,0,11337,0,11494,11181,0,0,0,14682,11181,11336,11338,11181,11182,0,0,14233,10822,10504,
+0,10660,14231,11495,0,11494,11181,11813,0,11495,0,14523,0,0,0,0,11495,0,14843,0,0,0,14233,10664,10820,
+10502,10823,14231,11495,0,11495,0,0,0,11494,11181,11182,32655,32656,11180,11181,11336,11181,11338,11182,0,0,14233,10662,0,
+10660,0,14231,11495,0,11495,0,0,0,11652,0,0,32683,32684,0,0,11495,0,0,0,0,0,10664,10820,0,
+10660,0,14231,11497,11338,11338,11181,11181,11181,11338,11181,11181,11656,11657,11181,11181,11338,11496,11181,11182,0,0,10822,10504,0,
+10818,10665,14231,0,0,0,0,0,0,0,0,11654,11658,11659,11655,0,0,11653,0,0,0,0,14233,10662,0,
+0,10818,10665,14390,14392,14390,14390,14392,14390,14390,14392,14390,12419,12419,14390,14392,14390,14390,10664,10665,14390,14390,14391,10822,10504,
+0,0,10818,10819,10819,10819,10819,10819,10819,10665,0,0,0,0,0,0,10664,10819,10820,10818,10819,10819,10665,10664,10820,
+0,0,0,0,0,0,0,0,0,10821,0,0,0,0,0,0,10824,0,0,0,0,0,10818,10820,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,13687,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="25" height="17">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,14855,14856,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,14855,14856,0,14859,14860,0,0,15013,15014,0,14859,14860,0,0,0,0,0,0,0,0,0,0,0,0,
+0,15013,15014,0,15017,15018,0,0,0,0,0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,15314,15473,15472,15315,15314,15472,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,14530,14531,0,14847,12623,0,0,0,0,12623,0,0,0,0,0,0,14859,14860,0,
+0,0,0,0,14842,0,14688,14689,0,0,0,14845,0,0,0,0,0,0,0,14682,0,0,15017,15018,0,
+0,0,0,0,0,0,0,0,0,0,12623,0,0,0,0,12623,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,14528,14529,0,0,14681,0,0,14840,0,0,0,0,14841,0,0,0,0,0,
+0,14859,14860,0,14839,0,0,14686,14687,0,12623,0,0,0,0,12623,0,0,0,14523,0,0,0,0,0,
+0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14681,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14078,0,0,14080,0,0,14841,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14236,0,0,14238,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="25" height="17">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8278,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32937,32938,0,0,0,0,0,0,0,8434,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,32965,32966,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,14233,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,14079,14079,0,0,0,0,0,0,0,3729,0,0,0,
+0,0,14389,0,0,0,0,0,0,0,0,0,14237,14237,0,0,0,0,14392,14390,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6340,0,0,4747,4748,0,0,0,0,0,
+0,0,0,0,0,0,4743,4744,0,0,0,0,0,0,0,0,0,0,4905,4906,0,0,0,0,0,
+0,0,0,0,0,0,4901,4902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3575,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="6" template="../../../../../common/maps/obj/quest.tx" x="198.625" y="162.5" width="18.625" height="16"/>
+  <object id="8" template="../../../../../common/maps/obj/entry_up.tx" x="180.727" y="272.409" width="60.1818" height="34"/>
+  <object id="9" template="../../../../../common/maps/obj/shop.tx" x="303.333" y="175">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="10" template="../../../../../common/maps/obj/shop.tx" x="303.667" y="111">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="11" template="../../../../../common/maps/obj/shop.tx" x="225" y="112.667">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="12" template="../../../../../common/maps/obj/RotatingShop.tx" x="176.667" y="144.667">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="13" template="../../../../../common/maps/obj/inn.tx" x="111.667" y="160.667" width="33" height="16"/>
+  <object id="14" template="../../../../../common/maps/obj/shardtrader.tx" x="95.6667" y="112.333" width="33" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_parish.tmx b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_parish.tmx
new file mode 100644
index 00000000000..b81aaacf408
--- /dev/null
+++ b/forge-gui/res/adventure/Innistrad/maps/map/Innistrad/towns/inn_gavony_parish.tmx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="25" height="19" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="19">
+ <tileset firstgid="1" source="../../../../../common/maps/tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../../../tileset/inn_main.tsx"/>
+ <tileset firstgid="20225" source="../../../tileset/INN_dungen_crawler_tileset.tsx"/>
+ <tileset firstgid="32513" source="../../../tileset/buildings.tsx"/>
+ <tileset firstgid="34305" source="../../../../../common/maps/tileset/buildings.tsx"/>
+ <layer id="1" name="Ground" width="25" height="19">
+  <data encoding="csv">
+23560,23682,23681,23559,23560,23682,23681,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,23560,23682,23681,23559,23560,23682,23681,23681,
+23559,23682,23687,23683,23559,23694,23559,23560,23681,23559,23682,23687,23683,23559,23694,23559,23560,23559,23682,23687,23683,23559,23694,23559,23560,
+23559,23682,23549,24052,24047,24048,24049,24052,24047,24048,24049,24050,24052,24047,24048,24049,24052,24052,24047,24048,24049,24050,23682,23681,23566,
+23559,23559,23421,23924,23919,23920,23921,23924,23919,23920,23921,23922,23924,23919,23920,23921,23924,23924,23919,23920,23921,23922,23694,23559,23682,
+23559,23682,23549,24052,24047,24048,24049,24050,24047,24048,24049,24050,24047,24048,24049,24050,23920,24052,24047,24048,24049,24050,23688,23681,23681,
+23559,23683,23564,23924,23919,23920,23921,23922,23919,23920,23921,23922,23919,23920,23921,23922,23920,23924,23919,23920,23921,23922,23420,23686,23560,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,24048,24049,24050,24051,24052,24047,23420,23565,23566,
+23682,23549,23550,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23920,23921,23922,23923,23924,23919,23548,23693,23694,
+23559,23421,23422,23543,23543,23544,23545,23546,23547,23543,23544,23545,23546,23547,23548,23547,23543,23544,23545,23546,23547,23548,23691,23565,23566,
+23559,23549,23683,23553,23554,23555,23554,23555,23553,23554,23555,23422,23415,23416,23565,23554,23555,23553,23554,23555,23553,23554,23555,23693,23694,
+23682,23561,23681,23681,23682,23683,23682,23683,23681,23682,23683,23550,23415,23416,23693,23682,23683,23681,23682,23683,23681,23682,23683,23559,23682,
+23559,23560,23682,23681,23559,23560,23682,23681,23559,23560,23682,23422,23415,23416,23565,23681,23559,23560,23682,23681,23559,23560,23682,23681,23681,
+23682,23683,23681,23559,23694,23559,23682,23681,23559,23682,23561,23550,23543,23544,23693,23682,23681,23559,23682,23687,23683,23559,23694,23559,23560
+</data>
+ </layer>
+ <layer id="2" name="Ground 2" width="25" height="19">
+  <data encoding="csv">
+0,10502,10503,10823,0,0,10822,10503,10503,10823,0,0,0,10822,10504,0,10502,10503,10504,0,0,10504,0,0,0,
+0,10823,0,0,0,0,0,0,0,0,0,0,0,0,10822,10503,10823,0,10822,10503,10823,10822,10504,0,0,
+10823,0,0,0,14390,14392,14390,14390,14392,14390,14390,14392,14390,14392,14390,14390,14392,14390,14390,14392,0,0,10822,10504,0,
+0,0,0,0,0,0,0,0,0,33008,0,0,0,0,33008,0,0,0,0,0,0,0,0,10822,10504,
+0,0,0,0,0,0,11342,11342,0,0,0,11342,11342,0,0,11342,11342,0,0,0,0,0,0,10664,10820,
+0,0,14231,0,11339,11181,11500,11500,11181,11181,11181,11500,11500,11181,11181,11500,11500,11181,11340,0,0,0,0,10662,0,
+10665,0,14231,0,11495,0,0,0,0,0,0,0,0,0,0,0,0,0,11495,0,0,0,14233,10662,0,
+10818,10665,14231,11339,11336,11340,0,14534,0,11337,0,33008,0,0,33008,0,14846,0,11495,14527,0,0,14233,10662,0,
+0,10660,14231,11495,11653,11495,0,11337,0,11494,11181,0,0,0,14682,11181,11336,11181,11338,11182,0,0,14233,10822,10504,
+0,10660,14231,11495,14839,11336,11181,11813,0,11495,0,14523,33008,33008,14523,0,11495,0,14843,0,0,0,14233,10664,10820,
+10502,10823,14231,11494,11182,11494,14846,0,11180,11336,11181,11182,0,0,14681,11181,11336,11181,11338,11182,0,0,17592,10662,0,
+10660,0,14231,11495,0,11494,14845,11337,11180,11652,0,33008,0,0,33008,0,11494,14844,0,0,0,0,10664,10820,0,
+10660,0,14231,11494,11338,11336,11181,11336,11181,11336,11181,11181,11656,11657,11181,11181,11338,11496,11181,11182,0,0,10822,10504,0,
+10818,10665,14231,14843,0,14841,0,14843,0,14845,0,11654,11658,11659,11655,0,0,11653,0,0,0,0,17592,10662,0,
+0,10818,10665,14390,14392,14390,14390,14392,14390,14390,14392,14390,12419,12419,14390,17278,17278,17278,10664,10665,14390,14390,14391,10822,10504,
+0,0,10818,10819,10819,10819,10819,10819,10819,10665,0,0,0,0,0,0,10664,10819,10820,10818,10819,10819,10665,10664,10820,
+0,0,0,0,0,0,0,0,0,10821,0,0,0,0,0,0,10824,0,0,0,0,0,10818,10820,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,13687,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="3" name="Clutter" width="25" height="19">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="csv">
+0,0,0,0,14859,14860,0,0,0,14859,14860,0,14859,14860,0,0,0,14859,14860,0,0,0,0,0,0,
+0,0,0,0,15017,15018,0,0,0,15017,15018,0,15017,15018,0,0,0,15017,15018,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,17278,17278,17278,17278,0,0,0,0,0,0,0,0,0,0,0,
+0,14855,14856,15316,15315,15315,14525,14526,15315,0,0,0,0,0,0,15472,15314,15475,15314,15314,15316,15316,0,0,0,
+0,15013,15014,15316,15315,15315,14683,14684,15315,15315,0,0,0,0,15315,14690,14691,15474,15473,15315,15316,15316,0,0,0,
+0,0,0,15316,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15315,15316,15316,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,14530,14531,0,14847,12623,0,0,0,14527,12623,0,0,0,0,8433,0,14859,14860,0,
+0,0,0,0,14842,0,14688,14689,0,0,0,14845,0,0,0,0,0,0,0,14682,8278,8278,15017,15018,0,
+0,0,0,0,0,0,0,0,0,0,12623,0,0,0,0,12623,0,0,0,8275,8276,8277,0,0,0,
+0,0,0,0,14842,0,0,0,14841,0,0,14681,0,0,0,0,0,0,0,14841,8279,8281,0,0,0,
+0,14859,14860,0,14839,0,0,14843,14842,0,12623,0,0,0,0,12623,0,0,0,14523,8437,8439,0,0,0,
+0,15017,15018,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14681,0,8432,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14078,0,0,14080,0,0,14841,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,14236,0,0,14238,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14859,14860,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15017,15018,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer id="4" name="Walls" width="25" height="19">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,33573,33574,33575,33576,0,0,0,0,0,0,0,0,0,0,0,
+0,0,17435,17278,17278,17278,17278,17278,17278,17278,33601,33602,33603,33604,17278,17278,17278,17278,17278,17278,17278,17278,17437,0,0,
+0,0,17592,0,0,0,0,0,0,0,33629,33630,33631,33632,0,14532,14533,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,33657,33658,33659,33660,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,14390,0,14390,14390,14392,14390,14390,14390,14390,14392,14390,14390,14390,14390,14392,0,14390,14392,14390,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8434,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,32937,32938,0,0,0,0,0,0,0,0,0,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,32965,32966,0,0,0,0,0,0,0,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8913,0,17592,0,0,
+0,0,17592,0,0,0,0,0,0,0,0,0,14079,14079,0,0,0,0,0,0,0,3729,0,0,0,
+0,0,17751,17278,17278,17278,17278,17278,17278,17278,17278,17279,14237,14237,17277,0,0,0,17278,17278,17278,17278,17753,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6340,0,0,4747,4748,0,0,0,0,0,
+0,0,0,0,0,0,4743,4744,0,0,0,0,0,0,0,0,0,0,4905,4906,0,0,0,0,0,
+0,0,0,0,0,0,4901,4902,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,3575,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup id="5" name="Object Layer 1">
+  <object id="6" template="../../../../../common/maps/obj/quest.tx" x="175.625" y="82.8333" width="33.625" height="16"/>
+  <object id="8" template="../../../../../common/maps/obj/entry_up.tx" x="180.727" y="304.409" width="60.1818" height="34"/>
+  <object id="9" template="../../../../../common/maps/obj/shop.tx" x="302" y="207" width="17.3333" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="10" template="../../../../../common/maps/obj/shop.tx" x="301.334" y="143" width="18.3333" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="11" template="../../../../../common/maps/obj/shop.tx" x="225" y="144.667" width="18.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="12" template="../../../../../common/maps/obj/RotatingShop.tx" x="175" y="176.667" width="17.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="13" template="../../../../../common/maps/obj/inn.tx" x="239.334" y="83.3337" width="33" height="19.3333"/>
+  <object id="14" template="../../../../../common/maps/obj/shardtrader.tx" x="95.6667" y="144.333" width="33" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="16" template="../../../../../common/maps/obj/spellsmith.tx" x="94.6667" y="81.6667" width="34" height="17.6667">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+  <object id="18" template="../../../../../common/maps/obj/RotatingShop.tx" x="226.333" y="177" width="18.6667" height="16">
+   <properties>
+    <property name="signXOffset" type="float" value="4"/>
+    <property name="signYOffset" type="float" value="-4"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png
index 19ec78526d5..fd7bcffc7ca 100644
Binary files a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png and b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.png differ
diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf
index 5c98cb8920b..7037253166a 100644
Binary files a/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf and b/forge-gui/res/adventure/Innistrad/maps/tileset/buildings.xcf differ
diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas
index a08b774f09f..5fdcf47cae9 100644
--- a/forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas
+++ b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_buildings.atlas
@@ -632,4 +632,13 @@ crescentus
   size: 32, 32
 lodge_1
   xy: 272, 528
-  size: 16, 16
\ No newline at end of file
+  size: 16, 16
+dark_forest
+  xy: 416, 496
+  size: 32, 32
+abbey
+    xy: 32, 80
+    size: 32, 32
+parish
+  xy: 352, 368
+  size: 32, 32
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx
index 3183138d35a..dc896ca900d 100644
--- a/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx
+++ b/forge-gui/res/adventure/Innistrad/maps/tileset/inn_main.tsx
@@ -54,6 +54,31 @@
    <object id="1" x="0" y="12" width="12" height="4"/>
   </objectgroup>
  </tile>
+ <tile id="389">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="12" width="5" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="390">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="16" height="3"/>
+  </objectgroup>
+ </tile>
+ <tile id="391">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="6" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="393">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="12" width="13" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="394">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="12" height="4"/>
+  </objectgroup>
+ </tile>
  <tile id="467">
   <objectgroup draworder="index" id="2">
    <object id="1" x="11" y="12" width="5" height="4"/>
@@ -121,6 +146,40 @@
    <object id="1" x="0" y="4" width="6.08696" height="12"/>
   </objectgroup>
  </tile>
+ <tile id="547">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="10" y="0" width="5" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="549">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="6" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="550">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="10" y="3" width="6" height="13"/>
+  </objectgroup>
+ </tile>
+ <tile id="551">
+  <objectgroup draworder="index" id="2">
+   <object id="4" x="7.95652" y="1.3043" width="8.13043" height="9.6087"/>
+   <object id="5" x="3.1739" y="6.04344" width="4.78261" height="8.04348"/>
+   <object id="6" x="0.956524" y="10.9131" width="2.13043" height="5.08696"/>
+  </objectgroup>
+ </tile>
+ <tile id="552">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="-0.0434783" y="1.21739" width="8.13043" height="9.6087"/>
+   <object id="2" x="8.08696" y="5.95652" width="4.78261" height="8.04348"/>
+   <object id="3" x="11.3913" y="12.087" width="3.69565" height="3.82609"/>
+  </objectgroup>
+ </tile>
+ <tile id="553">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="4" width="7" height="12"/>
+  </objectgroup>
+ </tile>
  <tile id="625">
   <objectgroup draworder="index" id="2">
    <object id="1" x="10" y="0" width="5" height="16"/>
@@ -208,6 +267,46 @@
    <object id="1" x="0" y="0" width="6.08696" height="13"/>
   </objectgroup>
  </tile>
+ <tile id="705">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="10" y="0" width="6" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="706">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="1" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="707">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="7" height="10"/>
+   <object id="2" x="0" y="0" width="7" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="708">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="10" y="0" width="6" height="12"/>
+  </objectgroup>
+ </tile>
+ <tile id="709">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1.08696" y="-0.130435" width="3.78261" height="5.78261"/>
+   <object id="2" x="5.08696" y="3.91304" width="4.73913" height="8.26087"/>
+   <object id="3" x="9.95652" y="11.1304" width="6" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="710">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11.1739" y="-0.0652001" width="3.78261" height="7.13044"/>
+   <object id="2" x="6.21739" y="6.10871" width="4.73913" height="5.13044"/>
+   <object id="3" x="0.0869591" y="10.0217" width="6" height="5.17391"/>
+  </objectgroup>
+ </tile>
+ <tile id="711">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="7" height="13"/>
+  </objectgroup>
+ </tile>
  <tile id="749">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -293,6 +392,16 @@
    <object id="1" x="0" y="0" width="13" height="7.86957"/>
   </objectgroup>
  </tile>
+ <tile id="867">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="7.375"/>
+  </objectgroup>
+ </tile>
+ <tile id="868">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="6.375"/>
+  </objectgroup>
+ </tile>
  <tile id="910">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="15.0435"/>
@@ -328,6 +437,11 @@
    <object id="1" x="2" y="0" width="10.0435" height="13.913"/>
   </objectgroup>
  </tile>
+ <tile id="2373">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="2510">
   <objectgroup draworder="index" id="2">
    <object id="1" x="1.95652" y="0.826087" width="10.3043" height="13.3043"/>
@@ -898,6 +1012,43 @@
    <object id="1" x="0.0434783" y="-0.0869565" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="3960">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="12" width="5" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="3961">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="16" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="3962">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="12" width="5" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="3963">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="9.375" y="-0.125" width="6.625" height="16.125"/>
+   <object id="2" x="0.25" y="9" width="9.25" height="7.125"/>
+  </objectgroup>
+ </tile>
+ <tile id="3964">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0.125" y="-0.125" width="6.625" height="16.125"/>
+   <object id="2" x="6.625" y="9" width="9.25" height="7.125"/>
+  </objectgroup>
+ </tile>
+ <tile id="3965">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="7" width="14" height="9"/>
+  </objectgroup>
+ </tile>
+ <tile id="3967">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="7" width="14" height="9"/>
+  </objectgroup>
+ </tile>
  <tile id="4021">
   <objectgroup draworder="index" id="2">
    <object id="1" x="3" y="0" width="13" height="8.13043"/>
@@ -974,6 +1125,43 @@
    <object id="1" x="0" y="0" width="8" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="4118">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="0" width="5" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4119">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4120">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="6" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="4121">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0.125" y="0" width="16" height="9.5"/>
+   <object id="2" x="6.25" y="9.25" width="9.875" height="6.75"/>
+  </objectgroup>
+ </tile>
+ <tile id="4122">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0.125" width="16" height="9.5"/>
+   <object id="2" x="0" y="9.375" width="9.875" height="6.75"/>
+  </objectgroup>
+ </tile>
+ <tile id="4123">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="7"/>
+  </objectgroup>
+ </tile>
+ <tile id="4125">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="13" height="7"/>
+  </objectgroup>
+ </tile>
  <tile id="4238">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -1039,6 +1227,31 @@
    <object id="1" x="0" y="0" width="16" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="4276">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="11" y="0" width="5" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4277">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4278">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="6" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4279">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="4280">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="10"/>
+  </objectgroup>
+ </tile>
  <tile id="4396">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="7" width="13" height="9"/>
@@ -1902,6 +2115,21 @@
    <object id="2" x="6.95652" y="0.478261" width="8.43478" height="5.95652"/>
   </objectgroup>
  </tile>
+ <tile id="7164">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7165">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7166">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7175">
   <animation>
    <frame tileid="7175" duration="100"/>
@@ -1946,6 +2174,26 @@
    <object id="1" x="0" y="0" width="5" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="7321">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7322">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7323">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7324">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7373">
   <animation>
    <frame tileid="7373" duration="100"/>
@@ -1975,6 +2223,26 @@
    <object id="1" x="0" y="0" width="5" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="7479">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7480">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7481">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7482">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="7536">
   <objectgroup draworder="index" id="2">
    <object id="1" x="2.13043" y="7.04348" width="11.6957" height="6.73913"/>
@@ -1986,6 +2254,26 @@
    <object id="1" x="3.3913" y="1" width="9" height="12.4348"/>
   </objectgroup>
  </tile>
+ <tile id="7637">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7638">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="3" y="0" width="13" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7639">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="7640">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="16" height="16"/>
+  </objectgroup>
+ </tile>
  <tile id="8185">
   <objectgroup draworder="index" id="2">
    <object id="1" x="6.95652" y="0" width="9.04348" height="16"/>
diff --git a/forge-gui/res/adventure/Innistrad/ui/inn_shard.png b/forge-gui/res/adventure/Innistrad/ui/inn_shard.png
index 1b1382e3673..8311189b31d 100644
Binary files a/forge-gui/res/adventure/Innistrad/ui/inn_shard.png and b/forge-gui/res/adventure/Innistrad/ui/inn_shard.png differ
diff --git a/forge-gui/res/adventure/Innistrad/world/biomes/inn_approaches.json b/forge-gui/res/adventure/Innistrad/world/biomes/inn_approaches.json
index 3285fc95ded..566b960d608 100644
--- a/forge-gui/res/adventure/Innistrad/world/biomes/inn_approaches.json
+++ b/forge-gui/res/adventure/Innistrad/world/biomes/inn_approaches.json
@@ -31,6 +31,7 @@
 	"Borderland Ranger",
 	"Escaped Skaab",
 	"Falkenrath Neonate",
+	"Hobbling Zombie",
 	"Howlpack Exile",
 	"Loam Dryad",
 	"Missionary of Saint Traft",
@@ -46,7 +47,9 @@
 	"inn_ulvenwald_village",
 	"inn_Cave_river",
 	"inn_lodge_1",
-	"inn_forgotten_lodge_1"
+	"inn_forgotten_lodge_1",
+	"inn_dark_forest",
+	"inn_abbey"
 ],
 "structures": [
 	{
diff --git a/forge-gui/res/adventure/Innistrad/world/biomes/inn_gavony.json b/forge-gui/res/adventure/Innistrad/world/biomes/inn_gavony.json
index 2acd34b21cd..1da750563ef 100644
--- a/forge-gui/res/adventure/Innistrad/world/biomes/inn_gavony.json
+++ b/forge-gui/res/adventure/Innistrad/world/biomes/inn_gavony.json
@@ -26,8 +26,13 @@
 	"DarkGras"
 ],
 "enemies": [
+	"Gavony Farmhand",
+	"Scarecrow"
 ],
 "pointsOfInterest": [
+	"inn_abbey",
+	"inn_gavony_chapelry",
+	"inn_gavony_parish"
 
 ],
 "structures": [
diff --git a/forge-gui/res/adventure/Innistrad/world/enemies.json b/forge-gui/res/adventure/Innistrad/world/enemies.json
index 583e50e85e4..3483939d763 100644
--- a/forge-gui/res/adventure/Innistrad/world/enemies.json
+++ b/forge-gui/res/adventure/Innistrad/world/enemies.json
@@ -459,6 +459,59 @@
 			"BiomeRed"
 		]
 	},
+	{
+		"name": "Gavony Farmhand",
+		"sprite": "sprites/enemy/humanoid/human/peasant/farmer.atlas",
+		"deck": [
+			"decks/standard/INN/inn_peasant_easy.dck"
+		],
+		"ai": "",
+		"spawnRate": 0.7,
+		"difficulty": 0.1,
+		"speed": 25,
+		"life": 17,
+		"rewards": [
+			{
+				"type": "deckCard",
+				"probability": 1,
+				"count": 2,
+				"addMaxCount": 3
+			},
+			{
+				"type": "gold",
+				"probability": 0.7,
+				"count": 70,
+				"addMaxCount": 80
+			},
+			{
+				"type": "card",
+				"count": 3,
+				"colors": [
+					"White",
+					"Green"
+				],
+				"rarity": [
+					"Common",
+					"Uncommon"
+				],
+				"editions":[
+					"SOI",
+					"DKA",
+					"ISD",
+					"AVR",
+					"MID"
+				]
+			}
+		],
+		"colors": "W",
+		"questTags": [
+			"Human",
+			"Humanoid",
+			"Peasant",
+			"IdentityWhite",
+			"BiomeWhite"
+		]
+	},
 	{
 		"name": "The Gitrog Monster",
 		"sprite": "sprites/enemy/undead/zombie.atlas",
@@ -523,6 +576,58 @@
 			"Gitrog"
 		]
 	},
+	{
+		"name": "Hobbling Zombie",
+		"sprite": "sprites/enemy/undead/zombie_2.atlas",
+		"deck": [
+			"decks/standard/INN/inn_zombie_easy.dck"
+		],
+		"ai": "",
+		"spawnRate": 0.7,
+		"difficulty": 0.1,
+		"speed": 18,
+		"life": 10,
+		"rewards": [
+			{
+				"type": "deckCard",
+				"probability": 1,
+				"count": 2,
+				"addMaxCount": 3
+			},
+			{
+				"type": "gold",
+				"probability": 0.7,
+				"count": 50,
+				"addMaxCount": 80
+			},
+			{
+				"type": "card",
+				"count": 2,
+				"colors": [
+					"Blue",
+					"Black"
+				],
+				"rarity": [
+					"Common",
+					"Uncommon"
+				],
+				"editions":[
+					"SOI",
+					"DKA",
+					"ISD",
+					"AVR"
+				]
+			}
+		],
+		"colors": "B",
+		"questTags": [
+			"Undead",
+			"Zombie",
+			"Humanoid",
+			"IdentityBlack",
+			"BiomeColorless"
+		]
+	},
 	{
 	"name": "Howlpack Exile",
 	"sprite": "sprites/enemy/humanoid/werewolf/werewolf.atlas",
@@ -950,6 +1055,61 @@
 			"BiomeBlue"
 		]
 	},
+	{
+		"name": "Scarecrow",
+		"sprite": "sprites/enemy/construct/scarecrow.atlas",
+		"deck": [
+			"decks/standard/INN/inn_scarecrow_easy.dck"
+		],
+		"ai": "",
+		"spawnRate": 0.45,
+		"difficulty": 0.1,
+		"speed": 10,
+		"life": 20,
+		"rewards": [
+			{
+				"type": "deckCard",
+				"probability": 0.75,
+				"count": 3,
+				"rarity": [
+					"Common"
+				],
+				"addMaxCount": 2
+			},
+			{
+				"type": "deckCard",
+				"probability": 0.55,
+				"count": 1,
+				"addMaxCount": 2
+			},
+			{
+				"type": "gold",
+				"probability": 0.3,
+				"count": 13,
+				"addMaxCount": 80
+			},
+			{
+				"type": "card",
+				"count": 1,
+				"rarity": [
+					"Common",
+					"Uncommon"
+				],
+				"editions":[
+					"SOI",
+					"DKA",
+					"ISD",
+					"MID"
+				]
+			}
+		],
+		"questTags": [
+			"Artifact",
+			"BiomeColorless",
+			"BiomeGreen",
+			"BiomeWhite"
+		]
+	},
 	{
 		"name": "Sigardian Priest",
 		"sprite": "sprites/enemy/humanoid/human/cleric/monk.atlas",
diff --git a/forge-gui/res/adventure/Innistrad/world/items.json b/forge-gui/res/adventure/Innistrad/world/items.json
index 3df7d3e1343..0b2cd30ee90 100644
--- a/forge-gui/res/adventure/Innistrad/world/items.json
+++ b/forge-gui/res/adventure/Innistrad/world/items.json
@@ -343,7 +343,7 @@
     "questItem": true
   },
   {
-    "name": "Grolnoks Key",
+    "name": "Grolnok's Key",
     "iconName": "StrangeKey",
     "questItem": true
   },
diff --git a/forge-gui/res/adventure/Innistrad/world/points_of_interest.json b/forge-gui/res/adventure/Innistrad/world/points_of_interest.json
index 4991e7ee5a3..59dace85ed3 100644
--- a/forge-gui/res/adventure/Innistrad/world/points_of_interest.json
+++ b/forge-gui/res/adventure/Innistrad/world/points_of_interest.json
@@ -1,9 +1,51 @@
 [
-
+	{
+		"name": "inn_abbey",
+		"type": "town",
+		"count": 4,
+		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
+		"sprite": "abbey",
+		"map": "../Innistrad/maps/map/Innistrad/towns/inn_abbey.tmx",
+		"radiusFactor": 0.8,
+		"questTags": [
+			"Town",
+			"TownGeneric"
+		]
+	},
+	{
+		"name": "inn_gavony_chapelry",
+		"type": "town",
+		"count": 10,
+		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
+		"sprite": "parish",
+		"map": "../Innistrad/maps/map/Innistrad/towns/inn_gavony_chapelry.tmx",
+		"radiusFactor": 0.8,
+		"questTags": [
+			"Town",
+			"TownGeneric",
+			"BiomeWhite",
+			"Sidequest"
+		]
+	},
+	{
+		"name": "inn_gavony_parish",
+		"type": "town",
+		"count": 4,
+		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
+		"sprite": "parish",
+		"map": "../Innistrad/maps/map/Innistrad/towns/inn_gavony_parish.tmx",
+		"radiusFactor": 0.8,
+		"questTags": [
+			"Town",
+			"TownGeneric",
+			"BiomeWhite",
+			"Sidequest"
+		]
+	},
 	{
 		"name": "inn_Cave_river",
 		"type": "cave",
-		"count": 15,
+		"count": 12,
 		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
 		"sprite": "Cave",
 		"map": "../Innistrad/maps/map/Innistrad/cave/inn_cave_river_entrance.tmx",
@@ -17,7 +59,7 @@
 	},
 	{
 		"name": "inn_crescentus",
-		"type": "town",
+		"type": "capital",
 		"count": 1,
 		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
 		"sprite": "crescentus",
@@ -28,6 +70,21 @@
 			"BiomeMoonlight"
 		]
 	},
+	{
+		"name": "inn_dark_forest",
+		"type": "cave",
+		"count": 10,
+		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
+		"sprite": "dark_forest",
+		"map": "../Innistrad/maps/map/Innistrad/inn_approaches/dark_forest.tmx",
+		"radiusFactor": 0.4,
+		"questTags": [
+			"Hostile",
+			"Cave",
+			"BiomeColorless",
+			"Sidequest"
+		]
+	},
 	{
 		"name": "inn_forgotten_lodge_1",
 		"type": "dungeon",
@@ -92,7 +149,7 @@
 	{
 		"name": "inn_ulvenwald_village",
 		"type": "town",
-		"count": 10,
+		"count": 6,
 		"spriteAtlas": "../Innistrad/maps/tileset/inn_buildings.atlas",
 		"sprite": "ulvenwaldtown",
 		"map": "../Innistrad/maps/map/Innistrad/towns/inn_ulvenwald_hamlet.tmx",
diff --git a/forge-gui/res/adventure/Innistrad/world/quests.json b/forge-gui/res/adventure/Innistrad/world/quests.json
index d5f1d68ccc0..518cba15f4f 100644
--- a/forge-gui/res/adventure/Innistrad/world/quests.json
+++ b/forge-gui/res/adventure/Innistrad/world/quests.json
@@ -41,7 +41,7 @@
                         },
                         {
                             "name": "\"And what if I find the right people myself?\"",
-                            "text": "He shrugs as though that wouldn't bother him. \"Then I'll have to find someone bigger, badder, and most importantly faster than you to work with.\"",
+                            "text": "He shrugs as though that wouldn't bother him. \"Then I'll have to find someone bigger, badder, and, most importantly, faster than you to work with.\"",
                             "options": [
                                 {
                                     "name": "\"Good luck with that.\" (Decline Quest)"
@@ -435,7 +435,7 @@
                 ],
                 "objective": "Travel",
                 "prologue": {
-                    "text": "Nothing like a really long walk to strech the legs, right? You could likely save yourself some time with the right spells, but... is that going to be safe?",
+                    "text": "Nothing like a really long walk to stretch the legs, right? You could likely save yourself some time with the right spells, but... is that going to be safe?",
                     "options": [
                         {
                             "name": "(Begin your quest)"
@@ -592,7 +592,7 @@
                                                     ]
                                                 }
                                             ],
-                                            "name": "Quickly and discretely help yourself to a spell before continuing",
+                                            "name": "Quickly and discreetly help yourself to a spell before continuing",
                                             "text": "You receive a spell of dubious quality.",
                                             "options": [
                                                 {
@@ -849,7 +849,7 @@
                     "POIReference": ""
                 }
             ],
-            "text": "Consciously or unconsciously, you brush your shoulders off as you walk back in to town. The locals appear delighted that you have taken care of their problem. (+3 local reputation)",
+            "text": "Consciously or unconsciously, you brush your shoulders off as you walk back into town. The locals appear delighted that you have taken care of their problem. (+3 local reputation)",
             "options": [
                 {
                     "action": [
@@ -1047,7 +1047,7 @@
                 },
                 {
                     "name": "\"Urgency is expensive.\"",
-                    "text": "\"So is not being the next scheduled burial.\" As you're still processesing that statement, the figure continues. \"Ten mana shards. And you can keep the bones.\"",
+                    "text": "\"So is not being the next scheduled burial.\" As you're still processing that statement, the figure continues. \"Ten mana shards. And you can keep the bones.\"",
                     "options": [
                         {
                             "action": [
@@ -1284,7 +1284,7 @@
                                 }
                             ],
                             "name": "You shrug your shoulders. It's not your problem. (Decline Quest)",
-                            "text": "The criminal glances at you and hurredly scampers off. (-1 Reputation)",
+                            "text": "The criminal glances at you and hurriedly scampers off. (-1 Reputation)",
                             "options": [
                                 {
                                     "name": "(Continue)"
@@ -1343,7 +1343,7 @@
                             ]
                         },
                         {
-                            "name": "You clear your throat in an exagerated manner.",
+                            "name": "You clear your throat in an exaggerated manner.",
                             "text": "The $(enemy_2) drops a small satchel as they begin to run away.",
                             "options": [
                                 {
@@ -2225,7 +2225,7 @@
                                 },
                                 {
                                     "name": "Curious as to why this would be on the board, your gaze lingers for a moment.",
-                                    "text": "As you look at the wordless paper, words find their way in to your mind by unknown other means. 'FIND.' '{COLOR=red}KILL!{ENDCOLOR}' 'REWARD.'",
+                                    "text": "As you look at the wordless paper, words find their way into your mind by unknown means. 'FIND.' '{COLOR=red}KILL!{ENDCOLOR}' 'REWARD.'",
                                     "options": [
                                         {
                                             "action": [
@@ -2275,7 +2275,7 @@
                                             ]
                                         },
                                         {
-                                            "name": "You decide that the invasive thoughts, if you can call them that, are unwelcomed, and you take a step back.",
+                                            "name": "You decide that the invasive thoughts, if you can call them that, are unwelcome, and you take a step back.",
                                             "text": "The thoughts urgently follow you for a moment. '{COLOR=red}KKKKiiiiill...{ENDCOLOR}' But as you take another step back, the words vanish from your mind.",
                                             "options": [
                                                 {
@@ -2310,7 +2310,7 @@
                             "options": [
                                 {
                                     "name": "You continue to read.",
-                                    "text": "Secondly, another handwriting has scrawled over what might have actually been a romantic bit with the following. \"Don't bother. I killed him yesterday\"",
+                                    "text": "Secondly, another's handwriting was scrawled over what might have actually been a romantic bit with the following. \"Don't bother. I killed him yesterday\"",
                                     "options": [
                                         {
                                             "name": "You shake your head and walk away. (Decline Quest)"
@@ -2727,7 +2727,7 @@
                             ]
                         }
                     ],
-                    "name": "\"Almost. I believe there's a reward due to level the scales.\"",
+                    "name": "\"Almost. I believe there's a reward due, to level the scales.\"",
                     "text": "(-1 Local Reputation) The druid frowns slightly, but hands you a bundle wrapped in small vines.",
                     "options": [
                         {
@@ -2902,7 +2902,7 @@
             "options": [
                 {
                     "name": "\"Capable just so happens to be my middle name.\"",
-                    "text": "He looks perplexed for a moment, but glances back at the wagon as though distracted by it. \"I was hoping you could handle some business for me\"",
+                    "text": "He looks perplexed for a moment, but glances back at the wagon as though distracted by it. \"I was hoping you could handle some business for me.\"",
                     "options": [
                         {
                             "name": "Business? What sort of business?",
@@ -3683,7 +3683,7 @@
                     "POIReference": "$(poi_2)"
                 }
             ],
-            "text": "Despite the insistance of the needle you decide that you will not finish clearing the $(poi_2). As if it could sense this somehow, the onyx compass disappears. (-2 Local Reputation)",
+            "text": "Despite the insistence of the needle you decide that you will not finish clearing the $(poi_2). As if it could sense this somehow, the onyx compass disappears. (-2 Local Reputation)",
             "options": [
                 {
                     "name": "(Quest Failed)"
@@ -3790,7 +3790,7 @@
         "name": "A Vision of Destruction",
         "description": "Clear out all enemies in the $(poi_1) and report back",
         "offerDialog": {
-            "text": "Walking in to the village, an old man looks up as if expecting you and rushes over (to the extent that he is able) \"$(playername). I need you to turn around and leave. NOW.\"",
+            "text": "Walking into the village, an old man looks up as if expecting you and rushes over (to the extent that he is able) \"$(playername). I need you to turn around and leave. NOW.\"",
             "options": [
                 {
                     "name": "You take a good look at the old man, but do not recognize his features. \"Should I know you?\"",
@@ -4003,7 +4003,7 @@
                     "text": "\"My vision was less than specific about whether or not it would be changed by your actions. So... yes.\"",
                     "options": [
                         {
-                            "name": "You glance around at a clear sky warily before going on in to town. (Complete Quest)"
+                            "name": "You glance around at a clear sky warily before going on into town. (Complete Quest)"
                         }
                     ]
                 }
@@ -4139,7 +4139,7 @@
                                 },
                                 {
                                     "name": "\"I must decline. I respect the local inhabitants far more than faceless nobility.\" (Decline Quest)",
-                                    "text": "He gives you the smallest bow imaginable, just enough to say that one was given without indicating respect.",
+                                    "text": "He gives you the smallest bow imaginable, just enough to say that one was given, without indicating respect.",
                                     "options": [
                                         {
                                             "name": "(Continue)"
@@ -4174,7 +4174,7 @@
                 },
                 {
                     "name": "You can't put your finger on it, but something seems off about the man. \"This isn't a good time.\" (Decline Quest)",
-                    "text": "He gives you the smallest bow imaginable, just enough to say that one was given without indicating respect. (-1 Local Reputation)",
+                    "text": "He gives you the smallest bow imaginable, just enough to say that one was given, without indicating respect. (-1 Local Reputation)",
                     "options": [
                         {
                             "name": "(Continue)"
@@ -4345,7 +4345,7 @@
                     "options": [
                         {
                             "name": "You wait for him to continue.",
-                            "text": "\"I've come in to an inheritance of a small estate that I've been expecting for years. Recently, I've had some hard times, and I've convinced some individuals to let me borrow against the land.\" ",
+                            "text": "\"I've come into an inheritance of a small estate that I've been expecting for years. Recently, I've had some hard times, and I've convinced some individuals to let me borrow against the land.\" ",
                             "options": [
                                 {
                                     "name": "\"I see.\" You think you know where this is headed.",
@@ -4588,7 +4588,7 @@
                     "text": "Most of the ads are nondescript, weather worn, or written in an unfamiliar language. A few catch your eye, however.",
                     "options": [
                         {
-                            "name": "You look at what seems to be an advertisment of some sort off to one side.",
+                            "name": "You look at what seems to be an advertisement of some sort off to one side.",
                             "text": "It reads: \"Gimgee's self-replicating paper. When you need unlimited paper or to clear a forest from afar, it's got to be Gimgee's\".",
                             "options": [
                                 {
@@ -4657,7 +4657,7 @@
         },
         "prologue": {},
         "epilogue": {
-            "text": "You feel awkward pulling your $(enemy_1)s in to town, but it doesn't actually seem that out of place here with other macabre scenes around. (This quest will only given in black biome in the future).",
+            "text": "You feel awkward pulling your $(enemy_1)s into town, but it doesn't actually seem that out of place here with other macabre scenes around. (This quest will only given in black biome in the future).",
             "options": [
                 {
                     "name": "You look around for someone that seems to be expecting bodies.",
@@ -4708,7 +4708,7 @@
                         },
                         {
                             "name": "You take a closer look at the carts.",
-                            "text": "$(enemy_1)s and a few random creatures are filling most of one cart., while the other holds a few identical satchels of goods.",
+                            "text": "$(enemy_1)s and a few random creatures are filling most of one cart, while the other holds a few identical satchels of goods.",
                             "options": [
                                 {
                                     "name": "Turn your attention to the carts' attendant.",
@@ -4862,7 +4862,7 @@
                     "text": "Most of the ads are nondescript, weather worn, or written in an unfamiliar language. A few catch your eye, however.",
                     "options": [
                         {
-                            "name": "You look at what seems to be an advertisment of some sort off to one side.",
+                            "name": "You look at what seems to be an advertisement of some sort off to one side.",
                             "text": "\"A focused mind receives great rewards. Focus on defeating 3 $(enemy_2)s, and be rewarded.\"",
                             "options": [
                                 {
@@ -4952,7 +4952,7 @@
                         }
                     ],
                     "name": "Warily take the items.",
-                    "text": "No sooner than you do, the Djinn dissapears in a puff of smoke. When you turn back, the $(enemy_2) you just defeated has vanished as well.",
+                    "text": "No sooner than you do, the Djinn disappears in a puff of smoke. When you turn back, the $(enemy_2) you just defeated has vanished as well.",
                     "options": [
                         {
                             "action": [
@@ -5150,7 +5150,7 @@
                                                         }
                                                     ],
                                                     "name": "\"And if I bring in six?\" (Accept Quest)",
-                                                    "text": "\"Then you will have brought down too many.We're thinning them, not removing them.\"",
+                                                    "text": "\"Then you will have brought down too many. We're thinning them, not removing them.\"",
                                                     "options": [
                                                         {
                                                             "name": "You nod and prepare to leave. (Continue)"
@@ -5597,7 +5597,7 @@
                     "text": "With little hope of catching the damsel, he turns his attention to you. \"Can I interest you in assisting me with some scientific experiments?\"",
                     "options": [
                         {
-                            "name": "\"It really depends on what they are.\" You look at him suspsiciously.",
+                            "name": "\"It really depends on what they are.\" You look at him suspiciously.",
                             "text": "\"You're not a farmhand, so it will have to be.\" He thinks for a moment, pulling out a well worn notebook and flipping through the pages.",
                             "options": [
                                 {
@@ -5633,7 +5633,7 @@
                                             "name": "\"I can do that.\" (Accept Quest)"
                                         },
                                         {
-                                            "name": "\"Sorry, I just decided that I'm more in to magic than science.\" (Decline Quest)"
+                                            "name": "\"Sorry, I just decided that I'm more into magic than science.\" (Decline Quest)"
                                         }
                                     ]
                                 }
@@ -5749,7 +5749,7 @@
                     "text": "Most of the ads are nondescript, weather worn, or written in an unfamiliar language. A few catch your eye, however.",
                     "options": [
                         {
-                            "name": "You look at what seems to be an advertisment of some sort off to one side.",
+                            "name": "You look at what seems to be an advertisement of some sort off to one side.",
                             "text": "It reads: \"Gimgee's rocks. When you need a good rock, think Gimgee's\".",
                             "options": [
                                 {
@@ -5905,7 +5905,7 @@
         "name": "Heart of a Champion",
         "description": "Enter and win an upcoming arena event",
         "offerDialog": {
-            "text": "\"DO YOU HAVE WHAT IT TAKES? ARE YOU THE BEST IN SHANDALAR???\" A young girl yells at the top of her lungs at each passer by in the town. Most people come in to view already covering their ears, having heard this plenty of times before.",
+            "text": "\"DO YOU HAVE WHAT IT TAKES? ARE YOU THE BEST IN SHANDALAR???\" A young girl yells at the top of her lungs at each passer by in the town. Most people come into view already covering their ears, having heard this plenty of times before.",
             "options": [
                 {
                     "name": "You walk over to her. \"Okay, kid, settle down, I heard you. What's this about?\"",
@@ -6065,7 +6065,7 @@
                 "objective": "Travel",
                 "prologue": {},
                 "epilogue": {
-                    "text": "As you walk through the $(poi_1) gates, you can feel the excitement building, eminating, radiating from the city's arena. Most of the populace is already there or on their way. ",
+                    "text": "As you walk through the $(poi_1) gates, you can feel the excitement building, emanating, radiating from the city's arena. Most of the populace is already there or on their way. ",
                     "options": [
                         {
                             "name": "(continue)",
@@ -6127,7 +6127,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Giant bugs holding balls eh ? Count me out. (Decline quest)",
+                    "name": "Giant bugs holding balls eh? Count me out. (Decline quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are.",
                     "options": [
                         {
@@ -6136,7 +6136,7 @@
                     ]
                 },
                 {
-                    "name": "Let me guess, you want to me to deal with this situation ?",
+                    "name": "Let me guess, you want to me to deal with this situation?",
                     "text": "Well Yes, Let me explain the situation; Xira's balls have become a bit of a problem. She has been hosting them every night, and they're becoming increasingly extravagant and disruptive. The townspeople are getting tired of the constant noise and commotion, and it's affecting their daily lives.",
                     "options": [
                         {
@@ -6228,7 +6228,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -6331,7 +6331,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are.",
                     "options": [
                         {
@@ -6340,11 +6340,11 @@
                     ]
                 },
                 {
-                    "name": "Let me guess, you want to me to deal with this situation ?",
+                    "name": "Let me guess, you want to me to deal with this situation?",
                     "text": "The factory, now infested with an array of peculiar mechs and skilled artificers, poses a grave threat to our community and the delicate balance of technology.  Slobad, once hailed as a genius, was known for his unorthodox creations and their volatile nature. However, a catastrophic incident occurred years ago, leading to the factory's abandonment. Now, the mechanical monstrosities have been reactivated, wreaking havoc on unsuspecting wanderers and nearby settlements.",
                     "options": [
                         {
-                            "name": "I see. So you want me to go to his factory and defeat him ?",
+                            "name": "I see. So you want me to go to his factory and defeat him?",
                             "text": "Your task, should you accept it, is to venture into Slobad's factory and cleanse it of its mechanical menaces. You will face a myriad of strange mechs, each with its unique capabilities and behaviors. Additionally, the factory's artificers, skilled engineers corrupted by their own creations, will fiercely defend their inventions, making your mission all the more challenging.",
                             "options": [
                                 {
@@ -6364,7 +6364,7 @@
                                             "POIReference": ""
                                         }
                                     ],
-                                    "name": "I'll take care of it, note the location of the factory on my map.(Accept Quest) (WARNING HARD QUEST)",
+                                    "name": "I'll take care of it. If you'd note the location of the factory on my map... (Accept Quest) (WARNING HARD QUEST)",
                                     "text": "Once you have vanquished the mechanical threat and quelled the chaos within the factory, return to me, Maven the Alchemist, and you shall be rewarded handsomely for your bravery and service to our community. Be warned, however, for the path ahead will test your mettle, cunning, and combat prowess. May fortune favor you on this perilous undertaking!"
                                 },
                                 {
@@ -6384,7 +6384,7 @@
                                             "POIReference": ""
                                         }
                                     ],
-                                    "name": "\"Do you really think I have nothing better to do ? Find someone else to take care of it\" (Decline Quest)",
+                                    "name": "\"Do you really think I have nothing better to do? Find someone else to take care of it\" (Decline Quest)",
                                     "text": "Maven the Alchemist keeps a passive look on his face. \"Soon those things will be balanced as well.\"",
                                     "options": [
                                         {
@@ -6434,7 +6434,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -6534,7 +6534,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are. (-1 local reputation)",
                     "options": [
                         {
@@ -6547,7 +6547,7 @@
                     "text": "Thank you, noble adventurer. Slimefoot is a creature of pure malevolence, a monstrous being that has taken root in the heart of the treacherous swamp. Its corrosive touch and toxic aura have brought devastation to our lands. To defeat it, you must journey through the perilous swamp, filled with treacherous terrain and deadly creatures lurking within.",
                     "options": [
                         {
-                            "name": "I see. So you want me to travel to Slimefoots swamp and defeat him ?",
+                            "name": "I see. So you want me to travel to Slimefoot's swamp and defeat him?",
                             "text": "Slimefoot is a formidable foe, adept at both offense and defense. Its body secretes a corrosive slime, and its tentacles strike with lightning speed. Prepare yourself for a challenging battle, my friend. Draw upon your combat skills, use potions and magical abilities wisely, and exploit any weaknesses you can find. Only then can you hope to overcome this vile creature.",
                             "options": [
                                 {
@@ -6632,7 +6632,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -6688,7 +6688,7 @@
             {
                 "id": 2,
                 "name": "Travel",
-                "description": "Return to town and report your success in clearing Slimefoots Lair.",
+                "description": "Return to town and report your success in clearing Slimefoot's Lair.",
                 "mapFlag": "",
                 "mapFlagValue": 1,
                 "here": true,
@@ -6733,7 +6733,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline Quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline Quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are. ",
                     "options": [
                         {
@@ -6742,7 +6742,7 @@
                     ]
                 },
                 {
-                    "name": "Let me guess, you want to me to deal with this situation ?",
+                    "name": "Let me guess, you want to me to deal with this situation?",
                     "text": "The town council seeks the aid of a skilled and courageous individual like yourself to venture into the depths of the old sewer near this town and eradicate this slimy menace once and for all.",
                     "options": [
                         {
@@ -6766,7 +6766,7 @@
                                             "POIReference": ""
                                         }
                                     ],
-                                    "name": "Consider it done, note the location of the old sewers on my map. (Accept Quest) (WARNING HARD QUEST)"
+                                    "name": "Consider it done. If you'd note the location of the old sewers on my map... (Accept Quest) (WARNING HARD QUEST)"
                                 },
                                 {
                                     "action": [
@@ -6837,7 +6837,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -6927,7 +6927,7 @@
                     "options": [
                         {
                             "name": "I need answers..",
-                            "text": "The only thing that stands clearly in your mind, is an unexplicable desire to march towards a strange structure in the nearby moonlight. You cannot explain the feeling, but it as if it's expecting your arrival.",
+                            "text": "The only thing that stands clearly in your mind, is an inexplicable desire to march towards a strange structure in the nearby moonlight. You cannot explain the feeling, but it as if it's expecting your arrival.",
                             "options": [
                                 {
                                 "name": "(Approach)"
@@ -7150,7 +7150,7 @@
                                             "options": [
                                                 {
                                                     "name": "\"What was the spell?\"",
-                                                    "text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam.... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
+                                                    "text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
                                                     "options": [
                                                         {
                                                             "name": "\"So, a portal?\"",
@@ -7199,7 +7199,7 @@
                                                 },
                                                 {
                                                     "name": "\"Cut to the chase already.\"",
-                                                    "text": "\"Right. He and his hole dissapeared, then another appeared and beasties came out, and I ran. Simple enough?\"",
+                                                    "text": "\"Right. He and his hole disappeared, then another appeared and beasties came out, and I ran. Simple enough?\"",
                                                     "options": [
                                                         {
                                                             "action": [
@@ -7402,7 +7402,7 @@
                 ],
                 "objective": "Travel",
                 "prologue": {
-                    "text": "(Old Man's Voice) All major locations in Innistrad can be divided up in to one of two categories: towns and dungeons.",
+                    "text": "(Old Man's Voice) All major locations in Innistrad can be divided up into one of two categories: towns and dungeons.",
                     "options": [
                         {
                             "name": "How are you speaking to me?",
@@ -7410,7 +7410,7 @@
                             "options": [
                                 {
                                     "name": "Thanks for the advice...",
-                                    "text": "As i'm so kind, have another hint: If you see one, follow a road. All roads lead to a town. You also move faster on roads and fewer enemies will appear.",
+                                    "text": "As I'm so kind, have another hint: If you see one, follow a road. All roads lead to a town. You also move faster on roads and fewer enemies will appear.",
                                     "options": [
                                         {
                                             "name": "(Say nothing and set off)"
@@ -7434,7 +7434,7 @@
                 "objective": "Leave",
                 "anyPOI": true,
                 "prologue": {
-                    "text": "(Old Man's Voice) You will find the towns in a region of Innistrad will look similar to eachother, and offer many of the same services. Though larger towns will offer more...",
+                    "text": "(Old Man's Voice) You will find the towns in a region of Innistrad will look similar to each other, and offer many of the same services. Though larger towns will offer more...",
                     "options": [
                         {
                             "name": "Will I ever be free of your voice?",
@@ -7508,7 +7508,7 @@
                                             "text": "*Chuckles again* You'll see... Unlike on the world map, an enemy that defeats you in a dungeon will remain on the map, to torment you; you can try to duel them again, or run away and seek out another opponent. If you need to heal yourself, go back to a town.",
                                             "options": [
                                                 {
-                                                    "name": "*Reamain silent*",
+                                                    "name": "*Remain silent*",
                                                     "text": "Oh! Also, some quests like this one, have multiple objectives that can be achieved simultaneously. Your other objective is to find and enter a cave on the world map. An enemy defeated in a cave or on the way there I will count as the enemy to defeat. Just for you. So feel free to do these things in any order.",
                                                     "options": [
                                                         {
@@ -7600,7 +7600,7 @@
     {
         "id": 31,
         "isTemplate": true,
-        "name": "Buillding A Collection",
+        "name": "Building A Collection",
         "offerDialog": {},
         "prologue": {},
         "epilogue": {},
@@ -7780,7 +7780,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline Quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline Quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are. ",
                     "options": [
                         {
@@ -7885,7 +7885,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -7986,7 +7986,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline Quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline Quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are. ",
                     "options": [
                         {
@@ -8091,7 +8091,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -8192,7 +8192,7 @@
                             "POIReference": ""
                         }
                     ],
-                    "name": "Sorry, I don't have to the time for this. (Decline Quest)",
+                    "name": "Sorry, I don't have the time for this. (Decline Quest)",
                     "text": "Figured you weren't up to the challenge, come back to me when you are. ",
                     "options": [
                         {
@@ -8296,7 +8296,7 @@
                             ]
                         }
                     ],
-                    "name": "It's nothing I coudn't handle (Complete Quest)"
+                    "name": "It's nothing I couldn't handle (Complete Quest)"
                 }
             ]
         },
@@ -8429,7 +8429,7 @@
                             "POIReference": "$(poi_3)"
                         }
                     ],
-                    "name": "(Quest complete)"
+                    "name": "(Quest Complete)"
                 }
             ]
         },
@@ -8617,7 +8617,7 @@
                             "POIReference": "$(poi_3)"
                         }
                     ],
-                    "name": "(Quest complete)"
+                    "name": "(Quest Complete)"
                 }
             ]
         },
@@ -8805,7 +8805,7 @@
                             "POIReference": "$(poi_3)"
                         }
                     ],
-                    "name": "(Quest complete)"
+                    "name": "(Quest Complete)"
                 }
             ]
         },
@@ -8958,7 +8958,7 @@
                             ]
                         },
                         {
-                            "name": "\"It's just a tree, I can handle some elves, and I support your bansai hobby.\" (Accept Quest)",
+                            "name": "\"It's just a tree, I can handle some elves, and I support your bonsai hobby.\" (Accept Quest)",
                             "action": [
                                 {
                                     "removeItem": "",
@@ -8992,7 +8992,7 @@
                             "POIReference": "$(poi_3)"
                         }
                     ],
-                    "name": "(Quest complete)"
+                    "name": "(Quest Complete)"
                 }
             ]
         },
@@ -9118,7 +9118,7 @@
             "plains_town_tribal",
             "swamp_town_generic",
             "swamp_town_identity",
-            "swamo_town_tribal",
+            "swamp_town_tribal",
             "waste_town_generic",
             "waste_town_identity",
             "waste_town_tribal"
@@ -9180,7 +9180,7 @@
                             "POIReference": "$(poi_3)"
                         }
                     ],
-                    "name": "(Quest complete)"
+                    "name": "(Quest Complete)"
                 }
             ]
         },
@@ -9343,7 +9343,7 @@
                 ],
                 "anyPOI": true,
                 "prologue": {
-                    "text": "You should note: Since this quest objective is to complete other quests, your navigation arrow will lead you to quest sources while you are tracking it. Once you accept a side quest, go in to your quest log and track that quest in order to update navigation hints.",
+                    "text": "You should note: Since this quest objective is to complete other quests, your navigation arrow will lead you to quest sources while you are tracking it. Once you accept a side quest, go into your quest log and track that quest in order to update navigation hints.",
                     "options": [
                         {
                             "name": "Understood"
@@ -9814,7 +9814,7 @@
                 ],
                 "prologue": {},
                 "epilogue": {
-                    "text": "Within moments of walking in to town, a wiry young elf approaches you. Or at least he looks young, it's so hard to tell with elves. He briefly holds out an amulet identical to the one Donovan gave you, and beckons you to follow him to the inn.",
+                    "text": "Within moments of walking into town, a wiry young elf approaches you. Or at least he looks young, it's so hard to tell with elves. He briefly holds out an amulet identical to the one Donovan gave you, and beckons you to follow him to the inn.",
                     "options": [
                         {
                             "name": "(Continue)",
@@ -9881,7 +9881,7 @@
         "offerDialog": {},
         "prologue": {},
         "epilogue": {
-            "text": "A slight whistle alerts you to Acirxes' presence. You're not entirely sure if he has impeccible timing or if he watched you complete your most recent job, but it appears that Sir Donovan has more work for you.",
+            "text": "A slight whistle alerts you to Acirxes' presence. You're not entirely sure if he has impeccable timing or if he watched you complete your most recent job, but it appears that Sir Donovan has more work for you.",
             "options": [
                 {
                     "name": "(Continue)",
@@ -9968,7 +9968,7 @@
                             "options": [
                                 {
                                     "name": "\"Consider it done.\"",
-                                    "text": "\"If you can handle that, it should be a short trip from there to $(poi_4) after. I've got some... 'buisiness' to take care of there. I'll meet you at the inn on the north end of the central peninsula.\"",
+                                    "text": "\"If you can handle that, it should be a short trip from there to $(poi_4) after. I've got some... 'business' to take care of there. I'll meet you at the inn on the north end of the central peninsula.\"",
                                     "action": [
                                         {
                                             "setQuestFlag": {
@@ -9984,7 +9984,7 @@
                                     "options": [
                                         {
                                             "name": "\"No, apparently not.\"",
-                                            "text": "\"So that's why we're sending you. Meet me in $(poi_4) after. I've got some... 'buisiness' to take care of there and I'll add a personal reward if you bring me back the head of whoever's running the show at the library.\" He looks away before walking off. \"I owe that much to Gwen...\"",
+                                            "text": "\"So that's why we're sending you. Meet me in $(poi_4) after. I've got some... 'business' to take care of there and I'll add a personal reward if you bring me back the head of whoever's running the show at the library.\" He looks away before walking off. \"I owe that much to Gwen...\"",
                                             "options": [
                                                 {
                                                     "name": "(Continue)",
@@ -10026,7 +10026,7 @@
                     "options": [
                         {
                             "name": "(Continue)",
-                            "text": "A small group of scholars carrying books around the entrance seems to confirm the building's purpose, but something odd about their manerisms has you on edge as you approach.",
+                            "text": "A small group of scholars carrying books around the entrance seems to confirm the building's purpose, but something odd about their mannerisms has you on edge as you approach.",
                             "options": [
                                 {
                                     "name": "(Continue)"
@@ -10590,7 +10590,7 @@
                     ]
                 },
                 "epilogue": {
-                    "text": "As you walk in to town, a familiar cloaked figure is waiting and watching for you.",
+                    "text": "As you walk into town, a familiar cloaked figure is waiting and watching for you.",
                     "options": [
                         {
                             "name": "(Continue)"
@@ -11370,4 +11370,4 @@
             }
         ]
     }
-]
\ No newline at end of file
+]
diff --git a/forge-gui/res/adventure/Innistrad/world/shops.json b/forge-gui/res/adventure/Innistrad/world/shops.json
index 8012b9f33c7..0d2f1e9b8d1 100644
--- a/forge-gui/res/adventure/Innistrad/world/shops.json
+++ b/forge-gui/res/adventure/Innistrad/world/shops.json
@@ -171,12 +171,12 @@
   "rewards": [
     {
       "count":6,
-	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure ",
+	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure",
 	  "colors": ["blue"]
     },
 	{
       "count":2,
-	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure "
+	  "cardText": "draw(s)?|(exile|reveal|look|search).*library|scry|seek|conjure"
     }]
 },
 {     
@@ -467,7 +467,7 @@
     }]
 },{                                      
 "name":"White4",                  
-"description":"Only mostly dead",
+"description":"Only Mostly Dead",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"RotatingShop",
 "overlaySprite":"Overlay6White",
@@ -500,7 +500,7 @@
     }]
 },{                                      
 "name":"White6",                  
-"description":"Strict dogma",
+"description":"Strict Dogma",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"RotatingShop",
 "overlaySprite":"Overlay6White",
@@ -982,7 +982,7 @@
     }]
 },{                                    
 "name":"Creature2Eldrazi",
-"description": "Eldritch Emissaries",
+"description":"Eldritch Emissaries",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"CreatureShop",
 "overlaySprite":"Overlay2Colorless",
@@ -1429,7 +1429,7 @@
     }]
 },{                                    
 "name":"Blue",                  
-"description":"Hermitic Study",
+"description":"Hermetic Study",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"BlueShop",
   "rewards": [
@@ -1439,7 +1439,7 @@
     }]
 },{                                    
 "name":"Azorius",      
-"description":"Azorious Shop, LLC",
+"description":"Azorius Shop, LLC",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"AzoriusShop",
   "rewards": [
@@ -1623,7 +1623,7 @@
     }]
 },{
   "name":"RWG",
-  "description":"Caberetti Curios",
+  "description":"Cabaretti Curios",
   "spriteAtlas":"maps/tileset/buildings.atlas",
   "sprite":"RWGShop",
   "rewards": [
@@ -1912,7 +1912,7 @@
 	}]
 },{
   "name":"Angel",
-  "description":"Halos R' Us",
+  "description":"Halos 'R' Us",
   "spriteAtlas":"maps/tileset/buildings.atlas",
   "sprite":"AngelShop",
   "rewards": [
@@ -2231,7 +2231,7 @@
 	}]
 },{
   "name":"Sliver4Green",
-  "description":"Venemous Hive",
+  "description":"Venomous Hive",
   "spriteAtlas":"maps/tileset/buildings.atlas",
   "sprite":"SliverShop",
   "overlaySprite":"Overlay4Green",
@@ -4974,7 +4974,7 @@
 	]
 },{
   "name":"Shaman",
-  "description":"Shaman for ya man",
+  "description":"Shaman for Ya Man",
   "spriteAtlas":"maps/tileset/buildings.atlas",
   "sprite":"ShamanShop",
   "rewards": [
diff --git a/forge-gui/res/adventure/Shandalar Old Border/config.json b/forge-gui/res/adventure/Shandalar Old Border/config.json
index 5821f361163..541274739f7 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/config.json	
+++ b/forge-gui/res/adventure/Shandalar Old Border/config.json	
@@ -70,9 +70,7 @@
     "Underground Sea",
     "Volcanic Island"
   ],
-  "restrictedEditions": [
-
-  ],
+  "restrictedEditions": [],
   "allowedEditions": [
     "LEA",
     "LEB",
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/enemies.json b/forge-gui/res/adventure/Shandalar Old Border/world/enemies.json
index 45317d55b0c..c2a664a0e40 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/enemies.json	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/enemies.json	
@@ -5154,7 +5154,7 @@
 			"Aberration",
 			"Animal",
 			"Chandra",
-			"FIre",
+			"Fire",
 			"IdentityRed"
 		]
 	},
@@ -5259,7 +5259,7 @@
 			"Human",
 			"Pyromancer",
 			"Wizard",
-			"FIre",
+			"Fire",
 			"IdentityRed"
 		]
 	},
@@ -5364,7 +5364,7 @@
 			"Pyromancer",
 			"Human",
 			"Wizard",
-			"FIre",
+			"Fire",
 			"IdentityRed"
 		]
 	},
@@ -5469,7 +5469,7 @@
 			"Wizard",
 			"Chandra",
 			"Human",
-			"FIre",
+			"Fire",
 			"IdentityRed"
 		]
 	},
@@ -10837,7 +10837,7 @@
 		],
 		"colors": "R",
 		"questTags": [
-			"FIre",
+			"Fire",
 			"Elemental",
 			"Humanoid",
 			"Flying",
@@ -16103,7 +16103,7 @@
 	},
 	{
 		"name": "Human elite",
-		"nameOverride": "Legionaire",
+		"nameOverride": "Legionnaire",
 		"sprite": "sprites/enemy/humanoid/human/soldier/legionite.atlas",
 		"deck": [
 			"decks/standard/human_good.json"
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/quests.json b/forge-gui/res/adventure/Shandalar Old Border/world/quests.json
index c63ff7fd6e0..ad349c6f70d 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/quests.json	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/quests.json	
@@ -41,7 +41,7 @@
 					},
 					{
 						"name": "\"And what if I find the right people myself?\"",
-						"text": "He shrugs as though that wouldn't bother him. \"Then I'll have to find someone bigger, badder, and most importantly, faster than you to work with.\"",
+						"text": "He shrugs as though that wouldn't bother him. \"Then I'll have to find someone bigger, badder, and, most importantly, faster than you to work with.\"",
 						"options": [
 							{
 								"name": "\"Good luck with that.\" (Decline Quest)"
@@ -591,7 +591,7 @@
 												]
 											}
 										],
-										"name": "Quickly and discretely help yourself to a spell before continuing.",
+										"name": "Quickly and discreetly help yourself to a spell before continuing.",
 										"text": "You receive a spell of dubious quality.",
 										"options": [
 											{
@@ -1268,7 +1268,7 @@
 							}
 						],
 						"name": "You shrug your shoulders. It's not your problem. (Decline Quest)",
-						"text": "The criminal glances at you and hurredly scampers off. (-1 Reputation)",
+						"text": "The criminal glances at you and hurriedly scampers off. (-1 Reputation)",
 						"options": [
 							{
 								"name": "(Continue)"
@@ -1327,7 +1327,7 @@
 						]
 					},
 					{
-						"name": "You clear your throat in an exagerated manner.",
+						"name": "You clear your throat in an exaggerated manner.",
 						"text": "The $(enemy_2) drops a small satchel as they begin to run away.",
 						"options": [
 							{
@@ -2200,7 +2200,7 @@
 							},
 							{
 								"name": "Curious as to why this would be on the board, your gaze lingers for a moment.",
-								"text": "As you look at the wordless paper, words find their way into your mind by unknown, other, means. 'FIND.' '{COLOR=red}KILL!{ENDCOLOR}' 'REWARD.'",
+								"text": "As you look at the wordless paper, words find their way into your mind by unknown means. 'FIND.' '{COLOR=red}KILL!{ENDCOLOR}' 'REWARD.'",
 								"options": [
 									{
 										"action": [
@@ -2285,7 +2285,7 @@
 						"options": [
 							{
 								"name": "You continue to read.",
-								"text": "Secondly, another's handwriting has scrawled over what might have actually been a romantic bit, with the following. \"Don't bother. I killed him yesterday\"",
+								"text": "Secondly, another's handwriting was scrawled over what might have actually been a romantic bit with the following. \"Don't bother. I killed him yesterday\"",
 								"options": [
 									{
 										"name": "You shake your head and walk away. (Decline Quest)"
@@ -2870,7 +2870,7 @@
 		"options": [
 			{
 				"name": "\"Capable just so happens to be my middle name.\"",
-				"text": "He looks perplexed for a moment, but glances back at the wagon as though distracted by it. \"I was hoping you could handle some business for me\"",
+				"text": "He looks perplexed for a moment, but glances back at the wagon as though distracted by it. \"I was hoping you could handle some business for me.\"",
 				"options": [
 					{
 						"name": "Business? What sort of business?",
@@ -3646,7 +3646,7 @@
 				"POIReference": "$(poi_2)"
 			}
 		],
-		"text": "Despite the insistance of the compass needle, you decide that you will not finish clearing the $(poi_2). As if it could sense this somehow, the onyx compass disappears. (-2 Local Reputation)",
+		"text": "Despite the insistence of the compass needle, you decide that you will not finish clearing the $(poi_2). As if it could sense this somehow, the onyx compass disappears. (-2 Local Reputation)",
 		"options": [
 			{
 				"name": "(Quest Failed)"
@@ -3749,7 +3749,7 @@
 	"name": "A Vision of Destruction",
 	"description": "Clear out all enemies in the $(poi_1) and report back.",
 	"offerDialog": {
-		"text": "Walking in to the village, an old man looks up as if expecting you and rushes over (to the extent that he is able) \"$(playername). I need you to turn around and leave. NOW.\"",
+		"text": "Walking into the village, an old man looks up as if expecting you and rushes over (to the extent that he is able) \"$(playername). I need you to turn around and leave. NOW.\"",
 		"options": [
 			{
 				"name": "You take a good look at the old man, but do not recognize his features. \"Should I know you?\"",
@@ -4339,7 +4339,7 @@
 												"POIReference": ""
 											}
 										],
-										"name": "\"So long as I get to keep whatever I find along the way, too.\" (Accept Quest)."
+										"name": "\"So long as I get to keep whatever I find along the way too.\" (Accept Quest)."
 									},
 									{
 										"name": "\"I don't think I'm interested. Sorry.\" (Decline Quest)"
@@ -4558,7 +4558,7 @@
 				"text": "Most of the ads are nondescript, weather worn, or written in an unfamiliar language. A few catch your eye, however.",
 				"options": [
 					{
-						"name": "You look at what seems to be an advertisement of some sort, off to one side.",
+						"name": "You look at what seems to be an advertisement of some sort off to one side.",
 						"text": "It reads: \"Gimgee's self-replicating paper. When you need unlimited paper or to clear a forest from afar, it's got to be Gimgee's.\"",
 						"options": [
 							{
@@ -4627,7 +4627,7 @@
 	},
 	"prologue": {},
 	"epilogue": {
-		"text": "You feel awkward pulling your $(enemy_1)s in to town, but it doesn't actually seem that out of place here with other macabre scenes around. (This quest will only given in black biome in the future).",
+		"text": "You feel awkward pulling your $(enemy_1)s into town, but it doesn't actually seem that out of place here with other macabre scenes around. (This quest will only given in black biome in the future).",
 		"options": [
 			{
 				"name": "You look around for someone that seems to be expecting bodies.",
@@ -4678,7 +4678,7 @@
 					},
 					{
 						"name": "You take a closer look at the carts.",
-						"text": "$(enemy_1)s and a few random creatures are filling most of one cart., while the other holds a few identical satchels of goods.",
+						"text": "$(enemy_1)s and a few random creatures are filling most of one cart, while the other holds a few identical satchels of goods.",
 						"options": [
 							{
 								"name": "Turn your attention to the carts' attendant.",
@@ -5116,7 +5116,7 @@
 													}
 												],
 												"name": "\"And if I bring in six?\" (Accept Quest)",
-												"text": "\"Then you will have brought down too many.We're thinning them, not removing them.\"",
+												"text": "\"Then you will have brought down too many. We're thinning them, not removing them.\"",
 												"options": [
 													{
 														"name": "You nod and prepare to leave. (Continue)"
@@ -5600,7 +5600,7 @@
 										"name": "\"I can do that.\" (Accept Quest)"
 									},
 									{
-										"name": "\"Sorry, I just decided that I'm more in to magic than science.\" (Decline Quest)"
+										"name": "\"Sorry, I just decided that I'm more into magic than science.\" (Decline Quest)"
 									}
 								]
 							}
@@ -5892,7 +5892,7 @@
 	"name": "Heart of a Champion",
 	"description": "Enter and win an upcoming arena event.",
 	"offerDialog": {
-		"text": "\"DO YOU HAVE WHAT IT TAKES? ARE YOU THE BEST IN SHANDALAR???\" A young girl yells at the top of her lungs at each passer by in the town. Most people come in to view already covering their ears, having heard this plenty of times before.",
+		"text": "\"DO YOU HAVE WHAT IT TAKES? ARE YOU THE BEST IN SHANDALAR???\" A young girl yells at the top of her lungs at each passer by in the town. Most people come into view already covering their ears, having heard this plenty of times before.",
 		"options": [
 			{
 				"name": "You walk over to her. \"Okay kid, settle down, I heard you. What's this about?\"",
@@ -6119,7 +6119,7 @@
 				]
 			},
 			{
-				"name": "Let me guess, you want to me to deal with this situation ?",
+				"name": "Let me guess, you want to me to deal with this situation?",
 				"text": "Well yes. Let me explain the situation; Xira's balls have become a bit of a problem. She has been hosting them every night, and they're becoming increasingly extravagant and disruptive. The townspeople are getting tired of the constant noise and commotion, and it's affecting their daily lives.",
 				"options": [
 					{
@@ -6314,7 +6314,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are.",
 				"options": [
 					{
@@ -6323,11 +6323,11 @@
 				]
 			},
 			{
-				"name": "Let me guess, you want to me to deal with this situation ?",
+				"name": "Let me guess, you want to me to deal with this situation?",
 				"text": "The factory, now infested with an array of peculiar mechs and skilled artificers, poses a grave threat to our community and the delicate balance of technology. Slobad, once hailed as a genius, was known for his unorthodox creations and their volatile nature. However, a catastrophic incident occurred years ago, leading to the factory's abandonment. Now, the mechanical monstrosities have been reactivated, wreaking havoc on unsuspecting wanderers and nearby settlements.",
 				"options": [
 					{
-						"name": "I see. So you want me to go to his factory and defeat him ?",
+						"name": "I see. So you want me to go to his factory and defeat him?",
 						"text": "Your task, should you accept it, is to venture into Slobad's factory and cleanse it of its mechanical menaces. You will face a myriad of strange mechs, each with its unique capabilities and behaviors. Additionally, the factory's artificers, skilled engineers corrupted by their own creations, will fiercely defend their inventions. Making your mission all the more challenging.",
 						"options": [
 							{
@@ -6347,7 +6347,7 @@
 										"POIReference": ""
 									}
 								],
-								"name": "I'll take care of it, note the location of the factory on my map.(Accept Quest) (WARNING HARD QUEST)",
+								"name": "I'll take care of it. If you'd note the location of the factory on my map... (Accept Quest) (WARNING HARD QUEST)",
 								"text": "Once you have vanquished the mechanical threat and quelled the chaos within the factory, return to me, Maven the Alchemist, and you shall be rewarded handsomely for your bravery and service to our community. Be warned, however, for the path ahead will test your mettle, cunning, and combat prowess. May fortune favor you on this perilous undertaking!"
 							},
 							{
@@ -6367,7 +6367,7 @@
 										"POIReference": ""
 									}
 								],
-								"name": "\"Do you really think I have nothing better to do ? Find someone else to take care of it\" (Decline Quest)",
+								"name": "\"Do you really think I have nothing better to do? Find someone else to take care of it\" (Decline Quest)",
 								"text": "Maven the Alchemist keeps a passive look on his face. \"Soon those things will be balanced as well.\"",
 								"options": [
 									{
@@ -6518,7 +6518,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are. (-1 Local Reputation)",
 				"options": [
 					{
@@ -6531,7 +6531,7 @@
 				"text": "Thank you, noble adventurer. Slimefoot is a creature of pure malevolence. A monstrous being that has taken root in the heart of the treacherous swamp. Its corrosive touch and toxic aura have brought devastation to our lands. To defeat it, you must journey through the perilous swamp, filled with treacherous terrain and deadly creatures lurking within.",
 				"options": [
 					{
-						"name": "I see. So you want me to travel to Slimefoots swamp and defeat him ?",
+						"name": "I see. So you want me to travel to Slimefoot's swamp and defeat him?",
 						"text": "Slimefoot is a formidable foe, adept at both offense and defense. Its body secretes a corrosive slime, and its tentacles strike with lightning speed. Prepare yourself for a challenging battle, my friend. Draw upon your combat skills, use potions and magical abilities wisely, and exploit any weaknesses you can find. Only then can you hope to overcome this vile creature.",
 						"options": [
 							{
@@ -6674,7 +6674,7 @@
 		{
 			"id": 2,
 			"name": "Travel",
-			"description": "Return to town and report your success in clearing Slimefoots Lair.",
+			"description": "Return to town and report your success in clearing Slimefoot's Lair.",
 			"mapFlag": "",
 			"mapFlagValue": 1,
 			"here": true,
@@ -6717,7 +6717,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are.",
 				"options": [
 					{
@@ -6726,7 +6726,7 @@
 				]
 			},
 			{
-				"name": "Let me guess, you want to me to deal with this situation ?",
+				"name": "Let me guess, you want to me to deal with this situation?",
 				"text": "The town council seeks the aid of a skilled and courageous individual like yourself to venture into the depths of the old sewer near this town and eradicate this slimy menace once and for all.",
 				"options": [
 					{
@@ -6750,7 +6750,7 @@
 										"POIReference": ""
 									}
 								],
-								"name": "Consider it done, note the location of the old sewers on my map. (Accept Quest) (WARNING HARD QUEST)"
+								"name": "Consider it done. If you'd note the location of the old sewers on my map... (Accept Quest) (WARNING HARD QUEST)"
 							},
 							{
 								"action": [
@@ -7095,7 +7095,7 @@
 										"options": [
 											{
 												"name": "\"What was the spell?\"",
-												"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam.... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
+												"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
 												"options": [
 													{
 														"name": "\"So, a portal?\"",
@@ -7344,7 +7344,7 @@
 			],
 			"objective": "Travel",
 			"prologue": {
-				"text": "All major locations in Shandalar can be divided up in to one of two categories: towns and dungeons.",
+				"text": "All major locations in Shandalar can be divided up into one of two categories: towns and dungeons.",
 				"options": [
 					{
 						"name": "(Continue)",
@@ -7381,7 +7381,7 @@
 				"options": [
 					{
 						"name": "(Continue)",
-						"text": "The inn contains some special events. You can also sell extra cards there, or buy temporary extra health.\n\nThe '?' sign denotes a town square / job board where you can obtain side quests.\n\nAll of the other buildings with signs out front are shops, most of them sell cards.\n\nTo leave town, walk back toward the edge of the screen just below your current location.",
+						"text": "The inn contains some special events. You can also sell extra cards there, or buy temporary extra health.\n\nThe '?' sign denotes a town square or a job board where you can obtain side quests.\n\nAll of the other buildings with signs out front are shops, most of them sell cards.\n\nTo leave town, walk back toward the edge of the screen just below your current location.",
 						"options": [
 							{
 								"name": "(Continue)",
@@ -7441,7 +7441,7 @@
 				"options": [
 					{
 						"name": "(Continue)",
-						"text": "Your next objective is to defeat any single enemy in a duel. You can find them in a dungeon like this one, or wandering around outside on the world map. To begin a duel, simply walk in to the enemy.",
+						"text": "Your next objective is to defeat any single enemy in a duel. You can find them in a dungeon like this one, or wandering around outside on the world map. To begin a duel, simply walk into the enemy.",
 						"options": [
 							{
 								"name": "(Continue)",
@@ -7713,7 +7713,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are.",
 				"options": [
 					{
@@ -7921,7 +7921,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are.",
 				"options": [
 					{
@@ -8127,7 +8127,7 @@
 						"POIReference": ""
 					}
 				],
-				"name": "Sorry, I don't have to the time for this. (Decline Quest)",
+				"name": "Sorry, I don't have the time for this. (Decline Quest)",
 				"text": "Figured you weren't up to the challenge, come back to me when you are.",
 				"options": [
 					{
@@ -8367,7 +8367,7 @@
 						"POIReference": "$(poi_3)"
 					}
 				],
-				"name": "(Quest complete)"
+				"name": "(Quest Complete)"
 			}
 		]
 	},
@@ -8551,7 +8551,7 @@
 						"POIReference": "$(poi_3)"
 					}
 				],
-				"name": "(Quest complete)"
+				"name": "(Quest Complete)"
 			}
 		]
 	},
@@ -8735,7 +8735,7 @@
 						"POIReference": "$(poi_3)"
 					}
 				],
-				"name": "(Quest complete)"
+				"name": "(Quest Complete)"
 			}
 		]
 	},
@@ -8918,7 +8918,7 @@
 						"POIReference": "$(poi_3)"
 					}
 				],
-				"name": "(Quest complete)"
+				"name": "(Quest Complete)"
 			}
 		]
 	},
@@ -9102,7 +9102,7 @@
 						"POIReference": "$(poi_3)"
 					}
 				],
-				"name": "(Quest complete)"
+				"name": "(Quest Complete)"
 			}
 		]
 	},
@@ -9260,7 +9260,7 @@
 			],
 			"objective": "CompleteQuest",
 			"prologue": {
-				"text": "Note: Since this quest objective is to complete other quests, your navigation arrow will lead you to quest sources while you are tracking it. Once you accept a side quest, go in to your quest log and track that quest in order to update navigation hints.",
+				"text": "Note: Since this quest objective is to complete other quests, your navigation arrow will lead you to quest sources while you are tracking it. Once you accept a side quest, go into your quest log and track that quest in order to update navigation hints.",
 				"options": [
 					{
 						"name": "(Continue)"
@@ -9715,7 +9715,7 @@
 			"prerequisiteIDs": [ 4 ],
 			"prologue": {},
 			"epilogue": {
-				"text": "Within moments of walking in to town, a wiry young elf approaches you. Or at least he looks young, it's so hard to tell with elves. He briefly holds out an amulet identical to the one Donovan gave you, and beckons you to follow him to the inn.",
+				"text": "Within moments of walking into town, a wiry young elf approaches you. Or at least he looks young, it's so hard to tell with elves. He briefly holds out an amulet identical to the one Donovan gave you, and beckons you to follow him to the inn.",
 				"options": [
 					{
 						"action": [
@@ -9925,7 +9925,7 @@
 				"options": [
 					{
 						"name": "(Continue)",
-						"text": "A small group of scholars carrying books around the entrance seems to confirm the building's purpose, but something odd about their manerisms has you on edge as you approach.",
+						"text": "A small group of scholars carrying books around the entrance seems to confirm the building's purpose, but something odd about their mannerisms has you on edge as you approach.",
 						"options": [
 							{
 								"name": "(Continue)"
@@ -10492,7 +10492,7 @@
 						"POIReference": ""
 					}
 				],
-				"text": "As you walk in to town, a familiar cloaked figure is waiting and watching for you.",
+				"text": "As you walk into town, a familiar cloaked figure is waiting and watching for you.",
 				"options": [
 					{
 						"name": "(Continue)"
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/shops.json b/forge-gui/res/adventure/Shandalar Old Border/world/shops.json
index cd02a244a45..c702be7e517 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/shops.json	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/shops.json	
@@ -467,7 +467,7 @@
 		}]
 	},{                                      
 	"name":"White4",                  
-	"description":"Only mostly dead",
+	"description":"Only Mostly Dead",
 	"spriteAtlas":"maps/tileset/buildings.atlas",   
 	"sprite":"RotatingShop",
 	"overlaySprite":"Overlay6White",
@@ -1415,7 +1415,7 @@
 		}]
 	},{                                    
 	"name":"Blue",                  
-	"description":"Hermitic Study",
+	"description":"Hermetic Study",
 	"spriteAtlas":"maps/tileset/buildings.atlas",   
 	"sprite":"BlueShop",
 	  "rewards": [
@@ -1830,7 +1830,7 @@
 		}]
 	},{
 	  "name":"Angel",
-	  "description":"Halos R' Us",
+	  "description":"Halos 'R' Us",
 	  "spriteAtlas":"maps/tileset/buildings.atlas",
 	  "sprite":"AngelShop",
 	  "rewards": [ { "count":8, "subTypes": ["Angel"] } ]
@@ -2577,7 +2577,7 @@
 	  "rewards": [ { "count":4, "type":"Union", "cardUnion": [ { "subTypes": ["Rogue"] }, { "cardText": "Rogue" } ] }, { "count":4, "type":"Union", "cardUnion": [ { "subTypes": ["Rogue"], "colors": ["blue"] }, { "cardText": "Rogue", "colors": ["blue"] } ] } ]
 	},{
 	  "name":"Shaman",
-	  "description":"Shaman for ya man",
+	  "description":"Shaman for Ya Man",
 	  "spriteAtlas":"maps/tileset/buildings.atlas",
 	  "sprite":"ShamanShop",
 	  "rewards": [ { "count":8, "type":"Union", "cardUnion": [ { "subTypes": ["Shaman"] }, { "cardText": "Shaman" } ] } ]
@@ -2671,7 +2671,7 @@
 	  },
 	  {
 		"name": "GreenBoosterPackShop",
-		"description":"Nature’s Nurture Packs",
+		"description":"Nature's Nurture Packs",
 		"spriteAtlas":"maps/tileset/buildings.atlas",
 		"overlaySprite": "Overlay4Green",
 		"sprite": "BoosterShop",
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/shops.json.bak b/forge-gui/res/adventure/Shandalar Old Border/world/shops.json.bak
index 1eb639d23ca..1cfdd35ec43 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/shops.json.bak	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/shops.json.bak	
@@ -467,7 +467,7 @@
 		}]
 	},{                                      
 	"name":"White4",                  
-	"description":"Only mostly dead",
+	"description":"Only Mostly Dead",
 	"spriteAtlas":"maps/tileset/buildings.atlas",   
 	"sprite":"RotatingShop",
 	"overlaySprite":"Overlay6White",
@@ -1341,7 +1341,7 @@
 		}]
 	},{                                    
 	"name":"Blue",                  
-	"description":"Hermitic Study",
+	"description":"Hermetic Study",
 	"spriteAtlas":"maps/tileset/buildings.atlas",   
 	"sprite":"BlueShop",
 	  "rewards": [
@@ -1756,7 +1756,7 @@
 		}]
 	},{
 	  "name":"Angel",
-	  "description":"Halos R' Us",
+	  "description":"Halos 'R' Us",
 	  "spriteAtlas":"maps/tileset/buildings.atlas",
 	  "sprite":"AngelShop",
 	  "rewards": [ { "count":8, "subTypes": ["Angel"] } ]
@@ -2431,7 +2431,7 @@
 	  "rewards": [ { "count":4, "type":"Union", "cardUnion": [ { "subTypes": ["Rogue"] }, { "cardText": "Rogue" } ] }, { "count":4, "type":"Union", "cardUnion": [ { "subTypes": ["Rogue"], "colors": ["blue"] }, { "cardText": "Rogue", "colors": ["blue"] } ] } ]
 	},{
 	  "name":"Shaman",
-	  "description":"Shaman for ya man",
+	  "description":"Shaman for Ya Man",
 	  "spriteAtlas":"maps/tileset/buildings.atlas",
 	  "sprite":"ShamanShop",
 	  "rewards": [ { "count":8, "type":"Union", "cardUnion": [ { "subTypes": ["Shaman"] }, { "cardText": "Shaman" } ] } ]
@@ -2525,7 +2525,7 @@
 	  },
 	  {
 		"name": "GreenBoosterPackShop",
-		"description":"Nature’s Nurture Packs",
+		"description":"Nature's Nurture Packs",
 		"spriteAtlas":"maps/tileset/buildings.atlas",
 		"overlaySprite": "Overlay4Green",
 		"sprite": "BoosterShop",
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_black.txt b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_black.txt
index 6389c96e9aa..0bcfe96935b 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_black.txt	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_black.txt	
@@ -369,7 +369,7 @@ Mirelight
 Ravencrest Mill
 Korven's Tomb
 Gorgon's Gallery
-Moldermnouth
+Moudhrelmont
 The Three Sisters
 Moldermouth
 Reaver's Point
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_blue.txt b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_blue.txt
index c7bf62dbd28..565a46be16b 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_blue.txt	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_blue.txt	
@@ -335,7 +335,7 @@ Fourmill Run
 Port Rachkham
 Cloudy Shallows
 Slumnis
-Silver Pointe
+Silver Point
 Abjuration Point
 Crow's Nest
 The Rookery
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_green.txt b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_green.txt
index 575e2e7d3e2..a339330f88c 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_green.txt	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_green.txt	
@@ -333,7 +333,7 @@ Three Oaks
 Bowerglen
 Redwood Ford
 Ogre's Gate
-Mandrake Hollow 
+Mandrake Hollow
 Irongate Mott
 Felden Pond
 Foxglove Point
diff --git a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_waste.txt b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_waste.txt
index c7b778d7b38..5e49b77af8c 100644
--- a/forge-gui/res/adventure/Shandalar Old Border/world/town_names_waste.txt	
+++ b/forge-gui/res/adventure/Shandalar Old Border/world/town_names_waste.txt	
@@ -45,7 +45,7 @@ Celestine Crossing
 Celestine Town
 Celestine Village
 Celestine Market
-Camp Celestine 
+Camp Celestine
 Celestine Tower
 Celestine Bazaar
 Celestine Forge
@@ -73,7 +73,7 @@ Eloren Crossing
 Eloren Town
 Eloren Village
 Eloren Market
-Camp Eloren 
+Camp Eloren
 Eloren Tower
 Eloren Bazaar
 Eloren Forge
@@ -87,7 +87,7 @@ Hornwall Crossing
 Hornwall Town
 Hornwall Village
 Hornwall Market
-Camp Hornwall 
+Camp Hornwall
 Hornwall Tower
 Hornwall Bazaar
 Hornwall Forge
@@ -101,7 +101,7 @@ Kraag Crossing
 Kraagtown
 Kraag Village
 Kraag Market
-Camp Kraag 
+Camp Kraag
 Kraag Tower
 Kraag Bazaar
 Kraag Forge
@@ -385,7 +385,7 @@ Merrowcreek
 Crookedbrook
 Warrior's Rest
 Golemstooth
-Gobspike 
+Gobspike
 Rabbitsden
 Greyrock
 Rabbitpath
diff --git a/forge-gui/res/adventure/Shandalar/world/quests.json b/forge-gui/res/adventure/Shandalar/world/quests.json
index cc8eb1902ca..d5c74fef141 100644
--- a/forge-gui/res/adventure/Shandalar/world/quests.json
+++ b/forge-gui/res/adventure/Shandalar/world/quests.json
@@ -6347,7 +6347,7 @@
 										"POIReference": ""
 									}
 								],
-								"name": "I'll take care of it, note the location of the factory on my map.(Accept Quest) (WARNING HARD QUEST)",
+								"name": "I'll take care of it. If you'd note the location of the factory on my map... (Accept Quest) (WARNING HARD QUEST)",
 								"text": "Once you have vanquished the mechanical threat and quelled the chaos within the factory, return to me, Maven the Alchemist, and you shall be rewarded handsomely for your bravery and service to our community. Be warned, however, for the path ahead will test your mettle, cunning, and combat prowess. May fortune favor you on this perilous undertaking!"
 							},
 							{
@@ -7096,7 +7096,7 @@
 										"options": [
 											{
 												"name": "\"What was the spell?\"",
-												"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam.... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
+												"text": "\"I'm not an expert in the island magics, so I didn't recognize it until a hole opened in front of 'em, and through they swam... Flopped...? Went. Anyhow, needless to say I was stunned.\"",
 												"options": [
 													{
 														"name": "\"So, a portal?\"",
diff --git a/forge-gui/res/adventure/Shandalar/world/shops.json b/forge-gui/res/adventure/Shandalar/world/shops.json
index c4daabc2a53..fda46190466 100644
--- a/forge-gui/res/adventure/Shandalar/world/shops.json
+++ b/forge-gui/res/adventure/Shandalar/world/shops.json
@@ -1439,7 +1439,7 @@
     }]
 },{                                    
 "name":"Azorius",      
-"description":"Azorious Shop, LLC",
+"description":"Azorius Shop, LLC",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"AzoriusShop",
   "rewards": [
diff --git a/forge-gui/res/adventure/Shandalar/world/town_names_blue.txt b/forge-gui/res/adventure/Shandalar/world/town_names_blue.txt
index c7bf62dbd28..565a46be16b 100644
--- a/forge-gui/res/adventure/Shandalar/world/town_names_blue.txt
+++ b/forge-gui/res/adventure/Shandalar/world/town_names_blue.txt
@@ -335,7 +335,7 @@ Fourmill Run
 Port Rachkham
 Cloudy Shallows
 Slumnis
-Silver Pointe
+Silver Point
 Abjuration Point
 Crow's Nest
 The Rookery
diff --git a/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Awakening.fullborder.jpg b/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Awakening.fullborder.jpg
new file mode 100644
index 00000000000..993621cd54f
Binary files /dev/null and b/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Awakening.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Presence.fullborder.jpg b/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Presence.fullborder.jpg
new file mode 100644
index 00000000000..05ac35a64e8
Binary files /dev/null and b/forge-gui/res/adventure/common/custom_card_pics/Emrakul's Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/common/custom_cards/emrakul_awakening.txt b/forge-gui/res/adventure/common/custom_cards/emrakul_awakening.txt
new file mode 100644
index 00000000000..20feed64b65
--- /dev/null
+++ b/forge-gui/res/adventure/common/custom_cards/emrakul_awakening.txt
@@ -0,0 +1,11 @@
+Name:Emrakul's Awakening
+ManaCost:no cost
+Types:Artifact
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ LT7 | Execute$ TrigFlip | TriggerDescription$ At the beginning of your end step, if you have fewer than seven cards in hand, flip a coin. If you win the flip, draw cards equal to the difference.
+SVar:TrigFlip:DB$ FlipACoin | Defined$ You | WinSubAbility$ TrigDraw
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
+SVar:X:Count$ValidHand Card.YouOwn
+SVar:Difference:Number$7/Minus.X
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigWish | TriggerDescription$ At the beginning of your upkeep, put a land card from your library onto the battlefield at random.
+SVar:TrigWish:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.YouCtrl | Hidden$ True | AtRandom$ True
+Oracle:At the beginning of your upkeep, put a land card from your library onto the battlefield at random.\nAt the beginning of your end step, if you have fewer than seven cards in hand, flip a coin. If you win the flip, draw cards equal to the difference.
\ No newline at end of file
diff --git a/forge-gui/res/adventure/common/custom_cards/emrakul_presence.txt b/forge-gui/res/adventure/common/custom_cards/emrakul_presence.txt
new file mode 100644
index 00000000000..6d513309c9f
--- /dev/null
+++ b/forge-gui/res/adventure/common/custom_cards/emrakul_presence.txt
@@ -0,0 +1,10 @@
+Name:Emrakul's Presence
+ManaCost:no cost
+Types:Artifact
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | CheckSVar$ X | SVarCompare$ LT8 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you have fewer than eight cards in hand, draw cards equal to the difference.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
+SVar:X:Count$ValidHand Card.YouOwn
+SVar:Difference:Number$8/Minus.X
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigWish | TriggerDescription$ At the beginning of your upkeep, put a random permanent card from your graveyard or exile onto the battlefield.
+SVar:TrigWish:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Battlefield | ChangeType$ Permanent.YouCtrl | Hidden$ True | AtRandom$ True
+Oracle:At the beginning of your upkeep, put a random permanent card from your graveyard or exile onto the battlefield.\nAt the beginning of your end step, if you have fewer than eight cards in hand, draw cards equal to the difference.
diff --git a/forge-gui/res/adventure/common/decks/boss/emrakul.dck b/forge-gui/res/adventure/common/decks/boss/emrakul.dck
index 4dabcd02b8a..b2c6eacca77 100644
--- a/forge-gui/res/adventure/common/decks/boss/emrakul.dck
+++ b/forge-gui/res/adventure/common/decks/boss/emrakul.dck
@@ -1,19 +1,25 @@
 [metadata]
 Name=Emrakul
 [Main]
-4 Black Lotus
-4 Crystal Vein
+1 Black Lotus
+2 Vesuva
 4 Eldrazi Temple
-3 Emrakul, the Aeons Torn
-3 Emrakul, the Promised End
+3 Forsaken Monument
+2 It That Betrays
+2 Pathrazer of Ulamog
+2 Void Winnower
+2 Emrakul, the Aeons Torn
+2 Emrakul, the Promised End
 4 Expedition Map
 2 Eye of Ugin
-4 Mana Vault
+4 Ancient Tomb
+1 Strip Mine
+4 All is Dust
 2 Kozilek, Butcher of Truth
 2 Kozilek, the Great Distortion
-4 Mana Crypt
-4 Sol Ring
-4 Titan's Presence
+1 Mana Crypt
+1 Sol Ring
+3 Titan's Presence
 2 Ulamog, the Ceaseless Hunger
 2 Ulamog, the Infinite Gyre
 4 Urza's Mine
diff --git a/forge-gui/res/adventure/common/decks/standard/crab.json b/forge-gui/res/adventure/common/decks/standard/crab.json
index 56a7d1a5522..8fcf24f389d 100644
--- a/forge-gui/res/adventure/common/decks/standard/crab.json
+++ b/forge-gui/res/adventure/common/decks/standard/crab.json
@@ -1,10 +1,10 @@
 {                                    
-"name":"Crab",
+  "name":"Crab",
   "template":
   {
    "count":60,
    "colors":["Blue"],
-   "tribe":"Crab",        
+   "tribe":"Crab",
    "tribeCards":1.0,
    "tribeSynergyCards":0.2,
    "rares":0.4
diff --git a/forge-gui/res/adventure/common/maps/map/emrakul/emrakul_legacy.tmx b/forge-gui/res/adventure/common/maps/map/emrakul/emrakul_legacy.tmx
index c5af577751c..9da20bc9569 100644
--- a/forge-gui/res/adventure/common/maps/map/emrakul/emrakul_legacy.tmx
+++ b/forge-gui/res/adventure/common/maps/map/emrakul/emrakul_legacy.tmx
@@ -38,7 +38,12 @@
   <object id="49" template="../../obj/gold.tx" x="106" y="216"/>
   <object id="50" template="../../obj/enemy.tx" x="182.772" y="284.992" width="64" height="64">
    <properties>
+    <property name="effect" value="{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Emrakul's Presence&quot;]}"/>
     <property name="enemy" value="Emrakul"/>
+    <property name="spawn.Easy" type="bool" value="false"/>
+    <property name="spawn.Hard" type="bool" value="true"/>
+    <property name="spawn.Insane" type="bool" value="true"/>
+    <property name="spawn.Normal" type="bool" value="false"/>
    </properties>
   </object>
   <object id="51" template="../../obj/entry_up.tx" x="209" y="480">
@@ -46,6 +51,16 @@
     <property name="teleport" value=""/>
    </properties>
   </object>
+  <object id="52" template="../../obj/enemy.tx" x="182.772" y="284.992" width="64" height="64">
+     <properties>
+      <property name="effect" value="{ &quot;startBattleWithCardInCommandZone&quot;: [ &quot;Emrakul's Awakening&quot;]}"/>
+      <property name="enemy" value="Emrakul"/>
+      <property name="spawn.Easy" type="bool" value="true"/>
+      <property name="spawn.Hard" type="bool" value="false"/>
+      <property name="spawn.Insane" type="bool" value="false"/>
+      <property name="spawn.Normal" type="bool" value="true"/>
+     </properties>
+    </object>
   <object id="69" template="../../obj/enemy.tx" x="132.844" y="401.619">
    <properties>
     <property name="dialog">[{
diff --git a/forge-gui/res/adventure/common/maps/map/grove/grove_1_bears.tmx b/forge-gui/res/adventure/common/maps/map/grove/grove_1_bears.tmx
index 8bf9638f732..73e8f3c27fd 100644
--- a/forge-gui/res/adventure/common/maps/map/grove/grove_1_bears.tmx
+++ b/forge-gui/res/adventure/common/maps/map/grove/grove_1_bears.tmx
@@ -142,7 +142,7 @@
    <properties>
     <property name="dialog">[
 	{
-		&quot;text&quot;: &quot;Suddenly you hear strange sounds coming behind you. A coarse voice thunders behind you: HONEY MINE, YOU DIE !&quot;,
+		&quot;text&quot;: &quot;Suddenly you hear strange sounds coming behind you. A coarse voice thunders behind you: HONEY MINE, YOU DIE!&quot;,
 		&quot;options&quot;: [
 			{
 				&quot;name&quot;: &quot;You have a bad feeling about this.&quot;,
diff --git a/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx b/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx
index 27a3d85c4db..39c0710a9d6 100644
--- a/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx
+++ b/forge-gui/res/adventure/common/maps/map/main_story_explore/library_of_varsil_3.tmx
@@ -94,7 +94,7 @@
    <properties>
     <property name="dialog">[
     {
-        &quot;text&quot;: &quot;'Shandalaar’s Most Burnable Cities'. Well, this one sounds like light reading...&quot;,
+        &quot;text&quot;: &quot;'Shandalaar's Most Burnable Cities'. Well, this one sounds like light reading...&quot;,
         &quot;options&quot;: [
             {
                 &quot;name&quot;: &quot;(Continue)&quot;,
diff --git a/forge-gui/res/adventure/common/maps/map/maze/maze_2.tmx b/forge-gui/res/adventure/common/maps/map/maze/maze_2.tmx
index be9fad594ed..583faa56ca2 100644
--- a/forge-gui/res/adventure/common/maps/map/maze/maze_2.tmx
+++ b/forge-gui/res/adventure/common/maps/map/maze/maze_2.tmx
@@ -63,7 +63,7 @@
    <properties>
     <property name="dialog">[
 	{
-		&quot;text&quot;: &quot;Suddenly you hear strange sounds coming behind you. A strange voice calls out hoarsely: INTRUDER ! This is your final mistake ! &quot;,
+		&quot;text&quot;: &quot;Suddenly you hear strange sounds coming behind you. A strange voice calls out hoarsely: INTRUDER! This is your final mistake!&quot;,
 		&quot;options&quot;: [
 			{
 				&quot;name&quot;: &quot;You have a bad feeling about this.&quot;,
diff --git a/forge-gui/res/adventure/common/maps/map/skep/skep_outer.tmx b/forge-gui/res/adventure/common/maps/map/skep/skep_outer.tmx
index 5d24e16071f..c80736363fd 100644
--- a/forge-gui/res/adventure/common/maps/map/skep/skep_outer.tmx
+++ b/forge-gui/res/adventure/common/maps/map/skep/skep_outer.tmx
@@ -54,7 +54,7 @@
         &quot;options&quot;: [
           {
             &quot;name&quot;: &quot;Usurped? What are you talking about?&quot;,
-            &quot;text&quot;: &quot;For millenia I've been keeping the Sliver of the Skep healthy and peaceful,keeping them under control to prevent them attacking outsiders. Everything changed when the Sliver Queen attacked the Skep. She attacked me and took control over this hive. As you can see, I was unable to defeat her.&quot;,
+            &quot;text&quot;: &quot;For millenia I've been keeping the Slivers of the Skep healthy and peaceful, keeping them under control to prevent them attacking outsiders. Everything changed when the Sliver Queen attacked the Skep. She attacked me and took control over this hive. As you can see, I was unable to defeat her.&quot;,
             &quot;options&quot;: [
               {
                 &quot;name&quot;: &quot;So I guess the Sliver Queen is causing the Slivers of the Skep to be this aggressive? &quot;,
@@ -95,7 +95,7 @@
         &quot;not&quot;: true
       }
     ],
-    &quot;text&quot;: &quot;Weak, ... I am, defeat the Sliver Queen .... Before I lose the last of my strength.&quot;,
+    &quot;text&quot;: &quot;Weak, ... I am, defeat the Sliver Queen ... Before I lose the last of my strength.&quot;,
     &quot;options&quot;: [
       {
         &quot;name&quot;: &quot;(Continue)&quot;
@@ -108,7 +108,7 @@
       { &quot;checkQuestFlag&quot;: &quot;SliverQueenDefeated&quot; }
     ],
     &quot;name&quot;: &quot;The Sliver Queen has been defeated!&quot;,
-    &quot;text&quot;: &quot;My .... my gratitude to you stranger. I feel my strength slowly returning. As promised I'll take control of the Slivers again as her queen, the people of Shandalar shouldn't fear the Slivers of the Skep anymore. Though be warned adventurer, my children will still defend against any intruder why goes into the skep. Goodbye Adventurer&quot;,
+    &quot;text&quot;: &quot;My ... my gratitude to you stranger. I feel my strength slowly returning. As promised, I'll take control of the Slivers again as their queen. The people of Shandalar shouldn't fear the Slivers of the Skep anymore. Though be warned, adventurer, my children will still defend against any intruder who goes into the Skep. Goodbye, adventurer!&quot;,
     &quot;options&quot;: [
       {
         &quot;name&quot;: &quot;(Continue)&quot;,
diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt
index 1d7ec93740f..bf3b9fd39e3 100644
--- a/forge-gui/res/blockdata/blocks.txt
+++ b/forge-gui/res/blockdata/blocks.txt
@@ -144,3 +144,4 @@ Tarkir Dragonstorm, 3/6/TDM, TDM
 Final Fantasy, 3/6/FIN, FIN
 Alchemy: Innistrad, 3/6/ISD, YMID
 Edge of Eternities, 3/6/EOE, EOE
+Marvel's Spider-Man, 3/6/SPM, SPM
diff --git a/forge-gui/res/cardsfolder/upcoming/aang_air_nomad.txt b/forge-gui/res/cardsfolder/a/aang_air_nomad.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aang_air_nomad.txt
rename to forge-gui/res/cardsfolder/a/aang_air_nomad.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aang_airbending_master.txt b/forge-gui/res/cardsfolder/a/aang_airbending_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aang_airbending_master.txt
rename to forge-gui/res/cardsfolder/a/aang_airbending_master.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aang_the_last_airbender.txt b/forge-gui/res/cardsfolder/a/aang_the_last_airbender.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aang_the_last_airbender.txt
rename to forge-gui/res/cardsfolder/a/aang_the_last_airbender.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aangs_defense.txt b/forge-gui/res/cardsfolder/a/aangs_defense.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aangs_defense.txt
rename to forge-gui/res/cardsfolder/a/aangs_defense.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/aangs_journey.txt b/forge-gui/res/cardsfolder/a/aangs_journey.txt
similarity index 50%
rename from forge-gui/res/cardsfolder/upcoming/aangs_journey.txt
rename to forge-gui/res/cardsfolder/a/aangs_journey.txt
index 160b3dc006a..2766c7431d6 100644
--- a/forge-gui/res/cardsfolder/upcoming/aangs_journey.txt
+++ b/forge-gui/res/cardsfolder/a/aangs_journey.txt
@@ -2,8 +2,8 @@ Name:Aang's Journey
 ManaCost:2
 Types:Sorcery Lesson
 K:Kicker:2
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card. If this spell was kicked, instead search your library for a basic land card and a Shrine card. Reveal those cards, put them into your hand, then shuffle. You gain 2 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ EACH Land.Basic & Shrine | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBGainLife
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card. If this spell was kicked, instead search your library for a basic land card and a Shrine card. Reveal those cards, put them into your hand, then shuffle. You gain 2 life.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ EACH Land.Basic & Shrine | ChangeTypeDesc$ basic land card and a Shrine card | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
 SVar:X:Count$TimesKicked
 Oracle:Kicker {2} (You may pay an additional {2} as you cast this spell.)\nSearch your library for a basic land card. If this spell was kicked, instead search your library for a basic land card and a Shrine card. Reveal those cards, put them into your hand, then shuffle.\nYou gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/aardvark_sloth.txt b/forge-gui/res/cardsfolder/a/aardvark_sloth.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aardvark_sloth.txt
rename to forge-gui/res/cardsfolder/a/aardvark_sloth.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/abandon_attachments.txt b/forge-gui/res/cardsfolder/a/abandon_attachments.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/abandon_attachments.txt
rename to forge-gui/res/cardsfolder/a/abandon_attachments.txt
diff --git a/forge-gui/res/cardsfolder/a/abeyance.txt b/forge-gui/res/cardsfolder/a/abeyance.txt
index 4a02b1bb11a..7d482d121a6 100644
--- a/forge-gui/res/cardsfolder/a/abeyance.txt
+++ b/forge-gui/res/cardsfolder/a/abeyance.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Instant
 A:SP$ Effect | ValidTgts$ Player | StaticAbilities$ STCantBeCast,STCantBeActivated | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
 SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ Player.IsRemembered | Description$ Target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.
-SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | ValidSA$ Activated.nonManaAbility | Activator$ Player.IsRemembered
+SVar:STCantBeActivated:Mode$ CantBeActivated | ValidCard$ Card | ValidSA$ Activated.!ManaAbility | Activator$ Player.IsRemembered
 SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 Oracle:Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/a/abstruse_archaic.txt b/forge-gui/res/cardsfolder/a/abstruse_archaic.txt
index 8bf4839b66d..43d623a4679 100644
--- a/forge-gui/res/cardsfolder/a/abstruse_archaic.txt
+++ b/forge-gui/res/cardsfolder/a/abstruse_archaic.txt
@@ -3,6 +3,6 @@ ManaCost:4
 Types:Creature Avatar
 PT:3/4
 K:Vigilance
-A:AB$ CopySpellAbility | Cost$ 1 T | TgtPrompt$ Select target activated or triggered ability you control from a colorless source | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | ValidTgts$ Card.Colorless | AILogic$ AlwaysCopyActivatedAbilities | MayChooseTarget$ True | SpellDescription$ Copy target activated or triggered ability you control from a colorless source. You may choose new targets for the copy. (Mana abilities can't be targeted.)
+A:AB$ CopySpellAbility | Cost$ 1 T | TgtPrompt$ Select target activated or triggered ability you control from a colorless source | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | ValidTgts$ Card.Colorless,Emblem | AILogic$ AlwaysCopyActivatedAbilities | MayChooseTarget$ True | SpellDescription$ Copy target activated or triggered ability you control from a colorless source. You may choose new targets for the copy. (Mana abilities can't be targeted.)
 DeckHints:Type$Artifact|Eldrazi
 Oracle:Vigilance\n{1}, {T}: Copy target activated or triggered ability you control from a colorless source. You may choose new targets for the copy. (Mana abilities can't be targeted.)
diff --git a/forge-gui/res/cardsfolder/a/abzan_monument.txt b/forge-gui/res/cardsfolder/a/abzan_monument.txt
index 9a098358311..d328c9cc84e 100644
--- a/forge-gui/res/cardsfolder/a/abzan_monument.txt
+++ b/forge-gui/res/cardsfolder/a/abzan_monument.txt
@@ -2,7 +2,7 @@ Name:Abzan Monument
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this artifact enters, search your library for a basic Plains, Swamp, or Forest card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Plains+Basic,Land.Swamp+Basic,Land.Forest+Basic
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Plains.Basic,Swamp.Basic,Forest.Basic | ChangeTypeDesc$ basic Plains, Swamp, or Forest
 A:AB$ Token | Cost$ 1 W B G T Sac<1/CARDNAME> | TokenAmount$ 1 | TokenPower$ X | TokenToughness$ X | TokenScript$ w_x_x_spirit | TokenOwner$ You | SorcerySpeed$ True | SpellDescription$ Create an X/X white Spirit creature token, where X is the greatest toughness among creatures you control. Activate only as a sorcery.
 SVar:X:Count$Valid Creature.YouCtrl$GreatestToughness
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/a/acererak_the_archlich.txt b/forge-gui/res/cardsfolder/a/acererak_the_archlich.txt
index fc1ef36c3ae..ff3b874fa66 100644
--- a/forge-gui/res/cardsfolder/a/acererak_the_archlich.txt
+++ b/forge-gui/res/cardsfolder/a/acererak_the_archlich.txt
@@ -5,7 +5,7 @@ PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ LT1 | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, if you haven't completed Tomb of Annihilation, return CARDNAME to its owner's hand and venture into the dungeon.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBVenture
 SVar:DBVenture:DB$ Venture
-SVar:X:PlayerCountPropertyYou$DungeonCompletedNamed_Tomb of Annihilation
+SVar:X:DungeonsCompleted$Valid Card.namedTomb of Annihilation
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, you create a 2/2 black Zombie creature token unless that player sacrifices a creature.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ b_2_2_zombie | UnlessCost$ Sac<1/Creature> | UnlessPayer$ Player.IsRemembered
diff --git a/forge-gui/res/cardsfolder/a/adipose_offspring.txt b/forge-gui/res/cardsfolder/a/adipose_offspring.txt
index 700226388f9..bc141a219db 100644
--- a/forge-gui/res/cardsfolder/a/adipose_offspring.txt
+++ b/forge-gui/res/cardsfolder/a/adipose_offspring.txt
@@ -6,6 +6,6 @@ K:Emerge:5 W
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/2 white Alien creature token. If CARDNAME's emerge cost was paid, instead create X of those tokens, where X is the sacrificed creature's toughness.
 SVar:TrigToken:DB$ Token | TokenAmount$ N | TokenScript$ w_2_2_alien | TokenOwner$ You
 SVar:N:Count$Emerged.T.1
-SVar:T:Emerged$SumToughness
+SVar:T:Emerged$CardToughness
 DeckHas:Ability$Token
 Oracle:Emerge {5}{W} (You may cast this spell by sacrificing a creature and paying the emerge cost reduced by that creature's mana value.)\nWhen Adipose Offspring enters, create a 2/2 white Alien creature token. If Adipose Offspring's emerge cost was paid, instead create X of those tokens, where X is the sacrificed creature's toughness.
diff --git a/forge-gui/res/cardsfolder/a/agent_venom.txt b/forge-gui/res/cardsfolder/a/agent_venom.txt
new file mode 100644
index 00000000000..0e06bda7d62
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/agent_venom.txt
@@ -0,0 +1,10 @@
+Name:Agent Venom
+ManaCost:2 B
+Types:Legendary Creature Symbiote Soldier Hero
+PT:2/3
+K:Flash
+K:Menace
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+!token+YouCtrl | Execute$ TrigDraw | TriggerDescription$ Whenever another nontoken creature you control dies, you draw a card and lose 1 life.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
+Oracle:Flash\nMenace\nWhenever another nontoken creature you control dies, you draw a card and lose 1 life.
diff --git a/forge-gui/res/cardsfolder/a/ainok_guide.txt b/forge-gui/res/cardsfolder/a/ainok_guide.txt
index 5584544da28..8733314caf3 100644
--- a/forge-gui/res/cardsfolder/a/ainok_guide.txt
+++ b/forge-gui/res/cardsfolder/a/ainok_guide.txt
@@ -5,6 +5,6 @@ PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBCounter,DBSearch
 SVar:DBCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | SpellDescription$ Search your library for a basic land card, reveal it, then shuffle and put that card on top.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, then shuffle and put that card on top.
 DeckHas:Ability$Counters
 Oracle:When Ainok Guide enters, choose one —\n• Put a +1/+1 counter on Ainok Guide.\n• Search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/a/airbending_lesson.txt b/forge-gui/res/cardsfolder/a/airbending_lesson.txt
new file mode 100644
index 00000000000..9f904f830d1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/airbending_lesson.txt
@@ -0,0 +1,6 @@
+Name:Airbending Lesson
+ManaCost:2 W
+Types:Instant Lesson
+A:SP$ Airbend | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBDraw | SpellDescription$ Airbend target nonland permanent. (Exile it. While it's exiled, its owner may cast it for {2} rather than its mana cost.)
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
+Oracle:Airbend target nonland permanent. (Exile it. While it's exiled, its owner may cast it for {2} rather than its mana cost.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/a/akron_legionnaire.txt b/forge-gui/res/cardsfolder/a/akron_legionnaire.txt
index 6a7a67319e4..e5c8b392416 100644
--- a/forge-gui/res/cardsfolder/a/akron_legionnaire.txt
+++ b/forge-gui/res/cardsfolder/a/akron_legionnaire.txt
@@ -2,7 +2,7 @@ Name:Akron Legionnaire
 ManaCost:6 W W
 Types:Creature Giant Soldier
 PT:8/4
-S:Mode$ CantAttack | ValidCard$ Creature.YouCtrl+nonArtifact+notnamedAkron Legionnaire | Description$ Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.
+S:Mode$ CantAttack | ValidCard$ Creature.YouCtrl+nonArtifact+!namedAkron Legionnaire | Description$ Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.
 DeckHints:Type$Artifact
 DeckNeeds:Name$Akron Legionnaire
 Oracle:Except for creatures named Akron Legionnaire and artifact creatures, creatures you control can't attack.
diff --git a/forge-gui/res/cardsfolder/a/aladdins_lamp.txt b/forge-gui/res/cardsfolder/a/aladdins_lamp.txt
index 98413ef0f7d..fbc2487a83d 100644
--- a/forge-gui/res/cardsfolder/a/aladdins_lamp.txt
+++ b/forge-gui/res/cardsfolder/a/aladdins_lamp.txt
@@ -1,14 +1,12 @@
 Name:Aladdin's Lamp
 ManaCost:10
 Types:Artifact
-A:AB$ StoreSVar | Cost$ XMin1 X T | SVar$ DigNum | Type$ Count | Expression$ xPaid | SubAbility$ TheMagic | SpellDescription$ The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
-SVar:TheMagic:DB$ Effect | Name$ Aladdin's Wish | ReplacementEffects$ DrawReplace
+A:AB$ Effect | Cost$ XMin1 X T | Name$ Aladdin's Wish | ReplacementEffects$ DrawReplace | SetChosenNumber$ X | SpellDescription$ The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
 SVar:DrawReplace:Event$ Draw | ValidPlayer$ You | ReplaceWith$ AladdinDraw | Description$ The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card.
-SVar:AladdinDraw:DB$ Dig | DigNum$ DigNum | ChangeNum$ 1 | RestRandomOrder$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBDraw
+SVar:AladdinDraw:DB$ Dig | DigNum$ Count$ChosenNumber | ChangeNum$ 1 | RestRandomOrder$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:X:Count$xPaid
-SVar:DigNum:Number$0
 AI:RemoveDeck:Random
 AI:RemoveDeck:All
 Oracle:{X}, {T}: The next time you would draw a card this turn, instead look at the top X cards of your library, put all but one of them on the bottom of your library in a random order, then draw a card. X can't be 0.
diff --git a/forge-gui/res/cardsfolder/a/alarum.txt b/forge-gui/res/cardsfolder/a/alarum.txt
index 4e903cf80bb..8576991c091 100644
--- a/forge-gui/res/cardsfolder/a/alarum.txt
+++ b/forge-gui/res/cardsfolder/a/alarum.txt
@@ -1,6 +1,6 @@
 Name:Alarum
 ManaCost:1 W
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.notattacking | TgtPrompt$ Select target nonattacking creature | NumAtt$ +1 | NumDef$ +3 | SubAbility$ DBUntap | SpellDescription$ Untap target nonattacking creature. It gets +1/+3 until end of turn.
+A:SP$ Pump | ValidTgts$ Creature.!attacking | TgtPrompt$ Select target nonattacking creature | NumAtt$ +1 | NumDef$ +3 | SubAbility$ DBUntap | SpellDescription$ Untap target nonattacking creature. It gets +1/+3 until end of turn.
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 Oracle:Untap target nonattacking creature. It gets +1/+3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/alchemax_slayer_bots.txt b/forge-gui/res/cardsfolder/a/alchemax_slayer_bots.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/alchemax_slayer_bots.txt
rename to forge-gui/res/cardsfolder/a/alchemax_slayer_bots.txt
diff --git a/forge-gui/res/cardsfolder/a/alien_symbiosis.txt b/forge-gui/res/cardsfolder/a/alien_symbiosis.txt
new file mode 100644
index 00000000000..f267f8728eb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/alien_symbiosis.txt
@@ -0,0 +1,9 @@
+Name:Alien Symbiosis
+ManaCost:1 B
+Types:Enchantment Aura
+K:Enchant:Creature
+SVar:AttachAILogic:Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Menace | AddType$ Symbiote | Description$ Enchanted creature gets +1/+1, has menace, and is a Symbiote in addition to its other types.
+S:Mode$ Continuous | Affected$ Card.Self | MayPlay$ True | AffectedZone$ Graveyard | EffectZone$ Graveyard | RaiseCost$ Discard<1/Card> | Description$ You may cast this card from your graveyard by discarding a card in addition to paying its other costs.
+DeckHas:Ability$Graveyard|Discard
+Oracle:Enchant creature\nEnchanted creature gets +1/+1, has menace, and is a Symbiote in addition to its other types.\nYou may cast this card from your graveyard by discarding a card in addition to paying its other costs.
diff --git a/forge-gui/res/cardsfolder/a/all_fates_scroll.txt b/forge-gui/res/cardsfolder/a/all_fates_scroll.txt
index 1499d57f567..5b7a41b234f 100644
--- a/forge-gui/res/cardsfolder/a/all_fates_scroll.txt
+++ b/forge-gui/res/cardsfolder/a/all_fates_scroll.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Draw | Cost$ 7 T Sac<1/CARDNAME> | NumCards$ X | SpellDescription$ Draw X cards, where X is the number of differently named lands you control.
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 Oracle:{T}: Add one mana of any color.\n{7}, {T}, Sacrifice this artifact: Draw X cards, where X is the number of differently named lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/allied_teamwork.txt b/forge-gui/res/cardsfolder/a/allied_teamwork.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/allied_teamwork.txt
rename to forge-gui/res/cardsfolder/a/allied_teamwork.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/amateur_hero.txt b/forge-gui/res/cardsfolder/a/amateur_hero.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amateur_hero.txt
rename to forge-gui/res/cardsfolder/a/amateur_hero.txt
diff --git a/forge-gui/res/cardsfolder/a/amazing_acrobatics.txt b/forge-gui/res/cardsfolder/a/amazing_acrobatics.txt
new file mode 100644
index 00000000000..8507507b2f9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/amazing_acrobatics.txt
@@ -0,0 +1,7 @@
+Name:Amazing Acrobatics
+ManaCost:1 U U
+Types:Instant
+A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBCounter,DBTap
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Counter target spell | SpellDescription$ Counter target spell.
+SVar:DBTap:DB$ Tap | TargetMin$ 1 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Choose one or two target creatures | SpellDescription$ Tap one or two target creatures.
+Oracle:Choose one or both —\n• Counter target spell.\n• Tap one or two target creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/amazing_alliance.txt b/forge-gui/res/cardsfolder/a/amazing_alliance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/amazing_alliance.txt
rename to forge-gui/res/cardsfolder/a/amazing_alliance.txt
diff --git a/forge-gui/res/cardsfolder/a/ambassador_of_evendo.txt b/forge-gui/res/cardsfolder/a/ambassador_of_evendo.txt
new file mode 100644
index 00000000000..bf3bd48714a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/ambassador_of_evendo.txt
@@ -0,0 +1,11 @@
+Name:Ambassador of Evendo
+ManaCost:G U
+Types:Creature Insect Advisor
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigRandom | TriggerDescription$ Landfall — Whenever a land you control enters, a random land card in your library perpetually gains "Whenever this land becomes tapped, draw a card."
+SVar:TrigRandom:DB$ ChooseCard | Choices$ Land.YouOwn | ChoiceZone$ Library | AtRandom$ True | Amount$ 1 | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | Triggers$ LandTapDraw | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:LandTapDraw:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever this land becomes tapped, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+Oracle:Landfall — Whenever a land you control enters, a random land card in your library perpetually gains "Whenever this land becomes tapped, draw a card."
diff --git a/forge-gui/res/cardsfolder/a/ambitious_dragonborn.txt b/forge-gui/res/cardsfolder/a/ambitious_dragonborn.txt
index c641465c8a0..e4534b17834 100644
--- a/forge-gui/res/cardsfolder/a/ambitious_dragonborn.txt
+++ b/forge-gui/res/cardsfolder/a/ambitious_dragonborn.txt
@@ -5,4 +5,5 @@ PT:0/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters with X +1/+1 counters on it, where X is the greatest power among creatures you control and creature cards in your graveyard.
 SVar:X:Count$ValidGraveyard,Battlefield Creature.YouCtrl$GreatestPower
 DeckHas:Ability$Graveyard|Counters
-Oracle:Ambitious Dragonborn enters with X +1/+1 counters on it, where X is the greatest power among creatures you control and creature cards in your graveyard.
+SVar:NeedsToPlay:X GE1
+Oracle:Ambitious Dragonborn enters with X +1/+1 counters on it, where X is the greatest power among creatures you control and creature cards in your graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/analyze_the_pollen.txt b/forge-gui/res/cardsfolder/a/analyze_the_pollen.txt
index a8daf21e612..55d24cbae5b 100644
--- a/forge-gui/res/cardsfolder/a/analyze_the_pollen.txt
+++ b/forge-gui/res/cardsfolder/a/analyze_the_pollen.txt
@@ -2,7 +2,7 @@ Name:Analyze the Pollen
 ManaCost:G
 Types:Sorcery
 S:Mode$ OptionalCost | EffectZone$ All | ValidCard$ Card.Self | ValidSA$ Spell | Cost$ CollectEvidence<8> | Description$ As an additional cost to cast this spell, you may collect evidence 8. (Exile cards with total mana value 8 or greater from your graveyard.)
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ConditionDefined$ Collected | ConditionPresent$ Card | ConditionCompare$ EQ0 | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card. If evidence was collected, instead search your library for a creature or land card. Reveal that card, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ConditionDefined$ Collected | ConditionPresent$ Card | ConditionCompare$ EQ0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card. If evidence was collected, instead search your library for a creature or land card. Reveal that card, put it into your hand, then shuffle.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land,Creature | ChangeNum$ 1 | ConditionDefined$ Collected | ConditionPresent$ Card
 DeckHints:Ability$Graveyard|Discard|Dredge|Mill
 Oracle:As an additional cost to cast this spell, you may collect evidence 8. (Exile cards with total mana value 8 or greater from your graveyard.)\nSearch your library for a basic land card. If evidence was collected, instead search your library for a creature or land card. Reveal that card, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/a/anchor_to_reality.txt b/forge-gui/res/cardsfolder/a/anchor_to_reality.txt
index 0c7da6ef690..82f76244f1d 100644
--- a/forge-gui/res/cardsfolder/a/anchor_to_reality.txt
+++ b/forge-gui/res/cardsfolder/a/anchor_to_reality.txt
@@ -1,7 +1,7 @@
 Name:Anchor to Reality
 ManaCost:2 U U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 U U Sac<1/Artifact;Creature/artifact or creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Equipment,Vehicle | ChangeTypeDesc$ Equipment or Vehicle card | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBScry | SpellDescription$ Search your library for an Equipment or Vehicle card, put that card onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Cost$ 2 U U Sac<1/Artifact;Creature/artifact or creature> | Origin$ Library | Destination$ Battlefield | ChangeType$ Equipment,Vehicle | RememberChanged$ True | SubAbility$ DBScry | SpellDescription$ Search your library for an Equipment or Vehicle card, put that card onto the battlefield, then shuffle.
 SVar:DBScry:DB$ Scry | ConditionDefined$ Remembered | ConditionPresent$ Card | ScryNum$ X | SubAbility$ DBCleanup | SpellDescription$ If it has mana value less than the sacrificed permanent's mana value, scry 2.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Compare Y LTZ.2.0
diff --git a/forge-gui/res/cardsfolder/upcoming/angry_rabble.txt b/forge-gui/res/cardsfolder/a/angry_rabble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/angry_rabble.txt
rename to forge-gui/res/cardsfolder/a/angry_rabble.txt
diff --git a/forge-gui/res/cardsfolder/a/animate_dead.txt b/forge-gui/res/cardsfolder/a/animate_dead.txt
index f505055471f..884f653dc7b 100644
--- a/forge-gui/res/cardsfolder/a/animate_dead.txt
+++ b/forge-gui/res/cardsfolder/a/animate_dead.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant:Creature.inZoneGraveyard:creature card in a graveyard
 SVar:AttachAILogic:Reanimate
-SVar:AttachAITgts:Creature.notnamedWorldgorger Dragon
+SVar:AttachAITgts:Creature.!namedWorldgorger Dragon
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Card.StrictlySelf | Execute$ TrigReanimate | TriggerDescription$ When CARDNAME enters, if it's on the battlefield, it loses "enchant creature card in a graveyard" and gains "enchant creature put onto the battlefield with CARDNAME." Return enchanted creature card to the battlefield under your control and attach CARDNAME to it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it.
 SVar:TrigReanimate:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Enchanted | RememberChanged$ True | GainControl$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Self | Keywords$ Enchant:Creature.IsRemembered:creature put onto the battlefield with CARDNAME | RemoveKeywords$ Enchant:Creature.inZoneGraveyard:creature card in a graveyard | Duration$ Permanent | SubAbility$ DBAttach
diff --git a/forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt b/forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt
index e63e2720ae6..3e2abd91e46 100644
--- a/forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt
+++ b/forge-gui/res/cardsfolder/a/anointed_peacekeeper.txt
@@ -9,6 +9,6 @@ SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | Look$ True | SubAbility$ DB
 SVar:DBNameCard:DB$ NameCard | Defined$ You | SubAbility$ DBClear
 SVar:DBClear:DB$ Cleanup | ClearChosenPlayer$ True
 S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.NamedCard | Type$ Spell | Amount$ 2 | Activator$ Opponent | Description$ Spells your opponents cast with the chosen name cost {2} more to cast.
-S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.NamedCard | ValidSpell$ Activated.nonManaAbility | Amount$ 2 | Description$ Activated abilities of sources with the chosen name cost {2} more to activate unless they're mana abilities.
+S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.NamedCard | ValidSpell$ Activated.!ManaAbility | Amount$ 2 | Description$ Activated abilities of sources with the chosen name cost {2} more to activate unless they're mana abilities.
 AI:RemoveDeck:Random
 Oracle:Vigilance\nAs Anointed Peacekeeper enters, look at an opponent's hand, then choose any card name.\nSpells your opponents cast with the chosen name cost {2} more to cast.\nActivated abilities of sources with the chosen name cost {2} more to activate unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/a/anti_magic_aura.txt b/forge-gui/res/cardsfolder/a/anti_magic_aura.txt
index 83c603e5036..d7fb7fe5c32 100644
--- a/forge-gui/res/cardsfolder/a/anti_magic_aura.txt
+++ b/forge-gui/res/cardsfolder/a/anti_magic_aura.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
-S:Mode$ CantTarget | ValidCard$ Creature.EnchantedBy | ValidSA$ Spell | Description$ Enchanted creature can't be the target of spells.
+S:Mode$ CantTarget | ValidTarget$ Creature.EnchantedBy | ValidSA$ Spell | Description$ Enchanted creature can't be the target of spells.
 S:Mode$ CantAttach | ValidCard$ Aura.Other | Target$ Creature.EnchantedBy | Description$ Enchanted creature can't be enchanted by other Auras.
 Oracle:Enchant creature\nEnchanted creature can't be the target of spells and can't be enchanted by other Auras.
diff --git a/forge-gui/res/cardsfolder/upcoming/anti_venom_horrifying_healer.txt b/forge-gui/res/cardsfolder/a/anti_venom_horrifying_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/anti_venom_horrifying_healer.txt
rename to forge-gui/res/cardsfolder/a/anti_venom_horrifying_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/appa_aangs_companion.txt b/forge-gui/res/cardsfolder/a/appa_aangs_companion.txt
similarity index 85%
rename from forge-gui/res/cardsfolder/upcoming/appa_aangs_companion.txt
rename to forge-gui/res/cardsfolder/a/appa_aangs_companion.txt
index 5cfc5cb267b..ecebfb61baf 100644
--- a/forge-gui/res/cardsfolder/upcoming/appa_aangs_companion.txt
+++ b/forge-gui/res/cardsfolder/a/appa_aangs_companion.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Legendary Creature Bison Ally
 PT:2/4
 K:Flying
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME attacks, another target attacking creature without flying gains flying until until end of turn.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME attacks, another target attacking creature without flying gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+attacking+withoutFlying | TgtPrompt$ Select another target attacking creature without flying | KW$ Flying
 SVar:HasAttackEffect:TRUE
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhenever Appa attacks, another target attacking creature without flying gains flying until until end of turn.
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhenever Appa attacks, another target attacking creature without flying gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/appa_steadfast_guardian.txt b/forge-gui/res/cardsfolder/a/appa_steadfast_guardian.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/appa_steadfast_guardian.txt
rename to forge-gui/res/cardsfolder/a/appa_steadfast_guardian.txt
diff --git a/forge-gui/res/cardsfolder/a/arachne_psionic_weaver.txt b/forge-gui/res/cardsfolder/a/arachne_psionic_weaver.txt
new file mode 100644
index 00000000000..3ed865e0871
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/arachne_psionic_weaver.txt
@@ -0,0 +1,12 @@
+Name:Arachne, Psionic Weaver
+ManaCost:2 W
+Types:Legendary Creature Spider Human Hero
+PT:3/3
+K:Web-slinging:W
+K:ETBReplacement:Other:ChoosePlayer
+SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to look at their hand | SubAbility$ DBLook | SpellDescription$ As NICKNAME enters, look at an opponent's hand, then choose a card type other than creature.
+SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | Look$ True | SubAbility$ DBChooseCardType
+SVar:DBChooseCardType:DB$ ChooseType | Defined$ You | Type$ Card | InvalidTypes$ Creature | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearChosenPlayer$ True
+S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.ChosenType | Type$ Spell | Amount$ 1 | Activator$ Player | Description$ Spells of the chosen type cost {1} more to cast.
+Oracle:Web-slinging {W} (You may cast this spell for {W} if you also return a tapped creature you control to its owner's hand.)\nAs Arachne enters, look at an opponent's hand, then choose a card type other than creature.\nSpells of the chosen type cost {1} more to cast.
diff --git a/forge-gui/res/cardsfolder/a/arachnus_spinner.txt b/forge-gui/res/cardsfolder/a/arachnus_spinner.txt
index dd901861fd5..f964ec42c32 100644
--- a/forge-gui/res/cardsfolder/a/arachnus_spinner.txt
+++ b/forge-gui/res/cardsfolder/a/arachnus_spinner.txt
@@ -3,6 +3,7 @@ ManaCost:5 G
 Types:Creature Spider
 PT:5/7
 K:Reach
-A:AB$ ChangeZone | Cost$ tapXType<1/Spider> | Hidden$ True | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Battlefield | ChangeType$ Card.YouOwn+namedArachnus Web | SpellDescription$ Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle.
+A:AB$ Pump | Cost$ tapXType<1/Spider> | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsCurse$ True | SubAbility$ DBChange
+SVar:DBChange:DB$ ChangeZone | Hidden$ True | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Battlefield | ChangeType$ Card.YouOwn+namedArachnus Web | AttachedTo$ ParentTarget | SpellDescription$ Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle.
 DeckHints:Name$Arachnus Web & Type$Spider
 Oracle:Reach\nTap an untapped Spider you control: Search your graveyard and/or library for a card named Arachnus Web and put it onto the battlefield attached to target creature. If you search your library this way, shuffle.
diff --git a/forge-gui/res/cardsfolder/a/arana_heart_of_the_spider.txt b/forge-gui/res/cardsfolder/a/arana_heart_of_the_spider.txt
new file mode 100644
index 00000000000..e103b625785
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/arana_heart_of_the_spider.txt
@@ -0,0 +1,15 @@
+Name:Araña, Heart of the Spider
+ManaCost:1 R W
+Types:Legendary Creature Spider Human Hero
+PT:3/3
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, put a +1/+1 counter on target attacking creature.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature
+T:Mode$ DamageDone | ValidSource$ Creature.modified+YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever a modified creature you control deals combat damage to a player, exile the top card of your library. You may play that card this turn. (Equipment, Auras you control, and counters are modifications.)
+SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ Remembered | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Exile the top card of your library. You may play that card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
+DeckHints:Type$Aura|Equipment
+Oracle:Whenever you attack, put a +1/+1 counter on target attacking creature.\nWhenever a modified creature you control deals combat damage to a player, exile the top card of your library. You may play that card this turn. (Equipment, Auras you control, and counters are modifications.)
diff --git a/forge-gui/res/cardsfolder/a/arashin_sunshield.txt b/forge-gui/res/cardsfolder/a/arashin_sunshield.txt
index cd6016096fd..5453c808691 100644
--- a/forge-gui/res/cardsfolder/a/arashin_sunshield.txt
+++ b/forge-gui/res/cardsfolder/a/arashin_sunshield.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Human Warrior
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this creature enters, exile up to two target cards from a single graveyard.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard
 A:AB$ Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
 DeckHas:Ability$Graveyard
 Oracle:When this creature enters, exile up to two target cards from a single graveyard.\n{W}, {T}: Tap target creature.
diff --git a/forge-gui/res/cardsfolder/a/arcades_sabboth.txt b/forge-gui/res/cardsfolder/a/arcades_sabboth.txt
index 593cecef1fc..bf316d4dccf 100644
--- a/forge-gui/res/cardsfolder/a/arcades_sabboth.txt
+++ b/forge-gui/res/cardsfolder/a/arcades_sabboth.txt
@@ -5,7 +5,7 @@ PT:7/7
 K:Flying
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you pay {G}{W}{U}.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ G W U
-S:Mode$ Continuous | Affected$ Creature.notattacking+untapped+YouCtrl | AddToughness$ 2 | Description$ Each untapped creature you control gets +0/+2 as long as it's not attacking.
+S:Mode$ Continuous | Affected$ Creature.!attacking+untapped+YouCtrl | AddToughness$ 2 | Description$ Each untapped creature you control gets +0/+2 as long as it's not attacking.
 A:AB$ Pump | Cost$ W | Defined$ Self | NumDef$ +1 | SpellDescription$ CARDNAME gets +0/+1 until end of turn.
 DeckHints:Type$Wall & Keyword$Defender
 Oracle:Flying\nAt the beginning of your upkeep, sacrifice Arcades Sabboth unless you pay {G}{W}{U}.\nEach untapped creature you control gets +0/+2 as long as it's not attacking.\n{W}: Arcades Sabboth gets +0/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arclight_phoenix.txt b/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
index 627af785062..2602046fd84 100644
--- a/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
+++ b/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
@@ -4,7 +4,7 @@ Types:Creature Phoenix
 PT:3/2
 K:Flying
 K:Haste
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, return CARDNAME from your graveyard to the battlefield.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | TriggerDescription$ At the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, return CARDNAME from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
 DeckNeeds:Type$Instant|Sorcery
diff --git a/forge-gui/res/cardsfolder/a/armillary_sphere.txt b/forge-gui/res/cardsfolder/a/armillary_sphere.txt
index 492127ba6f4..4d173118d17 100644
--- a/forge-gui/res/cardsfolder/a/armillary_sphere.txt
+++ b/forge-gui/res/cardsfolder/a/armillary_sphere.txt
@@ -1,5 +1,5 @@
 Name:Armillary Sphere
 ManaCost:2
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
 Oracle:{2}, {T}, Sacrifice Armillary Sphere: Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/a/artifact_ward.txt b/forge-gui/res/cardsfolder/a/artifact_ward.txt
index 172b47b6594..1eab577bb59 100644
--- a/forge-gui/res/cardsfolder/a/artifact_ward.txt
+++ b/forge-gui/res/cardsfolder/a/artifact_ward.txt
@@ -5,5 +5,5 @@ K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy | ValidBlocker$ Creature.Artifact | Description$ Enchanted creature can't be blocked by artifact creatures.
 R:Event$ DamageDone | Prevent$ True | ActiveZones$ Battlefield | ValidTarget$ Creature.EnchantedBy | ValidSource$ Artifact | Description$ Prevent all damage that would be dealt to enchanted creature by artifact sources.
-S:Mode$ CantTarget | ValidCard$ Card.EnchantedBy | ValidSource$ Artifact | Description$ Enchanted creature can't be the target of abilities from artifact sources.
+S:Mode$ CantTarget | ValidTarget$ Card.EnchantedBy | ValidSource$ Artifact | Description$ Enchanted creature can't be the target of abilities from artifact sources.
 Oracle:Enchant creature\nEnchanted creature can't be blocked by artifact creatures.\nPrevent all damage that would be dealt to enchanted creature by artifact sources.\nEnchanted creature can't be the target of abilities from artifact sources.
diff --git a/forge-gui/res/cardsfolder/a/ashnod_the_uncaring.txt b/forge-gui/res/cardsfolder/a/ashnod_the_uncaring.txt
index 7a60eef2554..94634e668d9 100644
--- a/forge-gui/res/cardsfolder/a/ashnod_the_uncaring.txt
+++ b/forge-gui/res/cardsfolder/a/ashnod_the_uncaring.txt
@@ -3,7 +3,7 @@ ManaCost:2 U B R
 Types:Legendary Creature Human Artificer
 PT:1/4
 K:Deathtouch
-T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Condition$ Sacrificed | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, if one or more permanents were sacrificed to activate it, you may copy that ability. You may choose new targets for the copy. (Sacrificing an artifact for mana to activate an ability doesn't count.)
+T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Condition$ Sacrificed | Execute$ TrigCopy | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, if one or more permanents were sacrificed to activate it, you may copy that ability. You may choose new targets for the copy. (Sacrificing an artifact for mana to activate an ability doesn't count.)
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 DeckNeeds:Ability$Sacrifice
 DeckHints:Type$Artifact
diff --git a/forge-gui/res/cardsfolder/a/assassins_trophy.txt b/forge-gui/res/cardsfolder/a/assassins_trophy.txt
index 3c0683f5a46..cca766e449d 100644
--- a/forge-gui/res/cardsfolder/a/assassins_trophy.txt
+++ b/forge-gui/res/cardsfolder/a/assassins_trophy.txt
@@ -2,5 +2,5 @@ Name:Assassin's Trophy
 ManaCost:B G
 Types:Instant
 A:SP$ Destroy | ValidTgts$ Permanent.OppCtrl | AITgts$ Permanent.nonLand,Land.nonBasic | TgtPrompt$ Select target permanent an opponent controls | SubAbility$ DBChange | SpellDescription$ Destroy target permanent an opponent controls. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 Oracle:Destroy target permanent an opponent controls. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/a/atalan_jackal.txt b/forge-gui/res/cardsfolder/a/atalan_jackal.txt
index f83d9b42e5d..4a18df48eba 100644
--- a/forge-gui/res/cardsfolder/a/atalan_jackal.txt
+++ b/forge-gui/res/cardsfolder/a/atalan_jackal.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Trample
 K:Haste
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigSearch | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Skilled Outrider — Whenever CARDNAME deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:Trample, haste\nSkilled Outrider — Whenever Atalan Jackal deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/a/atarka_beastbreaker.txt b/forge-gui/res/cardsfolder/a/atarka_beastbreaker.txt
index 64d658a096c..9208d1f2716 100644
--- a/forge-gui/res/cardsfolder/a/atarka_beastbreaker.txt
+++ b/forge-gui/res/cardsfolder/a/atarka_beastbreaker.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Human Warrior
 PT:2/2
 A:AB$ Pump | Cost$ 4 G | Defined$ Self | NumAtt$ +4 | NumDef$ +4 | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ CARDNAME gets +4/+4 until end of turn. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Formidable — {4}{G}: Atarka Beastbreaker gets +4/+4 until end of turn. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/a/atarka_pummeler.txt b/forge-gui/res/cardsfolder/a/atarka_pummeler.txt
index a8101f9279a..f2af1db0584 100644
--- a/forge-gui/res/cardsfolder/a/atarka_pummeler.txt
+++ b/forge-gui/res/cardsfolder/a/atarka_pummeler.txt
@@ -3,5 +3,5 @@ ManaCost:4 R
 Types:Creature Ogre Warrior
 PT:4/5
 A:AB$ PumpAll | Cost$ 3 R R | ValidCards$ Creature.YouCtrl | KW$ Menace | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ Creatures you control gain menace until end of turn. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Formidable — {3}{R}{R}: Creatures you control gain menace until end of turn. Activate only if creatures you control have total power 8 or greater. (They can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/a/atog.txt b/forge-gui/res/cardsfolder/a/atog.txt
index f0415a1ac9e..0a5913d0972 100644
--- a/forge-gui/res/cardsfolder/a/atog.txt
+++ b/forge-gui/res/cardsfolder/a/atog.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Atog
 PT:1/2
 A:AB$ Pump | Cost$ Sac<1/Artifact> | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
-SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ0+nonLegendary+notnamedBlack Lotus,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3
+SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ0+nonLegendary+!namedBlack Lotus,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3
 DeckHas:Ability$Sacrifice
 DeckNeeds:Type$Artifact
 Oracle:Sacrifice an artifact: Atog gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/attune_with_aether.txt b/forge-gui/res/cardsfolder/a/attune_with_aether.txt
index 9ffce915781..e5f92d54ef6 100644
--- a/forge-gui/res/cardsfolder/a/attune_with_aether.txt
+++ b/forge-gui/res/cardsfolder/a/attune_with_aether.txt
@@ -1,6 +1,6 @@
 Name:Attune with Aether
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | SubAbility$ DBEnergy | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You get {E}{E} (two energy counters).
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBEnergy | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You get {E}{E} (two energy counters).
 SVar:DBEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You get {E}{E} (two energy counters).
diff --git a/forge-gui/res/cardsfolder/a/audience_with_trostani.txt b/forge-gui/res/cardsfolder/a/audience_with_trostani.txt
index dd2ba9d7f0a..372fd29d0ff 100644
--- a/forge-gui/res/cardsfolder/a/audience_with_trostani.txt
+++ b/forge-gui/res/cardsfolder/a/audience_with_trostani.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 A:SP$ Token | TokenScript$ g_0_1_plant | SubAbility$ DBDraw | SpellDescription$ Create a 0/1 green Plant creature token, then draw cards equal to the number of differently named creature tokens you control.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | StackDescription$ None
-SVar:X:Count$DifferentCardNames_Creature.YouCtrl+token+inZoneBattlefield
+SVar:X:Count$Valid Creature.YouCtrl+token$DifferentCardNames
 DeckHas:Ability$Token & Type$Plant
 DeckHints:Ability$Token
 Oracle:Create a 0/1 green Plant creature token, then draw cards equal to the number of differently named creature tokens you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/aunt_may.txt b/forge-gui/res/cardsfolder/a/aunt_may.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/aunt_may.txt
rename to forge-gui/res/cardsfolder/a/aunt_may.txt
diff --git a/forge-gui/res/cardsfolder/a/autumns_veil.txt b/forge-gui/res/cardsfolder/a/autumns_veil.txt
index 63c4cfab594..7816beccb8a 100644
--- a/forge-gui/res/cardsfolder/a/autumns_veil.txt
+++ b/forge-gui/res/cardsfolder/a/autumns_veil.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Instant
 A:SP$ Effect | ReplacementEffects$ AntiMagic | StaticAbilities$ STCantBeTarget | SpellDescription$ Spells you control can't be countered by blue or black spells this turn, and creatures you control can't be the targets of blue or black spells this turn.
 SVar:AntiMagic:Event$ Counter | ValidSA$ Spell.YouCtrl | ValidCause$ Spell.Blue,Spell.Black | Layer$ CantHappen | Description$ Spells you control can't be countered by blue or black spells this turn.
-SVar:STCantBeTarget:Mode$ CantTarget | ValidCard$ Creature.YouCtrl | ValidSource$ Card.Blue,Card.Black | ValidSA$ Spell | Description$ Creatures you control can't be the targets of blue or black spells this turn.
+SVar:STCantBeTarget:Mode$ CantTarget | ValidTarget$ Creature.YouCtrl | ValidSource$ Card.Blue,Card.Black | ValidSA$ Spell | Description$ Creatures you control can't be the targets of blue or black spells this turn.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 Oracle:Spells you control can't be countered by blue or black spells this turn, and creatures you control can't be the targets of blue or black spells this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/avatar_aang_aang_master_of_elements.txt b/forge-gui/res/cardsfolder/a/avatar_aang_aang_master_of_elements.txt
similarity index 76%
rename from forge-gui/res/cardsfolder/upcoming/avatar_aang_aang_master_of_elements.txt
rename to forge-gui/res/cardsfolder/a/avatar_aang_aang_master_of_elements.txt
index a3072cef049..52806599b90 100644
--- a/forge-gui/res/cardsfolder/upcoming/avatar_aang_aang_master_of_elements.txt
+++ b/forge-gui/res/cardsfolder/a/avatar_aang_aang_master_of_elements.txt
@@ -7,7 +7,8 @@ K:Firebending:2
 T:Mode$ ElementalBend | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever you waterbend, earthbend, firebend, or airbend, draw a card. Then if you've done all four this turn, transform CARDNAME.
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBTransform
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | ConditionCheckSVar$ X
-X:Count$AllFourBend.1.0
+SVar:X:Count$AllFourBend.1.0
+AlternateMode:DoubleFaced
 Oracle:Flying, firebending 2\nWhenever you waterbend, earthbend, firebend, or airbend, draw a card. Then if you've done all four this turn, transform Avatar Aang.
 
 ALTERNATE
@@ -18,9 +19,9 @@ Types:Legendary Creature Avatar Ally
 PT:6/6
 K:Flying
 S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ 1 | Color$ W U B R G | Description$ Spells you cast cost {W}{U}{B}{R}{G} less to cast. (This can reduce generic costs.)
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ At the beginning of each upkeep, you may transform CARDNAME. If you do, you gain 4 life, draw four cards, put four +1/+1 counters on him, and he deals 4 damage to each opponent.
-SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | RememberChanged$ True | SubAbility$ DBGainLife
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBDraw
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigTransform | OptionalDecider$ You | TriggerDescription$ At the beginning of each upkeep, you may transform CARDNAME. If you do, you gain 4 life, draw four cards, put four +1/+1 counters on him, and he deals 4 damage to each opponent.
+SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform | RememberChanged$ True | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 4 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 4 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 4 | CounterNum$ 4 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/upcoming/avatar_enthusiasts.txt b/forge-gui/res/cardsfolder/a/avatar_enthusiasts.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/avatar_enthusiasts.txt
rename to forge-gui/res/cardsfolder/a/avatar_enthusiasts.txt
diff --git a/forge-gui/res/cardsfolder/a/avatar_of_growth.txt b/forge-gui/res/cardsfolder/a/avatar_of_growth.txt
index 66acf4c56be..cc9adb68f04 100644
--- a/forge-gui/res/cardsfolder/a/avatar_of_growth.txt
+++ b/forge-gui/res/cardsfolder/a/avatar_of_growth.txt
@@ -5,6 +5,6 @@ PT:4/4
 K:Trample
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, each player searches their library for up to two basic land cards, puts them onto the battlefield, then shuffles.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ Player | ChangeNum$ 2 | Shuffle$ True
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ Player | ChangeNum$ 2 | Shuffle$ True
 SVar:X:PlayerCountOpponents$Amount
 Oracle:This spell costs {1} less to cast for each opponent you have.\nTrample\nWhen Avatar of Growth enters, each player searches their library for up to two basic land cards, puts them onto the battlefield, then shuffles.
diff --git a/forge-gui/res/cardsfolder/a/awakened_amalgam.txt b/forge-gui/res/cardsfolder/a/awakened_amalgam.txt
index c98e4b02b80..74720c705b9 100644
--- a/forge-gui/res/cardsfolder/a/awakened_amalgam.txt
+++ b/forge-gui/res/cardsfolder/a/awakened_amalgam.txt
@@ -3,5 +3,5 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:*/*
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of differently named lands you control.
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 Oracle:Awakened Amalgam's power and toughness are each equal to the number of differently named lands you control.
diff --git a/forge-gui/res/cardsfolder/a/awestruck_cygnet.txt b/forge-gui/res/cardsfolder/a/awestruck_cygnet.txt
index a89e50c2d24..9659c7698a8 100644
--- a/forge-gui/res/cardsfolder/a/awestruck_cygnet.txt
+++ b/forge-gui/res/cardsfolder/a/awestruck_cygnet.txt
@@ -3,8 +3,8 @@ ManaCost:W
 Types:Creature Bird Scout
 PT:2/1
 K:Starting intensity:0
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+withFlying | IsPresent$ Card.Self+namedAwestruck Cygnet | TriggerZones$ Battlefield | Execute$ TrigIntensify | TriggerDescription$ Whenever a creature you control with flying enters, if this creature is named Awestruck Cygnet, cards you own named Awestruck Cygnet intensify by 1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other+withFlying | IsPresent$ Card.Self+namedAwestruck Cygnet | TriggerZones$ Battlefield | Execute$ TrigIntensify | TriggerDescription$ Whenever another creature you control with flying enters, if this creature is named Awestruck Cygnet, cards you own named Awestruck Cygnet intensify by 1.
 SVar:TrigIntensify:DB$ Intensify | AllDefined$ Card.namedAwestruck Cygnet+YouOwn
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 4 | CheckSVar$ X | SetName$ Radiant Swan | SVarCompare$ GE3 | AddKeyword$ Flying & Vigilance | SetToughness$ 4 | Description$ As long as this card's intensity is 3 or more, it has base power and toughness 4/4, has flying and vigilance, and is named Radiant Swan.
 SVar:X:Count$Intensity
-Oracle:Starting intensity 0\nWhenever a creature you control with flying enters, if this creature is named Awestruck Cygnet, cards you own named Awestruck Cygnet intensify by 1.\nAs long as this card's intensity is 3 or more, it has base power and toughness 4/4, has flying and vigilance, and is named Radiant Swan.
+Oracle:Starting intensity 0\nWhenever another creature you control with flying enters, if this creature is named Awestruck Cygnet, cards you own named Awestruck Cygnet intensify by 1.\nAs long as this card's intensity is 3 or more, it has base power and toughness 4/4, has flying and vigilance, and is named Radiant Swan.
diff --git a/forge-gui/res/cardsfolder/a/axavar_fate_thief.txt b/forge-gui/res/cardsfolder/a/axavar_fate_thief.txt
new file mode 100644
index 00000000000..45608358c65
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/axavar_fate_thief.txt
@@ -0,0 +1,10 @@
+Name:Axavar, Fate Thief
+ManaCost:2 B R
+Types:Legendary Creature Drix Pirate
+PT:4/3
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | Execute$ TrigDiscard | TriggerDescription$ Void — At the beginning of your end step, if a nonland permanent left the battlefield this turn or a spell was warped this turn, discard a card, then heist target opponent's library.
+SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBHeist
+SVar:DBHeist:DB$ Heist | ValidTgts$ Opponent
+SVar:X:Count$Void.1.0
+K:Warp:BR
+Oracle:Void — At the beginning of your end step, if a nonland permanent left the battlefield this turn or a spell was warped this turn, discard a card, then heist target opponent's library.\nWarp {B/R}
diff --git a/forge-gui/res/cardsfolder/a/axelrod_gunnarson.txt b/forge-gui/res/cardsfolder/a/axelrod_gunnarson.txt
index b1e0d76711c..ce0610e463e 100644
--- a/forge-gui/res/cardsfolder/a/axelrod_gunnarson.txt
+++ b/forge-gui/res/cardsfolder/a/axelrod_gunnarson.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B R R
 Types:Legendary Creature Giant
 PT:5/5
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | Execute$ DBGainLife | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, you gain 1 life and NICKNAME deals 1 damage to target player or planeswalker.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | Execute$ DBGainLife | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, you gain 1 life and NICKNAME deals 1 damage to target player or planeswalker.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBDealDamage
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1
 DeckHas:Ability$LifeGain
diff --git a/forge-gui/res/cardsfolder/upcoming/azula_always_lies.txt b/forge-gui/res/cardsfolder/a/azula_always_lies.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/azula_always_lies.txt
rename to forge-gui/res/cardsfolder/a/azula_always_lies.txt
diff --git a/forge-gui/res/cardsfolder/b/bad_river.txt b/forge-gui/res/cardsfolder/b/bad_river.txt
index 2a72590f0b2..fb59485d270 100644
--- a/forge-gui/res/cardsfolder/b/bad_river.txt
+++ b/forge-gui/res/cardsfolder/b/bad_river.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Swamp | ChangeNum$ 1 | SpellDescription$ Search your library for an Island or Swamp card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Swamp | SpellDescription$ Search your library for an Island or Swamp card, put it onto the battlefield, then shuffle.
 Oracle:Bad River enters tapped.\n{T}, Sacrifice Bad River: Search your library for an Island or Swamp card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/badgermole.txt b/forge-gui/res/cardsfolder/b/badgermole.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/badgermole.txt
rename to forge-gui/res/cardsfolder/b/badgermole.txt
index 3ef8bff4dee..9e24582a0b9 100644
--- a/forge-gui/res/cardsfolder/upcoming/badgermole.txt
+++ b/forge-gui/res/cardsfolder/b/badgermole.txt
@@ -6,4 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigEarthbend:DB$ Earthbend | Num$ 2
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Trample | Description$ Creatures you control with +1/+1 counters on them have trample.
 DeckHas:Ability$Counters
-Oracle:When this creature enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nCreatures you control with +1/+1 counters on them have trample.
\ No newline at end of file
+Oracle:When this creature enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nCreatures you control with +1/+1 counters on them have trample.
diff --git a/forge-gui/res/cardsfolder/b/bagel_and_schmear.txt b/forge-gui/res/cardsfolder/b/bagel_and_schmear.txt
new file mode 100644
index 00000000000..66285ca9f29
--- /dev/null
+++ b/forge-gui/res/cardsfolder/b/bagel_and_schmear.txt
@@ -0,0 +1,8 @@
+Name:Bagel and Schmear
+ManaCost:1
+Types:Artifact Food
+A:AB$ PutCounter | PrecostDesc$ Share — | Cost$ W T Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on up to one target creature. Draw a card. Activate only as a sorcery.
+A:AB$ GainLife | PrecostDesc$ Nosh — | Cost$ 2 T Sac<1/CARDNAME> | LifeAmount$ 3 | SubAbility$ DBDraw | SpellDescription$ You gain 3 life and draw a card.
+SVar:DBDraw:DB$ Draw
+DeckHas:Ability$LifeGain|Sacrifice|Counters
+Oracle:Share — {W}, {T}, Sacrifice this artifact: Put a +1/+1 counter on up to one target creature. Draw a card. Activate only as a sorcery.\nNosh — {2}, {T}, Sacrifice this artifact: You gain 3 life and draw a card.
diff --git a/forge-gui/res/cardsfolder/b/ballad_of_the_black_flag.txt b/forge-gui/res/cardsfolder/b/ballad_of_the_black_flag.txt
index e0135e23caa..214905940b1 100644
--- a/forge-gui/res/cardsfolder/b/ballad_of_the_black_flag.txt
+++ b/forge-gui/res/cardsfolder/b/ballad_of_the_black_flag.txt
@@ -5,6 +5,6 @@ K:Chapter:4:DBMill,DBMill,DBMill,DBCostReduction
 SVar:DBMill:DB$ Mill | NumCards$ 3 | Defined$ You | Imprint$ True | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Card.Historic+YouOwn+IsImprinted | Hidden$ True | Optional$ True | SubAbility$ DBCleanup | SpellDescription$ Mill three cards. You may put a historic card from among them into your hand. (Artifacts, legendaries, and Sagas are historic.)
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
-SVar:DBCostReduction:DB$ Effect | StaticAbilities$ ReduceSPcost
-SVar:ReduceSPcost:Mode$ ReduceCost | ValidCard$ Card.Historic | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Historic spells you cast this turn cost {2} less to cast.
+SVar:DBCostReduction:DB$ Effect | StaticAbilities$ ReduceSPCost
+SVar:ReduceSPCost:Mode$ ReduceCost | ValidCard$ Card.Historic | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Historic spells you cast this turn cost {2} less to cast.
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI, II, III — Mill three cards. You may put a historic card from among them into your hand. (Artifacts, legendaries, and Sagas are historic.)\nIV — Historic spells you cast this turn cost {2} less to cast.
diff --git a/forge-gui/res/cardsfolder/b/bant_panorama.txt b/forge-gui/res/cardsfolder/b/bant_panorama.txt
index 5daf89d4ec4..a09855b7170 100644
--- a/forge-gui/res/cardsfolder/b/bant_panorama.txt
+++ b/forge-gui/res/cardsfolder/b/bant_panorama.txt
@@ -2,5 +2,5 @@ Name:Bant Panorama
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Forest+Basic,Land.Plains+Basic,Land.Island+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Forest.Basic,Plains.Basic,Island.Basic | ChangeTypeDesc$ basic Forest, Plains, or Island | SpellDescription$ Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Bant Panorama: Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/barrels_of_blasting_jelly.txt b/forge-gui/res/cardsfolder/b/barrels_of_blasting_jelly.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/barrels_of_blasting_jelly.txt
rename to forge-gui/res/cardsfolder/b/barrels_of_blasting_jelly.txt
diff --git a/forge-gui/res/cardsfolder/b/barrowin_of_clan_undurr.txt b/forge-gui/res/cardsfolder/b/barrowin_of_clan_undurr.txt
index f6a684d1191..2895b5144bd 100644
--- a/forge-gui/res/cardsfolder/b/barrowin_of_clan_undurr.txt
+++ b/forge-gui/res/cardsfolder/b/barrowin_of_clan_undurr.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ DBChangeZone | TriggerDescription$ Whenever CARDNAME attacks, return up to one creature card with mana value 3 or less from your graveyard to the battlefield if you've completed a dungeon.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.YouOwn+cmcLE3
 SVar:DBVenture:DB$ Venture | Defined$ You
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 DeckHints:Ability$Mill|Discard
 DeckHas:Ability$Graveyard
 Oracle:When Barrowin of Clan Undurr enters, venture into the dungeon. (Enter the first room or advance to the next room.)\nWhenever Barrowin of Clan Undurr attacks, return up to one creature card with mana value 3 or less from your graveyard to the battlefield if you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/b/bartel_runeaxe.txt b/forge-gui/res/cardsfolder/b/bartel_runeaxe.txt
index 085ad7c17b5..2f12c26953a 100644
--- a/forge-gui/res/cardsfolder/b/bartel_runeaxe.txt
+++ b/forge-gui/res/cardsfolder/b/bartel_runeaxe.txt
@@ -3,5 +3,5 @@ ManaCost:3 B R G
 Types:Legendary Creature Giant Warrior
 PT:6/5
 K:Vigilance
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Aura | ValidSA$ Spell | Description$ CARDNAME can't be the target of Aura spells.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Aura | ValidSA$ Spell | Description$ CARDNAME can't be the target of Aura spells.
 Oracle:Vigilance\nBartel Runeaxe can't be the target of Aura spells.
diff --git a/forge-gui/res/cardsfolder/b/battle_cry_goblin.txt b/forge-gui/res/cardsfolder/b/battle_cry_goblin.txt
index 787b97c7d6a..2ad13695736 100644
--- a/forge-gui/res/cardsfolder/b/battle_cry_goblin.txt
+++ b/forge-gui/res/cardsfolder/b/battle_cry_goblin.txt
@@ -5,6 +5,6 @@ PT:2/2
 A:AB$ PumpAll | Cost$ 1 R | ValidCards$ Creature.Goblin+YouCtrl | NumAtt$ +1 | KW$ Haste | SpellDescription$ Goblins you control get +1/+0 and gain haste until end of turn.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, create a 1/1 red Goblin creature token that's tapped and attacking.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_goblin | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 DeckHas:Ability$Token
 Oracle:{1}{R}: Goblins you control get +1/+0 and gain haste until end of turn.\nPack tactics — Whenever Battle Cry Goblin attacks, if you attacked with creatures with total power 6 or greater this combat, create a 1/1 red Goblin creature token that's tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/b/battlemages_bracers.txt b/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
index 548265d91b5..56455252b62 100644
--- a/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
+++ b/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | Description$ Equipped creature has haste.
-T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopyAbility | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopyAbility | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ 1 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Equipped creature has haste.\nWhenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt b/forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt
index 2595f2063b8..21a1ca529e0 100644
--- a/forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt
+++ b/forge-gui/res/cardsfolder/b/beanstalk_giant_fertile_footsteps.txt
@@ -12,5 +12,5 @@ ALTERNATE
 Name:Fertile Footsteps
 ManaCost:2 G
 Types:Sorcery Adventure
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle. (Then exile this card. You may cast the creature later from exile.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle. (Then exile this card. You may cast the creature later from exile.)
 Oracle:Search your library for a basic land card, put it onto the battlefield, then shuffle. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/beetle_headed_merchants.txt b/forge-gui/res/cardsfolder/b/beetle_headed_merchants.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beetle_headed_merchants.txt
rename to forge-gui/res/cardsfolder/b/beetle_headed_merchants.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/beetle_legacy_criminal.txt b/forge-gui/res/cardsfolder/b/beetle_legacy_criminal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/beetle_legacy_criminal.txt
rename to forge-gui/res/cardsfolder/b/beetle_legacy_criminal.txt
diff --git a/forge-gui/res/cardsfolder/b/behold_the_sinister_six.txt b/forge-gui/res/cardsfolder/b/behold_the_sinister_six.txt
new file mode 100644
index 00000000000..b014a9c2f84
--- /dev/null
+++ b/forge-gui/res/cardsfolder/b/behold_the_sinister_six.txt
@@ -0,0 +1,6 @@
+Name:Behold the Sinister Six!
+ManaCost:6 B
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose up to six target creature cards with different names in your graveyard | ValidTgts$ Creature.YouOwn | TargetsWithDifferentNames$ True | TargetMin$ 0 | TargetMax$ 6 | SpellDescription$ Return up to six target creature cards with different names from your graveyard to the battlefield.
+DeckHas:Ability$Graveyard
+Oracle:Return up to six target creature cards with different names from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/benders_waterskin.txt b/forge-gui/res/cardsfolder/b/benders_waterskin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/benders_waterskin.txt
rename to forge-gui/res/cardsfolder/b/benders_waterskin.txt
diff --git a/forge-gui/res/cardsfolder/b/beneath_the_sands.txt b/forge-gui/res/cardsfolder/b/beneath_the_sands.txt
index c9b45dc14be..acccfbfb97b 100644
--- a/forge-gui/res/cardsfolder/b/beneath_the_sands.txt
+++ b/forge-gui/res/cardsfolder/b/beneath_the_sands.txt
@@ -1,6 +1,6 @@
 Name:Beneath the Sands
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:2
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/b/benevolent_blessing.txt b/forge-gui/res/cardsfolder/b/benevolent_blessing.txt
index c109b73970d..bea6937fef1 100644
--- a/forge-gui/res/cardsfolder/b/benevolent_blessing.txt
+++ b/forge-gui/res/cardsfolder/b/benevolent_blessing.txt
@@ -6,5 +6,5 @@ K:Enchant:Creature
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInHumanDeck | SpellDescription$ As CARDNAME enters, choose a color.
 SVar:AttachAILogic:Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:chosenColor:Aura.YouCtrl,Equipment.YouCtrl:SBA | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove Auras and Equipment you control that are already attached to it.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:chosenColor:Aura.ControlledBy Player.PlayerUID_HostCardControllerUID,Equipment.ControlledBy Player.PlayerUID_HostCardControllerUID:SBA | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove Auras and Equipment you control that are already attached to it.
 Oracle:Flash\nEnchant creature\nAs Benevolent Blessing enters, choose a color.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Auras and Equipment you control that are already attached to it.
diff --git a/forge-gui/res/cardsfolder/b/betor_kin_to_all.txt b/forge-gui/res/cardsfolder/b/betor_kin_to_all.txt
index 9eba4f8c722..aac139ffbf1 100644
--- a/forge-gui/res/cardsfolder/b/betor_kin_to_all.txt
+++ b/forge-gui/res/cardsfolder/b/betor_kin_to_all.txt
@@ -9,5 +9,5 @@ SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | ConditionCheckSVar
 SVar:RepeatLoseLife:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBLoseLife | ConditionCheckSVar$ X | ConditionSVarCompare$ GE40
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ HalfUp
 SVar:HalfUp:PlayerCountRemembered$LifeTotal/HalfUp
-SVar:X:Count$Valid Creature.YouCtrl$SumToughness
+SVar:X:Count$Valid Creature.YouCtrl$CardToughness
 Oracle:Flying\nAt the beginning of your end step, if creatures you control have total toughness 10 or greater, draw a card. Then if creatures you control have total toughness 20 or greater, untap each creature you control. Then if creatures you control have total toughness 40 or greater, each opponent loses half their life, rounded up.
diff --git a/forge-gui/res/cardsfolder/b/biorganic_carapace.txt b/forge-gui/res/cardsfolder/b/biorganic_carapace.txt
new file mode 100644
index 00000000000..3952192676a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/b/biorganic_carapace.txt
@@ -0,0 +1,11 @@
+Name:Biorganic Carapace
+ManaCost:2 W U
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When this Equipment enters, attach it to target creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ TrigDamageDone | Description$ Equipped creature gets +2/+2 and has "Whenever this creature deals combat damage to a player, draw a card for each modified creature you control." (Equipment, Auras you control, and counters are modifications.)
+SVar:TrigDamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player, draw a card for each modified creature you control.
+SVar:TrigDraw:DB$ Draw | NumCards$ X
+K:Equip:2
+SVar:X:Count$Valid Creature.modified+YouCtrl
+Oracle:When this Equipment enters, attach it to target creature you control.\nEquipped creature gets +2/+2 and has "Whenever this creature deals combat damage to a player, draw a card for each modified creature you control." (Equipment, Auras you control, and counters are modifications.)\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt b/forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt
index 1ff84d6e33d..f46c48d1a78 100644
--- a/forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt
+++ b/forge-gui/res/cardsfolder/b/bitterthorn_nissas_animus.txt
@@ -5,7 +5,7 @@ K:Living Weapon
 K:Equip:3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Token & Type$Germ|Phyrexian
diff --git a/forge-gui/res/cardsfolder/b/black_cat_cunning_thief.txt b/forge-gui/res/cardsfolder/b/black_cat_cunning_thief.txt
new file mode 100644
index 00000000000..347ae41e811
--- /dev/null
+++ b/forge-gui/res/cardsfolder/b/black_cat_cunning_thief.txt
@@ -0,0 +1,11 @@
+Name:Black Cat, Cunning Thief
+ManaCost:3 B B
+Types:Legendary Creature Human Rogue Villain
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When NICKNAME enters, look at the top nine cards of target opponent's library, exile two of them face down, then put the rest on the bottom of their library in a random order. You may play the exiled cards for as long as they remain exiled. Mana of any type can be spent to cast spells this way.
+SVar:TrigDig:DB$ Dig | ValidTgts$ Opponent | DigNum$ 9 | ChangeNum$ 2 | DestinationZone$ Exile | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | ExileFaceDown$ True | WithMayLook$ True | ChangeValid$ Card | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STPlay | Duration$ Permanent | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreType$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled cards for as long as they remain exiled. Mana of any type can be spent to cast spells this way.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:PlayMain1:TRUE
+Oracle:When Black Cat enters, look at the top nine cards of target opponent's library, exile two of them face down, then put the rest on the bottom of their library in a random order. You may play the exiled cards for as long as they remain exiled. Mana of any type can be spent to cast spells this way.
diff --git a/forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt b/forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt
index 83370e5ef21..7c380c8dd34 100644
--- a/forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt
+++ b/forge-gui/res/cardsfolder/b/blade_of_shared_souls.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Artifact Equipment
 K:For Mirrodin
 T:Mode$ Attached | ValidSource$ Card.Self | TriggerZones$ Battlefield | ValidTarget$ Creature | Execute$ TrigCopy | TriggerDescription$ Whenever CARDNAME becomes attached to a creature, for as long as CARDNAME remains attached to it, you may have that creature become a copy of another target creature you control.
-SVar:TrigCopy:DB$ Clone | ValidTgts$ Creature.YouCtrl+NotTriggeredTarget | Optional$ True | TgtPrompt$ Choose another target creature you control | CloneTarget$ TriggeredTargetLKICopy | Duration$ UntilUnattached
+SVar:TrigCopy:DB$ Clone | ValidTgts$ Creature.YouCtrl+!TriggeredTarget | Optional$ True | TgtPrompt$ Choose another target creature you control | CloneTarget$ TriggeredTargetLKICopy | Duration$ UntilUnattached
 K:Equip:2
 DeckHas:Ability$Token & Type$Rebel & Color$Red
 Oracle:For Mirrodin! (When this Equipment enters, create a 2/2 red Rebel creature token, then attach this to it.)\nWhenever Blade of Shared Souls becomes attached to a creature, for as long as Blade of Shared Souls remains attached to it, you may have that creature become a copy of another target creature you control.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/b/blessed_hippogriff_tyrs_blessing.txt b/forge-gui/res/cardsfolder/b/blessed_hippogriff_tyrs_blessing.txt
index ed69ea65029..e424c106f27 100644
--- a/forge-gui/res/cardsfolder/b/blessed_hippogriff_tyrs_blessing.txt
+++ b/forge-gui/res/cardsfolder/b/blessed_hippogriff_tyrs_blessing.txt
@@ -6,6 +6,7 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target attacking creature without flying gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | KW$ Flying
 AlternateMode:Adventure
+SVar:HasAttackEffect:TRUE
 Oracle:Flying\nWhenever Blessed Hippogriff attacks, target attacking creature without flying gains flying until end of turn.
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/b/blighted_woodland.txt b/forge-gui/res/cardsfolder/b/blighted_woodland.txt
index e26fc88f742..679f0fc48e8 100644
--- a/forge-gui/res/cardsfolder/b/blighted_woodland.txt
+++ b/forge-gui/res/cardsfolder/b/blighted_woodland.txt
@@ -2,7 +2,7 @@ Name:Blighted Woodland
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 3 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 DeckHas:Ability$Mana.Colorless
 DeckNeeds:Color$Green
 Oracle:{T}: Add {C}.\n{3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/bloodpyre_elemental.txt b/forge-gui/res/cardsfolder/b/bloodpyre_elemental.txt
index 0025d902e7d..fcc0db5613d 100644
--- a/forge-gui/res/cardsfolder/b/bloodpyre_elemental.txt
+++ b/forge-gui/res/cardsfolder/b/bloodpyre_elemental.txt
@@ -2,6 +2,6 @@ Name:Bloodpyre Elemental
 ManaCost:4 R
 Types:Creature Elemental
 PT:4/1
-A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ It deals 4 damage to target creature. Activate only any time you could cast a sorcery.
+A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ It deals 4 damage to target creature. Activate only as a sorcery.
 DeckHas:Ability$Sacrifice
 Oracle:Sacrifice Bloodpyre Elemental: It deals 4 damage to target creature. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/b/bloodstained_mire.txt b/forge-gui/res/cardsfolder/b/bloodstained_mire.txt
index e0a517c1d9f..990998d5125 100644
--- a/forge-gui/res/cardsfolder/b/bloodstained_mire.txt
+++ b/forge-gui/res/cardsfolder/b/bloodstained_mire.txt
@@ -1,5 +1,5 @@
 Name:Bloodstained Mire
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Mountain | ChangeNum$ 1 | SpellDescription$ Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Mountain | SpellDescription$ Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Bloodstained Mire: Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/bloomvine_regent_claim_territory.txt b/forge-gui/res/cardsfolder/b/bloomvine_regent_claim_territory.txt
index 8cb3e6667fe..bc1d52ee98c 100644
--- a/forge-gui/res/cardsfolder/b/bloomvine_regent_claim_territory.txt
+++ b/forge-gui/res/cardsfolder/b/bloomvine_regent_claim_territory.txt
@@ -13,7 +13,7 @@ ALTERNATE
 Name:Claim Territory
 ManaCost:2 G
 Types:Sorcery Omen
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Forest.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic Forest cards, reveal them, put one onto the battlefield tapped and the other into your hand, then shuffle. (Also shuffle this card.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Forest.Basic | ChangeTypeDesc$ basic Forest | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic Forest cards, reveal them, put one onto the battlefield tapped and the other into your hand, then shuffle. (Also shuffle this card.)
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/b/borderland_explorer.txt b/forge-gui/res/cardsfolder/b/borderland_explorer.txt
index 3317a6cdd73..b8634b348b5 100644
--- a/forge-gui/res/cardsfolder/b/borderland_explorer.txt
+++ b/forge-gui/res/cardsfolder/b/borderland_explorer.txt
@@ -7,7 +7,7 @@ SVar:TrigChoose:DB$ GenericChoice | TempRemember$ Chooser | ShowChoice$ ExceptSe
 SVar:Discard:DB$ Pump | Defined$ Remembered | NoteCards$ Self | NoteCardsFor$ Discard | SpellDescription$ Discard a card.
 SVar:No:DB$ Pump | SpellDescription$ Do not discard a card.
 SVar:DBDiscard:DB$ Discard | Defined$ Player.NotedForDiscard | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBSearch
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | DefinedPlayer$ RememberedOwner | SubAbility$ DBCleanup
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ RememberedOwner | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBClearNotes
 SVar:DBClearNotes:DB$ Pump | Defined$ Player | ClearNotedCardsFor$ Discard
 DeckHas:Ability$Discard
diff --git a/forge-gui/res/cardsfolder/b/borderland_ranger.txt b/forge-gui/res/cardsfolder/b/borderland_ranger.txt
index 53dded29539..e1424daa819 100644
--- a/forge-gui/res/cardsfolder/b/borderland_ranger.txt
+++ b/forge-gui/res/cardsfolder/b/borderland_ranger.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Human Scout Ranger
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Borderland Ranger enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/bound_determined.txt b/forge-gui/res/cardsfolder/b/bound_determined.txt
index 4930864f9da..6ae44ecde59 100644
--- a/forge-gui/res/cardsfolder/b/bound_determined.txt
+++ b/forge-gui/res/cardsfolder/b/bound_determined.txt
@@ -15,7 +15,7 @@ ALTERNATE
 Name:Determined
 ManaCost:G U
 Types:Instant
-A:SP$ Effect | ReplacementEffects$ CantbeCountered | SubAbility$ DBDraw | SpellDescription$ Other spells you control can't be countered this turn. Draw a card.
-SVar:CantbeCountered:Event$ Counter | ValidSA$ Spell.YouCtrl | Layer$ CantHappen | Description$ Other spells you control can't be countered this turn.
+A:SP$ Effect | ReplacementEffects$ CantBeCountered | SubAbility$ DBDraw | SpellDescription$ Other spells you control can't be countered this turn. Draw a card.
+SVar:CantBeCountered:Event$ Counter | ValidSA$ Spell.YouCtrl | Layer$ CantHappen | Description$ Other spells you control can't be countered this turn.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Other spells you control can't be countered this turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/b/bound_in_gold.txt b/forge-gui/res/cardsfolder/b/bound_in_gold.txt
index 468a68290ef..7f6a7eb0dd9 100644
--- a/forge-gui/res/cardsfolder/b/bound_in_gold.txt
+++ b/forge-gui/res/cardsfolder/b/bound_in_gold.txt
@@ -3,5 +3,5 @@ ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant:Permanent
 SVar:AttachAILogic:Curse
-S:Mode$ CantAttack,CantBlock,CantCrew,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.nonManaAbility | Description$ Enchanted permanent can't attack, block, or crew Vehicles, and its activated abilities can't be activated unless they're mana abilities.
+S:Mode$ CantAttack,CantBlock,CantCrew,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.!ManaAbility | Description$ Enchanted permanent can't attack, block, or crew Vehicles, and its activated abilities can't be activated unless they're mana abilities.
 Oracle:Enchant permanent\nEnchanted permanent can't attack, block, or crew Vehicles, and its activated abilities can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/b/boundless_realms.txt b/forge-gui/res/cardsfolder/b/boundless_realms.txt
index c0214c85fcb..f2ddd045565 100644
--- a/forge-gui/res/cardsfolder/b/boundless_realms.txt
+++ b/forge-gui/res/cardsfolder/b/boundless_realms.txt
@@ -1,6 +1,6 @@
 Name:Boundless Realms
 ManaCost:6 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for X basic land cards, where X is the number of lands you control, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for X basic land cards, where X is the number of lands you control, put them onto the battlefield tapped, then shuffle.
 SVar:X:Count$Valid Land.YouCtrl
 Oracle:Search your library for up to X basic land cards, where X is the number of lands you control, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/bountiful_landscape.txt b/forge-gui/res/cardsfolder/b/bountiful_landscape.txt
index 0f37325a33f..0ab9fbe599c 100644
--- a/forge-gui/res/cardsfolder/b/bountiful_landscape.txt
+++ b/forge-gui/res/cardsfolder/b/bountiful_landscape.txt
@@ -2,6 +2,6 @@ Name:Bountiful Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Forest+Basic,Land.Island+Basic,Land.Mountain+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Forest, Island, or Mountain card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Forest.Basic,Island.Basic,Mountain.Basic | ChangeTypeDesc$ basic Forest, Island, or Mountain | SpellDescription$ Search your library for a basic Forest, Island, or Mountain card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:G U R
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Bountiful Landscape: Search your library for a basic Forest, Island, or Mountain card, put it onto the battlefield tapped, then shuffle.\nCycling {G}{U}{R} ({G}{U}{R}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/b/bow_to_my_command.txt b/forge-gui/res/cardsfolder/b/bow_to_my_command.txt
index 9df772014fc..ed1a944a9a9 100644
--- a/forge-gui/res/cardsfolder/b/bow_to_my_command.txt
+++ b/forge-gui/res/cardsfolder/b/bow_to_my_command.txt
@@ -16,5 +16,5 @@ SVar:AbandonSelf:DB$ Abandon | SubAbility$ DBCleanup | ConditionCheckSVar$ Tappe
 T:Mode$ Abandoned | ValidCard$ Card.Self | Execute$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:NumCreatures:Count$Valid Creature.RememberedPlayerCtrl
-SVar:TappedCreaturePower:Count$SumPower_Card.IsRemembered
+SVar:TappedCreaturePower:Remembered$CardPower
 Oracle:(An ongoing scheme remains face up until it's abandoned.)\nAs you set this scheme in motion, choose an opponent.\nCreatures the chosen player controls can't attack you or planeswalkers you control.\nAt the beginning of your opponents' end step, they may tap any number of untapped creatures they control with total power 8 or greater. If they do, abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/b/braidwood_sextant.txt b/forge-gui/res/cardsfolder/b/braidwood_sextant.txt
index fdd8bb376e8..5ce8628811d 100644
--- a/forge-gui/res/cardsfolder/b/braidwood_sextant.txt
+++ b/forge-gui/res/cardsfolder/b/braidwood_sextant.txt
@@ -1,5 +1,5 @@
 Name:Braidwood Sextant
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.
 Oracle:{2}, {T}, Sacrifice Braidwood Sextant: Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/brave_the_wilds.txt b/forge-gui/res/cardsfolder/b/brave_the_wilds.txt
index aaf01d66563..9ba9962a721 100644
--- a/forge-gui/res/cardsfolder/b/brave_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/b/brave_the_wilds.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Sorcery
 K:Bargain
 A:SP$ Animate | ValidTgts$ Land.YouCtrl | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select target land you control | Power$ 3 | Toughness$ 3 | Types$ Creature,Elemental | Duration$ Permanent | SubAbility$ DBChangeZone | Condition$ Bargain | Keywords$ Haste | SpellDescription$ If this spell was bargained, target land you control becomes a 3/3 Elemental creature with haste that's still a land.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:X:Count$Bargained.1.0
 DeckHints:Type$Artifact|Enchantment & Ability$Token
 DeckHas:Ability$Sacrifice & Type$Elemental
diff --git a/forge-gui/res/cardsfolder/b/broken_dam.txt b/forge-gui/res/cardsfolder/b/broken_dam.txt
index 5bd7ab682b5..46694aaeae9 100644
--- a/forge-gui/res/cardsfolder/b/broken_dam.txt
+++ b/forge-gui/res/cardsfolder/b/broken_dam.txt
@@ -1,5 +1,5 @@
 Name:Broken Dam
 ManaCost:U
 Types:Sorcery
-A:SP$ Tap | TargetMin$ 1 | TargetMax$ 2 | TgtPrompt$ Choose target creature without horsemanship | ValidTgts$ Creature.withoutHorsemanship | SpellDescription$ Tap one or two target creatures without horsemanship.
+A:SP$ Tap | TargetMin$ 1 | TargetMax$ 2 | ValidTgts$ Creature.withoutHorsemanship | TgtPrompt$ Choose one or two target creatures without horsemanship | SpellDescription$ Tap one or two target creatures without horsemanship.
 Oracle:Tap one or two target creatures without horsemanship.
diff --git a/forge-gui/res/cardsfolder/b/brokers_hideout.txt b/forge-gui/res/cardsfolder/b/brokers_hideout.txt
index a0d7090667a..63020480f2c 100644
--- a/forge-gui/res/cardsfolder/b/brokers_hideout.txt
+++ b/forge-gui/res/cardsfolder/b/brokers_hideout.txt
@@ -4,7 +4,7 @@ Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | Defined$ Self | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Forest+Basic,Land.Plains+Basic,Land.Island+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Forest.Basic,Plains.Basic,Island.Basic | ChangeTypeDesc$ basic Forest, Plains, or Island | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
diff --git a/forge-gui/res/cardsfolder/b/brudiclad_telchor_engineer.txt b/forge-gui/res/cardsfolder/b/brudiclad_telchor_engineer.txt
index bc3b3bbdcfd..62967b12daa 100644
--- a/forge-gui/res/cardsfolder/b/brudiclad_telchor_engineer.txt
+++ b/forge-gui/res/cardsfolder/b/brudiclad_telchor_engineer.txt
@@ -7,6 +7,6 @@ SVar:PlayMain1:TRUE
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of combat on your turn, create a 2/1 blue Phyrexian Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token.
 SVar:TrigToken:DB$ Token | TokenScript$ u_2_1_a_phyrexian_myr | SubAbility$ DBClone
 SVar:DBClone:DB$ Clone | Choices$ Card.token+YouCtrl | ChoiceTitle$ You may choose a token you control | ChoiceOptional$ True | ExcludeChosen$ True | CloneTarget$ Valid Card.token+YouCtrl
-DeckHints:Type$Token
-DeckHas:Type$Token & Type$Artifact|Myr
+DeckHints:Ability$Token
+DeckHas:Ability$Token & Type$Artifact|Myr
 Oracle:Creature tokens you control have haste.\nAt the beginning of combat on your turn, create a 2/1 blue Phyrexian Myr artifact creature token. Then you may choose a token you control. If you do, each other token you control becomes a copy of that token.
diff --git a/forge-gui/res/cardsfolder/b/bucolic_ranch.txt b/forge-gui/res/cardsfolder/b/bucolic_ranch.txt
index cc0b5e81e0a..5dcad48b6b9 100644
--- a/forge-gui/res/cardsfolder/b/bucolic_ranch.txt
+++ b/forge-gui/res/cardsfolder/b/bucolic_ranch.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land Desert
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Spell.Mount | SpellDescription$ Add one mana of any color. Spend this mana only to cast a Mount spell.
-A:AB$ PeekAndReveal | Cost$ 3 T | PeekAmount$ 1 | RevealValid$ Card.Mount | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBChangeZone | SpellDescription$ Look at the top card of your library. If it's a Mount card, you may reveal it and put it into your hand. If you don't put it into your hand, you may put it on the bottom of your library.
+A:AB$ PeekAndReveal | Cost$ 3 T | PeekAmount$ 1 | RevealValid$ Card.Mount | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBChangeZone | AILogic$ AtOppEOT | SpellDescription$ Look at the top card of your library. If it's a Mount card, you may reveal it and put it into your hand. If you don't put it into your hand, you may put it on the bottom of your library.
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Optional$ True | Defined$ TopOfLibrary | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/bumi_eclectic_earthbender.txt b/forge-gui/res/cardsfolder/b/bumi_eclectic_earthbender.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/bumi_eclectic_earthbender.txt
rename to forge-gui/res/cardsfolder/b/bumi_eclectic_earthbender.txt
index 8559b76944e..99d21634e24 100644
--- a/forge-gui/res/cardsfolder/upcoming/bumi_eclectic_earthbender.txt
+++ b/forge-gui/res/cardsfolder/b/bumi_eclectic_earthbender.txt
@@ -7,4 +7,4 @@ SVar:TrigEarthbend:DB$ Earthbend | Num$ 1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever NICKNAME attacks, put two +1/+1 counters on each land creature you control.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.Land+YouCtrl | CounterType$ P1P1 | CounterNum$ 2
 DeckHas:Ability$Counters
-Oracle:When Bumi enters, earthbend 1. (Target land you control becomes a 0/0 creature with haste that's still a land. Put a +1/+1 counter on it. When it dies or is exiled, return it to the battlefield tapped.)\nWhenever Bumi attacks, put two +1/+1 counters on each land creature you control.
\ No newline at end of file
+Oracle:When Bumi enters, earthbend 1. (Target land you control becomes a 0/0 creature with haste that's still a land. Put a +1/+1 counter on it. When it dies or is exiled, return it to the battlefield tapped.)\nWhenever Bumi attacks, put two +1/+1 counters on each land creature you control.
diff --git a/forge-gui/res/cardsfolder/b/burning_rune_demon.txt b/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
index 0cef5dcc70a..dc3310814a6 100644
--- a/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
+++ b/forge-gui/res/cardsfolder/b/burning_rune_demon.txt
@@ -4,7 +4,7 @@ Types:Creature Demon Berserker
 PT:6/6
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for exactly two cards not named Burning-Rune Demon that have different names. If you do, reveal those cards. An opponent chooses one of them. Put the chosen card into your hand and the other into your graveyard, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Card.notnamedBurning-Rune Demon | ChangeNum$ 2 | DifferentNames$ True | RememberChanged$ True | Reveal$ True | Shuffle$ False | AILogic$ Intuition | SubAbility$ DBChoosePlayer
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Card.!namedBurning-Rune Demon | ChangeNum$ 2 | DifferentNames$ True | Exactly$ True | RememberChanged$ True | Reveal$ True | Shuffle$ False | AILogic$ Intuition | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChangeZone1
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | Chooser$ ChosenPlayer | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to be put into the hand of CARDNAME's controller | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZoneAll | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Shuffle$ True | StackDescription$ None | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt b/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
index 3643336923d..df3170e5738 100644
--- a/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
+++ b/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
@@ -2,6 +2,6 @@ Name:Burning-Tree Shaman
 ManaCost:1 R G
 Types:Creature Centaur Shaman
 PT:3/4
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Player | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever a player activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Player | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever a player activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 Oracle:Whenever a player activates an ability that isn't a mana ability, Burning-Tree Shaman deals 1 damage to that player.
diff --git a/forge-gui/res/cardsfolder/b/burnished_hart.txt b/forge-gui/res/cardsfolder/b/burnished_hart.txt
index 7abe85f1b23..986c995bb44 100644
--- a/forge-gui/res/cardsfolder/b/burnished_hart.txt
+++ b/forge-gui/res/cardsfolder/b/burnished_hart.txt
@@ -2,5 +2,5 @@ Name:Burnished Hart
 ManaCost:3
 Types:Artifact Creature Elk
 PT:2/2
-A:AB$ ChangeZone | Cost$ 3 Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 Oracle:{3}, Sacrifice Burnished Hart: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/b/bushwhack.txt b/forge-gui/res/cardsfolder/b/bushwhack.txt
index d1659b41e0c..8e9b441bc71 100644
--- a/forge-gui/res/cardsfolder/b/bushwhack.txt
+++ b/forge-gui/res/cardsfolder/b/bushwhack.txt
@@ -2,7 +2,7 @@ Name:Bushwhack
 ManaCost:G
 Types:Sorcery
 A:SP$ Charm | Choices$ FetchBasic,Fight
-SVar:FetchBasic:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:FetchBasic:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:Fight:DB$ Pump | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | SubAbility$ DBFight | SpellDescription$ Target creature you control fights target creature you don't control.
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
 Oracle:Choose one —\n• Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n• Target creature you control fights target creature you don't control. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/upcoming/buzzard_wasp_colony.txt b/forge-gui/res/cardsfolder/b/buzzard_wasp_colony.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/buzzard_wasp_colony.txt
rename to forge-gui/res/cardsfolder/b/buzzard_wasp_colony.txt
diff --git a/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt b/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
index 151bbed9c44..65eb5b0ca06 100644
--- a/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
+++ b/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
@@ -4,7 +4,7 @@ Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Mountain.Basic,Forest.Basic,Plains.Basic | ChangeTypeDesc$ basic Mountain, Forest, or Plains | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
diff --git a/forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt b/forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt
index 7bffc1bd003..e42009cd035 100644
--- a/forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt
+++ b/forge-gui/res/cardsfolder/c/caesar_legions_emperor.txt
@@ -11,5 +11,5 @@ SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the number of creature tokens you control to target opponent.
 SVar:X:Count$Valid Creature.token+YouCtrl
 DeckHas:Ability$Token|Sacrifice
-DeckHints:Type$Token
+DeckHints:Ability$Token
 Oracle:Whenever you attack, you may sacrifice another creature. When you do, choose two —\n• Create two 1/1 red and white Soldier creature tokens with haste that are tapped and attacking.\n• You draw a card and you lose 1 life.\n• Caesar, Legion's Emperor deals damage equal to the number of creature tokens you control to target opponent.
diff --git a/forge-gui/res/cardsfolder/c/caged_sun.txt b/forge-gui/res/cardsfolder/c/caged_sun.txt
index fc57f7feea9..40c41f94581 100644
--- a/forge-gui/res/cardsfolder/c/caged_sun.txt
+++ b/forge-gui/res/cardsfolder/c/caged_sun.txt
@@ -4,7 +4,7 @@ Types:Artifact
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color.
 S:Mode$ Continuous | Affected$ Creature.ChosenColor+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen color get +1/+1.
-T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.ManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
-T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.nonManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
+T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.ManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
+T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.!ManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Amount$ 1
 Oracle:As Caged Sun enters, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability causes you to add one or more mana of the chosen color, add an additional one mana of that color.
diff --git a/forge-gui/res/cardsfolder/c/campus_guide.txt b/forge-gui/res/cardsfolder/c/campus_guide.txt
index 40079635200..ae6fd598c03 100644
--- a/forge-gui/res/cardsfolder/c/campus_guide.txt
+++ b/forge-gui/res/cardsfolder/c/campus_guide.txt
@@ -3,5 +3,5 @@ ManaCost:2
 Types:Artifact Creature Golem
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Campus Guide enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/c/candela_aegis_of_adagia.txt b/forge-gui/res/cardsfolder/c/candela_aegis_of_adagia.txt
new file mode 100644
index 00000000000..de299210fe2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/candela_aegis_of_adagia.txt
@@ -0,0 +1,14 @@
+Name:Candela, Aegis of Adagia
+ManaCost:W
+Types:Legendary Artifact Spacecraft
+PT:2/3
+K:Flash
+K:Station:8
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When NICKNAME enters, return up to one target creature you control to its owner's hand. It perpetually gets +1/+1.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.YouCtrl | RememberChanged$ True | TgtPrompt$ Select up to one target creature you control. | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | PumpZone$ Hand | Defined$ Remembered | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddTrigger$ DamageTrig | Description$ STATION 8+ Flying,,,,,,Whenever NICKNAME deals combat damage to a player, you may put a creature card with mana value 3 or less from your hand onto the battlefield.
+SVar:DamageTrig:Mode$ DamageDoneOnce | CombatDamage$ True | OptionalDecider$ You | ValidSource$ Card.Self | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, you may put a creature card with mana value 3 or less from your hand onto the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChoiceZone$ Hand | Amount$ 1 | ChangeType$ Creature.cmcLE3+YouCtrl | ChangeNum$ 1 | AILogic$ BestCard
+Oracle:Flash\nWhen Candela enters, return up to one target creature you control to its owner's hand. It perpetually gets +1/+1.\nSTATION 8+\nFlying\nWhenever Candela deals combat damage to a player, you may put a creature card with mana value 3 or less from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/canopy_cover.txt b/forge-gui/res/cardsfolder/c/canopy_cover.txt
index a9bb6c2ea4d..5cdde51cf2b 100644
--- a/forge-gui/res/cardsfolder/c/canopy_cover.txt
+++ b/forge-gui/res/cardsfolder/c/canopy_cover.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.EnchantedBy | ValidBlocker$ Creature.withoutFlying+withoutReach | Description$ Enchanted creature can't be blocked except by creatures with flying or reach.
-S:Mode$ CantTarget | ValidCard$ Card.EnchantedBy | Activator$ Opponent | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Card.EnchantedBy | Activator$ Opponent | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
 Oracle:Enchant creature\nEnchanted creature can't be blocked except by creatures with flying or reach.\nEnchanted creature can't be the target of spells or abilities your opponents control.
diff --git a/forge-gui/res/cardsfolder/c/cantor_of_the_refrain.txt b/forge-gui/res/cardsfolder/c/cantor_of_the_refrain.txt
new file mode 100644
index 00000000000..8ea22f1ea3c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/cantor_of_the_refrain.txt
@@ -0,0 +1,10 @@
+Name:Cantor of the Refrain
+ManaCost:B
+Types:Creature Human Pilot
+PT:2/1
+S:Mode$ CantBlock | ValidCard$ Card.Self | Description$ This creature can't block.
+T:Mode$ SpellCast | ValidCard$ Card | ValidSA$ Spell.Warp | ValidActivatingPlayer$ You | TriggerZones$ Graveyard | Execute$ TrigChangeZone | TriggerDescription$ When you cast a spell for its warp cost, return this card from your graveyard to the battlefield under its owner's control. It perpetually gets +1/+0.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Pump | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | NumAtt$ +1 | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:This creature can't block.\nWhen you cast a spell for its warp cost, return this card from your graveyard to the battlefield under its owner's control. It perpetually gets +1/+0.
diff --git a/forge-gui/res/cardsfolder/upcoming/capital_guard.txt b/forge-gui/res/cardsfolder/c/capital_guard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/capital_guard.txt
rename to forge-gui/res/cardsfolder/c/capital_guard.txt
diff --git a/forge-gui/res/cardsfolder/c/caravan_vigil.txt b/forge-gui/res/cardsfolder/c/caravan_vigil.txt
index a223a83018a..ee5396a550c 100644
--- a/forge-gui/res/cardsfolder/c/caravan_vigil.txt
+++ b/forge-gui/res/cardsfolder/c/caravan_vigil.txt
@@ -1,5 +1,5 @@
 Name:Caravan Vigil
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | DestinationAlternative$ Battlefield | DestAltSVar$ Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature | ChangeType$ Land.Basic | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.,,,,,,Morbid — You may put that card onto the battlefield instead of putting it into your hand if a creature died this turn.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | DestinationAlternative$ Battlefield | DestAltSVar$ Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.,,,,,,Morbid — You may put that card onto the battlefield instead of putting it into your hand if a creature died this turn.
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nMorbid — You may put that card onto the battlefield instead of putting it into your hand if a creature died this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/carnage_crimson_chaos.txt b/forge-gui/res/cardsfolder/c/carnage_crimson_chaos.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/carnage_crimson_chaos.txt
rename to forge-gui/res/cardsfolder/c/carnage_crimson_chaos.txt
diff --git a/forge-gui/res/cardsfolder/c/carrion_beetles.txt b/forge-gui/res/cardsfolder/c/carrion_beetles.txt
index 995d9f9e4f3..096f33e952c 100644
--- a/forge-gui/res/cardsfolder/c/carrion_beetles.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_beetles.txt
@@ -2,5 +2,5 @@ Name:Carrion Beetles
 ManaCost:B
 Types:Creature Insect
 PT:1/1
-A:AB$ ChangeZone | Cost$ 2 B T | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ 2 B T | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 Oracle:{2}{B}, {T}: Exile up to three target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt b/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
index 0d984f81a28..eeebb69b0ca 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
@@ -8,6 +8,6 @@ SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 T:Mode$ AttackersDeclared | IsPresent$ Card.Self+IsSolved | AttackingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCounterAttacker | TriggerDescription$ Solved — Whenever you attack, put a +1/+1 counter on target attacking creature. It gains trample until end of turn.
 SVar:TrigCounterAttacker:DB$ PutCounter | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 DeckHas:Ability$Counters
 Oracle:When this Case enters, distribute two +1/+1 counters among one or two target creatures you control.\nTo solve — Creatures you control have total power 8 or greater. (If unsolved, solve at the beginning of your end step.)\nSolved — Whenever you attack, put a +1/+1 counter on target attacking creature. It gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/cat_gator.txt b/forge-gui/res/cardsfolder/c/cat_gator.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cat_gator.txt
rename to forge-gui/res/cardsfolder/c/cat_gator.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/cat_owl.txt b/forge-gui/res/cardsfolder/c/cat_owl.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/cat_owl.txt
rename to forge-gui/res/cardsfolder/c/cat_owl.txt
diff --git a/forge-gui/res/cardsfolder/c/caves_of_chaos_adventurer.txt b/forge-gui/res/cardsfolder/c/caves_of_chaos_adventurer.txt
index 87633e9a623..c7a84a87788 100644
--- a/forge-gui/res/cardsfolder/c/caves_of_chaos_adventurer.txt
+++ b/forge-gui/res/cardsfolder/c/caves_of_chaos_adventurer.txt
@@ -13,6 +13,6 @@ SVar:STPlay2:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | A
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play that card this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 SVar:HasAttackEffect:TRUE
 Oracle:Trample\nWhen Caves of Chaos Adventurer enters, you take the initiative.\nWhenever Caves of Chaos Adventurer attacks, exile the top card of your library. If you've completed a dungeon, you may play that card this turn without paying its mana cost. Otherwise, you may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/c/cease_desist.txt b/forge-gui/res/cardsfolder/c/cease_desist.txt
index 6a36165dce5..162548b016b 100644
--- a/forge-gui/res/cardsfolder/c/cease_desist.txt
+++ b/forge-gui/res/cardsfolder/c/cease_desist.txt
@@ -1,7 +1,7 @@
 Name:Cease
 ManaCost:1 BG
 Types:Instant
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target cards from a single graveyard | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | SubAbility$ DBGainLife | SpellDescription$ Exile up to two target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select up to two target cards from a single graveyard | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | SubAbility$ DBGainLife | SpellDescription$ Exile up to two target cards from a single graveyard.
 SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ Target player gains 2 life and draws a card.
 SVar:DBDraw:DB$ Draw | Defined$ TargetedPlayer
 DeckHas:Ability$Graveyard|LifeGain
diff --git a/forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt b/forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt
index 597c7c979e0..51703eea0b1 100644
--- a/forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt
+++ b/forge-gui/res/cardsfolder/c/celebrate_the_harvest.txt
@@ -1,6 +1,6 @@
 Name:Celebrate the Harvest
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True | SelectPrompt$ Select up to X basic land cards | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to X basic land cards, where X is the number of different powers among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True | SelectPrompt$ Select up to X basic land cards | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to X basic land cards, where X is the number of different powers among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
 SVar:X:Count$DifferentPower_Creature.YouCtrl
 Oracle:Search your library for up to X basic land cards, where X is the number of different powers among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/c/centaur_rootcaster.txt b/forge-gui/res/cardsfolder/c/centaur_rootcaster.txt
index 3369e75cd15..7abdbb30b30 100644
--- a/forge-gui/res/cardsfolder/c/centaur_rootcaster.txt
+++ b/forge-gui/res/cardsfolder/c/centaur_rootcaster.txt
@@ -3,5 +3,5 @@ ManaCost:3 G
 Types:Creature Centaur Druid
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigChange | CombatDamage$ True | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Whenever Centaur Rootcaster deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/c/central_elevator_promising_stairs.txt b/forge-gui/res/cardsfolder/c/central_elevator_promising_stairs.txt
index 26ca18797da..751dcb0cc7a 100644
--- a/forge-gui/res/cardsfolder/c/central_elevator_promising_stairs.txt
+++ b/forge-gui/res/cardsfolder/c/central_elevator_promising_stairs.txt
@@ -14,5 +14,5 @@ Types:Enchantment Room
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. You win the game if there are eight or more different names among unlocked doors of Rooms you control.
 SVar:TrigSurveil:DB$ Surveil | SubAbility$ DBWin
 SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ RoomsUnlocked | ConditionSVarCompare$ GE8
-SVar:RoomsUnlocked:Count$DistinctUnlockedDoors Card.Room+YouCtrl
+SVar:RoomsUnlocked:Count$DistinctUnlockedDoors
 Oracle:At the beginning of your upkeep, surveil 1. You win the game if there are eight or more different names among unlocked doors of Rooms you control.
diff --git a/forge-gui/res/cardsfolder/c/chameleon_master_of_disguise.txt b/forge-gui/res/cardsfolder/c/chameleon_master_of_disguise.txt
new file mode 100644
index 00000000000..bcf701ee1cd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/chameleon_master_of_disguise.txt
@@ -0,0 +1,8 @@
+Name:Chameleon, Master of Disguise
+ManaCost:3 U
+Types:Legendary Creature Human Shapeshifter Villain
+PT:2/3
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.YouCtrl+Other | NewName$ Chameleon, Master of Disguise | SpellDescription$ You may have NICKNAME enter as a copy of a creature you control, except his name is Chameleon, Master of Disguise.
+K:Mayhem:2 U
+Oracle:You may have Chameleon enter as a copy of a creature you control, except his name is Chameleon, Master of Disguise.\nMayhem {2}{U} (You may cast this card from your graveyard for {2}{U} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/c/cheering_crowd.txt b/forge-gui/res/cardsfolder/c/cheering_crowd.txt
new file mode 100644
index 00000000000..2fdd7ac6391
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/cheering_crowd.txt
@@ -0,0 +1,8 @@
+Name:Cheering Crowd
+ManaCost:1 RG
+Types:Creature Human Citizen
+PT:2/2
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each player's first main phase, that player may put a +1/+1 counter on this creature. If they do, they add {C} for each counter on it.
+SVar:TrigMana:DB$ Mana | UnlessCost$ AddCounter<1/P1P1/CARDNAME> | UnlessPayer$ TriggeredPlayer | UnlessSwitched$ True | Produced$ C | Amount$ X | Defined$ TriggeredPlayer
+SVar:X:Count$CardCounters.ALL
+Oracle:At the beginning of each player's first main phase, that player may put a +1/+1 counter on this creature. If they do, they add {C} for each counter on it.
diff --git a/forge-gui/res/cardsfolder/c/chlorophant.txt b/forge-gui/res/cardsfolder/c/chlorophant.txt
index e63ccf172c3..ce01a6059f5 100644
--- a/forge-gui/res/cardsfolder/c/chlorophant.txt
+++ b/forge-gui/res/cardsfolder/c/chlorophant.txt
@@ -6,4 +6,4 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | O
 S:Mode$ Continuous | Affected$ Card.Self | AddTrigger$ TrigCounter | Condition$ Threshold | Description$ Threshold — As long as there are seven or more cards in your graveyard, CARDNAME has "At the beginning of your upkeep, you may put another +1/+1 counter on CARDNAME."
 SVar:TrigCounter:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ GimmeSome | TriggerDescription$ At the beginning of your upkeep, you may put another +1/+1 counter on CARDNAME.
 SVar:GimmeSome:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-Oracle:At the beginning of your upkeep, you may put a +1/+1 counter on Chlorophant.\nThreshold — As long as there are seven or more cards in your graveyard,, Chlorophant has "At the beginning of your upkeep, you may put another +1/+1 counter on Chlorophant."
+Oracle:At the beginning of your upkeep, you may put a +1/+1 counter on Chlorophant.\nThreshold — As long as there are seven or more cards in your graveyard, Chlorophant has "At the beginning of your upkeep, you may put another +1/+1 counter on Chlorophant."
diff --git a/forge-gui/res/cardsfolder/c/circle_of_elders.txt b/forge-gui/res/cardsfolder/c/circle_of_elders.txt
index 9ba44f4ae35..9b82eb7f732 100644
--- a/forge-gui/res/cardsfolder/c/circle_of_elders.txt
+++ b/forge-gui/res/cardsfolder/c/circle_of_elders.txt
@@ -4,5 +4,5 @@ Types:Creature Human Shaman
 PT:2/4
 K:Vigilance
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ Add {C}{C}{C}. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Vigilance\nFormidable — {T}: Add {C}{C}{C}. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/c/city_pigeon.txt b/forge-gui/res/cardsfolder/c/city_pigeon.txt
new file mode 100644
index 00000000000..1b0ed07a6a9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/city_pigeon.txt
@@ -0,0 +1,9 @@
+Name:City Pigeon
+ManaCost:W
+Types:Creature Bird
+PT:1/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature leaves the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this token: You gain 3 life.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+DeckHas:Ability$Token|Sacrifice & Type$Food
+Oracle:Flying\nWhen this creature leaves the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this token: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/c/civic_wayfinder.txt b/forge-gui/res/cardsfolder/c/civic_wayfinder.txt
index 7a2c0a2e0d6..55960c76f66 100644
--- a/forge-gui/res/cardsfolder/c/civic_wayfinder.txt
+++ b/forge-gui/res/cardsfolder/c/civic_wayfinder.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Elf Druid Warrior
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Civic Wayfinder enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt b/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
index 30200a18783..b9adf47bce0 100644
--- a/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
+++ b/forge-gui/res/cardsfolder/c/cleansing_wildfire.txt
@@ -2,6 +2,6 @@ Name:Cleansing Wildfire
 ManaCost:1 R
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw | StackDescription$ Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library.
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw | StackDescription$ Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/c/clever_conjurer.txt b/forge-gui/res/cardsfolder/c/clever_conjurer.txt
index 6b1d34d72c8..72bb957603d 100644
--- a/forge-gui/res/cardsfolder/c/clever_conjurer.txt
+++ b/forge-gui/res/cardsfolder/c/clever_conjurer.txt
@@ -2,5 +2,5 @@ Name:Clever Conjurer
 ManaCost:2 U
 Types:Creature Gnome Wizard
 PT:2/3
-A:AB$ Untap | Cost$ T | ValidTgts$ Permanent.Other+notnamedClever Conjurer | TgtPrompt$ Select another target permanent not named Clever Conjurer | SorcerySpeed$ True | PrecostDesc$ Mage Hand — | SpellDescription$ Untap target permanent not named Clever Conjurer. Activate only as a sorcery.
+A:AB$ Untap | Cost$ T | ValidTgts$ Permanent.Other+!namedClever Conjurer | TgtPrompt$ Select another target permanent not named Clever Conjurer | SorcerySpeed$ True | PrecostDesc$ Mage Hand — | SpellDescription$ Untap target permanent not named Clever Conjurer. Activate only as a sorcery.
 Oracle:Mage Hand — {T}: Untap target permanent not named Clever Conjurer. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/c/cliffside_market.txt b/forge-gui/res/cardsfolder/c/cliffside_market.txt
index 04e5c42a145..b3eb06aeb16 100644
--- a/forge-gui/res/cardsfolder/c/cliffside_market.txt
+++ b/forge-gui/res/cardsfolder/c/cliffside_market.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Mercadia
 T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLife | TriggerZones$ Command | Secondary$ True | OptionalDecider$ You | TriggerDescription$ When you planeswalk to CARDNAME or at the beginning of your upkeep, you may exchange life totals with target player.
-SVar:TrigLife:DB$ ExchangeLife | Optional$ True | ValidTgts$ Player | TgtPrompt$ Select target player to exchange life totals with
+SVar:TrigLife:DB$ ExchangeLife | ValidTgts$ Player | TgtPrompt$ Select target player to exchange life totals with
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, exchange control of two target permanents that share a card type.
 SVar:RolledChaos:DB$ ExchangeControl | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent | TgtPrompt$ Select target permanents that share a permanent type | TargetsWithSameCardType$ True
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/c/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/c/cloakwood_swarmkeeper.txt
index 16eeb056faa..e542d0eb53f 100644
--- a/forge-gui/res/cardsfolder/c/cloakwood_swarmkeeper.txt
+++ b/forge-gui/res/cardsfolder/c/cloakwood_swarmkeeper.txt
@@ -2,8 +2,8 @@ Name:Cloakwood Swarmkeeper
 ManaCost:G
 Types:Creature Elf Ranger
 PT:1/1
-T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutcounter | TriggerDescription$ Gathered Swarm — Whenever one or more tokens you control enter, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ 1
+T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Gathered Swarm — Whenever one or more tokens you control enter, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ 1
 DeckHints:Ability$Token
 DeckHas:Ability$Counters
 Oracle:Gathered Swarm — Whenever one or more tokens you control enter, put a +1/+1 counter on Cloakwood Swarmkeeper.
diff --git a/forge-gui/res/cardsfolder/c/cloister_gargoyle.txt b/forge-gui/res/cardsfolder/c/cloister_gargoyle.txt
index e2ff4417f81..07ea1913c59 100644
--- a/forge-gui/res/cardsfolder/c/cloister_gargoyle.txt
+++ b/forge-gui/res/cardsfolder/c/cloister_gargoyle.txt
@@ -5,5 +5,5 @@ PT:0/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBVenture | TriggerDescription$ When CARDNAME enters, venture into the dungeon. (Enter the first room or advance to the next room.)
 SVar:DBVenture:DB$ Venture | Defined$ You
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you've completed a dungeon, CARDNAME gets +3/+0 and has flying.
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:When Cloister Gargoyle enters, venture into the dungeon. (Enter the first room or advance to the next room.)\nAs long as you've completed a dungeon, Cloister Gargoyle gets +3/+0 and has flying.
diff --git a/forge-gui/res/cardsfolder/c/coal_hill_school.txt b/forge-gui/res/cardsfolder/c/coal_hill_school.txt
index 6cef1558b57..f05bbf2d080 100644
--- a/forge-gui/res/cardsfolder/c/coal_hill_school.txt
+++ b/forge-gui/res/cardsfolder/c/coal_hill_school.txt
@@ -2,7 +2,7 @@ Name:Coal Hill School
 ManaCost:no cost
 Types:Plane Earth
 T:Mode$ SpellCast | ValidCard$ Card.Historic | Execute$ TrigDraw | TriggerZones$ Command | TriggerDescription$ Whenever a player casts a historic spell, that player draws a card. (Artifacts, legendaries, and Sagas are historic.)
-SVar:TrigDraw:DB$ Draw | Defined$ TriggeredPlayer | NumCards$ 1
+SVar:TrigDraw:DB$ Draw | Defined$ TriggeredActivator | NumCards$ 1
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigReturn | TriggerDescription$ Whenever chaos ensues, return target historic card from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.Historic+YouOwn | TgtPrompt$ Select target historic card
 DeckHints:Type$Artifact|Saga|Legendary
diff --git a/forge-gui/res/cardsfolder/c/cogwork_assembler.txt b/forge-gui/res/cardsfolder/c/cogwork_assembler.txt
index 5d60e998b0c..4904c95647a 100644
--- a/forge-gui/res/cardsfolder/c/cogwork_assembler.txt
+++ b/forge-gui/res/cardsfolder/c/cogwork_assembler.txt
@@ -2,5 +2,5 @@ Name:Cogwork Assembler
 ManaCost:3
 Types:Artifact Creature Assembly-Worker
 PT:2/3
-A:AB$ CopyPermanent | Cost$ 7 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ 7 | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | PumpKeywords$ Haste | AtEOT$ Exile | SpellDescription$ Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
 Oracle:{7}: Create a token that's a copy of target artifact. That token gains haste. Exile it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt b/forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt
index f3ffdab8922..ed65290a80e 100644
--- a/forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt
+++ b/forge-gui/res/cardsfolder/c/colfenor_the_last_yew.txt
@@ -5,7 +5,7 @@ PT:3/7
 K:Vigilance
 K:Reach
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever CARDNAME or another creature you control dies, return up to one other target creature card with lesser toughness from your graveyard to your hand.
-SVar:TrigChange:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other+NotTriggeredNewCard+toughnessLTX+YouOwn | TgtPrompt$ Select up to one other target creature card with lesser toughness from your graveyard to return to your hand
+SVar:TrigChange:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.Other+!TriggeredNewCard+toughnessLTX+YouOwn | TgtPrompt$ Select up to one other target creature card with lesser toughness from your graveyard to return to your hand
 SVar:X:TriggeredCard$CardToughness
 DeckHas:Ability$Graveyard
 Oracle:Vigilance, reach\nWhenever Colfenor, the Last Yew or another creature you control dies, return up to one other target creature card with lesser toughness from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/collective_voyage.txt b/forge-gui/res/cardsfolder/c/collective_voyage.txt
index 76c99008032..ed6990b00e6 100644
--- a/forge-gui/res/cardsfolder/c/collective_voyage.txt
+++ b/forge-gui/res/cardsfolder/c/collective_voyage.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ RepeatEach | RepeatPlayers$ Player | StartingWith$ You | RepeatSubAbility$ DBPay | SubAbility$ DBSearch | StackDescription$ SpellDescription | SpellDescription$ Join forces — Starting with you, each player may pay any amount of mana. Each player searches their library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles.
 SVar:DBPay:DB$ ChooseNumber | Defined$ Player.IsRemembered | ChooseAnyNumber$ True | ListTitle$ amount of mana to pay | SubAbility$ DBStore
 SVar:DBStore:DB$ StoreSVar | SVar$ JoinForcesAmount | Type$ CountSVar | Expression$ JoinForcesAmount/Plus.Y | UnlessCost$ Y | UnlessPayer$ Player.IsRemembered | UnlessSwitched$ True
-SVar:DBSearch:DB$ ChangeZone | DefinedPlayer$ Player | ChangeType$ Land.Basic | ChangeNum$ JoinForcesAmount | Origin$ Library | Destination$ Battlefield | Tapped$ True | SubAbility$ DBReset | StackDescription$ None
+SVar:DBSearch:DB$ ChangeZone | DefinedPlayer$ Player | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ JoinForcesAmount | Origin$ Library | Destination$ Battlefield | Tapped$ True | SubAbility$ DBReset | StackDescription$ None
 SVar:DBReset:DB$ StoreSVar | SVar$ JoinForcesAmount | Type$ Number | Expression$ 0
 SVar:Y:Count$ChosenNumber
 SVar:JoinForcesAmount:Number$0
diff --git a/forge-gui/res/cardsfolder/c/colossal_badger_dig_deep.txt b/forge-gui/res/cardsfolder/c/colossal_badger_dig_deep.txt
index 9e645ab3542..73e7e83cb0c 100644
--- a/forge-gui/res/cardsfolder/c/colossal_badger_dig_deep.txt
+++ b/forge-gui/res/cardsfolder/c/colossal_badger_dig_deep.txt
@@ -13,9 +13,10 @@ ALTERNATE
 Name:Dig Deep
 ManaCost:1 G
 Types:Sorcery Adventure
-A:SP$ Mill | NumCards$ 4 | RememberMilled$ True | SubAbility$ DBPutCounter | AILogic$ Main1 | SpellDescription$ Choose target creature. Mill four cards,
+A:SP$ Mill | NumCards$ 4 | RememberMilled$ True | SubAbility$ DBPutCounter | SpellDescription$ Choose target creature. Mill four cards,
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup | SpellDescription$ then put a +1/+1 counter on that creature for each creature card milled this way.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Creature
+SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters
 Oracle:Choose target creature. Mill four cards, then put a +1/+1 counter on that creature for each creature card milled this way.
diff --git a/forge-gui/res/cardsfolder/c/coming_attraction.txt b/forge-gui/res/cardsfolder/c/coming_attraction.txt
index de226a42e04..30d23397f88 100644
--- a/forge-gui/res/cardsfolder/c/coming_attraction.txt
+++ b/forge-gui/res/cardsfolder/c/coming_attraction.txt
@@ -1,6 +1,6 @@
 Name:Coming Attraction
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBOpenAttraction | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBOpenAttraction | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:DBOpenAttraction:DB$ OpenAttraction | SpellDescription$ Open an Attraction. (Put the top card of your Attraction deck onto the battlefield.)
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Open an Attraction. (Put the top card of your Attraction deck onto the battlefield.)
diff --git a/forge-gui/res/cardsfolder/c/common_crook.txt b/forge-gui/res/cardsfolder/c/common_crook.txt
new file mode 100644
index 00000000000..3c8c6854d68
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/common_crook.txt
@@ -0,0 +1,8 @@
+Name:Common Crook
+ManaCost:1 B
+Types:Creature Human Rogue Villain
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+DeckHas:Ability$Token
+Oracle:When this creature dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/c/consuming_ferocity.txt b/forge-gui/res/cardsfolder/c/consuming_ferocity.txt
index f12ec9c6b67..435bb7b385e 100644
--- a/forge-gui/res/cardsfolder/c/consuming_ferocity.txt
+++ b/forge-gui/res/cardsfolder/c/consuming_ferocity.txt
@@ -6,7 +6,7 @@ SVar:AttachAILogic:Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | Description$ Enchanted creature gets +1/+0.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a +1/+0 counter on enchanted creature. If that creature has three or more +1/+0 counters on it, it deals damage equal to its power to its controller, then destroy that creature and it can't be regenerated.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Enchanted | CounterType$ P1P0 | CounterNum$ 1 | SubAbility$ DBDmg
-SVar:DBDmg:DB$ DealDamage | Defined$ TriggeredPlayer | DamageSource$ Enchanted | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3 | SubAbility$ DBDes
+SVar:DBDmg:DB$ DealDamage | Defined$ EnchantedController | DamageSource$ Enchanted | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3 | SubAbility$ DBDes
 SVar:DBDes:DB$ Destroy | Defined$ Enchanted | NoRegen$ True | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3
 SVar:Y:Count$Valid Creature.EnchantedBy$CardCounters.P1P0
 SVar:X:Enchanted$CardPower
diff --git a/forge-gui/res/cardsfolder/c/contaminated_landscape.txt b/forge-gui/res/cardsfolder/c/contaminated_landscape.txt
index 0cabd4643c0..f5766fee496 100644
--- a/forge-gui/res/cardsfolder/c/contaminated_landscape.txt
+++ b/forge-gui/res/cardsfolder/c/contaminated_landscape.txt
@@ -2,6 +2,6 @@ Name:Contaminated Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Plains+Basic,Land.Island+Basic,Land.Swamp+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic,Island.Basic,Swamp.Basic | ChangeTypeDesc$ basic Plains, Island, or Swamp | SpellDescription$ Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:W U B
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Contaminated Landscape: Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.\nCycling {W}{U}{B} ({W}{U}{B}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/c/corpse_traders.txt b/forge-gui/res/cardsfolder/c/corpse_traders.txt
index 27aadf2f91b..bbc5544c279 100644
--- a/forge-gui/res/cardsfolder/c/corpse_traders.txt
+++ b/forge-gui/res/cardsfolder/c/corpse_traders.txt
@@ -2,6 +2,6 @@ Name:Corpse Traders
 ManaCost:3 B
 Types:Creature Human Rogue
 PT:3/3
-A:AB$ Discard | Cost$ 2 B Sac<1/Creature> | ValidTgts$ Player | Mode$ RevealYouChoose | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Target player reveals their hand. You choose a card from it. That player discards that card. Activate only any time you could cast a sorcery.
+A:AB$ Discard | Cost$ 2 B Sac<1/Creature> | ValidTgts$ Player | Mode$ RevealYouChoose | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Target player reveals their hand. You choose a card from it. That player discards that card. Activate only as a sorcery.
 AI:RemoveDeck:All
 Oracle:{2}{B}, Sacrifice a creature: Target opponent reveals their hand. You choose a card from it. That player discards that card. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/c/cosmic_spider_man.txt b/forge-gui/res/cardsfolder/c/cosmic_spider_man.txt
new file mode 100644
index 00000000000..e0a1f433445
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/cosmic_spider_man.txt
@@ -0,0 +1,13 @@
+Name:Cosmic Spider-Man
+ManaCost:W U B R G
+Types:Legendary Creature Spider Human Hero
+PT:5/5
+K:Flying
+K:First Strike
+K:Trample
+K:Lifelink
+K:Haste
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ At the beginning of combat on your turn, other Spiders you control gain flying, first strike, trample, lifelink, and haste until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Spider.Other+YouCtrl | KW$ Flying & First Strike & Trample & Lifelink & Haste
+DeckHints:Type$Spider
+Oracle:Flying, first strike, trample, lifelink, haste\nAt the beginning of combat on your turn, other Spiders you control gain flying, first strike, trample, lifelink, and haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/costume_closet.txt b/forge-gui/res/cardsfolder/c/costume_closet.txt
new file mode 100644
index 00000000000..3ed81142e4d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/c/costume_closet.txt
@@ -0,0 +1,9 @@
+Name:Costume Closet
+ManaCost:1 W
+Types:Artifact
+K:etbCounter:P1P1:2
+A:AB$ MoveCounter | Cost$ T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Source$ Self | CounterType$ P1P1 | CounterNum$ 1 | SorcerySpeed$ True | SpellDescription$ Move a +1/+1 counter from this artifact onto target creature you control. Activate only as a sorcery.
+T:Mode$ ChangesZone | ValidCard$ Creature.modified+YouCtrl | Origin$ Battlefield | Destination$ Any | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a modified creature you control leaves the battlefield, put a +1/+1 counter on this artifact. (Equipment, Auras you control, and counters are modifications.)
+SVar:TrigCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+Oracle:This artifact enters with two +1/+1 counters on it.\n{T}: Move a +1/+1 counter from this artifact onto target creature you control. Activate only as a sorcery.\nWhenever a modified creature you control leaves the battlefield, put a +1/+1 counter on this artifact. (Equipment, Auras you control, and counters are modifications.)
diff --git a/forge-gui/res/cardsfolder/c/crackdown_construct.txt b/forge-gui/res/cardsfolder/c/crackdown_construct.txt
index bc4abab45dd..e57f5824825 100644
--- a/forge-gui/res/cardsfolder/c/crackdown_construct.txt
+++ b/forge-gui/res/cardsfolder/c/crackdown_construct.txt
@@ -2,6 +2,6 @@ Name:Crackdown Construct
 ManaCost:4
 Types:Artifact Creature Construct
 PT:2/2
-T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, CARDNAME gets +1/+1 until end of turn.
+T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, CARDNAME gets +1/+1 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 Oracle:Whenever you activate an ability of an artifact or creature that isn't a mana ability, Crackdown Construct gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/crater_elemental.txt b/forge-gui/res/cardsfolder/c/crater_elemental.txt
index 9a505f7f568..23b37c1d934 100644
--- a/forge-gui/res/cardsfolder/c/crater_elemental.txt
+++ b/forge-gui/res/cardsfolder/c/crater_elemental.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental
 PT:0/6
 A:AB$ DealDamage | Cost$ R T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ It deals 4 damage to target creature.
 A:AB$ Animate | Cost$ 2 R | Defined$ Self | Power$ 8 | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ CARDNAME has base power 8 until end of turn. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice
 Oracle:{R}, {T}, Sacrifice Crater Elemental: It deals 4 damage to target creature.\nFormidable — {2}{R}: Crater Elemental has base power 8 until end of turn. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/c/crisis_of_conscience.txt b/forge-gui/res/cardsfolder/c/crisis_of_conscience.txt
index 2b901551689..4269209413e 100644
--- a/forge-gui/res/cardsfolder/c/crisis_of_conscience.txt
+++ b/forge-gui/res/cardsfolder/c/crisis_of_conscience.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Charm | Choices$ DBDestroyAllTokens,DBDestroyAllNonlandNontokenPermanents | CharmNum$ 1
 SVar:DBDestroyAllTokens:DB$ DestroyAll | ValidCards$ Card.token | SpellDescription$ Destroy all tokens.
 SVar:DBDestroyAllNonlandNontokenPermanents:DB$ DestroyAll | ValidCards$ Permanent.nonLand+!token | SpellDescription$ Destroy all nonland, nontoken permanents.
-DeckHints:Type$Token
+DeckHints:Ability$Token
 Oracle:Choose one —\n• Destroy all tokens.\n• Destroy all nonland, nontoken permanents.
diff --git a/forge-gui/res/cardsfolder/c/cultivate.txt b/forge-gui/res/cardsfolder/c/cultivate.txt
index dc93f59004d..59f81d0da0b 100644
--- a/forge-gui/res/cardsfolder/c/cultivate.txt
+++ b/forge-gui/res/cardsfolder/c/cultivate.txt
@@ -1,7 +1,7 @@
 Name:Cultivate
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/c/curiosity.txt b/forge-gui/res/cardsfolder/c/curiosity.txt
index 764e69f1e32..3be6a5c5d59 100644
--- a/forge-gui/res/cardsfolder/c/curiosity.txt
+++ b/forge-gui/res/cardsfolder/c/curiosity.txt
@@ -5,4 +5,5 @@ K:Enchant:Creature
 SVar:AttachAILogic:Curiosity
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Opponent | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever enchanted creature deals damage to an opponent, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:PlayMain1:TRUE
 Oracle:Enchant creature\nWhenever enchanted creature deals damage to an opponent, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/c/cutthroat_centurion.txt b/forge-gui/res/cardsfolder/c/cutthroat_centurion.txt
index ab918836983..1f8ef783805 100644
--- a/forge-gui/res/cardsfolder/c/cutthroat_centurion.txt
+++ b/forge-gui/res/cardsfolder/c/cutthroat_centurion.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Artifact Creature Phyrexian Warrior
 PT:2/2
 A:AB$ Pump | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Defined$ Self | NumDef$ +2 | NumAtt$ +2 | AILogic$ Aristocrat | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
-SVar:AIPreference:SacCost$Artifact.token,Creature.token,Artifact.cmcEQ0+nonLegendary+notnamedBlack Lotus,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3,Creature.cmcLE3
+SVar:AIPreference:SacCost$Artifact.token,Creature.token,Artifact.cmcEQ0+nonLegendary+!namedBlack Lotus,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3,Creature.cmcLE3
 DeckHas:Ability$Sacrifice
 Oracle:Sacrifice another artifact or creature: Cutthroat Centurion gets +2/+2 until end of turn. Activate only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/dai_li_indoctrination.txt b/forge-gui/res/cardsfolder/d/dai_li_indoctrination.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/dai_li_indoctrination.txt
rename to forge-gui/res/cardsfolder/d/dai_li_indoctrination.txt
index dadf19be943..142cb3da795 100644
--- a/forge-gui/res/cardsfolder/upcoming/dai_li_indoctrination.txt
+++ b/forge-gui/res/cardsfolder/d/dai_li_indoctrination.txt
@@ -5,4 +5,4 @@ A:SP$ Charm | Choices$ DBDiscard,DBEarthbend
 SVar:DBDiscard:DB$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | DiscardValid$ Permanent.nonLand | NumCards$ 1 | SpellDescription$ Target opponent reveals their hand. You choose a nonland permanent card from it. That player discards that card.
 SVar:DBEarthbend:DB$ Earthbend | Num$ 2 | SpellDescription$ Earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
 DeckHas:Ability$Discard|Counters
-Oracle:Choose one —\n• Target opponent reveals their hand. You choose a nonland permanent card from it. That player discards that card.\n• Earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
\ No newline at end of file
+Oracle:Choose one —\n• Target opponent reveals their hand. You choose a nonland permanent card from it. That player discards that card.\n• Earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
diff --git a/forge-gui/res/cardsfolder/d/daily_bugle_building.txt b/forge-gui/res/cardsfolder/d/daily_bugle_building.txt
new file mode 100644
index 00000000000..fe1ae148c0e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/d/daily_bugle_building.txt
@@ -0,0 +1,8 @@
+Name:Daily Bugle Building
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ 1 T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+A:AB$ Pump | PrecostDesc$ Smear Campaign — | Cost$ 1 T | ValidTgts$ Creature.Legendary | TgtPrompt$ Select target legendary creature | KW$ Menace | SorcerySpeed$ True | SpellDescription$ Target legendary creature gains menace until end of turn. Activate only as a sorcery.
+DeckHints:Type$Legendary
+Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.\nSmear Campaign — {1}, {T}: Target legendary creature gains menace until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/daily_bugle_reporters.txt b/forge-gui/res/cardsfolder/d/daily_bugle_reporters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/daily_bugle_reporters.txt
rename to forge-gui/res/cardsfolder/d/daily_bugle_reporters.txt
diff --git a/forge-gui/res/cardsfolder/d/damage_control_crew.txt b/forge-gui/res/cardsfolder/d/damage_control_crew.txt
new file mode 100644
index 00000000000..68e58b2d7bd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/d/damage_control_crew.txt
@@ -0,0 +1,10 @@
+Name:Damage Control Crew
+ManaCost:3 G
+Types:Creature Human Citizen
+PT:3/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCharm | TriggerDescription$ When this creature enters, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DBRepair,DBImpound | CharmNum$ 1
+SVar:DBRepair:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouCtrl+cmcGE4 | SpellDescription$ Repair — Return target card with mana value 4 or greater from your graveyard to your hand.
+SVar:DBImpound:DB$ ChangeZone | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Impound — Exile target artifact or enchantment.
+DeckHas:Ability$Graveyard
+Oracle:When this creature enters, choose one —\n• Repair — Return target card with mana value 4 or greater from your graveyard to your hand.\n• Impound — Exile target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/d/damping_matrix.txt b/forge-gui/res/cardsfolder/d/damping_matrix.txt
index 6ecddcea24f..a45be1a203a 100644
--- a/forge-gui/res/cardsfolder/d/damping_matrix.txt
+++ b/forge-gui/res/cardsfolder/d/damping_matrix.txt
@@ -1,7 +1,7 @@
 Name:Damping Matrix
 ManaCost:3
 Types:Artifact
-S:Mode$ CantBeActivated | ValidCard$ Artifact,Creature | ValidSA$ Activated.nonManaAbility | AffectedZone$ Battlefield | Description$ Activated abilities of artifacts and creatures can't be activated unless they're mana abilities.
+S:Mode$ CantBeActivated | ValidCard$ Artifact,Creature | ValidSA$ Activated.!ManaAbility | AffectedZone$ Battlefield | Description$ Activated abilities of artifacts and creatures can't be activated unless they're mana abilities.
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:Activated abilities of artifacts and creatures can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/d/dance_of_the_dead.txt b/forge-gui/res/cardsfolder/d/dance_of_the_dead.txt
index 1477bb7f2b7..4fa2167fea8 100644
--- a/forge-gui/res/cardsfolder/d/dance_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/d/dance_of_the_dead.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant:Creature.inZoneGraveyard:creature card in a graveyard
 SVar:AttachAILogic:Reanimate
-SVar:AttachAITgts:Creature.notnamedWorldgorger Dragon
+SVar:AttachAITgts:Creature.!namedWorldgorger Dragon
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Card.StrictlySelf | Execute$ TrigReanimate | TriggerDescription$ When CARDNAME enters, if it's on the battlefield, it loses "enchant creature card in a graveyard" and gains "enchant creature put onto the battlefield with CARDNAME." Put enchanted creature card onto the battlefield tapped under your control and attach CARDNAME to it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it.
 SVar:TrigReanimate:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Enchanted | RememberChanged$ True | GainControl$ True | Tapped$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Self | OverwriteSpells$ True | Keywords$ Enchant:Creature.IsRemembered:creature put onto the battlefield with CARDNAME | RemoveKeywords$ Enchant:Creature.inZoneGraveyard:creature card in a graveyard | Duration$ Permanent | SubAbility$ DBAttach
diff --git a/forge-gui/res/cardsfolder/d/dawntreader_elk.txt b/forge-gui/res/cardsfolder/d/dawntreader_elk.txt
index 46e562a72d5..fd5b73dfae4 100644
--- a/forge-gui/res/cardsfolder/d/dawntreader_elk.txt
+++ b/forge-gui/res/cardsfolder/d/dawntreader_elk.txt
@@ -2,5 +2,5 @@ Name:Dawntreader Elk
 ManaCost:1 G
 Types:Creature Elk
 PT:2/2
-A:AB$ ChangeZone | Cost$ G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
 Oracle:{G}, Sacrifice Dawntreader Elk: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt b/forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt
index c2efa4c6a94..3fc257fdc23 100644
--- a/forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt
+++ b/forge-gui/res/cardsfolder/d/deathbellow_war_cry.txt
@@ -1,6 +1,6 @@
 Name:Deathbellow War Cry
 ManaCost:5 R R R
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Minotaur | ChangeNum$ 4 | DifferentNames$ True | SpellDescription$ Search your library for up to four Minotaur creature cards with different names, put them onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Minotaur | ChangeTypeDesc$ Minotaur creature | ChangeNum$ 4 | DifferentNames$ True | SpellDescription$ Search your library for up to four Minotaur creature cards with different names, put them onto the battlefield, then shuffle.
 DeckNeeds:Type$Minotaur
 Oracle:Search your library for up to four Minotaur creature cards with different names, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/deathsprout.txt b/forge-gui/res/cardsfolder/d/deathsprout.txt
index e92c0bae6b1..a75d44f89e9 100644
--- a/forge-gui/res/cardsfolder/d/deathsprout.txt
+++ b/forge-gui/res/cardsfolder/d/deathsprout.txt
@@ -2,5 +2,5 @@ Name:Deathsprout
 ManaCost:1 B B G
 Types:Instant
 A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBSearch | SpellDescription$ Destroy target creature. Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True
 Oracle:Destroy target creature. Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/deceptive_landscape.txt b/forge-gui/res/cardsfolder/d/deceptive_landscape.txt
index 09a7742f151..6691ccfd006 100644
--- a/forge-gui/res/cardsfolder/d/deceptive_landscape.txt
+++ b/forge-gui/res/cardsfolder/d/deceptive_landscape.txt
@@ -2,6 +2,6 @@ Name:Deceptive Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Plains+Basic,Land.Swamp+Basic,Land.Forest+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Plains, Swamp, or Forest card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic,Swamp.Basic,Forest.Basic | ChangeTypeDesc$ basic Plains, Swamp, or Forest | SpellDescription$ Search your library for a basic Plains, Swamp, or Forest card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:W B G
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Deceptive Landscape: Search your library for a basic Plains, Swamp, or Forest card, put it onto the battlefield tapped, then shuffle.\nCycling {W}{B}{G} ({W}{B}{G}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/d/decompose.txt b/forge-gui/res/cardsfolder/d/decompose.txt
index 8e9eb4c0182..6b76b523266 100644
--- a/forge-gui/res/cardsfolder/d/decompose.txt
+++ b/forge-gui/res/cardsfolder/d/decompose.txt
@@ -1,6 +1,6 @@
 Name:Decompose
 ManaCost:1 B
 Types:Sorcery
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 AI:RemoveDeck:Random
 Oracle:Exile up to three target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/d/deep_reconnaissance.txt b/forge-gui/res/cardsfolder/d/deep_reconnaissance.txt
index f594afa0312..46a5fdd5ee0 100644
--- a/forge-gui/res/cardsfolder/d/deep_reconnaissance.txt
+++ b/forge-gui/res/cardsfolder/d/deep_reconnaissance.txt
@@ -2,5 +2,5 @@ Name:Deep Reconnaissance
 ManaCost:2 G
 Types:Sorcery
 K:Flashback:4 G
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 Oracle:Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.\nFlashback {4}{G} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/d/demolition_field.txt b/forge-gui/res/cardsfolder/d/demolition_field.txt
index b562926b74f..b8669e4b60d 100644
--- a/forge-gui/res/cardsfolder/d/demolition_field.txt
+++ b/forge-gui/res/cardsfolder/d/demolition_field.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Land.nonBasic+OppCtrl | TgtPrompt$ Select target nonbasic land an opponent controls | SubAbility$ DBSearch | AILogic$ GhostQuarter | SpellDescription$ Destroy target nonbasic land an opponent controls. That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBSearchBis | StackDescription$ That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBSearchBis:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ You | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBSearchBis | StackDescription$ That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
+SVar:DBSearchBis:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ You | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 AI:RemoveDeck:Random
 DeckHas:Ability$Sacrifice
 Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Demolition Field: Destroy target nonbasic land an opponent controls. That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You may search your library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/dense_foliage.txt b/forge-gui/res/cardsfolder/d/dense_foliage.txt
index 480cbfcacf3..13cdbafaf91 100644
--- a/forge-gui/res/cardsfolder/d/dense_foliage.txt
+++ b/forge-gui/res/cardsfolder/d/dense_foliage.txt
@@ -1,7 +1,7 @@
 Name:Dense Foliage
 ManaCost:2 G
 Types:Enchantment
-S:Mode$ CantTarget | ValidCard$ Creature | ValidSA$ Spell | Description$ Creatures can't be the target of spells.
+S:Mode$ CantTarget | ValidTarget$ Creature | ValidSA$ Spell | Description$ Creatures can't be the target of spells.
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:Creatures can't be the targets of spells.
diff --git a/forge-gui/res/cardsfolder/upcoming/deny_entry.txt b/forge-gui/res/cardsfolder/d/deny_entry.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deny_entry.txt
rename to forge-gui/res/cardsfolder/d/deny_entry.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/deserters_disciple.txt b/forge-gui/res/cardsfolder/d/deserters_disciple.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/deserters_disciple.txt
rename to forge-gui/res/cardsfolder/d/deserters_disciple.txt
diff --git a/forge-gui/res/cardsfolder/d/detention_sphere.txt b/forge-gui/res/cardsfolder/d/detention_sphere.txt
index b50d472dcc0..eb0667d23b6 100644
--- a/forge-gui/res/cardsfolder/d/detention_sphere.txt
+++ b/forge-gui/res/cardsfolder/d/detention_sphere.txt
@@ -2,7 +2,7 @@ Name:Detention Sphere
 ManaCost:1 W U
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, you may exile target nonland permanent not named Detention Sphere and all other permanents with the same name as that permanent.
-SVar:TrigExile:DB$ Pump | ValidTgts$ Permanent.nonLand+notnamedDetention Sphere | IsCurse$ True | TgtPrompt$ Choose target nonland permanent not named Detention Sphere | SubAbility$ DBChangeZoneAll
+SVar:TrigExile:DB$ Pump | ValidTgts$ Permanent.nonLand+!namedDetention Sphere | IsCurse$ True | TgtPrompt$ Choose target nonland permanent not named Detention Sphere | SubAbility$ DBChangeZoneAll
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Targeted.Self,Targeted.sameName | Origin$ Battlefield | Destination$ Exile
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to the battlefield under their owner's control.
 SVar:TrigReturn:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Battlefield
diff --git a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
index 8799de32013..98403677176 100644
--- a/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
+++ b/forge-gui/res/cardsfolder/d/dhalsim_pliable_pacifist.txt
@@ -4,7 +4,7 @@ ManaCost:2 G W
 Types:Legendary Creature Human Monk
 PT:1/3
 K:Reach
-S:Mode$ Continuous | Affected$ Card.Self+notattacking | AddKeyword$ Hexproof | Description$ Teleport — CARDNAME has hexproof unless he's attacking.
+S:Mode$ Continuous | Affected$ Card.Self+!attacking | AddKeyword$ Hexproof | Description$ Teleport — CARDNAME has hexproof unless he's attacking.
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+withReach | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever a creature you control with reach attacks, untap it and it can't be blocked by creatures with greater power this combat.
 SVar:TrigUntap:DB$ Untap | Defined$ TriggeredAttackerLKICopy | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredAttacker | StaticAbilities$ CantBeBlockedPow | ForgetOnMoved$ Battlefield | Duration$ UntilEndOfCombat
diff --git a/forge-gui/res/cardsfolder/d/dig_up.txt b/forge-gui/res/cardsfolder/d/dig_up.txt
index a761e641864..cb39edcb029 100644
--- a/forge-gui/res/cardsfolder/d/dig_up.txt
+++ b/forge-gui/res/cardsfolder/d/dig_up.txt
@@ -1,6 +1,6 @@
 Name:Dig Up
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. | SpellDescription$ Search your library for a [basic land] card, [reveal it,] put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | StackDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. | SpellDescription$ Search your library for a [basic land] card, [reveal it,] put it into your hand, then shuffle.
 A:SP$ ChangeZone | Cost$ 1 B B G | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | NoReveal$ True | PrecostDesc$ Cleave | CostDesc$ {1}{B}{B}{G} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its cleave cost. If you do, remove the words in square brackets.) | StackDescription$ Search your library for a card, put it into your hand, then shuffle.
 Oracle:Cleave {1}{B}{B}{G} (You may cast this spell for its cleave cost. If you do, remove the words in square brackets.)\nSearch your library for a [basic land] card, [reveal it,] put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/digsite_conservator.txt b/forge-gui/res/cardsfolder/d/digsite_conservator.txt
index 2fe3b62b2ac..232c18c8f47 100644
--- a/forge-gui/res/cardsfolder/d/digsite_conservator.txt
+++ b/forge-gui/res/cardsfolder/d/digsite_conservator.txt
@@ -2,7 +2,7 @@ Name:Digsite Conservator
 ManaCost:2
 Types:Artifact Creature Gnome
 PT:2/1
-A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 4 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select up to four target cards from a single graveyard | ValidTgts$ Card | SorcerySpeed$ True | SpellDescription$ Exile up to four target cards from a single graveyard. Activate only as a sorcery.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 4 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select up to four target cards from a single graveyard | ValidTgts$ Card | SorcerySpeed$ True | SpellDescription$ Exile up to four target cards from a single graveyard. Activate only as a sorcery.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscover | TriggerDescription$ When CARDNAME dies, you may pay {4}. If you do, discover 4. (Exile cards from the top of your library until you exile a nonland card with mana value 4 or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
 SVar:TrigDiscover:AB$ Discover | Cost$ 4 | Num$ 4
 DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/d/diligent_farmhand.txt b/forge-gui/res/cardsfolder/d/diligent_farmhand.txt
index 8caa48a1342..8411519dbf9 100644
--- a/forge-gui/res/cardsfolder/d/diligent_farmhand.txt
+++ b/forge-gui/res/cardsfolder/d/diligent_farmhand.txt
@@ -2,7 +2,7 @@ Name:Diligent Farmhand
 ManaCost:G
 Types:Creature Human Druid
 PT:1/1
-A:AB$ ChangeZone | Cost$ 1 G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | AffectedZone$ Graveyard | AddHiddenKeyword$ CARDNAME count as Muscle Burst. | Description$ If CARDNAME is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst.
 DeckHints:Name$Diligent Farmhand|Muscle Burst
 Oracle:{1}{G}, Sacrifice Diligent Farmhand: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.\nIf Diligent Farmhand is in a graveyard, effects from spells named Muscle Burst count it as a card named Muscle Burst.
diff --git a/forge-gui/res/cardsfolder/d/dire_strain_rampage.txt b/forge-gui/res/cardsfolder/d/dire_strain_rampage.txt
index ab685face2e..6219e99691c 100644
--- a/forge-gui/res/cardsfolder/d/dire_strain_rampage.txt
+++ b/forge-gui/res/cardsfolder/d/dire_strain_rampage.txt
@@ -2,7 +2,7 @@ Name:Dire-Strain Rampage
 ManaCost:1 R G
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Artifact,Enchantment,Land | TgtPrompt$ Select target artifact, enchantment, or land | RememberDestroyed$ True | SubAbility$ DBChangeZone | SpellDescription$ Destroy target artifact, enchantment, or land. If a land was destroyed this way, its controller may search their library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. Otherwise, its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:DBChangeZone:DB$ ChangeZone | DefinedPlayer$ TargetedController | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeNum$ X | ChangeType$ Land.Basic | Optional$ True | ShuffleNonMandatory$ True | SubAbility$ DBCleanup | StackDescription$ If a land was destroyed this way, its controller may search their library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. Otherwise, its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:DBChangeZone:DB$ ChangeZone | DefinedPlayer$ TargetedController | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeNum$ X | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Optional$ True | ShuffleNonMandatory$ True | SubAbility$ DBCleanup | StackDescription$ If a land was destroyed this way, its controller may search their library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. Otherwise, its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Land/Plus.1
 K:Flashback:3 R G
diff --git a/forge-gui/res/cardsfolder/d/displaced_dinosaurs.txt b/forge-gui/res/cardsfolder/d/displaced_dinosaurs.txt
index d44ce1c2747..61f3fa28bb1 100644
--- a/forge-gui/res/cardsfolder/d/displaced_dinosaurs.txt
+++ b/forge-gui/res/cardsfolder/d/displaced_dinosaurs.txt
@@ -2,7 +2,7 @@ Name:Displaced Dinosaurs
 ManaCost:5 G G
 Types:Creature Dinosaur
 PT:7/7
-R:Event$ Moved | ValidCard$ Permanent.Historic+YouCtrl | ActiveZones$ Battlefield | Destination$ Battlefield | ReplaceWith$ BecomeDino | ReplacementResult$ Updated | Description$ As a historic permanent you control enters, it becomes a 7/7 Dinosaur creature in addition to its other types. (Artifacts, legendaries, and Sagas are historic.)
-SVar:BecomeDino:DB$ Animate | Defined$ ReplacedCard | Toughness$ 7 | Power$ 7 | Types$ Creature,Dinosaur | Duration$ Permanent
+R:Event$ Moved | ValidCard$ Permanent.Historic+YouCtrl | ActiveZones$ Battlefield | Destination$ Battlefield | ReplaceWith$ BecomeDino | Layer$ Copy | ReplacementResult$ Updated | Description$ As a historic permanent you control enters, it becomes a 7/7 Dinosaur creature in addition to its other types. (Artifacts, legendaries, and Sagas are historic.)
+SVar:BecomeDino:DB$ Clone | Defined$ ReplacedCard | CloneTarget$ ReplacedCard | SetPower$ 7 | SetToughness$ 7 | AddTypes$ Creature & Dinosaur
 DeckHints:Type$Legendary|Artifact|Saga
 Oracle:As a historic permanent you control enters, it becomes a 7/7 Dinosaur creature in addition to its other types. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/d/display_of_dominance.txt b/forge-gui/res/cardsfolder/d/display_of_dominance.txt
index 0cb3094a462..6bd430e7a27 100644
--- a/forge-gui/res/cardsfolder/d/display_of_dominance.txt
+++ b/forge-gui/res/cardsfolder/d/display_of_dominance.txt
@@ -4,6 +4,6 @@ Types:Instant
 A:SP$ Charm | Choices$ DBDestroy,DBProtect
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature+Blue,Permanent.nonCreature+Black | TgtPrompt$ Select target blue or black noncreature permanent | SpellDescription$ Destroy target blue or black noncreature permanent.
 SVar:DBProtect:DB$ Effect | StaticAbilities$ STCantBeTarget | SpellDescription$ Permanents you control can't be the targets of blue or black spells your opponents control this turn.
-SVar:STCantBeTarget:Mode$ CantTarget | ValidCard$ Permanent.YouCtrl | ValidSource$ Card.Blue+OppCtrl,Card.Black+OppCtrl | ValidSA$ Spell | Description$ Permanents you control can't be the targets of blue or black spells your opponents control this turn.
+SVar:STCantBeTarget:Mode$ CantTarget | ValidTarget$ Permanent.YouCtrl | ValidSource$ Card.Blue+OppCtrl,Card.Black+OppCtrl | ValidSA$ Spell | Description$ Permanents you control can't be the targets of blue or black spells your opponents control this turn.
 AI:RemoveDeck:Random
 Oracle:Choose one —\n• Destroy target blue or black noncreature permanent.\n• Permanents you control can't be the targets of blue or black spells your opponents control this turn.
diff --git a/forge-gui/res/cardsfolder/d/disruptor_flute.txt b/forge-gui/res/cardsfolder/d/disruptor_flute.txt
index 27c819e214b..9891e5e8d69 100644
--- a/forge-gui/res/cardsfolder/d/disruptor_flute.txt
+++ b/forge-gui/res/cardsfolder/d/disruptor_flute.txt
@@ -5,6 +5,6 @@ K:Flash
 K:ETBReplacement:Other:DBNameCard
 SVar:DBNameCard:DB$ NameCard | Defined$ You | SpellDescription$ As CARDNAME enters, choose a card name.
 S:Mode$ RaiseCost | EffectZone$ Battlefield | ValidCard$ Card.NamedCard | Type$ Spell | Activator$ Player | Amount$ 3 | Description$ Spells with the chosen name cost 3 more to cast.
-S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.nonManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
+S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.!ManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 AI:RemoveDeck:Random
 Oracle:Flash\nAs Disruptor Flute enters, choose a card name.\nSpells with the chosen name cost 3 more to cast.\nActivated abilities of sources with the chosen name can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/doc_ock_sinister_scientist.txt b/forge-gui/res/cardsfolder/d/doc_ock_sinister_scientist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doc_ock_sinister_scientist.txt
rename to forge-gui/res/cardsfolder/d/doc_ock_sinister_scientist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/doc_ocks_henchmen.txt b/forge-gui/res/cardsfolder/d/doc_ocks_henchmen.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/doc_ocks_henchmen.txt
rename to forge-gui/res/cardsfolder/d/doc_ocks_henchmen.txt
diff --git a/forge-gui/res/cardsfolder/d/doc_ocks_tentacles.txt b/forge-gui/res/cardsfolder/d/doc_ocks_tentacles.txt
new file mode 100644
index 00000000000..a57c48a9c2e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/d/doc_ocks_tentacles.txt
@@ -0,0 +1,8 @@
+Name:Doc Ock's Tentacles
+ManaCost:1
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+cmcGE5 | TriggerZones$ Battlefield | Execute$ TrigAttach | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control with mana value 5 or greater enters, you may attach this Equipment to it.
+SVar:TrigAttach:DB$ Attach | Defined$ TriggeredCardLKICopy
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 4 | AddToughness$ 4 | Description$ Equipped creature gets +4/+4.
+K:Equip:5
+Oracle:Whenever a creature you control with mana value 5 or greater enters, you may attach this Equipment to it.\nEquipped creature gets +4/+4.\nEquip {5}
diff --git a/forge-gui/res/cardsfolder/upcoming/doctor_octopus_master_planner.txt b/forge-gui/res/cardsfolder/d/doctor_octopus_master_planner.txt
similarity index 85%
rename from forge-gui/res/cardsfolder/upcoming/doctor_octopus_master_planner.txt
rename to forge-gui/res/cardsfolder/d/doctor_octopus_master_planner.txt
index f0d00a5ba67..a69eb46bb0e 100644
--- a/forge-gui/res/cardsfolder/upcoming/doctor_octopus_master_planner.txt
+++ b/forge-gui/res/cardsfolder/d/doctor_octopus_master_planner.txt
@@ -2,7 +2,7 @@ Name:Doctor Octopus, Master Planner
 ManaCost:5 U B
 Types:Legendary Creature Human Scientist Villain
 PT:4/8
-S:Mode$ Continuous | Affected$ Villain.Other | AddPower$ 2 | AddToughness$ 2 | Description$ Other Villains you control get +2/+2.
+S:Mode$ Continuous | Affected$ Villain.Other+YouCtrl | AddPower$ 2 | AddToughness$ 2 | Description$ Other Villains you control get +2/+2.
 S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ 8 | Description$ Your maximum hand size is eight.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ LT8 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if you have fewer than eight cards in hand, draw cards equal to the difference.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Difference
diff --git a/forge-gui/res/cardsfolder/d/domineering_will.txt b/forge-gui/res/cardsfolder/d/domineering_will.txt
index 1a5649f406c..d35ee6879a0 100644
--- a/forge-gui/res/cardsfolder/d/domineering_will.txt
+++ b/forge-gui/res/cardsfolder/d/domineering_will.txt
@@ -2,7 +2,7 @@ Name:Domineering Will
 ManaCost:3 U
 Types:Instant
 A:SP$ Pump | ValidTgts$ Player | StackDescription$ None | SubAbility$ DBGainControl | SpellDescription$ Target player gains control of up to three target nonattacking creatures until end of turn. Untap those creatures. They block this turn if able.
-SVar:DBGainControl:DB$ GainControl | ValidTgts$ Creature.notattacking | TgtPrompt$ Select up to three target nonattacking creatures | LoseControl$ EOT | TargetMin$ 0 | TargetMax$ 3 | NewController$ ParentTarget | Untap$ True | SubAbility$ DBEffect
+SVar:DBGainControl:DB$ GainControl | ValidTgts$ Creature.!attacking | TgtPrompt$ Select up to three target nonattacking creatures | LoseControl$ EOT | TargetMin$ 0 | TargetMax$ 3 | NewController$ ParentTarget | Untap$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | ForgetOnMoved$ Battlefield | StaticAbilities$ MustBlock | SpellDescription$ They block this turn if able.
 SVar:MustBlock:Mode$ MustBlock | ValidCreature$ Card.IsRemembered | Description$ Those creatures block this turn if able.
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/d/domri_city_smasher.txt b/forge-gui/res/cardsfolder/d/domri_city_smasher.txt
index 6248c2c3d9b..f1d605bbcae 100644
--- a/forge-gui/res/cardsfolder/d/domri_city_smasher.txt
+++ b/forge-gui/res/cardsfolder/d/domri_city_smasher.txt
@@ -2,7 +2,7 @@ Name:Domri, City Smasher
 ManaCost:4 R G
 Types:Legendary Planeswalker Domri
 Loyalty:4
-A:AB$ PumpAll | Cost$ AddCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | KW$ Haste | NumAtt$ +1 | NumDef$ +1 | Planeswalker$ True | AILogic$ Main1 | SpellDescription$ Creatures you control get +1/+1 and gain haste until end of turn.
+A:AB$ PumpAll | Cost$ AddCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | KW$ Haste | NumAtt$ +1 | NumDef$ +1 | Planeswalker$ True | SpellDescription$ Creatures you control get +1/+1 and gain haste until end of turn.
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Any | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
 A:AB$ PutCounterAll | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 3 | SubAbility$ DBPumpAll | SpellDescription$ Put three +1/+1 counters on each creature you control. Those creatures gain trample until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | KW$ Trample | ValidCards$ Creature.YouCtrl
diff --git a/forge-gui/res/cardsfolder/upcoming/double_trouble.txt b/forge-gui/res/cardsfolder/d/double_trouble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/double_trouble.txt
rename to forge-gui/res/cardsfolder/d/double_trouble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/dragon_moose.txt b/forge-gui/res/cardsfolder/d/dragon_moose.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/dragon_moose.txt
rename to forge-gui/res/cardsfolder/d/dragon_moose.txt
diff --git a/forge-gui/res/cardsfolder/d/dragon_scarred_bear.txt b/forge-gui/res/cardsfolder/d/dragon_scarred_bear.txt
index 93285bc960f..f955ecd30c1 100644
--- a/forge-gui/res/cardsfolder/d/dragon_scarred_bear.txt
+++ b/forge-gui/res/cardsfolder/d/dragon_scarred_bear.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Bear
 PT:3/2
 A:AB$ Regenerate | Cost$ 1 G | PrecostDesc$ Formidable — | CheckSVar$ FormidableTest | SVarCompare$ GE8 | SpellDescription$ Regenerate CARDNAME. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Formidable — {1}{G}: Regenerate Dragon-Scarred Bear. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/d/dragon_whisperer.txt b/forge-gui/res/cardsfolder/d/dragon_whisperer.txt
index a1417ac2adb..cf987d3a42d 100644
--- a/forge-gui/res/cardsfolder/d/dragon_whisperer.txt
+++ b/forge-gui/res/cardsfolder/d/dragon_whisperer.txt
@@ -5,7 +5,7 @@ PT:2/2
 A:AB$ Pump | Cost$ R | KW$ Flying | Defined$ Self | SpellDescription$ CARDNAME gains flying until end of turn.
 A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 A:AB$ Token | Cost$ 4 R R | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ r_4_4_dragon_flying | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ Create a 4/4 red Dragon creature token with flying. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 DeckHas:Ability$Token
 DeckHints:Type$Dragon
 Oracle:{R}: Dragon Whisperer gains flying until end of turn.\n{1}{R}: Dragon Whisperer gets +1/+0 until end of turn.\nFormidable — {4}{R}{R}: Create a 4/4 red Dragon creature token with flying. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/d/dragonstorm.txt b/forge-gui/res/cardsfolder/d/dragonstorm.txt
index 478234ef013..97474badc4f 100644
--- a/forge-gui/res/cardsfolder/d/dragonstorm.txt
+++ b/forge-gui/res/cardsfolder/d/dragonstorm.txt
@@ -1,7 +1,7 @@
 Name:Dragonstorm
 ManaCost:8 R
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Dragon | ChangeNum$ 1 | SpellDescription$ Search your library for a Dragon permanent card, put it onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Dragon | ChangeTypeDesc$ Dragon permanent | SpellDescription$ Search your library for a Dragon permanent card, put it onto the battlefield, then shuffle.
 K:Storm
 AI:RemoveDeck:Random
 Oracle:Search your library for a Dragon permanent card, put it onto the battlefield, then shuffle.\nStorm (When you cast this spell, copy it for each spell cast before it this turn.)
diff --git a/forge-gui/res/cardsfolder/d/draining_whelk.txt b/forge-gui/res/cardsfolder/d/draining_whelk.txt
index fbf48502e5f..07d32022cb7 100644
--- a/forge-gui/res/cardsfolder/d/draining_whelk.txt
+++ b/forge-gui/res/cardsfolder/d/draining_whelk.txt
@@ -5,8 +5,8 @@ PT:1/1
 K:Flash
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounter | TriggerDescription$ When CARDNAME enters, counter target spell. Put X +1/+1 counters on CARDNAME, where X is that spell's mana value.
-SVar:TrigCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | RememberCounteredCMC$ True | SubAbility$ DBPutcounter
-SVar:DBPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X | SubAbility$ DBCleanup
+SVar:TrigCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card | TgtPrompt$ Select target spell | RememberCounteredCMC$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedNumber
 Oracle:Flash\nFlying\nWhen Draining Whelk enters, counter target spell. Put X +1/+1 counters on Draining Whelk, where X is that spell's mana value.
diff --git a/forge-gui/res/cardsfolder/d/dream_leash.txt b/forge-gui/res/cardsfolder/d/dream_leash.txt
index 986b3b29262..8357da4ebdd 100644
--- a/forge-gui/res/cardsfolder/d/dream_leash.txt
+++ b/forge-gui/res/cardsfolder/d/dream_leash.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Permanent
 SVar:AttachAITgts:Permanent.tapped
 SVar:AttachAILogic:GainControl
-S:Mode$ CantTarget | EffectZone$ Stack | ValidSource$ Spell.Self | ValidCard$ Permanent.untapped | Description$ You can't choose an untapped permanent as this spell's target as you cast it.
+S:Mode$ CantTarget | ValidTarget$ Permanent.untapped | EffectZone$ Stack | ValidSource$ Spell.Self | Description$ You can't choose an untapped permanent as this spell's target as you cast it.
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | GainControl$ You | Description$ You control enchanted permanent.
 Oracle:Enchant permanent\nYou can't choose an untapped permanent as this spell's target as you cast it.\nYou control enchanted permanent.
diff --git a/forge-gui/res/cardsfolder/d/dreamscape_artist.txt b/forge-gui/res/cardsfolder/d/dreamscape_artist.txt
index 4f45f4ec745..a6816674ee4 100644
--- a/forge-gui/res/cardsfolder/d/dreamscape_artist.txt
+++ b/forge-gui/res/cardsfolder/d/dreamscape_artist.txt
@@ -2,5 +2,5 @@ Name:Dreamscape Artist
 ManaCost:1 U
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ ChangeZone | Cost$ 2 U T Discard<1/Card> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 U T Discard<1/Card> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
 Oracle:{2}{U}, {T}, Discard a card, Sacrifice a land: Search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/droning_bureaucrats.txt b/forge-gui/res/cardsfolder/d/droning_bureaucrats.txt
index 57d193f3a96..31de2a29884 100644
--- a/forge-gui/res/cardsfolder/d/droning_bureaucrats.txt
+++ b/forge-gui/res/cardsfolder/d/droning_bureaucrats.txt
@@ -2,10 +2,8 @@ Name:Droning Bureaucrats
 ManaCost:3 W
 Types:Creature Human Advisor
 PT:1/4
-A:AB$ StoreSVar | Cost$ X T | SVar$ DroningX | Type$ Count | Expression$ xPaid | SubAbility$ CreateDroningEffect | SpellDescription$ Each creature with mana value X can't attack or block this turn.
-SVar:CreateDroningEffect:DB$ Effect | StaticAbilities$ NoCombat
-SVar:NoCombat:Mode$ Continuous | Affected$ Creature.cmcEQDroningX | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Each creature with mana value X can't attack or block this turn.
+A:AB$ Effect | Cost$ X T | StaticAbilities$ NoCombat | SetChosenNumber$ X | SpellDescription$ Each creature with mana value X can't attack or block this turn.
+SVar:NoCombat:Mode$ Continuous | Affected$ Creature.cmcChosen | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Each creature with mana value X can't attack or block this turn.
 SVar:X:Count$xPaid
-SVar:DroningX:Number$0
 AI:RemoveDeck:All
 Oracle:{X}, {T}: Each creature with mana value X can't attack or block this turn.
diff --git a/forge-gui/res/cardsfolder/d/drop_tower.txt b/forge-gui/res/cardsfolder/d/drop_tower.txt
index ed5b5ada6db..329ae1b915a 100644
--- a/forge-gui/res/cardsfolder/d/drop_tower.txt
+++ b/forge-gui/res/cardsfolder/d/drop_tower.txt
@@ -5,7 +5,7 @@ K:Visit:TrigPump
 SVar:TrigPump:DB$ Effect | StaticAbilities$ Pump | ValidTgts$ Creature | Triggers$ ExileSelf | RememberObjects$ Targeted | SpellDescription$ Target creature gains flying until end of turn, or until any player rolls a 1, whichever comes first.
 SVar:Pump:Mode$ Continuous | Affected$ Card.IsRemembered | AddKeyword$ Flying | Description$ This creature gains flying until end of turn, or until any player rolls a 1.
 SVar:ExileSelf:Mode$ RolledDie | Execute$ TrigRemove | ValidResult$ EQ1 | Static$ True
-SVar:TrigRemove:DB$ ChangeZone | Origin$ Command | Defined$ Self | Destination$ Exiled
+SVar:TrigRemove:DB$ ChangeZone | Origin$ Command | Defined$ Self | Destination$ Exile
 Oracle:Visit — Target creature gains flying until end of turn, or until any player rolls a 1, whichever comes first.
 
 # --- VARIANTS ---
diff --git a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
index b33c765faaf..b3c9038475a 100644
--- a/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
+++ b/forge-gui/res/cardsfolder/d/druid_of_the_emerald_grove.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Dwarf Druid
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ When CARDNAME enters, search your library for up to two basic land cards and reveal them, then ABILITY
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 2 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBRollDice
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 2 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBRollDice
 SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TutuDaDome,10-19:WonTwoField,Else:ToFourField | SpellDescription$ then roll a d20.
 SVar:TutuDaDome:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | SubAbility$ DBCleanup | SpellDescription$ 1-9 VERT Put those cards into your hand, then shuffle.
 SVar:WonTwoField:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | ForgetChanged$ True | NoShuffle$ True | SubAbility$ WonTwoDome | SpellDescription$ 10-19 VERT Put one of those cards onto the battlefield tapped and the other into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/d/dutiful_replicator.txt b/forge-gui/res/cardsfolder/d/dutiful_replicator.txt
index def1c64cbae..c99c1f66045 100644
--- a/forge-gui/res/cardsfolder/d/dutiful_replicator.txt
+++ b/forge-gui/res/cardsfolder/d/dutiful_replicator.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Assembly-Worker
 PT:3/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigImmediate | TriggerDescription$ When CARDNAME enters, you may pay {1}. When you do, create a token that's a copy of target token you control not named Dutiful Replicator.
 SVar:TrigImmediate:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigClone | TriggerDescription$ When you do, create a token that's a copy of target token you control not named Dutiful Replicator.
-SVar:TrigClone:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl+notnamedDutiful Replicator | TgtPrompt$ Select target token you control not named Dutiful Replicator
+SVar:TrigClone:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl+!namedDutiful Replicator | TgtPrompt$ Select target token you control not named Dutiful Replicator
 DeckHas:Ability$Token
 DeckNeeds:Ability$Token
 Oracle:When Dutiful Replicator enters, you may pay {1}. When you do, create a token that's a copy of target token you control not named Dutiful Replicator.
diff --git a/forge-gui/res/cardsfolder/d/dynaheir_invoker_adept.txt b/forge-gui/res/cardsfolder/d/dynaheir_invoker_adept.txt
index 6f25676575d..bbda52be4d7 100644
--- a/forge-gui/res/cardsfolder/d/dynaheir_invoker_adept.txt
+++ b/forge-gui/res/cardsfolder/d/dynaheir_invoker_adept.txt
@@ -5,7 +5,7 @@ PT:4/4
 K:Haste
 S:Mode$ ActivateAbilityAsIfHaste | ValidCard$ Creature.Other+YouCtrl+inZoneBattlefield | Description$ You may activate abilities of other creatures you control as though those creatures had haste.
 A:AB$ Effect | Cost$ T | Triggers$ ActivateTrig | SpellDescription$ When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy.
-SVar:ActivateTrig:Mode$ AbilityCast | ValidSA$ SpellAbility.nonManaAbility+ManaSpent GE4 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopy | OneOff$ True | TriggerDescription$ When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy.
+SVar:ActivateTrig:Mode$ AbilityCast | ValidSA$ SpellAbility.!ManaAbility+ManaSpent GE4 | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopy | OneOff$ True | TriggerDescription$ When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 SVar:BuffedBy:Creature.hasAbility Activated
 Oracle:Haste\nYou may activate abilities of other creatures you control as though those creatures had haste.\n{T}: When you next activate an ability that isn't a mana ability this turn by spending four or more mana to activate it, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/earth_kingdom_soldier.txt b/forge-gui/res/cardsfolder/e/earth_kingdom_soldier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earth_kingdom_soldier.txt
rename to forge-gui/res/cardsfolder/e/earth_kingdom_soldier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earth_rumble.txt b/forge-gui/res/cardsfolder/e/earth_rumble.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earth_rumble.txt
rename to forge-gui/res/cardsfolder/e/earth_rumble.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earth_village_ruffians.txt b/forge-gui/res/cardsfolder/e/earth_village_ruffians.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/earth_village_ruffians.txt
rename to forge-gui/res/cardsfolder/e/earth_village_ruffians.txt
index 57a170376c6..5a62a08b27a 100644
--- a/forge-gui/res/cardsfolder/upcoming/earth_village_ruffians.txt
+++ b/forge-gui/res/cardsfolder/e/earth_village_ruffians.txt
@@ -5,4 +5,4 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigEarthbend | TriggerDescription$ When this creature dies, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
 SVar:TrigEarthbend:DB$ Earthbend | Num$ 2
 DeckHas:Ability$Counters
-Oracle:When this creature dies, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
\ No newline at end of file
+Oracle:When this creature dies, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
diff --git a/forge-gui/res/cardsfolder/upcoming/earthbending_lesson.txt b/forge-gui/res/cardsfolder/e/earthbending_lesson.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/earthbending_lesson.txt
rename to forge-gui/res/cardsfolder/e/earthbending_lesson.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/earthbending_student.txt b/forge-gui/res/cardsfolder/e/earthbending_student.txt
similarity index 94%
rename from forge-gui/res/cardsfolder/upcoming/earthbending_student.txt
rename to forge-gui/res/cardsfolder/e/earthbending_student.txt
index fa0766dd8d9..509f0de1705 100644
--- a/forge-gui/res/cardsfolder/upcoming/earthbending_student.txt
+++ b/forge-gui/res/cardsfolder/e/earthbending_student.txt
@@ -6,4 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigEarthbend:DB$ Earthbend | Num$ 2
 S:Mode$ Continuous | Affected$ Creature.Land+YouCtrl | AddKeyword$ Vigilance | Description$ Land creatures you control have vigilance. (Attacking doesn't cause them to tap.)
 DeckHas:Ability$Counters
-Oracle:When this creature enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nLand creatures you control have vigilance. (Attacking doesn't cause them to tap.)
\ No newline at end of file
+Oracle:When this creature enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nLand creatures you control have vigilance. (Attacking doesn't cause them to tap.)
diff --git a/forge-gui/res/cardsfolder/e/ebondeath_dracolich.txt b/forge-gui/res/cardsfolder/e/ebondeath_dracolich.txt
index c69ad0b624e..9b5da7c7a22 100644
--- a/forge-gui/res/cardsfolder/e/ebondeath_dracolich.txt
+++ b/forge-gui/res/cardsfolder/e/ebondeath_dracolich.txt
@@ -7,7 +7,7 @@ K:Flying
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | AffectedZone$ Graveyard | MayPlay$ True | CheckSVar$ X | SVarCompare$ GE1 | Description$ You may cast CARDNAME from your graveyard if a creature not named Ebondeath, Dracolich died this turn.
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.notnamedEbondeath; Dracolich
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.!namedEbondeath; Dracolich
 SVar:SacMe:3
 SVar:DiscardMe:3
 Oracle:Flash\nFlying\nEbondeath, Dracolich enters tapped.\nYou may cast Ebondeath, Dracolich from your graveyard if a creature not named Ebondeath, Dracolich died this turn.
diff --git a/forge-gui/res/cardsfolder/e/ebony_charm.txt b/forge-gui/res/cardsfolder/e/ebony_charm.txt
index e2350e21a08..04af89188a3 100644
--- a/forge-gui/res/cardsfolder/e/ebony_charm.txt
+++ b/forge-gui/res/cardsfolder/e/ebony_charm.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Charm | Choices$ EbonyDrain,EbonyExile,EbonyFear | Defined$ You
 SVar:EbonyDrain:DB$ LoseLife | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | LifeAmount$ 1 | SubAbility$ EbonyGain | SpellDescription$ Target opponent loses 1 life and you gain 1 life.
 SVar:EbonyGain:DB$ GainLife | Defined$ You | LifeAmount$ 1
-SVar:EbonyExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+SVar:EbonyExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 SVar:EbonyFear:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Fear | SpellDescription$ Target creature gains fear until end of turn.
 AI:RemoveDeck:All
 Oracle:Choose one —\n• Target opponent loses 1 life and you gain 1 life.\n• Exile up to three target cards from a single graveyard.\n• Target creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
diff --git a/forge-gui/res/cardsfolder/e/eccentric_apprentice.txt b/forge-gui/res/cardsfolder/e/eccentric_apprentice.txt
index 4c24fa6ba13..3693371bab8 100644
--- a/forge-gui/res/cardsfolder/e/eccentric_apprentice.txt
+++ b/forge-gui/res/cardsfolder/e/eccentric_apprentice.txt
@@ -7,5 +7,5 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$
 SVar:TrigVenture:DB$ Venture
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | CheckSVar$ X | Execute$ TrigAnimate | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, if you've completed a dungeon, up to one target creature becomes a Bird with base power and toughness 1/1 and flying until end of turn.
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | Power$ 1 | Toughness$ 1 | Types$ Bird | RemoveCreatureTypes$ True | Keywords$ Flying
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:Flying\nWhen Eccentric Apprentice enters, venture into the dungeon. (Enter the first room or advance to the next room.)\nAt the beginning of combat on your turn, if you've completed a dungeon, up to one target creature becomes a Bird with base power and toughness 1/1 and flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/e/ecologists_terrarium.txt b/forge-gui/res/cardsfolder/e/ecologists_terrarium.txt
index 8052be300f3..d566d13be3b 100644
--- a/forge-gui/res/cardsfolder/e/ecologists_terrarium.txt
+++ b/forge-gui/res/cardsfolder/e/ecologists_terrarium.txt
@@ -2,7 +2,7 @@ Name:Ecologist's Terrarium
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ChangeTypeDesc$ basic land card | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 A:AB$ PutCounter | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Creature | SorcerySpeed$ True | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature. Activate only as a sorcery.
 DeckHas:Ability$Counters
 Oracle:When Ecologist's Terrarium enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{2}, {T}, Sacrifice Ecologist's Terrarium: Put a +1/+1 counter on target creature. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/e/eddie_brock_venom_lethal_protector.txt b/forge-gui/res/cardsfolder/e/eddie_brock_venom_lethal_protector.txt
new file mode 100644
index 00000000000..574697622ad
--- /dev/null
+++ b/forge-gui/res/cardsfolder/e/eddie_brock_venom_lethal_protector.txt
@@ -0,0 +1,25 @@
+Name:Eddie Brock
+ManaCost:2 B
+Types:Legendary Creature Human Hero Villain
+PT:3/3
+AlternateMode:Modal
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target creature card with mana value 1 or less from your graveyard to the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.cmcLE1+YouOwn | TgtPrompt$ Select target creature card with mana value 1 or less in your graveyard
+A:AB$ SetState | Cost$ 3 B R G | Defined$ Self | Mode$ Transform | SorcerySpeed$ True | AILogic$ Always | SpellDescription$ Transform CARDNAME. Activate only as a sorcery.
+SVar:PlayMain1:TRUE
+Oracle:When Eddie Brock enters, return target creature card with mana value 1 or less from your graveyard to the battlefield.\n{3}{B}{R}{G}: Transform Eddie Brock. Activate only as a sorcery.
+
+ALTERNATE
+
+Name:Venom, Lethal Protector
+ManaCost:3 B R G
+Types:Legendary Creature Symbiote Hero Villain
+PT:5/5
+K:Menace
+K:Trample
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME attacks, you may sacrifice another creature. If you do, draw X cards, then you may put a permanent card with mana value X or less from your hand onto the battlefield, where X is the sacrificed creature's mana value.
+SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Creature.Other/another creature> | NumCards$ X | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | ChangeType$ Permanent.YouCtrl+cmcLEX | Origin$ Hand | Destination$ Battlefield | TgtPrompt$ Select permanent card with mana value less than or equal to the sacrificed creature's mana value
+SVar:X:Sacrificed$CardManaCost
+Oracle:Menace, trample, haste\nWhenever Venom attacks, you may sacrifice another creature. If you do, draw X cards, then you may put a permanent card with mana value X or less from your hand onto the battlefield, where X is the sacrificed creature's mana value.
diff --git a/forge-gui/res/cardsfolder/e/edge_of_autumn.txt b/forge-gui/res/cardsfolder/e/edge_of_autumn.txt
index fe4ec6832de..d948e7d15ad 100644
--- a/forge-gui/res/cardsfolder/e/edge_of_autumn.txt
+++ b/forge-gui/res/cardsfolder/e/edge_of_autumn.txt
@@ -1,7 +1,7 @@
 Name:Edge of Autumn
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | ConditionPresent$ Land.YouCtrl | ConditionCompare$ LE4 | ConditionDescription$ If you control four or fewer lands, | SpellDescription$ If you control four or fewer lands, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | ConditionPresent$ Land.YouCtrl | ConditionCompare$ LE4 | ConditionDescription$ If you control four or fewer lands, | SpellDescription$ If you control four or fewer lands, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:Sac<1/Land>
 AI:RemoveDeck:All
 Oracle:If you control four or fewer lands, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nCycling—Sacrifice a land. (Sacrifice a land, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/eel_hounds.txt b/forge-gui/res/cardsfolder/e/eel_hounds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eel_hounds.txt
rename to forge-gui/res/cardsfolder/e/eel_hounds.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/eerie_gravestone.txt b/forge-gui/res/cardsfolder/e/eerie_gravestone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/eerie_gravestone.txt
rename to forge-gui/res/cardsfolder/e/eerie_gravestone.txt
diff --git a/forge-gui/res/cardsfolder/e/eerie_ultimatum.txt b/forge-gui/res/cardsfolder/e/eerie_ultimatum.txt
index 355ff616eff..cba20ce6570 100644
--- a/forge-gui/res/cardsfolder/e/eerie_ultimatum.txt
+++ b/forge-gui/res/cardsfolder/e/eerie_ultimatum.txt
@@ -2,7 +2,7 @@ Name:Eerie Ultimatum
 ManaCost:W W B B B G G
 Types:Sorcery
 A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Permanent.YouOwn | ChangeNumDesc$ any number of | ChangeTypeDesc$ permanent cards with different names | DifferentNames$ True | ChangeNum$ X | Hidden$ True | SpellDescription$ Return any number of permanent cards with different names from your graveyard to the battlefield.
-SVar:X:Count$DifferentCardNames_Permanent.YouOwn+inZoneGraveyard
+SVar:X:Count$ValidGraveyard Permanent.YouOwn$DifferentCardNames
 SVar:IsReanimatorCard:TRUE
 DeckHas:Ability$Graveyard
 Oracle:Return any number of permanent cards with different names from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/e/elanor_gardner.txt b/forge-gui/res/cardsfolder/e/elanor_gardner.txt
index 1c00c4cbd4a..85c55a7d1cf 100644
--- a/forge-gui/res/cardsfolder/e/elanor_gardner.txt
+++ b/forge-gui/res/cardsfolder/e/elanor_gardner.txt
@@ -5,7 +5,7 @@ PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | ValidPlayer$ You | CheckSVar$ FoodCheck | SVarCompare$ GE1 | OptionalDecider$ You | Execute$ TrigSearch | TriggerDescription$ At the beginning of your end step, if you sacrificed a Food this turn, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1
 SVar:FoodCheck:PlayerCountPropertyYou$SacrificedThisTurn Food
 DeckHas:Ability$LifeGain|Token|Food
 DeckHints:Ability$Food
diff --git a/forge-gui/res/cardsfolder/e/electro_assaulting_battery.txt b/forge-gui/res/cardsfolder/e/electro_assaulting_battery.txt
new file mode 100644
index 00000000000..d7bf1a9b42a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/e/electro_assaulting_battery.txt
@@ -0,0 +1,13 @@
+Name:Electro, Assaulting Battery
+ManaCost:1 R R
+Types:Legendary Creature Human Villain
+PT:2/3
+K:Flying
+S:Mode$ UnspentMana | ValidPlayer$ You | ManaType$ Red | Description$ You don't lose unspent red mana as steps and phases end.
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever you cast an instant or sorcery spell, add {R}.
+SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ When NICKNAME leaves the battlefield, you may pay {X}. When you do, he deals X damage to target player.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ X | Execute$ TrigDamage | TriggerDescription$ When you do, he deals X damage to target player.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X
+SVar:X:Count$xPaid
+Oracle:Flying\nYou don't lose unspent red mana as steps and phases end.\nWhenever you cast an instant or sorcery spell, add {R}.\nWhen Electro leaves the battlefield, you may pay {X}. When you do, he deals X damage to target player.
diff --git a/forge-gui/res/cardsfolder/e/electros_bolt.txt b/forge-gui/res/cardsfolder/e/electros_bolt.txt
new file mode 100644
index 00000000000..88186bc7674
--- /dev/null
+++ b/forge-gui/res/cardsfolder/e/electros_bolt.txt
@@ -0,0 +1,7 @@
+Name:Electro's Bolt
+ManaCost:2 R
+Types:Sorcery
+A:SP$ DealDamage | ValidTgts$ Creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
+K:Mayhem:1 R
+Oracle:Electro's Bolt deals 4 damage to target creature.\nMayhem {1}{R} (You may cast this card from your graveyard for {1}{R} if you discarded it this turn. Timing rules still apply.)
+
diff --git a/forge-gui/res/cardsfolder/upcoming/elephant_rat.txt b/forge-gui/res/cardsfolder/e/elephant_rat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/elephant_rat.txt
rename to forge-gui/res/cardsfolder/e/elephant_rat.txt
diff --git a/forge-gui/res/cardsfolder/e/elfhame_sanctuary.txt b/forge-gui/res/cardsfolder/e/elfhame_sanctuary.txt
index 2ec4413a10a..b15e1809cab 100644
--- a/forge-gui/res/cardsfolder/e/elfhame_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/e/elfhame_sanctuary.txt
@@ -2,7 +2,7 @@ Name:Elfhame Sanctuary
 ManaCost:1 G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle. If you do, you skip your draw step this turn.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBSkipDraw | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBSkipDraw | ShuffleNonMandatory$ True
 SVar:DBSkipDraw:DB$ SkipPhase | Defined$ You | Step$ Draw | Duration$ EndOfTurn
 AI:RemoveDeck:All
 Oracle:At the beginning of your upkeep, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle. If you do, you skip your draw step this turn.
diff --git a/forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt b/forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt
index 56a84754772..5461b41ed77 100644
--- a/forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt
+++ b/forge-gui/res/cardsfolder/e/eliminate_the_impossible.txt
@@ -2,7 +2,7 @@ Name:Eliminate the Impossible
 ManaCost:1 U
 Types:Instant
 A:SP$ Investigate | SubAbility$ DBDebuff | SpellDescription$ Investigate. Creatures your opponents control get -2/-0 until end of turn. If any of them are suspected, they're no longer suspected. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
-SVar:DBDebuff:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -2 | SubAbility$ DBAlterAtribute
-SVar:DBAlterAtribute:DB$ AlterAttribute | Defined$ Valid Creature.OppCtrl+IsSuspected | Attributes$ Suspected | Activate$ False
+SVar:DBDebuff:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -2 | SubAbility$ DBAlterAttribute
+SVar:DBAlterAttribute:DB$ AlterAttribute | Defined$ Valid Creature.OppCtrl+IsSuspected | Attributes$ Suspected | Activate$ False
 DeckHas:Ability$Token & Type$Artifact|Clue
 Oracle:Investigate. Creatures your opponents control get -2/-0 until end of turn. If any of them are suspected, they're no longer suspected. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/e/ellywick_tumblestrum.txt b/forge-gui/res/cardsfolder/e/ellywick_tumblestrum.txt
index 7dde30bfbd5..4241f683d8f 100644
--- a/forge-gui/res/cardsfolder/e/ellywick_tumblestrum.txt
+++ b/forge-gui/res/cardsfolder/e/ellywick_tumblestrum.txt
@@ -9,5 +9,5 @@ SVar:IsLegendary:Count$ValidHand Creature.Legendary+IsRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Ellywick Tumblestrum | Image$ emblem_ellywick_tumblestrum | StaticAbilities$ STOverrun | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed."
 SVar:STOverrun:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ X | AddToughness$ X | AddKeyword$ Trample & Haste | Description$ Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed.
-SVar:X:PlayerCountPropertyYou$DifferentlyNamedDungeonsCompleted/Twice
+SVar:X:DungeonsCompleted$DifferentCardNames/Twice
 Oracle:[+1]: Venture into the dungeon. (Enter the first room or advance to the next room.)\n[-2]: Look at the top six cards of your library. You may reveal a creature card from among them and put it into your hand. If it's legendary, you gain 3 life. Put the rest on the bottom of your library in a random order.\n[-7]: You get an emblem with "Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed."
diff --git a/forge-gui/res/cardsfolder/e/elvish_pioneer.txt b/forge-gui/res/cardsfolder/e/elvish_pioneer.txt
index 8dbbe0d047a..319a84d7141 100644
--- a/forge-gui/res/cardsfolder/e/elvish_pioneer.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_pioneer.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Elf Druid
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may put a basic land card from your hand onto the battlefield tapped.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:When Elvish Pioneer enters, you may put a basic land card from your hand onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/e/embermouth_sentinel.txt b/forge-gui/res/cardsfolder/e/embermouth_sentinel.txt
index bd6c8475e2f..84c2a0dcc9b 100644
--- a/forge-gui/res/cardsfolder/e/embermouth_sentinel.txt
+++ b/forge-gui/res/cardsfolder/e/embermouth_sentinel.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Chimera
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBranch | OptionalDecider$ You | TriggerDescription$ When this creature enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top. If you control a Dragon, put that card onto the battlefield tapped instead.
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ RampantLand | FalseSubAbility$ GuidedLand
-SVar:GuidedLand:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ShuffleNonMandatory$ True
-SVar:RampantLand:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ShuffleNonMandatory$ True
+SVar:GuidedLand:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
+SVar:RampantLand:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 SVar:X:Count$Valid Dragon.YouCtrl
 Oracle:When this creature enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top. If you control a Dragon, put that card onto the battlefield tapped instead.
diff --git a/forge-gui/res/cardsfolder/e/embodiment_of_spring.txt b/forge-gui/res/cardsfolder/e/embodiment_of_spring.txt
index 7eada395913..5a41521d3ac 100644
--- a/forge-gui/res/cardsfolder/e/embodiment_of_spring.txt
+++ b/forge-gui/res/cardsfolder/e/embodiment_of_spring.txt
@@ -2,7 +2,7 @@ Name:Embodiment of Spring
 ManaCost:U
 Types:Creature Elemental
 PT:0/3
-A:AB$ ChangeZone | Cost$ 1 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
 DeckHints:Color$Green
 # TODO: Just like with Sakura-Tribe Elder, the AI will sac it at its earliest convenience to search for a land. Might improve conditions for when the AI might not want to do that.
 Oracle:{1}{G}, {T}, Sacrifice Embodiment of Spring: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/e/emergent_sequence.txt b/forge-gui/res/cardsfolder/e/emergent_sequence.txt
index 3c7d5465fc7..10f21f5001f 100644
--- a/forge-gui/res/cardsfolder/e/emergent_sequence.txt
+++ b/forge-gui/res/cardsfolder/e/emergent_sequence.txt
@@ -1,7 +1,7 @@
 Name:Emergent Sequence
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | RememberChanged$ True | ChangeNum$ 1 | SubAbility$ DBAnimate | StackDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. That land becomes a 0/0 green and blue Fractal creature that's still a land. Put a +1/+1 counter on it for each land you had enter the battlefield under your control this turn. | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. That land becomes a 0/0 green and blue Fractal creature that's still a land. Put a +1/+1 counter on it for each land you had enter the battlefield under your control this turn.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | RememberChanged$ True | ChangeNum$ 1 | SubAbility$ DBAnimate | StackDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. That land becomes a 0/0 green and blue Fractal creature that's still a land. Put a +1/+1 counter on it for each land you had enter the battlefield under your control this turn. | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. That land becomes a 0/0 green and blue Fractal creature that's still a land. Put a +1/+1 counter on it for each land you had enter the battlefield under your control this turn.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 0 | Toughness$ 0 | Colors$ Green,Blue | OverwriteColors$ True | Types$ Creature,Fractal | Duration$ Permanent | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/e/enatu_golem.txt b/forge-gui/res/cardsfolder/e/enatu_golem.txt
index b0d53981ce4..10406dd3860 100644
--- a/forge-gui/res/cardsfolder/e/enatu_golem.txt
+++ b/forge-gui/res/cardsfolder/e/enatu_golem.txt
@@ -3,5 +3,5 @@ ManaCost:6
 Types:Artifact Creature Golem
 PT:3/5
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, you gain 4 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ TriggeredCardController | LifeAmount$ 4
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
 Oracle:When Enatu Golem dies, you gain 4 life.
diff --git a/forge-gui/res/cardsfolder/e/encroaching_dragonstorm.txt b/forge-gui/res/cardsfolder/e/encroaching_dragonstorm.txt
index 5373a953ae6..dd24492e9fd 100644
--- a/forge-gui/res/cardsfolder/e/encroaching_dragonstorm.txt
+++ b/forge-gui/res/cardsfolder/e/encroaching_dragonstorm.txt
@@ -2,7 +2,7 @@ Name:Encroaching Dragonstorm
 ManaCost:3 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When this enchantment enters, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Dragon.YouCtrl | Execute$ TrigReturn | TriggerDescription$ When a Dragon you control enters, return this enchantment to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 DeckHints:Type$Dragon
diff --git a/forge-gui/res/cardsfolder/e/enigma_ridges.txt b/forge-gui/res/cardsfolder/e/enigma_ridges.txt
index ab6a4851cd5..f024a503d35 100644
--- a/forge-gui/res/cardsfolder/e/enigma_ridges.txt
+++ b/forge-gui/res/cardsfolder/e/enigma_ridges.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Echoir
 T:Mode$ PlaneswalkedTo | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When you planeswalk to CARDNAME, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, reveals them, puts them into their hand, then shuffles.
 SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ LTY | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land.Basic | ChangeNum$ Z | Origin$ Library | Destination$ Hand
+SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ LTY | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ Z | Origin$ Library | Destination$ Hand
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:Y:PlayerCountPlayers$HighestValid Land.YouCtrl
 SVar:Z:SVar$Y/Minus.X
diff --git a/forge-gui/res/cardsfolder/e/enlightened_tutor.txt b/forge-gui/res/cardsfolder/e/enlightened_tutor.txt
index f6e98e8bd09..bd185b8bfa0 100644
--- a/forge-gui/res/cardsfolder/e/enlightened_tutor.txt
+++ b/forge-gui/res/cardsfolder/e/enlightened_tutor.txt
@@ -1,6 +1,6 @@
 Name:Enlightened Tutor
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Artifact,Enchantment | ChangeNum$ 1 | SpellDescription$ Search your library for an artifact or enchantment card, reveal it, then shuffle and put that card on top.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Artifact,Enchantment | SpellDescription$ Search your library for an artifact or enchantment card, reveal it, then shuffle and put that card on top.
 AI:RemoveDeck:Random
 Oracle:Search your library for an artifact or enchantment card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/e/enthralling_hold.txt b/forge-gui/res/cardsfolder/e/enthralling_hold.txt
index 2dfdd22d04c..97dcdbcbdc7 100644
--- a/forge-gui/res/cardsfolder/e/enthralling_hold.txt
+++ b/forge-gui/res/cardsfolder/e/enthralling_hold.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAITgts:Creature.tapped
 SVar:AttachAILogic:GainControl
-S:Mode$ CantTarget | EffectZone$ Stack | ValidSource$ Spell.Self | ValidCard$ Creature.untapped | Description$ You can't choose an untapped creature as this spell's target as you cast it.
+S:Mode$ CantTarget | ValidTarget$ Creature.untapped | EffectZone$ Stack | ValidSource$ Spell.Self | Description$ You can't choose an untapped creature as this spell's target as you cast it.
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | GainControl$ You | Description$ You control enchanted creature.
 Oracle:Enchant creature\nYou can't choose an untapped creature as this spell's target as you cast it.\nYou control enchanted creature.
diff --git a/forge-gui/res/cardsfolder/e/entish_restoration.txt b/forge-gui/res/cardsfolder/e/entish_restoration.txt
index 00db588e562..e7ce321079e 100644
--- a/forge-gui/res/cardsfolder/e/entish_restoration.txt
+++ b/forge-gui/res/cardsfolder/e/entish_restoration.txt
@@ -2,7 +2,7 @@ Name:Entish Restoration
 ManaCost:2 G
 Types:Instant
 A:SP$ Sacrifice | Defined$ You | SacValid$ Land | SubAbility$ DBChangeZone | SpellDescription$ Sacrifice a land. Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. If you control a creature with power 4 or greater, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True
 SVar:AIPreference:SacCost$Land.Basic+tapped
 SVar:X:Count$Compare Y GE1.3.2
 SVar:Y:Count$Valid Creature.YouCtrl+powerGE4
diff --git a/forge-gui/res/cardsfolder/e/environmental_sciences.txt b/forge-gui/res/cardsfolder/e/environmental_sciences.txt
index ec41b822cb2..69fabb0e0bc 100644
--- a/forge-gui/res/cardsfolder/e/environmental_sciences.txt
+++ b/forge-gui/res/cardsfolder/e/environmental_sciences.txt
@@ -1,7 +1,7 @@
 Name:Environmental Sciences
 ManaCost:2
 Types:Sorcery Lesson
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBGainLife | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You gain 2 life.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBGainLife | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You gain 2 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
 DeckHas:Ability$LifeGain
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You gain 2 life.
diff --git a/forge-gui/res/cardsfolder/e/escape_tunnel.txt b/forge-gui/res/cardsfolder/e/escape_tunnel.txt
index 6ff53b6e1ff..9cd28e00f2f 100644
--- a/forge-gui/res/cardsfolder/e/escape_tunnel.txt
+++ b/forge-gui/res/cardsfolder/e/escape_tunnel.txt
@@ -1,7 +1,7 @@
 Name:Escape Tunnel
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 A:AB$ Effect | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target creature with power 2 or less can't be blocked this turn.
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/e/esper_panorama.txt b/forge-gui/res/cardsfolder/e/esper_panorama.txt
index fc623cba812..087e7d0c5c9 100644
--- a/forge-gui/res/cardsfolder/e/esper_panorama.txt
+++ b/forge-gui/res/cardsfolder/e/esper_panorama.txt
@@ -2,5 +2,5 @@ Name:Esper Panorama
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Plains+Basic,Land.Island+Basic,Land.Swamp+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic,Island.Basic,Swamp.Basic | ChangeTypeDesc$ basic Plains, Island, or Swamp | SpellDescription$ Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Esper Panorama: Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/e/euroakus.txt b/forge-gui/res/cardsfolder/e/euroakus.txt
index d1f03154637..262a250357b 100644
--- a/forge-gui/res/cardsfolder/e/euroakus.txt
+++ b/forge-gui/res/cardsfolder/e/euroakus.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Treefolk Wizard
 PT:6/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a number of 1/1 blue Human Wizard creature tokens equal to the number of differently named lands you control.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_1_1_human_wizard
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 A:AB$ Draw | Cost$ 4 G U | NumCards$ Y | SubAbility$ PumpAll | SpellDescription$ Draw a card for each Wizard you control. They each get +1/+1 until end of turn for each card in your hand.
 SVar:Y:Count$Valid Wizard.YouCtrl
 SVar:PumpAll:DB$ PumpAll | ValidCards$ Wizard.YouCtrl | NumAtt$ +Z | NumDef$ +Z
diff --git a/forge-gui/res/cardsfolder/e/evolution_charm.txt b/forge-gui/res/cardsfolder/e/evolution_charm.txt
index 8946fd1b636..28b8fd342fb 100644
--- a/forge-gui/res/cardsfolder/e/evolution_charm.txt
+++ b/forge-gui/res/cardsfolder/e/evolution_charm.txt
@@ -2,7 +2,7 @@ Name:Evolution Charm
 ManaCost:1 G
 Types:Instant
 A:SP$ Charm | Choices$ SearchLand,Return,DoPump | CharmNum$ 1
-SVar:SearchLand:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:SearchLand:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:Return:DB$ ChangeZone | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:DoPump:DB$ Pump | ValidTgts$ Creature | KW$ Flying | TgtPrompt$ Select target creature | SpellDescription$ Target creature gains flying until end of turn.
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/e/evolving_wilds.txt b/forge-gui/res/cardsfolder/e/evolving_wilds.txt
index 15e0f5fe8af..0ec71745caf 100644
--- a/forge-gui/res/cardsfolder/e/evolving_wilds.txt
+++ b/forge-gui/res/cardsfolder/e/evolving_wilds.txt
@@ -1,5 +1,5 @@
 Name:Evolving Wilds
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}, Sacrifice Evolving Wilds: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/e/exploding_borders.txt b/forge-gui/res/cardsfolder/e/exploding_borders.txt
index 06f98408353..47dd36b8c58 100644
--- a/forge-gui/res/cardsfolder/e/exploding_borders.txt
+++ b/forge-gui/res/cardsfolder/e/exploding_borders.txt
@@ -1,7 +1,7 @@
 Name:Exploding Borders
 ManaCost:2 R G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBDealDamage | SpellDescription$ Domain — Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBDealDamage | SpellDescription$ Domain — Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target player or planeswalker, where X is the number of basic land types among lands you control.
 SVar:X:Count$Domain
 Oracle:Domain — Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Exploding Borders deals X damage to target player or planeswalker, where X is the number of basic land types among lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/explosive_shot.txt b/forge-gui/res/cardsfolder/e/explosive_shot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/explosive_shot.txt
rename to forge-gui/res/cardsfolder/e/explosive_shot.txt
diff --git a/forge-gui/res/cardsfolder/e/explosive_vegetation.txt b/forge-gui/res/cardsfolder/e/explosive_vegetation.txt
index 58ff4299097..627f2f6acf1 100644
--- a/forge-gui/res/cardsfolder/e/explosive_vegetation.txt
+++ b/forge-gui/res/cardsfolder/e/explosive_vegetation.txt
@@ -1,5 +1,5 @@
 Name:Explosive Vegetation
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 Oracle:Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt b/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt
index 906d10f13ea..c60cd0bbb48 100644
--- a/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt
+++ b/forge-gui/res/cardsfolder/e/eye_for_an_eye.txt
@@ -4,8 +4,8 @@ Types:Instant
 A:SP$ ChooseSource | Choices$ Card,Emblem | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and CARDNAME deals that much damage to that source's controller.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | ImprintCards$ Self | ConditionDefined$ ChosenCard | ConditionPresent$ Card,Emblem | ConditionCompare$ GE1
 SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCardStrict,Emblem.ChosenCard | ReplaceWith$ SelflessDmg | Description$ The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and this card deals that much damage to that source's controller.
-SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ EyeforEye
-SVar:EyeforEye:DB$ DealDamage | Defined$ ReplacedSourceController | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ ExileEffect
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ You | VarType$ Player | SubAbility$ EyeForEye
+SVar:EyeForEye:DB$ DealDamage | Defined$ ReplacedSourceController | DamageSource$ EffectSource | NumDmg$ X | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:X:ReplaceCount$DamageAmount
 Oracle:The next time a source of your choice would deal damage to you this turn, instead that source deals that much damage to you and Eye for an Eye deals that much damage to that source's controller.
diff --git a/forge-gui/res/cardsfolder/e/eye_of_singularity.txt b/forge-gui/res/cardsfolder/e/eye_of_singularity.txt
index 212994fcf74..d568f846d66 100644
--- a/forge-gui/res/cardsfolder/e/eye_of_singularity.txt
+++ b/forge-gui/res/cardsfolder/e/eye_of_singularity.txt
@@ -7,6 +7,6 @@ SVar:DBRem:DB$ Pump | ImprintCards$ Valid Permanent.sharesNameWith Remembered+Is
 SVar:DBDestroy:DB$ DestroyAll | ValidCards$ Card.IsImprinted | NoRegen$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.nonBasic | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever a permanent other than a basic land enters, destroy all other permanents with that name. They can't be regenerated.
-SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Permanent.NotTriggeredCard+sharesNameWith TriggeredCard | NoRegen$ True
+SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Permanent.!TriggeredCard+sharesNameWith TriggeredCard | NoRegen$ True
 AI:RemoveDeck:All
 Oracle:When Eye of Singularity enters, destroy each permanent with the same name as another permanent, except for basic lands. They can't be regenerated.\nWhenever a permanent other than a basic land enters, destroy all other permanents with that name. They can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/e/ezekiel_sims_spider_totem.txt b/forge-gui/res/cardsfolder/e/ezekiel_sims_spider_totem.txt
new file mode 100644
index 00000000000..8b25c1cc72c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/e/ezekiel_sims_spider_totem.txt
@@ -0,0 +1,8 @@
+Name:Ezekiel Sims, Spider-Totem
+ManaCost:4 G
+Types:Legendary Creature Spider Human Advisor
+PT:3/5
+K:Reach
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, target Spider you control gets +2/+2 until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Spider.YouCtrl | TgtPrompt$ Select target Spider you control | NumAtt$ +2 | NumDef$ +2
+Oracle:Reach\nAt the beginning of combat on your turn, target Spider you control gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/fabled_passage.txt b/forge-gui/res/cardsfolder/f/fabled_passage.txt
index e51b36ab511..82434537b09 100644
--- a/forge-gui/res/cardsfolder/f/fabled_passage.txt
+++ b/forge-gui/res/cardsfolder/f/fabled_passage.txt
@@ -1,7 +1,7 @@
 Name:Fabled Passage
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBUntap | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Then if you control four or more lands, untap that land.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | SubAbility$ DBUntap | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Then if you control four or more lands, untap that land.
 SVar:DBUntap:DB$ Untap | Defined$ Remembered | ConditionPresent$ Land.YouCtrl | ConditionCompare$ GE4 | ConditionDescription$ If you control four or more lands, untap that land. | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:{T}, Sacrifice Fabled Passage: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Then if you control four or more lands, untap that land.
diff --git a/forge-gui/res/cardsfolder/f/faiths_fetters.txt b/forge-gui/res/cardsfolder/f/faiths_fetters.txt
index 0c286bdecda..9cf396d4677 100644
--- a/forge-gui/res/cardsfolder/f/faiths_fetters.txt
+++ b/forge-gui/res/cardsfolder/f/faiths_fetters.txt
@@ -6,6 +6,6 @@ SVar:AttachAITgts:Creature
 SVar:AttachAILogic:Curse
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 4 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 4
-S:Mode$ CantAttack,CantBlock,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.nonManaAbility | Description$ Enchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
+S:Mode$ CantAttack,CantBlock,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.!ManaAbility | Description$ Enchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
 DeckHas:Ability$LifeGain
 Oracle:Enchant permanent\nWhen Faith's Fetters enters, you gain 4 life.\nEnchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/f/famished_ghoul.txt b/forge-gui/res/cardsfolder/f/famished_ghoul.txt
index 3316d8012e2..ae8af4ca09b 100644
--- a/forge-gui/res/cardsfolder/f/famished_ghoul.txt
+++ b/forge-gui/res/cardsfolder/f/famished_ghoul.txt
@@ -2,6 +2,6 @@ Name:Famished Ghoul
 ManaCost:3 B
 Types:Creature Zombie
 PT:3/2
-A:AB$ ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from a single graveyard.
 AI:RemoveDeck:All
 Oracle:{1}{B}, Sacrifice Famished Ghoul: Exile up to two target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/f/far_wanderings.txt b/forge-gui/res/cardsfolder/f/far_wanderings.txt
index d32ecf108c6..96c324381fc 100644
--- a/forge-gui/res/cardsfolder/f/far_wanderings.txt
+++ b/forge-gui/res/cardsfolder/f/far_wanderings.txt
@@ -1,6 +1,6 @@
 Name:Far Wanderings
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Threshold — If there are seven or more cards in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Threshold — If there are seven or more cards in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
 SVar:X:Count$Threshold.3.1
 Oracle:Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.\nThreshold — If there are seven or more cards in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/farfinder.txt b/forge-gui/res/cardsfolder/f/farfinder.txt
index 02484e75c9b..4b262a19a68 100644
--- a/forge-gui/res/cardsfolder/f/farfinder.txt
+++ b/forge-gui/res/cardsfolder/f/farfinder.txt
@@ -4,5 +4,5 @@ Types:Creature Fox
 PT:1/1
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Vigilance\nWhen Farfinder enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/farhaven_elf.txt b/forge-gui/res/cardsfolder/f/farhaven_elf.txt
index 2e531f3c1aa..32691b84bd2 100644
--- a/forge-gui/res/cardsfolder/f/farhaven_elf.txt
+++ b/forge-gui/res/cardsfolder/f/farhaven_elf.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Farhaven Elf enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/farrels_mantle.txt b/forge-gui/res/cardsfolder/f/farrels_mantle.txt
index ceb3ee09044..3b5bb7e3d17 100644
--- a/forge-gui/res/cardsfolder/f/farrels_mantle.txt
+++ b/forge-gui/res/cardsfolder/f/farrels_mantle.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 T:Mode$ AttackerUnblocked | ValidCard$ Creature.EnchantedBy | Execute$ FarrelDmg | OptionalDecider$ EnchantedController | TriggerDescription$ Whenever enchanted creature attacks and isn't blocked, its controller may have it deal damage equal to its power plus 2 to another target creature. If that player does, the attacking creature assigns no combat damage this turn.
-SVar:FarrelDmg:DB$ DealDamage | ValidTgts$ Creature.NotTriggeredAttacker | TgtPrompt$ Select another target creature | NumDmg$ FarrelX | DamageSource$ TriggeredAttackerLKICopy | SubAbility$ DBNoCombatDamage
+SVar:FarrelDmg:DB$ DealDamage | ValidTgts$ Creature.!TriggeredAttacker | TgtPrompt$ Select another target creature | NumDmg$ FarrelX | DamageSource$ TriggeredAttackerLKICopy | SubAbility$ DBNoCombatDamage
 SVar:DBNoCombatDamage:DB$ Effect | RememberObjects$ TriggeredAttackerLKICopy | StaticAbilities$ SNoCombatDamage | ForgetOnMoved$ Battlefield
 SVar:SNoCombatDamage:Mode$ AssignNoCombatDamage | ValidCard$ Card.IsRemembered | Description$ Remembered creature assigns no combat damage this turn.
 SVar:FarrelX:TriggeredAttacker$CardPower/Plus.2
diff --git a/forge-gui/res/cardsfolder/upcoming/fated_firepower.txt b/forge-gui/res/cardsfolder/f/fated_firepower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fated_firepower.txt
rename to forge-gui/res/cardsfolder/f/fated_firepower.txt
diff --git a/forge-gui/res/cardsfolder/f/faunsbane_troll.txt b/forge-gui/res/cardsfolder/f/faunsbane_troll.txt
index fc94739231d..1ac6a4d8c92 100644
--- a/forge-gui/res/cardsfolder/f/faunsbane_troll.txt
+++ b/forge-gui/res/cardsfolder/f/faunsbane_troll.txt
@@ -4,6 +4,6 @@ Types:Creature Troll
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a Monster Role token attached to it. (Enchanted creature gets +1/+1 and has trample.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ role_monster | AttachedTo$ Self
-A:AB$ Fight | Defined$ Self | Cost$ Sac<1/Aura.Attached> | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | ReplaceDyingDefined$ Targeted | SorcerySpeed$ True | SpellDescription$ CARDNAME fights target creature you don't control. If that creature would die this turn, exile it instead. Activate only as a sorcery.
+A:AB$ Fight | Defined$ Self | Cost$ 1 Sac<1/Aura.Attached> | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | ReplaceDyingDefined$ Targeted | SorcerySpeed$ True | SpellDescription$ CARDNAME fights target creature you don't control. If that creature would die this turn, exile it instead. Activate only as a sorcery.
 DeckHas:Ability$Token|Sacrifice & Type$Aura|Enchantment|Role
 Oracle:When Faunsbane Troll enters, create a Monster Role token attached to it. (Enchanted creature gets +1/+1 and has trample.)\n{1}, Sacrifice an Aura attached to Faunsbane Troll: Faunsbane Troll fights target creature you don't control. If that creature would die this turn, exile it instead. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/f/feral_deathgorger_dusk_sight.txt b/forge-gui/res/cardsfolder/f/feral_deathgorger_dusk_sight.txt
index bbdd236afd8..1588e349e72 100644
--- a/forge-gui/res/cardsfolder/f/feral_deathgorger_dusk_sight.txt
+++ b/forge-gui/res/cardsfolder/f/feral_deathgorger_dusk_sight.txt
@@ -5,7 +5,7 @@ PT:3/5
 K:Flying
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this creature enters, exile up to two target cards from a single graveyard.
-SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card
+SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card
 AlternateMode:Omen
 Oracle:Flying, deathtouch\nWhen this creature enters, exile up to two target cards from a single graveyard.
 
diff --git a/forge-gui/res/cardsfolder/f/fertilid.txt b/forge-gui/res/cardsfolder/f/fertilid.txt
index 8c8f6218f6c..f2cf6ef916f 100644
--- a/forge-gui/res/cardsfolder/f/fertilid.txt
+++ b/forge-gui/res/cardsfolder/f/fertilid.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Elemental
 PT:0/0
 K:etbCounter:P1P1:2
-A:AB$ ChangeZone | Cost$ 1 G SubCounter<1/P1P1> | ValidTgts$ Player | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | Chooser$ Targeted | SpellDescription$ Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles.
+A:AB$ ChangeZone | Cost$ 1 G SubCounter<1/P1P1> | ValidTgts$ Player | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Chooser$ Targeted | SpellDescription$ Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles.
 DeckHas:Ability$Counters
 Oracle:Fertilid enters with two +1/+1 counters on it.\n{1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles.
diff --git a/forge-gui/res/cardsfolder/f/fertilids_favor.txt b/forge-gui/res/cardsfolder/f/fertilids_favor.txt
index 454c67933b3..375bc0a836f 100644
--- a/forge-gui/res/cardsfolder/f/fertilids_favor.txt
+++ b/forge-gui/res/cardsfolder/f/fertilids_favor.txt
@@ -1,7 +1,7 @@
 Name:Fertilid's Favor
 ManaCost:3 G
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Player | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBCounter | Chooser$ Targeted | SpellDescription$ Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles. Put two +1/+1 counters on up to one target artifact or creature.
+A:SP$ ChangeZone | ValidTgts$ Player | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBCounter | Chooser$ Targeted | SpellDescription$ Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles. Put two +1/+1 counters on up to one target artifact or creature.
 SVar:DBCounter:DB$ PutCounter | ValidTgts$ Creature,Artifact | TgtPrompt$ Select up to one target creature or artifact | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 2
 DeckHas:Ability$Counters
 Oracle:Target player searches their library for a basic land card, puts it onto the battlefield tapped, then shuffles. Put two +1/+1 counters on up to one target artifact or creature.
diff --git a/forge-gui/res/cardsfolder/f/field_of_ruin.txt b/forge-gui/res/cardsfolder/f/field_of_ruin.txt
index c7bf2aa8719..7c5b47b1a27 100644
--- a/forge-gui/res/cardsfolder/f/field_of_ruin.txt
+++ b/forge-gui/res/cardsfolder/f/field_of_ruin.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 2 T Sac<1/CARDNAME> | ValidTgts$ Land.nonBasic+OppCtrl | TgtPrompt$ Select target nonbasic land an opponent controls. | SubAbility$ DBSearch | AILogic$ GhostQuarter | SpellDescription$ Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ Player | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ Player | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | StackDescription$ Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library.
 AI:RemoveDeck:Random
 Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles.
diff --git a/forge-gui/res/cardsfolder/f/field_of_the_dead.txt b/forge-gui/res/cardsfolder/f/field_of_the_dead.txt
index 39bd2e04423..d941c9e4fd6 100644
--- a/forge-gui/res/cardsfolder/f/field_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/f/field_of_the_dead.txt
@@ -6,6 +6,6 @@ SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Land.Other+YouCtrl | CheckSVar$ X | SVarCompare$ GE7 | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another land you control enters, if you control seven or more lands with different names, create a 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 DeckHas:Ability$Token
 Oracle:Field of the Dead enters tapped.\n{T}: Add {C}.\nWhenever Field of the Dead or another land you control enters, if you control seven or more lands with different names, create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/f/fiendslayer_paladin.txt b/forge-gui/res/cardsfolder/f/fiendslayer_paladin.txt
index 19b124a74ad..61f9f2dc32d 100644
--- a/forge-gui/res/cardsfolder/f/fiendslayer_paladin.txt
+++ b/forge-gui/res/cardsfolder/f/fiendslayer_paladin.txt
@@ -4,5 +4,5 @@ Types:Creature Human Knight
 PT:2/2
 K:First Strike
 K:Lifelink
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.Black,Card.Red | ValidSA$ Spell | Activator$ Opponent | Description$ CARDNAME can't be the target of black or red spells your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.Black,Card.Red | ValidSA$ Spell | Activator$ Opponent | Description$ CARDNAME can't be the target of black or red spells your opponents control.
 Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nLifelink (Damage dealt by this creature also causes you to gain that much life.)\nFiendslayer Paladin can't be the target of black or red spells your opponents control.
diff --git a/forge-gui/res/cardsfolder/f/finale_of_revelation.txt b/forge-gui/res/cardsfolder/f/finale_of_revelation.txt
index bf83f925a5b..4fd11280949 100644
--- a/forge-gui/res/cardsfolder/f/finale_of_revelation.txt
+++ b/forge-gui/res/cardsfolder/f/finale_of_revelation.txt
@@ -6,6 +6,6 @@ SVar:DBDraw:DB$ Draw | NumCards$ X | SubAbility$ DBUntap | AILogic$ ConsiderPrim
 SVar:DBUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ 5 | SubAbility$ DBEffect | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STHandSize | Duration$ Permanent | SubAbility$ DBChange | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10
 SVar:STHandSize:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ Exile CARDNAME
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ Exile CARDNAME.
 SVar:X:Count$xPaid
 Oracle:Draw X cards. If X is 10 or more, instead shuffle your graveyard into your library, draw X cards, untap up to five lands, and you have no maximum hand size for the rest of the game.\nExile Finale of Revelation.
diff --git a/forge-gui/res/cardsfolder/f/finneas_ace_archer.txt b/forge-gui/res/cardsfolder/f/finneas_ace_archer.txt
index 89a2a7a1788..483b5239bc4 100644
--- a/forge-gui/res/cardsfolder/f/finneas_ace_archer.txt
+++ b/forge-gui/res/cardsfolder/f/finneas_ace_archer.txt
@@ -7,5 +7,5 @@ K:Reach
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on each other creature you control that's a token or a Rabbit. Then if creatures you control have total power 10 or greater, draw a card.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+StrictlyOther+token,Creature.YouCtrl+StrictlyOther+Rabbit | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Vigilance, reach\nWhenever Finneas, Ace Archer attacks, put a +1/+1 counter on each other creature you control that's a token or a Rabbit. Then if creatures you control have total power 10 or greater, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_lord_ozai.txt b/forge-gui/res/cardsfolder/f/fire_lord_ozai.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_lord_ozai.txt
rename to forge-gui/res/cardsfolder/f/fire_lord_ozai.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_lord_zuko.txt b/forge-gui/res/cardsfolder/f/fire_lord_zuko.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/fire_lord_zuko.txt
rename to forge-gui/res/cardsfolder/f/fire_lord_zuko.txt
index 2bb84bf5350..a4dee053bb0 100644
--- a/forge-gui/res/cardsfolder/upcoming/fire_lord_zuko.txt
+++ b/forge-gui/res/cardsfolder/f/fire_lord_zuko.txt
@@ -7,4 +7,4 @@ T:Mode$ SpellCast | ValidCard$ Card.wasCastFromExile | ValidActivatingPlayer$ Yo
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Battlefield | ValidCard$ Permanent.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | Secondary$ True | TriggerDescription$ Whenever you cast a spell from exile and whenever a permanent you control enters from exile, put a +1/+1 counter on each creature you control.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$CardPower
-Oracle:Firebending X, where X is Fire Lord Zuko's power. (Whenever this creature attacks, add X {R}. This mana lasts until end of combat.)\nWhenever you cast a spell from exile and whenever a permanent you control enters from exile, put a +1/+1 counter on each creature you control.
\ No newline at end of file
+Oracle:Firebending X, where X is Fire Lord Zuko's power. (Whenever this creature attacks, add X {R}. This mana lasts until end of combat.)\nWhenever you cast a spell from exile and whenever a permanent you control enters from exile, put a +1/+1 counter on each creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_ambushers.txt b/forge-gui/res/cardsfolder/f/fire_nation_ambushers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_ambushers.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_ambushers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_archers.txt b/forge-gui/res/cardsfolder/f/fire_nation_archers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_archers.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_archers.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_attacks.txt b/forge-gui/res/cardsfolder/f/fire_nation_attacks.txt
similarity index 87%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_attacks.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_attacks.txt
index ccc85675cee..e737dd00894 100644
--- a/forge-gui/res/cardsfolder/upcoming/fire_nation_attacks.txt
+++ b/forge-gui/res/cardsfolder/f/fire_nation_attacks.txt
@@ -3,4 +3,4 @@ ManaCost:4 R
 Types:Instant
 A:SP$ Token | TokenAmount$ 2 | TokenScript$ r_2_2_soldier_firebending_1 | TokenOwner$ You | SpellDescription$ Create two 2/2 red Soldier creature tokens with firebending 1. (Whenever a creature with firebending 1 attacks, add {R}. This mana lasts until end of combat.)
 K:Flashback:8 R
-Oracle:Create two 2/2 red Soldier creature tokens with firebending 1. (Whenever a creature with firebending 1 attacks, add {R}. This mana lasts until end of combat.)\nFlashback {8}{R} (You may may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Oracle:Create two 2/2 red Soldier creature tokens with firebending 1. (Whenever a creature with firebending 1 attacks, add {R}. This mana lasts until end of combat.)\nFlashback {8}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_engineer.txt b/forge-gui/res/cardsfolder/f/fire_nation_engineer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_engineer.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_engineer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_sentinels.txt b/forge-gui/res/cardsfolder/f/fire_nation_sentinels.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_sentinels.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_sentinels.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nation_soldier.txt b/forge-gui/res/cardsfolder/f/fire_nation_soldier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nation_soldier.txt
rename to forge-gui/res/cardsfolder/f/fire_nation_soldier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_nations_conquest.txt b/forge-gui/res/cardsfolder/f/fire_nations_conquest.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/fire_nations_conquest.txt
rename to forge-gui/res/cardsfolder/f/fire_nations_conquest.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/fire_sages.txt b/forge-gui/res/cardsfolder/f/fire_sages.txt
similarity index 93%
rename from forge-gui/res/cardsfolder/upcoming/fire_sages.txt
rename to forge-gui/res/cardsfolder/f/fire_sages.txt
index 6d5863da493..ea44ae2df50 100644
--- a/forge-gui/res/cardsfolder/upcoming/fire_sages.txt
+++ b/forge-gui/res/cardsfolder/f/fire_sages.txt
@@ -4,4 +4,4 @@ Types:Creature Human Cleric
 PT:2/2
 K:Firebending:1
 A:AB$ PutCounter | Cost$ 1 R R | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on this creature.
-Oracle:Firebending 1 (Whenever this creature attacks, add {R}. This mana lasts until end of combat.)\n{1}{R}{R}: Put a +1/+1 counter on this creature.
\ No newline at end of file
+Oracle:Firebending 1 (Whenever this creature attacks, add {R}. This mana lasts until end of combat.)\n{1}{R}{R}: Put a +1/+1 counter on this creature.
diff --git a/forge-gui/res/cardsfolder/f/firebrand_ranger.txt b/forge-gui/res/cardsfolder/f/firebrand_ranger.txt
index 7777bcbea11..2ff329505f3 100644
--- a/forge-gui/res/cardsfolder/f/firebrand_ranger.txt
+++ b/forge-gui/res/cardsfolder/f/firebrand_ranger.txt
@@ -2,5 +2,5 @@ Name:Firebrand Ranger
 ManaCost:1 R
 Types:Creature Human Soldier Ranger
 PT:2/1
-A:AB$ ChangeZone | Cost$ G T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Optional$ You | AILogic$ AtOppEOT | SpellDescription$ You may put a basic land card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ G T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Optional$ You | AILogic$ AtOppEOT | SpellDescription$ You may put a basic land card from your hand onto the battlefield.
 Oracle:{G}, {T}: You may put a basic land card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/first_time_flyer.txt b/forge-gui/res/cardsfolder/f/first_time_flyer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/first_time_flyer.txt
rename to forge-gui/res/cardsfolder/f/first_time_flyer.txt
diff --git a/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt b/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
index 1ff11b2e485..bd2c8391d85 100644
--- a/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
+++ b/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
@@ -2,7 +2,7 @@ Name:Flamescroll Celebrant
 ManaCost:1 R
 Types:Creature Human Shaman
 PT:2/1
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
 AlternateMode:Modal
diff --git a/forge-gui/res/cardsfolder/f/flamewar_brash_veteran_flamewar_streetwise_operative.txt b/forge-gui/res/cardsfolder/f/flamewar_brash_veteran_flamewar_streetwise_operative.txt
index 9b9f9e64a99..604ab696c0c 100644
--- a/forge-gui/res/cardsfolder/f/flamewar_brash_veteran_flamewar_streetwise_operative.txt
+++ b/forge-gui/res/cardsfolder/f/flamewar_brash_veteran_flamewar_streetwise_operative.txt
@@ -4,7 +4,7 @@ Types:Legendary Artifact Creature Robot
 PT:3/2
 K:More Than Meets the Eye:B R
 A:AB$ PutCounter | Cost$ Sac<1/Artifact.Other/another artifact> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SorcerySpeed$ True | SubAbility$ DBConvert | AILogic$ AristocratCounters | SpellDescription$ Put a +1/+1 counter on NICKNAME and convert it. Activate only as a sorcery.
-SVar:DBConvert:DB$ SetState | Mode$ Transform | StackDescription$ Convert NICKNAME
+SVar:DBConvert:DB$ SetState | Mode$ Transform | StackDescription$ Convert NICKNAME.
 A:AB$ ChangeZoneAll | Cost$ 1 Discard<1/Hand> | ChangeType$ Card.YouOwn+counters_GE1_INTEL | Origin$ Exile | Destination$ Hand | SpellDescription$ Put all exiled cards you own with intel counters on them into your hand.
 DeckHints:Ability$Counters
 DeckHas:Ability$Sacrifice|Discard|Counters
diff --git a/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt b/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
index 5a8b310ac30..f6a12c40603 100644
--- a/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
+++ b/forge-gui/res/cardsfolder/f/flare_of_cultivation.txt
@@ -2,7 +2,7 @@ Name:Flare of Cultivation
 ManaCost:1 G G
 Types:Sorcery
 S:Mode$ AlternativeCost | ValidSA$ Spell.Self | EffectZone$ All | Cost$ Sac<1/Creature.Green+!token/a nontoken green creature> | Description$ You may sacrifice a nontoken green creature rather than pay this spell's mana cost.
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/f/flash_thompson_spider_fan.txt b/forge-gui/res/cardsfolder/f/flash_thompson_spider_fan.txt
new file mode 100644
index 00000000000..0d1c34f0961
--- /dev/null
+++ b/forge-gui/res/cardsfolder/f/flash_thompson_spider_fan.txt
@@ -0,0 +1,10 @@
+Name:Flash Thompson, Spider-Fan
+ManaCost:1 W
+Types:Legendary Creature Human Citizen
+PT:2/2
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When NICKNAME enters, ABILITY
+SVar:TrigCharm:DB$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBHeckle,DBHeroWorship
+SVar:DBHeckle:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Heckle — Tap target creature.
+SVar:DBHeroWorship:DB$ Untap | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Hero Worship — Untap target creature.
+Oracle:Flash\nWhen Flash Thompson enters, choose one or both —\n• Heckle — Tap target creature.\n• Hero Worship — Untap target creature.
diff --git a/forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt b/forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt
index 24f2f60d9b1..0960e36a934 100644
--- a/forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt
+++ b/forge-gui/res/cardsfolder/f/flaxen_intruder_welcome_home.txt
@@ -2,8 +2,8 @@ Name:Flaxen Intruder
 ManaCost:G
 Types:Creature Human Berserker
 PT:1/2
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ Trigtrig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may sacrifice it. When you do, destroy target artifact or enchantment.
-SVar:Trigtrig:AB$ ImmediateTrigger | Cost$ Sac<1/CARDNAME> | Execute$ TrigDestroy | TriggerDescription$ When you do, destroy target artifact or enchantment.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigTrig | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may sacrifice it. When you do, destroy target artifact or enchantment.
+SVar:TrigTrig:AB$ ImmediateTrigger | Cost$ Sac<1/CARDNAME> | Execute$ TrigDestroy | TriggerDescription$ When you do, destroy target artifact or enchantment.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment
 AlternateMode:Adventure
 Oracle:Whenever Flaxen Intruder deals combat damage to a player, you may sacrifice it. When you do, destroy target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/f/flood_plain.txt b/forge-gui/res/cardsfolder/f/flood_plain.txt
index af5e7da885d..848180bfe24 100644
--- a/forge-gui/res/cardsfolder/f/flood_plain.txt
+++ b/forge-gui/res/cardsfolder/f/flood_plain.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | SpellDescription$ Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
 Oracle:Flood Plain enters tapped.\n{T}, Sacrifice Flood Plain: Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/flooded_strand.txt b/forge-gui/res/cardsfolder/f/flooded_strand.txt
index f27bf84964c..7861fce53b1 100644
--- a/forge-gui/res/cardsfolder/f/flooded_strand.txt
+++ b/forge-gui/res/cardsfolder/f/flooded_strand.txt
@@ -1,5 +1,5 @@
 Name:Flooded Strand
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Island | SpellDescription$ Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Flooded Strand: Search your library for a Plains or Island card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/flopsie_bumis_buddy.txt b/forge-gui/res/cardsfolder/f/flopsie_bumis_buddy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flopsie_bumis_buddy.txt
rename to forge-gui/res/cardsfolder/f/flopsie_bumis_buddy.txt
diff --git a/forge-gui/res/cardsfolder/f/flourishing_defenses.txt b/forge-gui/res/cardsfolder/f/flourishing_defenses.txt
index 421f603c49d..773ac6bf608 100644
--- a/forge-gui/res/cardsfolder/f/flourishing_defenses.txt
+++ b/forge-gui/res/cardsfolder/f/flourishing_defenses.txt
@@ -1,7 +1,7 @@
 Name:Flourishing Defenses
 ManaCost:4 G
 Types:Enchantment
-T:Mode$ CounterAdded | ValidCard$ Creature | TriggerZones$ Battlefield | CounterType$ M1M1 | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever a -1/-1 counter is put on a creature, create a 1/1 green Elf Warrior creature token.
+T:Mode$ CounterAdded | ValidCard$ Creature | TriggerZones$ Battlefield | CounterType$ M1M1 | Execute$ TrigToken | OptionalDecider$ You | TriggerDescription$ Whenever a -1/-1 counter is put on a creature, you may create a 1/1 green Elf Warrior creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You
 AI:RemoveDeck:Random
 Oracle:Whenever a -1/-1 counter is put on a creature, you may create a 1/1 green Elf Warrior creature token.
diff --git a/forge-gui/res/cardsfolder/f/flower_flourish.txt b/forge-gui/res/cardsfolder/f/flower_flourish.txt
index 0c541acd6c9..6fde17b50d0 100644
--- a/forge-gui/res/cardsfolder/f/flower_flourish.txt
+++ b/forge-gui/res/cardsfolder/f/flower_flourish.txt
@@ -1,7 +1,7 @@
 Name:Flower
 ManaCost:GW
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Forest or Plains card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Forest.Basic,Plains.Basic | ChangeTypeDesc$ basic Forest or Plains | SpellDescription$ Search your library for a basic Forest or Plains card, reveal it, put it into your hand, then shuffle.
 AlternateMode:Split
 Oracle:Search your library for a basic Forest or Plains card, reveal it, put it into your hand, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/upcoming/flying_dolphin_fish.txt b/forge-gui/res/cardsfolder/f/flying_dolphin_fish.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flying_dolphin_fish.txt
rename to forge-gui/res/cardsfolder/f/flying_dolphin_fish.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/flying_octobot.txt b/forge-gui/res/cardsfolder/f/flying_octobot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/flying_octobot.txt
rename to forge-gui/res/cardsfolder/f/flying_octobot.txt
diff --git a/forge-gui/res/cardsfolder/f/font_of_fertility.txt b/forge-gui/res/cardsfolder/f/font_of_fertility.txt
index 0a5b76a6873..fe2736142ee 100644
--- a/forge-gui/res/cardsfolder/f/font_of_fertility.txt
+++ b/forge-gui/res/cardsfolder/f/font_of_fertility.txt
@@ -1,5 +1,5 @@
 Name:Font of Fertility
 ManaCost:G
 Types:Enchantment
-A:AB$ ChangeZone | Cost$ 1 G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped, then shuffle.
 Oracle:{1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/footsteps_of_the_goryo.txt b/forge-gui/res/cardsfolder/f/footsteps_of_the_goryo.txt
index 77892ccf224..20c483986c0 100644
--- a/forge-gui/res/cardsfolder/f/footsteps_of_the_goryo.txt
+++ b/forge-gui/res/cardsfolder/f/footsteps_of_the_goryo.txt
@@ -1,7 +1,6 @@
 Name:Footsteps of the Goryo
 ManaCost:2 B
 Types:Sorcery Arcane
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | SubAbility$ DBPump | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | AtEOT$ Sacrifice
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | GainControl$ True | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
 AI:RemoveDeck:Random
 Oracle:Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/f/forceful_cultivator.txt b/forge-gui/res/cardsfolder/f/forceful_cultivator.txt
index 61d74845f10..42b203bdf6e 100644
--- a/forge-gui/res/cardsfolder/f/forceful_cultivator.txt
+++ b/forge-gui/res/cardsfolder/f/forceful_cultivator.txt
@@ -4,5 +4,5 @@ Types:Creature Snake Shaman
 PT:2/3
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Land.YouOwn | PresentZone$ Hand | PresentCompare$ EQ0 | Description$ This spell costs {2} less to cast if there are no land cards in your hand.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:This spell costs {2} less to cast if there are no land cards in your hand.\nWhen Forceful Cultivator enters, search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/foreboding_landscape.txt b/forge-gui/res/cardsfolder/f/foreboding_landscape.txt
index 34b38bcd9f5..fac61eea1f9 100644
--- a/forge-gui/res/cardsfolder/f/foreboding_landscape.txt
+++ b/forge-gui/res/cardsfolder/f/foreboding_landscape.txt
@@ -2,6 +2,6 @@ Name:Foreboding Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Forest+Basic,Land.Island+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Swamp, Forest, or Island card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Swamp.Basic,Forest.Basic,Island.Basic | ChangeTypeDesc$ basic Swamp, Forest, or Island | SpellDescription$ Search your library for a basic Swamp, Forest, or Island card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:B G U
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Foreboding Landscape: Search your library for a basic Swamp, Forest, or Island card, put it onto the battlefield tapped, then shuffle.\nCycling {B}{G}{U} ({B}{G}{U}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/f/forestfolk.txt b/forge-gui/res/cardsfolder/f/forestfolk.txt
index 8b6286097c4..c5daf467c49 100644
--- a/forge-gui/res/cardsfolder/f/forestfolk.txt
+++ b/forge-gui/res/cardsfolder/f/forestfolk.txt
@@ -3,7 +3,7 @@ ManaCost:2 G U
 Types:Creature Elf Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ TriggeredCardController | NumCards$ 1
 SVar:SacMe:1
diff --git a/forge-gui/res/cardsfolder/f/fork_in_the_road.txt b/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
index 4c28cc25c8a..5d093a7b355 100644
--- a/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
+++ b/forge-gui/res/cardsfolder/f/fork_in_the_road.txt
@@ -1,7 +1,7 @@
 Name:Fork in the Road
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards and reveal them. Put one into your hand and the other into your graveyard. Then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic+IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Land.Basic+IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your graveyard | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/f/fountainport_bell.txt b/forge-gui/res/cardsfolder/f/fountainport_bell.txt
index d8cf86af6ce..d7bfe43acd8 100644
--- a/forge-gui/res/cardsfolder/f/fountainport_bell.txt
+++ b/forge-gui/res/cardsfolder/f/fountainport_bell.txt
@@ -2,6 +2,6 @@ Name:Fountainport Bell
 ManaCost:1
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 A:AB$ Draw | Cost$ 1 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:When Fountainport Bell enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.\n{1}, Sacrifice Fountainport Bell: Draw a card.
diff --git a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
index dd2d294c307..2a666c18e96 100644
--- a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
+++ b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
@@ -4,8 +4,8 @@ Types:Creature Zombie
 PT:0/1
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ExileCreature | Description$ As CARDNAME enters, exile X creature cards from your graveyard. If you can't, put CARDNAME into its owner's graveyard instead of onto the battlefield. For each creature card exiled this way, CARDNAME enters with a +2/+0, +1/+1, or +0/+2 counter on it.
 SVar:ExileCreature:DB$ ChooseCard | ETB$ True | Choices$ Creature.YouOwn+NotDefinedReplacedSimultaneousETB | ChoiceZone$ Graveyard | Amount$ X | Mandatory$ True | ConditionCheckSVar$ CheckYard | ConditionSVarCompare$ GEX | SubAbility$ DBExile
-SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ Movetoyard
-SVar:Movetoyard:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Graveyard | Defined$ Self | ConditionCheckSVar$ CheckExiled | ConditionSVarCompare$ LTX | Imprint$ True | ETB$ True | SubAbility$ DBChooseCounter
+SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ MoveToYard
+SVar:MoveToYard:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Graveyard | Defined$ Self | ConditionCheckSVar$ CheckExiled | ConditionSVarCompare$ LTX | Imprint$ True | ETB$ True | SubAbility$ DBChooseCounter
 SVar:DBChooseCounter:DB$ PutCounter | CounterTypes$ P2P0,P1P1,P0P2 | CounterNum$ X | SplitAmount$ True | ETB$ True | ConditionDefined$ Imprinted | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBUpdate
 SVar:DBUpdate:DB$ ReplaceEffect | ConditionDefined$ Imprinted | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
diff --git a/forge-gui/res/cardsfolder/f/frenzied_tilling.txt b/forge-gui/res/cardsfolder/f/frenzied_tilling.txt
index 20952793f12..d7597aec863 100644
--- a/forge-gui/res/cardsfolder/f/frenzied_tilling.txt
+++ b/forge-gui/res/cardsfolder/f/frenzied_tilling.txt
@@ -2,5 +2,5 @@ Name:Frenzied Tilling
 ManaCost:3 R G
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBSearch | SpellDescription$ Destroy target land. Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True
 Oracle:Destroy target land. Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/friendly_neighborhood.txt b/forge-gui/res/cardsfolder/f/friendly_neighborhood.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/friendly_neighborhood.txt
rename to forge-gui/res/cardsfolder/f/friendly_neighborhood.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/frog_squirrels.txt b/forge-gui/res/cardsfolder/f/frog_squirrels.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/frog_squirrels.txt
rename to forge-gui/res/cardsfolder/f/frog_squirrels.txt
diff --git a/forge-gui/res/cardsfolder/f/from_the_ashes.txt b/forge-gui/res/cardsfolder/f/from_the_ashes.txt
index 90107398379..06a2707881b 100644
--- a/forge-gui/res/cardsfolder/f/from_the_ashes.txt
+++ b/forge-gui/res/cardsfolder/f/from_the_ashes.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Sorcery
 A:SP$ DestroyAll | ValidCards$ Land.nonBasic | RememberDestroyed$ True | SubAbility$ DBRepeat | SpellDescription$ Destroy all nonbasic lands. For each land destroyed this way, its controller may search their library for a basic land card and put it onto the battlefield. Then each player who searched their library this way shuffles.
 SVar:DBRepeat:DB$ RepeatEach | UseImprinted$ True | DefinedCards$ DirectRemembered | RepeatSubAbility$ DBSearch | SubAbility$ DBShuffle
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | RememberChanged$ True | DefinedPlayer$ ImprintedController | Chooser$ ImprintedController | NoShuffle$ True | Optional$ True
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | DefinedPlayer$ ImprintedController | Chooser$ ImprintedController | NoShuffle$ True | Optional$ True
 SVar:DBShuffle:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ShuffleSearched | SubAbility$ DBCleanup
 SVar:ShuffleSearched:DB$ Shuffle | Defined$ Player.IsRemembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
 SVar:X:Count$Valid Card.IsRemembered+RememberedPlayerCtrl
diff --git a/forge-gui/res/cardsfolder/f/frontier_guide.txt b/forge-gui/res/cardsfolder/f/frontier_guide.txt
index d127259f69f..f2f9b6cd5e8 100644
--- a/forge-gui/res/cardsfolder/f/frontier_guide.txt
+++ b/forge-gui/res/cardsfolder/f/frontier_guide.txt
@@ -2,5 +2,5 @@ Name:Frontier Guide
 ManaCost:1 G
 Types:Creature Elf Scout
 PT:1/1
-A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{3}{G}, {T}: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/f/fungal_colossus.txt b/forge-gui/res/cardsfolder/f/fungal_colossus.txt
index 54d0be698a6..0409a9e823e 100644
--- a/forge-gui/res/cardsfolder/f/fungal_colossus.txt
+++ b/forge-gui/res/cardsfolder/f/fungal_colossus.txt
@@ -3,5 +3,5 @@ ManaCost:6 G
 Types:Creature Fungus Beast
 PT:5/5
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the number of differently named lands you control.
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 Oracle:This spell costs {X} less to cast, where X is the number of differently named lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/future_flight.txt b/forge-gui/res/cardsfolder/f/future_flight.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/future_flight.txt
rename to forge-gui/res/cardsfolder/f/future_flight.txt
diff --git a/forge-gui/res/cardsfolder/g/gaeas_liege.txt b/forge-gui/res/cardsfolder/g/gaeas_liege.txt
index a39be798793..74135634aba 100644
--- a/forge-gui/res/cardsfolder/g/gaeas_liege.txt
+++ b/forge-gui/res/cardsfolder/g/gaeas_liege.txt
@@ -2,7 +2,7 @@ Name:Gaea's Liege
 ManaCost:3 G G G
 Types:Creature Avatar
 PT:*/*
-S:Mode$ Continuous | CharacteristicDefining$ True | IsPresent$ Card.Self+notattacking | SetPower$ X | SetToughness$ X | Description$ As long as CARDNAME isn't attacking, its power and toughness are each equal to the number of Forests you control. As long as CARDNAME is attacking, its power and toughness are each equal to the number of Forests defending player controls.
+S:Mode$ Continuous | CharacteristicDefining$ True | IsPresent$ Card.Self+!attacking | SetPower$ X | SetToughness$ X | Description$ As long as CARDNAME isn't attacking, its power and toughness are each equal to the number of Forests you control. As long as CARDNAME is attacking, its power and toughness are each equal to the number of Forests defending player controls.
 SVar:X:Count$Valid Forest.YouCtrl
 S:Mode$ Continuous | CharacteristicDefining$ True | IsPresent$ Card.Self+attacking | SetPower$ Y | SetToughness$ Y
 SVar:Y:Count$Valid Forest.DefenderCtrl
diff --git a/forge-gui/res/cardsfolder/g/gaeas_revenge.txt b/forge-gui/res/cardsfolder/g/gaeas_revenge.txt
index e5e40f30116..0ccff68d102 100644
--- a/forge-gui/res/cardsfolder/g/gaeas_revenge.txt
+++ b/forge-gui/res/cardsfolder/g/gaeas_revenge.txt
@@ -4,5 +4,5 @@ Types:Creature Elemental
 PT:8/5
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
 K:Haste
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.nonGreen | Description$ CARDNAME can't be the target of nongreen spells or abilities from nongreen sources.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.nonGreen | Description$ CARDNAME can't be the target of nongreen spells or abilities from nongreen sources.
 Oracle:This spell can't be countered.\nHaste\nGaea's Revenge can't be the target of nongreen spells or abilities from nongreen sources.
diff --git a/forge-gui/res/cardsfolder/g/gallant_citizen.txt b/forge-gui/res/cardsfolder/g/gallant_citizen.txt
new file mode 100644
index 00000000000..fdb99dd217d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/g/gallant_citizen.txt
@@ -0,0 +1,7 @@
+Name:Gallant Citizen
+ManaCost:GW GW
+Types:Creature Human Citizen
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature enters, draw a card.
+SVar:TrigDraw:DB$ Draw
+Oracle:When this creature enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/g/geomancers_gambit.txt b/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
index 69bf863a9f1..8a6d5783574 100644
--- a/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
+++ b/forge-gui/res/cardsfolder/g/geomancers_gambit.txt
@@ -2,6 +2,6 @@ Name:Geomancer's Gambit
 ManaCost:2 R
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt b/forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt
index 6537785e945..8776f598cf7 100644
--- a/forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt
+++ b/forge-gui/res/cardsfolder/g/geralf_the_fleshwright.txt
@@ -6,7 +6,7 @@ T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | ValidActivatingPlayer$ You | Trigg
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ub_2_2_zombie_rogue | TokenOwner$ You
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Zombie.YouCtrl | Execute$ DBPutCounter | TriggerDescription$ Whenever a Zombie you control enters, put a +1/+1 counter on it for each other Zombie that entered the battlefield under your control this turn.
 SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterNum$ X | CounterType$ P1P1
-SVar:X:Count$ThisTurnEntered_Battlefield_Zombie.YouCtrl+NotTriggeredCard
+SVar:X:Count$ThisTurnEntered_Battlefield_Zombie.YouCtrl+!TriggeredCard
 DeckHas:Ability$Token|Counters & Type$Zombie|Rogue & Color$Black
 DeckHints:Type$Zombie
 Oracle:Whenever you cast a spell during your turn other than your first spell that turn, create a 2/2 blue and black Zombie Rogue creature token.\nWhenever a Zombie you control enters, put a +1/+1 counter on it for each other Zombie that entered the battlefield under your control this turn.
diff --git a/forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt b/forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt
index 87a39b29bcd..1f60b409986 100644
--- a/forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt
+++ b/forge-gui/res/cardsfolder/g/ghalta_primal_hunger.txt
@@ -4,5 +4,5 @@ Types:Legendary Creature Elder Dinosaur
 PT:12/12
 K:Trample
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the total power of creatures you control.
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 Oracle:This spell costs {X} less to cast, where X is the total power of creatures you control.\nTrample
diff --git a/forge-gui/res/cardsfolder/g/ghost_quarter.txt b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
index f239fef961c..a785783c29c 100644
--- a/forge-gui/res/cardsfolder/g/ghost_quarter.txt
+++ b/forge-gui/res/cardsfolder/g/ghost_quarter.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBChange | AILogic$ GhostQuarter | AITgts$ Land.nonBasic | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 AI:RemoveDeck:Random
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_spider_gwen_stacy.txt b/forge-gui/res/cardsfolder/g/ghost_spider_gwen_stacy.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ghost_spider_gwen_stacy.txt
rename to forge-gui/res/cardsfolder/g/ghost_spider_gwen_stacy.txt
diff --git a/forge-gui/res/cardsfolder/g/giant_ladybug.txt b/forge-gui/res/cardsfolder/g/giant_ladybug.txt
index bab6095c03c..5c430428883 100644
--- a/forge-gui/res/cardsfolder/g/giant_ladybug.txt
+++ b/forge-gui/res/cardsfolder/g/giant_ladybug.txt
@@ -4,5 +4,5 @@ Types:Creature Insect
 PT:4/1
 K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Reach\nWhen Giant Ladybug enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/upcoming/gilacorn.txt b/forge-gui/res/cardsfolder/g/gilacorn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gilacorn.txt
rename to forge-gui/res/cardsfolder/g/gilacorn.txt
diff --git a/forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt b/forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt
index 9aa3b8aa800..125325c25f2 100644
--- a/forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt
+++ b/forge-gui/res/cardsfolder/g/gimbal_gremlin_prodigy.txt
@@ -7,7 +7,7 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigToken:DB$ Token | TokenScript$ r_0_0_a_gremlin | RememberTokens$ True | SubAbility$ DBCounters
 SVar:DBCounters:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Artifact.YouCtrl+inZoneBattlefield+token
+SVar:X:Count$Valid Artifact.YouCtrl+token$DifferentCardNames
 DeckHas:Ability$Token|Counters
 DeckHints:Type$Artifact & Ability$Token
 Oracle:Artifact creatures you control have trample.\nAt the beginning of your end step, create a 0/0 red Gremlin artifact creature token. Put X +1/+1 counters on it, where X is the number of differently named artifact tokens you control.
diff --git a/forge-gui/res/cardsfolder/g/gimlis_reckless_might.txt b/forge-gui/res/cardsfolder/g/gimlis_reckless_might.txt
index 3d0b1c5fbc5..371f1e87d96 100644
--- a/forge-gui/res/cardsfolder/g/gimlis_reckless_might.txt
+++ b/forge-gui/res/cardsfolder/g/gimlis_reckless_might.txt
@@ -5,7 +5,7 @@ S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Haste | Descriptio
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE8 | Execute$ TrigFight | TriggerDescription$ Formidable — Whenever you attack, if creatures you control have total power 8 or greater, target attacking creature you control fights up to one target creature you don't control.
 SVar:TrigFight:DB$ Pump | ValidTgts$ Creature.YouCtrl+attacking | AILogic$ Fight | TgtPrompt$ Select target attacking creature you control | SubAbility$ DBFight
 SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you don't control
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 SVar:BuffedBy:Creature
 SVar:NonStackingEffect:True
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/g/glade_watcher.txt b/forge-gui/res/cardsfolder/g/glade_watcher.txt
index a657890ed4d..322c8000ff4 100644
--- a/forge-gui/res/cardsfolder/g/glade_watcher.txt
+++ b/forge-gui/res/cardsfolder/g/glade_watcher.txt
@@ -5,5 +5,5 @@ PT:3/3
 K:Defender
 A:AB$ Effect | Cost$ G | StaticAbilities$ CanAttack | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | SpellDescription$ CARDNAME can attack this turn as though it didn't have defender. Activate only if creatures you control have total power 8 or greater.
 SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.EffectSource | Description$ EFFECTSOURCE can attack this turn as though it didn't have defender.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Defender\nFormidable — {G}: Glade Watcher can attack this turn as though it didn't have defender. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/glider_kids.txt b/forge-gui/res/cardsfolder/g/glider_kids.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/glider_kids.txt
rename to forge-gui/res/cardsfolder/g/glider_kids.txt
diff --git a/forge-gui/res/cardsfolder/g/gloom_stalker.txt b/forge-gui/res/cardsfolder/g/gloom_stalker.txt
index c033e830b2a..455e3bcfcd1 100644
--- a/forge-gui/res/cardsfolder/g/gloom_stalker.txt
+++ b/forge-gui/res/cardsfolder/g/gloom_stalker.txt
@@ -3,5 +3,5 @@ ManaCost:2 W
 Types:Creature Dwarf Ranger
 PT:2/3
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you've completed a dungeon, CARDNAME has double strike.
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:As long as you've completed a dungeon, Gloom Stalker has double strike.
diff --git a/forge-gui/res/cardsfolder/g/glowspore_shaman.txt b/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
index ae4401e5ad0..1d33f120b31 100644
--- a/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
+++ b/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
@@ -4,6 +4,6 @@ Types:Creature Elf Shaman
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill three cards. You may put a land card from your graveyard on top of your library.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | OptionalDecider$ You | ChangeType$ Land.YouOwn | ChangeNum$ 1 | Hidden$ True | Optional$ True
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | ChangeType$ Land.YouOwn | ChangeNum$ 1 | Hidden$ True | Optional$ True
 DeckHas:Ability$Graveyard
 Oracle:When Glowspore Shaman enters, mill three cards. You may put a land card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/g/gnoll_hunter.txt b/forge-gui/res/cardsfolder/g/gnoll_hunter.txt
index a452f8ba51d..a8ffd3ef220 100644
--- a/forge-gui/res/cardsfolder/g/gnoll_hunter.txt
+++ b/forge-gui/res/cardsfolder/g/gnoll_hunter.txt
@@ -4,6 +4,6 @@ Types:Creature Gnoll
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 DeckHas:Ability$Counters
 Oracle:Pack tactics — Whenever Gnoll Hunter attacks, if you attacked with creatures with total power 6 or greater this combat, put a +1/+1 counter on Gnoll Hunter.
diff --git a/forge-gui/res/cardsfolder/g/go_forth.txt b/forge-gui/res/cardsfolder/g/go_forth.txt
index 230607bacf7..4fa42016702 100644
--- a/forge-gui/res/cardsfolder/g/go_forth.txt
+++ b/forge-gui/res/cardsfolder/g/go_forth.txt
@@ -2,6 +2,6 @@ Name:Go Forth
 ManaCost:G
 Types:Instant
 A:SP$ Charm | Choices$ DBSearch,DBPump | CharmNum$ 1
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 Oracle:Choose one —\n• Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n• Target creature gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt b/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt
index 3cd98da801c..a82c0b6b33b 100644
--- a/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt
+++ b/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt
@@ -3,8 +3,8 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ TrigTap | AddSVar$ HieroTap & HasAttackEffect | Description$ Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls."
-SVar:TrigTap:Mode$ Attacks | ValidCard$ Card.Self | Execute$ HieroTap | TriggerDescription$ Whenever this creature attacks, tap target creature defending player controls.
-SVar:HieroTap:DB$ Tap | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls
-SVar:HasAttackEffect:TRUE
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ AttackTrig | AddSVar$ AE | Description$ Enchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls."
+SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever this creature attacks, tap target creature defending player controls.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls
+SVar:AE:SVar:HasAttackEffect:TRUE
 Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has "Whenever this creature attacks, tap target creature defending player controls."
diff --git a/forge-gui/res/cardsfolder/g/grasslands.txt b/forge-gui/res/cardsfolder/g/grasslands.txt
index 74bd3afc184..de704bdb6f0 100644
--- a/forge-gui/res/cardsfolder/g/grasslands.txt
+++ b/forge-gui/res/cardsfolder/g/grasslands.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | SpellDescription$ Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
 Oracle:Grasslands enters tapped.\n{T}, Sacrifice Grasslands: Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/g/grave_strength.txt b/forge-gui/res/cardsfolder/g/grave_strength.txt
index c21d32cd380..b8dc01cedef 100644
--- a/forge-gui/res/cardsfolder/g/grave_strength.txt
+++ b/forge-gui/res/cardsfolder/g/grave_strength.txt
@@ -1,8 +1,9 @@
 Name:Grave Strength
 ManaCost:1 B
 Types:Sorcery
-A:SP$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBPutCounter | AILogic$ Main1 | SpellDescription$ Choose target creature. Mill three cards, then put a +1/+1 counter on that creature for each creature card in your graveyard.
+A:SP$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBPutCounter | SpellDescription$ Choose target creature. Mill three cards, then put a +1/+1 counter on that creature for each creature card in your graveyard.
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ X
 SVar:X:Count$ValidGraveyard Creature.YouOwn
 DeckHas:Ability$Graveyard
+SVar:PlayMain1:TRUE
 Oracle:Choose target creature. Mill three cards, then put a +1/+1 counter on that creature for each creature card in your graveyard.
diff --git a/forge-gui/res/cardsfolder/g/gravegouger.txt b/forge-gui/res/cardsfolder/g/gravegouger.txt
index 009cc72f4c2..dcf6ec9b658 100644
--- a/forge-gui/res/cardsfolder/g/gravegouger.txt
+++ b/forge-gui/res/cardsfolder/g/gravegouger.txt
@@ -4,6 +4,6 @@ Types:Creature Nightmare Horror
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile up to two target cards from a single graveyard.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, return the exiled cards to their owner's graveyard.
-SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | RememberTargets$ True | ForgetOtherTargets$ True
+SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | RememberTargets$ True | ForgetOtherTargets$ True
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Graveyard
 Oracle:When Gravegouger enters, exile up to two target cards from a single graveyard.\nWhen Gravegouger leaves the battlefield, return the exiled cards to their owner's graveyard.
diff --git a/forge-gui/res/cardsfolder/g/greater_tanuki.txt b/forge-gui/res/cardsfolder/g/greater_tanuki.txt
index d86c1786efa..948fb996178 100644
--- a/forge-gui/res/cardsfolder/g/greater_tanuki.txt
+++ b/forge-gui/res/cardsfolder/g/greater_tanuki.txt
@@ -3,6 +3,6 @@ ManaCost:4 G G
 Types:Enchantment Creature Dog
 PT:6/5
 K:Trample
-A:AB$ ChangeZone | PrecostDesc$ Channel — | Cost$ 2 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | PrecostDesc$ Channel — | Cost$ 2 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 DeckHas:Ability$Discard
 Oracle:Trample\nChannel — {2}{G}, Discard Greater Tanuki: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/green_goblin_revenant.txt b/forge-gui/res/cardsfolder/g/green_goblin_revenant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/green_goblin_revenant.txt
rename to forge-gui/res/cardsfolder/g/green_goblin_revenant.txt
diff --git a/forge-gui/res/cardsfolder/g/greenseeker.txt b/forge-gui/res/cardsfolder/g/greenseeker.txt
index 8f0bfc2533e..f717290a627 100644
--- a/forge-gui/res/cardsfolder/g/greenseeker.txt
+++ b/forge-gui/res/cardsfolder/g/greenseeker.txt
@@ -2,6 +2,6 @@ Name:Greenseeker
 ManaCost:G
 Types:Creature Elf Spellshaper
 PT:1/1
-A:AB$ ChangeZone | Cost$ G T Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ G T Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 AI:RemoveDeck:All
 Oracle:{G}, {T}, Discard a card: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/grendel_spawn_of_knull.txt b/forge-gui/res/cardsfolder/g/grendel_spawn_of_knull.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grendel_spawn_of_knull.txt
rename to forge-gui/res/cardsfolder/g/grendel_spawn_of_knull.txt
diff --git a/forge-gui/res/cardsfolder/g/griffnaut_tracker.txt b/forge-gui/res/cardsfolder/g/griffnaut_tracker.txt
index 99e6f0c2a7d..9bd4213d0f7 100644
--- a/forge-gui/res/cardsfolder/g/griffnaut_tracker.txt
+++ b/forge-gui/res/cardsfolder/g/griffnaut_tracker.txt
@@ -4,6 +4,6 @@ Types:Creature Human Detective
 PT:3/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, exile up to two target cards from a single graveyard.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard
+SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard
 DeckHas:Ability$Graveyard
 Oracle:Flying\nWhen Griffnaut Tracker enters, exile up to two target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
index ed2aa2199f1..a0ad6cc5d69 100644
--- a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
+++ b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
@@ -1,7 +1,7 @@
 Name:Grip of Chaos
 ManaCost:4 R R
 Types:Enchantment
-T:Mode$ SpellAbilityCast | ValidSA$ SpellAbility.nonManaAbility | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
+T:Mode$ SpellAbilityCast | ValidSA$ SpellAbility.!ManaAbility | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
 T:Mode$ SpellAbilityCopy | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | Secondary$ True | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
 SVar:TrigChangeTarget:DB$ ChangeTargets | Defined$ TriggeredSpellAbility | RandomTarget$ True
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/g/grishnakh_brash_instigator.txt b/forge-gui/res/cardsfolder/g/grishnakh_brash_instigator.txt
index d3123cc9d83..16869bce724 100644
--- a/forge-gui/res/cardsfolder/g/grishnakh_brash_instigator.txt
+++ b/forge-gui/res/cardsfolder/g/grishnakh_brash_instigator.txt
@@ -9,5 +9,5 @@ SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Creature.nonLegendary+powerLEX
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:TriggerRemembered$CardPower
 DeckHas:Ability$Token|Counters & Type$Orc|Army
-DeckHints:Type$Token
+DeckHints:Ability$Token
 Oracle:When Grishnákh, Brash Instigator enters, amass Orcs 2. When you do, until end of turn, gain control of target nonlegendary creature an opponent controls with power less than or equal to the amassed Army's power. Untap that creature. It gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/grixis_panorama.txt b/forge-gui/res/cardsfolder/g/grixis_panorama.txt
index 9128052e71e..1e46036959f 100644
--- a/forge-gui/res/cardsfolder/g/grixis_panorama.txt
+++ b/forge-gui/res/cardsfolder/g/grixis_panorama.txt
@@ -2,5 +2,5 @@ Name:Grixis Panorama
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Island+Basic,Land.Swamp+Basic,Land.Mountain+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Island.Basic,Swamp.Basic,Mountain.Basic | ChangeTypeDesc$ basic Island, Swamp, or Mountain | SpellDescription$ Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Grixis Panorama: Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/grow_extra_arms.txt b/forge-gui/res/cardsfolder/g/grow_extra_arms.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/grow_extra_arms.txt
rename to forge-gui/res/cardsfolder/g/grow_extra_arms.txt
diff --git a/forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt b/forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt
index 5d65cc68226..eb7d1eb63ae 100644
--- a/forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt
+++ b/forge-gui/res/cardsfolder/g/grow_from_the_ashes.txt
@@ -2,6 +2,6 @@ Name:Grow from the Ashes
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:2
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle.
 SVar:X:Count$Kicked.2.1
 Oracle:Kicker {2} (You may pay an additional {2} as you cast this spell.)\nSearch your library for a basic land card, put it onto the battlefield, then shuffle. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/g/growth_charm.txt b/forge-gui/res/cardsfolder/g/growth_charm.txt
index 9336bc70fdb..db5fd0d4bb7 100644
--- a/forge-gui/res/cardsfolder/g/growth_charm.txt
+++ b/forge-gui/res/cardsfolder/g/growth_charm.txt
@@ -2,7 +2,7 @@ Name:Growth Charm
 ManaCost:1 G G
 Types:Instant
 A:SP$ Charm | Choices$ DBRamp,DBGiant,DBRegrow | Defined$ You
-SVar:DBRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
+SVar:DBRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
 SVar:DBGiant:DB$ Pump | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
 SVar:DBRegrow:DB$ ChangeZone | Cost$ 1 G | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouCtrl | SpellDescription$ Return target card from your graveyard to your hand.
 Oracle:Choose one —\n• Rampant Growth\n• Giant Growth\n• Regrowth
diff --git a/forge-gui/res/cardsfolder/g/growth_spasm.txt b/forge-gui/res/cardsfolder/g/growth_spasm.txt
index 242a42e4c01..e0aeec9d04e 100644
--- a/forge-gui/res/cardsfolder/g/growth_spasm.txt
+++ b/forge-gui/res/cardsfolder/g/growth_spasm.txt
@@ -1,7 +1,7 @@
 Name:Growth Spasm
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | SpellDescription$ Create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
diff --git a/forge-gui/res/cardsfolder/g/gryffs_boon.txt b/forge-gui/res/cardsfolder/g/gryffs_boon.txt
index 0aadaff4fb1..323abdef6fb 100644
--- a/forge-gui/res/cardsfolder/g/gryffs_boon.txt
+++ b/forge-gui/res/cardsfolder/g/gryffs_boon.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+0 and has flying.
-A:AB$ Pump | Cost$ 3 W | ActivationZone$ Graveyard | ValidTgts$ Creature | SorcerySpeed$ True | TgtPrompt$ Choose a creature | SubAbility$ DBChange | SpellDescription$ Return CARDNAME from your graveyard to the battlefield attached to target creature. Activate only any time you could cast a sorcery. | StackDescription$ SpellDescription
-SVar:DBChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ ParentTarget | SpellDescription$ | StackDescription$ SpellDescription
+A:AB$ Pump | Cost$ 3 W | ActivationZone$ Graveyard | ValidTgts$ Creature | SorcerySpeed$ True | TgtPrompt$ Choose a creature | SubAbility$ DBChange | StackDescription$ REP Return_{p:You} returns & from your_from their & to target creature. Activate only as a sorcery._to {c:Targeted}. | SpellDescription$ Return CARDNAME from your graveyard to the battlefield attached to target creature. Activate only as a sorcery.
+SVar:DBChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | AttachedTo$ ParentTarget | StackDescription$ None
 Oracle:Enchant creature\nEnchanted creature gets +1/+0 and has flying.\n{3}{W}: Return Gryff's Boon from your graveyard to the battlefield attached to target creature. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/g/guildsworn_prowler.txt b/forge-gui/res/cardsfolder/g/guildsworn_prowler.txt
index 70060ab91d8..64884b3d96f 100644
--- a/forge-gui/res/cardsfolder/g/guildsworn_prowler.txt
+++ b/forge-gui/res/cardsfolder/g/guildsworn_prowler.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Creature Tiefling Rogue Assassin
 PT:2/1
 K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+notblocking | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, if it wasn't blocking, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+!blocking | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, if it wasn't blocking, draw a card.
 SVar:TrigDraw:DB$ Draw
 Oracle:Deathtouch\nWhen Guildsworn Prowler dies, if it wasn't blocking, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/guy_in_the_chair.txt b/forge-gui/res/cardsfolder/g/guy_in_the_chair.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/guy_in_the_chair.txt
rename to forge-gui/res/cardsfolder/g/guy_in_the_chair.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/gwen_stacy_ghost_spider.txt b/forge-gui/res/cardsfolder/g/gwen_stacy_ghost_spider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gwen_stacy_ghost_spider.txt
rename to forge-gui/res/cardsfolder/g/gwen_stacy_ghost_spider.txt
diff --git a/forge-gui/res/cardsfolder/g/gwenom_remorseless.txt b/forge-gui/res/cardsfolder/g/gwenom_remorseless.txt
new file mode 100644
index 00000000000..a4ffef44a94
--- /dev/null
+++ b/forge-gui/res/cardsfolder/g/gwenom_remorseless.txt
@@ -0,0 +1,11 @@
+Name:Gwenom, Remorseless
+ManaCost:3 B B
+Types:Legendary Creature Symbiote Spider Hero
+PT:4/4
+K:Deathtouch
+K:Lifelink
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Whenever NICKNAME attacks, until end of turn, you may look at the top card of your library any time and you may play cards from the top of your library. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
+SVar:TrigEffect:DB$ Effect | StaticAbilities$ MayLookAndPlay | Description$ Until end of turn, you may look at the top card of your library any time and you may play cards from the top of your library. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
+SVar:MayLookAndPlay:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ You | MayPlay$ True | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | Description$ You may look at the top card of your library any time and you may play cards from the top of your library. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
+SVar:HasAttackEffect:TRUE
+Oracle:Deathtouch, lifelink\nWhenever Gwenom attacks, until end of turn, you may look at the top card of your library any time and you may play cards from the top of your library. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
diff --git a/forge-gui/res/cardsfolder/upcoming/hakoda_selfless_commander.txt b/forge-gui/res/cardsfolder/h/hakoda_selfless_commander.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hakoda_selfless_commander.txt
rename to forge-gui/res/cardsfolder/h/hakoda_selfless_commander.txt
diff --git a/forge-gui/res/cardsfolder/h/hand_to_hand.txt b/forge-gui/res/cardsfolder/h/hand_to_hand.txt
index a72f994596c..9fca1411c01 100644
--- a/forge-gui/res/cardsfolder/h/hand_to_hand.txt
+++ b/forge-gui/res/cardsfolder/h/hand_to_hand.txt
@@ -2,7 +2,7 @@ Name:Hand to Hand
 ManaCost:2 R
 Types:Enchantment
 S:Mode$ CantBeCast | ValidCard$ Instant | Phases$ BeginCombat->EndCombat | Description$ During combat, players can't cast instant spells or activate abilities that aren't mana abilities.
-S:Mode$ CantBeActivated | ValidCard$ Card | Phases$ BeginCombat->EndCombat | ValidSA$ Activated.nonManaAbility
+S:Mode$ CantBeActivated | ValidCard$ Card | Phases$ BeginCombat->EndCombat | ValidSA$ Activated.!ManaAbility
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:During combat, players can't cast instant spells or activate abilities that aren't mana abilities.
diff --git a/forge-gui/res/cardsfolder/h/harrow.txt b/forge-gui/res/cardsfolder/h/harrow.txt
index 33569b4e841..3b2e4d12777 100644
--- a/forge-gui/res/cardsfolder/h/harrow.txt
+++ b/forge-gui/res/cardsfolder/h/harrow.txt
@@ -1,6 +1,6 @@
 Name:Harrow
 ManaCost:2 G
 Types:Instant
-A:SP$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
 SVar:AIPreference:SacCost$Land.Basic
 Oracle:As an additional cost to cast this spell, sacrifice a land.\nSearch your library for up to two basic land cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/h/harsh_mentor.txt b/forge-gui/res/cardsfolder/h/harsh_mentor.txt
index e0dbfa32f87..643cb4079df 100644
--- a/forge-gui/res/cardsfolder/h/harsh_mentor.txt
+++ b/forge-gui/res/cardsfolder/h/harsh_mentor.txt
@@ -2,6 +2,6 @@ Name:Harsh Mentor
 ManaCost:1 R
 Types:Creature Human Cleric
 PT:2/2
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, CARDNAME deals 2 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, CARDNAME deals 2 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 2 | Defined$ TriggeredActivator
 Oracle:Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, Harsh Mentor deals 2 damage to that player.
diff --git a/forge-gui/res/cardsfolder/upcoming/haru_hidden_talent.txt b/forge-gui/res/cardsfolder/h/haru_hidden_talent.txt
similarity index 94%
rename from forge-gui/res/cardsfolder/upcoming/haru_hidden_talent.txt
rename to forge-gui/res/cardsfolder/h/haru_hidden_talent.txt
index 4519ac3ce57..7ad83ae1778 100644
--- a/forge-gui/res/cardsfolder/upcoming/haru_hidden_talent.txt
+++ b/forge-gui/res/cardsfolder/h/haru_hidden_talent.txt
@@ -6,4 +6,4 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.O
 SVar:TrigEarthbend:DB$ Earthbend | Num$ 1
 DeckHas:Ability$Counters
 DeckNeeds:Type$Ally
-Oracle:Whenever another Ally you control enters, earthbend 1. (Target land you control becomes a 0/0 creature with haste that's still a land. Put a +1/+1 counter on it. When it dies or is exiled, return it to the battlefield tapped.)
\ No newline at end of file
+Oracle:Whenever another Ally you control enters, earthbend 1. (Target land you control becomes a 0/0 creature with haste that's still a land. Put a +1/+1 counter on it. When it dies or is exiled, return it to the battlefield tapped.)
diff --git a/forge-gui/res/cardsfolder/h/harvest_season.txt b/forge-gui/res/cardsfolder/h/harvest_season.txt
index f3a644cf5d6..c488d62ea4b 100644
--- a/forge-gui/res/cardsfolder/h/harvest_season.txt
+++ b/forge-gui/res/cardsfolder/h/harvest_season.txt
@@ -1,6 +1,6 @@
 Name:Harvest Season
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is the number of tapped creatures you control, put those cards onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is the number of tapped creatures you control, put those cards onto the battlefield tapped, then shuffle.
 SVar:X:Count$Valid Creature.tapped+YouCtrl
 Oracle:Search your library for up to X basic land cards, where X is the number of tapped creatures you control, put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/h/hate_mirage.txt b/forge-gui/res/cardsfolder/h/hate_mirage.txt
index c5566f0e471..6d53d5b4eac 100644
--- a/forge-gui/res/cardsfolder/h/hate_mirage.txt
+++ b/forge-gui/res/cardsfolder/h/hate_mirage.txt
@@ -1,5 +1,5 @@
 Name:Hate Mirage
 ManaCost:3 R
 Types:Sorcery
-A:SP$ CopyPermanent | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select up to two target creatures you don't control | TargetMin$ 0 | TargetMax$ 2 | PumpKeywords$ Haste | AtEOT$ Exile | AILogic$ BeforeCombat | SpellDescription$ Choose up to two target creatures you don't control. For each of those creatures, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.
+A:SP$ CopyPermanent | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select up to two target creatures you don't control | TargetMin$ 0 | TargetMax$ 2 | PumpKeywords$ Haste | AtEOT$ Exile | SpellDescription$ Choose up to two target creatures you don't control. For each of those creatures, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.
 Oracle:Choose up to two target creatures you don't control. For each of those creatures, create a token that's a copy of that creature. Those tokens gain haste. Exile them at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/h/heaped_harvest.txt b/forge-gui/res/cardsfolder/h/heaped_harvest.txt
index 696a3e01720..2b86377d262 100644
--- a/forge-gui/res/cardsfolder/h/heaped_harvest.txt
+++ b/forge-gui/res/cardsfolder/h/heaped_harvest.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Artifact Food
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigChange | Secondary$ True | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters and when you sacrifice it, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 SVar:SacMe:5
 DeckHas:Ability$LifeGain|Food
diff --git a/forge-gui/res/cardsfolder/upcoming/hei_bai_spirit_of_balance.txt b/forge-gui/res/cardsfolder/h/hei_bai_spirit_of_balance.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hei_bai_spirit_of_balance.txt
rename to forge-gui/res/cardsfolder/h/hei_bai_spirit_of_balance.txt
diff --git a/forge-gui/res/cardsfolder/h/herd_migration.txt b/forge-gui/res/cardsfolder/h/herd_migration.txt
index df23cd8cc77..0abc160a05f 100644
--- a/forge-gui/res/cardsfolder/h/herd_migration.txt
+++ b/forge-gui/res/cardsfolder/h/herd_migration.txt
@@ -2,7 +2,7 @@ Name:Herd Migration
 ManaCost:6 G
 Types:Sorcery
 A:SP$ Token | TokenAmount$ X | TokenScript$ g_3_3_beast | TokenOwner$ You | SpellDescription$ Domain — Create a 3/3 green Beast creature token for each basic land type among lands you control.
-A:AB$ ChangeZone | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ChangeTypeDesc$ basic land card | SubAbility$ DBGainLife | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You gain 3 life.
+A:AB$ ChangeZone | Cost$ 1 G Discard<1/CARDNAME> | ActivationZone$ Hand | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBGainLife | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. You gain 3 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$Discard|LifeGain|Token & Type$Beast
 SVar:X:Count$Domain
diff --git a/forge-gui/res/cardsfolder/h/heroes_hangout.txt b/forge-gui/res/cardsfolder/h/heroes_hangout.txt
new file mode 100644
index 00000000000..090f4a6c5f4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/heroes_hangout.txt
@@ -0,0 +1,11 @@
+Name:Heroes' Hangout
+ManaCost:R
+Types:Sorcery
+A:SP$ Charm | Choices$ DBDateNight,DBPatrolNight
+SVar:DBDateNight:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Date Night — Exile the top two cards of your library. Choose one of them. Until the end of your next turn, you may play that card.
+SVar:DBChoose:DB$ ChooseCard | Defined$ You | Amount$ 1 | Mandatory$ True | Choices$ Card.IsRemembered | ChoiceZone$ Exile | ChoiceTitle$ Choose one of the exiled cards | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ ChosenCard | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the chosen card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+SVar:DBPatrolNight:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select one or two target creatures | TargetMin$ 1 | TargetMax$ 2 | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Patrol Night — One or two target creatures each get +1/+0 and gain first strike until end of turn.
+Oracle:Choose one —\n• Date Night — Exile the top two cards of your library. Choose one of them. Until the end of your next turn, you may play that card.\n• Patrol Night — One or two target creatures each get +1/+0 and gain first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/hide_on_the_ceiling.txt b/forge-gui/res/cardsfolder/h/hide_on_the_ceiling.txt
new file mode 100644
index 00000000000..d9d5ac9f983
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/hide_on_the_ceiling.txt
@@ -0,0 +1,9 @@
+Name:Hide on the Ceiling
+ManaCost:X U
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Artifact,Creature | TgtPrompt$ Select X target artifacts and/or creatures | TargetMin$ X | TargetMax$ X | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBDelTrig | SpellDescription$ Exile X target artifacts and/or creatures. Return the exiled cards to the battlefield under their owners' control at the beginning of the next end step.
+SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | SubAbility$ DBCleanup | TriggerDescription$ Return the exiled cards to the battlefield under their owners' control at the beginning of the next end step.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+Oracle:Exile X target artifacts and/or creatures. Return the exiled cards to the battlefield under their owners' control at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/hippo_cows.txt b/forge-gui/res/cardsfolder/h/hippo_cows.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hippo_cows.txt
rename to forge-gui/res/cardsfolder/h/hippo_cows.txt
diff --git a/forge-gui/res/cardsfolder/h/hithlain_rope.txt b/forge-gui/res/cardsfolder/h/hithlain_rope.txt
index 9af07ee80d1..90167d48ef1 100644
--- a/forge-gui/res/cardsfolder/h/hithlain_rope.txt
+++ b/forge-gui/res/cardsfolder/h/hithlain_rope.txt
@@ -2,7 +2,7 @@ Name:Hithlain Rope
 ManaCost:2
 Types:Artifact
 S:Mode$ CantSacrifice | ValidCard$ Card.Self | Description$ CARDNAME can't be sacrificed.
-A:AB$ ChangeZone | Cost$ 1 T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBPass | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. The player to your right gains control of CARDNAME.
+A:AB$ ChangeZone | Cost$ 1 T | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBPass | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. The player to your right gains control of CARDNAME.
 A:AB$ Draw | Cost$ 2 T | SubAbility$ DBPass | SpellDescription$ Draw a card. The player to your right gains control of CARDNAME.
 SVar:DBPass:DB$ GainControl | Defined$ Self | NewController$ NextPlayerToYourRight
 Oracle:Hithlain Rope can't be sacrificed.\n{1}, {T}: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. The player to your right gains control of Hithlain Rope.\n{2}, {T}: Draw a card. The player to your right gains control of Hithlain Rope.
diff --git a/forge-gui/res/cardsfolder/h/hobgoblin_captain.txt b/forge-gui/res/cardsfolder/h/hobgoblin_captain.txt
index cf75d4df78f..ad4e5764345 100644
--- a/forge-gui/res/cardsfolder/h/hobgoblin_captain.txt
+++ b/forge-gui/res/cardsfolder/h/hobgoblin_captain.txt
@@ -4,5 +4,5 @@ Types:Creature Goblin Barbarian
 PT:3/1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, CARDNAME gains first strike until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ First Strike
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 Oracle:Pack tactics — Whenever Hobgoblin Captain attacks, if you attacked with creatures with total power 6 or greater this combat, Hobgoblin Captain gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/hobgoblin_mantled_marauder.txt b/forge-gui/res/cardsfolder/h/hobgoblin_mantled_marauder.txt
new file mode 100644
index 00000000000..075838c1245
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/hobgoblin_mantled_marauder.txt
@@ -0,0 +1,10 @@
+Name:Hobgoblin, Mantled Marauder
+ManaCost:1 R
+Types:Legendary Creature Goblin Human Villain
+PT:1/2
+K:Flying
+K:Haste
+T:Mode$ Discarded | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you discard a card, NICKNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
+DeckHints:Ability$Discard
+Oracle:Flying, haste\nWhenever you discard a card, Hobgoblin gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hog_monkey.txt b/forge-gui/res/cardsfolder/h/hog_monkey.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hog_monkey.txt
rename to forge-gui/res/cardsfolder/h/hog_monkey.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/hog_monkey_rampage.txt b/forge-gui/res/cardsfolder/h/hog_monkey_rampage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/hog_monkey_rampage.txt
rename to forge-gui/res/cardsfolder/h/hog_monkey_rampage.txt
diff --git a/forge-gui/res/cardsfolder/h/hollow_warrior.txt b/forge-gui/res/cardsfolder/h/hollow_warrior.txt
index a199895c1f1..9328cf70a8b 100644
--- a/forge-gui/res/cardsfolder/h/hollow_warrior.txt
+++ b/forge-gui/res/cardsfolder/h/hollow_warrior.txt
@@ -2,7 +2,7 @@ Name:Hollow Warrior
 ManaCost:4
 Types:Artifact Creature Golem Warrior
 PT:4/4
-S:Mode$ CantAttackUnless | ValidCard$ Card.Self | Cost$ tapXType<1/Creature.notattacking> | Description$ CARDNAME can't attack or block unless you tap an untapped creature you control not declared as an attacking or blocking creature this combat. (This cost is paid as attackers or blockers are declared.)
-S:Mode$ CantBlockUnless | ValidCard$ Card.Self | Cost$ tapXType<1/Creature.notblocking>
+S:Mode$ CantAttackUnless | ValidCard$ Card.Self | Cost$ tapXType<1/Creature.!attacking> | Description$ CARDNAME can't attack or block unless you tap an untapped creature you control not declared as an attacking or blocking creature this combat. (This cost is paid as attackers or blockers are declared.)
+S:Mode$ CantBlockUnless | ValidCard$ Card.Self | Cost$ tapXType<1/Creature.!blocking>
 AI:RemoveDeck:Random
 Oracle:Hollow Warrior can't attack or block unless you tap an untapped creature you control not declared as an attacking or blocking creature this combat. (This cost is paid as attackers or blockers are declared.)
diff --git a/forge-gui/res/cardsfolder/h/horizon_boughs.txt b/forge-gui/res/cardsfolder/h/horizon_boughs.txt
index 06fad108964..b23646bd126 100644
--- a/forge-gui/res/cardsfolder/h/horizon_boughs.txt
+++ b/forge-gui/res/cardsfolder/h/horizon_boughs.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Plane Pyrulea
 S:Mode$ Continuous | EffectZone$ Command | Affected$ Permanent | AddHiddenKeyword$ CARDNAME untaps during each other player's untap step. | Description$ All permanents untap during each player's untap step.
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ DBFetch | TriggerDescription$ Whenever chaos ensues, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:DBFetch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 3 | ShuffleNonMandatory$ True
+SVar:DBFetch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 3 | ShuffleNonMandatory$ True
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | MaxRollsPerTurn$ 9
 Oracle:All permanents untap during each player's untap step.\nWhenever chaos ensues, you may search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/h/horizon_seeker.txt b/forge-gui/res/cardsfolder/h/horizon_seeker.txt
index 89aa71d133e..b3766d6fe1d 100644
--- a/forge-gui/res/cardsfolder/h/horizon_seeker.txt
+++ b/forge-gui/res/cardsfolder/h/horizon_seeker.txt
@@ -2,5 +2,5 @@ Name:Horizon Seeker
 ManaCost:2 G
 Types:Creature Human Warrior
 PT:3/2
-A:AB$ ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | Boast$ True | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Boast$ True | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 Oracle:Boast — {1}{G}: Search your library for a basic land card, reveal it, put it into your hand, then shuffle. (Activate only if this creature attacked this turn and only once each turn.)
diff --git a/forge-gui/res/cardsfolder/h/horizon_spellbomb.txt b/forge-gui/res/cardsfolder/h/horizon_spellbomb.txt
index 12a27333533..8fb54f10863 100644
--- a/forge-gui/res/cardsfolder/h/horizon_spellbomb.txt
+++ b/forge-gui/res/cardsfolder/h/horizon_spellbomb.txt
@@ -1,7 +1,7 @@
 Name:Horizon Spellbomb
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ChangeType$ Land.Basic | Origin$ Library | Destination$ Hand | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Origin$ Library | Destination$ Hand | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay {G}. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ G | NumCards$ 1
 Oracle:{2}, {T}, Sacrifice Horizon Spellbomb: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nWhen Horizon Spellbomb is put into a graveyard from the battlefield, you may pay {G}. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/h/horned_kavu.txt b/forge-gui/res/cardsfolder/h/horned_kavu.txt
index a806934093b..ca755dd82fb 100644
--- a/forge-gui/res/cardsfolder/h/horned_kavu.txt
+++ b/forge-gui/res/cardsfolder/h/horned_kavu.txt
@@ -4,5 +4,5 @@ Types:Creature Kavu
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return a red or green creature you control to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl | AILogic$ NeverBounceItself
-SVar:NeedsToPlay:Creature.Red+YouCtrl+cmcLE3+notnamedHorned Kavu,Creature.Green+YouCtrl+cmcLE3+notnamedHorned Kavu
+SVar:NeedsToPlay:Creature.Red+YouCtrl+cmcLE3+!namedHorned Kavu,Creature.Green+YouCtrl+cmcLE3+!namedHorned Kavu
 Oracle:When Horned Kavu enters, return a red or green creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/h/hot_dog_cart.txt b/forge-gui/res/cardsfolder/h/hot_dog_cart.txt
new file mode 100644
index 00000000000..51d081d0b86
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/hot_dog_cart.txt
@@ -0,0 +1,7 @@
+Name:Hot Dog Cart
+ManaCost:3
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When this artifact enters, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this token: You gain 3 life.")
+SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:When this artifact enters, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this token: You gain 3 life.")\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/h/housemeld.txt b/forge-gui/res/cardsfolder/h/housemeld.txt
index 425e11386e3..3aaa3534baa 100644
--- a/forge-gui/res/cardsfolder/h/housemeld.txt
+++ b/forge-gui/res/cardsfolder/h/housemeld.txt
@@ -1,8 +1,9 @@
 Name:Housemeld
 ManaCost:2 U U
 Types:Sorcery
-A:SP$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature. | RememberTargets$ True | SubAbility$ DBAnimate | SpellDescription$ Exile target creature. The exiled card perpetually becomes an enchantment. Then put it onto the battlefield under your control. (It loses all other card types.)
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | RemoveCardTypes$ True | Types$ Enchantment | Duration$ Perpetual | SubAbility$ DBChangeZone
+A:SP$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature. | RememberTargets$ True | SubAbility$ DBAnimate | SpellDescription$ Exile target creature. The exiled card perpetually becomes an enchantment. At the beginning of your next end step, put it onto the battlefield under your control. (It loses all other card types.)
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | RemoveCardTypes$ True | Types$ Enchantment | Duration$ Perpetual | SubAbility$ DBDelayedTrigger
+SVar:DBDelayedTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | RememberObjects$ Remembered | Execute$ DBChangeZone | TriggerDescription$ At the beginning of your next end step, put it onto the battlefield under your control.
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Exile target creature. The exiled card perpetually becomes an enchantment. Then put it onto the battlefield under your control. (It loses all other card types.)
+Oracle:Exile target creature. The exiled card perpetually becomes an enchantment. At the beginning of your next end step, put it onto the battlefield under your control. (It loses all other card types.)
diff --git a/forge-gui/res/cardsfolder/upcoming/how_to_start_a_riot.txt b/forge-gui/res/cardsfolder/h/how_to_start_a_riot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/how_to_start_a_riot.txt
rename to forge-gui/res/cardsfolder/h/how_to_start_a_riot.txt
diff --git a/forge-gui/res/cardsfolder/h/huatli_poet_of_unity_roar_of_the_fifth_people.txt b/forge-gui/res/cardsfolder/h/huatli_poet_of_unity_roar_of_the_fifth_people.txt
index c9729cef42d..8b4fc6eed77 100644
--- a/forge-gui/res/cardsfolder/h/huatli_poet_of_unity_roar_of_the_fifth_people.txt
+++ b/forge-gui/res/cardsfolder/h/huatli_poet_of_unity_roar_of_the_fifth_people.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Legendary Creature Human Warrior Bard
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 A:AB$ ChangeZone | Cost$ 3 RW RW | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Exile NICKNAME, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/h/hydro_man_fluid_felon.txt b/forge-gui/res/cardsfolder/h/hydro_man_fluid_felon.txt
new file mode 100644
index 00000000000..e99fbb1dcbc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/hydro_man_fluid_felon.txt
@@ -0,0 +1,11 @@
+Name:Hydro-Man, Fluid Felon
+ManaCost:U U
+Types:Legendary Creature Elemental Villain
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+Creature | Execute$ TrigPump | TriggerDescription$ Whenever you cast a blue spell, if NICKNAME is a creature, he gets +1/+1 until end of turn.
+SVar:TrigPump:DB$ Pump | NumAtt$ +1 | NumDef$ +1 | Defined$ Self
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your end step, untap NICKNAME. Until your next turn, he becomes a land and gains "{T}: Add {U}." (He's not a creature during that time.)
+SVar:TrigUntap:DB$ Untap | Defined$ Self | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Self | Types$ Land | RemoveCardTypes$ True | Abilities$ DBMana | Duration$ UntilYourNextTurn
+SVar:DBMana:AB$ Mana | Cost$ T | Produced$ U | Amount$ 1 | SpellDescription$ Add {U}
+Oracle:Whenever you cast a blue spell, if Hydro-Man is a creature, he gets +1/+1 until end of turn.\nAt the beginning of your end step, untap Hydro-Man. Until your next turn, he becomes a land and gains "{T}: Add {U}." (He's not a creature during that time.)
diff --git a/forge-gui/res/cardsfolder/i/ignoble_soldier.txt b/forge-gui/res/cardsfolder/i/ignoble_soldier.txt
index d38c4b07914..b8930c03711 100644
--- a/forge-gui/res/cardsfolder/i/ignoble_soldier.txt
+++ b/forge-gui/res/cardsfolder/i/ignoble_soldier.txt
@@ -2,8 +2,8 @@ Name:Ignoble Soldier
 ManaCost:2 W
 Types:Creature Human Soldier
 PT:3/1
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigNodamage | TriggerDescription$ Whenever CARDNAME becomes blocked, prevent all combat damage that would be dealt by it this turn.
-SVar:TrigNodamage:DB$ Effect | ReplacementEffects$ RPrevent | RememberObjects$ TriggeredAttackerLKICopy | ExileOnMoved$ Battlefield
+T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigNoDamage | TriggerDescription$ Whenever CARDNAME becomes blocked, prevent all combat damage that would be dealt by it this turn.
+SVar:TrigNoDamage:DB$ Effect | ReplacementEffects$ RPrevent | RememberObjects$ TriggeredAttackerLKICopy | ExileOnMoved$ Battlefield
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt by it this turn.
 SVar:MustBeBlocked:True
 Oracle:Whenever Ignoble Soldier becomes blocked, prevent all combat damage that would be dealt by it this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/iguana_parrot.txt b/forge-gui/res/cardsfolder/i/iguana_parrot.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iguana_parrot.txt
rename to forge-gui/res/cardsfolder/i/iguana_parrot.txt
diff --git a/forge-gui/res/cardsfolder/i/illicit_masquerade.txt b/forge-gui/res/cardsfolder/i/illicit_masquerade.txt
index af756efa2da..095b6666c95 100644
--- a/forge-gui/res/cardsfolder/i/illicit_masquerade.txt
+++ b/forge-gui/res/cardsfolder/i/illicit_masquerade.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigPutCountersAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ IMPOSTOR | CounterNum$ 1
 T:Mode$ ChangesZone | ValidCard$ Creature.YouCtrl+counters_GE1_IMPOSTOR | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control with an impostor counter on it dies, exile it. Return up to one other target creature card from your graveyard to the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose up to one other target creature card in your graveyard | ValidTgts$ Creature.YouOwn+NotTriggeredCard | TargetMin$ 0 | TargetMax$ 1
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose up to one other target creature card in your graveyard | ValidTgts$ Creature.YouOwn+!TriggeredCard | TargetMin$ 0 | TargetMax$ 1
 DeckHas:Ability$Counters|Graveyard
 DeckHints:Ability$Graveyard|Discard|Mill
 Oracle:Flash\nWhen Illicit Masquerade enters, put an impostor counter on each creature you control.\nWhenever a creature you control with an impostor counter on it dies, exile it. Return up to one other target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/i/illusionists_bracers.txt b/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
index 8e57678e6fb..24eefef8a9e 100644
--- a/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
+++ b/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
@@ -2,6 +2,6 @@ Name:Illusionist's Bracers
 ManaCost:2
 Types:Artifact Equipment
 K:Equip:3
-T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | OptionalDecider$ You | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | OptionalDecider$ You | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt b/forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt
index 80dfd030e84..6d2a6eb4ff7 100644
--- a/forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt
+++ b/forge-gui/res/cardsfolder/i/immersturm_skullcairn.txt
@@ -4,7 +4,7 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
-A:AB$ DealDamage | Cost$ 1 B R R T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDiscard | SorcerySpeed$ True | SpellDescription$ It deals 3 damage to target player. That player discards a card. Activate only any time you could cast a sorcery.
+A:AB$ DealDamage | Cost$ 1 B R R T Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDiscard | SorcerySpeed$ True | SpellDescription$ It deals 3 damage to target player. That player discards a card. Activate only as a sorcery.
 SVar:DBDiscard:DB$ Discard | Defined$ TargetedPlayer | NumCards$ 1 | Mode$ TgtChoose
 DeckHas:Ability$Sacrifice
 Oracle:Immersturm Skullcairn enters tapped.\n{T}: Add {B}.\n{1}{B}{R}{R}, {T}, Sacrifice Immersturm Skullcairn: It deals 3 damage to target player. That player discards a card. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/i/immolation_shaman.txt b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
index b4e991f382f..16574414388 100644
--- a/forge-gui/res/cardsfolder/i/immolation_shaman.txt
+++ b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
@@ -2,7 +2,7 @@ Name:Immolation Shaman
 ManaCost:1 R
 Types:Creature Lizard Shaman
 PT:1/3
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 A:AB$ Pump | Cost$ 3 R R | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | KW$ Menace | SpellDescription$ CARDNAME gets +3/+3 and gains menace until end of turn.
 Oracle:Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, Immolation Shaman deals 1 damage to that player.\n{3}{R}{R}: Immolation Shaman gets +3/+3 and gains menace until end of turn.
diff --git a/forge-gui/res/cardsfolder/i/imoen_mystic_trickster.txt b/forge-gui/res/cardsfolder/i/imoen_mystic_trickster.txt
index 39346837310..3ea3c9d999d 100644
--- a/forge-gui/res/cardsfolder/i/imoen_mystic_trickster.txt
+++ b/forge-gui/res/cardsfolder/i/imoen_mystic_trickster.txt
@@ -7,5 +7,5 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigDraw:DB$ Draw | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | ConditionCheckSVar$ X
 K:Choose a Background
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nAt the beginning of your end step, if you have the initiative, draw a card. Draw another card if you've completed a dungeon.\nChoose a Background (You can have a Background as a second commander.)
diff --git a/forge-gui/res/cardsfolder/i/impostor_syndrome.txt b/forge-gui/res/cardsfolder/i/impostor_syndrome.txt
new file mode 100644
index 00000000000..b984a88a02c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/i/impostor_syndrome.txt
@@ -0,0 +1,6 @@
+Name:Impostor Syndrome
+ManaCost:4 U U
+Types:Enchantment
+T:Mode$ DamageDone | ValidSource$ Creature.!token+YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a nontoken creature you control deals combat damage to a player, create a token that's a copy of it, except it isn't legendary.
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredSourceLKICopy | NonLegendary$ True
+Oracle:Whenever a nontoken creature you control deals combat damage to a player, create a token that's a copy of it, except it isn't legendary.
diff --git a/forge-gui/res/cardsfolder/i/imprison.txt b/forge-gui/res/cardsfolder/i/imprison.txt
index e1fecafc969..4796490c95e 100644
--- a/forge-gui/res/cardsfolder/i/imprison.txt
+++ b/forge-gui/res/cardsfolder/i/imprison.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Curse
-T:Mode$ AbilityCast | ValidCard$ Creature.EnchantedBy | ValidSA$ SpellAbility.nonManaAbility+hasTapCost | TriggerZones$ Battlefield | Execute$ TrigDestroy1 | TriggerDescription$ Whenever a player activates an ability of enchanted creature with {T} in its activation cost that isn't a mana ability, you may pay {1}. If you do, counter that ability. If you don't, destroy CARDNAME.
+T:Mode$ AbilityCast | ValidCard$ Creature.EnchantedBy | ValidSA$ SpellAbility.!ManaAbility+hasTapCost | TriggerZones$ Battlefield | Execute$ TrigDestroy1 | TriggerDescription$ Whenever a player activates an ability of enchanted creature with {T} in its activation cost that isn't a mana ability, you may pay {1}. If you do, counter that ability. If you don't, destroy CARDNAME.
 SVar:TrigDestroy1:DB$ Destroy | Defined$ Self | UnlessCost$ 1 | UnlessPayer$ You | UnlessResolveSubs$ WhenPaid | SubAbility$ DBCounter
 SVar:DBCounter:DB$ Counter | Defined$ TriggeredSpellAbility
 T:Mode$ Attacks | ValidCard$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy2 | TriggerDescription$ Whenever enchanted creature attacks or blocks, you may pay {1}. If you do, tap the creature, remove it from combat, and creatures it was blocking that had become blocked by only that creature this combat become unblocked. If you don't, destroy CARDNAME.
diff --git a/forge-gui/res/cardsfolder/i/inner_demons_gangsters.txt b/forge-gui/res/cardsfolder/i/inner_demons_gangsters.txt
new file mode 100644
index 00000000000..1ba0bccaea5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/i/inner_demons_gangsters.txt
@@ -0,0 +1,6 @@
+Name:Inner Demons Gangsters
+ManaCost:3 B
+Types:Creature Human Rogue Villain
+PT:3/4
+A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | NumAtt$ +1 | KW$ Menace | SorcerySpeed$ True | SpellDescription$ This creature gets +1/+0 and gains menace until end of turn. Activate only as a sorcery. (It can't be blocked except by two or more creatures.)
+Oracle:Discard a card: This creature gets +1/+0 and gains menace until end of turn. Activate only as a sorcery. (It can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/i/intercessors_arrest.txt b/forge-gui/res/cardsfolder/i/intercessors_arrest.txt
index a4c9f0207c7..68a9c929216 100644
--- a/forge-gui/res/cardsfolder/i/intercessors_arrest.txt
+++ b/forge-gui/res/cardsfolder/i/intercessors_arrest.txt
@@ -3,5 +3,5 @@ ManaCost:2 W
 Types:Enchantment Aura
 K:Enchant:Permanent
 SVar:AttachAILogic:Curse
-S:Mode$ CantAttack,CantBlock,CantCrew,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.nonManaAbility | Description$ Enchanted permanent can't attack, block, or crew Vehicles. Its activated abilities can't be activated unless they're mana abilities.
+S:Mode$ CantAttack,CantBlock,CantCrew,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.!ManaAbility | Description$ Enchanted permanent can't attack, block, or crew Vehicles. Its activated abilities can't be activated unless they're mana abilities.
 Oracle:Enchant permanent\nEnchanted permanent can't attack, block, or crew Vehicles. Its activated abilities can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/i/interdimensional_web_watch.txt b/forge-gui/res/cardsfolder/i/interdimensional_web_watch.txt
new file mode 100644
index 00000000000..317e224243b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/i/interdimensional_web_watch.txt
@@ -0,0 +1,10 @@
+Name:Interdimensional Web Watch
+ManaCost:4
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this artifact enters, exile the top two cards of your library. Until the end of your next turn, you may play those cards.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | Duration$ UntilTheEndOfYourNextTurn | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the remembered cards.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.wasCastFromExile | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast spells from exile.
+Oracle:When this artifact enters, exile the top two cards of your library. Until the end of your next turn, you may play those cards.\n{T}: Add two mana in any combination of colors. Spend this mana only to cast spells from exile.
diff --git a/forge-gui/res/cardsfolder/i/intrepid_outlander.txt b/forge-gui/res/cardsfolder/i/intrepid_outlander.txt
index c475addc35d..83c180e1c96 100644
--- a/forge-gui/res/cardsfolder/i/intrepid_outlander.txt
+++ b/forge-gui/res/cardsfolder/i/intrepid_outlander.txt
@@ -5,5 +5,5 @@ PT:2/3
 K:Reach
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigVenture | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, venture into the dungeon. (Enter the first room or advance to the next room.)
 SVar:TrigVenture:DB$ Venture
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 Oracle:Reach\nPack tactics — Whenever Intrepid Outlander attacks, if you attacked with creatures with total power 6 or greater this combat, venture into the dungeon. (Enter the first room or advance to the next room.)
diff --git a/forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt b/forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt
index ba44ec75b89..6348ab29f33 100644
--- a/forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt
+++ b/forge-gui/res/cardsfolder/i/invasion_of_zendikar_awakened_skyclave.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Battle Siege
 Defense:3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2
 AlternateMode:DoubleFaced
 Oracle:(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.)\nWhen Invasion of Zendikar enters, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/upcoming/iroh_firebending_instructor.txt b/forge-gui/res/cardsfolder/i/iroh_firebending_instructor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iroh_firebending_instructor.txt
rename to forge-gui/res/cardsfolder/i/iroh_firebending_instructor.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_spider_stark_upgrade.txt b/forge-gui/res/cardsfolder/i/iron_spider_stark_upgrade.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/iron_spider_stark_upgrade.txt
rename to forge-gui/res/cardsfolder/i/iron_spider_stark_upgrade.txt
diff --git a/forge-gui/res/cardsfolder/i/isperia_supreme_judge.txt b/forge-gui/res/cardsfolder/i/isperia_supreme_judge.txt
index cecf7a28d6f..5d0a56d2582 100644
--- a/forge-gui/res/cardsfolder/i/isperia_supreme_judge.txt
+++ b/forge-gui/res/cardsfolder/i/isperia_supreme_judge.txt
@@ -3,6 +3,6 @@ ManaCost:2 W W U U
 Types:Legendary Creature Sphinx
 PT:6/4
 K:Flying
-T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, draw a card.
+T:Mode$ Attacks | ValidCard$ Creature | Attacked$ You,Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature attacks you or a planeswalker you control, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Flying\nWhenever a creature attacks you or a planeswalker you control, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/itll_quench_ya.txt b/forge-gui/res/cardsfolder/i/itll_quench_ya.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/itll_quench_ya.txt
rename to forge-gui/res/cardsfolder/i/itll_quench_ya.txt
diff --git a/forge-gui/res/cardsfolder/i/izzet_steam_maze.txt b/forge-gui/res/cardsfolder/i/izzet_steam_maze.txt
index 4ce5a51f885..4b2571dcd38 100644
--- a/forge-gui/res/cardsfolder/i/izzet_steam_maze.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_steam_maze.txt
@@ -4,7 +4,7 @@ Types:Plane Ravnica
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Player | Execute$ TrigCopy | TriggerZones$ Command | TriggerDescription$ Whenever a player casts an instant or sorcery spell, that player copies it. The player may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | MayChooseTarget$ True
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, instant and sorcery spells you cast this turn cost {3} less to cast.
-SVar:RolledChaos:DB$ Effect | StaticAbilities$ ReduceSPcost
-SVar:ReduceSPcost:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 3 | Description$ Instant and sorcery spells you cast this turn cost {3} less to cast.
+SVar:RolledChaos:DB$ Effect | StaticAbilities$ ReduceSPCost
+SVar:ReduceSPCost:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 3 | Description$ Instant and sorcery spells you cast this turn cost {3} less to cast.
 SVar:AIRollPlanarDieParams:Mode$ Always | RollInMain1$ True
 Oracle:Whenever a player casts an instant or sorcery spell, that player copies it. The player may choose new targets for the copy.\nWhenever chaos ensues, instant and sorcery spells you cast this turn cost {3} less to cast.
diff --git a/forge-gui/res/cardsfolder/upcoming/j_jonah_jameson.txt b/forge-gui/res/cardsfolder/j/j_jonah_jameson.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/j_jonah_jameson.txt
rename to forge-gui/res/cardsfolder/j/j_jonah_jameson.txt
diff --git a/forge-gui/res/cardsfolder/j/jackal_genius_geneticist.txt b/forge-gui/res/cardsfolder/j/jackal_genius_geneticist.txt
new file mode 100644
index 00000000000..c51acc69e92
--- /dev/null
+++ b/forge-gui/res/cardsfolder/j/jackal_genius_geneticist.txt
@@ -0,0 +1,10 @@
+Name:Jackal, Genius Geneticist
+ManaCost:G U
+Types:Legendary Creature Human Scientist Villain
+PT:1/1
+K:Trample
+T:Mode$ SpellCast | ValidCard$ Creature.cmcEQX | ValidActivatingPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell with mana value equal to NICKNAME's power, copy that spell, except the copy isn't legendary. Then put a +1/+1 counter on NICKNAME. (The copy becomes a token.)
+SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | NonLegendary$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:X:Count$CardPower
+Oracle:Trample\nWhenever you cast a creature spell with mana value equal to Jackal's power, copy that spell, except the copy isn't legendary. Then put a +1/+1 counter on Jackal. (The copy becomes a token.)
diff --git a/forge-gui/res/cardsfolder/j/jaheiras_respite.txt b/forge-gui/res/cardsfolder/j/jaheiras_respite.txt
index 929ef0dc8a7..277f4266867 100644
--- a/forge-gui/res/cardsfolder/j/jaheiras_respite.txt
+++ b/forge-gui/res/cardsfolder/j/jaheiras_respite.txt
@@ -1,7 +1,7 @@
 Name:Jaheira's Respite
 ManaCost:4 G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True | SubAbility$ DBFog | SpellDescription$ Search your library for up to X basic land cards, where X is the number of creatures attacking you, put those cards onto the battlefield tapped, then shuffle. Prevent all combat damage that would be dealt this turn.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True | SubAbility$ DBFog | SpellDescription$ Search your library for up to X basic land cards, where X is the number of creatures attacking you, put those cards onto the battlefield tapped, then shuffle. Prevent all combat damage that would be dealt this turn.
 SVar:X:Count$Valid Creature.attackingYou
 SVar:DBFog:DB$ Fog
 Oracle:Search your library for up to X basic land cards, where X is the number of creatures attacking you, put those cards onto the battlefield tapped, then shuffle.\nPrevent all combat damage that would be dealt this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/jeong_jeongs_deserters.txt b/forge-gui/res/cardsfolder/j/jeong_jeongs_deserters.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/jeong_jeongs_deserters.txt
rename to forge-gui/res/cardsfolder/j/jeong_jeongs_deserters.txt
diff --git a/forge-gui/res/cardsfolder/j/jeskai_monument.txt b/forge-gui/res/cardsfolder/j/jeskai_monument.txt
index 3a8d4b26062..ef93bb8e4af 100644
--- a/forge-gui/res/cardsfolder/j/jeskai_monument.txt
+++ b/forge-gui/res/cardsfolder/j/jeskai_monument.txt
@@ -2,7 +2,7 @@ Name:Jeskai Monument
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this artifact enters, search your library for a basic Island, Mountain, or Plains card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Island+Basic,Land.Mountain+Basic,Land.Plains+Basic
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Island.Basic,Mountain.Basic,Plains.Basic | ChangeTypeDesc$ basic Island, Mountain, or Plains
 A:AB$ Token | Cost$ 1 U R W T Sac<1/CARDNAME> | TokenAmount$ 2 | TokenScript$ w_1_1_bird_flying | TokenOwner$ You | SorcerySpeed$ True | SpellDescription$ Create two 1/1 white Bird creature tokens with flying. Activate only as a sorcery.
 DeckHas:Ability$Token
 Oracle:When this artifact enters, search your library for a basic Island, Mountain, or Plains card, reveal it, put it into your hand, then shuffle.\n{1}{U}{R}{W}, {T}, Sacrifice this artifact: Create two 1/1 white Bird creature tokens with flying. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt b/forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt
index b46c05ca583..5a97df45598 100644
--- a/forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt
+++ b/forge-gui/res/cardsfolder/j/journey_for_the_elixir.txt
@@ -1,7 +1,7 @@
 Name:Journey for the Elixir
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library,Graveyard | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | Shuffle$ False | SubAbility$ DBSearch1 | SpellDescription$ Search your library and graveyard for a basic land card and a card named Jiang Yanggu, reveal them, put them into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library,Graveyard | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Shuffle$ False | SubAbility$ DBSearch1 | SpellDescription$ Search your library and graveyard for a basic land card and a card named Jiang Yanggu, reveal them, put them into your hand, then shuffle.
 SVar:DBSearch1:DB$ ChangeZone | Origin$ Library,Graveyard | Destination$ Hand | ChangeType$ Card.namedJiang Yanggu | ChangeNum$ 1
 DeckNeeds:Name$Jiang Yanggu
 Oracle:Search your library and graveyard for a basic land card and a card named Jiang Yanggu, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
index 60aea28cebb..fb098ac74b9 100644
--- a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
+++ b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 K:Entwine:2 G
 A:SP$ Charm | Choices$ DBChangeZone,DBEffect | CharmNum$ 1
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ JourneyOfDis | AILogic$ Always | SpellDescription$ You may play up to two additional lands this turn.
 SVar:JourneyOfDis:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 2 | Description$ You may play two additional lands this turn.
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/j/journeyers_kite.txt b/forge-gui/res/cardsfolder/j/journeyers_kite.txt
index 5c238d3d792..467fd70d729 100644
--- a/forge-gui/res/cardsfolder/j/journeyers_kite.txt
+++ b/forge-gui/res/cardsfolder/j/journeyers_kite.txt
@@ -1,5 +1,5 @@
 Name:Journeyer's Kite
 ManaCost:2
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 Oracle:{3}, {T}: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/j/jund_panorama.txt b/forge-gui/res/cardsfolder/j/jund_panorama.txt
index cf66eee31c9..a114281d878 100644
--- a/forge-gui/res/cardsfolder/j/jund_panorama.txt
+++ b/forge-gui/res/cardsfolder/j/jund_panorama.txt
@@ -2,5 +2,5 @@ Name:Jund Panorama
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Mountain+Basic,Land.Forest+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Swamp.Basic,Mountain.Basic,Forest.Basic | ChangeTypeDesc$ basic Swamp, Mountain, or Forest | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Jund Panorama: Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/j/jungle_wayfinder.txt b/forge-gui/res/cardsfolder/j/jungle_wayfinder.txt
index a42476effec..695b1f4b121 100644
--- a/forge-gui/res/cardsfolder/j/jungle_wayfinder.txt
+++ b/forge-gui/res/cardsfolder/j/jungle_wayfinder.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Elf Warrior
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, each player may search their library for a basic land card, reveal it, put it into their hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | DefinedPlayer$ Player | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ Player | ChangeNum$ 1 | ShuffleNonMandatory$ True
 Oracle:When Jungle Wayfinder enters, each player may search their library for a basic land card, reveal it, put it into their hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/kami_of_twisted_reflection.txt b/forge-gui/res/cardsfolder/k/kami_of_twisted_reflection.txt
index 5d531b281ea..a2dfd611327 100644
--- a/forge-gui/res/cardsfolder/k/kami_of_twisted_reflection.txt
+++ b/forge-gui/res/cardsfolder/k/kami_of_twisted_reflection.txt
@@ -2,5 +2,5 @@ Name:Kami of Twisted Reflection
 ManaCost:1 U U
 Types:Creature Spirit
 PT:2/2
-A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.YouCtrl | AITgts$ Creature.Other+YouCtrl | AITgtsOnlyBetterThanSelf$ True | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature you control to its owner's hand.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature.YouCtrl | AITgts$ BetterThanSource | TgtPrompt$ Select target creature you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature you control to its owner's hand.
 Oracle:Sacrifice Kami of Twisted Reflection: Return target creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/k/kamigawa_charm.txt b/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
index 385cd100663..23bcaad437e 100644
--- a/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
+++ b/forge-gui/res/cardsfolder/k/kamigawa_charm.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ Charm | Choices$ DosansOldestChant,KodamasReach,TimeOfNeed | Defined$ You
 SVar:DosansOldestChant:DB$ GainLife | LifeAmount$ 6 | SubAbility$ DBDraw | SpellDescription$ You gain 6 life. Draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
-SVar:KodamasReach:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
+SVar:KodamasReach:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/kapow.txt b/forge-gui/res/cardsfolder/k/kapow.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kapow.txt
rename to forge-gui/res/cardsfolder/k/kapow.txt
diff --git a/forge-gui/res/cardsfolder/k/kardur_doomscourge.txt b/forge-gui/res/cardsfolder/k/kardur_doomscourge.txt
index 67c7c8fd7b7..e1502e0c335 100644
--- a/forge-gui/res/cardsfolder/k/kardur_doomscourge.txt
+++ b/forge-gui/res/cardsfolder/k/kardur_doomscourge.txt
@@ -5,7 +5,7 @@ PT:4/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters, until your next turn, creatures your opponents control attack each combat if able and attack a player other than you if able.
 SVar:TrigEffect:DB$ Effect | StaticAbilities$ AttackEach,AttackOther | Duration$ UntilYourNextTurn
 SVar:AttackEach:Mode$ MustAttack | ValidCreature$ Creature.OppCtrl | Description$ Creatures your opponents control attack each combat if able and attack a player other than you if able.
-SVar:AttackOther:Mode$ Continuous | Affected$ You | AddKeyword$ Creatures your opponents control attack a player other than you if able. | Secondary$ True | Description$ Creatures your opponents control attack each combat if able and attack a player other than you if able.
+SVar:AttackOther:Mode$ MustAttack | ValidCreature$ Creature.OppCtrl | MustAttack$ Player.Other | Secondary$ True | Description$ Creatures your opponents control attack each combat if able and attack a player other than you if able.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.attacking | Execute$ TrigDrain | TriggerZones$ Battlefield | TriggerDescription$ Whenever an attacking creature dies, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainOneLife
 SVar:DBGainOneLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
diff --git a/forge-gui/res/cardsfolder/k/karns_sylex.txt b/forge-gui/res/cardsfolder/k/karns_sylex.txt
index 68580d91e56..3d75b39feef 100644
--- a/forge-gui/res/cardsfolder/k/karns_sylex.txt
+++ b/forge-gui/res/cardsfolder/k/karns_sylex.txt
@@ -3,8 +3,7 @@ ManaCost:3
 Types:Legendary Artifact
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-S:Mode$ CantPayLife | ValidPlayer$ Player | ValidCause$ Spell,Activated.nonManaAbility | ForCost$ True | Description$ Players can't pay life or sacrifice creatures to cast spells or activate abilities that aren't mana abilities.
-S:Mode$ CantSacrifice | ValidCard$ Creature | ValidCause$ Spell,Activated.nonManaAbility | ForCost$ True | Secondary$ True | Description$ Players can't pay life or sacrifice creatures to cast spells or activate abilities that aren't mana abilities.
+S:Mode$ CantPayLife | ValidPlayer$ Player | ValidCause$ Spell,Activated.!ManaAbility | ForCost$ True | Description$ Players can't pay life to cast spells or activate abilities that aren't mana abilities.
 A:AB$ DestroyAll | Cost$ X T Exile<1/CARDNAME> | ValidCards$ Permanent.nonLand+cmcLEX | SorcerySpeed$ True | SpellDescription$ Destroy each nonland permanent with mana value X or less. Activate only as a sorcery.
 SVar:X:Count$xPaid
 Oracle:Karn's Sylex enters tapped.\nPlayers can't pay life to cast spells or to activate abilities that aren't mana abilities.\n{X}, {T}, Exile Karn's Sylex: Destroy each nonland permanent with mana value X or less. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/k/karplusan_strider.txt b/forge-gui/res/cardsfolder/k/karplusan_strider.txt
index 57ec938cf65..7402af01c4c 100644
--- a/forge-gui/res/cardsfolder/k/karplusan_strider.txt
+++ b/forge-gui/res/cardsfolder/k/karplusan_strider.txt
@@ -2,5 +2,5 @@ Name:Karplusan Strider
 ManaCost:3 G
 Types:Creature Yeti
 PT:3/4
-S:Mode$ CantTarget | ValidSA$ Spell | ValidCard$ Card.Self | ValidSource$ Card.Blue,Card.Black | Description$ CARDNAME can't be the target of blue or black spells.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSA$ Spell | ValidSource$ Card.Blue,Card.Black | Description$ CARDNAME can't be the target of blue or black spells.
 Oracle:Karplusan Strider can't be the target of blue or black spells.
diff --git a/forge-gui/res/cardsfolder/k/kassandra_eagle_bearer.txt b/forge-gui/res/cardsfolder/k/kassandra_eagle_bearer.txt
index ac80b32add1..7877961a3cc 100644
--- a/forge-gui/res/cardsfolder/k/kassandra_eagle_bearer.txt
+++ b/forge-gui/res/cardsfolder/k/kassandra_eagle_bearer.txt
@@ -3,7 +3,7 @@ ManaCost:1 R W
 Types:Legendary Creature Human Assassin Warrior
 PT:2/2
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When NICKNAME enters, search your graveyard, hand, and library for a card named The Spear of Leonidas, put it onto the battlefield, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When NICKNAME enters, search your graveyard, hand, and library for a card named The Spear of Leonidas, put it onto the battlefield, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | OriginAlternative$ Graveyard,Hand | Hidden$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedThe Spear of Leonidas | ChangeNum$ 1 | ShuffleNonMandatory$ True
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl+EquippedByValid Equipment.Legendary | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control with a legendary Equipment attached to it deals combat damage to a player, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
diff --git a/forge-gui/res/cardsfolder/upcoming/katara_heroic_healer.txt b/forge-gui/res/cardsfolder/k/katara_heroic_healer.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/katara_heroic_healer.txt
rename to forge-gui/res/cardsfolder/k/katara_heroic_healer.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/katara_the_fearless.txt b/forge-gui/res/cardsfolder/k/katara_the_fearless.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/katara_the_fearless.txt
rename to forge-gui/res/cardsfolder/k/katara_the_fearless.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/katara_waterbending_master.txt b/forge-gui/res/cardsfolder/k/katara_waterbending_master.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/katara_waterbending_master.txt
rename to forge-gui/res/cardsfolder/k/katara_waterbending_master.txt
diff --git a/forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt b/forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt
index 3163e6632ab..57a36d47d94 100644
--- a/forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt
+++ b/forge-gui/res/cardsfolder/k/kaya_orzhov_usurper.txt
@@ -2,7 +2,7 @@ Name:Kaya, Orzhov Usurper
 ManaCost:1 W B
 Types:Legendary Planeswalker Kaya
 Loyalty:3
-A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | ValidTgts$ Card | TgtPrompt$ Select target card from a graveyard | Planeswalker$ True | SubAbility$ DBGainLife | RememberChanged$ True | SpellDescription$ Exile up to two target cards from a single graveyard. You gain 2 life if at least one creature card was exiled this way.
+A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | ValidTgts$ Card | TgtPrompt$ Select target card from a graveyard | Planeswalker$ True | SubAbility$ DBGainLife | RememberChanged$ True | SpellDescription$ Exile up to two target cards from a single graveyard. You gain 2 life if at least one creature card was exiled this way.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ ChangeZone | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Choose target nonland permanent with mana value 1 or less | ValidTgts$ Permanent.nonLand+cmcLE1 | SpellDescription$ Exile target nonland permanent with mana value 1 or less.
diff --git a/forge-gui/res/cardsfolder/k/kellan_the_fae_blooded_birthright_boon.txt b/forge-gui/res/cardsfolder/k/kellan_the_fae_blooded_birthright_boon.txt
index ba9f7bd4989..62bb5b3a2e7 100644
--- a/forge-gui/res/cardsfolder/k/kellan_the_fae_blooded_birthright_boon.txt
+++ b/forge-gui/res/cardsfolder/k/kellan_the_fae_blooded_birthright_boon.txt
@@ -16,5 +16,5 @@ ALTERNATE
 Name:Birthright Boon
 ManaCost:1 W
 Types:Sorcery Adventure
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Aura,Equipment | ChangeNum$ 1 | SpellDescription$ Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Aura,Equipment | SpellDescription$ Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
 Oracle:Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/keys_to_the_house.txt b/forge-gui/res/cardsfolder/k/keys_to_the_house.txt
index e11d451871e..e831128c6ac 100644
--- a/forge-gui/res/cardsfolder/k/keys_to_the_house.txt
+++ b/forge-gui/res/cardsfolder/k/keys_to_the_house.txt
@@ -1,6 +1,6 @@
 Name:Keys to the House
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 A:AB$ UnlockDoor | Cost$ 3 T Sac<1/CARDNAME> | Mode$ LockOrUnlock | ValidTgts$ Room.YouCtrl | TgtPrompt$ Choose target Room you control | SorcerySpeed$ True | SpellDescription$ Lock or unlock a door of target Room you control. Activate only as a sorcery.
 Oracle:{1}, {T}, Sacrifice Keys to the House: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{3}, {T}, Sacrifice Keys to the House: Lock or unlock a door of target Room you control. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/k/khalni_heart_expedition.txt b/forge-gui/res/cardsfolder/k/khalni_heart_expedition.txt
index 93fd55fd29c..6c7502ed0b9 100644
--- a/forge-gui/res/cardsfolder/k/khalni_heart_expedition.txt
+++ b/forge-gui/res/cardsfolder/k/khalni_heart_expedition.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Landfall — Whenever a land you control enters, you may put a quest counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ QUEST | CounterNum$ 1
-A:AB$ ChangeZone | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ SubCounter<3/QUEST> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 SVar:MaxQuestEffect:3
 DeckHas:Ability$Counters
 Oracle:Landfall — Whenever a land you control enters, you may put a quest counter on Khalni Heart Expedition.\nRemove three quest counters from Khalni Heart Expedition and sacrifice it: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt b/forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt
index 13fd2d5e3d4..0836fe77007 100644
--- a/forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt
+++ b/forge-gui/res/cardsfolder/k/kiki_jiki_mirror_breaker.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R R
 Types:Legendary Creature Goblin Shaman
 PT:2/2
 K:Haste
-A:AB$ CopyPermanent | Cost$ T | ValidTgts$ Creature.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary creature you control | AddKeywords$ Haste | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of target nonlegendary creature you control, except it has haste. Sacrifice it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ T | ValidTgts$ Creature.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary creature you control | AddKeywords$ Haste | AtEOT$ Sacrifice | SpellDescription$ Create a token that's a copy of target nonlegendary creature you control, except it has haste. Sacrifice it at the beginning of the next end step.
 SVar:UntapMe:True
 Oracle:Haste\n{T}: Create a token that's a copy of target nonlegendary creature you control, except it has haste. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/k/kill_zone_acrobat.txt b/forge-gui/res/cardsfolder/k/kill_zone_acrobat.txt
index db739f53a28..f1efc7f0b83 100644
--- a/forge-gui/res/cardsfolder/k/kill_zone_acrobat.txt
+++ b/forge-gui/res/cardsfolder/k/kill_zone_acrobat.txt
@@ -4,7 +4,6 @@ Types:Creature Human Soldier
 PT:3/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may sacrifice another creature or artifact. If you do, CARDNAME gains flying until end of turn.
 SVar:TrigPump:AB$ Pump | Cost$ Sac<1/Creature.Other;Artifact.Other/another creature or artifact> | Defined$ Self | KW$ Flying
-SVar:PlayMain1:TRUE
 SVar:AIPreference:SacCost$Artifact.token,Creature.Other+cmcLE2+withoutFlying,Artifact.cmcEQ1
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/k/klauth_unrivaled_ancient.txt b/forge-gui/res/cardsfolder/k/klauth_unrivaled_ancient.txt
index 4de844dbb42..dc5306de016 100644
--- a/forge-gui/res/cardsfolder/k/klauth_unrivaled_ancient.txt
+++ b/forge-gui/res/cardsfolder/k/klauth_unrivaled_ancient.txt
@@ -6,6 +6,6 @@ K:Flying
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever CARDNAME attacks, add X mana in any combination of colors, where X is the total power of attacking creatures. Spend this mana only to cast spells. Until end of turn, you don't lose this mana as steps and phases end.
 SVar:TrigMana:DB$ Mana | Produced$ Combo Any | Amount$ X | PersistentMana$ True | RestrictValid$ Spell
-SVar:X:Count$SumPower_Creature.attacking
+SVar:X:Count$Valid Creature.attacking$CardPower
 SVar:HasAttackEffect:TRUE
 Oracle:Flying, haste\nWhenever Klauth, Unrivaled Ancient attacks, add X mana in any combination of colors, where X is the total power of attacking creatures. Spend this mana only to cast spells. Until end of turn, you don't lose this mana as steps and phases end.
diff --git a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
index 21bfa1d8ddc..295efb2fe38 100644
--- a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
+++ b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
@@ -2,7 +2,7 @@ Name:Knowledge Exploitation
 ManaCost:5 U U
 Types:Kindred Sorcery Rogue
 K:Prowl:3 U
-A:SP$ ChangeZone | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | RememberChanged$ True | Reveal$ True | Shuffle$ False | DefinedPlayer$ Targeted | Chooser$ You | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles.
+A:SP$ ChangeZone | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | RememberChanged$ True | Reveal$ True | Shuffle$ False | DefinedPlayer$ Targeted | Chooser$ You | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles.
 SVar:DBPlay:DB$ Play | Defined$ Remembered | Controller$ You | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ RememberedController | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt b/forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt
index 967aaaf12e3..54382f36e51 100644
--- a/forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt
+++ b/forge-gui/res/cardsfolder/k/kodama_of_the_west_tree.txt
@@ -5,6 +5,6 @@ PT:3/3
 K:Reach
 S:Mode$ Continuous | Affected$ Creature.modified+YouCtrl | AddKeyword$ Trample | Description$ Modified creatures you control have trample.
 T:Mode$ DamageDone | ValidSource$ Creature.modified+YouCtrl | ValidTarget$ Opponent | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ TrigSearch | TriggerDescription$ Whenever a modified creature you control deals combat damage to an opponent, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1
 DeckHints:Type$Aura|Equipment & Ability$Counters
 Oracle:Reach\nModified creatures you control have trample. (Equipment, Auras you control, and counters are modifications.)\nWhenever a modified creature you control deals combat damage to an opponent, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/kodamas_reach.txt b/forge-gui/res/cardsfolder/k/kodamas_reach.txt
index dc9f6bd9453..0b550bd16cf 100644
--- a/forge-gui/res/cardsfolder/k/kodamas_reach.txt
+++ b/forge-gui/res/cardsfolder/k/kodamas_reach.txt
@@ -1,7 +1,7 @@
 Name:Kodama's Reach
 ManaCost:2 G
 Types:Sorcery Arcane
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, put one onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/komodo_rhino.txt b/forge-gui/res/cardsfolder/k/komodo_rhino.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/komodo_rhino.txt
rename to forge-gui/res/cardsfolder/k/komodo_rhino.txt
diff --git a/forge-gui/res/cardsfolder/k/kraven_proud_predator.txt b/forge-gui/res/cardsfolder/k/kraven_proud_predator.txt
new file mode 100644
index 00000000000..fc36f295eac
--- /dev/null
+++ b/forge-gui/res/cardsfolder/k/kraven_proud_predator.txt
@@ -0,0 +1,8 @@
+Name:Kraven, Proud Predator
+ManaCost:1 R G
+Types:Legendary Creature Human Warrior Villain
+PT:*/4
+K:Vigilance
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | Description$ Top of the Food Chain — NICKNAME's power is equal to the greatest mana value among permanents you control.
+SVar:X:Count$Valid Permanent.YouCtrl$GreatestCMC
+Oracle:Vigilance\nTop of the Food Chain — Kraven's power is equal to the greatest mana value among permanents you control.
diff --git a/forge-gui/res/cardsfolder/k/kraven_the_hunter.txt b/forge-gui/res/cardsfolder/k/kraven_the_hunter.txt
new file mode 100644
index 00000000000..8d91ec66549
--- /dev/null
+++ b/forge-gui/res/cardsfolder/k/kraven_the_hunter.txt
@@ -0,0 +1,10 @@
+Name:Kraven the Hunter
+ManaCost:1 B G
+Types:Legendary Creature Human Warrior Villain
+PT:4/3
+K:Trample
+T:Mode$ ChangesZone | ValidCard$ Creature.OppCtrl | Origin$ Battlefield | Destination$ Graveyard | CheckOnTriggeredCard$ X GE1 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature an opponent controls with the greatest power among creatures that player controls dies, draw a card and put a +1/+1 counter on CARDNAME.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:X:Count$ValidSelf Creature.greatestPowerControlledByCardController
+Oracle:Trample\nWhenever a creature an opponent controls with the greatest power among creatures that player controls dies, draw a card and put a +1/+1 counter on Kraven the Hunter.
diff --git a/forge-gui/res/cardsfolder/upcoming/kravens_cats.txt b/forge-gui/res/cardsfolder/k/kravens_cats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kravens_cats.txt
rename to forge-gui/res/cardsfolder/k/kravens_cats.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/kravens_last_hunt.txt b/forge-gui/res/cardsfolder/k/kravens_last_hunt.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kravens_last_hunt.txt
rename to forge-gui/res/cardsfolder/k/kravens_last_hunt.txt
diff --git a/forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt b/forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt
index 3ac3d15e3fa..fef54fe87ea 100644
--- a/forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt
+++ b/forge-gui/res/cardsfolder/k/krenkos_buzzcrusher.txt
@@ -8,6 +8,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:DBForEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBDestroy
 SVar:DBChoose:DB$ ChooseCard | ChoiceZone$ Battlefield | Amount$ 1 | Choices$ Land.nonBasic+RememberedPlayerCtrl | Optional$ True | ImprintChosen$ True | ChoiceTitle$ Choose up to one nonbasic land this player controls
 SVar:DBDestroy:DB$ Destroy | Defined$ Imprinted | RememberDestroyed$ True | SubAbility$ DBSearch
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ RememberedController | Optional$ True | SubAbility$ DBCleanup
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ RememberedController | Optional$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 Oracle:Flying, trample\nWhen Krenko's Buzzcrusher enters, for each player, destroy up to one nonbasic land that player controls. For each land destroyed this way, its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/k/krosan_tusker.txt b/forge-gui/res/cardsfolder/k/krosan_tusker.txt
index dd7945c5401..f4b6207f5d0 100644
--- a/forge-gui/res/cardsfolder/k/krosan_tusker.txt
+++ b/forge-gui/res/cardsfolder/k/krosan_tusker.txt
@@ -4,5 +4,5 @@ Types:Creature Boar Beast
 PT:6/5
 K:Cycling:2 G
 T:Mode$ Cycled | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When you cycle CARDNAME, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle. (Do this before you draw.)
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Cycling {2}{G} ({2}{G}, Discard this card: Draw a card.)\nWhen you cycle Krosan Tusker, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle. (Do this before you draw.)
diff --git a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
index 355d05f4206..9a50c74e3c3 100644
--- a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
+++ b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
@@ -2,6 +2,6 @@ Name:Kurkesh, Onakke Ancient
 ManaCost:2 R R
 Types:Legendary Creature Ogre Spirit
 PT:4/3
-T:Mode$ AbilityCast | ValidCard$ Artifact | ValidSA$ SpellAbility.nonManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Artifact | ValidSA$ SpellAbility.!ManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ R | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/k/kusari_gama.txt b/forge-gui/res/cardsfolder/k/kusari_gama.txt
index 1234de9ebe1..f7c4d914371 100644
--- a/forge-gui/res/cardsfolder/k/kusari_gama.txt
+++ b/forge-gui/res/cardsfolder/k/kusari_gama.txt
@@ -5,6 +5,6 @@ K:Equip:3
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ GamaPump | Description$ Equipped creature has "{2}: This creature gets +1/+0 until end of turn."
 SVar:GamaPump:AB$ Pump | Cost$ 2 | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 T:Mode$ DamageDone | ValidSource$ Card.EquippedBy | ValidTarget$ Creature.blocking | Execute$ GamaDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals damage to a blocking creature, CARDNAME deals that much damage to each other creature defending player controls.
-SVar:GamaDamage:DB$ DamageAll | NumDmg$ X | ValidCards$ Creature.NotTriggeredTarget+ControlledBy TriggeredTargetController
+SVar:GamaDamage:DB$ DamageAll | NumDmg$ X | ValidCards$ Creature.!TriggeredTarget+ControlledBy TriggeredTargetController
 SVar:X:TriggerCount$DamageAmount
 Oracle:Equipped creature has "{2}: This creature gets +1/+0 until end of turn."\nWhenever equipped creature deals damage to a blocking creature, Kusari-Gama deals that much damage to each other creature defending player controls.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/kyoshi_warrior_guard.txt b/forge-gui/res/cardsfolder/k/kyoshi_warrior_guard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/kyoshi_warrior_guard.txt
rename to forge-gui/res/cardsfolder/k/kyoshi_warrior_guard.txt
diff --git a/forge-gui/res/cardsfolder/l/lady_octopus_inspired_inventor.txt b/forge-gui/res/cardsfolder/l/lady_octopus_inspired_inventor.txt
new file mode 100644
index 00000000000..2c6bace341c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/l/lady_octopus_inspired_inventor.txt
@@ -0,0 +1,10 @@
+Name:Lady Octopus, Inspired Inventor
+ManaCost:U
+Types:Legendary Creature Human Scientist Villain
+PT:0/2
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw your first or second card each turn, put an ingenuity counter on NICKNAME.
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | Number$ 2 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever you draw your first or second card each turn, put an ingenuity counter on NICKNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ INGENUITY | CounterNum$ 1
+A:AB$ Play | Cost$ T | Valid$ Artifact.YouOwn | ValidSA$ Spell.cmcLEX | ValidZone$ Hand | WithoutManaCost$ True | Amount$ 1 | Controller$ You | Optional$ True | SpellDescription$ You may cast an artifact spell from your hand with mana value less than or equal to the number of ingenuity counters on NICKNAME without paying its mana cost.
+SVar:X:Count$CardCounters.INGENUITY
+Oracle:Whenever you draw your first or second card each turn, put an ingenuity counter on Lady Octopus.\n{T}: You may cast an artifact spell from your hand with mana value less than or equal to the number of ingenuity counters on Lady Octopus without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/l/land_tax.txt b/forge-gui/res/cardsfolder/l/land_tax.txt
index b0ae1f05747..6cdc628e643 100644
--- a/forge-gui/res/cardsfolder/l/land_tax.txt
+++ b/forge-gui/res/cardsfolder/l/land_tax.txt
@@ -2,7 +2,7 @@ Name:Land Tax
 ManaCost:W
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 3 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 3 | ShuffleNonMandatory$ True
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
 Oracle:At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/l/larval_scoutlander.txt b/forge-gui/res/cardsfolder/l/larval_scoutlander.txt
index 17c76aa646b..4b65c5a4255 100644
--- a/forge-gui/res/cardsfolder/l/larval_scoutlander.txt
+++ b/forge-gui/res/cardsfolder/l/larval_scoutlander.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Artifact Spacecraft
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When this Spacecraft enters, you may sacrifice a land or Lander. If you do, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ Sac<1/Land;Lander/land or Lander> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ Sac<1/Land;Lander/land or Lander> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True
 K:Station:7
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE7_CHARGE | AddType$ Creature | AddKeyword$ Flying | Description$ STATION 7+ Flying
 Oracle:When this Spacecraft enters, you may sacrifice a land or Lander. If you do, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 7+.)\nSTATION 7+\nFlying
diff --git a/forge-gui/res/cardsfolder/l/last_march_of_the_ents.txt b/forge-gui/res/cardsfolder/l/last_march_of_the_ents.txt
index 0645823806d..fed7511d6b4 100644
--- a/forge-gui/res/cardsfolder/l/last_march_of_the_ents.txt
+++ b/forge-gui/res/cardsfolder/l/last_march_of_the_ents.txt
@@ -3,7 +3,7 @@ ManaCost:6 G G
 Types:Sorcery
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
 A:SP$ Draw | Defined$ You | NumCards$ X | SubAbility$ CheatBattlefield | SpellDescription$ Draw cards equal to the greatest toughness among creatures you control, then put any number of creature cards from your hand onto the battlefield.
-SVar:CheatBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ Y | StackDescription$ {p:You} puts any number of creature cards from their hand onto the battlefield
+SVar:CheatBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ Y | StackDescription$ {p:You} puts any number of creature cards from their hand onto the battlefield.
 SVar:X:Count$Valid Creature.YouCtrl$GreatestToughness
 SVar:Y:Count$ValidHand Creature.YouCtrl
 DeckHints:Type$Wall|Plant|Treefolk
diff --git a/forge-gui/res/cardsfolder/l/lay_of_the_land.txt b/forge-gui/res/cardsfolder/l/lay_of_the_land.txt
index 1ea27c89f9e..b5310fb8b4b 100644
--- a/forge-gui/res/cardsfolder/l/lay_of_the_land.txt
+++ b/forge-gui/res/cardsfolder/l/lay_of_the_land.txt
@@ -1,5 +1,5 @@
 Name:Lay of the Land
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/l/leonin_iconoclast.txt b/forge-gui/res/cardsfolder/l/leonin_iconoclast.txt
index 18759f76555..6cc5e733cfc 100644
--- a/forge-gui/res/cardsfolder/l/leonin_iconoclast.txt
+++ b/forge-gui/res/cardsfolder/l/leonin_iconoclast.txt
@@ -2,6 +2,6 @@ Name:Leonin Iconoclast
 ManaCost:3 W
 Types:Creature Cat Monk
 PT:3/2
-T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, destroy target enchantment creature an opponent controls.
+T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, destroy target enchantment creature an opponent controls.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.Enchantment+OppCtrl | TgtPrompt$ Select target creature an opponent controls.
 Oracle:Heroic — Whenever you cast a spell that targets Leonin Iconoclast, destroy target enchantment creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/lethal_protection.txt b/forge-gui/res/cardsfolder/l/lethal_protection.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lethal_protection.txt
rename to forge-gui/res/cardsfolder/l/lethal_protection.txt
diff --git a/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt b/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt
index c4c6c944ee9..78eb2c0b554 100644
--- a/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt
+++ b/forge-gui/res/cardsfolder/l/liege_of_the_tangle.txt
@@ -3,8 +3,8 @@ ManaCost:6 G G
 Types:Creature Elemental
 PT:8/8
 K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may choose any number of target lands you control and put an awakening counter on each of them. Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | OptionalDecider$ You | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select lands you control | CounterType$ AWAKENING | CounterNum$ 1 | SubAbility$ DBEffect
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may choose any number of target lands you control and put an awakening counter on each of them. Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Land.YouCtrl | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select lands you control | CounterType$ AWAKENING | CounterNum$ 1 | SubAbility$ DBEffect
 SVar:X:Count$Valid Land.YouCtrl
 SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ TangleStatic | ForgetOnMoved$ Battlefield | ForgetCounter$ AWAKENING | Duration$ Permanent
 SVar:TangleStatic:Mode$ Continuous | Affected$ Card.IsRemembered | SetPower$ 8 | SetToughness$ 8 | AddType$ Creature & Elemental | RemoveCreatureTypes$ True | SetColor$ Green | Description$ Each of those lands is an 8/8 green Elemental creature for as long as it has an awakening counter on it. They're still lands.
diff --git a/forge-gui/res/cardsfolder/l/lilianas_contract.txt b/forge-gui/res/cardsfolder/l/lilianas_contract.txt
index b6946fef4da..51abebdd572 100644
--- a/forge-gui/res/cardsfolder/l/lilianas_contract.txt
+++ b/forge-gui/res/cardsfolder/l/lilianas_contract.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBWin | TriggerZones$ Battlefield | CheckSVar$ Contractors | SVarCompare$ GE4 | TriggerDescription$ At the beginning of your upkeep, if you control four or more Demons with different names, you win the game.
 SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Contractors | ConditionSVarCompare$ GE4
-SVar:Contractors:Count$DifferentCardNames_Demon.YouCtrl+inRealZoneBattlefield
+SVar:Contractors:Count$Valid Demon.YouCtrl$DifferentCardNames
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw four cards and you lose 4 life.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 4 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 4
diff --git a/forge-gui/res/cardsfolder/upcoming/lion_vulture.txt b/forge-gui/res/cardsfolder/l/lion_vulture.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lion_vulture.txt
rename to forge-gui/res/cardsfolder/l/lion_vulture.txt
diff --git a/forge-gui/res/cardsfolder/l/living_brain_mechanical_marvel.txt b/forge-gui/res/cardsfolder/l/living_brain_mechanical_marvel.txt
new file mode 100644
index 00000000000..0dc09d7dcd7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/l/living_brain_mechanical_marvel.txt
@@ -0,0 +1,9 @@
+Name:Living Brain, Mechanical Marvel
+ManaCost:4
+Types:Legendary Artifact Creature Robot Villain
+PT:3/3
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, target non-Equipment artifact you control becomes an artifact creature with base power and toughness 3/3 until end of turn. Untap it.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.nonEquipment+YouCtrl | TgtPrompt$ Select target non-Equipment artifact you control | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature | SubAbility$ DBUntap
+SVar:DBUntap:DB$ Untap | Defined$ Targeted
+SVar:PlayMain1:TRUE
+Oracle:At the beginning of combat on your turn, target non-Equipment artifact you control becomes an artifact creature with base power and toughness 3/3 until end of turn. Untap it.
diff --git a/forge-gui/res/cardsfolder/l/lizard_connorss_curse.txt b/forge-gui/res/cardsfolder/l/lizard_connorss_curse.txt
new file mode 100644
index 00000000000..cfe05aa1046
--- /dev/null
+++ b/forge-gui/res/cardsfolder/l/lizard_connorss_curse.txt
@@ -0,0 +1,8 @@
+Name:Lizard, Connors's Curse
+ManaCost:2 G G
+Types:Legendary Creature Lizard Villain
+PT:5/5
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ Lizard Formula — When CARDNAME enters, up to one other target creature loses all abilities and becomes a green Lizard creature with base power and toughness 4/4.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | Power$ 4 | Toughness$ 4 | RemoveAllAbilities$ True | Colors$ Green | Types$ Lizard,Creature | OverwriteColors$ True | RemoveCreatureTypes$ True | RemoveCardTypes$ True | Duration$ Permanent
+Oracle:Trample\nLizard Formula — When Lizard, Connors's Curse enters, up to one other target creature loses all abilities and becomes a green Lizard creature with base power and toughness 4/4.
diff --git a/forge-gui/res/cardsfolder/l/loam_larva.txt b/forge-gui/res/cardsfolder/l/loam_larva.txt
index 8fcad11cae0..d1394e63b79 100644
--- a/forge-gui/res/cardsfolder/l/loam_larva.txt
+++ b/forge-gui/res/cardsfolder/l/loam_larva.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Insect
 PT:1/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Loam Larva enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/l/lodestone_bauble.txt b/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
index 7a9447444e1..d211d4879da 100644
--- a/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
+++ b/forge-gui/res/cardsfolder/l/lodestone_bauble.txt
@@ -1,7 +1,7 @@
 Name:Lodestone Bauble
 ManaCost:0
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 4 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | TgtPrompt$ Choose target basic land card in a graveyard | ValidTgts$ Land.Basic | Chooser$ You | SubAbility$ ChooseZero | SpellDescription$ Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | TargetMin$ 0 | TargetMax$ 4 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | TgtPrompt$ Choose target basic land card in a graveyard | ValidTgts$ Land.Basic | Chooser$ You | SubAbility$ ChooseZero | SpellDescription$ Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep.
 SVar:ChooseZero:DB$ ChoosePlayer | Choices$ Player | ConditionDefined$ Targeted | ConditionNotPresent$ Card | SubAbility$ DelTrigSlowtrip
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | RememberObjects$ TargetedOwner,ChosenPlayer | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ DelayTriggerRemembered
diff --git a/forge-gui/res/cardsfolder/upcoming/long_feng_grand_secretariat.txt b/forge-gui/res/cardsfolder/l/long_feng_grand_secretariat.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/long_feng_grand_secretariat.txt
rename to forge-gui/res/cardsfolder/l/long_feng_grand_secretariat.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lost_in_the_spirit_world.txt b/forge-gui/res/cardsfolder/l/lost_in_the_spirit_world.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lost_in_the_spirit_world.txt
rename to forge-gui/res/cardsfolder/l/lost_in_the_spirit_world.txt
diff --git a/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt b/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
index 18f139b27ee..fc4e3999064 100644
--- a/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
+++ b/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
@@ -4,7 +4,7 @@ Types:Creature Elephant Cleric
 PT:4/6
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may have your life total become the total toughness of creatures you control.
 SVar:TrigLife:DB$ SetLife | Defined$ You | LifeAmount$ Y
-SVar:Y:Count$Valid Creature.YouCtrl$SumToughness
+SVar:Y:Count$Valid Creature.YouCtrl$CardToughness
 A:AB$ Pump | Cost$ 5 W | NumAtt$ +X | NumDef$ +X | SpellDescription$ CARDNAME gets +X/+X until end of turn, where X is your life total.
 SVar:X:Count$YourLifeTotal
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/upcoming/loyal_fire_sage.txt b/forge-gui/res/cardsfolder/l/loyal_fire_sage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/loyal_fire_sage.txt
rename to forge-gui/res/cardsfolder/l/loyal_fire_sage.txt
diff --git a/forge-gui/res/cardsfolder/l/lumbering_laundry.txt b/forge-gui/res/cardsfolder/l/lumbering_laundry.txt
index 2779a9255ba..ba58088ffeb 100644
--- a/forge-gui/res/cardsfolder/l/lumbering_laundry.txt
+++ b/forge-gui/res/cardsfolder/l/lumbering_laundry.txt
@@ -5,4 +5,4 @@ PT:4/5
 A:AB$ Effect | Cost$ 2 | StaticAbilities$ MayLookFaceDown | SpellDescription$ Until end of turn, you may look at face-down creatures you don't control any time.
 SVar:MayLookFaceDown:Mode$ Continuous | Affected$ Creature.faceDown+YouDontCtrl | AffectedZone$ Battlefield | MayLookAt$ You | Description$ You may look at face-down creatures you don't control any time.
 K:Disguise:5
-Oracle:{2}: Until end of turn, you may look at face-down creatures you don't control any time.
+Oracle:{2}: Until end of turn, you may look at face-down creatures you don't control any time.\nDisguise {5} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
diff --git a/forge-gui/res/cardsfolder/l/lumbering_worldwagon.txt b/forge-gui/res/cardsfolder/l/lumbering_worldwagon.txt
index 71014d3d590..ea2cef8462e 100644
--- a/forge-gui/res/cardsfolder/l/lumbering_worldwagon.txt
+++ b/forge-gui/res/cardsfolder/l/lumbering_worldwagon.txt
@@ -5,7 +5,7 @@ PT:*/4
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | Description$ This Vehicle's power is equal to the number of lands you control.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever this Vehicle enters or attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever this Vehicle enters or attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 K:Crew:4
 SVar:X:Count$Valid Land.YouCtrl
 SVar:BuffedBy:Land
diff --git a/forge-gui/res/cardsfolder/l/luminescent_rain.txt b/forge-gui/res/cardsfolder/l/luminescent_rain.txt
index 8839c36b53d..f3180e33614 100644
--- a/forge-gui/res/cardsfolder/l/luminescent_rain.txt
+++ b/forge-gui/res/cardsfolder/l/luminescent_rain.txt
@@ -1,8 +1,8 @@
 Name:Luminescent Rain
 ManaCost:2 G
 Types:Instant
-A:SP$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentComputerControls | SubAbility$ DBGainlife | SpellDescription$ Choose a creature type. You gain 2 life for each permanent you control of that type.
-SVar:DBGainlife:DB$ Gainlife | LifeAmount$ X | StackDescription$ You gain 2 life for each permanent you control of that type.
+A:SP$ ChooseType | Defined$ You | Type$ Creature | AILogic$ MostProminentComputerControls | SubAbility$ DBGainLife | SpellDescription$ Choose a creature type. You gain 2 life for each permanent you control of that type.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | StackDescription$ You gain 2 life for each permanent you control of that type.
 SVar:X:Count$Valid Permanent.ChosenType+YouCtrl/Times.2
 SVar:NeedsToPlay:Creature
 Oracle:Choose a creature type. You gain 2 life for each permanent you control of that type.
diff --git a/forge-gui/res/cardsfolder/l/lurker.txt b/forge-gui/res/cardsfolder/l/lurker.txt
index 62022f11fce..d376d2962bf 100644
--- a/forge-gui/res/cardsfolder/l/lurker.txt
+++ b/forge-gui/res/cardsfolder/l/lurker.txt
@@ -2,5 +2,5 @@ Name:Lurker
 ManaCost:2 G
 Types:Creature Beast
 PT:2/3
-S:Mode$ CantTarget | ValidCard$ Card.Self+!attackedThisTurn+!blockedThisTurn | ValidSA$ Spell | Description$ CARDNAME can't be the target of spells unless it attacked or blocked this turn.
+S:Mode$ CantTarget | ValidTarget$ Card.Self+!attackedThisTurn+!blockedThisTurn | ValidSA$ Spell | Description$ CARDNAME can't be the target of spells unless it attacked or blocked this turn.
 Oracle:Lurker can't be the target of spells unless it attacked or blocked this turn.
diff --git a/forge-gui/res/cardsfolder/l/lurking_arynx.txt b/forge-gui/res/cardsfolder/l/lurking_arynx.txt
index 939d91a881a..66e0d11267e 100644
--- a/forge-gui/res/cardsfolder/l/lurking_arynx.txt
+++ b/forge-gui/res/cardsfolder/l/lurking_arynx.txt
@@ -3,5 +3,5 @@ ManaCost:4 G
 Types:Creature Cat Beast
 PT:3/5
 A:AB$ MustBlock | Cost$ 2 G | ValidTgts$ Creature | CheckSVar$ FormidableTest | SVarCompare$ GE8 | PrecostDesc$ Formidable — | TgtPrompt$ Select target creature that must block this creature this turn | SpellDescription$ Target creature blocks CARDNAME this turn if able. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Formidable — {2}{G}: Target creature blocks Lurking Arynx this turn if able. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/lurking_lizards.txt b/forge-gui/res/cardsfolder/l/lurking_lizards.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lurking_lizards.txt
rename to forge-gui/res/cardsfolder/l/lurking_lizards.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/lyla_holographic_assistant.txt b/forge-gui/res/cardsfolder/l/lyla_holographic_assistant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/lyla_holographic_assistant.txt
rename to forge-gui/res/cardsfolder/l/lyla_holographic_assistant.txt
diff --git a/forge-gui/res/cardsfolder/m/madame_web_clairvoyant.txt b/forge-gui/res/cardsfolder/m/madame_web_clairvoyant.txt
new file mode 100644
index 00000000000..976fefcecfa
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/madame_web_clairvoyant.txt
@@ -0,0 +1,9 @@
+Name:Madame Web, Clairvoyant
+ManaCost:4 U U
+Types:Legendary Creature Mutant Advisor
+PT:4/4
+S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | AffectedZone$ Library | MayLookAt$ You | Description$ You may look at the top card of your library any time.
+S:Mode$ Continuous | Affected$ Spider.TopLibrary+YouOwn+nonLand,Card.TopLibrary+YouOwn+nonCreature+nonLand | AffectedZone$ Library | MayPlay$ True | Description$ You may cast Spider spells and noncreature spells from the top of your library.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever you attack, you may mill a card. (You may put the top card of your library into your graveyard.)
+SVar:TrigMill:DB$ Mill | NumCards$ 1 | Defined$ You | Optional$ True
+Oracle:You may look at the top of your library any time.\nYou may cast Spider spells and noncreature spells from the top of your library.\nWhenever you attack, you may mill a card. (You may put the top card of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/m/maestros_theater.txt b/forge-gui/res/cardsfolder/m/maestros_theater.txt
index 738c72e7533..f3d1652be63 100644
--- a/forge-gui/res/cardsfolder/m/maestros_theater.txt
+++ b/forge-gui/res/cardsfolder/m/maestros_theater.txt
@@ -4,7 +4,7 @@ Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Island+Basic,Land.Swamp+Basic,Land.Mountain+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Island.Basic,Swamp.Basic,Mountain.Basic | ChangeTypeDesc$ basic Island, Swamp, or Mountain | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
diff --git a/forge-gui/res/cardsfolder/m/magmatic_hellkite.txt b/forge-gui/res/cardsfolder/m/magmatic_hellkite.txt
index 99ceec4e7a4..0d954cbeefd 100644
--- a/forge-gui/res/cardsfolder/m/magmatic_hellkite.txt
+++ b/forge-gui/res/cardsfolder/m/magmatic_hellkite.txt
@@ -5,5 +5,5 @@ PT:4/5
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When this creature enters, destroy target nonbasic land an opponent controls. Its controller searches their library for a basic land card, puts it on the battlefield tapped with a stun counter on it, then shuffles. (If a permanent with a stun counter would become untapped, remove one from it instead.)
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic+OppCtrl | TgtPrompt$ Select target nonbasic land an opponent controls | SubAbility$ DBChange
-SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ TargetedController | Tapped$ True | WithCountersType$ STUN
+SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TargetedController | Tapped$ True | WithCountersType$ STUN
 Oracle:Flying\nWhen this creature enters, destroy target nonbasic land an opponent controls. Its controller searches their library for a basic land card, puts it on the battlefield tapped with a stun counter on it, then shuffles. (If a permanent with a stun counter would become untapped, remove one from it instead.)
diff --git a/forge-gui/res/cardsfolder/m/many_partings.txt b/forge-gui/res/cardsfolder/m/many_partings.txt
index f51fdc39d29..b59bc04dcac 100644
--- a/forge-gui/res/cardsfolder/m/many_partings.txt
+++ b/forge-gui/res/cardsfolder/m/many_partings.txt
@@ -1,7 +1,7 @@
 Name:Many Partings
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:DBToken:DB$ Token | TokenScript$ c_a_food_sac
 DeckHas:Ability$Token|LifeGain|Sacrifice & Type$Artifact|Food
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/m/map_the_wastes.txt b/forge-gui/res/cardsfolder/m/map_the_wastes.txt
index f6ca95af749..a059b1f63e8 100644
--- a/forge-gui/res/cardsfolder/m/map_the_wastes.txt
+++ b/forge-gui/res/cardsfolder/m/map_the_wastes.txt
@@ -1,7 +1,7 @@
 Name:Map the Wastes
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBBolster | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Bolster 1. (Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SubAbility$ DBBolster | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Bolster 1. (Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)
 SVar:DBBolster:DB$ PutCounter | Bolster$ True | CounterNum$ 1 | CounterType$ P1P1
 DeckHas:Ability$Counters
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Bolster 1. (Choose a creature with the least toughness among creatures you control and put a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/m/maralen_of_the_mornsong.txt b/forge-gui/res/cardsfolder/m/maralen_of_the_mornsong.txt
index 31c3678c2c0..0b86615bc6d 100644
--- a/forge-gui/res/cardsfolder/m/maralen_of_the_mornsong.txt
+++ b/forge-gui/res/cardsfolder/m/maralen_of_the_mornsong.txt
@@ -5,6 +5,6 @@ PT:2/3
 S:Mode$ CantDraw | ValidPlayer$ Player | Description$ Players can't draw cards.
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of each player's draw step, that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles.
 SVar:TrigDrain:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 3 | SubAbility$ DBTutor
-SVar:DBTutor:DB$ ChangeZone | DefinedPlayer$ TriggeredPlayer | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1
+SVar:DBTutor:DB$ ChangeZone | DefinedPlayer$ TriggeredPlayer | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True
 AI:RemoveDeck:Random
 Oracle:Players can't draw cards.\nAt the beginning of each player's draw step, that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles.
diff --git a/forge-gui/res/cardsfolder/m/march_toward_perfection.txt b/forge-gui/res/cardsfolder/m/march_toward_perfection.txt
index 8aedc9d06fd..870985aa2b7 100644
--- a/forge-gui/res/cardsfolder/m/march_toward_perfection.txt
+++ b/forge-gui/res/cardsfolder/m/march_toward_perfection.txt
@@ -7,6 +7,6 @@ SVar:ReplEffAddCounter:DB$ Effect | ReplacementEffects$ ETBAddCounter | Remember
 SVar:ETBAddCounter:Event$ Moved | Origin$ Stack | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ ETBAddExtraCounter | ReplacementResult$ Updated
 SVar:ETBAddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Deathtouch | CounterNum$ 1
 SVar:DBDraft:DB$ Draft | Spellbook$ Entomber Exarch,Phyrexian Fleshgorger,Phyrexian Gargantua,Phyrexian Obliterator,Phyrexian Rager,Phyrexian Revoker,Toxic Abomination,Vault Skirge,Scrapwork Rager,Bilious Skulldweller,Archfiend of the Dross,Myr Convert,Zenith Chronicler,Soulless Jailer,Diminished Returner | SpellDescription$ Draft a card from CARDNAME's spellbook.
-DeckHas:Ability$Counters|Lifegain|Graveyard & Type$Phyrexian|Horror|Imp|Zombie|Insect|Demon|Insect
+DeckHas:Ability$Counters|LifeGain|Graveyard & Type$Phyrexian|Horror|Imp|Zombie|Insect|Demon|Insect
 DeckNeeds:Type$Phyrexian
 Oracle:You get a boon with "When you cast your next Phyrexian creature spell, that creature enters with an additional +1/+1 counter and deathtouch counter on it."\nDraft a card from March Toward Perfection's spellbook.
diff --git a/forge-gui/res/cardsfolder/m/mardu_monument.txt b/forge-gui/res/cardsfolder/m/mardu_monument.txt
index 8b569e78f20..fd56ce66f3e 100644
--- a/forge-gui/res/cardsfolder/m/mardu_monument.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_monument.txt
@@ -2,7 +2,7 @@ Name:Mardu Monument
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this artifact enters, search your library for a basic Mountain, Plains, or Swamp card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Mountain+Basic,Land.Plains+Basic,Land.Swamp+Basic
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Mountain.Basic,Plains.Basic,Swamp.Basic | ChangeTypeDesc$ basic Mountain, Plains, or Swamp
 A:AB$ Token | Cost$ 2 R W B T Sac<1/CARDNAME> | TokenAmount$ 3 | TokenScript$ r_1_1_warrior | TokenOwner$ You | PumpKeywords$ Menace & Haste | PumpDuration$ EOT | SorcerySpeed$ True | SpellDescription$ Create three 1/1 red Warrior creature tokens. They gain menace and haste until end of turn. Activate only as a sorcery. (A creature with menace can't be blocked except by two or more creatures.)
 DeckHas:Ability$Token
 Oracle:When this artifact enters, search your library for a basic Mountain, Plains, or Swamp card, reveal it, put it into your hand, then shuffle.\n{2}{R}{W}{B}, {T}, Sacrifice this artifact: Create three 1/1 red Warrior creature tokens. They gain menace and haste until end of turn. Activate only as a sorcery. (A creature with menace can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/m/marsh_flats.txt b/forge-gui/res/cardsfolder/m/marsh_flats.txt
index ff67cc21ae2..2a455802e98 100644
--- a/forge-gui/res/cardsfolder/m/marsh_flats.txt
+++ b/forge-gui/res/cardsfolder/m/marsh_flats.txt
@@ -1,5 +1,5 @@
 Name:Marsh Flats
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Swamp | ChangeNum$ 1 | SpellDescription$ Search your library for a Plains or Swamp card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Plains,Swamp | SpellDescription$ Search your library for a Plains or Swamp card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Marsh Flats: Search your library for a Plains or Swamp card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/martial_coup.txt b/forge-gui/res/cardsfolder/m/martial_coup.txt
index 06e54384827..4f1c0612ba1 100644
--- a/forge-gui/res/cardsfolder/m/martial_coup.txt
+++ b/forge-gui/res/cardsfolder/m/martial_coup.txt
@@ -6,6 +6,6 @@ SVar:CoupDestroy:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered | Conditi
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 SVar:NeedsToPlayVar:OwnCreats LEOppCreats
-SVar:OwnCreats:Count$SumPower_Creature.YouCtrl
-SVar:OppCreats:Count$SumPower_Creature.OppCtrl
+SVar:OwnCreats:Count$Valid Creature.YouCtrl$CardPower
+SVar:OppCreats:Count$Valid Creature.OppCtrl$CardPower
 Oracle:Create X 1/1 white Soldier creature tokens. If X is 5 or more, destroy all other creatures.
diff --git a/forge-gui/res/cardsfolder/m/martial_impetus.txt b/forge-gui/res/cardsfolder/m/martial_impetus.txt
index f4838e951c7..351d24c6d1a 100644
--- a/forge-gui/res/cardsfolder/m/martial_impetus.txt
+++ b/forge-gui/res/cardsfolder/m/martial_impetus.txt
@@ -5,5 +5,5 @@ K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Goad$ True | Description$ Enchanted creature gets +1/+1 and is goaded. (It attacks each combat if able and attacks a player other than you if able.)
 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever enchanted creature attacks, each other creature that's attacking one of your opponents gets +1/+1 until end of turn.
-SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.NotTriggeredAttacker+attacking Opponent | NumAtt$ +1 | NumDef$ +1
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.!TriggeredAttacker+attacking Opponent | NumAtt$ +1 | NumDef$ +1
 Oracle:Enchant creature\nEnchanted creature gets +1/+1 and is goaded. (It attacks each combat if able and attacks a player other than you if able.)\nWhenever enchanted creature attacks, each other creature that's attacking one of your opponents gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/martyr_of_bones.txt b/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
index 64b303c4531..fc5c88fd9fa 100644
--- a/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
+++ b/forge-gui/res/cardsfolder/m/martyr_of_bones.txt
@@ -2,7 +2,7 @@ Name:Martyr of Bones
 ManaCost:B
 Types:Creature Human Wizard
 PT:1/1
-A:AB$ ChangeZone | Cost$ 1 Reveal<X/Card.Black> Sac<1/CARDNAME> | CostDesc$ {1}, Reveal X black cards from your hand, Sacrifice CARDNAME: | Origin$ Graveyard | TargetsFromSingleZone$ True | Destination$ Exile | TargetMin$ 0 | TargetMax$ Y | ValidTgts$ Card | SpellDescription$ Exile up to X target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ 1 Reveal<X/Card.Black> Sac<1/CARDNAME> | CostDesc$ {1}, Reveal X black cards from your hand, Sacrifice CARDNAME: | Origin$ Graveyard | TargetsWithSameController$ True | Destination$ Exile | TargetMin$ 0 | TargetMax$ Y | ValidTgts$ Card | SpellDescription$ Exile up to X target cards from a single graveyard.
 SVar:X:TargetedObjects$Amount
 SVar:Y:Count$ValidHand Card.Black+YouOwn
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/m/mary_jane_watson.txt b/forge-gui/res/cardsfolder/m/mary_jane_watson.txt
new file mode 100644
index 00000000000..81be6a3ccf2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/mary_jane_watson.txt
@@ -0,0 +1,7 @@
+Name:Mary Jane Watson
+ManaCost:1 GW
+Types:Legendary Creature Human Performer
+PT:2/2
+T:Mode$ ChangesZone | ValidCard$ Spider.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerZones$ Battlefield | ActivationLimit$ 1 | TriggerDescription$ Whenever a Spider you control enters, draw a card. This ability triggers only once each turn.
+SVar:TrigDraw:DB$ Draw
+Oracle:Whenever a Spider you control enters, draw a card. This ability triggers only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/masked_meower.txt b/forge-gui/res/cardsfolder/m/masked_meower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/masked_meower.txt
rename to forge-gui/res/cardsfolder/m/masked_meower.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/master_pakku.txt b/forge-gui/res/cardsfolder/m/master_pakku.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/master_pakku.txt
rename to forge-gui/res/cardsfolder/m/master_pakku.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/master_piandao.txt b/forge-gui/res/cardsfolder/m/master_piandao.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/master_piandao.txt
rename to forge-gui/res/cardsfolder/m/master_piandao.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/match_the_odds.txt b/forge-gui/res/cardsfolder/m/match_the_odds.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/match_the_odds.txt
rename to forge-gui/res/cardsfolder/m/match_the_odds.txt
diff --git a/forge-gui/res/cardsfolder/m/maximum_carnage.txt b/forge-gui/res/cardsfolder/m/maximum_carnage.txt
new file mode 100644
index 00000000000..dfca7f59cea
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/maximum_carnage.txt
@@ -0,0 +1,10 @@
+Name:Maximum Carnage
+ManaCost:4 R
+Types:Enchantment Saga
+K:Chapter:3:DBEffect,DBMana,DBDamage
+SVar:DBEffect:DB$ Effect | Duration$ UntilYourNextTurn | StaticAbilities$ MustAttack1,MustAttack2 | SpellDescription$ Until your next turn, each creature attacks each combat if able and attacks a player other than you if able.
+SVar:MustAttack1:Mode$ MustAttack | ValidCreature$ Creature | Description$ Until your next turn, each creature attacks each combat if able and attacks a player other than you if able.
+SVar:MustAttack2:Mode$ MustAttack | ValidCreature$ Creature | MustAttack$ Player.Other | Secondary$ True | Description$ Until your next turn, each creature attacks each combat if able and attacks a player other than you if able.
+SVar:DBMana:DB$ Mana | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R}.
+SVar:DBDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 5 | SpellDescription$ This Saga deals 5 damage to each opponent.
+Oracle:(As this Saga enters step and after your draw step, add a lore counter. Sacrifice after III.)\nI — Until your next turn, each creature attacks each combat if able and attacks a player other than you if able.\nII — Add {R}{R}{R}.\nIII — This Saga deals 5 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/m/mazes_end.txt b/forge-gui/res/cardsfolder/m/mazes_end.txt
index 5b0c03d6450..ecee1c92509 100644
--- a/forge-gui/res/cardsfolder/m/mazes_end.txt
+++ b/forge-gui/res/cardsfolder/m/mazes_end.txt
@@ -6,6 +6,6 @@ SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZone | Cost$ 3 T Return<1/CARDNAME> | ChangeType$ Gate | ChangeNum$ 1 | Origin$ Library | Destination$ Battlefield | AILogic$ MazesEnd | SubAbility$ DBWin | SpellDescription$ Search your library for a Gate card, put it onto the battlefield, then shuffle. If you control ten or more Gates with different names, you win the game.
 SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ MazeGate | ConditionSVarCompare$ GE10
-SVar:MazeGate:Count$DifferentCardNames_Gate.YouCtrl+inZoneBattlefield
+SVar:MazeGate:Count$Valid Gate.YouCtrl$DifferentCardNames
 AI:RemoveDeck:Random
 Oracle:Maze's End enters tapped.\n{T}: Add {C}.\n{3}, {T}, Return Maze's End to its owner's hand: Search your library for a Gate card, put it onto the battlefield, then shuffle. If you control ten or more Gates with different names, you win the game.
diff --git a/forge-gui/res/cardsfolder/upcoming/mechanical_glider.txt b/forge-gui/res/cardsfolder/m/mechanical_glider.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mechanical_glider.txt
rename to forge-gui/res/cardsfolder/m/mechanical_glider.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/mechanical_mobster.txt b/forge-gui/res/cardsfolder/m/mechanical_mobster.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mechanical_mobster.txt
rename to forge-gui/res/cardsfolder/m/mechanical_mobster.txt
diff --git a/forge-gui/res/cardsfolder/m/mercenary_informer.txt b/forge-gui/res/cardsfolder/m/mercenary_informer.txt
index 6394ae49401..638074630ba 100644
--- a/forge-gui/res/cardsfolder/m/mercenary_informer.txt
+++ b/forge-gui/res/cardsfolder/m/mercenary_informer.txt
@@ -2,6 +2,6 @@ Name:Mercenary Informer
 ManaCost:2 W
 Types:Creature Human Rebel Mercenary
 PT:2/1
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.Black | Description$ CARDNAME can't be the target of black spells or abilities from black sources.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.Black | Description$ CARDNAME can't be the target of black spells or abilities from black sources.
 A:AB$ ChangeZone | Cost$ 2 W | ValidTgts$ Mercenary | IsCurse$ True | TgtPrompt$ Select target Mercenary | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target Mercenary on the bottom of its owner's library.
 Oracle:Mercenary Informer can't be the target of black spells or abilities from black sources.\n{2}{W}: Put target nontoken Mercenary on the bottom of its owner's library.
diff --git a/forge-gui/res/cardsfolder/upcoming/merchant_of_many_hats.txt b/forge-gui/res/cardsfolder/m/merchant_of_many_hats.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merchant_of_many_hats.txt
rename to forge-gui/res/cardsfolder/m/merchant_of_many_hats.txt
diff --git a/forge-gui/res/cardsfolder/m/merchant_scroll.txt b/forge-gui/res/cardsfolder/m/merchant_scroll.txt
index 2c630b6def4..ba1690e0c71 100644
--- a/forge-gui/res/cardsfolder/m/merchant_scroll.txt
+++ b/forge-gui/res/cardsfolder/m/merchant_scroll.txt
@@ -1,6 +1,6 @@
 Name:Merchant Scroll
 ManaCost:1 U
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Instant.Blue | ChangeNum$ 1 | SpellDescription$ Search your library for a blue instant card, reveal that card, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Instant.Blue | ChangeTypeDesc$ blue instant | SpellDescription$ Search your library for a blue instant card, reveal that card, put it into your hand, then shuffle.
 AI:RemoveDeck:All
 Oracle:Search your library for a blue instant card, reveal that card, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/merciless_enforcers.txt b/forge-gui/res/cardsfolder/m/merciless_enforcers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/merciless_enforcers.txt
rename to forge-gui/res/cardsfolder/m/merciless_enforcers.txt
diff --git a/forge-gui/res/cardsfolder/m/merfolk_looter.txt b/forge-gui/res/cardsfolder/m/merfolk_looter.txt
index 3a2cac37d1e..addf58dc9d7 100644
--- a/forge-gui/res/cardsfolder/m/merfolk_looter.txt
+++ b/forge-gui/res/cardsfolder/m/merfolk_looter.txt
@@ -4,4 +4,5 @@ Types:Creature Merfolk Rogue
 PT:1/1
 A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+DeckHas:Ability$Discard
 Oracle:{T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/m/migration_path.txt b/forge-gui/res/cardsfolder/m/migration_path.txt
index 08becc0292d..64abc1e8909 100644
--- a/forge-gui/res/cardsfolder/m/migration_path.txt
+++ b/forge-gui/res/cardsfolder/m/migration_path.txt
@@ -1,6 +1,6 @@
 Name:Migration Path
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2 | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 K:Cycling:2
 Oracle:Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/m/migratory_greathorn.txt b/forge-gui/res/cardsfolder/m/migratory_greathorn.txt
index 5ab769dd426..18002e002c4 100644
--- a/forge-gui/res/cardsfolder/m/migratory_greathorn.txt
+++ b/forge-gui/res/cardsfolder/m/migratory_greathorn.txt
@@ -4,5 +4,5 @@ Types:Creature Beast
 PT:3/4
 K:Mutate:2 G
 T:Mode$ Mutates | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature mutates, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:Mutate {2}{G} (If you cast this spell for its mutate cost, put it over or under target non-Human creature you own. They mutate into the creature on top plus all abilities from under it.)\nWhenever this creature mutates, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/miles_morales_ultimate_spider_man.txt b/forge-gui/res/cardsfolder/m/miles_morales_ultimate_spider_man.txt
similarity index 94%
rename from forge-gui/res/cardsfolder/upcoming/miles_morales_ultimate_spider_man.txt
rename to forge-gui/res/cardsfolder/m/miles_morales_ultimate_spider_man.txt
index e41e39fdbd6..f134f8f3042 100644
--- a/forge-gui/res/cardsfolder/upcoming/miles_morales_ultimate_spider_man.txt
+++ b/forge-gui/res/cardsfolder/m/miles_morales_ultimate_spider_man.txt
@@ -19,6 +19,6 @@ K:Haste
 A:AB$ PutCounter | PrecostDesc$ Camouflage — | Cost$ 2 | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on CARDNAME. He gains hexproof and becomes colorless until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Hexproof | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Self | Colors$ Colorless | OverwriteColors$ True
-T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDoubleCounters | TriggerZones$ Battlefield | TriggerDescription$ nWhenever you attack, double the number of each kind of counter on each Spider and legendary creature you control.
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigDoubleCounters | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, double the number of each kind of counter on each Spider and legendary creature you control.
 SVar:TrigDoubleCounters:DB$ MultiplyCounter | Defined$ Valid Spider.YouCtrl,Creature.Legendary+YouCtrl | Multiplier$ 2
 Oracle:First strike, haste\nCamouflage — {2}: Put a +1/+1 counter on Ultimate Spider-Man. He gains hexproof and becomes colorless until end of turn.\nWhenever you attack, double the number of each kind of counter on each Spider and legendary creature you control.
diff --git a/forge-gui/res/cardsfolder/m/mindwhip_sliver.txt b/forge-gui/res/cardsfolder/m/mindwhip_sliver.txt
index 12a690a3adb..753f09f017d 100644
--- a/forge-gui/res/cardsfolder/m/mindwhip_sliver.txt
+++ b/forge-gui/res/cardsfolder/m/mindwhip_sliver.txt
@@ -3,5 +3,5 @@ ManaCost:2 B
 Types:Creature Sliver
 PT:2/2
 S:Mode$ Continuous | Affected$ Sliver | AddAbility$ Discard | Description$ All Slivers have "{2}, Sacrifice this permanent: Target player discards a card at random. Activate only as a sorcery."
-SVar:Discard:AB$ Discard | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 1 | Mode$ Random | SpellDescription$ Target player discards a card at random. Activate only any time you could cast a sorcery.
+SVar:Discard:AB$ Discard | Cost$ 2 Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 1 | Mode$ Random | SpellDescription$ Target player discards a card at random. Activate only as a sorcery.
 Oracle:All Slivers have "{2}, Sacrifice this permanent: Target player discards a card at random. Activate only as a sorcery."
diff --git a/forge-gui/res/cardsfolder/m/minion_of_the_mighty.txt b/forge-gui/res/cardsfolder/m/minion_of_the_mighty.txt
index 4e49a9eeec5..a30909b9999 100644
--- a/forge-gui/res/cardsfolder/m/minion_of_the_mighty.txt
+++ b/forge-gui/res/cardsfolder/m/minion_of_the_mighty.txt
@@ -5,6 +5,6 @@ PT:0/1
 K:Menace
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, you may put a Dragon creature card from your hand onto the battlefield tapped and attacking.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Dragon+YouCtrl | Tapped$ True | Attacking$ True
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 DeckHints:Type$Dragon
 Oracle:Menace\nPack tactics — Whenever Minion of the Mighty attacks, if you attacked with creatures with total power 6 or greater this combat, you may put a Dragon creature card from your hand onto the battlefield tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/m/mishras_research_desk.txt b/forge-gui/res/cardsfolder/m/mishras_research_desk.txt
index 72e98666205..fddbef8d588 100644
--- a/forge-gui/res/cardsfolder/m/mishras_research_desk.txt
+++ b/forge-gui/res/cardsfolder/m/mishras_research_desk.txt
@@ -1,7 +1,7 @@
 Name:Mishra's Research Desk
 ManaCost:1
 Types:Artifact
-A:AB$ Dig | Cost$ 1 T Sac<1/CARDNAME> | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Exile the top two cards of your library, then choose one of them. Until the end of your next turn, you may play that card.
+A:AB$ Dig | Cost$ 1 T Sac<1/CARDNAME> | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Exile the top two cards of your library. Choose one of them. Until the end of your next turn, you may play that card.
 SVar:DBChoose:DB$ ChooseCard | Defined$ You | Amount$ 1 | Mandatory$ True | Choices$ Card.IsRemembered | ChoiceZone$ Exile | ChoiceTitle$ Choose one of the exiled cards | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ ChosenCard | Duration$ UntilTheEndOfYourNextTurn | SubAbility$ DBCleanup
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the chosen card this turn.
diff --git a/forge-gui/res/cardsfolder/m/mister_negative.txt b/forge-gui/res/cardsfolder/m/mister_negative.txt
new file mode 100644
index 00000000000..c392ba7aed6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/mister_negative.txt
@@ -0,0 +1,12 @@
+Name:Mister Negative
+ManaCost:5 W B
+Types:Legendary Creature Human Villain
+PT:5/5
+K:Vigilance
+K:Lifelink
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExchangeLife | OptionalDecider$ You | TriggerDescription$ Darkforce Inversion — When CARDNAME enters, you may exchange life totals with target opponent. If you lost life this way, draw that many cards.
+SVar:TrigExchangeLife:DB$ ExchangeLife | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to exchange life totals with | RememberOwnLoss$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$RememberedNumber
+Oracle:Vigilance, lifelink\nDarkforce Inversion — When Mister Negative enters, you may exchange life totals with target opponent. If you lost life this way, draw that many cards.
diff --git a/forge-gui/res/cardsfolder/m/misty_rainforest.txt b/forge-gui/res/cardsfolder/m/misty_rainforest.txt
index 367dd6e6aee..0207fab6398 100644
--- a/forge-gui/res/cardsfolder/m/misty_rainforest.txt
+++ b/forge-gui/res/cardsfolder/m/misty_rainforest.txt
@@ -1,5 +1,5 @@
 Name:Misty Rainforest
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Island | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Island card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Island | SpellDescription$ Search your library for a Forest or Island card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Misty Rainforest: Search your library for a Forest or Island card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/mj_rising_star.txt b/forge-gui/res/cardsfolder/m/mj_rising_star.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mj_rising_star.txt
rename to forge-gui/res/cardsfolder/m/mj_rising_star.txt
diff --git a/forge-gui/res/cardsfolder/m/mob_lookout.txt b/forge-gui/res/cardsfolder/m/mob_lookout.txt
new file mode 100644
index 00000000000..246c421d56c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/mob_lookout.txt
@@ -0,0 +1,7 @@
+Name:Mob Lookout
+ManaCost:1 UB
+Types:Creature Human Rogue Villain
+PT:0/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When this creature enters, target creature you control connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
+SVar:TrigConnive:DB$ Connive | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+Oracle:When this creature enters, target creature you control connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
diff --git a/forge-gui/res/cardsfolder/m/moggcatcher.txt b/forge-gui/res/cardsfolder/m/moggcatcher.txt
index d4a59f15253..b694bac10fe 100644
--- a/forge-gui/res/cardsfolder/m/moggcatcher.txt
+++ b/forge-gui/res/cardsfolder/m/moggcatcher.txt
@@ -2,7 +2,7 @@ Name:Moggcatcher
 ManaCost:2 R R
 Types:Creature Human Mercenary
 PT:2/2
-A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Goblin | ChangeNum$ 1 | SpellDescription$ Search your library for a Goblin permanent card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Goblin | ChangeTypeDesc$ Goblin permanent | SpellDescription$ Search your library for a Goblin permanent card, put it onto the battlefield, then shuffle.
 AI:RemoveDeck:Random
 SVar:NonCombatPriority:3
 Oracle:{3}, {T}: Search your library for a Goblin permanent card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/moldering_gym_weight_room.txt b/forge-gui/res/cardsfolder/m/moldering_gym_weight_room.txt
index 194b112c79a..d5cef8a1722 100644
--- a/forge-gui/res/cardsfolder/m/moldering_gym_weight_room.txt
+++ b/forge-gui/res/cardsfolder/m/moldering_gym_weight_room.txt
@@ -2,7 +2,7 @@ Name:Moldering Gym
 ManaCost:2 G
 Types:Enchantment Room
 T:Mode$ UnlockDoor | ValidPlayer$ You | ValidCard$ Card.Self | ThisDoor$ True | Execute$ TrigSearch | TriggerDescription$ When you unlock this door, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 AlternateMode:Split
 Oracle:(You may cast either half. That door unlocks on the battlefield. As a sorcery, you may pay the mana cost of a locked door to unlock it.)\nWhen you unlock this door, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/m/molten_collapse.txt b/forge-gui/res/cardsfolder/m/molten_collapse.txt
index 3a94f2fd44b..ab49c22cd30 100644
--- a/forge-gui/res/cardsfolder/m/molten_collapse.txt
+++ b/forge-gui/res/cardsfolder/m/molten_collapse.txt
@@ -1,9 +1,9 @@
 Name:Molten Collapse
 ManaCost:B R
 Types:Sorcery
-A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ Count$Compare Y GE1.2.1 | Choices$ DBDestroy,DBDsestroynoncreatue | AdditionalDescription$ . If you descended this turn, you may choose both instead. (You descended if a permanent card was put into your graveyard from anywhere.)
+A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ Count$Compare Y GE1.2.1 | Choices$ DBDestroy,DBDestroyNonCreature | AdditionalDescription$ . If you descended this turn, you may choose both instead. (You descended if a permanent card was put into your graveyard from anywhere.)
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | SpellDescription$ Destroy target creature or planeswalker.
-SVar:DBDsestroynoncreatue:DB$ Destroy | ValidTgts$ Permanent.nonCreature+nonLand+cmcLE1 | TgtPrompt$ Select target noncreature, nonland permanent with mana value 1 or less | SpellDescription$ Destroy target noncreature, nonland permanent with mana value 1 or less.
+SVar:DBDestroyNonCreature:DB$ Destroy | ValidTgts$ Permanent.nonCreature+nonLand+cmcLE1 | TgtPrompt$ Select target noncreature, nonland permanent with mana value 1 or less | SpellDescription$ Destroy target noncreature, nonland permanent with mana value 1 or less.
 SVar:Y:Count$YouDescendedThisTurn
 DeckHints:Ability$Mill|Graveyard|Dredge|Sacrifice
 Oracle:Choose one. If you descended this turn, you may choose both instead. (You descended if a permanent card was put into your graveyard from anywhere.)\n• Destroy target creature or planeswalker.\n• Destroy target noncreature, nonland permanent with mana value 1 or less.
diff --git a/forge-gui/res/cardsfolder/m/molten_man_inferno_incarnate.txt b/forge-gui/res/cardsfolder/m/molten_man_inferno_incarnate.txt
new file mode 100644
index 00000000000..3f3746da46e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/molten_man_inferno_incarnate.txt
@@ -0,0 +1,11 @@
+Name:Molten Man, Inferno Incarnate
+ManaCost:2 R
+Types:Legendary Creature Elemental Villain
+PT:0/0
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When NICKNAME enters, search your library for a basic Mountain card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Mountain.Basic
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ NICKNAME gets +1/+1 for each Mountain you control.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When NICKNAME leaves the battlefield, sacrifice a land.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Land | Defined$ You
+SVar:X:Count$Valid Mountain.YouCtrl
+Oracle:When Molten Man enters, search your library for a basic Mountain card, put it onto the battlefield tapped, then shuffle.\nMolten Man gets +1/+1 for each Mountain you control.\nWhen Molten Man leaves the battlefield, sacrifice a land.
diff --git a/forge-gui/res/cardsfolder/upcoming/momo_friendly_flier.txt b/forge-gui/res/cardsfolder/m/momo_friendly_flier.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/momo_friendly_flier.txt
rename to forge-gui/res/cardsfolder/m/momo_friendly_flier.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/momo_rambunctious_rascal.txt b/forge-gui/res/cardsfolder/m/momo_rambunctious_rascal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/momo_rambunctious_rascal.txt
rename to forge-gui/res/cardsfolder/m/momo_rambunctious_rascal.txt
diff --git a/forge-gui/res/cardsfolder/m/mondassian_colony_ship.txt b/forge-gui/res/cardsfolder/m/mondassian_colony_ship.txt
index b296cec7daa..93ab698e38a 100644
--- a/forge-gui/res/cardsfolder/m/mondassian_colony_ship.txt
+++ b/forge-gui/res/cardsfolder/m/mondassian_colony_ship.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Plane Spacecraft
 T:Mode$ Attacks | ValidCard$ Creature | TriggerZones$ Command | Execute$ AnimosityPump | TriggerDescription$ Whenever a creature attacks, it gets +1/+1 until end of turn for each other creature its controller controls that shares a creature type with it.
 SVar:AnimosityPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X | NumDef$ +X
-SVar:X:Count$Valid Creature.NotTriggeredAttacker+ControlledBy AttackingPlayer+sharesCreatureTypeWith TriggeredAttacker
+SVar:X:Count$Valid Creature.!TriggeredAttacker+ControlledBy AttackingPlayer+sharesCreatureTypeWith TriggeredAttacker
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigSetState | TriggerDescription$ Whenever chaos ensues, turn target creature face down. It becomes a 2/2 Cyberman artifact creature.
 SVar:TrigSetState:DB$ SetState | ValidTgts$ Creature | Mode$ TurnFaceDown | FaceDownSetType$ Artifact & Creature & Cyberman | FaceDownPower$ 2 | FaceDownToughness$ 2
 DeckHas:Type$Cyberman
diff --git a/forge-gui/res/cardsfolder/upcoming/mongoose_lizard.txt b/forge-gui/res/cardsfolder/m/mongoose_lizard.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/mongoose_lizard.txt
rename to forge-gui/res/cardsfolder/m/mongoose_lizard.txt
diff --git a/forge-gui/res/cardsfolder/m/monument_to_perfection.txt b/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
index a4df800d0e8..a39c9e3356b 100644
--- a/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
+++ b/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic,Land.Locus,Land.Sphere | ChangeTypeDesc$ basic, Sphere, or Locus land card | SpellDescription$ Search your library for a basic, Sphere, or Locus land card, reveal it, put it into your hand, then shuffle.
 A:AB$ Animate | Cost$ 3 | CheckSVar$ CountAll | SVarCompare$ GE9 | Power$ 9 | Toughness$ 9 | Types$ Artifact,Creature,Phyrexian,Construct | RemoveCreatureTypes$ True | RemoveAllAbilities$ True | Defined$ Self | Keywords$ Indestructible & Toxic:9 | Duration$ Permanent | SpellDescription$ CARDNAME becomes a 9/9 Phyrexian Construct artifact creature, loses all abilities, and gains indestructible and toxic 9. Activate only if there are nine or more lands with different names among the basic, Sphere, and Locus lands you control.
-SVar:CountAll:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield+Basic,Land.YouCtrl+inZoneBattlefield+Sphere,Land.YouCtrl+inZoneBattlefield+Locus
+SVar:CountAll:Count$Valid Land.YouCtrl+Basic,Sphere.YouCtrl,Locus.YouCtrl$DifferentCardNames
 DeckHas:Type$Phyrexian|Construct|Artifact
 DeckNeeds:Type$Locus|Sphere
 Oracle:{3}, {T}: Search your library for a basic, Sphere, or Locus land card, reveal it, put it into your hand, then shuffle.\n{3}: Monument to Perfection becomes a 9/9 Phyrexian Construct artifact creature, loses all abilities, and gains indestructible and toxic 9. Activate only if there are nine or more lands with different names among the basic, Sphere, and Locus lands you control.
diff --git a/forge-gui/res/cardsfolder/m/morbius_the_living_vampire.txt b/forge-gui/res/cardsfolder/m/morbius_the_living_vampire.txt
new file mode 100644
index 00000000000..23f02c0b74b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/morbius_the_living_vampire.txt
@@ -0,0 +1,9 @@
+Name:Morbius the Living Vampire
+ManaCost:2 U B
+Types:Legendary Creature Vampire Scientist Villain
+PT:3/1
+K:Flying
+K:Vigilance
+K:Lifelink
+A:AB$ Dig | Cost$ U B ExileFromGrave<1/CARDNAME/this card> | ActivationZone$ Graveyard | DigNum$ 3 | ChangeNum$ 1 | NoReveal$ True | StackDescription$ SpellDescription | SpellDescription$ Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
+Oracle:Flying, vigilance, lifelink\n{U}{B}, Exile this card from your graveyard: Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/m/morlun_devourer_of_spiders.txt b/forge-gui/res/cardsfolder/m/morlun_devourer_of_spiders.txt
new file mode 100644
index 00000000000..1840b841ba0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/morlun_devourer_of_spiders.txt
@@ -0,0 +1,10 @@
+Name:Morlun, Devourer of Spiders
+ManaCost:X B B
+Types:Legendary Creature Vampire Villain
+PT:2/1
+K:Lifelink
+K:etbCounter:P1P1:X:no Condition:NICKNAME enters with X +1/+1 counters on him.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When NICKNAME enters, he deals X damage to target opponent.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ X
+SVar:X:Count$xPaid
+Oracle:Lifelink\nMorlun enters with X +1/+1 counters on him.\nWhen Morlun enters, he deals X damage to target opponent.
diff --git a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
index 5507fbb4640..a84a1b62de8 100644
--- a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
+++ b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
@@ -6,5 +6,5 @@ R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementRe
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Play | Cost$ G T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | SpellDescription$ You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Hideaway 4 (When this permanent enters, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\nMosswort Bridge enters tapped.\n{T}: Add {G}.\n{G}, {T}: You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
diff --git a/forge-gui/res/cardsfolder/m/mothrider_cavalry.txt b/forge-gui/res/cardsfolder/m/mothrider_cavalry.txt
index d82b74142a4..1b77fe6e639 100644
--- a/forge-gui/res/cardsfolder/m/mothrider_cavalry.txt
+++ b/forge-gui/res/cardsfolder/m/mothrider_cavalry.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Creature Human Samurai
 PT:2/2
 K:Flying
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Creature.YouOwn+notnamedMothrider Cavalry | PresentZone$ Hand | PresentCompare$ EQ0 | Description$ This spell costs {2} less to cast if you have no other creature cards in hand or if the only other creature cards in your hand are named Mothrider Cavalry.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Creature.YouOwn+!namedMothrider Cavalry | PresentZone$ Hand | PresentCompare$ EQ0 | Description$ This spell costs {2} less to cast if you have no other creature cards in hand or if the only other creature cards in your hand are named Mothrider Cavalry.
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control get +1/+1.
 DeckNeeds:Name$Mothrider Cavalry
 Oracle:This spell costs {2} less to cast if you have no other creature cards in hand or if the only other creature cards in your hand are named Mothrider Cavalry.\nFlying\nOther creatures you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/m/mountain_valley.txt b/forge-gui/res/cardsfolder/m/mountain_valley.txt
index 9bb7cea6777..ec612427231 100644
--- a/forge-gui/res/cardsfolder/m/mountain_valley.txt
+++ b/forge-gui/res/cardsfolder/m/mountain_valley.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Mountain,Forest | ChangeNum$ 1 | SpellDescription$ Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Mountain,Forest | SpellDescription$ Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
 Oracle:Mountain Valley enters tapped.\n{T}, Sacrifice Mountain Valley: Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/multiversal_passage.txt b/forge-gui/res/cardsfolder/m/multiversal_passage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/multiversal_passage.txt
rename to forge-gui/res/cardsfolder/m/multiversal_passage.txt
diff --git a/forge-gui/res/cardsfolder/m/murasa.txt b/forge-gui/res/cardsfolder/m/murasa.txt
index aae59b2230b..85eb4f93a64 100644
--- a/forge-gui/res/cardsfolder/m/murasa.txt
+++ b/forge-gui/res/cardsfolder/m/murasa.txt
@@ -2,7 +2,7 @@ Name:Murasa
 ManaCost:no cost
 Types:Plane Zendikar
 T:Mode$ ChangesZone | ValidCard$ Creature.!token | Origin$ Any | Destination$ Battlefield | TriggerZones$ Command | Execute$ TrigRamp | OptionalDecider$ TriggeredCardController | TriggerDescription$ Whenever a nontoken creature enters, its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TriggeredCardController | ShuffleNonMandatory$ True
+SVar:TrigRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TriggeredCardController | ShuffleNonMandatory$ True
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, target land becomes a 4/4 creature that's still a land.
 SVar:RolledChaos:DB$ Animate | ValidTgts$ Land | Power$ 4 | Toughness$ 4 | Types$ Creature | Duration$ Permanent
 SVar:AIRollPlanarDieParams:Mode$ Always
diff --git a/forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt b/forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt
index a983ffdd9ff..d1c5c2bb2d9 100644
--- a/forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt
+++ b/forge-gui/res/cardsfolder/m/murasa_rootgrazer.txt
@@ -3,6 +3,6 @@ ManaCost:G W
 Types:Creature Beast
 PT:2/3
 K:Vigilance
-A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Optional$ You | AILogic$ AtOppEOT | SpellDescription$ You may put a basic land card from your hand onto the battlefield.
+A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Optional$ You | AILogic$ AtOppEOT | SpellDescription$ You may put a basic land card from your hand onto the battlefield.
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Land.Basic+YouCtrl | TgtPrompt$ Select target basic land you control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target basic land you control to its owner's hand.
 Oracle:Vigilance\n{T}: You may put a basic land card from your hand onto the battlefield.\n{T}: Return target basic land you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/m/mycosynth_wellspring.txt b/forge-gui/res/cardsfolder/m/mycosynth_wellspring.txt
index 4545ca508f3..78bdb3d269b 100644
--- a/forge-gui/res/cardsfolder/m/mycosynth_wellspring.txt
+++ b/forge-gui/res/cardsfolder/m/mycosynth_wellspring.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters or is put into a graveyard from the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | Secondary$ True | TriggerDescription$ When CARDNAME enters or is put into a graveyard from the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 SVar:SacMe:5
 Oracle:When Mycosynth Wellspring enters or is put into a graveyard from the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/myr_turbine.txt b/forge-gui/res/cardsfolder/m/myr_turbine.txt
index a49c136919a..9b534156113 100644
--- a/forge-gui/res/cardsfolder/m/myr_turbine.txt
+++ b/forge-gui/res/cardsfolder/m/myr_turbine.txt
@@ -2,7 +2,7 @@ Name:Myr Turbine
 ManaCost:5
 Types:Artifact
 A:AB$ Token | Cost$ T | TokenAmount$ 1 | TokenScript$ c_1_1_a_myr | TokenOwner$ You | SpellDescription$ Create a 1/1 colorless Myr artifact creature token.
-A:AB$ ChangeZone | Cost$ T tapXType<5/Myr> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Myr | ChangeNum$ 1 | SpellDescription$ Search your library for a Myr creature card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T tapXType<5/Myr> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Myr | ChangeTypeDesc$ Myr creature | SpellDescription$ Search your library for a Myr creature card, put it onto the battlefield, then shuffle.
 DeckHints:Type$Myr
 DeckHas:Ability$Token
 Oracle:{T}: Create a 1/1 colorless Myr artifact creature token.\n{T}, Tap five untapped Myr you control: Search your library for a Myr creature card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/myriad_landscape.txt b/forge-gui/res/cardsfolder/m/myriad_landscape.txt
index b45e8fab1e5..6b46cf526ac 100644
--- a/forge-gui/res/cardsfolder/m/myriad_landscape.txt
+++ b/forge-gui/res/cardsfolder/m/myriad_landscape.txt
@@ -4,5 +4,5 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 2 | ShareLandType$ True | SpellDescription$ Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 2 | ShareLandType$ True | SpellDescription$ Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle.
 Oracle:Myriad Landscape enters tapped.\n{T}: Add {C}.\n{2}, {T}, Sacrifice Myriad Landscape: Search your library for up to two basic land cards that share a land type, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/m/mysterio_master_of_illusion.txt b/forge-gui/res/cardsfolder/m/mysterio_master_of_illusion.txt
new file mode 100644
index 00000000000..1d4bc927fe8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/mysterio_master_of_illusion.txt
@@ -0,0 +1,14 @@
+Name:Mysterio, Master of Illusion
+ManaCost:3 U
+Types:Legendary Creature Human Villain
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create a 3/3 blue Illusion Villain creature token for each nontoken Villain you control. Exile those tokens when NICKNAME leaves the battlefield.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ u_3_3_illusion_villain | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedLKI | Triggers$ TrigExile | Duration$ Permanent | ForgetOnMoved$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigExile:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.EffectSource | Execute$ ExileTwin | TriggerDescription$ Exile those tokens when EFFECTSOURCE leaves the battlefield.
+SVar:ExileTwin:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile
+SVar:X:Count$Valid Villain.!token+YouCtrl
+DeckHas:Ability$Token
+DeckHints:Type$Villain
+Oracle:When Mysterio enters, create a 3/3 blue Illusion Villain creature token for each nontoken Villain you control. Exile those tokens when Mysterio leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/m/mysterios_phantasm.txt b/forge-gui/res/cardsfolder/m/mysterios_phantasm.txt
new file mode 100644
index 00000000000..fc9df269fa3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/m/mysterios_phantasm.txt
@@ -0,0 +1,11 @@
+Name:Mysterio's Phantasm
+ManaCost:1 U
+Types:Creature Illusion Villain
+PT:1/3
+K:Flying
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever this creature attacks, mill a card. (Put the top card of your library into your graveyard.)
+SVar:TrigMill:DB$ Mill | NumCards$ 1
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Mill
+Oracle:Flying, vigilance\nWhenever this creature attacks, mill a card. (Put the top card of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/m/mystical_tutor.txt b/forge-gui/res/cardsfolder/m/mystical_tutor.txt
index 3983fe82e67..d2a344e9bb4 100644
--- a/forge-gui/res/cardsfolder/m/mystical_tutor.txt
+++ b/forge-gui/res/cardsfolder/m/mystical_tutor.txt
@@ -1,7 +1,7 @@
 Name:Mystical Tutor
 ManaCost:U
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | SpellDescription$ Search your library for an instant or sorcery card, reveal it, then shuffle and put that card on top.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Instant,Sorcery | SpellDescription$ Search your library for an instant or sorcery card, reveal it, then shuffle and put that card on top.
 # TODO: The AI will currently search for the most expensive valid card in the library. This can be used to the AI's advantage with careful deck design (which is why this card only works in properly designed AI decks). Consider improving tutoring logic with priorities.
 AI:RemoveDeck:Random
 Oracle:Search your library for an instant or sorcery card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt b/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
index 75ab85f438e..41ae0d4a943 100644
--- a/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
+++ b/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
@@ -7,5 +7,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBVenture | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)
 SVar:DBVenture:DB$ Venture | Defined$ You
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+Other | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ Other creatures you control get +1/+1 as long as you've completed a dungeon.
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:Vigilance\nWhenever Nadaar, Selfless Paladin enters or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)\nOther creatures you control get +1/+1 as long as you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/n/nahiri_the_harbinger.txt b/forge-gui/res/cardsfolder/n/nahiri_the_harbinger.txt
index a21ab759b1d..5e3f685b58d 100644
--- a/forge-gui/res/cardsfolder/n/nahiri_the_harbinger.txt
+++ b/forge-gui/res/cardsfolder/n/nahiri_the_harbinger.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Nahiri
 Loyalty:4
 A:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ 1 | UnlessCost$ Discard<1/Card> | UnlessSwitched$ True | UnlessPayer$ You | SpellDescription$ You may discard a card. If you do, draw a card.
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Enchantment,Artifact.tapped,Creature.tapped | TgtPrompt$ Select target enchantment, tapped artifact, or tapped creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target enchantment, tapped artifact, or tapped creature.
-A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact,Creature | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Search your library for an artifact or creature card, put it onto the battlefield, then shuffle. It gains haste. Return it to your hand at the beginning of the next end step.
+A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact,Creature | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Search your library for an artifact or creature card, put it onto the battlefield, then shuffle. It gains haste. Return it to your hand at the beginning of the next end step.
 SVar:DBPump:DB$ Animate | Keywords$ Haste | Duration$ Permanent | AtEOT$ Hand | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Discard
diff --git a/forge-gui/res/cardsfolder/n/name_sticker_goblin.txt b/forge-gui/res/cardsfolder/n/name_sticker_goblin.txt
index 8c30691d0c9..4ebdf69da62 100644
--- a/forge-gui/res/cardsfolder/n/name_sticker_goblin.txt
+++ b/forge-gui/res/cardsfolder/n/name_sticker_goblin.txt
@@ -2,9 +2,9 @@ Name:"Name Sticker" Goblin
 ManaCost:2 R
 Types:Creature Goblin Guest
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Hand,Stack,Library | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+named"Name Sticker" Goblin | PresentCompare$ LE9 | Execute$ TrigRollDice | TriggerDescription$ When CARDNAME enters from anywhere other than a graveyard or exile, if it's on the battlefield and you control 9 or fewer creatures named "Name Sticker" Goblin, roll a 20-sided die.
+T:Mode$ ChangesZone | ExcludedOrigins$ Graveyard,Exile | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.YouCtrl+named"Name Sticker" Goblin | IsPresent2$ Card.Self | PresentCompare$ LE9 | Execute$ TrigRollDice | TriggerDescription$ When CARDNAME enters from anywhere other than a graveyard or exile, if it's on the battlefield and you control 9 or fewer creatures named "Name Sticker" Goblin, roll a 20-sided die.
 SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-6:DBMana1,7-14:DBMana2,15-20:DBMana3
 SVar:DBMana1:DB$ Mana | Produced$ R | Amount$ 4 | SpellDescription$ 1-6 VERT Add {R}{R}{R}{R}.
 SVar:DBMana2:DB$ Mana | Produced$ R | Amount$ 5 | SpellDescription$ 7-14 VERT Add {R}{R}{R}{R}{R}.
 SVar:DBMana3:DB$ Mana | Produced$ R | Amount$ 6 | SpellDescription$ 15-20 VERT Add {R}{R}{R}{R}{R}{R}.
-Oracle:When this creature enters from anywhere other than a graveyard or exile, if it’s on the battlefield and you control 9 or fewer creatures named “Name Sticker” Goblin, roll a 20-sided die.\n1-6 | Add {R}{R}{R}{R}.\n7-14 | Add {R}{R}{R}{R}{R}.\n15-20 | Add {R}{R}{R}{R}{R}{R}.
+Oracle:When this creature enters from anywhere other than a graveyard or exile, if it's on the battlefield and you control 9 or fewer creatures named "Name Sticker" Goblin, roll a 20-sided die.\n1-6 | Add {R}{R}{R}{R}.\n7-14 | Add {R}{R}{R}{R}{R}.\n15-20 | Add {R}{R}{R}{R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/n/natural_balance.txt b/forge-gui/res/cardsfolder/n/natural_balance.txt
index c84abcd92f3..cc0c1aec172 100644
--- a/forge-gui/res/cardsfolder/n/natural_balance.txt
+++ b/forge-gui/res/cardsfolder/n/natural_balance.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Sorcery
 A:SP$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ BalanceLands | AILogic$ BalanceLands | SpellDescription$ Each player who controls six or more lands chooses five lands they control and sacrifices the rest. Each player who controls four or fewer lands may search their library for up to X basic land cards and put them onto the battlefield, where X is five minus the number of lands they control. Then each player who searched their library this way shuffles.
 SVar:BalanceLands:DB$ Sacrifice | SacValid$ Land | Amount$ SacX | Defined$ Remembered | ConditionCheckSVar$ SacX | ConditionSVarCompare$ GT0 | SubAbility$ FetchLands
-SVar:FetchLands:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ FetchX | DefinedPlayer$ Remembered | ConditionCheckSVar$ FetchX | ConditionSVarCompare$ GT0 | ShuffleNonMandatory$ True
+SVar:FetchLands:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ FetchX | DefinedPlayer$ Remembered | ConditionCheckSVar$ FetchX | ConditionSVarCompare$ GT0 | ShuffleNonMandatory$ True
 SVar:LandsControlled:Count$Valid Land.RememberedPlayerCtrl
 SVar:SacX:SVar$LandsControlled/Minus.5
 SVar:FetchX:Number$5/Minus.LandsControlled
diff --git a/forge-gui/res/cardsfolder/n/natural_connection.txt b/forge-gui/res/cardsfolder/n/natural_connection.txt
index 7ba9871a690..c92bff4a33c 100644
--- a/forge-gui/res/cardsfolder/n/natural_connection.txt
+++ b/forge-gui/res/cardsfolder/n/natural_connection.txt
@@ -1,5 +1,5 @@
 Name:Natural Connection
 ManaCost:2 G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/n/naya_panorama.txt b/forge-gui/res/cardsfolder/n/naya_panorama.txt
index 4f5a74afc75..be8209b8fb9 100644
--- a/forge-gui/res/cardsfolder/n/naya_panorama.txt
+++ b/forge-gui/res/cardsfolder/n/naya_panorama.txt
@@ -2,5 +2,5 @@ Name:Naya Panorama
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Mountain.Basic,Forest.Basic,Plains.Basic | ChangeTypeDesc$ basic Mountain, Forest, or Plains | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Naya Panorama: Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/n/neriv_crackling_vanguard.txt b/forge-gui/res/cardsfolder/n/neriv_crackling_vanguard.txt
index 943d36038bf..b5c3405fbe8 100644
--- a/forge-gui/res/cardsfolder/n/neriv_crackling_vanguard.txt
+++ b/forge-gui/res/cardsfolder/n/neriv_crackling_vanguard.txt
@@ -11,7 +11,7 @@ SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ X | ChangeNum$ All | Destination
 SVar:DBEffectYou:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ Permanent
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | CheckSVar$ Y | Description$ During any turn you attacked with a commander, you may play those cards.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Permanent.token+YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Permanent.YouCtrl+token$DifferentCardNames
 SVar:Y:Count$CreaturesAttackedThisTurn Creature.IsCommander+YouCtrl
 SVar:HasAttackEffect:TRUE
 Oracle:Flying,deathtouch\nWhen Neriv enters, create two 1/1 red Goblin creature tokens.\nWhenever Neriv attacks, exile a number of cards from the top of your library equal to the number of differently named tokens you control. During any turn you attacked with a commander, you may play those cards.
diff --git a/forge-gui/res/cardsfolder/n/new_frontiers.txt b/forge-gui/res/cardsfolder/n/new_frontiers.txt
index 90ea5f9a449..fd8881bcb69 100644
--- a/forge-gui/res/cardsfolder/n/new_frontiers.txt
+++ b/forge-gui/res/cardsfolder/n/new_frontiers.txt
@@ -1,7 +1,7 @@
 Name:New Frontiers
 ManaCost:X G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ Player | ChangeNum$ X | Optional$ True | Tapped$ True | ShuffleNonMandatory$ True | SpellDescription$ Each player may search their library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched their library this way shuffles.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ Player | ChangeNum$ X | Optional$ True | Tapped$ True | ShuffleNonMandatory$ True | SpellDescription$ Each player may search their library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched their library this way shuffles.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 Oracle:Each player may search their library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched their library this way shuffles.
diff --git a/forge-gui/res/cardsfolder/n/news_helicopter.txt b/forge-gui/res/cardsfolder/n/news_helicopter.txt
new file mode 100644
index 00000000000..c7a4a10ba18
--- /dev/null
+++ b/forge-gui/res/cardsfolder/n/news_helicopter.txt
@@ -0,0 +1,8 @@
+Name:News Helicopter
+ManaCost:3
+Types:Artifact Creature Construct
+PT:1/1
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a 1/1 green and white Human Citizen creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ gw_1_1_human_citizen | TokenOwner$ You
+Oracle:Flying\nWhen this creature enters, create a 1/1 green and white Human Citizen creature token.
diff --git a/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt b/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
index a4d3a4f5036..ba0aa0bcabc 100644
--- a/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Nissa
 Loyalty:3
 A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Duration$ Permanent | Keywords$ Trample | SpellDescription$ Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Forest | TgtPrompt$ Choose target forest | TargetMin$ 0 | TargetMax$ 4 | Planeswalker$ True | SpellDescription$ Untap up to four target Forests.
-A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for any number of basic land cards, put them onto the battlefield, then shuffle. Those lands become 4/4 Elemental creatures with trample. They're still lands.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for any number of basic land cards, put them onto the battlefield, then shuffle. Those lands become 4/4 Elemental creatures with trample. They're still lands.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Duration$ Permanent | Keywords$ Trample | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:XFetch:Count$ValidLibrary Land.Basic+YouCtrl
diff --git a/forge-gui/res/cardsfolder/n/nissas_expedition.txt b/forge-gui/res/cardsfolder/n/nissas_expedition.txt
index 28b476ed43b..137c3086ed9 100644
--- a/forge-gui/res/cardsfolder/n/nissas_expedition.txt
+++ b/forge-gui/res/cardsfolder/n/nissas_expedition.txt
@@ -2,5 +2,5 @@ Name:Nissa's Expedition
 ManaCost:4 G
 Types:Sorcery
 K:Convoke
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nSearch your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/n/nissas_renewal.txt b/forge-gui/res/cardsfolder/n/nissas_renewal.txt
index f032639f788..a56ad80cdce 100644
--- a/forge-gui/res/cardsfolder/n/nissas_renewal.txt
+++ b/forge-gui/res/cardsfolder/n/nissas_renewal.txt
@@ -1,6 +1,6 @@
 Name:Nissa's Renewal
 ManaCost:5 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 3 | SubAbility$ DBGainLife | SpellDescription$ Search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle. You gain 7 life.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 3 | SubAbility$ DBGainLife | SpellDescription$ Search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle. You gain 7 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 7
 Oracle:Search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle. You gain 7 life.
diff --git a/forge-gui/res/cardsfolder/n/norman_osborn_green_goblin.txt b/forge-gui/res/cardsfolder/n/norman_osborn_green_goblin.txt
new file mode 100644
index 00000000000..69c8d8dfef4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/n/norman_osborn_green_goblin.txt
@@ -0,0 +1,22 @@
+Name:Norman Osborn
+ManaCost:1 U
+Types:Legendary Creature Human Scientist Villain
+PT:1/1
+AlternateMode:Modal
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigConnive | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, he connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+SVar:TrigConnive:DB$ Connive
+A:AB$ SetState | Cost$ 1 U B R | Defined$ Self | Mode$ Transform | SorcerySpeed$ True | AILogic$ Always | SpellDescription$ Transform CARDNAME. Activate only as a sorcery.
+Oracle:Norman Osborn can't be blocked.\nWhenever Norman Osborn deals combat damage to a player, he connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)\n{1}{U}{B}{R}: Transform Norman Osborn. Activate only as a sorcery.
+
+ALTERNATE
+
+Name:Green Goblin
+ManaCost:1 U B R
+Types:Legendary Creature Goblin Human Villain
+PT:3/3
+K:Flying
+K:Menace
+S:Mode$ ReduceCost | ValidCard$ Card.wasCastFromYourGraveyard | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Spells you cast from your graveyard cost {2} less to cast.
+S:Mode$ Continuous | Affected$ Card.YouOwn+nonLand | AffectedZone$ Graveyard | AddKeyword$ Mayhem:CardManaCost | Description$ Goblin Formula — Each nonland card in your graveyard has mayhem. The mayhem cost is equal to its mana cost. (You may cast a card from your graveyard for its mayhem cost if you discarded it this turn. Timing rules still apply.)
+Oracle:Flying, menace\nSpells you cast from your graveyard cost {2} less to cast.\nGoblin Formula — Each nonland card in your graveyard has mayhem. The mayhem cost is equal to its mana cost. (You may cast a card from your graveyard for its mayhem cost if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/n/not_dead_after_all.txt b/forge-gui/res/cardsfolder/n/not_dead_after_all.txt
index b7e77609139..5107a31ce99 100644
--- a/forge-gui/res/cardsfolder/n/not_dead_after_all.txt
+++ b/forge-gui/res/cardsfolder/n/not_dead_after_all.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Instant
 A:SP$ Animate | Triggers$ TrigChangeZone | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Until end of turn, target creature you control gains "When this creature dies, return it to the battlefield tapped under its owner's control, then create a Wicked Role token attached to it." (Enchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.)
 SVar:TrigChangeZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone2 | TriggerController$ TriggeredCardController | TriggerDescription$ When this creature dies, return it to the battlefield tapped under its owner's control, then create a Wicked Role token attached to it. (Enchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.)
-SVar:TrigChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBToken
+SVar:TrigChangeZone2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredNewCardLKICopy | Tapped$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ role_wicked | TokenOwner$ You | AttachedTo$ TriggeredNewCardLKICopy
 DeckHas:Ability$Token & Type$Role|Aura
 Oracle:Until end of turn, target creature you control gains "When this creature dies, return it to the battlefield tapped under its owner's control, then create a Wicked Role token attached to it." (Enchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.)
diff --git a/forge-gui/res/cardsfolder/o/oashra_cultivator.txt b/forge-gui/res/cardsfolder/o/oashra_cultivator.txt
index fc120716bea..fb0c00ac813 100644
--- a/forge-gui/res/cardsfolder/o/oashra_cultivator.txt
+++ b/forge-gui/res/cardsfolder/o/oashra_cultivator.txt
@@ -2,5 +2,5 @@ Name:Oashra Cultivator
 ManaCost:G
 Types:Creature Human Druid
 PT:0/3
-A:AB$ ChangeZone | Cost$ 2 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 G T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{2}{G}, {T}, Sacrifice Oashra Cultivator: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/o/oath_of_lieges.txt b/forge-gui/res/cardsfolder/o/oath_of_lieges.txt
index e174fdcd218..2b20bfc53a9 100644
--- a/forge-gui/res/cardsfolder/o/oath_of_lieges.txt
+++ b/forge-gui/res/cardsfolder/o/oath_of_lieges.txt
@@ -2,7 +2,7 @@ Name:Oath of Lieges
 ManaCost:1 W
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ LiegesSearch | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player chooses target player who controls more lands than they do and is their opponent. The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle.
-SVar:LiegesSearch:DB$ ChangeZone | TargetingPlayer$ TriggeredPlayer | ValidTgts$ Player.OpponentToActive+withMoreLandsThanActive | TgtPrompt$ Choose target opponent who controls more land than you | DefinedPlayer$ TriggeredPlayer | Chooser$ TriggeredPlayer | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Optional$ True | ShuffleNonMandatory$ True
+SVar:LiegesSearch:DB$ ChangeZone | TargetingPlayer$ TriggeredPlayer | ValidTgts$ Player.OpponentToActive+withMoreLandsThanActive | TgtPrompt$ Choose target opponent who controls more land than you | DefinedPlayer$ TriggeredPlayer | Chooser$ TriggeredPlayer | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Optional$ True | ShuffleNonMandatory$ True
 SVar:NeedsToPlayVar:Z GEY
 SVar:Z:Count$Valid Land.YouDontCtrl+inZoneBattlefield
 SVar:Y:Count$Valid Land.YouCtrl+inZoneBattlefield
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
index 0bb6222a19c..28265705d08 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
@@ -6,8 +6,8 @@ Text:CARDNAME can be your commander.
 A:AB$ LoseLife | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 1 life. You gain life equal to the life lost this way. | StackDescription$ SpellDescription
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ AFLifeLost | StackDescription$ None
 SVar:AFLifeLost:Number$0
-A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You | SubAbility$ DBLoselife | SpellDescription$ Create a 5/5 black Demon creature token with flying. You lose 2 life.
-SVar:DBLoselife:DB$ LoseLife | LifeAmount$ 2
+A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You | SubAbility$ DBLoseLife | SpellDescription$ Create a 5/5 black Demon creature token with flying. You lose 2 life.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Ob Nixilis of the Black Oath | Image$ emblem_ob_nixilis_of_the_black_oath | Stackable$ False | Abilities$ ObGainLife | Duration$ Permanent | SpellDescription$ You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power."
 SVar:ObGainLife:AB$ GainLife | Cost$ 1 B Sac<1/Creature> | ActivationZone$ Command | LifeAmount$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and draw X cards, where X is the sacrificed creature's power.
 SVar:DBDraw:DB$ Draw | NumCards$ X
diff --git a/forge-gui/res/cardsfolder/o/obscura_storefront.txt b/forge-gui/res/cardsfolder/o/obscura_storefront.txt
index 03373ed06b7..591f4f8ee84 100644
--- a/forge-gui/res/cardsfolder/o/obscura_storefront.txt
+++ b/forge-gui/res/cardsfolder/o/obscura_storefront.txt
@@ -4,7 +4,7 @@ Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Plains+Basic,Land.Island+Basic,Land.Swamp+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic,Island.Basic,Swamp.Basic | ChangeTypeDesc$ basic Plains, Island, or Swamp | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
diff --git a/forge-gui/res/cardsfolder/o/old_growth_dryads.txt b/forge-gui/res/cardsfolder/o/old_growth_dryads.txt
index b11bf4391b0..980fe24cdb9 100644
--- a/forge-gui/res/cardsfolder/o/old_growth_dryads.txt
+++ b/forge-gui/res/cardsfolder/o/old_growth_dryads.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Dryad
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, each opponent may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | DefinedPlayer$ Player.Opponent | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | DefinedPlayer$ Player.Opponent | ChangeNum$ 1 | ShuffleNonMandatory$ True
 Oracle:When Old-Growth Dryads enters, each opponent may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt b/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
index 36d52ee68db..824e4d54701 100644
--- a/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
+++ b/forge-gui/res/cardsfolder/o/omarthis_ghostfire_initiate.txt
@@ -8,7 +8,7 @@ T:Mode$ CounterAddedOnce | ValidCard$ Creature.Other+inZoneBattlefield+Colorless
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigManifest | TriggerDescription$ When NICKNAME dies, manifest a number of cards from the top of your library equal to the number of counters on it.
 SVar:TrigManifest:DB$ Manifest | Amount$ Y
-SVar:Y:TriggeredCard$CardCounters.P1P1
+SVar:Y:TriggeredCard$CardCounters.ALL
 DeckHas:Ability$Counters
 DeckHints:Ability$Counters
 Oracle:Omarthis, Ghostfire Initiate enters with X +1/+1 counters on it.\nWhenever you put one or more +1/+1 counters on another colorless creature, you may put a +1/+1 counter on Omarthis.\nWhen Omarthis dies, manifest a number of cards from the top of your library equal to the number of counters on it.
diff --git a/forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt b/forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt
index df869ad556c..239b6021929 100644
--- a/forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt
+++ b/forge-gui/res/cardsfolder/o/omen_of_the_hunt.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Enchantment
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | ShuffleNonMandatory$ True
 A:AB$ Scry | Cost$ 2 G Sac<1/CARDNAME> | ScryNum$ 2 | AILogic$ BestOpportunity | SpellDescription$ Scry 2.
 Oracle:Flash\nWhen Omen of the Hunt enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\n{2}{G}, Sacrifice Omen of the Hunt: Scry 2.
diff --git a/forge-gui/res/cardsfolder/o/ominous_asylum.txt b/forge-gui/res/cardsfolder/o/ominous_asylum.txt
new file mode 100644
index 00000000000..527059a2496
--- /dev/null
+++ b/forge-gui/res/cardsfolder/o/ominous_asylum.txt
@@ -0,0 +1,8 @@
+Name:Ominous Asylum
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
+A:AB$ Surveil | Cost$ 4 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:This land enters tapped.\n{T}: Add {B} or {R}.\n{4}, {T}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/o/ominous_parcel.txt b/forge-gui/res/cardsfolder/o/ominous_parcel.txt
index feea1c008e8..1309ee5e763 100644
--- a/forge-gui/res/cardsfolder/o/ominous_parcel.txt
+++ b/forge-gui/res/cardsfolder/o/ominous_parcel.txt
@@ -1,6 +1,6 @@
 Name:Ominous Parcel
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 A:AB$ DealDamage | Cost$ 5 T Sac<1/CARDNAME> | ValidTgts$ Creature | NumDmg$ 4 | SpellDescription$ It deals 4 damage to target creature.
 Oracle:{2}, {T}, Sacrifice Ominous Parcel: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{5}, {T}, Sacrifice Ominous Parcel: It deals 4 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/o/ondu_giant.txt b/forge-gui/res/cardsfolder/o/ondu_giant.txt
index 5889a7f30bd..7ef64a2b588 100644
--- a/forge-gui/res/cardsfolder/o/ondu_giant.txt
+++ b/forge-gui/res/cardsfolder/o/ondu_giant.txt
@@ -3,5 +3,5 @@ ManaCost:3 G
 Types:Creature Giant Druid
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 Oracle:When Ondu Giant enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/o/one_with_nature.txt b/forge-gui/res/cardsfolder/o/one_with_nature.txt
index 76a2a6aca03..7baa3e00694 100644
--- a/forge-gui/res/cardsfolder/o/one_with_nature.txt
+++ b/forge-gui/res/cardsfolder/o/one_with_nature.txt
@@ -5,5 +5,5 @@ K:Enchant:Creature
 SVar:AttachAITgts:Card.powerGE1
 SVar:AttachAILogic:Pump
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChange | CombatDamage$ True | TriggerDescription$ Whenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Enchant creature\nWhenever enchanted creature deals combat damage to a player, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/o/open_the_armory.txt b/forge-gui/res/cardsfolder/o/open_the_armory.txt
index 085ca9dd571..73a5e1ddaf6 100644
--- a/forge-gui/res/cardsfolder/o/open_the_armory.txt
+++ b/forge-gui/res/cardsfolder/o/open_the_armory.txt
@@ -1,6 +1,6 @@
 Name:Open the Armory
 ManaCost:1 W
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Aura,Equipment | ChangeNum$ 1 | SpellDescription$ Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Aura,Equipment | SpellDescription$ Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
 AI:RemoveDeck:Random
 Oracle:Search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/o/ordeal_of_nylea.txt b/forge-gui/res/cardsfolder/o/ordeal_of_nylea.txt
index 4698a3e9830..b89fe747183 100644
--- a/forge-gui/res/cardsfolder/o/ordeal_of_nylea.txt
+++ b/forge-gui/res/cardsfolder/o/ordeal_of_nylea.txt
@@ -7,7 +7,7 @@ T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigPutCounter | Trigger
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredAttackerLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | ConditionDefined$ TriggeredAttackerLKICopy | ConditionPresent$ Card.counters_GE3_P1P1
 T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ When you sacrifice CARDNAME, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigDiscard:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2
+SVar:TrigDiscard:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
 SVar:SacMe:4
diff --git a/forge-gui/res/cardsfolder/upcoming/origin_of_spider_man.txt b/forge-gui/res/cardsfolder/o/origin_of_spider_man.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/origin_of_spider_man.txt
rename to forge-gui/res/cardsfolder/o/origin_of_spider_man.txt
diff --git a/forge-gui/res/cardsfolder/o/ormos_archive_keeper.txt b/forge-gui/res/cardsfolder/o/ormos_archive_keeper.txt
index a8162c859d5..417b4d2919c 100644
--- a/forge-gui/res/cardsfolder/o/ormos_archive_keeper.txt
+++ b/forge-gui/res/cardsfolder/o/ormos_archive_keeper.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Flying
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | IsPresent$ Card.YouOwn | PresentZone$ Library | PresentCompare$ EQ0 | ReplaceWith$ AddCounters | Description$ If you would draw a card while your library has no cards in it, instead put five +1/+1 counters on CARDNAME.
 SVar:AddCounters:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 5 | Defined$ Self
-A:AB$ Draw | Cost$ 1 U U Discard<3/DifferentNames> | NumCards$ 5 | SpellDescription$ Draw five cards.
+A:AB$ Draw | Cost$ 1 U U Discard<3/Card+WithDifferentNames> | NumCards$ 5 | SpellDescription$ Draw five cards.
 AI:RemoveDeck:All
 Oracle:Flying\nIf you would draw a card while your library has no cards in it, instead put five +1/+1 counters on Ormos, Archive Keeper.\n{1}{U}{U}, Discard three cards with different names: Draw five cards.
diff --git a/forge-gui/res/cardsfolder/o/orochi_colony.txt b/forge-gui/res/cardsfolder/o/orochi_colony.txt
index 65da5a78198..ad0da2087ef 100644
--- a/forge-gui/res/cardsfolder/o/orochi_colony.txt
+++ b/forge-gui/res/cardsfolder/o/orochi_colony.txt
@@ -2,7 +2,7 @@ Name:Orochi Colony
 ManaCost:no cost
 Types:Plane Kamigawa
 T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigRamp | TriggerZones$ Command | TriggerDescription$ Whenever a creature you control deals combat damage to a player, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigRamp:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, target creature can't be blocked this turn.
 SVar:RolledChaos:DB$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/o/oscorp_industries.txt b/forge-gui/res/cardsfolder/o/oscorp_industries.txt
new file mode 100644
index 00000000000..6033bd39bee
--- /dev/null
+++ b/forge-gui/res/cardsfolder/o/oscorp_industries.txt
@@ -0,0 +1,10 @@
+Name:Oscorp Industries
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When this land enters from a graveyard, you lose 2 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2
+A:AB$ Mana | Cost$ T | Produced$ Combo U B R | SpellDescription$ Add {U}, {B}, or {R}.
+K:Mayhem
+Oracle:This land enters tapped.\nWhen this land enters from a graveyard, you lose 2 life.\n{T}: Add {U}, {B}, or {R}.\nMayhem (You may play this card from your graveyard if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/upcoming/oscorp_research_team.txt b/forge-gui/res/cardsfolder/o/oscorp_research_team.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/oscorp_research_team.txt
rename to forge-gui/res/cardsfolder/o/oscorp_research_team.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/ostrich_horse.txt b/forge-gui/res/cardsfolder/o/ostrich_horse.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ostrich_horse.txt
rename to forge-gui/res/cardsfolder/o/ostrich_horse.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/otter_penguin.txt b/forge-gui/res/cardsfolder/o/otter_penguin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/otter_penguin.txt
rename to forge-gui/res/cardsfolder/o/otter_penguin.txt
diff --git a/forge-gui/res/cardsfolder/o/overwhelming_splendor.txt b/forge-gui/res/cardsfolder/o/overwhelming_splendor.txt
index 55017f773f2..1520f75730a 100644
--- a/forge-gui/res/cardsfolder/o/overwhelming_splendor.txt
+++ b/forge-gui/res/cardsfolder/o/overwhelming_splendor.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura Curse
 K:Enchant:Player
 SVar:AttachAILogic:Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedPlayerCtrl | SetPower$ 1 | SetToughness$ 1 | RemoveAllAbilities$ True | Description$ Creatures enchanted player controls lose all abilities and have base power and toughness 1/1.
-S:Mode$ CantBeActivated | Activator$ Player.EnchantedBy | ValidSA$ Activated.nonManaAbility+!Loyalty | Description$ Enchanted player can't activate abilities that aren't mana abilities or loyalty abilities.
+S:Mode$ CantBeActivated | Activator$ Player.EnchantedBy | ValidSA$ Activated.!ManaAbility+!Loyalty | Description$ Enchanted player can't activate abilities that aren't mana abilities or loyalty abilities.
 Oracle:Enchant player\nCreatures enchanted player controls lose all abilities and have base power and toughness 1/1.\nEnchanted player can't activate abilities that aren't mana abilities or loyalty abilities.
diff --git a/forge-gui/res/cardsfolder/o/owlbear_shepherd.txt b/forge-gui/res/cardsfolder/o/owlbear_shepherd.txt
index 263da52d739..0a7c297df69 100644
--- a/forge-gui/res/cardsfolder/o/owlbear_shepherd.txt
+++ b/forge-gui/res/cardsfolder/o/owlbear_shepherd.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Goblin Druid
 PT:1/4
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE8 | TriggerDescription$ At the beginning of your end step, if creatures you control have total power 8 or greater, draw a card.
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:At the beginning of your end step, if creatures you control have total power 8 or greater, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/ozais_cruelty.txt b/forge-gui/res/cardsfolder/o/ozais_cruelty.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ozais_cruelty.txt
rename to forge-gui/res/cardsfolder/o/ozais_cruelty.txt
diff --git a/forge-gui/res/cardsfolder/p/parker_luck.txt b/forge-gui/res/cardsfolder/p/parker_luck.txt
new file mode 100644
index 00000000000..802200a0944
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/parker_luck.txt
@@ -0,0 +1,12 @@
+Name:Parker Luck
+ManaCost:2 B
+Types:Enchantment
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, two target players each reveal the top card of their library. They each lose life equal to the mana value of the card revealed by the other player. Then they each put the card they revealed into their hand.
+SVar:TrigReveal:DB$ PeekAndReveal | NoPeek$ True | ValidTgts$ Player | TgtPrompt$ Choose two target players | TargetMin$ 2 | TargetMax$ 2 | RememberRevealed$ True | SubAbility$ DBRepeatEach
+SVar:DBRepeatEach:DB$ RepeatEach | RepeatPlayers$ Targeted | RepeatSubAbility$ DBLoseLife | SubAbility$ DBChangeZoneAll
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Hand | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$ValidLibrary Card.IsRemembered+!RememberedPlayerOwn$CardManaCost
+AI:RemoveDeck:All
+Oracle:At the beginning of your end step, two target players each reveal the top card of their library. They each lose life equal to the mana value of the card revealed by the other player. Then they each put the card they revealed into their hand.
diff --git a/forge-gui/res/cardsfolder/p/passenger_ferry.txt b/forge-gui/res/cardsfolder/p/passenger_ferry.txt
new file mode 100644
index 00000000000..51390945035
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/passenger_ferry.txt
@@ -0,0 +1,11 @@
+Name:Passenger Ferry
+ManaCost:3
+Types:Artifact Vehicle
+PT:4/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | TriggerDescription$ When this Vehicle attacks, you may pay {U}. When you do, another target attacking creature can't be blocked this turn.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ U | Execute$ TrigUnblockable | TriggerDescription$ When you do, another target attacking creature can't be blocked this turn.
+SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature.Other+attacking | TgtPrompt$ Select another target attacking creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+K:Crew:2
+SVar:HasAttackEffect:TRUE
+Oracle:When this Vehicle attacks, you may pay {U}. When you do, another target attacking creature can't be blocked this turn.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/p/path_of_the_animist.txt b/forge-gui/res/cardsfolder/p/path_of_the_animist.txt
index c5bbead63b2..de0fa4933b4 100644
--- a/forge-gui/res/cardsfolder/p/path_of_the_animist.txt
+++ b/forge-gui/res/cardsfolder/p/path_of_the_animist.txt
@@ -1,7 +1,7 @@
 Name:Path of the Animist
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBSpace | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBSpace | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
 SVar:DBSpace:DB$ BlankLine | SubAbility$ DBVote | SpellDescription$ ,,,,,,
 SVar:DBVote:DB$ Vote | Defined$ Player | Choices$ DBPlaneswalk,DBChaos | VoteTiedAbility$ DBChaos | StackDescription$ SpellDescription | SpellDescription$ Will of the Planeswalkers — Starting with you, each player votes for planeswalk or chaos. If planeswalk gets more votes, planeswalk. If chaos gets more votes or the vote is tied, chaos ensues.
 SVar:DBPlaneswalk:DB$ Planeswalk | SpellDescription$ Planeswalk
diff --git a/forge-gui/res/cardsfolder/p/path_to_exile.txt b/forge-gui/res/cardsfolder/p/path_to_exile.txt
index 0f64e9a4ef6..d688dfa4553 100644
--- a/forge-gui/res/cardsfolder/p/path_to_exile.txt
+++ b/forge-gui/res/cardsfolder/p/path_to_exile.txt
@@ -2,5 +2,5 @@ Name:Path to Exile
 ManaCost:W
 Types:Instant
 A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBChange | StackDescription$ Exile {c:Targeted}. {p:TargetedController} may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle their library. | SpellDescription$ Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | StackDescription$ None
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | StackDescription$ None
 Oracle:Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/path_to_redemption.txt b/forge-gui/res/cardsfolder/p/path_to_redemption.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/path_to_redemption.txt
rename to forge-gui/res/cardsfolder/p/path_to_redemption.txt
diff --git a/forge-gui/res/cardsfolder/p/path_to_the_festival.txt b/forge-gui/res/cardsfolder/p/path_to_the_festival.txt
index 8cbb222daf7..de048866373 100644
--- a/forge-gui/res/cardsfolder/p/path_to_the_festival.txt
+++ b/forge-gui/res/cardsfolder/p/path_to_the_festival.txt
@@ -1,7 +1,7 @@
 Name:Path to the Festival
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBScry | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Then if there are three or more basic land types among lands you control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | SubAbility$ DBScry | StackDescription$ SpellDescription | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Then if there are three or more basic land types among lands you control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 SVar:DBScry:DB$ Scry | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | ScryNum$ 1
 SVar:X:PlayerCountPropertyYou$DomainPlayer
 K:Flashback:4 G
diff --git a/forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt b/forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt
index 6efc1b9aea4..279e9043ff5 100644
--- a/forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt
+++ b/forge-gui/res/cardsfolder/p/path_to_the_world_tree.txt
@@ -2,7 +2,7 @@ Name:Path to the World Tree
 ManaCost:1 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 A:AB$ GainLife | Cost$ 2 W U B R G Sac<1/CARDNAME> | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ You gain 2 life and draw two cards. Target opponent loses 2 life. CARDNAME deals 2 damage to up to one target creature. You create a 2/2 green Bear creature token.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | ValidTgts$ Player.Opponent | TgtPrompt$ Choose an opponent | LifeAmount$ 2 | SubAbility$ DBDamage
diff --git a/forge-gui/res/cardsfolder/p/patron_of_the_kitsune.txt b/forge-gui/res/cardsfolder/p/patron_of_the_kitsune.txt
index bb976591943..70c096c3593 100644
--- a/forge-gui/res/cardsfolder/p/patron_of_the_kitsune.txt
+++ b/forge-gui/res/cardsfolder/p/patron_of_the_kitsune.txt
@@ -3,7 +3,7 @@ ManaCost:4 W W
 Types:Legendary Creature Spirit
 PT:5/6
 K:Offering:Fox
-T:Mode$ Attacks | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ PatronLife | OptionalDecider$ You | TriggerDescription$ Whenever a creature attacks, you gain 1 life.
+T:Mode$ Attacks | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ PatronLife | OptionalDecider$ You | TriggerDescription$ Whenever a creature attacks, you may gain 1 life.
 SVar:PatronLife:DB$ GainLife | LifeAmount$ 1
 AI:RemoveDeck:All
 Oracle:Fox offering (You may cast this card any time you could cast an instant by sacrificing a Fox and paying the difference in mana costs between this and the sacrificed Fox. Mana cost includes color.)\nWhenever a creature attacks, you may gain 1 life.
diff --git a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
index 6e654efec85..63465a16274 100644
--- a/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
+++ b/forge-gui/res/cardsfolder/p/pawn_of_ulamog.txt
@@ -2,7 +2,7 @@ Name:Pawn of Ulamog
 ManaCost:1 B B
 Types:Creature Vampire Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+!token+YouCtrl,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+!token+YouCtrl,Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
diff --git a/forge-gui/res/cardsfolder/p/peace_talks.txt b/forge-gui/res/cardsfolder/p/peace_talks.txt
index 5b5a749263f..0ea21ebf9bb 100644
--- a/forge-gui/res/cardsfolder/p/peace_talks.txt
+++ b/forge-gui/res/cardsfolder/p/peace_talks.txt
@@ -3,6 +3,5 @@ ManaCost:1 W
 Types:Sorcery
 A:SP$ Effect | AILogic$ PeaceTalks | Stackable$ False | StaticAbilities$ STCantAttack,STCantTarget,STCantTargetPlayer | Duration$ ThisTurnAndNextTurn | SpellDescription$ This turn and next turn, creatures can't attack, and players and permanents can't be the targets of spells or activated abilities.
 SVar:STCantAttack:Mode$ CantAttack | ValidCard$ Creature | Description$ Creatures can't attack.
-SVar:STCantTarget:Mode$ CantTarget | ValidCard$ Permanent | ValidSA$ Spell,Activated | Description$ Permanents can't be the targets of spells or activated abilities.
-SVar:STCantTargetPlayer:Mode$ CantTarget | ValidPlayer$ Player | ValidSA$ Spell,Activated | Description$ Players can't be the targets of spells or activated abilities.
+SVar:STCantTarget:Mode$ CantTarget | ValidTarget$ Card.Permanent,Player | ValidSA$ Spell,Activated | Description$ Players and Permanents can't be the targets of spells or activated abilities.
 Oracle:This turn and next turn, creatures can't attack, and players and permanents can't be the targets of spells or activated abilities.
diff --git a/forge-gui/res/cardsfolder/p/peregrination.txt b/forge-gui/res/cardsfolder/p/peregrination.txt
index 7c2a934fa4b..fc3fb85d0b3 100644
--- a/forge-gui/res/cardsfolder/p/peregrination.txt
+++ b/forge-gui/res/cardsfolder/p/peregrination.txt
@@ -1,7 +1,7 @@
 Name:Peregrination
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Shuffle, then scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to two basic land cards, reveal those cards, and put one onto the battlefield tapped and the other into your hand. Shuffle, then scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBScry
diff --git a/forge-gui/res/cardsfolder/p/perilous_landscape.txt b/forge-gui/res/cardsfolder/p/perilous_landscape.txt
index cd2635a4da7..cfed140ef59 100644
--- a/forge-gui/res/cardsfolder/p/perilous_landscape.txt
+++ b/forge-gui/res/cardsfolder/p/perilous_landscape.txt
@@ -2,6 +2,6 @@ Name:Perilous Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Island+Basic,Land.Mountain+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Island, Mountain, or Plains card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Island.Basic,Mountain.Basic,Plains.Basic | ChangeTypeDesc$ basic Island, Mountain, or Plains | SpellDescription$ Search your library for a basic Island, Mountain, or Plains card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:U R W
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Perilous Landscape: Search your library for a basic Island, Mountain, or Plains card, put it onto the battlefield tapped, then shuffle.\nCycling {U}{R}{W} ({U}{R}{W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/p/perish_the_thought.txt b/forge-gui/res/cardsfolder/p/perish_the_thought.txt
index 06b70ed0a78..8bc23bd9df2 100644
--- a/forge-gui/res/cardsfolder/p/perish_the_thought.txt
+++ b/forge-gui/res/cardsfolder/p/perish_the_thought.txt
@@ -1,6 +1,6 @@
 Name:Perish the Thought
 ManaCost:2 B
 Types:Sorcery
-A:SP$ RevealHand | Defined$ Targeted | ValidTgts$ Opponent | SubAbility$ ShuffleCardtoLib | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals their hand.
-SVar:ShuffleCardtoLib:DB$ ChangeZone | Origin$ Hand | Destination$ Library | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Shuffle$ True | Mandatory$ True | AlreadyRevealed$ True | StackDescription$ SpellDescription | SpellDescription$ You choose a card from it. That player shuffles that card into their library.
+A:SP$ RevealHand | Defined$ Targeted | ValidTgts$ Opponent | SubAbility$ ShuffleCardToLib | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals their hand.
+SVar:ShuffleCardToLib:DB$ ChangeZone | Origin$ Hand | Destination$ Library | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card | ChangeNum$ 1 | IsCurse$ True | Shuffle$ True | Mandatory$ True | AlreadyRevealed$ True | StackDescription$ SpellDescription | SpellDescription$ You choose a card from it. That player shuffles that card into their library.
 Oracle:Target opponent reveals their hand. You choose a card from it. That player shuffles that card into their library.
diff --git a/forge-gui/res/cardsfolder/p/pestilent_cauldron_restorative_burst.txt b/forge-gui/res/cardsfolder/p/pestilent_cauldron_restorative_burst.txt
index e5305fb1f01..b79687adb06 100644
--- a/forge-gui/res/cardsfolder/p/pestilent_cauldron_restorative_burst.txt
+++ b/forge-gui/res/cardsfolder/p/pestilent_cauldron_restorative_burst.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Artifact
 A:AB$ Token | Cost$ T Discard<1/Card> | TokenScript$ bg_1_1_pest_lifegain | StackDescription$ SpellDescription | SpellDescription$ Create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."
 A:AB$ Mill | Cost$ 1 T | Defined$ Opponent | NumCards$ X | SpellDescription$ Each opponent mills cards equal to the amount of life you gained this turn.
-A:AB$ ChangeZone | Cost$ 4 T | TargetMin$ 4 | TargetMax$ 4 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose four target cards from a single graveyard | ValidTgts$ Card | SubAbility$ DBDraw | StackDescription$ Exile four target cards from a single graveyard. ({c:Targeted}) | SpellDescription$ Exile four target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ 4 T | TargetMin$ 4 | TargetMax$ 4 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose four target cards from a single graveyard | ValidTgts$ Card | SubAbility$ DBDraw | StackDescription$ Exile four target cards from a single graveyard. ({c:Targeted}) | SpellDescription$ Exile four target cards from a single graveyard.
 SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 SVar:X:Count$LifeYouGainedThisTurn
 DeckHas:Ability$Discard|Token|LifeGain|Mill|Graveyard
diff --git a/forge-gui/res/cardsfolder/upcoming/peter_parker_amazing_spider_man.txt b/forge-gui/res/cardsfolder/p/peter_parker_amazing_spider_man.txt
similarity index 71%
rename from forge-gui/res/cardsfolder/upcoming/peter_parker_amazing_spider_man.txt
rename to forge-gui/res/cardsfolder/p/peter_parker_amazing_spider_man.txt
index b48cb3f3f37..7d3b1cdfc9e 100644
--- a/forge-gui/res/cardsfolder/upcoming/peter_parker_amazing_spider_man.txt
+++ b/forge-gui/res/cardsfolder/p/peter_parker_amazing_spider_man.txt
@@ -16,6 +16,5 @@ Types:Legendary Creature Spider Human Hero
 PT:4/4
 K:Vigilance
 K:Reach
-S:Mode$ Continuous | Affected$ Legendary.YouCtrl+wasCast+nonColorless | AffectedZone$ Stack | AddKeyword$ Web-slinging:G W U:Spell.Legendary+nonColorless | Description$ Each legendary spell you cast that’s one or more colors has web-slinging {G}{W}{U}. (You may cast a spell for its web-slinging cost if you also return a tapped creature you control to its owner’s hand.)
-Oracle:Vigilance, reach\nEach legendary spell you cast that’s one or more colors has web-slinging {G}{W}{U}. (You may cast a spell for its web-slinging cost if you also return a tapped creature you control to its owner’s hand.)
-
+S:Mode$ Continuous | Affected$ Legendary.YouCtrl+wasCast+nonColorless | AffectedZone$ Stack | AddKeyword$ Web-slinging:G W U:Spell.Legendary+nonColorless | Description$ Each legendary spell you cast that's one or more colors has web-slinging {G}{W}{U}. (You may cast a spell for its web-slinging cost if you also return a tapped creature you control to its owner's hand.)
+Oracle:Vigilance, reach\nEach legendary spell you cast that's one or more colors has web-slinging {G}{W}{U}. (You may cast a spell for its web-slinging cost if you also return a tapped creature you control to its owner's hand.)
diff --git a/forge-gui/res/cardsfolder/p/peter_parkers_camera.txt b/forge-gui/res/cardsfolder/p/peter_parkers_camera.txt
new file mode 100644
index 00000000000..4054f171af5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/peter_parkers_camera.txt
@@ -0,0 +1,6 @@
+Name:Peter Parker's Camera
+ManaCost:1
+Types:Artifact
+K:etbCounter:FILM:3
+A:AB$ CopySpellAbility | Cost$ 2 T SubCounter<1/FILM> | TargetType$ Activated.YouCtrl,Triggered.YouCtrl | ValidTgts$ Card,Emblem | TgtPrompt$ Choose target activated or triggered ability you control | MayChooseTarget$ True | SpellDescription$ Copy target activated or triggered ability you control. You may choose new targets for the copy.
+Oracle:This artifact enters with three film counters on it.\n{2}, {T}, Remove a film counter from this artifact: Copy target activated or triggered ability you control. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_dreadnought.txt b/forge-gui/res/cardsfolder/p/phyrexian_dreadnought.txt
index 24550a572d9..ef898fe7ea4 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_dreadnought.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_dreadnought.txt
@@ -11,7 +11,7 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:TotalPower:Remembered$CardPower
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:NeedsToPlayVar:Y GE12
-SVar:Y:Count$SumPower_Creature.YouCtrl+notnamedPhyrexian Dreadnought
+SVar:Y:Count$Valid Creature.YouCtrl+!namedPhyrexian Dreadnought$CardPower
 AI:RemoveDeck:Random
 DeckHas:Ability$Sacrifice
 Oracle:Trample\nWhen Phyrexian Dreadnought enters, sacrifice it unless you sacrifice any number of creatures with total power 12 or greater.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_reaper.txt b/forge-gui/res/cardsfolder/p/phyrexian_reaper.txt
index 89f93143f86..a04f8e79922 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_reaper.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_reaper.txt
@@ -2,6 +2,6 @@ Name:Phyrexian Reaper
 ManaCost:4 B
 Types:Creature Phyrexian Zombie
 PT:3/3
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.Green | Execute$ TrigDestroyBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a green creature, destroy that creature. It can't be regenerated.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.Green | Execute$ TrigDestroyBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a green creature, destroy that creature. It can't be regenerated.
 SVar:TrigDestroyBlocker:DB$ Destroy | Defined$ TriggeredBlockerLKICopy | NoRegen$ True
 Oracle:Whenever Phyrexian Reaper becomes blocked by a green creature, destroy that creature. It can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_slayer.txt b/forge-gui/res/cardsfolder/p/phyrexian_slayer.txt
index a1329a6535b..44d48e2792a 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_slayer.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_slayer.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Phyrexian Minion
 PT:2/2
 K:Flying
-T:Mode$ AttackerBlocked | ValidCard$ Card.Self | ValidBlocker$ Creature.White | Execute$ TrigDestroyBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a white creature, destroy that creature. It can't be regenerated.
+T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature.White | Execute$ TrigDestroyBlocker | TriggerDescription$ Whenever CARDNAME becomes blocked by a white creature, destroy that creature. It can't be regenerated.
 SVar:TrigDestroyBlocker:DB$ Destroy | Defined$ TriggeredBlockerLKICopy | NoRegen$ True
 AI:RemoveDeck:Random
 Oracle:Flying\nWhenever Phyrexian Slayer becomes blocked by a white creature, destroy that creature. It can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/p/pictures_of_spider_man.txt b/forge-gui/res/cardsfolder/p/pictures_of_spider_man.txt
new file mode 100644
index 00000000000..9408e9fb5a2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/pictures_of_spider_man.txt
@@ -0,0 +1,8 @@
+Name:Pictures of Spider-Man
+ManaCost:2 G
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When this artifact enters, look at the top five cards of your library. You may reveal up to two creature cards from among them and put them into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 2 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Creature | RestRandomOrder$ True
+A:AB$ Token | Cost$ 1 T Sac<1/CARDNAME> | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token.
+DeckHas:Ability$Sacrifice|Token & Type$Treasure
+Oracle:When this artifact enters, look at the top five cards of your library. You may reveal up to two creature cards from among them and put them into your hand. Put the rest on the bottom of your library in a random order.\n{1}, {T}, Sacrifice this artifact: Create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/p/pilfering_imp.txt b/forge-gui/res/cardsfolder/p/pilfering_imp.txt
index 68057c35d4c..316556ee8a5 100644
--- a/forge-gui/res/cardsfolder/p/pilfering_imp.txt
+++ b/forge-gui/res/cardsfolder/p/pilfering_imp.txt
@@ -3,5 +3,5 @@ ManaCost:B
 Types:Creature Imp
 PT:1/1
 K:Flying
-A:AB$ Discard | Cost$ 1 B T Sac<1/CARDNAME> | ValidTgts$ Player | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Target player reveals their hand. You choose a nonland card from it. That player discards that card. Activate only any time you could cast a sorcery.
+A:AB$ Discard | Cost$ 1 B T Sac<1/CARDNAME> | ValidTgts$ Player | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Target player reveals their hand. You choose a nonland card from it. That player discards that card. Activate only as a sorcery.
 Oracle:Flying\n{1}{B}, {T}, Sacrifice Pilfering Imp: Target opponent reveals their hand. You choose a nonland card from it. That player discards that card. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/p/pilgrims_eye.txt b/forge-gui/res/cardsfolder/p/pilgrims_eye.txt
index 1c7d14ba92a..b2e290bf9b3 100644
--- a/forge-gui/res/cardsfolder/p/pilgrims_eye.txt
+++ b/forge-gui/res/cardsfolder/p/pilgrims_eye.txt
@@ -4,5 +4,5 @@ Types:Artifact Creature Thopter
 PT:1/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Flying\nWhen Pilgrim's Eye enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/pillar_launch.txt b/forge-gui/res/cardsfolder/p/pillar_launch.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pillar_launch.txt
rename to forge-gui/res/cardsfolder/p/pillar_launch.txt
diff --git a/forge-gui/res/cardsfolder/p/pit_automaton.txt b/forge-gui/res/cardsfolder/p/pit_automaton.txt
index be8a8afa095..5e1393f4066 100644
--- a/forge-gui/res/cardsfolder/p/pit_automaton.txt
+++ b/forge-gui/res/cardsfolder/p/pit_automaton.txt
@@ -4,6 +4,6 @@ Types:Artifact Creature Construct
 PT:0/4
 K:Defender
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | RestrictValid$ Activated | SpellDescription$ Add {C}{C}. Spend this mana only to activate abilities.
-A:AB$ DelayedTrigger | Cost$ 2 T | AILogic$ SpellCopy | Mode$ AbilityCast | ValidSA$ Activated.Exhaust+nonManaAbility | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next activate an exhaust ability that isn't a mana ability this turn, copy it. You may choose new targets for the copy.
+A:AB$ DelayedTrigger | Cost$ 2 T | AILogic$ SpellCopy | Mode$ AbilityCast | ValidSA$ Activated.Exhaust+!ManaAbility | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next activate an exhaust ability that isn't a mana ability this turn, copy it. You may choose new targets for the copy.
 SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Defender\n{T}: Add {C}{C}. Spend this mana only to activate abilities.\n{2}, {T}: When you next activate an exhaust ability that isn't a mana ability this turn, copy it. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/p/pithing_needle.txt b/forge-gui/res/cardsfolder/p/pithing_needle.txt
index 1ac4895d24f..a75c2631bc1 100644
--- a/forge-gui/res/cardsfolder/p/pithing_needle.txt
+++ b/forge-gui/res/cardsfolder/p/pithing_needle.txt
@@ -3,6 +3,6 @@ ManaCost:1
 Types:Artifact
 K:ETBReplacement:Other:DBNameCard
 SVar:DBNameCard:DB$ NameCard | Defined$ You | AILogic$ PithingNeedle | SpellDescription$ As CARDNAME enters, choose a card name.
-S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.nonManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
+S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.!ManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 AI:RemoveDeck:Random
 Oracle:As Pithing Needle enters, choose a card name.\nActivated abilities of sources with the chosen name can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/p/planar_birth.txt b/forge-gui/res/cardsfolder/p/planar_birth.txt
index f84f4434ebc..04019bc427f 100644
--- a/forge-gui/res/cardsfolder/p/planar_birth.txt
+++ b/forge-gui/res/cardsfolder/p/planar_birth.txt
@@ -1,6 +1,6 @@
 Name:Planar Birth
 ManaCost:1 W
 Types:Sorcery
-A:SP$ ChangeZoneAll | ChangeType$ Land.Basic | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all basic land cards from all graveyards to the battlefield tapped under their owners' control.
+A:SP$ ChangeZoneAll | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ Return all basic land cards from all graveyards to the battlefield tapped under their owners' control.
 AI:RemoveDeck:Random
 Oracle:Return all basic land cards from all graveyards to the battlefield tapped under their owners' control.
diff --git a/forge-gui/res/cardsfolder/p/point_the_way.txt b/forge-gui/res/cardsfolder/p/point_the_way.txt
index 0ca1ed000f4..11dee17d0eb 100644
--- a/forge-gui/res/cardsfolder/p/point_the_way.txt
+++ b/forge-gui/res/cardsfolder/p/point_the_way.txt
@@ -2,6 +2,6 @@ Name:Point the Way
 ManaCost:G
 Types:Enchantment
 K:Start your engines
-A:AB$ ChangeZone | Cost$ 3 G Sac<1/CARDNAME/this enchantment> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ Count$YourSpeed | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is your speed. Put those cards onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 G Sac<1/CARDNAME/this enchantment> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ Count$YourSpeed | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is your speed. Put those cards onto the battlefield tapped, then shuffle.
 DeckHas:Ability$Sacrifice
 Oracle:Start your engines! (If you have no speed, it starts at 1. It increases once on each of your turns when an opponent loses life. Max speed is 4.)\n{3}{G}, Sacrifice this enchantment: Search your library for up to X basic land cards, where X is your speed. Put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/polluted_delta.txt b/forge-gui/res/cardsfolder/p/polluted_delta.txt
index b2aa5893acf..7717ce7c8b4 100644
--- a/forge-gui/res/cardsfolder/p/polluted_delta.txt
+++ b/forge-gui/res/cardsfolder/p/polluted_delta.txt
@@ -1,5 +1,5 @@
 Name:Polluted Delta
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Swamp | ChangeNum$ 1 | SpellDescription$ Search your library for a Island or Swamp card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Swamp | SpellDescription$ Search your library for a Island or Swamp card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Polluted Delta: Search your library for an Island or Swamp card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/precipitous_drop.txt b/forge-gui/res/cardsfolder/p/precipitous_drop.txt
index 6291bd0ecab..c763fc18a6e 100644
--- a/forge-gui/res/cardsfolder/p/precipitous_drop.txt
+++ b/forge-gui/res/cardsfolder/p/precipitous_drop.txt
@@ -7,5 +7,5 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$
 SVar:TrigVenture:DB$ Venture
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | Description$ Enchanted creature gets -2/-2. It gets -5/-5 instead as long as you've completed a dungeon.
 SVar:X:Count$Compare Y GE1.5.2
-SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
+SVar:Y:DungeonsCompleted$Amount
 Oracle:Enchant creature\nWhen Precipitous Drop enters, venture into the dungeon. (Enter the first room or advance to the next room.)\nEnchanted creature gets -2/-2. It gets -5/-5 instead as long as you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/upcoming/pretending_poxbearers.txt b/forge-gui/res/cardsfolder/p/pretending_poxbearers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/pretending_poxbearers.txt
rename to forge-gui/res/cardsfolder/p/pretending_poxbearers.txt
diff --git a/forge-gui/res/cardsfolder/p/priest_of_the_wakening_sun.txt b/forge-gui/res/cardsfolder/p/priest_of_the_wakening_sun.txt
index 2d65952968d..9781f933a1e 100644
--- a/forge-gui/res/cardsfolder/p/priest_of_the_wakening_sun.txt
+++ b/forge-gui/res/cardsfolder/p/priest_of_the_wakening_sun.txt
@@ -4,6 +4,6 @@ Types:Creature Human Cleric
 PT:1/1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ ABGainLife | OptionalDecider$ You | TriggerDescription$ At the beginning of your upkeep, you may reveal a Dinosaur card from your hand. If you do, you gain 2 life.
 SVar:ABGainLife:DB$ GainLife | UnlessCost$ Reveal<1/Creature.Dinosaur> | UnlessPayer$ You | UnlessSwitched$ True | LifeAmount$ 2 | StackDescription$ you gain 2 life. | SpellDescription$ You gain 2 life.
-A:AB$ ChangeZone | Cost$ 3 W W Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Dinosaur | ChangeNum$ 1 | SpellDescription$ Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 W W Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Dinosaur | SpellDescription$ Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle.
 DeckHints:Type$Dinosaur
 Oracle:At the beginning of your upkeep, you may reveal a Dinosaur card from your hand. If you do, you gain 2 life.\n{3}{W}{W}, Sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/primal_druid.txt b/forge-gui/res/cardsfolder/p/primal_druid.txt
index 3cbdc004467..5d3a80146fe 100644
--- a/forge-gui/res/cardsfolder/p/primal_druid.txt
+++ b/forge-gui/res/cardsfolder/p/primal_druid.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Human Druid
 PT:0/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | ShuffleNonMandatory$ True
 Oracle:When Primal Druid dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/primal_growth.txt b/forge-gui/res/cardsfolder/p/primal_growth.txt
index 6a29c53f1db..24866d2cdf5 100644
--- a/forge-gui/res/cardsfolder/p/primal_growth.txt
+++ b/forge-gui/res/cardsfolder/p/primal_growth.txt
@@ -2,6 +2,6 @@ Name:Primal Growth
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:Sac<1/Creature>
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle. If this spell was kicked, instead search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle. If this spell was kicked, instead search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
 SVar:X:Count$Kicked.2.1
 Oracle:Kicker—Sacrifice a creature. (You may sacrifice a creature in addition to any other costs as you cast this spell.)\nSearch your library for a basic land card, put that card onto the battlefield, then shuffle. If this spell was kicked, instead search your library for up to two basic land cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/primeval_herald.txt b/forge-gui/res/cardsfolder/p/primeval_herald.txt
index 3af4b74e16c..af2ad5d9bea 100644
--- a/forge-gui/res/cardsfolder/p/primeval_herald.txt
+++ b/forge-gui/res/cardsfolder/p/primeval_herald.txt
@@ -5,6 +5,6 @@ PT:3/1
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters or attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 SVar:HasAttackEffect:TRUE
 Oracle:Trample\nWhenever Primeval Herald enters or attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/prismatic_vista.txt b/forge-gui/res/cardsfolder/p/prismatic_vista.txt
index 8782d31f4a2..d78221a64b1 100644
--- a/forge-gui/res/cardsfolder/p/prismatic_vista.txt
+++ b/forge-gui/res/cardsfolder/p/prismatic_vista.txt
@@ -1,6 +1,6 @@
 Name:Prismatic Vista
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
 DeckHas:Ability$Sacrifice
 Oracle:{T}, Pay 1 life, Sacrifice Prismatic Vista: Search your library for a basic land card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/prison_break.txt b/forge-gui/res/cardsfolder/p/prison_break.txt
new file mode 100644
index 00000000000..0b5d1765017
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/prison_break.txt
@@ -0,0 +1,8 @@
+Name:Prison Break
+ManaCost:4 B
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature card in your graveyard | WithCountersType$ P1P1 | WithCountersAmount$ 1 | SpellDescription$ Return target creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.
+K:Mayhem:3 B
+DeckHas:Ability$Graveyard
+DeckHints:Ability$Discard
+Oracle:Return target creature card from your graveyard to the battlefield with an additional +1/+1 counter on it.\nMayhem {3}{B} (You may cast this card from your graveyard for {3}{B} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/p/professional_wrestler.txt b/forge-gui/res/cardsfolder/p/professional_wrestler.txt
new file mode 100644
index 00000000000..20e5a89bb1c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/professional_wrestler.txt
@@ -0,0 +1,9 @@
+Name:Professional Wrestler
+ManaCost:3 G
+Types:Creature Human Warrior Performer
+PT:4/4
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When this creature enters, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Max$ 1 | Description$ CARDNAME can't be blocked by more than one creature.
+DeckHas:Ability$Token
+Oracle:When this creature enters, create a Treasure token. (It's an artifact with "{T}, Sacrifice this token: Add one mana of any color.")\nThis creature can't be blocked by more than one creature.
diff --git a/forge-gui/res/cardsfolder/p/promising_vein.txt b/forge-gui/res/cardsfolder/p/promising_vein.txt
index e1a0d4be938..4b9316f7bcb 100644
--- a/forge-gui/res/cardsfolder/p/promising_vein.txt
+++ b/forge-gui/res/cardsfolder/p/promising_vein.txt
@@ -2,6 +2,6 @@ Name:Promising Vein
 ManaCost:no cost
 Types:Land Cave
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 DeckHas:Ability$Sacrifice
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Promising Vein: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/p/prosperity_tycoon.txt b/forge-gui/res/cardsfolder/p/prosperity_tycoon.txt
index 810d7051b69..6ca2cade710 100644
--- a/forge-gui/res/cardsfolder/p/prosperity_tycoon.txt
+++ b/forge-gui/res/cardsfolder/p/prosperity_tycoon.txt
@@ -7,5 +7,5 @@ SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_mercenary_tappump
 A:AB$ Pump | Cost$ 2 Sac<1/Card.token/token> | Defined$ Self | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)
 SVar:DBTap:DB$ Tap | Defined$ Self
 DeckHas:Ability$Token|Sacrifice & Type$Mercenary
-DeckHints:Type$Token
+DeckHints:Ability$Token
 Oracle:When Prosperity Tycoon enters, create a 1/1 red Mercenary creature token with "{T}: Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery."\n{2}, Sacrifice a token: Prosperity Tycoon gains indestructible until end of turn. Tap it. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/p/prowler_clawed_thief.txt b/forge-gui/res/cardsfolder/p/prowler_clawed_thief.txt
new file mode 100644
index 00000000000..8b7503dfe07
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/prowler_clawed_thief.txt
@@ -0,0 +1,9 @@
+Name:Prowler, Clawed Thief
+ManaCost:1 U B
+Types:Legendary Creature Human Rogue Villain
+PT:2/3
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Villain.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigConnive | TriggerDescription$ Whenever another Villain you control enters, NICKNAME connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+SVar:TrigConnive:DB$ Connive
+DeckHints:Type$Villain
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhenever another Villain you control enters, Prowler connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
diff --git a/forge-gui/res/cardsfolder/upcoming/prowler_misguided_mentor.txt b/forge-gui/res/cardsfolder/p/prowler_misguided_mentor.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/prowler_misguided_mentor.txt
rename to forge-gui/res/cardsfolder/p/prowler_misguided_mentor.txt
diff --git a/forge-gui/res/cardsfolder/p/psychic_battle.txt b/forge-gui/res/cardsfolder/p/psychic_battle.txt
index 7c96b64007c..71775f6f770 100644
--- a/forge-gui/res/cardsfolder/p/psychic_battle.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_battle.txt
@@ -1,7 +1,7 @@
 Name:Psychic Battle
 ManaCost:3 U U
 Types:Enchantment
-T:Mode$ BecomesTargetOnce | ValidCause$ Card.notnamedPsychic Battle | TriggerZones$ Battlefield | Execute$ TrigReveal | TriggerDescription$ Whenever a player chooses one or more targets, each player reveals the top card of their library. The player who reveals the card with the highest mana value may change the target or targets. If two or more cards are tied for highest cost, the target or targets remain unchanged. Changing targets this way doesn't trigger abilities of permanents named Psychic Battle.
+T:Mode$ BecomesTargetOnce | ValidCause$ Card.!namedPsychic Battle | TriggerZones$ Battlefield | Execute$ TrigReveal | TriggerDescription$ Whenever a player chooses one or more targets, each player reveals the top card of their library. The player who reveals the card with the highest mana value may change the target or targets. If two or more cards are tied for highest cost, the target or targets remain unchanged. Changing targets this way doesn't trigger abilities of permanents named Psychic Battle.
 SVar:TrigReveal:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBReveal | SubAbility$ DBChangeTargets
 SVar:DBReveal:DB$ PeekAndReveal | Defined$ Remembered | RememberRevealed$ True | SubAbility$ DBCheckLibrary
 SVar:DBCheckLibrary:DB$ Branch | BranchConditionSVar$ NumRememberedCard | TrueSubAbility$ DBCheckImprinted
diff --git a/forge-gui/res/cardsfolder/p/pumpkin_bombardment.txt b/forge-gui/res/cardsfolder/p/pumpkin_bombardment.txt
new file mode 100644
index 00000000000..0f4190d3531
--- /dev/null
+++ b/forge-gui/res/cardsfolder/p/pumpkin_bombardment.txt
@@ -0,0 +1,8 @@
+Name:Pumpkin Bombardment
+ManaCost:BR
+Types:Sorcery
+K:AlternateAdditionalCost:Discard<1/Card>:2
+A:SP$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ CARDNAME deals 3 damage to target creature.
+DeckHas:Ability$Discard
+DeckHints:Keyword$Madness & Ability$Delirium
+Oracle:As an additional cost to cast this spell, discard a card or pay {2}.\nPumpkin Bombardment deals 3 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/p/purestrain_genestealer.txt b/forge-gui/res/cardsfolder/p/purestrain_genestealer.txt
index 5504a3c55c1..5ce9d72497b 100644
--- a/forge-gui/res/cardsfolder/p/purestrain_genestealer.txt
+++ b/forge-gui/res/cardsfolder/p/purestrain_genestealer.txt
@@ -4,7 +4,7 @@ Types:Creature Tyranid
 PT:1/1
 K:etbCounter:P1P1:2
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRamp | TriggerDescription$ Vanguard Species — Whenever CARDNAME attacks, you may remove a +1/+1 counter from it. If you do, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigRamp:AB$ ChangeZone | Cost$ SubCounter<1/P1P1> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigRamp:AB$ ChangeZone | Cost$ SubCounter<1/P1P1> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Counters
 Oracle:Purestrain Genestealer enters with two +1/+1 counters on it.\nVanguard Species — Whenever Purestrain Genestealer attacks, you may remove a +1/+1 counter from it. If you do, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/purple_pentapus.txt b/forge-gui/res/cardsfolder/p/purple_pentapus.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/purple_pentapus.txt
rename to forge-gui/res/cardsfolder/p/purple_pentapus.txt
diff --git a/forge-gui/res/cardsfolder/p/push_pull.txt b/forge-gui/res/cardsfolder/p/push_pull.txt
index ad6e04791fb..a3ada4eac40 100644
--- a/forge-gui/res/cardsfolder/p/push_pull.txt
+++ b/forge-gui/res/cardsfolder/p/push_pull.txt
@@ -11,6 +11,6 @@ ALTERNATE
 Name:Pull
 ManaCost:4 BR BR
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | ValidTgts$ Creature | TgtPrompt$ Select up to two target creature cards from a single graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Put up to two target creature cards from a single graveyard onto the battlefield under your control. They gain haste until end of turn. Sacrifice them at the beginning of the next end step.
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | ValidTgts$ Creature | TgtPrompt$ Select up to two target creature cards from a single graveyard | GainControl$ True | SubAbility$ DBPump | SpellDescription$ Put up to two target creature cards from a single graveyard onto the battlefield under your control. They gain haste until end of turn. Sacrifice them at the beginning of the next end step.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Haste | AtEOT$ Sacrifice
 Oracle:Put up to two target creature cards from a single graveyard onto the battlefield under your control. They gain haste until end of turn. Sacrifice them at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/p/push_the_limit.txt b/forge-gui/res/cardsfolder/p/push_the_limit.txt
index 6d1d35c1612..c0b0ef1f42b 100644
--- a/forge-gui/res/cardsfolder/p/push_the_limit.txt
+++ b/forge-gui/res/cardsfolder/p/push_the_limit.txt
@@ -1,11 +1,9 @@
 Name:Push the Limit
 ManaCost:5 R R
 Types:Sorcery
-A:SP$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Mount.YouOwn,Vehicle.YouOwn | RememberChanged$ True | SubAbility$ DBPump | SpellDescription$ Return all Mount and Vehicle cards from your graveyard to the battlefield. Sacrifice them at the beginning of the next end step. Vehicles you control become artifact creatures until end of turn. Creatures you control gain haste until end of turn.
-SVar:DBPump:DB$ Pump | Defined$ Remembered | AtEOT$ Sacrifice | SubAbility$ DBAnimateAll
+A:SP$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Mount.YouOwn,Vehicle.YouOwn | AtEOT$ Sacrifice | SubAbility$ DBAnimateAll | SpellDescription$ Return all Mount and Vehicle cards from your graveyard to the battlefield. Sacrifice them at the beginning of the next end step. Vehicles you control become artifact creatures until end of turn. Creatures you control gain haste until end of turn.
 SVar:DBAnimateAll:DB$ AnimateAll | Types$ Artifact,Creature | ValidCards$ Vehicle.YouCtrl | SubAbility$ DBPumpAll
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Haste | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Haste
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Graveyard
 DeckHints:Ability$Discard|Sacrifice
diff --git a/forge-gui/res/cardsfolder/q/quiet_speculation.txt b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
index 84cf709db8a..56f9380da1b 100644
--- a/forge-gui/res/cardsfolder/q/quiet_speculation.txt
+++ b/forge-gui/res/cardsfolder/q/quiet_speculation.txt
@@ -1,6 +1,6 @@
 Name:Quiet Speculation
 ManaCost:1 U
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.withFlashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Graveyard | ValidTgts$ Player | ChangeType$ Card.withFlashback | ChangeTypeDesc$ cards with flashback | ChangeNum$ 3 | SpellDescription$ Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
 AI:RemoveDeck:All
 Oracle:Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles.
diff --git a/forge-gui/res/cardsfolder/q/quirion_trailblazer.txt b/forge-gui/res/cardsfolder/q/quirion_trailblazer.txt
index b9252fdc99d..ac82e18531e 100644
--- a/forge-gui/res/cardsfolder/q/quirion_trailblazer.txt
+++ b/forge-gui/res/cardsfolder/q/quirion_trailblazer.txt
@@ -3,5 +3,5 @@ ManaCost:3 G
 Types:Creature Elf Scout
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 Oracle:When Quirion Trailblazer enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/q/qutrub_forayer.txt b/forge-gui/res/cardsfolder/q/qutrub_forayer.txt
index b0607fbdbd2..d9d08599d7f 100644
--- a/forge-gui/res/cardsfolder/q/qutrub_forayer.txt
+++ b/forge-gui/res/cardsfolder/q/qutrub_forayer.txt
@@ -5,5 +5,5 @@ PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When this creature enters, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBDestroy,DBExile
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn | SpellDescription$ Destroy target creature that was dealt damage this turn.
-SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard | SpellDescription$ Exile up to two target cards from a single graveyard.
+SVar:DBExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | ValidTgts$ Card | TgtPrompt$ Select up to two target cards from a single graveyard | SpellDescription$ Exile up to two target cards from a single graveyard.
 Oracle:When this creature enters, choose one —\n• Destroy target creature that was dealt damage this turn.\n• Exile up to two target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/rabaroo_troop.txt b/forge-gui/res/cardsfolder/r/rabaroo_troop.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rabaroo_troop.txt
rename to forge-gui/res/cardsfolder/r/rabaroo_troop.txt
diff --git a/forge-gui/res/cardsfolder/r/radioactive_spider.txt b/forge-gui/res/cardsfolder/r/radioactive_spider.txt
new file mode 100644
index 00000000000..9d180549e85
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/radioactive_spider.txt
@@ -0,0 +1,8 @@
+Name:Radioactive Spider
+ManaCost:G
+Types:Creature Spider
+PT:1/1
+K:Reach
+K:Deathtouch
+A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Spider.Hero | ChangeTypeDesc$ Spider Hero | SorcerySpeed$ True | SpellDescription$ Search your libary for a Spider Hero card, reveal it, put it into your hand, then shuffle. Activate only as a sorcery.
+Oracle:Reach, deathtouch\nFateful Bite — {2}, Sacrifice this creature: Search your libary for a Spider Hero card, reveal it, put it into your hand, then shuffle. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/r/rag_dealer.txt b/forge-gui/res/cardsfolder/r/rag_dealer.txt
index 0ba8318a893..2c68ab199cf 100644
--- a/forge-gui/res/cardsfolder/r/rag_dealer.txt
+++ b/forge-gui/res/cardsfolder/r/rag_dealer.txt
@@ -2,5 +2,5 @@ Name:Rag Dealer
 ManaCost:B
 Types:Creature Human Rogue
 PT:1/1
-A:AB$ ChangeZone | Cost$ 2 B T | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ 2 B T | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 Oracle:{2}{B}, {T}: Exile up to three target cards from a single graveyard.
diff --git a/forge-gui/res/cardsfolder/r/raging_goblinoids.txt b/forge-gui/res/cardsfolder/r/raging_goblinoids.txt
new file mode 100644
index 00000000000..2f82842a461
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/raging_goblinoids.txt
@@ -0,0 +1,7 @@
+Name:Raging Goblinoids
+ManaCost:4 R
+Types:Creature Goblin Berserker Villain
+PT:5/4
+K:Haste
+K:Mayhem:2 R
+Oracle:Haste\nMayhem {2}{R} (You may cast this card from your graveyard for {2}{R} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/r/raiding_party.txt b/forge-gui/res/cardsfolder/r/raiding_party.txt
index bd9a036f117..402ca6ef8d4 100644
--- a/forge-gui/res/cardsfolder/r/raiding_party.txt
+++ b/forge-gui/res/cardsfolder/r/raiding_party.txt
@@ -1,7 +1,7 @@
 Name:Raiding Party
 ManaCost:2 R
 Types:Enchantment
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
 A:AB$ RepeatEach | Cost$ Sac<1/Orc/Orc> | CostDesc$ Sacrifice an Orc: | RepeatPlayers$ Player | RepeatSubAbility$ DBTap | SubAbility$ DBDestroy | SpellDescription$ Each player may tap any number of untapped white creatures they control. For each creature tapped this way, that player chooses up to two Plains. Then destroy all Plains that weren't chosen this way by any player.
 SVar:DBTap:DB$ Tap | CardChoices$ Creature.untapped+White+RememberedPlayerCtrl | Tapper$ RememberedPlayer | AnyNumber$ True | ChoiceAmount$ Count$Valid Creature.untapped+White+RememberedPlayerCtrl | RememberTapped$ True | SubAbility$ ChoosePlainsToSave
 SVar:ChoosePlainsToSave:DB$ ChooseCard | Defined$ Remembered | MinAmount$ 0 | Amount$ TappedXTwo | Choices$ Plains | ChoiceTitle$ Choose up to two Plains for each creature tapped | ChoiceZone$ Battlefield | ImprintChosen$ True | AILogic$ OwnCard | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt b/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
index be1ac83fccb..a61dbc88dfc 100644
--- a/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
+++ b/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
@@ -2,7 +2,7 @@ Name:Rakshasa Vizier
 ManaCost:2 B G U
 Types:Creature Demon
 PT:4/4
-T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Graveyard | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutcounter | TriggerDescription$ Whenever one or more cards are put into exile from your graveyard, put that many +1/+1 counters on CARDNAME.
-SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X
+T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Graveyard | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more cards are put into exile from your graveyard, put that many +1/+1 counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X
 SVar:X:TriggerCount$Amount
 Oracle:Whenever one or more cards are put into exile from your graveyard, put that many +1/+1 counters on Rakshasa Vizier.
diff --git a/forge-gui/res/cardsfolder/r/rally_maneuver.txt b/forge-gui/res/cardsfolder/r/rally_maneuver.txt
index 236d5786b88..b045f9139d6 100644
--- a/forge-gui/res/cardsfolder/r/rally_maneuver.txt
+++ b/forge-gui/res/cardsfolder/r/rally_maneuver.txt
@@ -2,6 +2,6 @@ Name:Rally Maneuver
 ManaCost:2 W
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to get +2/+0 and first strike | TargetUnique$ True | NumAtt$ +2 | KW$ First Strike | SubAbility$ DBPumpOther | SpellDescription$ Target creature gets +2/+0 and gains first strike until end of turn. Up to one other target creature gets +0/+2 and gains lifelink until end of turn.
-SVar:DBPumpOther:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select another target creature to get +0/+2 and lifelink | TargetUnique$ True | NumDef$ +2 | KW$ Lifelink
+SVar:DBPumpOther:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select another target creature to get +0/+2 and lifelink | TargetUnique$ True | TargetMin$ 0 | NumDef$ +2 | KW$ Lifelink
 DeckHas:Ability$LifeGain
 Oracle:Target creature gets +2/+0 and gains first strike until end of turn. Up to one other target creature gets +0/+2 and gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/rampaging_classmate.txt b/forge-gui/res/cardsfolder/r/rampaging_classmate.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rampaging_classmate.txt
rename to forge-gui/res/cardsfolder/r/rampaging_classmate.txt
diff --git a/forge-gui/res/cardsfolder/r/rampaging_growth.txt b/forge-gui/res/cardsfolder/r/rampaging_growth.txt
index 7ea2b4cd5a8..238f23875f0 100644
--- a/forge-gui/res/cardsfolder/r/rampaging_growth.txt
+++ b/forge-gui/res/cardsfolder/r/rampaging_growth.txt
@@ -1,7 +1,7 @@
 Name:Rampaging Growth
 ManaCost:3 G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | RememberChanged$ True | ChangeNum$ 1 | SubAbility$ DBAnimate | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield, then shuffle. Until end of turn, that land becomes a 4/3 Insect creature with reach and haste. It's still a land.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | ChangeNum$ 1 | SubAbility$ DBAnimate | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield, then shuffle. Until end of turn, that land becomes a 4/3 Insect creature with reach and haste. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 4 | Toughness$ 3 | Types$ Creature,Insect | Keywords$ Haste & Reach | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Type$Insect
diff --git a/forge-gui/res/cardsfolder/r/rampaging_soulrager.txt b/forge-gui/res/cardsfolder/r/rampaging_soulrager.txt
index af9fc947061..86f35bb255f 100644
--- a/forge-gui/res/cardsfolder/r/rampaging_soulrager.txt
+++ b/forge-gui/res/cardsfolder/r/rampaging_soulrager.txt
@@ -3,5 +3,5 @@ ManaCost:2 R
 Types:Creature Spirit
 PT:1/4
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | CheckSVar$ X | SVarCompare$ GE2 | Description$ CARDNAME gets +3/+0 as long as there are two or more unlocked doors among Rooms you control.
-SVar:X:Count$UnlockedDoors Card.Room+YouCtrl
+SVar:X:Count$UnlockedDoors
 Oracle:Rampaging Soulrager gets +3/+0 as long as there are two or more unlocked doors among Rooms you control.
diff --git a/forge-gui/res/cardsfolder/r/rampant_growth.txt b/forge-gui/res/cardsfolder/r/rampant_growth.txt
index 0d87977e68b..ebf1e1e8372 100644
--- a/forge-gui/res/cardsfolder/r/rampant_growth.txt
+++ b/forge-gui/res/cardsfolder/r/rampant_growth.txt
@@ -1,5 +1,5 @@
 Name:Rampant Growth
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | StackDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | StackDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 Oracle:Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt b/forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt
index 94940aec976..978a5c61b43 100644
--- a/forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt
+++ b/forge-gui/res/cardsfolder/r/rampant_rejuvenator.txt
@@ -4,7 +4,7 @@ Types:Creature Plant Hydra
 PT:0/0
 K:etbCounter:P1P1:2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, search your library for up to X basic land cards, where X is CARDNAME's power, put them onto the battlefield, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X
 SVar:X:TriggeredCard$CardPower
 DeckHas:Ability$Counters
 Oracle:Rampant Rejuvenator enters with two +1/+1 counters on it.\nWhen Rampant Rejuvenator dies, search your library for up to X basic land cards, where X is Rampant Rejuvenator's power, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/rampart_architect.txt b/forge-gui/res/cardsfolder/r/rampart_architect.txt
index 9bd128ad0a5..97bfc7df8f5 100644
--- a/forge-gui/res/cardsfolder/r/rampart_architect.txt
+++ b/forge-gui/res/cardsfolder/r/rampart_architect.txt
@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever this creature enters or attacks, create a 1/3 white Wall creature token with defender.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_3_wall_defender | TokenOwner$ You
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+withDefender | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control with defender dies, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 DeckHas:Ability$Token
 Oracle:Whenever this creature enters or attacks, create a 1/3 white Wall creature token with defender.\nWhenever a creature you control with defender dies, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/ranging_raptors.txt b/forge-gui/res/cardsfolder/r/ranging_raptors.txt
index fd4379096ab..eeb4e1bf388 100644
--- a/forge-gui/res/cardsfolder/r/ranging_raptors.txt
+++ b/forge-gui/res/cardsfolder/r/ranging_raptors.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Dinosaur
 PT:2/3
 T:Mode$ DamageDoneOnce | Execute$ TrigSearchLand | ValidTarget$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Enrage — Whenever CARDNAME is dealt damage, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearchLand:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | ShuffleNonMandatory$ True
+SVar:TrigSearchLand:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 SVar:HasCombatEffect:TRUE
 Oracle:Enrage — Whenever Ranging Raptors is dealt damage, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/rapid_decay.txt b/forge-gui/res/cardsfolder/r/rapid_decay.txt
index 57bf8fd9676..56ca750004b 100644
--- a/forge-gui/res/cardsfolder/r/rapid_decay.txt
+++ b/forge-gui/res/cardsfolder/r/rapid_decay.txt
@@ -1,7 +1,7 @@
 Name:Rapid Decay
 ManaCost:1 B
 Types:Instant
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 K:Cycling:2
 AI:RemoveDeck:All
 Oracle:Exile up to three target cards from a single graveyard.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/r/rats_feast.txt b/forge-gui/res/cardsfolder/r/rats_feast.txt
index ce40837e24f..71c21fcede6 100644
--- a/forge-gui/res/cardsfolder/r/rats_feast.txt
+++ b/forge-gui/res/cardsfolder/r/rats_feast.txt
@@ -1,7 +1,7 @@
 Name:Rats' Feast
 ManaCost:X B
 Types:Sorcery
-A:SP$ ChangeZone | TargetMin$ X | TargetMax$ X | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose X target cards in a single graveyard | ValidTgts$ Card | StackDescription$ Exile {c:Targeted}. | SpellDescription$ Exile X target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ X | TargetMax$ X | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose X target cards in a single graveyard | ValidTgts$ Card | StackDescription$ Exile {c:Targeted}. | SpellDescription$ Exile X target cards from a single graveyard.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/upcoming/raucous_audience.txt b/forge-gui/res/cardsfolder/r/raucous_audience.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/raucous_audience.txt
rename to forge-gui/res/cardsfolder/r/raucous_audience.txt
diff --git a/forge-gui/res/cardsfolder/r/ravenloft_adventurer.txt b/forge-gui/res/cardsfolder/r/ravenloft_adventurer.txt
index d6eff347fad..e2634b39e1d 100644
--- a/forge-gui/res/cardsfolder/r/ravenloft_adventurer.txt
+++ b/forge-gui/res/cardsfolder/r/ravenloft_adventurer.txt
@@ -10,7 +10,7 @@ SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ HIT | SubA
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | CheckSVar$ X | TriggerDescription$ Whenever CARDNAME attacks, if you've completed a dungeon, defending player loses 1 life for each card they own in exile with a hit counter on it.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredDefendingPlayer | LifeAmount$ Y
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 SVar:Y:TriggeredDefendingPlayer$ValidExile Card.YouOwn+counters_GE1_HIT
 SVar:HasAttackEffect:TRUE
 DeckHints:Name$Etrata, the Silencer|Mari, the Killing Quill
diff --git a/forge-gui/res/cardsfolder/upcoming/razor_rings.txt b/forge-gui/res/cardsfolder/r/razor_rings.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/razor_rings.txt
rename to forge-gui/res/cardsfolder/r/razor_rings.txt
diff --git a/forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt b/forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt
index 2a9fa93ea6d..60a48443c17 100644
--- a/forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt
+++ b/forge-gui/res/cardsfolder/r/realmbreakers_grasp.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant:Artifact,Creature:artifact or creature
 SVar:AttachAILogic:Curse
-S:Mode$ CantAttack,CantBlock,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.nonManaAbility | Description$ Enchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
+S:Mode$ CantAttack,CantBlock,CantBeActivated | ValidCard$ Card.EnchantedBy | ValidSA$ Activated.!ManaAbility | Description$ Enchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
 Oracle:Enchant artifact or creature\nEnchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/r/realms_befitting_my_majesty.txt b/forge-gui/res/cardsfolder/r/realms_befitting_my_majesty.txt
index f719f55fa24..5653729c842 100644
--- a/forge-gui/res/cardsfolder/r/realms_befitting_my_majesty.txt
+++ b/forge-gui/res/cardsfolder/r/realms_befitting_my_majesty.txt
@@ -2,5 +2,5 @@ Name:Realms Befitting My Majesty
 ManaCost:no cost
 Types:Scheme
 T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ GetRealms | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:GetRealms:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2
+SVar:GetRealms:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2
 Oracle:When you set this scheme in motion, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/rebel_informer.txt b/forge-gui/res/cardsfolder/r/rebel_informer.txt
index 4af31ee9a4a..59da120ccf1 100644
--- a/forge-gui/res/cardsfolder/r/rebel_informer.txt
+++ b/forge-gui/res/cardsfolder/r/rebel_informer.txt
@@ -2,6 +2,6 @@ Name:Rebel Informer
 ManaCost:2 B
 Types:Creature Human Mercenary Rebel
 PT:1/2
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.White | Description$ CARDNAME can't be the target of white spells or abilities from white sources.
 A:AB$ ChangeZone | Cost$ 3 | ValidTgts$ Rebel.!token | IsCurse$ True | TgtPrompt$ Select target Rebel | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put target nontoken Rebel on the bottom of its owner's library.
 Oracle:Rebel Informer can't be the target of white spells or abilities from white sources.\n{3}: Put target nontoken Rebel on the bottom of its owner's library.
diff --git a/forge-gui/res/cardsfolder/upcoming/rebellious_captives.txt b/forge-gui/res/cardsfolder/r/rebellious_captives.txt
similarity index 94%
rename from forge-gui/res/cardsfolder/upcoming/rebellious_captives.txt
rename to forge-gui/res/cardsfolder/r/rebellious_captives.txt
index 4c62071a175..7918b91107f 100644
--- a/forge-gui/res/cardsfolder/upcoming/rebellious_captives.txt
+++ b/forge-gui/res/cardsfolder/r/rebellious_captives.txt
@@ -5,4 +5,4 @@ PT:2/2
 A:AB$ PutCounter | Cost$ 6 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | Exhaust$ True | SubAbility$ DBEarthbend | SpellDescription$ Put two +1/+1 counters on this creature, then earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped. Activate each exhaust ability only once.)
 SVar:DBEarthbend:DB$ Earthbend | Num$ 2
 DeckHas:Ability$Counters
-Oracle:Exhaust — {6}: Put two +1/+1 counters on this creature, then earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped. Activate each exhaust ability only once.)
\ No newline at end of file
+Oracle:Exhaust — {6}: Put two +1/+1 counters on this creature, then earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped. Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/r/reckless_handling.txt b/forge-gui/res/cardsfolder/r/reckless_handling.txt
index ed24c2f4aba..77d1b262ce5 100644
--- a/forge-gui/res/cardsfolder/r/reckless_handling.txt
+++ b/forge-gui/res/cardsfolder/r/reckless_handling.txt
@@ -1,7 +1,7 @@
 Name:Reckless Handling
 ManaCost:1 R
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.Artifact | ChangeNum$ 1 | SubAbility$ DBDiscard | SpellDescription$ Search your library for an artifact card, reveal it, put it into your hand, shuffle, then discard a card at random. If an artifact card was discarded this way, CARDNAME deals 2 damage to each opponent.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Artifact | SubAbility$ DBDiscard | SpellDescription$ Search your library for an artifact card, reveal it, put it into your hand, shuffle, then discard a card at random. If an artifact card was discarded this way, CARDNAME deals 2 damage to each opponent.
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ Random | SubAbility$ DBDealDamage | RememberDiscarded$ True
 SVar:DBDealDamage:DB$ DamageAll | ConditionDefined$ Remembered | ConditionPresent$ Card.Artifact | ConditionCompare$ EQ1 | StackDescription$ If an artifact card was discarded this way, CARDNAME deals 2 damage to each opponent | ValidPlayers$ Opponent | NumDmg$ 2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/r/recruit_instructor.txt b/forge-gui/res/cardsfolder/r/recruit_instructor.txt
index 14717fa2544..55f848edb10 100644
--- a/forge-gui/res/cardsfolder/r/recruit_instructor.txt
+++ b/forge-gui/res/cardsfolder/r/recruit_instructor.txt
@@ -2,8 +2,9 @@ Name:Recruit Instructor
 ManaCost:R W
 Types:Creature Mouse Warrior
 PT:1/1
-T:Mode$ AttackersDeclared | ValidAttackers$ Mouse.YouCtrl | Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Mice you control attack, draft a card from CARDNAME's spellbook.
+T:Mode$ AttackersDeclared | ValidAttackers$ Card.Self | Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature attacks, draft a card from CARDNAME's spellbook.
 SVar:TrigDraft:DB$ Draft | Spellbook$ Angelfire Ignition,Barge In,Become Brutes,Boon of Safety,Cheeky House-Mouse,Crumb and Get It,Defiant Strike,Embercleave,Feather of Flight,Mabel's Mettle,Might of the Meek,Moment of Heroism,Unleash Fury,War Squeak
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigToken | TriggerDescription$ Valiant — Whenever CARDNAME becomes the target of a spell or ability you control for the first time each turn, create a 1/1 white Mouse creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_mouse | TokenAmount$ 1 | TokenOwner$ You
-Oracle:Whenever one or more Mice you control attack, draft a card from Recruit Instructor's spellbook.\nValiant — Whenever Recruit Instructor becomes the target of a spell or ability you control for the first time each turn, create a 1/1 white Mouse creature token.
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever this creature attacks, draft a card from Recruit Instructor's spellbook.\nValiant — Whenever Recruit Instructor becomes the target of a spell or ability you control for the first time each turn, create a 1/1 white Mouse creature token.
diff --git a/forge-gui/res/cardsfolder/r/red_suns_twilight.txt b/forge-gui/res/cardsfolder/r/red_suns_twilight.txt
index 56c289a9810..464b7c64538 100644
--- a/forge-gui/res/cardsfolder/r/red_suns_twilight.txt
+++ b/forge-gui/res/cardsfolder/r/red_suns_twilight.txt
@@ -2,7 +2,7 @@ Name:Red Sun's Twilight
 ManaCost:X R R
 Types:Sorcery
 A:SP$ Destroy | TargetMin$ 0 | TargetMax$ X | ValidTgts$ Artifact | TgtPrompt$ Select X target artifacts | RememberDestroyed$ True | SubAbility$ DBCopy | SpellDescription$ Destroy up to X target artifacts.
-SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | PumpKeywords$ Haste | SubAbility$ DBCleanup | AtEOT$ Exile | AILogic$ BeforeCombat | SpellDescription$ If X is 5 or more, for each artifact destroyed this way, create a token that's a copy of it. Those tokens gain haste. Exile them at the beginning of the next end step.
+SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | PumpKeywords$ Haste | SubAbility$ DBCleanup | AtEOT$ Exile | SpellDescription$ If X is 5 or more, for each artifact destroyed this way, create a token that's a copy of it. Those tokens gain haste. Exile them at the beginning of the next end step.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/upcoming/redirect_lightning.txt b/forge-gui/res/cardsfolder/r/redirect_lightning.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/redirect_lightning.txt
rename to forge-gui/res/cardsfolder/r/redirect_lightning.txt
diff --git a/forge-gui/res/cardsfolder/r/renegade_map.txt b/forge-gui/res/cardsfolder/r/renegade_map.txt
index 5ef3471d431..5c8590cee59 100644
--- a/forge-gui/res/cardsfolder/r/renegade_map.txt
+++ b/forge-gui/res/cardsfolder/r/renegade_map.txt
@@ -3,5 +3,5 @@ ManaCost:1
 Types:Artifact
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 Oracle:Renegade Map enters tapped.\n{T}, Sacrifice Renegade Map: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/renewal.txt b/forge-gui/res/cardsfolder/r/renewal.txt
index 9bfd94d3911..c5a978bba17 100644
--- a/forge-gui/res/cardsfolder/r/renewal.txt
+++ b/forge-gui/res/cardsfolder/r/renewal.txt
@@ -1,7 +1,7 @@
 Name:Renewal
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
+A:SP$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DelTrigSlowtrip
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
 DeckHas:Ability$Sacrifice
diff --git a/forge-gui/res/cardsfolder/r/rent_is_due.txt b/forge-gui/res/cardsfolder/r/rent_is_due.txt
new file mode 100644
index 00000000000..5700c7b6dc1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/rent_is_due.txt
@@ -0,0 +1,7 @@
+Name:Rent Is Due
+ManaCost:W
+Types:Enchantment
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, you may tap two untapped creatures and/or Treasures you control. If you do, draw a card. Otherwise, sacrifice this enchantment.
+SVar:TrigDraw:DB$ Draw | UnlessCost$ tapXType<2/Creature;Treasure/creatures and/or Treasures> | UnlessPayer$ You | UnlessSwitched$ True | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBSac
+SVar:DBSac:DB$ Sacrifice | SacValid$ Self
+Oracle:At the beginning of your end step, you may tap two untapped creatures and/or Treasures you control. If you do, draw a card. Otherwise, sacrifice this enchantment.
diff --git a/forge-gui/res/cardsfolder/r/retribution.txt b/forge-gui/res/cardsfolder/r/retribution.txt
index 0fd9510a962..cfd685751e3 100644
--- a/forge-gui/res/cardsfolder/r/retribution.txt
+++ b/forge-gui/res/cardsfolder/r/retribution.txt
@@ -1,7 +1,7 @@
 Name:Retribution
 ManaCost:2 R R
 Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures an opponent controls | TargetMin$ 2 | TargetMax$ 2 | TargetsFromSingleZone$ True | IsCurse$ True | RememberTargets$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures an opponent controls. That player chooses and sacrifices one of those creatures. Put a -1/-1 counter on the other.
+A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures an opponent controls | TargetMin$ 2 | TargetMax$ 2 | TargetsWithSameController$ True | IsCurse$ True | RememberTargets$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures an opponent controls. That player chooses and sacrifices one of those creatures. Put a -1/-1 counter on the other.
 SVar:DBChoose:DB$ ChooseCard | Defined$ TargetedController | Mandatory$ True | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose one to sacrifice | ForgetChosen$ True | AILogic$ WorstCard | SubAbility$ DBSac | StackDescription$ None
 SVar:DBSac:DB$ SacrificeAll | Defined$ ChosenCard | SubAbility$ DBPutCounter | StackDescription$ None
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ M1M1 | CounterNum$ 1 | StackDescription$ None | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/r/return_from_the_wilds.txt b/forge-gui/res/cardsfolder/r/return_from_the_wilds.txt
index fe35b971cc4..00e20d14600 100644
--- a/forge-gui/res/cardsfolder/r/return_from_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/r/return_from_the_wilds.txt
@@ -2,7 +2,7 @@ Name:Return from the Wilds
 ManaCost:2 G
 Types:Sorcery
 A:SP$ Charm | Choices$ DBSearch,DBHuman,DBFood | CharmNum$ 2
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 SVar:DBHuman:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You | SpellDescription$ Create a 1/1 white Human creature token.
 SVar:DBFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You | SpellDescription$ Create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 DeckHas:Ability$Token & Type$Artifact|Food|Human
diff --git a/forge-gui/res/cardsfolder/r/rhino_barreling_brute.txt b/forge-gui/res/cardsfolder/r/rhino_barreling_brute.txt
new file mode 100644
index 00000000000..749cdbedfad
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/rhino_barreling_brute.txt
@@ -0,0 +1,12 @@
+Name:Rhino, Barreling Brute
+ManaCost:3 R R G G
+Types:Legendary Creature Human Villain
+PT:6/7
+K:Vigilance
+K:Trample
+K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME attacks, if you've cast a spell with mana value 4 or greater this turn, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:X:Count$ThisTurnCast_Card.cmcGE4+YouCtrl
+SVar:HasAttackEffect:TRUE
+Oracle:Vigilance, trample, haste\nWhenever Rhino attacks, if you've cast a spell with mana value 4 or greater this turn, draw a card.
diff --git a/forge-gui/res/cardsfolder/r/rhinos_rampage.txt b/forge-gui/res/cardsfolder/r/rhinos_rampage.txt
new file mode 100644
index 00000000000..3207fa83522
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/rhinos_rampage.txt
@@ -0,0 +1,8 @@
+Name:Rhino's Rampage
+ManaCost:GR
+Types:Sorcery
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | NumAtt$ +1 | SpellDescription$ Target creature you control gets +1/+0 until end of turn. It fights target creature an opponent controls.
+SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.OppCtrl | ExcessSVar$ Excess | ExcessSVarCondition$ Creature.targetedBy+OppCtrl | SubAbility$ DBImmediateTrig | TgtPrompt$ Select target creature an opponent controls.
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionCheckSVar$ Excess | ConditionSVarCompare$ GE1 | Execute$ TrigDestroy | SpellDescription$ When excess damage is dealt to the creature an opponent controls this way, destroy up to one target noncreature artifact with mana value 3 or less.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact.nonCreature+cmcLE3 | TgtPrompt$ Select up to one target noncreature artifact with mana value 3 or less | TargetMin$ 0 | TargetMax$ 1
+Oracle:Target creature you control gets +1/+0 until end of turn. It fights target creature an opponent controls. When excess damage is dealt to the creature an opponent controls this way, destroy up to one target noncreature artifact with mana value 3 or less.
diff --git a/forge-gui/res/cardsfolder/r/ribald_shanty.txt b/forge-gui/res/cardsfolder/r/ribald_shanty.txt
index 70b5ac42ebd..883ac15fbe4 100644
--- a/forge-gui/res/cardsfolder/r/ribald_shanty.txt
+++ b/forge-gui/res/cardsfolder/r/ribald_shanty.txt
@@ -1,5 +1,5 @@
 Name:Ribald Shanty
-ManaCost:1 R
+ManaCost:R
 Types:Instant Chorus
 K:Starting intensity:2
 A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SubAbility$ DBIntensify | SpellDescription$ This spell deals damage equal to its intensity to target creature or planeswalker.
diff --git a/forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt b/forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt
index 4c156177fa4..bbe692ee87d 100644
--- a/forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt
+++ b/forge-gui/res/cardsfolder/r/rikku_resourceful_guardian.txt
@@ -7,4 +7,4 @@ SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredObjectLKICopy | StaticAbi
 SVar:BlockRestrict:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | ValidBlocker$ Creature.OppCtrl | Description$ That creature can't be blocked by creatures your opponents control.
 A:AB$ Pump | Cost$ 1 T | PrecostDesc$ Steal — | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBMove | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Move a counter from target creature an opponent controls onto target creature you control. Activate only as a sorcery.
 SVar:DBMove:DB$ MoveCounter | Source$ ParentTarget | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to move counter to | CounterType$ Any | CounterNum$ 1 | StackDescription$ None
-Oracle:Whenever you put one or more counters on a creature, until end of turn, that creature can't be blocked by creatures your opponents control.\nSteal — {1}, {T}: Move a counter from target creature an opponent controls onto target creature you control. Activate only as a sorcery.\n
+Oracle:Whenever you put one or more counters on a creature, until end of turn, that creature can't be blocked by creatures your opponents control.\nSteal — {1}, {T}: Move a counter from target creature an opponent controls onto target creature you control. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/r/rilsa_rael_kingpin.txt b/forge-gui/res/cardsfolder/r/rilsa_rael_kingpin.txt
index 19118fa2a06..6f5614bccc6 100644
--- a/forge-gui/res/cardsfolder/r/rilsa_rael_kingpin.txt
+++ b/forge-gui/res/cardsfolder/r/rilsa_rael_kingpin.txt
@@ -8,5 +8,5 @@ SVar:TrigInitiative:DB$ TakeInitiative
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking creature gains deathtouch until end of turn. If you've completed a dungeon, that creature also gets +5/+0 and gains first strike and menace until end of turn.
 SVar:TrigPump:DB$ Pump | KW$ Deathtouch | TgtPrompt$ Select target attacking creature | ValidTgts$ Creature.attacking | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | ConditionCheckSVar$ X | NumAtt$ +5 | KW$ First Strike & Menace | Defined$ Targeted
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:Deathtouch\nWhen Rilsa Rael, Kingpin enters, you take the initiative.\nWhenever you attack, target attacking creature gains deathtouch until end of turn. If you've completed a dungeon, that creature also gets +5/+0 and gains first strike and menace until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt b/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
index 5e1edfdf780..fbc5c863705 100644
--- a/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
+++ b/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
@@ -1,6 +1,6 @@
 Name:Rings of Brighthearth
 ManaCost:3
 Types:Artifact
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ 2 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/upcoming/risky_research.txt b/forge-gui/res/cardsfolder/r/risky_research.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/risky_research.txt
rename to forge-gui/res/cardsfolder/r/risky_research.txt
diff --git a/forge-gui/res/cardsfolder/r/rites_of_spring.txt b/forge-gui/res/cardsfolder/r/rites_of_spring.txt
index 90f1604e7dd..947c5867285 100644
--- a/forge-gui/res/cardsfolder/r/rites_of_spring.txt
+++ b/forge-gui/res/cardsfolder/r/rites_of_spring.txt
@@ -2,7 +2,7 @@ Name:Rites of Spring
 ManaCost:1 G
 Types:Sorcery
 A:SP$ Discard | Defined$ You | AnyNumber$ True | Mode$ TgtChoose | Optional$ True | RememberDiscarded$ True | SubAbility$ DBChangeZone | SpellDescription$ Discard any number of cards. Search your library for up to that many basic land cards, reveal them, put them into your hand, then shuffle.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ X | SubAbility$ DBCleanup
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/r/riveteers_overlook.txt b/forge-gui/res/cardsfolder/r/riveteers_overlook.txt
index 0e0e398b032..daf01410757 100644
--- a/forge-gui/res/cardsfolder/r/riveteers_overlook.txt
+++ b/forge-gui/res/cardsfolder/r/riveteers_overlook.txt
@@ -4,7 +4,7 @@ Types:Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Mountain+Basic,Land.Forest+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Swamp.Basic,Mountain.Basic,Forest.Basic | ChangeTypeDesc$ basic Swamp, Mountain, or Forest | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
diff --git a/forge-gui/res/cardsfolder/r/road_ruin.txt b/forge-gui/res/cardsfolder/r/road_ruin.txt
index c0b68918718..1d2977c474a 100644
--- a/forge-gui/res/cardsfolder/r/road_ruin.txt
+++ b/forge-gui/res/cardsfolder/r/road_ruin.txt
@@ -1,7 +1,7 @@
 Name:Road
 ManaCost:2 G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 AlternateMode:Split
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/r/roamers_routine.txt b/forge-gui/res/cardsfolder/r/roamers_routine.txt
index e484ca42d42..76631ebee96 100644
--- a/forge-gui/res/cardsfolder/r/roamers_routine.txt
+++ b/forge-gui/res/cardsfolder/r/roamers_routine.txt
@@ -1,6 +1,6 @@
 Name:Roamer's Routine
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 K:Harmonize:4 G
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nHarmonize {4}{G} (You may cast this card from your graveyard for its harmonize cost. You may tap a creature you control to reduce that cost by {X}, where X is its power. Then exile this spell.)
diff --git a/forge-gui/res/cardsfolder/r/robotics_mastery.txt b/forge-gui/res/cardsfolder/r/robotics_mastery.txt
new file mode 100644
index 00000000000..fd249dbcbe3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/robotics_mastery.txt
@@ -0,0 +1,10 @@
+Name:Robotics Mastery
+ManaCost:4 U
+Types:Enchantment Aura
+K:Flash
+K:Enchant:Creature
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this Aura enters, create two 1/1 colorless Robot artifact creature tokens with flying.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_1_1_a_robot_flying | TokenOwner$ You
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | Description$ Enchanted creature gets +2/+2.
+SVar:AttachAILogic:Pump
+Oracle:Flash\nEnchant creature\nWhen this Aura enters, create two 1/1 colorless Robot artifact creature tokens with flying.\nEnchanted creature gets +2/+2.
diff --git a/forge-gui/res/cardsfolder/r/rocket_powered_goblin_glider.txt b/forge-gui/res/cardsfolder/r/rocket_powered_goblin_glider.txt
new file mode 100644
index 00000000000..858e34fe055
--- /dev/null
+++ b/forge-gui/res/cardsfolder/r/rocket_powered_goblin_glider.txt
@@ -0,0 +1,9 @@
+Name:Rocket-Powered Goblin Glider
+ManaCost:3
+Types:Artifact Equipment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+wasCastFromYourGraveyard | Execute$ TrigAttach | TriggerDescription$ When this Equipment enters, if it was cast from your graveyard, attach it to target creature you control.
+SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Flying & Haste | Description$ Equipped creature gets +2/+0 and has flying and haste.
+K:Equip:2
+K:Mayhem:2
+Oracle:When this Equipment enters, if it was cast from your graveyard, attach it to target creature you control.\nEquipped creature gets +2/+0 and has flying and haste.\nEquip {2}\nMayhem {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/rocky_rebuke.txt b/forge-gui/res/cardsfolder/r/rocky_rebuke.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rocky_rebuke.txt
rename to forge-gui/res/cardsfolder/r/rocky_rebuke.txt
diff --git a/forge-gui/res/cardsfolder/r/rocky_tar_pit.txt b/forge-gui/res/cardsfolder/r/rocky_tar_pit.txt
index c30766dd2d9..0d8eb9e7e9d 100644
--- a/forge-gui/res/cardsfolder/r/rocky_tar_pit.txt
+++ b/forge-gui/res/cardsfolder/r/rocky_tar_pit.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Mountain | ChangeNum$ 1 | SpellDescription$ Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Mountain | SpellDescription$ Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
 Oracle:Rocky Tar Pit enters tapped.\n{T}, Sacrifice Rocky Tar Pit: Search your library for a Swamp or Mountain card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/r/roiling_regrowth.txt b/forge-gui/res/cardsfolder/r/roiling_regrowth.txt
index 15c8b8be7a0..428bbf00f43 100644
--- a/forge-gui/res/cardsfolder/r/roiling_regrowth.txt
+++ b/forge-gui/res/cardsfolder/r/roiling_regrowth.txt
@@ -2,6 +2,6 @@ Name:Roiling Regrowth
 ManaCost:2 G
 Types:Instant
 A:SP$ Sacrifice | Defined$ You | SacValid$ Land | SubAbility$ DBChangeZone | StackDescription$ SpellDescription | SpellDescription$ Sacrifice a land. Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | StackDescription$ None
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | StackDescription$ None
 SVar:AIPreference:SacCost$Land.Basic+tapped
 Oracle:Sacrifice a land. Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/rokus_mastery.txt b/forge-gui/res/cardsfolder/r/rokus_mastery.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rokus_mastery.txt
rename to forge-gui/res/cardsfolder/r/rokus_mastery.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/romantic_rendezvous.txt b/forge-gui/res/cardsfolder/r/romantic_rendezvous.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/romantic_rendezvous.txt
rename to forge-gui/res/cardsfolder/r/romantic_rendezvous.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/rough_rhino_cavalry.txt b/forge-gui/res/cardsfolder/r/rough_rhino_cavalry.txt
similarity index 92%
rename from forge-gui/res/cardsfolder/upcoming/rough_rhino_cavalry.txt
rename to forge-gui/res/cardsfolder/r/rough_rhino_cavalry.txt
index eb523510f0b..47c43cb9c77 100644
--- a/forge-gui/res/cardsfolder/upcoming/rough_rhino_cavalry.txt
+++ b/forge-gui/res/cardsfolder/r/rough_rhino_cavalry.txt
@@ -6,4 +6,4 @@ K:Firebending:2
 A:AB$ PutCounter | Cost$ 8 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | Exhaust$ True | SubAbility$ DBPump | SpellDescription$ Put two +1/+1 counters on this creature. It gains trample until end of turn. (Activate each exhaust ability only once.)
 SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Trample
 DeckHas:Ability$Counters
-Oracle:Firebending 2 (Whenever this creature attacks, add {R}{R}. This mana lasts until end of combat.)\nExhaust — {8}: Put two +1/+1 counters on this creature. It gains trample until end of turn. (Activate each exhaust ability only once.)
\ No newline at end of file
+Oracle:Firebending 2 (Whenever this creature attacks, add {R}{R}. This mana lasts until end of combat.)\nExhaust — {8}: Put two +1/+1 counters on this creature. It gains trample until end of turn. (Activate each exhaust ability only once.)
diff --git a/forge-gui/res/cardsfolder/r/rowan_kenrith.txt b/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
index bc53b45708e..9efa223c332 100644
--- a/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
+++ b/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
@@ -11,7 +11,7 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ DamageAll | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | ValidCards$ Creature.tapped | Planeswalker$ True | ValidDescription$ each tapped creature target player controls. | SpellDescription$ CARDNAME deals 3 damage to each tapped creature target player controls.
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | EffectOwner$ Targeted | Name$ Emblem — Rowan Kenrith | Image$ emblem_rowan_kenrith | Triggers$ CopyAbility | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target player gets an emblem with "Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy."
-SVar:CopyAbility:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
+SVar:CopyAbility:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 DeckHints:Name$Will Kenrith
 Oracle:[+2]: During target player's next turn, each creature that player controls attacks if able.\n[-2]: Rowan Kenrith deals 3 damage to each tapped creature target player controls.\n[-8]: Target player gets an emblem with "Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy."\nPartner with Will Kenrith\nRowan Kenrith can be your commander.
diff --git a/forge-gui/res/cardsfolder/upcoming/rowdy_snowballers.txt b/forge-gui/res/cardsfolder/r/rowdy_snowballers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/rowdy_snowballers.txt
rename to forge-gui/res/cardsfolder/r/rowdy_snowballers.txt
diff --git a/forge-gui/res/cardsfolder/r/ruin_in_their_wake.txt b/forge-gui/res/cardsfolder/r/ruin_in_their_wake.txt
index 9037fb7a22d..60701cbf1d8 100644
--- a/forge-gui/res/cardsfolder/r/ruin_in_their_wake.txt
+++ b/forge-gui/res/cardsfolder/r/ruin_in_their_wake.txt
@@ -2,7 +2,7 @@ Name:Ruin in Their Wake
 ManaCost:1 G
 Types:Sorcery
 K:Devoid
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card and reveal it. You may put that card onto the battlefield tapped if you control a land named Wastes. Otherwise, put that card into your hand. Then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card and reveal it. You may put that card onto the battlefield tapped if you control a land named Wastes. Otherwise, put that card into your hand. Then shuffle.
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | Tapped$ True | ConditionPresent$ Land.namedWastes+YouCtrl | ForgetChanged$ True | Optional$ True | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/r/runic_armasaur.txt b/forge-gui/res/cardsfolder/r/runic_armasaur.txt
index d685168bdc0..4f86002588f 100644
--- a/forge-gui/res/cardsfolder/r/runic_armasaur.txt
+++ b/forge-gui/res/cardsfolder/r/runic_armasaur.txt
@@ -2,6 +2,6 @@ Name:Runic Armasaur
 ManaCost:1 G G
 Types:Creature Dinosaur
 PT:2/5
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/r/ruthless_instincts.txt b/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
index 95ca1c3d546..6d16f3f02fd 100644
--- a/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
+++ b/forge-gui/res/cardsfolder/r/ruthless_instincts.txt
@@ -2,7 +2,7 @@ Name:Ruthless Instincts
 ManaCost:2 G
 Types:Instant
 A:SP$ Charm | Choices$ DBPump1,DBPump2
-SVar:DBPump1:DB$ Pump | ValidTgts$ Creature.notattacking | TgtPrompt$ Select target nonattacking creature | KW$ Reach & Deathtouch | SubAbility$ DBUntap | SpellDescription$ Target nonattacking creature gains reach and deathtouch until end of turn. Untap it.
+SVar:DBPump1:DB$ Pump | ValidTgts$ Creature.!attacking | TgtPrompt$ Select target nonattacking creature | KW$ Reach & Deathtouch | SubAbility$ DBUntap | SpellDescription$ Target nonattacking creature gains reach and deathtouch until end of turn. Untap it.
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
 SVar:DBPump2:DB$ Pump | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target attacking creature gets +2/+2 and gains trample until end of turn.
 Oracle:Choose one —\n• Target nonattacking creature gains reach and deathtouch until end of turn. Untap it.\n• Target attacking creature gets +2/+2 and gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-acererak_the_archlich.txt b/forge-gui/res/cardsfolder/rebalanced/a-acererak_the_archlich.txt
index 6099cb71f11..7729f3e0ad5 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-acererak_the_archlich.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-acererak_the_archlich.txt
@@ -5,7 +5,7 @@ PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ LT1 | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, if you haven't completed Tomb of Annihilation, return CARDNAME to its owner's hand and venture into the dungeon.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBVenture
 SVar:DBVenture:DB$ Venture
-SVar:X:PlayerCountPropertyYou$DungeonCompletedNamed_Tomb of Annihilation
+SVar:X:DungeonsCompleted$Valid Card.namedTomb of Annihilation
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, create a number of 2/2 black Zombie creature tokens equal to the number of opponents you have.
 SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenScript$ b_2_2_zombie | TokenOwner$ You
 SVar:Y:PlayerCountOpponents$Amount
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-blessed_hippogriff_tyrs_blesing.txt b/forge-gui/res/cardsfolder/rebalanced/a-blessed_hippogriff_tyrs_blesing.txt
index fdde4d50ae4..da142ff68a4 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-blessed_hippogriff_tyrs_blesing.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-blessed_hippogriff_tyrs_blesing.txt
@@ -6,6 +6,7 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, target attacking creature without flying gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | KW$ Flying
 AlternateMode:Adventure
+SVar:HasAttackEffect:TRUE
 Oracle:Flying\nWhenever Blessed Hippogriff attacks, target attacking creature without flying gains flying until end of turn.
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-cloister_gargoyle.txt b/forge-gui/res/cardsfolder/rebalanced/a-cloister_gargoyle.txt
index 5518835c584..d662a29c699 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-cloister_gargoyle.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-cloister_gargoyle.txt
@@ -5,5 +5,5 @@ PT:0/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBVenture | TriggerDescription$ When CARDNAME enters, venture into the dungeon.
 SVar:DBVenture:DB$ Venture | Defined$ You
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you've completed a dungeon, CARDNAME gets +3/+0 and has flying.
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:When Cloister Gargoyle enters, venture into the dungeon.\nAs long as you've completed a dungeon, Cloister Gargoyle gets +3/+0 and has flying.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-cori_steel_cutter.txt b/forge-gui/res/cardsfolder/rebalanced/a-cori_steel_cutter.txt
new file mode 100644
index 00000000000..404ff0547ad
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-cori_steel_cutter.txt
@@ -0,0 +1,11 @@
+Name:A-Cori-Steel Cutter
+ManaCost:1 R
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | Description$ Equipped creature has haste.
+T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | ValidActivatingPlayer$ You | ActivatorThisTurnCast$ EQ2 | TriggerDescription$ Whenever you cast your second spell each turn, create a 1/1 white Monk creature token with prowess. You may attach this Equipment to it. (Whenever you cast a noncreature spell, the token gets +1/+1 until end of turn.)
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_monk_prowess | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | Defined$ Remembered | Optional$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+K:Equip:1 R
+DeckHas:Ability$Token
+Oracle:Equipped creature has haste.\nFlurry — Whenever you cast your second spell each turn, create a 1/1 white Monk creature token with prowess. You may attach this Equipment to it. (Whenever you cast a noncreature spell, the token gets +1/+1 until end of turn.)\nEquip {1}{R}
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt b/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
index bdf88028444..dbc247c5834 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
@@ -8,6 +8,6 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone
 A:AB$ ChangeZone | Cost$ 2 G Sac<1/Land> | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 SVar:DiscardMe:1
 SVar:PlayMain1:TRUE
-SVar:X:Count$Valid Creature.Dragon+notnamedEarthquake Dragon+notnamedA-Earthquake Dragon+YouCtrl$SumCMC
+SVar:X:Count$Valid Creature.Dragon+!namedEarthquake Dragon+!namedA-Earthquake Dragon+YouCtrl$SumCMC
 DeckHints:Type$Dragon
 Oracle:This spell costs {X} less to cast, where X is the total mana value of Dragons you control not named Earthquake Dragon.\nFlying, trample\n{2}{G}, Sacrifice a land: Return Earthquake Dragon from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt b/forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt
index 6326cd1adfa..3a40b2cf6fc 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-ellywick_tumblestrum.txt
@@ -9,5 +9,5 @@ SVar:IsLegendary:Count$ValidHand Creature.Legendary+IsRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Ellywick Tumblestrum | Image$ emblem_ellywick_tumblestrum | StaticAbilities$ STOverrun | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed."
 SVar:STOverrun:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ X | AddToughness$ X | AddKeyword$ Trample & Haste | Description$ Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed.
-SVar:X:PlayerCountPropertyYou$DifferentlyNamedDungeonsCompleted/Twice
+SVar:X:DungeonsCompleted$DifferentCardNames/Twice
 Oracle:[+1]: Venture into the dungeon.\n[-2]: Look at the top six cards of your library. You may reveal a creature card from among them and put it into your hand. If it's legendary, you gain 3 life. Put the rest on the bottom of your library in a random order.\n[-6]: You get an emblem with "Creatures you control have trample and haste and get +2/+2 for each differently named dungeon you've completed."
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-guildsworn_prowler.txt b/forge-gui/res/cardsfolder/rebalanced/a-guildsworn_prowler.txt
index d2e075214a3..5927d7dd35b 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-guildsworn_prowler.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-guildsworn_prowler.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Creature Tiefling Rogue Assassin
 PT:1/1
 K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+notblocking | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, if it wasn't blocking, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+!blocking | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, if it wasn't blocking, draw a card.
 SVar:TrigDraw:DB$ Draw
 Oracle:Deathtouch\nWhen Guildsworn Prowler dies, if it wasn't blocking, draw a card.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-ominous_parcel.txt b/forge-gui/res/cardsfolder/rebalanced/a-ominous_parcel.txt
index 828df989baf..e85023326dc 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-ominous_parcel.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-ominous_parcel.txt
@@ -1,6 +1,6 @@
 Name:A-Ominous Parcel
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 A:AB$ DealDamage | Cost$ 5 T Sac<1/CARDNAME> | ValidTgts$ Creature | NumDmg$ 4 | SpellDescription$ It deals 4 damage to target creature.
 Oracle:{1}, {T}, Sacrifice Ominous Parcel: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{5}, {T}, Sacrifice Ominous Parcel: It deals 4 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-precipitous_drop.txt b/forge-gui/res/cardsfolder/rebalanced/a-precipitous_drop.txt
index 964588d0ffc..d756a4a6086 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-precipitous_drop.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-precipitous_drop.txt
@@ -7,5 +7,5 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$
 SVar:TrigVenture:DB$ Venture
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | Description$ Enchanted creature gets -2/-2. It gets -5/-5 instead as long as you've completed a dungeon.
 SVar:X:Count$Compare Y GE1.5.2
-SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
+SVar:Y:DungeonsCompleted$Amount
 Oracle:Enchant creature\nWhen Precipitous Drop enters, venture into the dungeon.\nEnchanted creature gets -2/-2. It gets -5/-5 instead as long as you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-scout_the_wilderness.txt b/forge-gui/res/cardsfolder/rebalanced/a-scout_the_wilderness.txt
index f7d05ab4cdd..ba0e5db4b5d 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-scout_the_wilderness.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-scout_the_wilderness.txt
@@ -2,7 +2,7 @@ Name:A-Scout the Wilderness
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:W
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier | Condition$ Kicked
 DeckHints:Color$White
 DeckHas:Ability$Token & Type$Soldier
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-sorin_imperious_bloodlord.txt b/forge-gui/res/cardsfolder/rebalanced/a-sorin_imperious_bloodlord.txt
new file mode 100644
index 00000000000..6b1f9db6ffb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-sorin_imperious_bloodlord.txt
@@ -0,0 +1,16 @@
+Name:A-Sorin, Imperious Bloodlord
+ManaCost:2 B
+Types:Legendary Planeswalker Sorin
+Loyalty:4
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Deathtouch & Lifelink | SubAbility$ DBPutCounter | SpellDescription$ Target creature you control gains deathtouch and lifelink until end of turn. If it's a Vampire, put a +1/+1 counter on it.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Targeted | ConditionPresent$ Card.Vampire | ConditionCompare$ GE1
+A:AB$ Sacrifice | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | SacValid$ Vampire | Optional$ True | RememberSacrificed$ True | SubAbility$ TrigPayCost | SpellDescription$ You may sacrifice a Vampire.
+SVar:TrigPayCost:DB$ ImmediateTrigger | Execute$ DBDmg | ConditionDefined$ RememberedLKI | ConditionPresent$ Creature | ConditionCompare$ GE1 | SpellDescription$ When you do, CARDNAME deals 3 damage to any target and you gain 3 life. | SubAbility$ DBCleanup
+SVar:DBDmg:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Ultimate$ True | Planeswalker$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Vampire+cmcLE6 | ChangeNum$ 1 | SpellDescription$ You may put a Vampire creature card with mana value 6 of less from your hand onto the battlefield.
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Counters
+DeckHints:Type$Vampire
+Oracle:[+1]: Target creature you control gains deathtouch and lifelink until end of turn. If it's a Vampire, put a +1/+1 counter on it.\n[+1]: You may sacrifice a Vampire. When you do, Sorin, Imperious Bloodlord deals 3 damage to any target and you gain 3 life.\n[-3]: You may put a Vampire creature card with mana value 6 of less from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-zar_ojanen_scion_of_efrava.txt b/forge-gui/res/cardsfolder/rebalanced/a-zar_ojanen_scion_of_efrava.txt
index fe607d000bb..b3d0ceaa8b6 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-zar_ojanen_scion_of_efrava.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-zar_ojanen_scion_of_efrava.txt
@@ -2,9 +2,9 @@ Name:A-Zar Ojanen, Scion of Efrava
 ManaCost:3 G W
 Types:Legendary Creature Cat Warrior
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutcounter | TriggerDescription$ Domain — Whenever CARDNAME enters or becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
-T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigPutcounter | TriggerZones$ Battlefield | TriggerDescription$ Domain — Whenever CARDNAME enters or becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
-SVar:TrigPutcounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+toughnessLTX | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Domain — Whenever CARDNAME enters or becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
+T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Domain — Whenever CARDNAME enters or becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
+SVar:TrigPutCounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+toughnessLTX | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$Domain
 DeckHas:Ability$Counters
 Oracle:Domain — Whenever Zar Ojanen, Scion of Efrava enters or becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/saber_tooth_moose_lion.txt b/forge-gui/res/cardsfolder/s/saber_tooth_moose_lion.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/saber_tooth_moose_lion.txt
rename to forge-gui/res/cardsfolder/s/saber_tooth_moose_lion.txt
diff --git a/forge-gui/res/cardsfolder/s/sabertooth_outrider.txt b/forge-gui/res/cardsfolder/s/sabertooth_outrider.txt
index 2ab6765dafb..903e7de20da 100644
--- a/forge-gui/res/cardsfolder/s/sabertooth_outrider.txt
+++ b/forge-gui/res/cardsfolder/s/sabertooth_outrider.txt
@@ -5,5 +5,5 @@ PT:4/2
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE8 | Execute$ TrigFormidable | TriggerDescription$ Formidable — Whenever CARDNAME attacks, if creatures you control have total power 8 or greater, CARDNAME gains first strike until end of turn.
 SVar:TrigFormidable:DB$ Pump | Defined$ Self | KW$ First Strike
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Trample\nFormidable — Whenever Sabertooth Outrider attacks, if creatures you control have total power 8 or greater, Sabertooth Outrider gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/safana_calimport_cutthroat.txt b/forge-gui/res/cardsfolder/s/safana_calimport_cutthroat.txt
index 854c04f066e..067da524e15 100644
--- a/forge-gui/res/cardsfolder/s/safana_calimport_cutthroat.txt
+++ b/forge-gui/res/cardsfolder/s/safana_calimport_cutthroat.txt
@@ -6,7 +6,7 @@ K:Menace
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckDefinedPlayer$ You.hasInitiative | Execute$ TrigTreasure | TriggerDescription$ At the beginning of your end step, if you have the initiative, create a Treasure token. If you've completed a dungeon, create three of those tokens instead.
 SVar:TrigTreasure:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac
 SVar:X:Count$Compare Y GE1.3.1
-SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
+SVar:Y:DungeonsCompleted$Amount
 K:Choose a Background
 AI:RemoveDeck:Random
 DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
diff --git a/forge-gui/res/cardsfolder/s/safewright_quest.txt b/forge-gui/res/cardsfolder/s/safewright_quest.txt
index 70d86dabc66..b9a9c289d78 100644
--- a/forge-gui/res/cardsfolder/s/safewright_quest.txt
+++ b/forge-gui/res/cardsfolder/s/safewright_quest.txt
@@ -1,5 +1,5 @@
 Name:Safewright Quest
 ManaCost:GW
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Forest,Plains | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Plains card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Forest,Plains | SpellDescription$ Search your library for a Forest or Plains card, reveal it, put it into your hand, then shuffle.
 Oracle:Search your library for a Forest or Plains card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sage_of_days.txt b/forge-gui/res/cardsfolder/s/sage_of_days.txt
index f4c5a17637c..2a9bf74a532 100644
--- a/forge-gui/res/cardsfolder/s/sage_of_days.txt
+++ b/forge-gui/res/cardsfolder/s/sage_of_days.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top three cards of your library. You may put one of those cards back on top of your library. Put the rest into your graveyard.
-SVar:TrigDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | ChangeValid$ Card | DestinationZone2$ Graveyard | DestinationZone$ Library | LibraryPosition$ 0 | Optional$ True
+SVar:TrigDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | ChangeValid$ Card | DestinationZone2$ Graveyard | DestinationZone$ Library | LibraryPosition$ 0 | Optional$ True | NoReveal$ True
 DeckHas:Ability$Graveyard
 DeckHints:Ability$Graveyard
 Oracle:When Sage of Days enters, look at the top three cards of your library. You may put one of those cards back on top of your library. Put the rest into your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sagu_wildling_roost_seek.txt b/forge-gui/res/cardsfolder/s/sagu_wildling_roost_seek.txt
index fb30d49e8b7..810bcaf8db6 100644
--- a/forge-gui/res/cardsfolder/s/sagu_wildling_roost_seek.txt
+++ b/forge-gui/res/cardsfolder/s/sagu_wildling_roost_seek.txt
@@ -13,5 +13,5 @@ ALTERNATE
 Name:Roost Seek
 ManaCost:G
 Types:Sorcery Omen
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. (Also shuffle this card.)
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. (Also shuffle this card.)
 Oracle:Search your library for a basic land card, reveal it, put it into your hand, then shuffle. (Also shuffle this card.)
diff --git a/forge-gui/res/cardsfolder/s/sakura_tribe_elder.txt b/forge-gui/res/cardsfolder/s/sakura_tribe_elder.txt
index ea4f8a93127..d91ab8389ef 100644
--- a/forge-gui/res/cardsfolder/s/sakura_tribe_elder.txt
+++ b/forge-gui/res/cardsfolder/s/sakura_tribe_elder.txt
@@ -2,6 +2,6 @@ Name:Sakura-Tribe Elder
 ManaCost:1 G
 Types:Creature Snake Shaman
 PT:1/1
-A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:SacMeAfterBlock:TRUE
 Oracle:Sacrifice Sakura-Tribe Elder: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sala_deck_boss.txt b/forge-gui/res/cardsfolder/s/sala_deck_boss.txt
index dca5a955b01..d0becccfce9 100644
--- a/forge-gui/res/cardsfolder/s/sala_deck_boss.txt
+++ b/forge-gui/res/cardsfolder/s/sala_deck_boss.txt
@@ -3,6 +3,6 @@ ManaCost:1 U R
 Types:Legendary Creature Squid Pirate
 PT:3/3
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+hasAbility Activated.Exhaust | AddKeyword$ Haste | Description$ Each creature you control with an exhaust ability has haste.
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ Activated.Exhaust+nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an exhaust ability that isn't a mana ability, copy it. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ Activated.Exhaust+!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an exhaust ability that isn't a mana ability, copy it. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Each creature you control with an exhaust ability has haste.\nWhenever you activate an exhaust ability that isn't a mana ability, copy it. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/s/samite_ministration.txt b/forge-gui/res/cardsfolder/s/samite_ministration.txt
index dbd342c8b59..367118617af 100644
--- a/forge-gui/res/cardsfolder/s/samite_ministration.txt
+++ b/forge-gui/res/cardsfolder/s/samite_ministration.txt
@@ -3,11 +3,9 @@ ManaCost:1 W
 Types:Instant
 A:SP$ ChooseSource | Choices$ Card,Emblem | AILogic$ NeedsPrevention | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ Prevent all damage that would be dealt to you this turn by a source of your choice. Whenever damage from a black or red source is prevented this way this turn, you gain that much life.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RepDmg | ConditionDefined$ ChosenCard | ConditionPresent$ Card,Emblem | ConditionCompare$ GE1
-SVar:RepDmg:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCardStrict,Emblem.ChosenCard | ReplaceWith$ DBStoreSVar | PreventionEffect$ True | Description$ Prevent all damage that would be dealt to you this turn by a source of your choice. Whenever damage from a black or red source is prevented this way this turn, you gain that much life.
-SVar:DBStoreSVar:DB$ StoreSVar | SVar$ Z | Type$ Calculate | Expression$ X | SubAbility$ DBTrigger
+SVar:RepDmg:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCardStrict,Emblem.ChosenCard | ReplaceWith$ DBTrigger | PreventionEffect$ True | Description$ Prevent all damage that would be dealt to you this turn by a source of your choice. Whenever damage from a black or red source is prevented this way this turn, you gain that much life.
 SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ GainLifeYou | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 | TriggerDescription$ Whenever damage from a black or red source is prevented this way this turn, you gain that much life.
-SVar:GainLifeYou:DB$ GainLife | Defined$ You | LifeAmount$ Z
-SVar:X:ReplaceCount$DamageAmount
+SVar:GainLifeYou:DB$ GainLife | Defined$ You | LifeAmount$ X
+SVar:X:Spawner>ReplaceCount$DamageAmount
 SVar:Y:ReplacedSource$Valid Card.BlackSource,Card.RedSource
-SVar:Z:Number$0
 Oracle:Prevent all damage that would be dealt to you this turn by a source of your choice. Whenever damage from a black or red source is prevented this way this turn, you gain that much life.
diff --git a/forge-gui/res/cardsfolder/s/samut_the_tested.txt b/forge-gui/res/cardsfolder/s/samut_the_tested.txt
index aa66779e6aa..c4cef24be38 100644
--- a/forge-gui/res/cardsfolder/s/samut_the_tested.txt
+++ b/forge-gui/res/cardsfolder/s/samut_the_tested.txt
@@ -2,7 +2,7 @@ Name:Samut, the Tested
 ManaCost:2 R G
 Types:Legendary Planeswalker Samut
 Loyalty:4
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | Planeswalker$ True | KW$ Double Strike | SpellDescription$ Up to one target creature gains double strike until end of turn.
-A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Any | TgtPrompt$ Select any target to distribute damage to | NumDmg$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | Planeswalker$ True | SpellDescription$ CARDNAME deals 2 damage divided as you choose among one or two targets.
-A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature,Planeswalker | ChangeNum$ 2 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle.
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | KW$ Double Strike | SpellDescription$ Up to one target creature gains double strike until end of turn.
+A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Any | TgtPrompt$ Select any target to distribute damage to | NumDmg$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | SpellDescription$ CARDNAME deals 2 damage divided as you choose among one or two targets.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature,Planeswalker | ChangeNum$ 2 | Ultimate$ True | SpellDescription$ Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle.
 Oracle:[+1]: Up to one target creature gains double strike until end of turn.\n[-2]: Samut, the Tested deals 2 damage divided as you choose among one or two targets.\n[-7]: Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sandman_shifting_scoundrel.txt b/forge-gui/res/cardsfolder/s/sandman_shifting_scoundrel.txt
new file mode 100644
index 00000000000..37649329913
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/sandman_shifting_scoundrel.txt
@@ -0,0 +1,10 @@
+Name:Sandman, Shifting Scoundrel
+ManaCost:1 G G
+Types:Legendary Creature Sand Elemental Villain
+PT:*/*
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ NICKNAME's power and toughness are each equal to the number of lands you control.
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.powerLE2 | Description$ CARDNAME can't be blocked by creatures with power 2 or less.
+A:AB$ ChangeZone | Cost$ 3 G G | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | ValidTgts$ Land.YouOwn | TgtPrompt$ Select target land card in your graveyard | ThisDefinedAndTgts$ Self | Tapped$ True | SpellDescription$ Return this card and target land card from your graveyard to the battlefield tapped.
+SVar:X:Count$Valid Land.YouCtrl
+SVar:BuffedBy:Land
+Oracle:Sandman's power and toughness are each equal to the number of lands you control.\nSandman can't be blocked by creatures with power 2 or less.\n{3}{G}{G}: Return this card and target land card from your graveyard to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/sandmans_quicksand.txt b/forge-gui/res/cardsfolder/s/sandmans_quicksand.txt
new file mode 100644
index 00000000000..48e7f6374ab
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/sandmans_quicksand.txt
@@ -0,0 +1,8 @@
+Name:Sandman's Quicksand
+ManaCost:1 B B
+Types:Sorcery
+K:Mayhem:3 B
+A:SP$ PumpAll | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SubAbility$ DBPumpAll | ConditionDefined$ Self | ConditionPresent$ Card.!CastSa Spell.Mayhem | ConditionCompare$ EQ1 | SpellDescription$ All creatures get -2/-2 until end of turn. If this spell's mayhem cost was paid, creatures your opponents control get -2/-2 until end of turn instead.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -2 | NumDef$ -2 | ConditionDefined$ Self | ConditionPresent$ Card.CastSa Spell.Mayhem | IsCurse$ True
+DeckHints:Ability$Discard
+Oracle:Mayhem {3}{B} (You may cast this card from your graveyard for {3}{B} if you discarded it this turn. Timing rules still apply.)\nAll creatures get -2/-2 until end of turn. If this spell's mayhem cost was paid, creatures your opponents control get -2/-2 until end of turn instead.
diff --git a/forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt b/forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt
index 29f0206aa2c..05084018acc 100644
--- a/forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt
+++ b/forge-gui/res/cardsfolder/s/sandsteppe_war_riders.txt
@@ -5,6 +5,6 @@ PT:4/4
 K:Trample
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, bolster X, where X is the number of differently named artifact tokens you control. (Choose a creature with the least toughness among creatures you control and put X +1/+1 counters on it.)
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ X | Bolster$ True
-SVar:X:Count$DifferentCardNames_Artifact.YouCtrl+token+inZoneBattlefield
+SVar:X:Count$Valid Artifact.YouCtrl+token$DifferentCardNames
 DeckHas:Ability$Counters
 Oracle:Trample\nAt the beginning of combat on your turn, bolster X, where X is the number of differently named artifact tokens you control. (Choose a creature with the least toughness among creatures you control and put X +1/+1 counters on it.)
diff --git a/forge-gui/res/cardsfolder/s/sandworm.txt b/forge-gui/res/cardsfolder/s/sandworm.txt
index dcb4837ae2c..cd6303d589c 100644
--- a/forge-gui/res/cardsfolder/s/sandworm.txt
+++ b/forge-gui/res/cardsfolder/s/sandworm.txt
@@ -5,5 +5,5 @@ PT:5/4
 K:Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature enters, destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land | SubAbility$ DBChange | AITgts$ Land.nonBasic | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True
 Oracle:Haste\nWhen this creature enters, destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sarevoks_tome.txt b/forge-gui/res/cardsfolder/s/sarevoks_tome.txt
index 7fc15162f11..13451e69f62 100644
--- a/forge-gui/res/cardsfolder/s/sarevoks_tome.txt
+++ b/forge-gui/res/cardsfolder/s/sarevoks_tome.txt
@@ -8,5 +8,5 @@ SVar:X:Count$Initiative.2.1
 A:AB$ DigUntil | Cost$ 3 T | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Exile | RevealedDestination$ Exile | RememberFound$ True | SubAbility$ DBPlay | CheckSVar$ Y | NoPutDesc$ True | SpellDescription$ Exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Activate only if you've completed a dungeon.
 SVar:DBPlay:DB$ Play | Defined$ Remembered | DefinedDesc$ that card | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:Y:PlayerCountPropertyYou$DungeonsCompleted
+SVar:Y:DungeonsCompleted$Amount
 Oracle:When Sarevok's Tome enters, you take the initiative.\n{T}: Add {C}. If you have the initiative, add {C}{C} instead.\n{3}, {T}: Exile cards from the top of your library until you exile a nonland card. You may cast that card without paying its mana cost. Activate only if you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/s/sarkhans_triumph.txt b/forge-gui/res/cardsfolder/s/sarkhans_triumph.txt
index fa9abec458c..2d152a6fd25 100644
--- a/forge-gui/res/cardsfolder/s/sarkhans_triumph.txt
+++ b/forge-gui/res/cardsfolder/s/sarkhans_triumph.txt
@@ -1,7 +1,7 @@
 Name:Sarkhan's Triumph
 ManaCost:2 R
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Dragon | ChangeNum$ 1 | SpellDescription$ Search your library for a Dragon creature card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Dragon | ChangeTypeDesc$ Dragon creature | SpellDescription$ Search your library for a Dragon creature card, reveal it, put it into your hand, then shuffle.
 AI:RemoveDeck:Random
 DeckNeeds:Type$Dragon
 Oracle:Search your library for a Dragon creature card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
index 88e48cb6f6f..57f31c7f729 100644
--- a/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
+++ b/forge-gui/res/cardsfolder/s/sasaya_orochi_ascendant_sasayas_essence.txt
@@ -14,6 +14,6 @@ ManaCost:1 G G
 Colors:green
 Types:Legendary Enchantment
 T:Mode$ TapsForMana | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBRepeat | Static$ True | TriggerDescription$ Whenever a land you control is tapped for mana, add an additional one mana of any type that land produced for each other land you control with the same name as it.
-SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Land.YouCtrl+NotTriggeredCard+sharesNameWith TriggeredCard | RepeatSubAbility$ DBManaReflect
+SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Land.YouCtrl+!TriggeredCard+sharesNameWith TriggeredCard | RepeatSubAbility$ DBManaReflect
 SVar:DBManaReflect:DB$ ManaReflected | ColorOrType$ Type | ReflectProperty$ Produced | Defined$ You
 Oracle:Whenever a land you control is tapped for mana, add an additional one mana of any type that land produced for each other land you control with the same name as it.
diff --git a/forge-gui/res/cardsfolder/s/savage_mansion.txt b/forge-gui/res/cardsfolder/s/savage_mansion.txt
new file mode 100644
index 00000000000..7569ca4a44b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/savage_mansion.txt
@@ -0,0 +1,8 @@
+Name:Savage Mansion
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
+A:AB$ Surveil | Cost$ 4 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:This land enters tapped.\n{T}: Add {R} or {G}.\n{4}, {T}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/scalding_tarn.txt b/forge-gui/res/cardsfolder/s/scalding_tarn.txt
index a61dd110d4a..abbba1590b9 100644
--- a/forge-gui/res/cardsfolder/s/scalding_tarn.txt
+++ b/forge-gui/res/cardsfolder/s/scalding_tarn.txt
@@ -1,5 +1,5 @@
 Name:Scalding Tarn
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Mountain | ChangeNum$ 1 | SpellDescription$ Search your library for a Island or Mountain card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Island,Mountain | SpellDescription$ Search your library for a Island or Mountain card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Scalding Tarn: Search your library for an Island or Mountain card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/scale_up.txt b/forge-gui/res/cardsfolder/s/scale_up.txt
index 9533e22595f..ef3b789f0b7 100644
--- a/forge-gui/res/cardsfolder/s/scale_up.txt
+++ b/forge-gui/res/cardsfolder/s/scale_up.txt
@@ -1,6 +1,6 @@
 Name:Scale Up
 ManaCost:G
 Types:Sorcery
-A:SP$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 6 | Toughness$ 4 | Colors$ Green | OverwriteColors$ True | Types$ Wurm | SpellDescription$ Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.
+A:SP$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Power$ 6 | Toughness$ 4 | Colors$ Green | OverwriteColors$ True | Types$ Wurm | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.
 K:Overload:4 G G
 Oracle:Until end of turn, target creature you control becomes a green Wurm with base power and toughness 6/4.\nOverload {4}{G}{G} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/forge-gui/res/cardsfolder/s/scalpelexis.txt b/forge-gui/res/cardsfolder/s/scalpelexis.txt
index 050f476d302..e6820f26a0e 100644
--- a/forge-gui/res/cardsfolder/s/scalpelexis.txt
+++ b/forge-gui/res/cardsfolder/s/scalpelexis.txt
@@ -8,6 +8,6 @@ SVar:TrigExile:DB$ Repeat | RepeatSubAbility$ DBExileCleanup | RepeatCheckSVar$
 SVar:DBExileCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBExile
 SVar:DBExile:DB$ Dig | Defined$ TriggeredTarget | DigNum$ 4 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Card.IsRemembered
+SVar:X:Remembered$DifferentCardNames
 SVar:Y:Count$RememberedSize
 Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nWhenever Scalpelexis deals combat damage to a player, that player exiles the top four cards of their library. If two or more of those cards have the same name, repeat this process.
diff --git a/forge-gui/res/cardsfolder/s/scarab_feast.txt b/forge-gui/res/cardsfolder/s/scarab_feast.txt
index d70adde5db5..6cb39a16508 100644
--- a/forge-gui/res/cardsfolder/s/scarab_feast.txt
+++ b/forge-gui/res/cardsfolder/s/scarab_feast.txt
@@ -1,6 +1,6 @@
 Name:Scarab Feast
 ManaCost:B
 Types:Instant
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to three target cards from a single graveyard.
 K:Cycling:B
 Oracle:Exile up to three target cards from a single graveyard.\nCycling {B} ({B}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/scarlet_spider_ben_reilly.txt b/forge-gui/res/cardsfolder/s/scarlet_spider_ben_reilly.txt
new file mode 100644
index 00000000000..208e3d7fb77
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/scarlet_spider_ben_reilly.txt
@@ -0,0 +1,10 @@
+Name:Scarlet Spider, Ben Reilly
+ManaCost:1 R G
+Types:Legendary Creature Spider Human Hero
+PT:4/3
+K:Web-slinging:R G
+K:Trample
+R:Event$ Moved | ValidCard$ Card.Self+webSlinged+wasCast | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ AddExtraCounter | Description$ Sensational Save — If NICKNAME was cast using web-slinging, he enters with X +1/+1 counters on him, where X is the mana value of the returned creature.
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+SVar:X:CastSA>Returned$CardManaCost
+Oracle:Web-slinging {R}{G} (You may cast this spell for {R}{G} if you also return a tapped creature you control to its owner's hand.)\nTrample\nSensational Save — If Scarlet Spider was cast using web-slinging, he enters with X +1/+1 counters on him, where X is the mana value of the returned creature.
diff --git a/forge-gui/res/cardsfolder/s/scarlet_spider_kaine.txt b/forge-gui/res/cardsfolder/s/scarlet_spider_kaine.txt
new file mode 100644
index 00000000000..1f4c15ea362
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/scarlet_spider_kaine.txt
@@ -0,0 +1,9 @@
+Name:Scarlet Spider, Kaine
+ManaCost:B R
+Types:Legendary Creature Spider Human Hero
+PT:2/1
+K:Menace
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When NICKNAME enters, you may discard a card. If you do, put a +1/+1 counter on him.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ Discard<1/Card> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+K:Mayhem:BR
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhen Scarlet Spider enters, you may discard a card. If you do, put a +1/+1 counter on him.\nMayhem {B/R} (You may cast this card from your graveyard for {B/R} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt b/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
index bf9ad1d46a5..5869b37f1ac 100644
--- a/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
+++ b/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
@@ -4,7 +4,7 @@ Types:Creature Human Advisor
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When CARDNAME enters, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, puts those cards onto the battlefield tapped, then shuffles.
 SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ LTY | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land.Basic | ChangeNum$ Z | Origin$ Library | Destination$ Battlefield | Tapped$ True
+SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ LTY | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ Z | Origin$ Library | Destination$ Battlefield | Tapped$ True
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:Y:PlayerCountPlayers$HighestValid Land.YouCtrl
 SVar:Z:SVar$Y/Minus.X
diff --git a/forge-gui/res/cardsfolder/s/school_daze.txt b/forge-gui/res/cardsfolder/s/school_daze.txt
new file mode 100644
index 00000000000..f02ababd3e2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/school_daze.txt
@@ -0,0 +1,8 @@
+Name:School Daze
+ManaCost:3 U U
+Types:Instant
+A:SP$ Charm | Choices$ DBDoHomework,DBFightCrime | CharmNum$ 1
+SVar:DBDoHomework:DB$ Draw | NumCards$ 3 | SpellDescription$ Do Homework — Draw three cards.
+SVar:DBFightCrime:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Fight Crime — Counter target spell. Draw a card.
+SVar:DBDraw:DB$ Draw
+Oracle:Choose one —\n• Do Homework — Draw three cards.\n• Fight Crime — Counter target spell. Draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/scorpion_seething_striker.txt b/forge-gui/res/cardsfolder/s/scorpion_seething_striker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorpion_seething_striker.txt
rename to forge-gui/res/cardsfolder/s/scorpion_seething_striker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scorpions_sting.txt b/forge-gui/res/cardsfolder/s/scorpions_sting.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scorpions_sting.txt
rename to forge-gui/res/cardsfolder/s/scorpions_sting.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/scout_the_city.txt b/forge-gui/res/cardsfolder/s/scout_the_city.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/scout_the_city.txt
rename to forge-gui/res/cardsfolder/s/scout_the_city.txt
diff --git a/forge-gui/res/cardsfolder/s/scout_the_wilderness.txt b/forge-gui/res/cardsfolder/s/scout_the_wilderness.txt
index 6df041b89f6..5c126ccddcb 100644
--- a/forge-gui/res/cardsfolder/s/scout_the_wilderness.txt
+++ b/forge-gui/res/cardsfolder/s/scout_the_wilderness.txt
@@ -2,7 +2,7 @@ Name:Scout the Wilderness
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:1 W
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier | Condition$ Kicked
 DeckHints:Color$White
 DeckHas:Ability$Token & Type$Soldier
diff --git a/forge-gui/res/cardsfolder/s/scouting_trek.txt b/forge-gui/res/cardsfolder/s/scouting_trek.txt
index 9b5a435812f..138c5e18dbf 100644
--- a/forge-gui/res/cardsfolder/s/scouting_trek.txt
+++ b/forge-gui/res/cardsfolder/s/scouting_trek.txt
@@ -1,7 +1,7 @@
 Name:Scouting Trek
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | ChangeNum$ X | ChangeType$ Land.Basic | Origin$ Library | Destination$ Library | Reorder$ True | LibraryPosition$ 0 | SpellDescription$ Search your library for any number of basic land cards, reveal those cards, then shuffle and put them on top.
+A:SP$ ChangeZone | ChangeNum$ X | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Origin$ Library | Destination$ Library | Reorder$ True | LibraryPosition$ 0 | SpellDescription$ Search your library for any number of basic land cards, reveal those cards, then shuffle and put them on top.
 SVar:X:Count$ValidLibrary Land.Basic+YouOwn
 AI:RemoveDeck:All
 Oracle:Search your library for any number of basic land cards, reveal those cards, then shuffle and put them on top.
diff --git a/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt b/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
index 6889d8d2ecd..893699ffd64 100644
--- a/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
+++ b/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Construct
 PT:0/0
 K:Modular:2
-A:AB$ ChangeZone | Cost$ T Sac<1/Artifact> | Origin$ Library | Destination$ Hand | ChangeType$ Card.Construct | ChangeNum$ 1 | SpellDescription$ Search your library for a Construct card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/Artifact> | Origin$ Library | Destination$ Hand | ChangeType$ Construct | SpellDescription$ Search your library for a Construct card, reveal it, put it into your hand, then shuffle.
 SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ1
 AI:RemoveDeck:Random
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/s/sculpted_sunburst.txt b/forge-gui/res/cardsfolder/s/sculpted_sunburst.txt
index b1b83a8df9a..8f39e835757 100644
--- a/forge-gui/res/cardsfolder/s/sculpted_sunburst.txt
+++ b/forge-gui/res/cardsfolder/s/sculpted_sunburst.txt
@@ -2,7 +2,7 @@ Name:Sculpted Sunburst
 ManaCost:3 W W
 Types:Sorcery
 A:SP$ ChooseCard | Choices$ Creature.YouCtrl | ChoiceDesc$ creature they control | Mandatory$ True | ChoiceTitle$ Choose a creature you control | ImprintChosen$ True | SubAbility$ DBChooseCard | SpellDescription$ Choose a creature you control, then each opponent chooses a creature they control with equal or lesser power.
-SVar:DBChooseCard:DB$ ChooseCard | Defined$ Opponent | ControlledByPlayer$ Chooser | Choices$ Creature.powerLEX | Mandatory$ True | ChoiceTitle$ Choose a creature you control with equal or lesser power | RememberChosen$ True
+SVar:DBChooseCard:DB$ ChooseCard | Defined$ Opponent | ControlledByPlayer$ Chooser | Choices$ Creature.powerLEX | Mandatory$ True | ChoiceTitle$ Choose a creature you control with equal or lesser power | RememberChosen$ True | SubAbility$ DBChangeZoneAll
 SVar:X:Imprinted$CardPower
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ConditionDefined$ Imprinted | ConditionPresent$ Creature | Origin$ Battlefield | Destination$ Exile | ChangeType$ Creature.IsNotRemembered+IsNotImprinted | SubAbility$ DBCleanup | SpellDescription$ If you chose a creature this way, exile each creature not chosen by any player this way.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True | ClearChosenCard$ True
diff --git a/forge-gui/res/cardsfolder/s/sculpting_steel.txt b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
index 1863839700b..50adb17d6e3 100644
--- a/forge-gui/res/cardsfolder/s/sculpting_steel.txt
+++ b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact
 K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other | SpellDescription$ You may have CARDNAME enter as a copy of any artifact on the battlefield.
-SVar:NeedsToPlay:Artifact.YouDontCtrl+notnamedSculpting Steel,Artifact.YouCtrl+nonLegendary+notnamedSculpting Steel
+SVar:NeedsToPlay:Artifact.YouDontCtrl+!namedSculpting Steel,Artifact.YouCtrl+nonLegendary+!namedSculpting Steel
 Oracle:You may have Sculpting Steel enter as a copy of any artifact on the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/seahunter.txt b/forge-gui/res/cardsfolder/s/seahunter.txt
index e71ad422ed8..7690383325a 100644
--- a/forge-gui/res/cardsfolder/s/seahunter.txt
+++ b/forge-gui/res/cardsfolder/s/seahunter.txt
@@ -2,7 +2,7 @@ Name:Seahunter
 ManaCost:2 U U
 Types:Creature Human Mercenary
 PT:2/2
-A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Merfolk | ChangeNum$ 1 | SpellDescription$ Search your library for a Merfolk permanent card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Merfolk | ChangeTypeDesc$ Merfolk permanent | SpellDescription$ Search your library for a Merfolk permanent card, put it onto the battlefield, then shuffle.
 AI:RemoveDeck:Random
 SVar:NonCombatPriority:3
 Oracle:{3}, {T}: Search your library for a Merfolk permanent card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/search_for_tomorrow.txt b/forge-gui/res/cardsfolder/s/search_for_tomorrow.txt
index 4e919bb158a..ffdae0d4465 100644
--- a/forge-gui/res/cardsfolder/s/search_for_tomorrow.txt
+++ b/forge-gui/res/cardsfolder/s/search_for_tomorrow.txt
@@ -2,5 +2,5 @@ Name:Search for Tomorrow
 ManaCost:2 G
 Types:Sorcery
 K:Suspend:2:G
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
 Oracle:Search your library for a basic land card, put it onto the battlefield, then shuffle.\nSuspend 2—{G} (Rather than cast this card from your hand, you may pay {G} and exile it with two time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, you may cast it without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/s/secret_identity.txt b/forge-gui/res/cardsfolder/s/secret_identity.txt
new file mode 100644
index 00000000000..fbe7df6cc9f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/secret_identity.txt
@@ -0,0 +1,7 @@
+Name:Secret Identity
+ManaCost:U
+Types:Instant
+A:SP$ Charm | Choices$ DBConceal,DBReveal
+SVar:DBConceal:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Types$ Citizen | RemoveCreatureTypes$ True | Power$ 1 | Toughness$ 1 | Keywords$ Hexproof | SpellDescription$ Conceal — Until end of turn, target creature you control becomes a Citizen with base power and toughness 1/1 and gains hexproof.
+SVar:DBReveal:DB$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Types$ Hero | RemoveCreatureTypes$ True | Power$ 3 | Toughness$ 4 | Keywords$ Flying & Vigilance | SpellDescription$ Reveal — Until end of turn, target creature you control becomes a Hero with base power and toughness 3/4 and gains flying and vigilance.
+Oracle:Choose one —\n• Conceal — Until end of turn, target creature you control becomes a Citizen with base power and toughness 1/1 and gains hexproof.\n• Reveal — Until end of turn, target creature you control becomes a Hero with base power and toughness 3/4 and gains flying and vigilance.
diff --git a/forge-gui/res/cardsfolder/s/seek_the_horizon.txt b/forge-gui/res/cardsfolder/s/seek_the_horizon.txt
index 861e1826ab5..b6136d48f27 100644
--- a/forge-gui/res/cardsfolder/s/seek_the_horizon.txt
+++ b/forge-gui/res/cardsfolder/s/seek_the_horizon.txt
@@ -1,5 +1,5 @@
 Name:Seek the Horizon
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 3 | SpellDescription$ Search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 3 | SpellDescription$ Search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle.
 Oracle:Search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/seething_landscape.txt b/forge-gui/res/cardsfolder/s/seething_landscape.txt
index ba1d733d929..de8939f0a2f 100644
--- a/forge-gui/res/cardsfolder/s/seething_landscape.txt
+++ b/forge-gui/res/cardsfolder/s/seething_landscape.txt
@@ -2,6 +2,6 @@ Name:Seething Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Island+Basic,Land.Swamp+Basic,Land.Mountain+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Island.Basic,Swamp.Basic,Mountain.Basic | ChangeTypeDesc$ basic Island, Swamp, or Mountain | SpellDescription$ Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:U B R
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Seething Landscape: Search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle.\nCycling {U}{B}{R} ({U}{B}{R}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/sefris_of_the_hidden_ways.txt b/forge-gui/res/cardsfolder/s/sefris_of_the_hidden_ways.txt
index 90794536f66..9bdce439829 100644
--- a/forge-gui/res/cardsfolder/s/sefris_of_the_hidden_ways.txt
+++ b/forge-gui/res/cardsfolder/s/sefris_of_the_hidden_ways.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Wizard
 PT:2/3
 T:Mode$ ChangesZoneAll | ValidCards$ Creature.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigVenture | TriggerDescription$ Whenever one or more creature cards are put into your graveyard from anywhere, venture into the dungeon. This ability triggers only once each turn. (To venture into the dungeon, enter the first room or advance to the next room.)
 SVar:TrigVenture:DB$ Venture
-T:Mode$ DungeonCompleted | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DBReturn | TriggerDescription$ Create Undead — Whenever you complete a dungeon, return target creature card from your graveyard to the battlefield.
+T:Mode$ DungeonCompleted | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBReturn | TriggerDescription$ Create Undead — Whenever you complete a dungeon, return target creature card from your graveyard to the battlefield.
 SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Battlefield
 AI:RemoveDeck:Random
 DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/upcoming/seismic_tutelage.txt b/forge-gui/res/cardsfolder/s/seismic_tutelage.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/seismic_tutelage.txt
rename to forge-gui/res/cardsfolder/s/seismic_tutelage.txt
diff --git a/forge-gui/res/cardsfolder/s/self_destruct.txt b/forge-gui/res/cardsfolder/s/self_destruct.txt
index a556ba10d5e..adc7757bb36 100644
--- a/forge-gui/res/cardsfolder/s/self_destruct.txt
+++ b/forge-gui/res/cardsfolder/s/self_destruct.txt
@@ -1,10 +1,9 @@
 Name:Self-Destruct
 ManaCost:1 R
 Types:Instant
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl | AILogic$ PowerDmg | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBDealDamage1 | StackDescription$ None | SpellDescription$ Target creature you control deals X damage to any other target and X damage to itself, where X is its power.
-SVar:DBDealDamage1:DB$ DealDamage | ValidTgts$ Any | TargetUnique$ True | AILogic$ PowerDmg | NumDmg$ X | DamageMap$ True | SubAbility$ DBDealDamage2 | DamageSource$ Remembered
-SVar:DBDealDamage2:DB$ DealDamage | NumDmg$ X | Defined$ Remembered | SubAbility$ DBDamageResolve | DamageSource$ Remembered
-SVar:DBDamageResolve:DB$ DamageResolve | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$CardPower
+A:SP$ DealDamage | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ PowerDmg | NumDmg$ X | DamageMap$ True | SubAbility$ DBDealDamage2 | DamageSource$ ThisTargetedCard | SpellDescription$ Target creature you control deals X damage to any other target and X damage to itself, where X is its power.
+SVar:DBDealDamage2:DB$ DealDamage | ValidTgts$ Any | TargetUnique$ True | NumDmg$ Y | SubAbility$ DBDamageResolve | DamageSource$ ParentTarget
+SVar:DBDamageResolve:DB$ DamageResolve
+SVar:X:Targeted$CardPower
+SVar:Y:ParentTargeted$CardPower
 Oracle:Target creature you control deals X damage to any other target and X damage to itself, where X is its power.
diff --git a/forge-gui/res/cardsfolder/upcoming/selfless_police_captain.txt b/forge-gui/res/cardsfolder/s/selfless_police_captain.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/selfless_police_captain.txt
rename to forge-gui/res/cardsfolder/s/selfless_police_captain.txt
diff --git a/forge-gui/res/cardsfolder/s/serene_remembrance.txt b/forge-gui/res/cardsfolder/s/serene_remembrance.txt
index 5428e2e7cc0..55af0dc7bea 100644
--- a/forge-gui/res/cardsfolder/s/serene_remembrance.txt
+++ b/forge-gui/res/cardsfolder/s/serene_remembrance.txt
@@ -2,7 +2,7 @@ Name:Serene Remembrance
 ManaCost:G
 Types:Sorcery
 A:SP$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ False | RememberChanged$ True | Defined$ Self | SubAbility$ DBShuffleGrave | SpellDescription$ Shuffle CARDNAME and up to three target cards from a single graveyard into their owners' libraries.
-SVar:DBShuffleGrave:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsFromSingleZone$ True | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card.Other | Origin$ Graveyard | Destination$ Library | Shuffle$ False | RememberChanged$ True | SubAbility$ DBShuffleChanged
+SVar:DBShuffleGrave:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithSameController$ True | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card.Other | Origin$ Graveyard | Destination$ Library | Shuffle$ False | RememberChanged$ True | SubAbility$ DBShuffleChanged
 SVar:DBShuffleChanged:DB$ Shuffle | Defined$ RememberedOwner | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Shuffle Serene Remembrance and up to three target cards from a single graveyard into their owners' libraries.
diff --git a/forge-gui/res/cardsfolder/upcoming/serpent_of_the_pass.txt b/forge-gui/res/cardsfolder/s/serpent_of_the_pass.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/serpent_of_the_pass.txt
rename to forge-gui/res/cardsfolder/s/serpent_of_the_pass.txt
diff --git a/forge-gui/res/cardsfolder/s/settle_the_wreckage.txt b/forge-gui/res/cardsfolder/s/settle_the_wreckage.txt
index b7c1ccbe580..db0a8ffd91b 100644
--- a/forge-gui/res/cardsfolder/s/settle_the_wreckage.txt
+++ b/forge-gui/res/cardsfolder/s/settle_the_wreckage.txt
@@ -2,7 +2,7 @@ Name:Settle the Wreckage
 ManaCost:2 W W
 Types:Instant
 A:SP$ ChangeZoneAll | ValidTgts$ Player | ChangeType$ Creature.attacking | TgtPrompt$ Select target player | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBGetLands | SpellDescription$ Exile all attacking creatures target player controls. That player may search their library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle.
-SVar:DBGetLands:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ X | DefinedPlayer$ TargetedPlayer | ShuffleNonMandatory$ True | SubAbility$ DBCleanup
+SVar:DBGetLands:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | DefinedPlayer$ TargetedPlayer | ShuffleNonMandatory$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
 Oracle:Exile all attacking creatures target player controls. That player may search their library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/shadow_of_the_goblin.txt b/forge-gui/res/cardsfolder/s/shadow_of_the_goblin.txt
new file mode 100644
index 00000000000..2c010042d28
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/shadow_of_the_goblin.txt
@@ -0,0 +1,12 @@
+Name:Shadow of the Goblin
+ManaCost:1 R
+Types:Enchantment
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Unreliable Visions — At the beginning of your first main phase, discard a card. If you do, draw a card.
+SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl | Origin$ Ante,Command,Exile,Graveyard,Library | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Undying Vengeance — Whenever you play a land or cast a spell from anywhere other than your hand, this enchantment deals 1 damage to each opponent.
+T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl+YouDontOwn | Origin$ Hand | Execute$ TrigDamage | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Undying Vengeance — Whenever you play a land or cast a spell from anywhere other than your hand, this enchantment deals 1 damage to each opponent.
+T:Mode$ SpellCast | ValidCard$ Card.!wasCastFromYourHand | ValidActivatingPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Undying Vengeance — Whenever you play a land or cast a spell from anywhere other than your hand, this enchantment deals 1 damage to each opponent.
+SVar:TrigDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1
+Oracle:Unreliable Visions — At the beginning of your first main phase, discard a card. If you do, draw a card.\nUndying Vengeance — Whenever you play a land or cast a spell from anywhere other than your hand, this enchantment deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/s/shadow_rite_priest.txt b/forge-gui/res/cardsfolder/s/shadow_rite_priest.txt
index 9f10a079aec..cecc223384d 100644
--- a/forge-gui/res/cardsfolder/s/shadow_rite_priest.txt
+++ b/forge-gui/res/cardsfolder/s/shadow_rite_priest.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Human Cleric
 PT:2/2
 S:Mode$ Continuous | Affected$ Cleric.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Clerics you control get +1/+1.
-A:AB$ ChangeZone | Cost$ T 3 B B Sac<1/Cleric.Other> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Black | SpellDescription$ Search your library for a black creature card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T 3 B B Sac<1/Cleric.Other> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Black | ChangeTypeDesc$ black creature | SpellDescription$ Search your library for a black creature card, put it onto the battlefield, then shuffle.
 DeckHas:Ability$Sacrifice
 DeckNeeds:Type$Cleric
 Oracle:Other Clerics you control get +1/+1.\n{3}{B}{B}, {T}, Sacrifice another Cleric: Search your library for a black creature card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
index 9d683f7ef4f..3616893e4ad 100644
--- a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
@@ -4,7 +4,7 @@ Types:Creature Human Shaman
 PT:2/3
 A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Spell.Creature | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast creature spells.
 A:AB$ RepeatEach | Cost$ 9 G G T | PrecostDesc$ Formidable — | CheckSVar$ FormidableTest | SVarCompare$ GE8 | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures they control. Activate only if creatures you control have total power 8 or greater.
-SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
+SVar:FormidableTest:Count$Valid Creature.YouCtrl$CardPower
 SVar:DBSetLife:DB$ SetLife | Defined$ Player.IsRemembered | LifeAmount$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 Oracle:{T}: Add two mana in any combination of colors. Spend this mana only to cast creature spells.\nFormidable — {9}{G}{G}, {T}: Each player's life total becomes the number of creatures they control. Activate only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt b/forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt
index 2a4edc6da5c..e49950485a2 100644
--- a/forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt
+++ b/forge-gui/res/cardsfolder/s/shanna_sisays_legacy.txt
@@ -2,7 +2,7 @@ Name:Shanna, Sisay's Legacy
 ManaCost:G W
 Types:Legendary Creature Human Warrior
 PT:0/0
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSA$ Activated,Triggered | Activator$ Player.Opponent | Description$ CARDNAME can't be the target of abilities your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSA$ Activated,Triggered | Activator$ Player.Opponent | Description$ CARDNAME can't be the target of abilities your opponents control.
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ NICKNAME gets +1/+1 for each creature you control.
 SVar:X:Count$Valid Creature.YouCtrl
 SVar:BuffedBy:Creature
diff --git a/forge-gui/res/cardsfolder/s/shared_animosity.txt b/forge-gui/res/cardsfolder/s/shared_animosity.txt
index 73b8536a799..8c313794f73 100644
--- a/forge-gui/res/cardsfolder/s/shared_animosity.txt
+++ b/forge-gui/res/cardsfolder/s/shared_animosity.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Enchantment
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ AnimosityPump | TriggerDescription$ Whenever a creature you control attacks, it gets +1/+0 until end of turn for each other attacking creature that shares a creature type with it.
 SVar:AnimosityPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X
-SVar:X:Count$Valid Creature.attacking+NotTriggeredAttacker+sharesCreatureTypeWith TriggeredAttacker
+SVar:X:Count$Valid Creature.attacking+!TriggeredAttacker+sharesCreatureTypeWith TriggeredAttacker
 AI:RemoveDeck:Random
 Oracle:Whenever a creature you control attacks, it gets +1/+0 until end of turn for each other attacking creature that shares a creature type with it.
diff --git a/forge-gui/res/cardsfolder/s/sharkey_tyrant_of_the_shire.txt b/forge-gui/res/cardsfolder/s/sharkey_tyrant_of_the_shire.txt
index 922e79e84c1..289f5293502 100644
--- a/forge-gui/res/cardsfolder/s/sharkey_tyrant_of_the_shire.txt
+++ b/forge-gui/res/cardsfolder/s/sharkey_tyrant_of_the_shire.txt
@@ -2,8 +2,8 @@ Name:Sharkey, Tyrant of the Shire
 ManaCost:2 U B
 Types:Legendary Creature Avatar Rogue
 PT:2/4
-S:Mode$ CantBeActivated | AffectedZone$ Battlefield | ValidCard$ Land.OppCtrl | ValidSA$ Activated.nonManaAbility | Description$ Activated abilities of lands your opponents control can't be activated unless they're mana abilities.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Land.OppCtrl | GainsValidAbilities$ Activated.nonManaAbility | Description$ CARDNAME has all activated abilities of lands your opponents control except mana abilities.
+S:Mode$ CantBeActivated | AffectedZone$ Battlefield | ValidCard$ Land.OppCtrl | ValidSA$ Activated.!ManaAbility | Description$ Activated abilities of lands your opponents control can't be activated unless they're mana abilities.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOf$ Land.OppCtrl | GainsValidAbilities$ Activated.!ManaAbility | Description$ CARDNAME has all activated abilities of lands your opponents control except mana abilities.
 S:Mode$ ManaConvert | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Activated | ManaConversion$ AnyType->AnyType | Description$ Mana of any type can be spent to activate NICKNAME's abilities.
 SVar:PlayMain1:TRUE
 Oracle:Activated abilities of lands your opponents control can't be activated unless they're mana abilities.\nSharkey, Tyrant of the Shire has all activated abilities of lands your opponents control except mana abilities.\nMana of any type can be spent to activate Sharkey's abilities.
diff --git a/forge-gui/res/cardsfolder/s/shattered_landscape.txt b/forge-gui/res/cardsfolder/s/shattered_landscape.txt
index d699fa72878..7f49d7df92a 100644
--- a/forge-gui/res/cardsfolder/s/shattered_landscape.txt
+++ b/forge-gui/res/cardsfolder/s/shattered_landscape.txt
@@ -2,6 +2,6 @@ Name:Shattered Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Plains+Basic,Land.Swamp+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Mountain, Plains, or Swamp card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Mountain.Basic,Plains.Basic,Swamp.Basic | ChangeTypeDesc$ basic Mountain, Plains, or Swamp | SpellDescription$ Search your library for a basic Mountain, Plains, or Swamp card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:R W B
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Shattered Landscape: Search your library for a basic Mountain, Plains, or Swamp card, put it onto the battlefield tapped, then shuffle.\nCycling {R}{W}{B} ({R}{W}{B}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/shaun_and_rebecca_agents.txt b/forge-gui/res/cardsfolder/s/shaun_and_rebecca_agents.txt
index 209cbb0620c..84bfcbd195c 100644
--- a/forge-gui/res/cardsfolder/s/shaun_and_rebecca_agents.txt
+++ b/forge-gui/res/cardsfolder/s/shaun_and_rebecca_agents.txt
@@ -3,7 +3,7 @@ ManaCost:1 G W U
 Types:Legendary Creature Human Assassin Scientist
 PT:4/4
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, search your graveyard, hand, and library for a card named The Animus and put it onto the battlefield, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, search your graveyard, hand, and library for a card named The Animus and put it onto the battlefield, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | OriginAlternative$ Graveyard,Hand | Hidden$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.namedThe Animus | ChangeNum$ 1 | ShuffleNonMandatory$ True
 A:AB$ Mana | Cost$ T | Produced$ C | SubAbility$ DBImmediateTrig | SpellDescription$ Add {C}. When you do, mill two cards.
 SVar:DBImmediateTrig:DB$ ImmediateTrigger | Execute$ TrigMill | TriggerDescription$ When you do, mill two cards.
diff --git a/forge-gui/res/cardsfolder/s/shellfish_scholar.txt b/forge-gui/res/cardsfolder/s/shellfish_scholar.txt
index 12319abf6cf..2cb9d128f36 100644
--- a/forge-gui/res/cardsfolder/s/shellfish_scholar.txt
+++ b/forge-gui/res/cardsfolder/s/shellfish_scholar.txt
@@ -1,7 +1,7 @@
 Name:Shellfish Scholar
-ManaCost:2 U
+ManaCost:1 U
 Types:Creature Rat Wizard
-PT:3/2
+PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Rat.Other+YouCtrl | Execute$ TrigConjure | TriggerDescription$ Whenever CARDNAME or another Rat you control enters, conjure a card named Think Twice into your graveyard.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Think Twice | Zone$ Graveyard | Amount$ 1
 A:AB$ Effect | Cost$ T | StaticAbilities$ StaticReduce | Activation$ Threshold | PrecostDesc$ Threshold — | SpellDescription$ Spells you cast from your graveyard this turn cost {2} less to cast. Activate only if there are seven or more cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sheltering_landscape.txt b/forge-gui/res/cardsfolder/s/sheltering_landscape.txt
index 72c47ebc740..15bfa78f4e0 100644
--- a/forge-gui/res/cardsfolder/s/sheltering_landscape.txt
+++ b/forge-gui/res/cardsfolder/s/sheltering_landscape.txt
@@ -2,6 +2,6 @@ Name:Sheltering Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Mountain.Basic,Forest.Basic,Plains.Basic | ChangeTypeDesc$ basic Mountain, Forest, or Plains | SpellDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:R G W
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Sheltering Landscape: Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle.\nCycling {R}{G}{W} ({R}{G}{W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/shielding_plax.txt b/forge-gui/res/cardsfolder/s/shielding_plax.txt
index 09bd6029230..4b446ff0266 100644
--- a/forge-gui/res/cardsfolder/s/shielding_plax.txt
+++ b/forge-gui/res/cardsfolder/s/shielding_plax.txt
@@ -3,7 +3,7 @@ ManaCost:2 GU
 Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
-S:Mode$ CantTarget | ValidCard$ Card.EnchantedBy | Activator$ Opponent | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Card.EnchantedBy | Activator$ Opponent | Description$ Enchanted creature can't be the target of spells or abilities your opponents control.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:({G/U} can be paid with either {G} or {U}.)\nEnchant creature\nWhen Shielding Plax enters, draw a card.\nEnchanted creature can't be the target of spells or abilities your opponents control.
diff --git a/forge-gui/res/cardsfolder/s/shimatsu_the_bloodcloaked.txt b/forge-gui/res/cardsfolder/s/shimatsu_the_bloodcloaked.txt
index db6d38ae3f8..5cbbdc4910e 100644
--- a/forge-gui/res/cardsfolder/s/shimatsu_the_bloodcloaked.txt
+++ b/forge-gui/res/cardsfolder/s/shimatsu_the_bloodcloaked.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Legendary Creature Demon Spirit
 PT:0/0
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ TrigSac | ReplacementResult$ Updated | Description$ As CARDNAME enters, sacrifice any number of permanents. NICKNAME enters with that many +1/+1 counters on it.
-SVar:TrigSac:DB$ Sacrifice | Amount$ SacX | SacValid$ Permanent | Defined$ You | RememberSacrificed$ True | Optional$ True | SubAbility$ DBPutcounter
-SVar:DBPutcounter:DB$ PutCounter | ETB$ True | CounterType$ P1P1 | Defined$ Self | CounterNum$ X | SubAbility$ DBCleanup
+SVar:TrigSac:DB$ Sacrifice | Amount$ SacX | SacValid$ Permanent | Defined$ You | RememberSacrificed$ True | Optional$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | ETB$ True | CounterType$ P1P1 | Defined$ Self | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SacX:Count$Valid Permanent.YouCtrl
 SVar:X:Remembered$Amount
diff --git a/forge-gui/res/cardsfolder/s/shire_terrace.txt b/forge-gui/res/cardsfolder/s/shire_terrace.txt
index 8acd308d15a..0b2f3d81e57 100644
--- a/forge-gui/res/cardsfolder/s/shire_terrace.txt
+++ b/forge-gui/res/cardsfolder/s/shire_terrace.txt
@@ -2,6 +2,6 @@ Name:Shire Terrace
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 DeckHas:Ability$Sacrifice
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Shire Terrace: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/shocker_unshakable.txt b/forge-gui/res/cardsfolder/s/shocker_unshakable.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/shocker_unshakable.txt
rename to forge-gui/res/cardsfolder/s/shocker_unshakable.txt
diff --git a/forge-gui/res/cardsfolder/s/shred_memory.txt b/forge-gui/res/cardsfolder/s/shred_memory.txt
index 2308ffb5e9e..85e7a30b00c 100644
--- a/forge-gui/res/cardsfolder/s/shred_memory.txt
+++ b/forge-gui/res/cardsfolder/s/shred_memory.txt
@@ -1,7 +1,7 @@
 Name:Shred Memory
 ManaCost:1 B
 Types:Instant
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 4 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to four target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ 4 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to four target cards from a single graveyard.
 K:Transmute:1 B B
 AI:RemoveDeck:All
 Oracle:Exile up to four target cards from a single graveyard.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/shriek_treblemaker.txt b/forge-gui/res/cardsfolder/s/shriek_treblemaker.txt
new file mode 100644
index 00000000000..8e41bff7069
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/shriek_treblemaker.txt
@@ -0,0 +1,10 @@
+Name:Shriek, Treblemaker
+ManaCost:2 BR
+Types:Legendary Creature Mutant Villain
+PT:2/3
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | Execute$ DBImmediateTrig | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your first main phase, you may discard a card. When you do, target creature can't block this turn.
+SVar:DBImmediateTrig:AB$ ImmediateTrigger | Cost$ Discard<1/Card> | Execute$ TrigPump | TriggerDescription$ You may discard a card. When you do, target creature can't block this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature. | IsCurse$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Sonic Blast — Whenever a creature an opponent controls dies, NICKNAME deals 1 damage to that player.
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredCardController
+Oracle:At the beginning of your first main phase, you may discard a card. When you do, target creature can't block this turn.\nSonic Blast — Whenever a creature an opponent controls dies, Shriek deals 1 damage to that player.
diff --git a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
index ff317a2a6c3..0c8383322cd 100644
--- a/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
+++ b/forge-gui/res/cardsfolder/s/sigil_of_valor.txt
@@ -4,5 +4,5 @@ Types:Artifact Equipment
 K:Equip:1
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Alone$ True | Execute$ TrigPump | TriggerDescription$ Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | NumAtt$ +X | NumDef$ +X
-SVar:X:Count$Valid Creature.YouCtrl+NotTriggeredAttacker
+SVar:X:Count$Valid Creature.YouCtrl+!TriggeredAttacker
 Oracle:Whenever equipped creature attacks alone, it gets +1/+1 until end of turn for each other creature you control.\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/signal_the_clans.txt b/forge-gui/res/cardsfolder/s/signal_the_clans.txt
index d449618dc05..a0a4574f962 100644
--- a/forge-gui/res/cardsfolder/s/signal_the_clans.txt
+++ b/forge-gui/res/cardsfolder/s/signal_the_clans.txt
@@ -6,6 +6,6 @@ SVar:DBChoose:DB$ ChooseCard | Defined$ You | Amount$ 1 | AtRandom$ True | Choic
 SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | Defined$ ChosenCard | StackDescription$ None | SubAbility$ DBShuffle | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ3
 SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Creature.IsRemembered
+SVar:X:Remembered$DifferentCardNames
 AI:RemoveDeck:All
 Oracle:Search your library for three creature cards and reveal them. If you reveal three cards with different names, choose one of them at random and put that card into your hand. Shuffle the rest into your library.
diff --git a/forge-gui/res/cardsfolder/s/silk_web_weaver.txt b/forge-gui/res/cardsfolder/s/silk_web_weaver.txt
new file mode 100644
index 00000000000..dac4d511c7e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/silk_web_weaver.txt
@@ -0,0 +1,9 @@
+Name:Silk, Web Weaver
+ManaCost:2 G W
+Types:Legendary Creature Spider Human Hero
+PT:3/5
+K:Web-slinging:1 G W
+T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, create a 1/1 green and white Human Citizen creature token.
+SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenScript$ gw_1_1_human_citizen
+A:AB$ PumpAll | Cost$ 3 G W | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +2 | KW$ Vigilance | SpellDescription$ Creatures you control get +2/+2 and gain vigilance until end of turn.
+Oracle:Web-slinging {1}{G}{W} (You may cast this spell for {1}{G}{W} if you also return a tapped creature you control to its owner's hand.)\nWhenever you cast a creature spell, create a 1/1 green and white Human Citizen creature token.\n{3}{G}{W}: Creatures you control get +2/+2 and gain vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/silkwing_scout.txt b/forge-gui/res/cardsfolder/s/silkwing_scout.txt
index 0a33db69925..e43a52167ba 100644
--- a/forge-gui/res/cardsfolder/s/silkwing_scout.txt
+++ b/forge-gui/res/cardsfolder/s/silkwing_scout.txt
@@ -3,5 +3,5 @@ ManaCost:2 U
 Types:Creature Faerie Scout
 PT:2/1
 K:Flying
-A:AB$ ChangeZone | Cost$ G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ G Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 Oracle:Flying\n{G}, Sacrifice Silkwing Scout: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/silver_sable_mercenary_leader.txt b/forge-gui/res/cardsfolder/s/silver_sable_mercenary_leader.txt
new file mode 100644
index 00000000000..52999815661
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/silver_sable_mercenary_leader.txt
@@ -0,0 +1,12 @@
+Name:Silver Sable, Mercenary Leader
+ManaCost:2 W
+Types:Legendary Creature Human Mercenary Hero
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When NICKNAME enters, put a +1/+1 counter on another target creature.
+SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | CounterType$ P1P1
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME attacks, target modified creature you control gains lifelink until end of turn. (Equipment, Auras you control, and counters are modifications.)
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.modified+YouCtrl | TgtPrompt$ Select target modified creature you control | KW$ Lifelink
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters
+DeckHints:Type$Aura|Equipment
+Oracle:When Silver Sable enters, put a +1/+1 counter on another target creature.\nWhenever Silver Sable attacks, target modified creature you control gains lifelink until end of turn. (Equipment, Auras you control, and counters are modifications.)
diff --git a/forge-gui/res/cardsfolder/s/silverglade_pathfinder.txt b/forge-gui/res/cardsfolder/s/silverglade_pathfinder.txt
index 2f8b41bea4b..7dda6656dba 100644
--- a/forge-gui/res/cardsfolder/s/silverglade_pathfinder.txt
+++ b/forge-gui/res/cardsfolder/s/silverglade_pathfinder.txt
@@ -2,6 +2,6 @@ Name:Silverglade Pathfinder
 ManaCost:1 G
 Types:Creature Dryad Spellshaper
 PT:1/1
-A:AB$ ChangeZone | Cost$ 1 G T Discard<1/Card> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 G T Discard<1/Card> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 AI:RemoveDeck:All
 Oracle:{1}{G}, {T}, Discard a card: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt b/forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt
index 1cb8bf8b52b..5d6db9b352a 100644
--- a/forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt
+++ b/forge-gui/res/cardsfolder/s/sin_unending_cataclysm.txt
@@ -5,12 +5,12 @@ PT:5/5
 K:Flying
 K:Trample
 K:ETBReplacement:Other:DBRemoveCounter
-SVar:DBRemoveCounter:DB$ RemoveCounter | Choices$ Artifact.HasCounters,Creature.HasCounters,Enchantment.HasCounters | ChoiceOptional$ True | CounterType$ All | CounterNum$ All | SubAbility$ DBPutCounters | RememberAmount$ True | SpellDescription$ As NICKNAME enters, remove all counters from any number of artifacts, creatures, and enchantments. NICKNAME enters with X +1/+1 counters on it, where X is twice the number of counters removed this way.
+SVar:DBRemoveCounter:DB$ RemoveCounter | Choices$ Artifact.HasCounters,Creature.HasCounters,Enchantment.HasCounters | ChoiceOptional$ True | CounterType$ All | SubAbility$ DBPutCounters | RememberAmount$ True | SpellDescription$ As NICKNAME enters, remove all counters from any number of artifacts, creatures, and enchantments. NICKNAME enters with X +1/+1 counters on it, where X is twice the number of counters removed this way.
 SVar:DBPutCounters:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When NICKNAME dies, put its counters on target creature you control, then shuffle this card into its owner's library.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ EachFromSource | EachFromSource$ TriggeredCardLKICopy | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Shuffle$ True
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Shuffle$ True
 SVar:X:Count$RememberedNumber/Times.2
 DeckHas:Ability$Counters
 Oracle:Flying, trample\nAs Sin enters, remove all counters from any number of artifacts, creatures, and enchantments. Sin enters with X +1/+1 counters on it, where X is twice the number of counters removed this way.\nWhen Sin dies, put its counters on target creature you control, then shuffle this card into its owner's library.
diff --git a/forge-gui/res/cardsfolder/s/sinister_hideout.txt b/forge-gui/res/cardsfolder/s/sinister_hideout.txt
new file mode 100644
index 00000000000..144088de195
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/sinister_hideout.txt
@@ -0,0 +1,8 @@
+Name:Sinister Hideout
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
+A:AB$ Surveil | Cost$ 4 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:This land enters tapped.\n{T}: Add {U} or {B}.\n{4}, {T}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt b/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
index c4ab79c229a..3c7fa084fe3 100644
--- a/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
+++ b/forge-gui/res/cardsfolder/s/skanos_dragon_vassal.txt
@@ -73,7 +73,7 @@ ManaCost:4 G G
 Types:Legendary Creature Dragon Ranger
 PT:6/6
 K:Vigilance
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$Whenever CARDNAME attacks, untap another target attacking creature. It gets +X/+0 until end of turn, where X is NICKNAME's power.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME attacks, untap another target attacking creature. It gets +X/+0 until end of turn, where X is NICKNAME's power.
 SVar:TrigUntap:DB$ Untap | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Targeted | NumAtt$ +X
 SVar:X:Count$CardPower
diff --git a/forge-gui/res/cardsfolder/s/skittering_surveyor.txt b/forge-gui/res/cardsfolder/s/skittering_surveyor.txt
index d0477f7a883..5821745a2a8 100644
--- a/forge-gui/res/cardsfolder/s/skittering_surveyor.txt
+++ b/forge-gui/res/cardsfolder/s/skittering_surveyor.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact Creature Construct
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Skittering Surveyor enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/skygames.txt b/forge-gui/res/cardsfolder/s/skygames.txt
index 790a323d3f2..af7b5503f94 100644
--- a/forge-gui/res/cardsfolder/s/skygames.txt
+++ b/forge-gui/res/cardsfolder/s/skygames.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Land
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ DPTapCreature | Description$ Enchanted land has "{T}: Target creature gains flying until end of turn. Activate only as a sorcery."
-SVar:DPTapCreature:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Choose target creature. | KW$ Flying | SorcerySpeed$ True | SpellDescription$ Target creature gains flying until end of turn. Activate only any time you could cast a sorcery.
+SVar:DPTapCreature:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Choose target creature. | KW$ Flying | SorcerySpeed$ True | SpellDescription$ Target creature gains flying until end of turn. Activate only as a sorcery.
 SVar:NonStackingAttachEffect:True
 Oracle:Enchant land\nEnchanted land has "{T}: Target creature gains flying until end of turn. Activate only as a sorcery."
diff --git a/forge-gui/res/cardsfolder/s/skyshroud_poacher.txt b/forge-gui/res/cardsfolder/s/skyshroud_poacher.txt
index 61645cbe9c7..21ade090a31 100644
--- a/forge-gui/res/cardsfolder/s/skyshroud_poacher.txt
+++ b/forge-gui/res/cardsfolder/s/skyshroud_poacher.txt
@@ -2,7 +2,7 @@ Name:Skyshroud Poacher
 ManaCost:2 G G
 Types:Creature Human Rebel
 PT:2/2
-A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Elf | ChangeNum$ 1 | SpellDescription$ Search your library for an Elf permanent card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.Elf | ChangeTypeDesc$ Elf permanent | SpellDescription$ Search your library for an Elf permanent card, put it onto the battlefield, then shuffle.
 AI:RemoveDeck:Random
 SVar:NonCombatPriority:3
 Oracle:{3}, {T}: Search your library for an Elf permanent card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/skyward_spider.txt b/forge-gui/res/cardsfolder/s/skyward_spider.txt
new file mode 100644
index 00000000000..74e9e90c4bf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/skyward_spider.txt
@@ -0,0 +1,7 @@
+Name:Skyward Spider
+ManaCost:WU WU
+Types:Creature Spider Human Hero
+PT:2/2
+K:Ward:2
+S:Mode$ Continuous | Affected$ Card.Self+modified | AddKeyword$ Flying | Description$ CARDNAME has flying as long as it's modified. (Equipment, Auras you control, and counters are modifications.)
+Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nThis creature has flying as long as it's modified. (Equipment, Auras you control, and counters are modifications.)
diff --git a/forge-gui/res/cardsfolder/upcoming/sledding_otter_penguin.txt b/forge-gui/res/cardsfolder/s/sledding_otter_penguin.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sledding_otter_penguin.txt
rename to forge-gui/res/cardsfolder/s/sledding_otter_penguin.txt
diff --git a/forge-gui/res/cardsfolder/s/smoky_lounge_misty_salon.txt b/forge-gui/res/cardsfolder/s/smoky_lounge_misty_salon.txt
index 831b569d199..0f2b8e92648 100644
--- a/forge-gui/res/cardsfolder/s/smoky_lounge_misty_salon.txt
+++ b/forge-gui/res/cardsfolder/s/smoky_lounge_misty_salon.txt
@@ -13,5 +13,5 @@ ManaCost:3 U
 Types:Enchantment Room
 T:Mode$ UnlockDoor | ValidPlayer$ You | ValidCard$ Card.Self | ThisDoor$ True | Execute$ TrigToken | TriggerDescription$ When you unlock this door, create an X/X blue Spirit creature token with flying, where X is the number of unlocked doors among Rooms you control.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_spirit_flying | TokenPower$ X | TokenToughness$ X | TokenOwner$ You
-SVar:X:Count$UnlockedDoors Card.Room+YouCtrl
+SVar:X:Count$UnlockedDoors
 Oracle:(You may cast either half. That door unlocks on the battlefield. As a sorcery, you may pay the mana cost of a locked door to unlock it.)\nWhen you unlock this door, create an X/X blue Spirit creature token with flying, where X is the number of unlocked doors among Rooms you control.
diff --git a/forge-gui/res/cardsfolder/s/smoldering_tar.txt b/forge-gui/res/cardsfolder/s/smoldering_tar.txt
index 9c9d6d4328a..cbf2486ad3f 100644
--- a/forge-gui/res/cardsfolder/s/smoldering_tar.txt
+++ b/forge-gui/res/cardsfolder/s/smoldering_tar.txt
@@ -3,6 +3,6 @@ ManaCost:2 B R
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, target player loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1
-A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ It deals 4 damage to target creature. Activate only any time you could cast a sorcery.
+A:AB$ DealDamage | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ It deals 4 damage to target creature. Activate only as a sorcery.
 DeckHas:Ability$Sacrifice
 Oracle:At the beginning of your upkeep, target player loses 1 life.\nSacrifice Smoldering Tar: It deals 4 damage to target creature. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/sokka_bold_boomeranger.txt b/forge-gui/res/cardsfolder/s/sokka_bold_boomeranger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sokka_bold_boomeranger.txt
rename to forge-gui/res/cardsfolder/s/sokka_bold_boomeranger.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sokka_lateral_strategist.txt b/forge-gui/res/cardsfolder/s/sokka_lateral_strategist.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sokka_lateral_strategist.txt
rename to forge-gui/res/cardsfolder/s/sokka_lateral_strategist.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sokka_wolf_coves_protector.txt b/forge-gui/res/cardsfolder/s/sokka_wolf_coves_protector.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sokka_wolf_coves_protector.txt
rename to forge-gui/res/cardsfolder/s/sokka_wolf_coves_protector.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sokkas_haiku.txt b/forge-gui/res/cardsfolder/s/sokkas_haiku.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sokkas_haiku.txt
rename to forge-gui/res/cardsfolder/s/sokkas_haiku.txt
diff --git a/forge-gui/res/cardsfolder/s/solemn_simulacrum.txt b/forge-gui/res/cardsfolder/s/solemn_simulacrum.txt
index 53fa9ded52d..7546753c02d 100644
--- a/forge-gui/res/cardsfolder/s/solemn_simulacrum.txt
+++ b/forge-gui/res/cardsfolder/s/solemn_simulacrum.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ TriggeredCardController | NumCards$ 1
 SVar:SacMe:1
diff --git a/forge-gui/res/cardsfolder/s/solve_the_equation.txt b/forge-gui/res/cardsfolder/s/solve_the_equation.txt
index 23f2c6d3ce2..b693c30609b 100644
--- a/forge-gui/res/cardsfolder/s/solve_the_equation.txt
+++ b/forge-gui/res/cardsfolder/s/solve_the_equation.txt
@@ -1,5 +1,5 @@
 Name:Solve the Equation
 ManaCost:2 U
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | SpellDescription$ Search your library for an instant or sorcery card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Instant,Sorcery | SpellDescription$ Search your library for an instant or sorcery card, reveal it, put it into your hand, then shuffle.
 Oracle:Search your library for an instant or sorcery card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/song_of_point_prime.txt b/forge-gui/res/cardsfolder/s/song_of_point_prime.txt
new file mode 100644
index 00000000000..6732409fabf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/song_of_point_prime.txt
@@ -0,0 +1,6 @@
+Name:Song of Point Prime
+ManaCost:1 B
+Types:Sorcery
+A:SP$ Sacrifice | Defined$ Opponent | SacValid$ Creature | SacMessage$ creature | SubAbility$ DBConjure | SpellDescription$ Each opponent sacrifices a creature of their choice.
+SVar:DBConjure:DB$ MakeCard | Conjure$ True | Name$ Cantor of the Refrain | Zone$ Graveyard | SpellDescription$ Conjure a card named Cantor of the Refrain into your graveyard.
+Oracle:Each opponent sacrifices a creature of their choice.\nConjure a card named Cantor of the Refrain into your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
index 2280d79249b..528e5fd49b7 100644
--- a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
+++ b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt
@@ -6,7 +6,7 @@ SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | C
 SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | Look$ True | SubAbility$ DBNameCard
 SVar:DBNameCard:DB$ NameCard | Defined$ You | SubAbility$ DBClear
 SVar:DBClear:DB$ Cleanup | ClearChosenPlayer$ True
-S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.nonManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
+S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | ValidSA$ Activated.!ManaAbility | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
 AI:RemoveDeck:Random
 # TODO: Might improve AI logic to support it (the AI needs to pick cards that actually have activated nonmana abilities on them)
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/sorrows_path.txt b/forge-gui/res/cardsfolder/s/sorrows_path.txt
index 8c9de22e45b..d4ab2064bf1 100644
--- a/forge-gui/res/cardsfolder/s/sorrows_path.txt
+++ b/forge-gui/res/cardsfolder/s/sorrows_path.txt
@@ -1,7 +1,7 @@
 Name:Sorrow's Path
 ManaCost:no cost
 Types:Land
-A:AB$ SwitchBlock | Cost$ T | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature.blocking+OppCtrl | TargetsFromSingleZone$ True | DefinedAttacker$ Valid Creature.blockedByValidThisTurn Targeted | DefinedBlocker$ Targeted | RemoveFromCombat$ True | TgtPrompt$ Choose two target blocking creatures an opponent controls | SpellDescription$ Choose two target blocking creatures an opponent controls. If each of those creatures could block all creatures that the other is blocking, remove both of them from combat. Each one then blocks all creatures the other was blocking. | StackDescription$ SpellDescription
+A:AB$ SwitchBlock | Cost$ T | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature.blocking+OppCtrl | TargetsWithSameController$ True | DefinedAttacker$ Valid Creature.blockedByValidThisTurn Targeted | DefinedBlocker$ Targeted | RemoveFromCombat$ True | TgtPrompt$ Choose two target blocking creatures an opponent controls | SpellDescription$ Choose two target blocking creatures an opponent controls. If each of those creatures could block all creatures that the other is blocking, remove both of them from combat. Each one then blocks all creatures the other was blocking. | StackDescription$ SpellDescription
 T:Mode$ Taps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME becomes tapped, it deals 2 damage to you and each creature you control.
 SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.YouCtrl | ValidPlayers$ You | NumDmg$ 2
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/s/soul_collector.txt b/forge-gui/res/cardsfolder/s/soul_collector.txt
index 61dc9eb60bf..d076bac7562 100644
--- a/forge-gui/res/cardsfolder/s/soul_collector.txt
+++ b/forge-gui/res/cardsfolder/s/soul_collector.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire
 PT:3/4
 K:Flying
 K:Morph:B B B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | Execute$ TrigBounce | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, return that card to the battlefield under your control.
-SVar:TrigBounce:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCardLKICopy
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | Execute$ TrigBounce | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, return that card to the battlefield under your control.
+SVar:TrigBounce:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy
 Oracle:Flying\nWhenever a creature dealt damage by Soul Collector this turn dies, return that card to the battlefield under your control.\nMorph {B}{B}{B} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
diff --git a/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt b/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
index c10b6cf6f86..7561afb5b85 100644
--- a/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
+++ b/forge-gui/res/cardsfolder/s/soul_seizer_ghastly_haunting.txt
@@ -4,8 +4,9 @@ Types:Creature Spirit
 PT:1/3
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigTransform | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may transform it. If you do, attach it to target creature that player controls.
-SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform | SubAbility$ DBAttach
-SVar:DBAttach:DB$ Attach | ValidTgts$ Creature.ControlledBy TriggeredTarget | TgtPrompt$ Select target creature that damaged player controls | AILogic$ GainControl
+SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform | RememberChanged$ True | SubAbility$ DBAttach
+SVar:DBAttach:DB$ Attach | ValidTgts$ Creature.ControlledBy TriggeredTarget | TgtPrompt$ Select target creature that damaged player controls | AILogic$ GainControl | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:DoubleFaced
 Oracle:Flying\nWhen Soul Seizer deals combat damage to a player, you may transform it. If you do, attach it to target creature that player controls.
 
diff --git a/forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt b/forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt
index 1eb17099201..e79c0803aae 100644
--- a/forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt
+++ b/forge-gui/res/cardsfolder/s/soul_shackled_zombie.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Zombie
 PT:4/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When this creature enters, exile up to two target cards from a single graveyard. If at least one creature card was exiled this way, each opponent loses 2 life and you gain 2 life.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | TgtPrompt$ Select target card in a graveyard to exile | RememberChanged$ True | SubAbility$ DBLoseLife
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | TgtPrompt$ Select target card in a graveyard to exile | RememberChanged$ True | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/s/soul_shredder.txt b/forge-gui/res/cardsfolder/s/soul_shredder.txt
index 2f4d2c10369..ecdf073e8f8 100644
--- a/forge-gui/res/cardsfolder/s/soul_shredder.txt
+++ b/forge-gui/res/cardsfolder/s/soul_shredder.txt
@@ -7,4 +7,4 @@ K:Crew:1
 T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield,Graveyard | ValidCards$ Creature.Other | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigPump | TriggerDescription$ Whenever one or more other creatures die, CARDNAME perpetually gets +1/+1. This ability also triggers if CARDNAME is in your graveyard.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | Duration$ Perpetual
 A:AB$ ChangeZone | Cost$ 1 Sac<2/Creature> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard to the battlefield.
-Oracle:Haste\nWhenever one or more other creatures die, Soul Shredder perpetually gets +1/+1. This ability also triggers if Sould Shredder is in your graveyard.\nCrew 1\n{1}, Sacrifice two creatures: Return Soul Shredder from your graveyard to the battlefield. Activate only as a sorcery.
+Oracle:Haste\nWhenever one or more other creatures die, Soul Shredder perpetually gets +1/+1. This ability also triggers if Soul Shredder is in your graveyard.\nCrew 1\n{1}, Sacrifice two creatures: Return Soul Shredder from your graveyard to the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/southern_air_temple.txt b/forge-gui/res/cardsfolder/s/southern_air_temple.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/southern_air_temple.txt
rename to forge-gui/res/cardsfolder/s/southern_air_temple.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/sp_dr_piloted_by_peni.txt b/forge-gui/res/cardsfolder/s/sp_dr_piloted_by_peni.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/sp_dr_piloted_by_peni.txt
rename to forge-gui/res/cardsfolder/s/sp_dr_piloted_by_peni.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectacular_spider_man.txt b/forge-gui/res/cardsfolder/s/spectacular_spider_man.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectacular_spider_man.txt
rename to forge-gui/res/cardsfolder/s/spectacular_spider_man.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spectacular_tactics.txt b/forge-gui/res/cardsfolder/s/spectacular_tactics.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spectacular_tactics.txt
rename to forge-gui/res/cardsfolder/s/spectacular_tactics.txt
diff --git a/forge-gui/res/cardsfolder/s/spectral_shield.txt b/forge-gui/res/cardsfolder/s/spectral_shield.txt
index 4e7b901c580..a73c5dee30b 100644
--- a/forge-gui/res/cardsfolder/s/spectral_shield.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_shield.txt
@@ -4,5 +4,5 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | Description$ Enchanted creature gets +0/+2 and can't be the target of spells.
-S:Mode$ CantTarget | ValidCard$ Creature.EnchantedBy | ValidSA$ Spell | Secondary$ True | Description$ Enchanted creature gets +0/+2 and can't be the target of spells.
+S:Mode$ CantTarget | ValidTarget$ Creature.EnchantedBy | ValidSA$ Spell | Secondary$ True | Description$ Enchanted creature gets +0/+2 and can't be the target of spells.
 Oracle:Enchant creature\nEnchanted creature gets +0/+2 and can't be the target of spells.
diff --git a/forge-gui/res/cardsfolder/s/speedbrood_stalker.txt b/forge-gui/res/cardsfolder/s/speedbrood_stalker.txt
index 0186997c763..b90e7587c3b 100644
--- a/forge-gui/res/cardsfolder/s/speedbrood_stalker.txt
+++ b/forge-gui/res/cardsfolder/s/speedbrood_stalker.txt
@@ -1,12 +1,13 @@
 Name:Speedbrood Stalker
 ManaCost:3 B B
 Types:Creature Insect Assassin
-PT:4/3
+PT:3/4
 K:Flying
+K:Lifelink
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When this creature enters choose target opponent. Secretly choose a creature or planeswalker that player controls. That player sacrifices a creature or planeswalker of their choice, then sacrifices the chosen permanent.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Opponent | SubAbility$ DBChooseCard
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Creature.ControlledBy TargetedPlayer,Planeswalker.ControlledBy TargetedPlayer | Secretly$ True | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Secretly choose a creature or planeswalker targeted player controls | SubAbility$ DBSac1
 SVar:DBSac1:DB$ Sacrifice | Defined$ Targeted | SacValid$ Creature,Planeswalker | SacMessage$ creature or planeswalker | SubAbility$ DBSac2
 SVar:DBSac2:DB$ Sacrifice | Defined$ Targeted | SacValid$ Permanent.ChosenCard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-Oracle:Flying\nWhen this creature enters choose target opponent. Secretly choose a creature or planeswalker that player controls. That player sacrifices a creature or planeswalker of their choice, then sacrifices the chosen permanent.
+Oracle:Flying, Lifelink\nWhen this creature enters choose target opponent. Secretly choose a creature or planeswalker that player controls. That player sacrifices a creature or planeswalker of their choice, then sacrifices the chosen permanent.
diff --git a/forge-gui/res/cardsfolder/s/spellbane_centaur.txt b/forge-gui/res/cardsfolder/s/spellbane_centaur.txt
index 96ef54cdf81..6fa8546a942 100644
--- a/forge-gui/res/cardsfolder/s/spellbane_centaur.txt
+++ b/forge-gui/res/cardsfolder/s/spellbane_centaur.txt
@@ -2,5 +2,5 @@ Name:Spellbane Centaur
 ManaCost:2 G
 Types:Creature Centaur
 PT:3/2
-S:Mode$ CantTarget | ValidCard$ Creature.YouCtrl | ValidSource$ Card.Blue | Description$ Creatures you control can't be the targets of blue spells or abilities from blue sources.
+S:Mode$ CantTarget | ValidTarget$ Creature.YouCtrl | ValidSource$ Card.Blue | Description$ Creatures you control can't be the targets of blue spells or abilities from blue sources.
 Oracle:Creatures you control can't be the targets of blue spells or abilities from blue sources.
diff --git a/forge-gui/res/cardsfolder/s/spellweaver_helix.txt b/forge-gui/res/cardsfolder/s/spellweaver_helix.txt
index f4232c91811..c3819f7cbf3 100644
--- a/forge-gui/res/cardsfolder/s/spellweaver_helix.txt
+++ b/forge-gui/res/cardsfolder/s/spellweaver_helix.txt
@@ -2,7 +2,7 @@ Name:Spellweaver Helix
 ManaCost:3
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigSpellweaverExile | OptionalDecider$ You | TriggerDescription$ Imprint — When CARDNAME enters, you may exile two target sorcery cards from a single graveyard.
-SVar:TrigSpellweaverExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetsFromSingleZone$ True | ValidTgts$ Card.Sorcery | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target sorcery cards from a single graveyard | Imprint$ True | SpellDescription$ Exile two sorcery cards from a single graveyard.
+SVar:TrigSpellweaverExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TargetsWithSameController$ True | ValidTgts$ Card.Sorcery | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target sorcery cards from a single graveyard | Imprint$ True | SpellDescription$ Exile two sorcery cards from a single graveyard.
 T:Mode$ SpellCast | ValidCard$ Card.sharesNameWith Imprinted+!token | Execute$ TrigSpellweaverCopy | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts a card, if it has the same name as one of the cards exiled with CARDNAME, you may copy the other. If you do, you may cast the copy without paying its mana cost.
 SVar:TrigSpellweaverCopy:DB$ Play | Defined$ ValidExile Card.IsImprinted+!sharesNameWith TriggeredCard | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | CopyCard$ True | ConditionPresent$ Card.IsImprinted+sharesNameWith TriggeredCard | ConditionZone$ Exile | ConditionCompare$ EQ1 | SubAbility$ TrigSpellweaverCopySame
 SVar:TrigSpellweaverCopySame:DB$ Play | Defined$ ValidExile Card.IsImprinted | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | CopyCard$ True | ConditionPresent$ Card.IsImprinted+sharesNameWith TriggeredCard | ConditionZone$ Exile | ConditionCompare$ EQ2
diff --git a/forge-gui/res/cardsfolder/s/sphinx_ambassador.txt b/forge-gui/res/cardsfolder/s/sphinx_ambassador.txt
index 6342223ebb1..f15357e0307 100644
--- a/forge-gui/res/cardsfolder/s/sphinx_ambassador.txt
+++ b/forge-gui/res/cardsfolder/s/sphinx_ambassador.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSearch | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, search that player's library for a card, then that player chooses a card name. If you searched for a creature card that doesn't have that name, you may put it onto the battlefield under your control. Then that player shuffles.
 SVar:TrigSearch:DB$ ChangeZone | ChangeType$ Card | Origin$ Library | Destination$ Library | DefinedPlayer$ TriggeredTarget | Chooser$ You | Shuffle$ False | RememberChanged$ True | SubAbility$ DBName
 SVar:DBName:DB$ NameCard | Defined$ TriggeredTarget | SubAbility$ DBChangeZone | AILogic$ BestCreatureInComputerDeck
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | GainControl$ True | ConditionDefined$ Remembered | Shuffle$ False | ConditionPresent$ Card.NamedCard | ConditionCompare$ EQ0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | Optional$ True | OptionalDecider$ You | SubAbility$ DBShuffle
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | GainControl$ True | ConditionDefined$ Remembered | Shuffle$ False | ConditionPresent$ Card.NamedCard | ConditionCompare$ EQ0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | Optional$ True | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ TriggeredTarget | SubAbility$ DBCleanup
 SVar:X:Count$ValidLibrary Creature.IsRemembered
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearNamedCard$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_bot.txt b/forge-gui/res/cardsfolder/s/spider_bot.txt
similarity index 83%
rename from forge-gui/res/cardsfolder/upcoming/spider_bot.txt
rename to forge-gui/res/cardsfolder/s/spider_bot.txt
index 610fcc1f4c9..16b7c1fcb4d 100644
--- a/forge-gui/res/cardsfolder/upcoming/spider_bot.txt
+++ b/forge-gui/res/cardsfolder/s/spider_bot.txt
@@ -4,5 +4,5 @@ Types:Artifact Creature Spider Robot Scout
 PT:2/1
 K:Reach
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When this creature enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Reach\nWhen this creature enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_byte_web_warden.txt b/forge-gui/res/cardsfolder/s/spider_byte_web_warden.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_byte_web_warden.txt
rename to forge-gui/res/cardsfolder/s/spider_byte_web_warden.txt
diff --git a/forge-gui/res/cardsfolder/s/spider_girl_legacy_hero.txt b/forge-gui/res/cardsfolder/s/spider_girl_legacy_hero.txt
new file mode 100644
index 00000000000..732cf0b2e56
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_girl_legacy_hero.txt
@@ -0,0 +1,9 @@
+Name:Spider-Girl, Legacy Hero
+ManaCost:G W
+Types:Legendary Creature Spider Human Hero
+PT:2/2
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ During your turn, NICKNAME has flying.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME leaves the battlefield, create a 1/1 green and white Human Citizen creature token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ gw_1_1_human_citizen | TokenOwner$ You
+DeckHas:Ability$Token & Type$Citizen
+Oracle:During your turn, Spider-Girl has flying.\nWhen Spider-Girl leaves the battlefield, create a 1/1 green and white Human Citizen creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_gwen_free_spirit.txt b/forge-gui/res/cardsfolder/s/spider_gwen_free_spirit.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_gwen_free_spirit.txt
rename to forge-gui/res/cardsfolder/s/spider_gwen_free_spirit.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_ham_peter_porker.txt b/forge-gui/res/cardsfolder/s/spider_ham_peter_porker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_ham_peter_porker.txt
rename to forge-gui/res/cardsfolder/s/spider_ham_peter_porker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_islanders.txt b/forge-gui/res/cardsfolder/s/spider_islanders.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_islanders.txt
rename to forge-gui/res/cardsfolder/s/spider_islanders.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_2099.txt b/forge-gui/res/cardsfolder/s/spider_man_2099.txt
similarity index 95%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_2099.txt
rename to forge-gui/res/cardsfolder/s/spider_man_2099.txt
index e9c82d77279..3023ae58621 100644
--- a/forge-gui/res/cardsfolder/upcoming/spider_man_2099.txt
+++ b/forge-gui/res/cardsfolder/s/spider_man_2099.txt
@@ -6,7 +6,7 @@ K:Double Strike
 K:Vigilance
 S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | Caster$ Player.Active | CheckSVar$ Z | SVarCompare$ LE3 | Description$ You can't cast CARDNAME during your first, second, or third turns of the game.
 SVar:Z:Count$YourTurns
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ Y | SVarCompare$ EQ1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your end step, if you've played a land or cast a spell this turn from anywhere other than your hand, CARDNAME deals damage equal to his power to any target.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ Y | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your end step, if you've played a land or cast a spell this turn from anywhere other than your hand, CARDNAME deals damage equal to his power to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X | AILogic$ PowerDmg
 SVar:X:Count$CardPower
 T:Mode$ LandPlayed | Origin$ Exile,Library,Graveyard | ValidCard$ Land.YouCtrl | Execute$ StoreVar | Static$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_2099_miguel_ohara.txt b/forge-gui/res/cardsfolder/s/spider_man_2099_miguel_ohara.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_2099_miguel_ohara.txt
rename to forge-gui/res/cardsfolder/s/spider_man_2099_miguel_ohara.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_brooklyn_visionary.txt b/forge-gui/res/cardsfolder/s/spider_man_brooklyn_visionary.txt
similarity index 58%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_brooklyn_visionary.txt
rename to forge-gui/res/cardsfolder/s/spider_man_brooklyn_visionary.txt
index 6f3cf1bba69..f0931bbc73e 100644
--- a/forge-gui/res/cardsfolder/upcoming/spider_man_brooklyn_visionary.txt
+++ b/forge-gui/res/cardsfolder/s/spider_man_brooklyn_visionary.txt
@@ -1,9 +1,9 @@
 Name:Spider-Man, Brooklyn Visionary
 ManaCost:4 G
-Types:Creature Spider Human Hero
+Types:Legendary Creature Spider Human Hero
 PT:4/3
 K:Web-slinging:2 G
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When NICKNAME enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
-Oracle:Web-slinging {2}{G} (You may cast this spell for {2}{G} if you also return a tapped creature you control to its owner’s hand.)\nWhen Spider-Man enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
+Oracle:Web-slinging {2}{G} (You may cast this spell for {2}{G} if you also return a tapped creature you control to its owner's hand.)\nWhen Spider-Man enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/s/spider_man_india.txt b/forge-gui/res/cardsfolder/s/spider_man_india.txt
new file mode 100644
index 00000000000..73dd5b52d25
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_man_india.txt
@@ -0,0 +1,9 @@
+Name:Spider-Man India
+ManaCost:3 G W
+Types:Legendary Creature Spider Human Hero
+PT:4/4
+K:Web-slinging:1 G W
+T:Mode$ SpellCast | ValidCard$ Card.Creature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Pavitr's Sevā — Whenever you cast a creature spell, put a +1/+1 counter on target creature you control. It gains flying until end of turn.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Flying
+Oracle:Web-slinging {1}{G}{W} (You may cast this spell for {1}{G}{W} if you also return a tapped creature you control to its owner's hand.)\nPavitr's Sevā — Whenever you cast a creature spell, put a +1/+1 counter on target creature you control. It gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_miles_morales.txt b/forge-gui/res/cardsfolder/s/spider_man_miles_morales.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_miles_morales.txt
rename to forge-gui/res/cardsfolder/s/spider_man_miles_morales.txt
diff --git a/forge-gui/res/cardsfolder/s/spider_man_no_more.txt b/forge-gui/res/cardsfolder/s/spider_man_no_more.txt
new file mode 100644
index 00000000000..b2ec8e565ed
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_man_no_more.txt
@@ -0,0 +1,8 @@
+Name:Spider-Man No More
+ManaCost:1 U
+Types:Enchantment Aura
+K:Enchant:Creature
+SVar:AttachAILogic:Curse
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 1 | SetToughness$ 1 | AddType$ Citizen | RemoveCreatureTypes$ True | RemoveAllAbilities$ True | AddKeyword$ Defender | Description$ Enchanted creature is a Citizen with base power and toughness 1/1. It has defender and loses all other abilities. (It also loses all other creature types.)
+SVar:NonStackingAttachEffect:True
+Oracle:Enchant creature\nEnchanted creature is a Citizen with base power and toughness 1/1. It has defender and loses all other abilities. (It also loses all other creature types.)
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_noir.txt b/forge-gui/res/cardsfolder/s/spider_man_noir.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_noir.txt
rename to forge-gui/res/cardsfolder/s/spider_man_noir.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_peter_parker.txt b/forge-gui/res/cardsfolder/s/spider_man_peter_parker.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_peter_parker.txt
rename to forge-gui/res/cardsfolder/s/spider_man_peter_parker.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_man_web_slinger.txt b/forge-gui/res/cardsfolder/s/spider_man_web_slinger.txt
similarity index 55%
rename from forge-gui/res/cardsfolder/upcoming/spider_man_web_slinger.txt
rename to forge-gui/res/cardsfolder/s/spider_man_web_slinger.txt
index 6f87fcdf08c..88b352abc21 100644
--- a/forge-gui/res/cardsfolder/upcoming/spider_man_web_slinger.txt
+++ b/forge-gui/res/cardsfolder/s/spider_man_web_slinger.txt
@@ -1,7 +1,7 @@
 Name:Spider-Man, Web-Slinger
 ManaCost:2 W
-Types:Creature Spider Human Hero
+Types:Legendary Creature Spider Human Hero
 PT:3/3
 K:Web-slinging:W
-Oracle:Web-slinging {W} (You may cast this spell for {W} if you also return a tapped creature you control to its owner’s hand.)
+Oracle:Web-slinging {W} (You may cast this spell for {W} if you also return a tapped creature you control to its owner's hand.)
 
diff --git a/forge-gui/res/cardsfolder/s/spider_manifestation.txt b/forge-gui/res/cardsfolder/s/spider_manifestation.txt
new file mode 100644
index 00000000000..d79ebe2cc9a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_manifestation.txt
@@ -0,0 +1,9 @@
+Name:Spider Manifestation
+ManaCost:1 RG
+Types:Creature Spider Avatar
+PT:2/2
+K:Reach
+A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
+T:Mode$ SpellCast | ValidCard$ Card.cmcGE4 | ValidActivatingPlayer$ You | Execute$ TrigUntap | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with mana value 4 or greater, untap this creature.
+SVar:TrigUntap:DB$ Untap | Defined$ Self
+Oracle:Reach\n{T}: Add {R} or {G}.\nWhenever you cast a spell with mana value 4 or greater, untap this creature.
diff --git a/forge-gui/res/cardsfolder/s/spider_mobile.txt b/forge-gui/res/cardsfolder/s/spider_mobile.txt
new file mode 100644
index 00000000000..a299cb4d064
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_mobile.txt
@@ -0,0 +1,13 @@
+Name:Spider-Mobile
+ManaCost:3
+Types:Artifact Vehicle
+PT:3/3
+K:Trample
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever this Vehicle attacks or blocks, it gets +1/+1 until end of turn for each Spider you control.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPump | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever this Vehicle attacks or blocks, it gets +1/+1 until end of turn for each Spider you control.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +X | NumDef$ +X
+K:Crew:2
+SVar:X:Count$Valid Spider.YouCtrl
+SVar:HasAttackEffect:TRUE
+SVar:HasBlockEffect:TRUE
+Oracle:Trample\nWhenever this Vehicle attacks or blocks, it gets +1/+1 until end of turn for each Spider you control.\nCrew 2
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_punk.txt b/forge-gui/res/cardsfolder/s/spider_punk.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_punk.txt
rename to forge-gui/res/cardsfolder/s/spider_punk.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/spider_rex_daring_dino.txt b/forge-gui/res/cardsfolder/s/spider_rex_daring_dino.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/spider_rex_daring_dino.txt
rename to forge-gui/res/cardsfolder/s/spider_rex_daring_dino.txt
diff --git a/forge-gui/res/cardsfolder/s/spider_sense.txt b/forge-gui/res/cardsfolder/s/spider_sense.txt
new file mode 100644
index 00000000000..61e8105fca8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_sense.txt
@@ -0,0 +1,6 @@
+Name:Spider-Sense
+ManaCost:1 U
+Types:Instant
+K:Web-slinging:U
+A:SP$ Counter | TargetType$ Instant,Sorcery,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target instant spell, sorcery spell, or triggered ability.
+Oracle:Web-slinging {U} (You may cast this spell for {U} if you also return a tapped creature you control to its owner's hand.)\nCounter target instant spell, sorcery spell, or triggered ability.
diff --git a/forge-gui/res/cardsfolder/s/spider_slayer_hatred_honed.txt b/forge-gui/res/cardsfolder/s/spider_slayer_hatred_honed.txt
new file mode 100644
index 00000000000..80a39ca515e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_slayer_hatred_honed.txt
@@ -0,0 +1,9 @@
+Name:Spider-Slayer, Hatred Honed
+ManaCost:2
+Types:Legendary Artifact Creature Human Villain
+PT:2/1
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Spider | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever NICKNAME deals damage to a Spider, destroy that creature.
+SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
+A:AB$ Token | Cost$ 6 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenTapped$ True | TokenAmount$ 2 | TokenScript$ c_1_1_a_robot_flying | SpellDescription$ Create two tapped 1/1 colorless Robot artifact creature tokens with flying.
+DeckHas:Ability$Token|Graveyard & Type$Robot
+Oracle:Whenever Spider-Slayer deals damage to a Spider, destroy that creature.\n{6}, Exile this card from your graveyard: Create two tapped 1/1 colorless Robot artifact creature tokens with flying.
diff --git a/forge-gui/res/cardsfolder/s/spider_suit.txt b/forge-gui/res/cardsfolder/s/spider_suit.txt
new file mode 100644
index 00000000000..4cd43749d28
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_suit.txt
@@ -0,0 +1,7 @@
+Name:Spider-Suit
+ManaCost:1
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddType$ Spider & Hero | Description$ Equipped creature gets +2/+2 and is a Spider Hero in addition to its other types.
+K:Equip:3
+DeckHas:Type$Spider|Hero
+Oracle:Equipped creature gets +2/+2 and is a Spider Hero in addition to its other types.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/spider_uk.txt b/forge-gui/res/cardsfolder/s/spider_uk.txt
new file mode 100644
index 00000000000..d561aa556ef
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_uk.txt
@@ -0,0 +1,10 @@
+Name:Spider-UK
+ManaCost:3 W
+Types:Legendary Creature Spider Human Hero
+PT:3/4
+K:Web-slinging:2 W
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if two or more creatures entered the battlefield under your control this turn, you draw a card and gain 2 life.
+SVar:TrigDraw:DB$ Draw | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+SVar:X:Count$ThisTurnEntered_Battlefield_Creature.YouCtrl
+Oracle:Web-slinging {2}{W} (You may cast this spell for {2}{W} if you also return a tapped creature you control to its owner's hand.)\nAt the beginning of your end step, if two or more creatures entered the battlefield under your control this turn, you draw a card and gain 2 life.
diff --git a/forge-gui/res/cardsfolder/s/spider_verse.txt b/forge-gui/res/cardsfolder/s/spider_verse.txt
new file mode 100644
index 00000000000..c8fa0651053
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_verse.txt
@@ -0,0 +1,9 @@
+Name:Spider-Verse
+ManaCost:3 R R
+Types:Enchantment
+S:Mode$ IgnoreLegendRule | ValidCard$ Spider.YouCtrl | Description$ The "legend rule" doesn't apply to Spiders you control.
+T:Mode$ SpellCast | ValidCard$ Card.!wasCastFromYourHand | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopySpell | ResolvedLimit$ 1 | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell from anywhere other than your hand, you may copy it. If you do, you may choose new targets for the copy. If the copy is a permanent spell, it gains haste. Do this only once each turn.
+SVar:TrigCopySpell:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True | RememberNewCard$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Permanent | Keywords$ Haste | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:The "legend rule" doesn't apply to Spiders you control.\nWhenever you cast a spell from anywhere other than your hand, you may copy it. If you do, you may choose new targets for the copy. If the copy is a permanent spell, it gains haste. Do this only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/spider_woman_stunning_savior.txt b/forge-gui/res/cardsfolder/s/spider_woman_stunning_savior.txt
new file mode 100644
index 00000000000..162fc9e0e6b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spider_woman_stunning_savior.txt
@@ -0,0 +1,8 @@
+Name:Spider-Woman, Stunning Savior
+ManaCost:1 WU
+Types:Legendary Creature Spider Human Hero
+PT:2/2
+K:Flying
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Venom Blast — Artifacts and creatures your opponents control enter tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
+Oracle:Flying\nVenom Blast — Artifacts and creatures your opponents control enter tapped.
diff --git a/forge-gui/res/cardsfolder/s/spiders_man_heroic_horde.txt b/forge-gui/res/cardsfolder/s/spiders_man_heroic_horde.txt
new file mode 100644
index 00000000000..caeddd8df5c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spiders_man_heroic_horde.txt
@@ -0,0 +1,9 @@
+Name:Spiders-Man, Heroic Horde
+ManaCost:1 G
+Types:Legendary Creature Spider Hero
+PT:2/3
+K:Web-slinging:4 G G
+T:Mode$ ChangesZone | Origin$ Stack | Destination$ Battlefield | ValidCard$ Card.Self+wasCast+webSlinged | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, if they were cast using web-slinging, you gain 3 life and create two 2/1 green Spider creature tokens with reach.
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_2_1_spider_reach | TokenOwner$ You
+Oracle:Web-slinging {4}{G}{G} (You may cast this spell for {4}{G}{G} if you also return a tapped creature you control to its owner's hand.)\nWhen Spiders-Man enters, if they were cast using web-slinging, you gain 3 life and create two 2/1 green Spider creature tokens with reach.
diff --git a/forge-gui/res/cardsfolder/s/spinal_embrace.txt b/forge-gui/res/cardsfolder/s/spinal_embrace.txt
index b3444c068c6..4d3b6fae407 100644
--- a/forge-gui/res/cardsfolder/s/spinal_embrace.txt
+++ b/forge-gui/res/cardsfolder/s/spinal_embrace.txt
@@ -2,7 +2,7 @@ Name:Spinal Embrace
 ManaCost:3 U U B
 Types:Instant
 A:SP$ Untap | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | ActivationPhases$ BeginCombat->EndCombat | SubAbility$ DBChange | SpellDescription$ Cast this spell only during combat. Untap target creature you don't control and gain control of it. It gains haste until end of turn. At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness.
-SVar:DBChange:DB$ GainControl | Defined$ Targeted | SubAbility$ DBAnimate
+SVar:DBChange:DB$ GainControl | Defined$ Targeted | AddKWs$ Haste | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | sVars$ SneakAttackEOT | SubAbility$ DelTrig
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigSac | RememberObjects$ Targeted | TriggerDescription$ At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness. | AILogic$ Always | ConditionDefined$ Targeted | ConditionPresent$ Card | ConditionCompare$ GE1
 SVar:TrigSac:DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI | Controller$ You | RememberSacrificed$ True | SubAbility$ DBGainLife
diff --git a/forge-gui/res/cardsfolder/s/spineseeker_centipede.txt b/forge-gui/res/cardsfolder/s/spineseeker_centipede.txt
index b68d24a3faa..3e8a0972211 100644
--- a/forge-gui/res/cardsfolder/s/spineseeker_centipede.txt
+++ b/forge-gui/res/cardsfolder/s/spineseeker_centipede.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Insect
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 2 | AddKeyword$ Vigilance | Condition$ Delirium | Description$ Delirium — CARDNAME gets +1/+2 and has vigilance as long as there are four or more card types among cards in your graveyard.
 DeckHints:Ability$Graveyard|Discard
 DeckHas:Ability$Delirium
diff --git a/forge-gui/res/cardsfolder/s/spinneret_and_spiderling.txt b/forge-gui/res/cardsfolder/s/spinneret_and_spiderling.txt
new file mode 100644
index 00000000000..bf31213a314
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/spinneret_and_spiderling.txt
@@ -0,0 +1,12 @@
+Name:Spinneret and Spiderling
+ManaCost:R
+Types:Legendary Creature Spider Human Hero
+PT:1/2
+T:Mode$ AttackersDeclared | Execute$ TrigPutCounter | ValidAttackers$ Spider | ValidAttackersAmount$ GE2 | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more Spiders, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ DamageDoneOnce | ValidSource$ Card.Self | DamageAmount$ GE4 | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals 4 or more damage, exile the top card of your library. Until the end of your next turn, you may play that card.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | Duration$ UntilTheEndOfYourNextTurn | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever you attack with two or more Spiders, put a +1/+1 counter on Spinneret and Spiderling.\nWhenever Spinneret and Spiderling deals 4 or more damage, exile the top card of your library. Until the end of your next turn, you may play that card.
diff --git a/forge-gui/res/cardsfolder/s/sporocyst.txt b/forge-gui/res/cardsfolder/s/sporocyst.txt
index c6daf2606fa..2b6a57eb3e0 100644
--- a/forge-gui/res/cardsfolder/s/sporocyst.txt
+++ b/forge-gui/res/cardsfolder/s/sporocyst.txt
@@ -5,7 +5,7 @@ PT:0/0
 K:Ravenous
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ Spore Chimney — When CARDNAME enters, search your library for up to X basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
 Oracle:Ravenous (This creature enters with X +1/+1 counters on it. If X is 5 or more, draw a card when it enters.)\nDefender\nSpore Chimney — When Sporocyst enters, search your library for up to X basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/spring_mind.txt b/forge-gui/res/cardsfolder/s/spring_mind.txt
index 5c2880400da..d8cc44f1a25 100644
--- a/forge-gui/res/cardsfolder/s/spring_mind.txt
+++ b/forge-gui/res/cardsfolder/s/spring_mind.txt
@@ -1,7 +1,7 @@
 Name:Spring
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 AlternateMode:Split
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 
diff --git a/forge-gui/res/cardsfolder/s/springbloom_druid.txt b/forge-gui/res/cardsfolder/s/springbloom_druid.txt
index 23b30810f80..e24814b102e 100644
--- a/forge-gui/res/cardsfolder/s/springbloom_druid.txt
+++ b/forge-gui/res/cardsfolder/s/springbloom_druid.txt
@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Creature Elf Druid
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRamp | TriggerDescription$ When CARDNAME enters, you may sacrifice a land. If you do, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
-SVar:TrigRamp:AB$ ChangeZone | Cost$ Sac<1/Land> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 2 | ShuffleNonMandatory$ True
+SVar:TrigRamp:AB$ ChangeZone | Cost$ Sac<1/Land> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | ShuffleNonMandatory$ True
 Oracle:When Springbloom Druid enters, you may sacrifice a land. If you do, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/sprouting_vines.txt b/forge-gui/res/cardsfolder/s/sprouting_vines.txt
index 63cafa6128c..7c014082652 100644
--- a/forge-gui/res/cardsfolder/s/sprouting_vines.txt
+++ b/forge-gui/res/cardsfolder/s/sprouting_vines.txt
@@ -1,6 +1,6 @@
 Name:Sprouting Vines
 ManaCost:2 G
 Types:Instant
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.
 K:Storm
 Oracle:Search your library for a basic land card, reveal that card, put it into your hand, then shuffle.\nStorm (When you cast this spell, copy it for each spell cast before it this turn.)
diff --git a/forge-gui/res/cardsfolder/s/spymasters_vault.txt b/forge-gui/res/cardsfolder/s/spymasters_vault.txt
index f6e469e93d9..1ea89a2cff2 100644
--- a/forge-gui/res/cardsfolder/s/spymasters_vault.txt
+++ b/forge-gui/res/cardsfolder/s/spymasters_vault.txt
@@ -4,6 +4,6 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Swamp.
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
-A:AB$ Connive | Cost$ B T | Defined$ Targeted | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | ConniveNum$ X | SpellDescription$ Target creature you control connives X, where X is the number of creatures that died this turn.
+A:AB$ Connive | Cost$ B T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | ConniveNum$ X | SpellDescription$ Target creature you control connives X, where X is the number of creatures that died this turn.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
 Oracle:Spymaster's Vault enters tapped unless you control a Swamp.\n{T}: Add {B}.\n{B}, {T}: Target creature you control connives X, where X is the number of creatures that died this turn.
diff --git a/forge-gui/res/cardsfolder/s/squees_revenge.txt b/forge-gui/res/cardsfolder/s/squees_revenge.txt
index 35f3bf4d2b1..80260f2a412 100644
--- a/forge-gui/res/cardsfolder/s/squees_revenge.txt
+++ b/forge-gui/res/cardsfolder/s/squees_revenge.txt
@@ -6,8 +6,8 @@ A:SP$ ChooseNumber | SubAbility$ RepeatFlip | SpellDescription$ Choose a number.
 SVar:RepeatFlip:DB$ Repeat | RepeatSubAbility$ FlipAgain | ConditionCheckSVar$ TimesToFlip | ConditionSVarCompare$ GT0 | RepeatCheckSVar$ FlipsDone | RepeatSVarCompare$ LTTimesToFlip | SubAbility$ DrawIfWin
 SVar:FlipAgain:DB$ FlipACoin | WinSubAbility$ IncrementFlips | LoseSubAbility$ IncrementLoss
 SVar:IncrementFlips:DB$ StoreSVar | SVar$ FlipsDone | Type$ CountSVar | Expression$ FlipsDone/Plus.1
-SVar:IncrementLoss:DB$ StoreSVar | SVar$ Loss | Type$ CountSVar | Expression$ Loss/Plus.1 | SubAbility$ SetFilpsDone
-SVar:SetFilpsDone:DB$ StoreSVar | SVar$ FlipsDone | Type$ CountSVar | Expression$ TimesToFlip
+SVar:IncrementLoss:DB$ StoreSVar | SVar$ Loss | Type$ CountSVar | Expression$ Loss/Plus.1 | SubAbility$ SetFlipsDone
+SVar:SetFlipsDone:DB$ StoreSVar | SVar$ FlipsDone | Type$ CountSVar | Expression$ TimesToFlip
 # Draw cards
 SVar:DrawIfWin:DB$ Draw | Defined$ You | NumCards$ CardsToDraw | ConditionCheckSVar$ Loss | ConditionSVarCompare$ EQ0
 SVar:TimesToFlip:Count$ChosenNumber
diff --git a/forge-gui/res/cardsfolder/s/staff_of_eden_vaults_key.txt b/forge-gui/res/cardsfolder/s/staff_of_eden_vaults_key.txt
index 0e12ca3a513..d4befdfb6c3 100644
--- a/forge-gui/res/cardsfolder/s/staff_of_eden_vaults_key.txt
+++ b/forge-gui/res/cardsfolder/s/staff_of_eden_vaults_key.txt
@@ -2,7 +2,7 @@ Name:Staff of Eden, Vault's Key
 ManaCost:6
 Types:Legendary Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Legendary+notnamedStaff of Eden; Vault's Key | GainControl$ True | ChangeNum$ 1 | Mandatory$ True | TgtPrompt$ Choose target legendary permanent card not named Staff of Eden, Vault's Key in a graveyard
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.Legendary+!namedStaff of Eden; Vault's Key | GainControl$ True | ChangeNum$ 1 | Mandatory$ True | TgtPrompt$ Choose target legendary permanent card not named Staff of Eden, Vault's Key in a graveyard
 A:AB$ Draw | Cost$ T | NumCards$ Count$Valid Permanent.YouCtrl+YouDontOwn | SpellDescription$ Draw a card for each permanent you control but don't own.
 SVar:X:Count$Valid Permanent.YouCtrl$Colors
 Oracle:When Staff of Eden, Vault's Key enters, put target legendary permanent card not named Staff of Eden, Vault's Key from a graveyard onto the battlefield under your control.\n{T}: Draw a card for each permanent you control but don't own.
diff --git a/forge-gui/res/cardsfolder/s/stalking_yeti.txt b/forge-gui/res/cardsfolder/s/stalking_yeti.txt
index 54abd085f97..2dd00d061b5 100644
--- a/forge-gui/res/cardsfolder/s/stalking_yeti.txt
+++ b/forge-gui/res/cardsfolder/s/stalking_yeti.txt
@@ -5,7 +5,7 @@ PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Card.StrictlySelf | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters, if it's on the battlefield, it deals damage equal to its power to target creature an opponent controls and that creature deals damage equal to its power to CARDNAME.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ Self | DamageSource$ Targeted | NumDmg$ Y
-A:AB$ ChangeZone | Cost$ 2 S | Origin$ Battlefield | Destination$ Hand | SorcerySpeed$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate only any time you could cast a sorcery.
+A:AB$ ChangeZone | Cost$ 2 S | Origin$ Battlefield | Destination$ Hand | SorcerySpeed$ True | SpellDescription$ Return CARDNAME to its owner's hand. Activate only as a sorcery.
 SVar:X:Count$CardPower
 SVar:Y:Targeted$CardPower
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/stampeding_elk_herd.txt b/forge-gui/res/cardsfolder/s/stampeding_elk_herd.txt
index f6464acbb80..9e46bb5fb2e 100644
--- a/forge-gui/res/cardsfolder/s/stampeding_elk_herd.txt
+++ b/forge-gui/res/cardsfolder/s/stampeding_elk_herd.txt
@@ -4,5 +4,5 @@ Types:Creature Elk
 PT:5/5
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE8 | Execute$ TrigFormidable | TriggerDescription$ Formidable — Whenever CARDNAME attacks, if creatures you control have total power 8 or greater, creatures you control gain trample until end of turn.
 SVar:TrigFormidable:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Trample
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 Oracle:Formidable — Whenever Stampeding Elk Herd attacks, if creatures you control have total power 8 or greater, creatures you control gain trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/starling_aerial_ally.txt b/forge-gui/res/cardsfolder/s/starling_aerial_ally.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/starling_aerial_ally.txt
rename to forge-gui/res/cardsfolder/s/starling_aerial_ally.txt
diff --git a/forge-gui/res/cardsfolder/s/startled_awake_persistent_nightmare.txt b/forge-gui/res/cardsfolder/s/startled_awake_persistent_nightmare.txt
index ac37d1ff808..4d6babaffd6 100644
--- a/forge-gui/res/cardsfolder/s/startled_awake_persistent_nightmare.txt
+++ b/forge-gui/res/cardsfolder/s/startled_awake_persistent_nightmare.txt
@@ -2,7 +2,7 @@ Name:Startled Awake
 ManaCost:2 U U
 Types:Sorcery
 A:SP$ Mill | NumCards$ 13 | ValidTgts$ Opponent | TgtPrompt$ Choose an opponent | SpellDescription$ Target opponent mills thirteen cards.
-A:AB$ ChangeZone | Cost$ 3 U U | Origin$ Graveyard | Destination$ Battlefield | Transformed$ True | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard onto the battlefield transformed. Activate only any time you could cast a sorcery.
+A:AB$ ChangeZone | Cost$ 3 U U | Origin$ Graveyard | Destination$ Battlefield | Transformed$ True | ActivationZone$ Graveyard | SorcerySpeed$ True | SpellDescription$ Return CARDNAME from your graveyard onto the battlefield transformed. Activate only as a sorcery.
 AlternateMode:DoubleFaced
 Oracle:Target opponent mills thirteen cards.\n{3}{U}{U}: Put Startled Awake from your graveyard onto the battlefield transformed. Activate only as a sorcery.
 
diff --git a/forge-gui/res/cardsfolder/s/steel_dromedary.txt b/forge-gui/res/cardsfolder/s/steel_dromedary.txt
index 79ac5a7a8d8..f64b86b2a1b 100644
--- a/forge-gui/res/cardsfolder/s/steel_dromedary.txt
+++ b/forge-gui/res/cardsfolder/s/steel_dromedary.txt
@@ -7,6 +7,6 @@ SVar:CamelTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
 SVar:DBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2
 R:Event$ Untap | ActiveZones$ Battlefield | ValidCard$ Card.Self+counters_GE1_P1P1 | ValidStepTurnToController$ You | Layer$ CantHappen | Description$ CARDNAME doesn't untap during your untap step if it has a +1/+1 counter on it.
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMoveCounter | TriggerDescription$ At the beginning of combat on your turn, you may move a +1/+1 counter from CARDNAME onto target creature.
-SVar:TrigMoveCounter:DB$ MoveCounter | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | Source$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:TrigMoveCounter:DB$ MoveCounter | ValidTgts$ Creature | Source$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Steel Dromedary enters tapped with two +1/+1 counters on it.\nSteel Dromedary doesn't untap during your untap step if it has a +1/+1 counter on it.\nAt the beginning of combat on your turn, you may move a +1/+1 counter from Steel Dromedary onto target creature.
diff --git a/forge-gui/res/cardsfolder/s/steel_wrecking_ball.txt b/forge-gui/res/cardsfolder/s/steel_wrecking_ball.txt
new file mode 100644
index 00000000000..5d843c0fd50
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/steel_wrecking_ball.txt
@@ -0,0 +1,8 @@
+Name:Steel Wrecking Ball
+ManaCost:5
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this artifact enters, it deals 5 damage to target creature.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5
+A:AB$ Destroy | Cost$ 1 R Discard<1/CARDNAME> | ActivationZone$ Hand | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
+SVar:PlayMain1:TRUE
+Oracle:When this artifact enters, it deals 5 damage to target creature.\n{1}{R}, Discard this card: Destroy target artifact.
diff --git a/forge-gui/res/cardsfolder/upcoming/stegron_the_dinosaur_man.txt b/forge-gui/res/cardsfolder/s/stegron_the_dinosaur_man.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/stegron_the_dinosaur_man.txt
rename to forge-gui/res/cardsfolder/s/stegron_the_dinosaur_man.txt
diff --git a/forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt b/forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt
index 6e81308cf71..afc6eb76af8 100644
--- a/forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt
+++ b/forge-gui/res/cardsfolder/s/stenn_paranoid_partisan.txt
@@ -3,7 +3,7 @@ ManaCost:W U
 Types:Legendary Creature Human Wizard
 PT:2/2
 K:ETBReplacement:Other:ChooseCT
-SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Card | ValidTypes$ Artifact,Planeswalker,Enchantment,Instant,Sorcery | SpellDescription$ As CARDNAME enters, choose a card type other than creature or land.
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Card | InvalidTypes$ Creature,Land | SpellDescription$ As CARDNAME enters, choose a card type other than creature or land.
 S:Mode$ ReduceCost | ValidCard$ Card.ChosenType | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Spells you cast of the chosen type cost {1} less to cast.
 A:AB$ ChangeZone | Cost$ 1 W U | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile NICKNAME. Return it to the battlefield under its owner's control at the beginning of the next end step.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | RememberObjects$ Remembered | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return it to the battlefield under its owner's control at the beginning of the next end step. | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/s/stoic_star_captain.txt b/forge-gui/res/cardsfolder/s/stoic_star_captain.txt
new file mode 100644
index 00000000000..53c63eaa67c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/stoic_star_captain.txt
@@ -0,0 +1,7 @@
+Name:Stoic Star-Captain
+ManaCost:1 W
+Types:Creature Human Pilot
+PT:2/3
+S:Mode$ TapPowerValue | ValidSA$ Activated.Crew+Vehicle,Activated.Station | ValidCard$ Creature.YouCtrl | Value$ 1 | Description$ Each creature you control crews Vehicles and stations permanents as though its power were 1 greater.
+A:AB$ Seek | Cost$ 1 W | Type$ Spacecraft | Exhaust$ True | SpellDescription$ Seek a Spacecraft card.
+Oracle:Each creature you control crews Vehicles and stations permanents as though its power were 1 greater.\nExhaust — {1}{W}: Seek a Spacecraft card.
diff --git a/forge-gui/res/cardsfolder/s/stonebinders_familiar.txt b/forge-gui/res/cardsfolder/s/stonebinders_familiar.txt
index db5c746e8f2..e7da54007f4 100644
--- a/forge-gui/res/cardsfolder/s/stonebinders_familiar.txt
+++ b/forge-gui/res/cardsfolder/s/stonebinders_familiar.txt
@@ -2,7 +2,7 @@ Name:Stonebinder's Familiar
 ManaCost:W
 Types:Creature Spirit Dog
 PT:1/1
-T:Mode$ ChangesZoneAll | ValidCards$ Card.!token+!copiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutcounter | PlayerTurn$ True | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on CARDNAME. This ability triggers only once each turn.
-SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ 1
+T:Mode$ ChangesZoneAll | ValidCards$ Card.!token+!copiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | PlayerTurn$ True | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on CARDNAME. This ability triggers only once each turn.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Whenever one or more cards are put into exile during your turn, put a +1/+1 counter on Stonebinder's Familiar. This ability triggers only once each turn.
diff --git a/forge-gui/res/cardsfolder/s/strength_of_will.txt b/forge-gui/res/cardsfolder/s/strength_of_will.txt
new file mode 100644
index 00000000000..eb9c59221a8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/strength_of_will.txt
@@ -0,0 +1,9 @@
+Name:Strength of Will
+ManaCost:1 G
+Types:Instant
+A:SP$ Animate | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Keywords$ Indestructible | Triggers$ DamageTrigger | SpellDescription$ Until end of turn, target creature you control gains indestructible and "Whenever this creature is dealt damage, put that many +1/+1 counters on it."
+SVar:DamageTrigger:Mode$ DamageDoneOnce | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature is dealt damage, put that many +1/+1 counters on it.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
+SVar:X:TriggerCount$DamageAmount
+DeckHas:Ability$Counters
+Oracle:Until end of turn, target creature you control gains indestructible and "Whenever this creature is dealt damage, put that many +1/+1 counters on it."
diff --git a/forge-gui/res/cardsfolder/s/suburban_sanctuary.txt b/forge-gui/res/cardsfolder/s/suburban_sanctuary.txt
new file mode 100644
index 00000000000..32c0e724a21
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/suburban_sanctuary.txt
@@ -0,0 +1,8 @@
+Name:Suburban Sanctuary
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
+A:AB$ Surveil | Cost$ 4 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:This land enters tapped.\n{T}: Add {G} or {W}.\n{4}, {T}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/subway_train.txt b/forge-gui/res/cardsfolder/s/subway_train.txt
new file mode 100644
index 00000000000..18947379674
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/subway_train.txt
@@ -0,0 +1,8 @@
+Name:Subway Train
+ManaCost:2
+Types:Artifact Vehicle
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When this Vehicle enters, you may pay {G}. If you do, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
+K:Crew:2
+Oracle:When this Vehicle enters, you may pay {G}. If you do, search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/s/sudden_strike.txt b/forge-gui/res/cardsfolder/s/sudden_strike.txt
new file mode 100644
index 00000000000..d418ca964c9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/sudden_strike.txt
@@ -0,0 +1,5 @@
+Name:Sudden Strike
+ManaCost:1 W
+Types:Instant
+A:SP$ Destroy | ValidTgts$ Creature.attacking,Creature.blocking | TgtPrompt$ Select target attacking or blocking creature | SpellDescription$ Destroy target attacking or blocking creature.
+Oracle:Destroy target attacking or blocking creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/suki_kyoshi_warrior.txt b/forge-gui/res/cardsfolder/s/suki_kyoshi_warrior.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/suki_kyoshi_warrior.txt
rename to forge-gui/res/cardsfolder/s/suki_kyoshi_warrior.txt
diff --git a/forge-gui/res/cardsfolder/s/sultai_monument.txt b/forge-gui/res/cardsfolder/s/sultai_monument.txt
index 23515beb47f..1b6035a57e5 100644
--- a/forge-gui/res/cardsfolder/s/sultai_monument.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_monument.txt
@@ -2,7 +2,7 @@ Name:Sultai Monument
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this artifact enters, search your library for a basic Swamp, Forest, or Island card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Swamp+Basic,Land.Forest+Basic,Land.Island+Basic
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Swamp.Basic,Forest.Basic,Island.Basic | ChangeTypeDesc$ basic Swamp, Forest, or Island
 A:AB$ Token | Cost$ 2 B G U T Sac<1/CARDNAME> | TokenAmount$ 2 | TokenScript$ b_2_2_zombie_druid | TokenOwner$ You | SorcerySpeed$ True | SpellDescription$ Create two 2/2 black Zombie Druid creature tokens. Activate only as a sorcery.
 DeckHas:Ability$Token
 Oracle:When this artifact enters, search your library for a basic Swamp, Forest, or Island card, reveal it, put it into your hand, then shuffle.\n{2}{B}{G}{U}, {T}, Sacrifice this artifact: Create two 2/2 black Zombie Druid creature tokens. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/summon_fenrir.txt b/forge-gui/res/cardsfolder/s/summon_fenrir.txt
index 68ece48b7c4..af42a1bb574 100644
--- a/forge-gui/res/cardsfolder/s/summon_fenrir.txt
+++ b/forge-gui/res/cardsfolder/s/summon_fenrir.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Enchantment Creature Saga Wolf
 PT:3/2
 K:Chapter:3:DBFetch,DBCast,DBDraw
-SVar:DBFetch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Crescent Fang — Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:DBFetch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Crescent Fang — Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:DBCast:DB$ Effect | Triggers$ SpellCast | SpellDescription$ Heavenward Howl — When you next cast a creature spell this turn, that creature enters with an additional +1/+1 counter on it.
 SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | OneOff$ True | Execute$ TrigEffect | TriggerDescription$ When you next cast a creature spell this turn, that creature enters with an additional +1/+1 counter on it.
 SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat | ExileOnMoved$ Stack
diff --git a/forge-gui/res/cardsfolder/s/sun_spider_nimble_webber.txt b/forge-gui/res/cardsfolder/s/sun_spider_nimble_webber.txt
new file mode 100644
index 00000000000..24a8f4e11c2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/sun_spider_nimble_webber.txt
@@ -0,0 +1,9 @@
+Name:Sun-Spider, Nimble Webber
+ManaCost:3 WU
+Types:Legendary Creature Spider Human Hero
+PT:3/2
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | Condition$ PlayerTurn | Description$ During your turn, NICKNAME has flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When NICKNAME enters, search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Aura,Equipment | ChangeNum$ 1
+DeckHints:Type$Aura|Equipment
+Oracle:During your turn, Sun-Spider has flying.\nWhen Sun-Spider enters, search your library for an Aura or Equipment card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/suncleanser.txt b/forge-gui/res/cardsfolder/s/suncleanser.txt
index 82b735d110f..6c80ca16b09 100644
--- a/forge-gui/res/cardsfolder/s/suncleanser.txt
+++ b/forge-gui/res/cardsfolder/s/suncleanser.txt
@@ -5,7 +5,7 @@ PT:1/4
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ CreatureDBRemoveCounter,OpponentDBRemoveCounter | CharmNum$ 1
 SVar:CreatureDBRemoveCounter:DB$ RemoveCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ All | CounterNum$ All | SubAbility$ DBPumpCreature | SpellDescription$ Remove all counters from target creature. It can't have counters put on it for as long as CARDNAME remains on the battlefield.
-SVar:OpponentDBRemoveCounter:DB$ RemoveCounter | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | CounterType$ All | CounterNum$ All | SubAbility$ DBPumpOpponent | SpellDescription$ Target opponent loses all counters. That player can't get counters for as long as CARDNAME remains on the battlefield.
+SVar:OpponentDBRemoveCounter:DB$ RemoveCounter | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | CounterType$ All | SubAbility$ DBPumpOpponent | SpellDescription$ Target opponent loses all counters. That player can't get counters for as long as CARDNAME remains on the battlefield.
 SVar:DBPumpCreature:DB$ Effect | StaticAbilities$ DBCantPutCounterCreature | RememberObjects$ Targeted | Duration$ AsLongAsInPlay
 SVar:DBCantPutCounterCreature:Mode$ CantPutCounter | ValidCard$ Card.IsRemembered | Description$ That creature can't have counters put on it for as long as EFFECTSOURCE remains on the battlefield.
 SVar:DBPumpOpponent:DB$ Effect | StaticAbilities$ DBCantPutCounterPlayer | RememberObjects$ Targeted | Duration$ AsLongAsInPlay
diff --git a/forge-gui/res/cardsfolder/s/sundering_eruption_volcanic_fissure.txt b/forge-gui/res/cardsfolder/s/sundering_eruption_volcanic_fissure.txt
index 340283ac564..75ff7b5a9f8 100644
--- a/forge-gui/res/cardsfolder/s/sundering_eruption_volcanic_fissure.txt
+++ b/forge-gui/res/cardsfolder/s/sundering_eruption_volcanic_fissure.txt
@@ -2,7 +2,7 @@ Name:Sundering Eruption
 ManaCost:2 R
 Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBChange | SpellDescription$ Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle. Creatures without flying can't block this turn.
-SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ CantBlockEffect
+SVar:DBChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | DefinedPlayer$ TargetedController | ShuffleNonMandatory$ True | SubAbility$ CantBlockEffect
 SVar:CantBlockEffect:DB$ Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ Creatures without flying can't block this turn.
 SVar:KWPump:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures without flying can't block this turn.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/s/superior_foes_of_spider_man.txt b/forge-gui/res/cardsfolder/s/superior_foes_of_spider_man.txt
new file mode 100644
index 00000000000..84113d41938
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/superior_foes_of_spider_man.txt
@@ -0,0 +1,15 @@
+Name:Superior Foes of Spider-Man
+ManaCost:2 R
+Types:Creature Human Rogue Villain
+PT:3/3
+K:Trample
+T:Mode$ SpellCast | ValidCard$ Card.cmcGE4 | ValidActivatingPlayer$ You | OptionalDecider$ You | Execute$ ExileSelf | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with mana value 4 or greater, you may exile the top card of your library. If you do, you may play that card until you exile another card with this creature.
+SVar:ExileSelf:DB$ ChangeZone | Defined$ Imprinted | Origin$ Command | Destination$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True | SubAbility$ DBExile
+SVar:DBExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | AILogic$ ExileAndPlayUntilEOT
+# AILogic tag not quite right?
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ Play | Duration$ Permanent | ForgetOnMoved$ Exile | ImprintOnHost$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup2 | Static$ True
+SVar:DBCleanup2:DB$ Cleanup | ClearImprinted$ True
+SVar:Play:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card until you exile another card with CARDNAME.
+Oracle:Whenever you cast a spell with mana value 4 or greater, you may exile the top card of your library. If you do, you may play that card until you exile another card with this creature.
diff --git a/forge-gui/res/cardsfolder/s/superior_spider_man.txt b/forge-gui/res/cardsfolder/s/superior_spider_man.txt
new file mode 100644
index 00000000000..9108ad401b3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/superior_spider_man.txt
@@ -0,0 +1,10 @@
+Name:Superior Spider-Man
+ManaCost:2 U B
+Types:Legendary Creature Spider Human Hero
+PT:4/4
+K:ETBReplacement:Copy:DBCopy:Optional
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | ChoiceZone$ Graveyard | NewName$ Superior Spider-Man | AddTypes$ Spider & Human & Hero | SetPower$ 4 | SetToughness$ 4 | RememberCloneOrigin$ True | SubAbility$ DBImmediateTrig | SpellDescription$ Mind Swap — You may have CARDNAME enter as a copy of any creature card in a graveyard, except his name is Superior Spider-Man and he's a 4/4 Spider Human Hero in addition to his other types. When you do, exile that card.
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | Execute$ TrigExile | RememberObjects$ RememberedCard | SubAbility$ DBCleanup | TriggerDescription$ When you do, exile that card.
+SVar:TrigExile:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Mind Swap — You may have Superior Spider-Man enter as a copy of any creature card in a graveyard, except his name is Superior Spider-Man and he's a 4/4 Spider Human Hero in addition to his other types. When you do, exile that card.
diff --git a/forge-gui/res/cardsfolder/s/supply_demand.txt b/forge-gui/res/cardsfolder/s/supply_demand.txt
index 292da85b4a7..02bec1a233c 100644
--- a/forge-gui/res/cardsfolder/s/supply_demand.txt
+++ b/forge-gui/res/cardsfolder/s/supply_demand.txt
@@ -12,5 +12,5 @@ ALTERNATE
 Name:Demand
 ManaCost:1 W U
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.MultiColor | ChangeNum$ 1 | SpellDescription$ Search your library for a multicolored card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.MultiColor | ChangeTypeDesc$ multicolored | SpellDescription$ Search your library for a multicolored card, reveal it, put it into your hand, then shuffle.
 Oracle:Search your library for a multicolored card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/supportive_parents.txt b/forge-gui/res/cardsfolder/s/supportive_parents.txt
new file mode 100644
index 00000000000..c3b4d429c15
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/supportive_parents.txt
@@ -0,0 +1,6 @@
+Name:Supportive Parents
+ManaCost:2 G
+Types:Creature Human Citizen
+PT:3/3
+A:AB$ Mana | Cost$ tapXType<2/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:Tap two untapped creatures you control: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/suppression_field.txt b/forge-gui/res/cardsfolder/s/suppression_field.txt
index 7ae4ff55f04..7b9a84967f3 100644
--- a/forge-gui/res/cardsfolder/s/suppression_field.txt
+++ b/forge-gui/res/cardsfolder/s/suppression_field.txt
@@ -1,6 +1,6 @@
 Name:Suppression Field
 ManaCost:1 W
 Types:Enchantment
-S:Mode$ RaiseCost | ValidCard$ Card | ValidSpell$ Activated.nonManaAbility | Amount$ 2 | Description$ Activated abilities cost {2} more to activate unless they're mana abilities.
+S:Mode$ RaiseCost | ValidCard$ Card | ValidSpell$ Activated.!ManaAbility | Amount$ 2 | Description$ Activated abilities cost {2} more to activate unless they're mana abilities.
 AI:RemoveDeck:Random
 Oracle:Activated abilities cost {2} more to activate unless they're mana abilities.
diff --git a/forge-gui/res/cardsfolder/s/suqata_firewalker.txt b/forge-gui/res/cardsfolder/s/suqata_firewalker.txt
index e7a16a7f747..dee14c0fc82 100644
--- a/forge-gui/res/cardsfolder/s/suqata_firewalker.txt
+++ b/forge-gui/res/cardsfolder/s/suqata_firewalker.txt
@@ -2,6 +2,6 @@ Name:Suq'Ata Firewalker
 ManaCost:1 U U
 Types:Creature Human Wizard
 PT:0/1
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.Red | Description$ CARDNAME can't be the target of red spells or abilities from red sources.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.Red | Description$ CARDNAME can't be the target of red spells or abilities from red sources.
 A:AB$ DealDamage | Cost$ T | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 Oracle:Suq'Ata Firewalker can't be the target of red spells or abilities from red sources.\n{T}: Suq'Ata Firewalker deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/s/surrak_the_hunt_caller.txt b/forge-gui/res/cardsfolder/s/surrak_the_hunt_caller.txt
index 917c363bed9..81a79b1b7c9 100644
--- a/forge-gui/res/cardsfolder/s/surrak_the_hunt_caller.txt
+++ b/forge-gui/res/cardsfolder/s/surrak_the_hunt_caller.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G
 Types:Legendary Creature Human Warrior
 PT:5/4
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE8 | Execute$ TrigPump | TriggerDescription$ Formidable — At the beginning of combat on your turn, if creatures you control have total power 8 or greater, target creature you control gains haste until end of turn.
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Haste
 Oracle:Formidable — At the beginning of combat on your turn, if creatures you control have total power 8 or greater, target creature you control gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/surtland_frostpyre.txt b/forge-gui/res/cardsfolder/s/surtland_frostpyre.txt
index cee470a24f3..16560ea7eb7 100644
--- a/forge-gui/res/cardsfolder/s/surtland_frostpyre.txt
+++ b/forge-gui/res/cardsfolder/s/surtland_frostpyre.txt
@@ -4,6 +4,6 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
-A:AB$ Scry | Cost$ 2 U U R T Sac<1/CARDNAME> | ScryNum$ 2 | SubAbility$ DBDamageAll | SorcerySpeed$ True | SpellDescription$ Scry 2. CARDNAME deals 2 damage to each creature. Activate only any time you could cast a sorcery.
+A:AB$ Scry | Cost$ 2 U U R T Sac<1/CARDNAME> | ScryNum$ 2 | SubAbility$ DBDamageAll | SorcerySpeed$ True | SpellDescription$ Scry 2. CARDNAME deals 2 damage to each creature. Activate only as a sorcery.
 SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 2
 Oracle:Surtland Frostpyre enters tapped.\n{T}: Add {R}.\n{2}{U}{U}{R}, {T}, Sacrifice Surtland Frostpyre: Scry 2. Surtland Frostpyre deals 2 damage to each creature. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/s/survey_mechan.txt b/forge-gui/res/cardsfolder/s/survey_mechan.txt
index aba0c2c2635..b87e31264cf 100644
--- a/forge-gui/res/cardsfolder/s/survey_mechan.txt
+++ b/forge-gui/res/cardsfolder/s/survey_mechan.txt
@@ -7,5 +7,5 @@ K:Hexproof
 A:AB$ DealDamage | Cost$ 10 Sac<1/CARDNAME> | ValidTgts$ Any | NumDmg$ 3 | ReduceCost$ X | SubAbility$ DBDraw | SpellDescription$ It deals 3 damage to any target. Target player draws three cards and gains 3 life. This ability costs {X} less to activate, where X is the number of differently named lands you control.
 SVar:DBDraw:DB$ Draw | NumCards$ 3 | ValidTgts$ Player | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ ParentTarget | LifeAmount$ 3
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 Oracle:Flying\nHexproof (This creature can't be the target of spells or abilities your opponents control.)\n{10}, Sacrifice this creature: It deals 3 damage to any target. Target player draws three cards and gains 3 life. This ability costs {X} less to activate, where X is the number of differently named lands you control.
diff --git a/forge-gui/res/cardsfolder/s/surveyors_scope.txt b/forge-gui/res/cardsfolder/s/surveyors_scope.txt
index 57f3a33c646..34fe105b7a3 100644
--- a/forge-gui/res/cardsfolder/s/surveyors_scope.txt
+++ b/forge-gui/res/cardsfolder/s/surveyors_scope.txt
@@ -1,7 +1,7 @@
 Name:Surveyor's Scope
 ManaCost:2
 Types:Artifact
-A:AB$ ChangeZone | Cost$ T Exile<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | SpellDescription$ Search your library for up to X basic land cards, where X is the number of players who control at least two more lands than you. Put those lands onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T Exile<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | SpellDescription$ Search your library for up to X basic land cards, where X is the number of players who control at least two more lands than you. Put those lands onto the battlefield, then shuffle.
 SVar:X:PlayerCountPropertywithAtLeast2MoreLandsThanYou$Amount
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt b/forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt
index cf081b4e1a2..1441c8e6ed0 100644
--- a/forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt
+++ b/forge-gui/res/cardsfolder/s/sutina_speaker_of_the_tajuru.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Legendary Creature Elf Scout
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ Whenever NICKNAME attacks, you may return a land you control to its owner's hand. When you do, put a +1/+1 counter on target creature.
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ Return<1/Land> | Execute$ TrigPutCounter | TriggerDescription$ When you do, put a +1/+1 counter on target creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
diff --git a/forge-gui/res/cardsfolder/s/swarm_being_of_bees.txt b/forge-gui/res/cardsfolder/s/swarm_being_of_bees.txt
new file mode 100644
index 00000000000..6c68f2aaaa2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/s/swarm_being_of_bees.txt
@@ -0,0 +1,8 @@
+Name:Swarm, Being of Bees
+ManaCost:2 B
+Types:Legendary Creature Insect Villain
+PT:2/2
+K:Flash
+K:Flying
+K:Mayhem:B
+Oracle:Flash\nFlying\nMayhem {B} (You may cast this card from your graveyard for {B} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/s/swine_rebellion.txt b/forge-gui/res/cardsfolder/s/swine_rebellion.txt
index c740ec7f736..abb939ffff9 100644
--- a/forge-gui/res/cardsfolder/s/swine_rebellion.txt
+++ b/forge-gui/res/cardsfolder/s/swine_rebellion.txt
@@ -6,7 +6,7 @@ SVar:DBConjureAll:DB$ MakeCard | Conjure$ True | Names$ First Little Pig,Second
 SVar:DBConjureTwo:DB$ MakeCard | Conjure$ True | SpellbookName$ the Three Pigs | Spellbook$ First Little Pig,Second Little Pig,Third Little Pig | SpellbookAmount$ 2 | RememberMade$ True | Zone$ Hand | SubAbility$ DBPutBattlefield
 SVar:DBPutBattlefield:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a card to put onto the battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Boar.YouCtrl+inRealZoneBattlefield
+SVar:X:Count$Valid Boar.YouCtrl$DifferentCardNames
 DeckHints:Type$Boar
 DeckHas:Type$Boar
 Oracle:If you control three or more Boars with different names, conjure each card from the Three Pigs spellbook onto the battlefield.\nIf you control two or fewer Boars with different names, conjure two cards of your choice from the Three Pigs spellbook into your hand, then put one of them onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/sword_of_hearth_and_home.txt b/forge-gui/res/cardsfolder/s/sword_of_hearth_and_home.txt
index 0afa6aef4ab..4c1e92eefae 100644
--- a/forge-gui/res/cardsfolder/s/sword_of_hearth_and_home.txt
+++ b/forge-gui/res/cardsfolder/s/sword_of_hearth_and_home.txt
@@ -5,7 +5,7 @@ K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddSVar$ SwordOfHearthAndHomeCE | AddKeyword$ Protection from green & Protection from white | Description$ Equipped creature gets +2/+2 and has protection from green and from white.
 T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigBlink | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, exile up to one target creature you own, then search your library for a basic land card. Put both cards onto the battlefield under your control, then shuffle.
 SVar:TrigBlink:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ValidTgts$ Creature.YouOwn | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature you own | SubAbility$ DBLand
-SVar:DBLand:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBReturn
+SVar:DBLand:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SwordOfHearthAndHomeCE:SVar:MustBeBlocked:AttackingPlayerConservative
diff --git a/forge-gui/res/cardsfolder/s/sword_of_the_animist.txt b/forge-gui/res/cardsfolder/s/sword_of_the_animist.txt
index 55f07dcf52e..b7ec40ac387 100644
--- a/forge-gui/res/cardsfolder/s/sword_of_the_animist.txt
+++ b/forge-gui/res/cardsfolder/s/sword_of_the_animist.txt
@@ -4,5 +4,5 @@ Types:Legendary Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Equipped creature gets +1/+1.
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever equipped creature attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ShuffleNonMandatory$ True
 Oracle:Equipped creature gets +1/+1.\nWhenever equipped creature attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/s/sword_point_diplomacy.txt b/forge-gui/res/cardsfolder/s/sword_point_diplomacy.txt
index 82c929dc202..646845b7761 100644
--- a/forge-gui/res/cardsfolder/s/sword_point_diplomacy.txt
+++ b/forge-gui/res/cardsfolder/s/sword_point_diplomacy.txt
@@ -1,9 +1,9 @@
 Name:Sword-Point Diplomacy
 ManaCost:2 B
 Types:Sorcery
-A:SP$ PeekAndReveal | PeekAmount$ 3 | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBRepeat | SpellDescription$ Reveal the top three cards of your library. For each of those cards, put that card into your hand unless any opponent pays 3 life. Then exile the rest.
+A:SP$ PeekAndReveal | PeekAmount$ 3 | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBRepeat | StackDescription$ REP Reveal_{p:You} reveals & of your_of their & put_{p:You} puts & into your_into their & Then exile_Then {p:You} exiles | SpellDescription$ Reveal the top three cards of your library. For each of those cards, put that card into your hand unless any opponent pays 3 life. Then exile the rest.
 SVar:DBRepeat:DB$ RepeatEach | RepeatSubAbility$ DBChangeZone | RepeatCards$ Card.IsRemembered | ChooseOrder$ True | Zone$ Library | UseImprinted$ True | SubAbility$ PutIntoHand
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Library | Destination$ Hand | UnlessCost$ PayLife<3> | UnlessPayer$ Opponent | ForgetChanged$ True | StackDescription$ Put [{c:Imprinted}] into the hand
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Library | Destination$ Hand | UnlessCost$ PayLife<3> | UnlessPayer$ Opponent | ForgetChanged$ True
 SVar:PutIntoHand:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Reveal the top three cards of your library. For each of those cards, put that card into your hand unless any opponent pays 3 life. Then exile the rest.
diff --git a/forge-gui/res/cardsfolder/s/sylvan_library.txt b/forge-gui/res/cardsfolder/s/sylvan_library.txt
index a81f123f95f..c2b9db9b3a6 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_library.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_library.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your draw step, you may draw two additional cards. If you do, choose two cards in your hand drawn this turn. For each of those cards, pay 4 life or put the card on top of your library.
 SVar:TrigDraw:AB$ ChooseCard | ChoiceZone$ Hand | Choices$ Card.YouOwn+DrawnThisTurn | Cost$ Draw<2/You> | Amount$ 2 | Mandatory$ True | AILogic$ Worst | SubAbility$ DBPayOrReturn | NoReveal$ True
 SVar:DBPayOrReturn:DB$ RepeatEach | RepeatCards$ Card.ChosenCard | Zone$ Hand | RepeatSubAbility$ DBReplace | SubAbility$ DBCleanup | ChooseOrder$ True
-SVar:DBReplace:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card.ChosenCard | UnlessCost$ PayLife<4> | Mandatory$ True | StackDescription$ Put {c:Imprinted} on top of your library | UnlessPayer$ TriggeredPlayer | NoReveal$ True
+SVar:DBReplace:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeType$ Card.ChosenCard | UnlessCost$ PayLife<4> | Mandatory$ True | UnlessPayer$ TriggeredPlayer | NoReveal$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 AI:RemoveDeck:All
 Oracle:At the beginning of your draw step, you may draw two additional cards. If you do, choose two cards in your hand drawn this turn. For each of those cards, pay 4 life or put the card on top of your library.
diff --git a/forge-gui/res/cardsfolder/s/sylvan_ranger.txt b/forge-gui/res/cardsfolder/s/sylvan_ranger.txt
index b57972684ad..5d995bd8711 100644
--- a/forge-gui/res/cardsfolder/s/sylvan_ranger.txt
+++ b/forge-gui/res/cardsfolder/s/sylvan_ranger.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Elf Scout Ranger
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Sylvan Ranger enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/symbiote_spawn.txt b/forge-gui/res/cardsfolder/s/symbiote_spawn.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/symbiote_spawn.txt
rename to forge-gui/res/cardsfolder/s/symbiote_spawn.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/symbiote_spider_man.txt b/forge-gui/res/cardsfolder/s/symbiote_spider_man.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/symbiote_spider_man.txt
rename to forge-gui/res/cardsfolder/s/symbiote_spider_man.txt
diff --git a/forge-gui/res/cardsfolder/t/tahngarths_glare.txt b/forge-gui/res/cardsfolder/t/tahngarths_glare.txt
index 3cd5f6a913f..597acb9369c 100644
--- a/forge-gui/res/cardsfolder/t/tahngarths_glare.txt
+++ b/forge-gui/res/cardsfolder/t/tahngarths_glare.txt
@@ -1,6 +1,6 @@
 Name:Tahngarth's Glare
 ManaCost:R
 Types:Sorcery
-A:SP$ RearrangeTopOfLibrary | ValidTgts$ Opponent | NumCards$ 3 | SubAbility$ DBRearange | SpellDescription$ Look at the top three cards of target opponent's library, then put them back in any order. That player looks at the top three cards of your library, then puts them back in any order.
-SVar:DBRearange:DB$ RearrangeTopOfLibrary | Defined$ You | RearrangePlayer$ Targeted | NumCards$ 3
+A:SP$ RearrangeTopOfLibrary | ValidTgts$ Opponent | NumCards$ 3 | SubAbility$ DBRearrange | SpellDescription$ Look at the top three cards of target opponent's library, then put them back in any order. That player looks at the top three cards of your library, then puts them back in any order.
+SVar:DBRearrange:DB$ RearrangeTopOfLibrary | Defined$ You | RearrangePlayer$ Targeted | NumCards$ 3
 Oracle:Look at the top three cards of target opponent's library, then put them back in any order. That player looks at the top three cards of your library, then puts them back in any order.
diff --git a/forge-gui/res/cardsfolder/t/tahngarths_rage.txt b/forge-gui/res/cardsfolder/t/tahngarths_rage.txt
index d891554a897..8935b0e0d13 100644
--- a/forge-gui/res/cardsfolder/t/tahngarths_rage.txt
+++ b/forge-gui/res/cardsfolder/t/tahngarths_rage.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant:Creature
 SVar:AttachAILogic:Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy+attacking | AddPower$ 3 | Description$ Enchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy+notattacking | AddPower$ -2 | AddToughness$ -1
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy+!attacking | AddPower$ -2 | AddToughness$ -1
 AI:RemoveDeck:All
 Oracle:Enchant creature\nEnchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1.
diff --git a/forge-gui/res/cardsfolder/t/talus_paladin.txt b/forge-gui/res/cardsfolder/t/talus_paladin.txt
index c66eb4a9c1b..3cdc0f6da30 100644
--- a/forge-gui/res/cardsfolder/t/talus_paladin.txt
+++ b/forge-gui/res/cardsfolder/t/talus_paladin.txt
@@ -2,9 +2,9 @@ Name:Talus Paladin
 ManaCost:3 W
 Types:Creature Human Knight Ally
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally you control enters, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Ally.YouCtrl | KW$ Lifelink | SubAbility$ DBCounter
-SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | OptionalDecider$ You
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally you control enters, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
+SVar:TrigPumpAll:DB$ Pump | Defined$ Valid Ally.YouCtrl | KW$ Lifelink | Optional$ True | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | Optional$ True
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
 Oracle:Whenever Talus Paladin or another Ally you control enters, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on Talus Paladin.
diff --git a/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt b/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt
index ca4bef9d990..724a26f227c 100644
--- a/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt
+++ b/forge-gui/res/cardsfolder/t/targ_nar_demon_fang_gnoll.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Gnoll
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, attacking creatures get +1/+0 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.attacking | NumAtt$ +1
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 A:AB$ Pump | Cost$ 2 R G | NumAtt$ Double | NumDef$ Double | StackDescription$ SpellDescription | SpellDescription$ Double NICKNAME's power and toughness until end of turn.
 Oracle:Pack tactics — Whenever Targ Nar, Demon-Fang Gnoll attacks, if you attacked with creatures with total power 6 or greater this combat, attacking creatures get +1/+0 until end of turn.\n{2}{R}{G}: Double Targ Nar's power and toughness until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/taxi_driver.txt b/forge-gui/res/cardsfolder/t/taxi_driver.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/taxi_driver.txt
rename to forge-gui/res/cardsfolder/t/taxi_driver.txt
diff --git a/forge-gui/res/cardsfolder/t/temur_monument.txt b/forge-gui/res/cardsfolder/t/temur_monument.txt
index 1b8e2059014..745ea9e6ee8 100644
--- a/forge-gui/res/cardsfolder/t/temur_monument.txt
+++ b/forge-gui/res/cardsfolder/t/temur_monument.txt
@@ -2,7 +2,7 @@ Name:Temur Monument
 ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this artifact enters, search your library for a basic Forest, Island, or Mountain card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Forest+Basic,Land.Island+Basic,Land.Mountain+Basic
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Forest.Basic,Island.Basic,Mountain.Basic | ChangeTypeDesc$ basic Forest, Island, or Mountain
 A:AB$ Token | Cost$ 3 G U R T Sac<1/CARDNAME> | TokenAmount$ 1 | TokenScript$ g_5_5_elephant | TokenOwner$ You | SorcerySpeed$ True | SpellDescription$ Create a 5/5 green Elephant creature token. Activate only as a sorcery.
 DeckHas:Ability$Token
 Oracle:When this artifact enters, search your library for a basic Forest, Island, or Mountain card, reveal it, put it into your hand, then shuffle.\n{3}{G}{U}{R}, {T}, Sacrifice this artifact: Create a 5/5 green Elephant creature token. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/terminal_moraine.txt b/forge-gui/res/cardsfolder/t/terminal_moraine.txt
index 16327fc7f84..334f41ad784 100644
--- a/forge-gui/res/cardsfolder/t/terminal_moraine.txt
+++ b/forge-gui/res/cardsfolder/t/terminal_moraine.txt
@@ -2,5 +2,5 @@ Name:Terminal Moraine
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Terminal Moraine: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/terramorph.txt b/forge-gui/res/cardsfolder/t/terramorph.txt
index 676ed36f43e..9c0e4ed9502 100644
--- a/forge-gui/res/cardsfolder/t/terramorph.txt
+++ b/forge-gui/res/cardsfolder/t/terramorph.txt
@@ -2,5 +2,5 @@ Name:Terramorph
 ManaCost:3 G
 Types:Sorcery
 K:Rebound
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield, then shuffle.
 Oracle:Search your library for a basic land card, put it onto the battlefield, then shuffle.\nRebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/t/terramorphic_expanse.txt b/forge-gui/res/cardsfolder/t/terramorphic_expanse.txt
index ff6396b3f52..19e121a2391 100644
--- a/forge-gui/res/cardsfolder/t/terramorphic_expanse.txt
+++ b/forge-gui/res/cardsfolder/t/terramorphic_expanse.txt
@@ -1,5 +1,5 @@
 Name:Terramorphic Expanse
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}, Sacrifice Terramorphic Expanse: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/terrific_team_up.txt b/forge-gui/res/cardsfolder/t/terrific_team_up.txt
new file mode 100644
index 00000000000..26014d34e47
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/terrific_team_up.txt
@@ -0,0 +1,7 @@
+Name:Terrific Team-Up
+ManaCost:3 G
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Permanent.cmcGE4+YouCtrl | Description$ This spell costs {2} less to cast if you control a permanent with mana value 4 or greater.
+A:SP$ Pump | TargetMin$ 1 | TargetMax$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select one or two target creatures you control | NumAtt$ +1 | AILogic$ PowerDmg | SubAbility$ DBEachDamage | SpellDescription$ One or two target creatures you control each get +1/+0 until end of turn. They each deal damage equal to their power to target creature an opponent controls.
+SVar:DBEachDamage:DB$ EachDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | DefinedDamagers$ ParentTarget | NumDmg$ Count$CardPower
+Oracle:This spell costs {2} less to cast if you control a permanent with mana value 4 or greater.\nOne or two target creatures you control each get +1/+0 until end of turn. They each deal damage equal to their power to target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/t/tetsuo_umezawa.txt b/forge-gui/res/cardsfolder/t/tetsuo_umezawa.txt
index adc3d2abc9b..f9e59d50544 100644
--- a/forge-gui/res/cardsfolder/t/tetsuo_umezawa.txt
+++ b/forge-gui/res/cardsfolder/t/tetsuo_umezawa.txt
@@ -2,6 +2,6 @@ Name:Tetsuo Umezawa
 ManaCost:U B R
 Types:Legendary Creature Human Archer
 PT:3/3
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Aura | ValidSA$ Spell | Description$ CARDNAME can't be the target of Aura spells.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Aura | ValidSA$ Spell | Description$ CARDNAME can't be the target of Aura spells.
 A:AB$ Destroy | Cost$ U B B R T | ValidTgts$ Creature.tapped,Creature.blocking | TgtPrompt$ Select target tapped or blocking creature | SpellDescription$ Destroy target tapped or blocking creature.
 Oracle:Tetsuo Umezawa can't be the target of Aura spells.\n{U}{B}{B}{R}, {T}: Destroy target tapped or blocking creature.
diff --git a/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt b/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
index a06ff1473ba..cc416023b52 100644
--- a/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
+++ b/forge-gui/res/cardsfolder/t/thaumatic_compass_spires_of_orazca.txt
@@ -1,7 +1,7 @@
 Name:Thaumatic Compass
 ManaCost:2
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card and put that card into your hand, then shuffle.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Land.YouCtrl | PresentCompare$ GE7 | Execute$ DBTransform | TriggerDescription$ At the beginning of your end step, if you control seven or more lands, transform CARDNAME.
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
diff --git a/forge-gui/res/cardsfolder/t/thawing_glaciers.txt b/forge-gui/res/cardsfolder/t/thawing_glaciers.txt
index 3c4d2ea40f1..df175601ca1 100644
--- a/forge-gui/res/cardsfolder/t/thawing_glaciers.txt
+++ b/forge-gui/res/cardsfolder/t/thawing_glaciers.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ ChangeZone | Cost$ 1 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | Shuffle$ True | SubAbility$ DBDelTrig | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
+A:AB$ ChangeZone | Cost$ 1 T | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | Shuffle$ True | SubAbility$ DBDelTrig | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
 SVar:DBDelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | ValidPlayer$ Player | Execute$ TrigBounce | TriggerDescription$ Return CARDNAME to its owner's hand at the beginning of the next cleanup step.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 Oracle:Thawing Glaciers enters tapped.\n{1}, {T}: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle. Return Thawing Glaciers to its owner's hand at the beginning of the next cleanup step.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_cabbage_merchant.txt b/forge-gui/res/cardsfolder/t/the_cabbage_merchant.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_cabbage_merchant.txt
rename to forge-gui/res/cardsfolder/t/the_cabbage_merchant.txt
diff --git a/forge-gui/res/cardsfolder/t/the_clone_saga.txt b/forge-gui/res/cardsfolder/t/the_clone_saga.txt
new file mode 100644
index 00000000000..583493de493
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/the_clone_saga.txt
@@ -0,0 +1,12 @@
+Name:The Clone Saga
+ManaCost:3 U
+Types:Enchantment Saga
+K:Chapter:3:DBSurveil,DBCopyEffect,DBDrawEffect
+SVar:DBSurveil:DB$ Surveil | Amount$ 3 | SpellDescription$ Surveil 3.
+SVar:DBCopyEffect:DB$ DelayedTrigger | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ EffTrigCopy | SpellDescription$ When you next cast a creature spell this turn, copy it, except the copy isn't legendary.
+SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | NonLegendary$ True
+SVar:DBDrawEffect:DB$ NameCard | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
+SVar:DBEffect:DB$ Effect | Triggers$ TrigDamage
+SVar:TrigDamage:Mode$ DamageDone | ValidSource$ Creature.NamedCard | ValidTarget$ Player | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
+SVar:TrigDraw:DB$ Draw
+Oracle:(As this Saga enters step, add a lore counter. Sacrifice after III.)\nI — Surveil 3.\nII — When you next cast a creature spell this turn, copy it, except the copy isn't legendary.\nIII — Choose a card name. Whenever a creature with the chosen name deals combat damage to a player this turn, draw a card.
diff --git a/forge-gui/res/cardsfolder/t/the_darkness_crystal.txt b/forge-gui/res/cardsfolder/t/the_darkness_crystal.txt
index 037d83d1d04..69492e03e51 100644
--- a/forge-gui/res/cardsfolder/t/the_darkness_crystal.txt
+++ b/forge-gui/res/cardsfolder/t/the_darkness_crystal.txt
@@ -2,7 +2,7 @@ Name:The Darkness Crystal
 ManaCost:2 B B
 Types:Legendary Artifact
 S:Mode$ ReduceCost | ValidCard$ Card.Black | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Black spells you cast cost {1} less to cast.
-R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Creature+!token+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, instead exile it and you gain 2 life.
+R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Creature+!token+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, instead exile it and you gain 2 life.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
 A:AB$ ChangeZone | Cost$ 4 B B T | ValidTgts$ Creature.ExiledWithSource | TgtZone$ Exile | TgtPrompt$ Select target creature card exiled with CARDNAME | Tapped$ True | WithCountersType$ P1P1 | WithCountersAmount$ 2 | GainControl$ True | Origin$ Exile | Destination$ Battlefield | SpellDescription$ Put target creature card exiled with CARDNAME onto the battlefield tapped under your control with two additional +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/t/the_death_of_gwen_stacy.txt b/forge-gui/res/cardsfolder/t/the_death_of_gwen_stacy.txt
new file mode 100644
index 00000000000..cb60a96de5c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/the_death_of_gwen_stacy.txt
@@ -0,0 +1,16 @@
+Name:The Death of Gwen Stacy
+ManaCost:2 B
+Types:Enchantment Saga
+K:Chapter:3:DBDestroy,DBChoose,DBExile
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
+SVar:DBChoose:DB$ GenericChoice | TempRemember$ Chooser | ShowChoice$ ExceptSelf | Defined$ Player | Choices$ Discard,No | SubAbility$ DBDiscard | SpellDescription$ Each player may discard a card. Each player who doesn't loses 3 life.
+SVar:Discard:DB$ Pump | Defined$ Remembered | NoteCards$ Self | NoteCardsFor$ Discard | SpellDescription$ Discard a card.
+SVar:No:DB$ Pump | SpellDescription$ Do not discard a card.
+SVar:DBDiscard:DB$ Discard | Defined$ Player.NotedForDiscard | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ NonRememberedOwner | LifeAmount$ 3 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBClearNotes
+SVar:DBClearNotes:DB$ Pump | Defined$ Player | ClearNotedCardsFor$ Discard
+SVar:DBExile:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select any number of target players | TargetMin$ 0 | TargetMax$ MaxTgt | ChangeType$ Card | StackDescription$ Exile graveyards ({p:Targeted}). | SpellDescription$ Exile any number of target players' graveyards.
+DeckHas:Ability$Discard
+SVar:MaxTgt:PlayerCountPlayers$Amount
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Destroy target creature.\nII — Each player may discard a card. Each player who doesn't loses 3 life.\nIII — Exile any number of target players' graveyards.
diff --git a/forge-gui/res/cardsfolder/t/the_enigma_jewel_locus_of_enlightenment.txt b/forge-gui/res/cardsfolder/t/the_enigma_jewel_locus_of_enlightenment.txt
index 52214ec4c21..52eb62a0420 100644
--- a/forge-gui/res/cardsfolder/t/the_enigma_jewel_locus_of_enlightenment.txt
+++ b/forge-gui/res/cardsfolder/t/the_enigma_jewel_locus_of_enlightenment.txt
@@ -19,6 +19,6 @@ ManaCost:no cost
 Colors:blue
 Types:Legendary Artifact
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ExiledWith | GainsAbilitiesLimitPerTurn$ 1 | Description$ CARDNAME has each activated ability of the exiled cards used to craft it. You may activate each of those abilities only once each turn.
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.!ManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Locus of Enlightenment has each activated ability of the exiled cards used to craft it. You may activate each of those abilities only once each turn.\nWhenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/t/the_fire_crystal.txt b/forge-gui/res/cardsfolder/t/the_fire_crystal.txt
index 07edfa20504..45dac1ddaaf 100644
--- a/forge-gui/res/cardsfolder/t/the_fire_crystal.txt
+++ b/forge-gui/res/cardsfolder/t/the_fire_crystal.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R
 Types:Legendary Artifact
 S:Mode$ ReduceCost | ValidCard$ Card.Red | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Red spells you cast cost {1} less to cast.
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Haste | Description$ Creatures you control have haste.
-A:AB$ CopyPermanent | Cost$ 4 R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of target creature you control. Sacrifice it at the beginning of the next end step.
+A:AB$ CopyPermanent | Cost$ 4 R R T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AtEOT$ Sacrifice | SpellDescription$ Create a token that's a copy of target creature you control. Sacrifice it at the beginning of the next end step.
 SVar:PlayMain1:TRUE
 Oracle:Red spells you cast cost {1} less to cast.\nCreatures you control have haste.\n{4}{R}{R}, {T}: Create a token that's a copy of target creature you control. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/t/the_flood_of_mars.txt b/forge-gui/res/cardsfolder/t/the_flood_of_mars.txt
index 74d9d85f5d5..def601ca0d7 100644
--- a/forge-gui/res/cardsfolder/t/the_flood_of_mars.txt
+++ b/forge-gui/res/cardsfolder/t/the_flood_of_mars.txt
@@ -4,7 +4,7 @@ Types:Creature Alien Zombie Horror
 PT:3/3
 K:Landwalk:Island
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ DBCounter | TriggerDescription$ Water Always Wins — Whenever CARDNAME attacks, put a flood counter on another target creature or land. If it's a creature, it becomes a copy of CARDNAME. If it's a land, it becomes an Island in addition to its other types.
-SVar:DBCounter:DB$ PutCounter | ValidTgts$ Creature.Other,Land.Other | AITgts$ Creature.OppCtrl+notnamedThe Flood of Mars,Land.OppCtrl+nonIsland | TgtPrompt$ Select target creature or land | CounterType$ FLOOD | SubAbility$ DBCopy
+SVar:DBCounter:DB$ PutCounter | ValidTgts$ Creature.Other,Land.Other | AITgts$ Creature.OppCtrl+!namedThe Flood of Mars,Land.OppCtrl+nonIsland | TgtPrompt$ Select target creature or land | CounterType$ FLOOD | SubAbility$ DBCopy
 SVar:DBCopy:DB$ Clone | ConditionDefined$ ParentTarget | ConditionPresent$ Creature | Defined$ Self | CloneZone$ Battlefield | CloneTarget$ ParentTarget | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | ConditionDefined$ ParentTarget | ConditionPresent$ Land | Defined$ ParentTarget | Types$ Island | Duration$ Permanent | IsCurse$ True
 SVar:HasAttackEffect:TRUE
diff --git a/forge-gui/res/cardsfolder/t/the_gold_saucer.txt b/forge-gui/res/cardsfolder/t/the_gold_saucer.txt
index cb385f67d36..498e3de4eea 100644
--- a/forge-gui/res/cardsfolder/t/the_gold_saucer.txt
+++ b/forge-gui/res/cardsfolder/t/the_gold_saucer.txt
@@ -2,7 +2,7 @@ Name:The Gold Saucer
 ManaCost:no cost
 Types:Land Town
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ FlipACoin | Cost$ 2 T | WinSubAbility$ DBToken | SpellDescription$ Flip a coin. If you win the flip, create a Treasure token.
+A:AB$ FlipACoin | Cost$ 2 T | WinSubAbility$ DBToken | AILogic$ AtOppEOT | SpellDescription$ Flip a coin. If you win the flip, create a Treasure token.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 A:AB$ Draw | Cost$ 3 T Sac<2/Artifact> | SpellDescription$ Draw a card.
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/t/the_jolly_balloon_man.txt b/forge-gui/res/cardsfolder/t/the_jolly_balloon_man.txt
index f5e3c3dbd97..3be7a9e9855 100644
--- a/forge-gui/res/cardsfolder/t/the_jolly_balloon_man.txt
+++ b/forge-gui/res/cardsfolder/t/the_jolly_balloon_man.txt
@@ -3,6 +3,6 @@ ManaCost:1 R W
 Types:Legendary Creature Human Clown
 PT:1/4
 K:Haste
-A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Creature & Balloon | AddColors$ Red | AddKeywords$ Flying & Haste | SorcerySpeed$ True | AtEOT$ Sacrifice | AILogic$ BeforeCombat | SpellDescription$ Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
+A:AB$ CopyPermanent | Cost$ 1 T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | SetPower$ 1 | SetToughness$ 1 | AddTypes$ Creature & Balloon | AddColors$ Red | AddKeywords$ Flying & Haste | SorcerySpeed$ True | AtEOT$ Sacrifice | SpellDescription$ Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
 SVar:UntapMe:True
 Oracle:Haste\n{1}, {T}: Create a token that's a copy of another target creature you control, except it's a 1/1 red Balloon creature in addition to its other colors and types and it has flying and haste. Sacrifice it at the beginning of the next end step. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/the_lost_and_the_damned.txt b/forge-gui/res/cardsfolder/t/the_lost_and_the_damned.txt
index 23f7d3498e7..9c7452b80fd 100644
--- a/forge-gui/res/cardsfolder/t/the_lost_and_the_damned.txt
+++ b/forge-gui/res/cardsfolder/t/the_lost_and_the_damned.txt
@@ -1,7 +1,7 @@
 Name:The Lost and the Damned
 ManaCost:1 U R
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Graveyard,Exile,Command,Library | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a land you control enters from anywhere other than your hand or you cast a spell from anywhere other than your hand, create 3/3 red Spawn creature token.
+T:Mode$ ChangesZone | ExcludedOrigins$ Hand | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a land you control enters from anywhere other than your hand or you cast a spell from anywhere other than your hand, create 3/3 red Spawn creature token.
 T:Mode$ SpellCast | ValidCard$ Card.!wasCastFromYourHand | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever a land you control enters from anywhere other than your hand or you cast a spell from anywhere other than your hand, create 3/3 red Spawn creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ r_3_3_spawn
 DeckHas:Ability$Token & Type$Spawn
diff --git a/forge-gui/res/cardsfolder/upcoming/the_mary_janes.txt b/forge-gui/res/cardsfolder/t/the_mary_janes.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_mary_janes.txt
rename to forge-gui/res/cardsfolder/t/the_mary_janes.txt
diff --git a/forge-gui/res/cardsfolder/t/the_necrobloom.txt b/forge-gui/res/cardsfolder/t/the_necrobloom.txt
index b615362e816..bc8fc3cf677 100644
--- a/forge-gui/res/cardsfolder/t/the_necrobloom.txt
+++ b/forge-gui/res/cardsfolder/t/the_necrobloom.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.Y
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE7 | TrueSubAbility$ DBZombie | FalseSubAbility$ DBPlant
 SVar:DBPlant:DB$ Token | TokenAmount$ 1 | TokenScript$ g_0_1_plant | TokenOwner$ You
 SVar:DBZombie:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You
-SVar:X:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield
+SVar:X:Count$Valid Land.YouCtrl$DifferentCardNames
 S:Mode$ Continuous | AffectedZone$ Graveyard | Affected$ Land.YouOwn | AddKeyword$ Dredge:2 | Description$ Land cards in your graveyard have dredge 2. (You may return a land card from your graveyard to your hand and mill two cards instead of drawing a card.)
 DeckHas:Ability$Token & Type$Zombie
 DeckHints:Ability$Mill
diff --git a/forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt b/forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt
index 799cff950ce..1306042cd6a 100644
--- a/forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt
+++ b/forge-gui/res/cardsfolder/t/the_pride_of_hull_clade.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Crocodile Elk Turtle
 PT:2/15
 K:Defender
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {X} less to cast, where X is the total toughness of creatures you control.
-SVar:X:Count$Valid Creature.YouCtrl$SumToughness
+SVar:X:Count$Valid Creature.YouCtrl$CardToughness
 A:AB$ Pump | Cost$ 2 U U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | SubAbility$ DBEffect | SpellDescription$ Until end of turn, target creature you control gets +1/+0, gains "Whenever this creature deals combat damage to a player, draw cards equal to its toughness," and can attack as though it didn't have defender.
 SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | Triggers$ TrigDamage | StaticAbilities$ CanAttack | ForgetOnMoved$ Battlefield | SubAbility$ DBAnimate
 SVar:CanAttack:Mode$ CanAttackDefender | ValidCard$ Card.IsRemembered | Description$ CARDNAME can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt b/forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt
index 055e8b8fba4..01ddf906825 100644
--- a/forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt
+++ b/forge-gui/res/cardsfolder/t/the_reaver_cleaver.txt
@@ -2,8 +2,8 @@ Name:The Reaver Cleaver
 ManaCost:2 R
 Types:Legendary Artifact Equipment
 K:Equip:3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Description$ Equipped creature gets +1/+1 and has trample.
-T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player,Planeswalker | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, create that many Treasure tokens.
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | AddTrigger$ TrigDamageDone | Description$ Equipped creature gets +1/+1 and has trample and "Whenever this creature deals combat damage to a player or planeswalker, create that many Treasure tokens."
+SVar:TrigDamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | CombatDamage$ True | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, create that many Treasure tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 SVar:X:TriggerCount$DamageAmount
 DeckHas:Ability$Token & Type$Treasure|Artifact
diff --git a/forge-gui/res/cardsfolder/upcoming/the_rise_of_sozin_fire_lord_sozin.txt b/forge-gui/res/cardsfolder/t/the_rise_of_sozin_fire_lord_sozin.txt
similarity index 87%
rename from forge-gui/res/cardsfolder/upcoming/the_rise_of_sozin_fire_lord_sozin.txt
rename to forge-gui/res/cardsfolder/t/the_rise_of_sozin_fire_lord_sozin.txt
index 680c2cf38a8..5c28f921a82 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_rise_of_sozin_fire_lord_sozin.txt
+++ b/forge-gui/res/cardsfolder/t/the_rise_of_sozin_fire_lord_sozin.txt
@@ -8,7 +8,8 @@ SVar:DBExile:DB$ ChangeZone | ValidTgts$ Opponent | ChangeType$ Card.NamedCard |
 SVar:DBTransform:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SpellDescription$ Exile this Saga, then return it to the battlefield transformed under your control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle: (As this Saga enters and after your draw step, add a lore counter.)\nI — Destroy all creatures.\nII — Choose a card name. Search target opponent's graveyard, hand, and library for up to four cards with that name and exile them. Then that player shuffles.\nIII — Exile this Saga, then return it to the battlefield transformed under your control.
+AlternateMode:DoubleFaced
+Oracle:(As this Saga enters and after your draw step, add a lore counter.)\nI — Destroy all creatures.\nII — Choose a card name. Search target opponent's graveyard, hand, and library for up to four cards with that name and exile them. Then that player shuffles.\nIII — Exile this Saga, then return it to the battlefield transformed under your control.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/t/the_soul_stone.txt b/forge-gui/res/cardsfolder/t/the_soul_stone.txt
new file mode 100644
index 00000000000..bda18d419c7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/the_soul_stone.txt
@@ -0,0 +1,11 @@
+Name:The Soul Stone
+ManaCost:1 B
+Types:Legendary Artifact Infinity Stone
+K:Indestructible
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
+A:AB$ AlterAttribute | Cost$ 6 B T Exile<1/Creature> | Defined$ Self | Attributes$ Harnessed | StackDescription$ SpellDescription | SpellDescription$ Harness CARDNAME. (Once harnessed, its ∞ ability is active.)
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self+harnessed | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ ∞ — At the beginning of your upkeep, return target creature card from your graveyard to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Battlefield
+SVar:PlayMain1:TRUE
+DeckHints:Ability$Graveyard
+Oracle:Indestructible\n{T}: Add {B}.\n{6}{B}, {T}, Exile a creature you control: Harness The Soul Stone. (Once harnessed, its ∞ ability is active.)\n∞ — At the beginning of your upkeep, return target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/t/the_spot_living_portal.txt b/forge-gui/res/cardsfolder/t/the_spot_living_portal.txt
new file mode 100644
index 00000000000..307691abbcf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/the_spot_living_portal.txt
@@ -0,0 +1,13 @@
+Name:The Spot, Living Portal
+ManaCost:3 W B
+Types:Legendary Creature Human Scientist Villain
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMarkBattlefield | TriggerDescription$ When NICKNAME enters, exile up to one target nonland permanent and up to one target nonland permanent card from a graveyard.
+SVar:TrigMarkBattlefield:DB$ Pump | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select up to one target nonland permanent | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBMarkGraveyard
+SVar:DBMarkGraveyard:DB$ Pump | ValidTgts$ Permanent.nonLand | TgtZone$ Graveyard | TgtPrompt$ Select up to one target nonland permanent card in a graveyard | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield,Graveyard | Destination$ Exile | Defined$ Targeted
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When NICKNAME dies, put him on the bottom of his owner's library. If you do, return the exiled cards to their owners' hands.
+SVar:TrigChangeZone:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | RememberChanged$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ ExiledWith | Origin$ Exile | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:When The Spot enters, exile up to one target nonland permanent and up to one target nonland permanent card from a graveyard.\nWhen The Spot dies, put him on the bottom of his owner's library. If you do, return the exiled cards to their owners' hands.
diff --git a/forge-gui/res/cardsfolder/t/the_spots_portal.txt b/forge-gui/res/cardsfolder/t/the_spots_portal.txt
new file mode 100644
index 00000000000..791097550b8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/the_spots_portal.txt
@@ -0,0 +1,6 @@
+Name:The Spot's Portal
+ManaCost:2 B
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SubAbility$ DBLoseLife | SpellDescription$ Put target creature on the bottom of its owner's library. You lose 2 life unless you control a Villain.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 2 | ConditionPresent$ Villain.YouCtrl | ConditionCompare$ EQ0
+Oracle:Put target creature on the bottom of its owner's library. You lose 2 life unless you control a Villain.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_terror_of_serpents_pass.txt b/forge-gui/res/cardsfolder/t/the_terror_of_serpents_pass.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/the_terror_of_serpents_pass.txt
rename to forge-gui/res/cardsfolder/t/the_terror_of_serpents_pass.txt
diff --git a/forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt b/forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt
index 2a591a67fa3..d05ba70ac3e 100644
--- a/forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt
+++ b/forge-gui/res/cardsfolder/t/the_weatherseed_treaty.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Enchantment Saga
 K:Read ahead
 K:Chapter:3:DBChangeZone,DBToken,DBDomain
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle.
 SVar:DBToken:DB$ Token | TokenScript$ g_1_1_saproling | SpellDescription$ Create a 1/1 green Saproling creature token.
 SVar:DBDomain:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ +X | NumDef$ +X | KW$ Trample | TgtPrompt$ Select target creature you control | SpellDescription$ Domain — Target creature you control gets +X/+X and gains trample until end of turn, where X is the number of basic land types among lands you control.
 SVar:X:Count$Domain
diff --git a/forge-gui/res/cardsfolder/t/themberchaud.txt b/forge-gui/res/cardsfolder/t/themberchaud.txt
index b2911e5fe24..b4f02da2d45 100644
--- a/forge-gui/res/cardsfolder/t/themberchaud.txt
+++ b/forge-gui/res/cardsfolder/t/themberchaud.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Dragon
 PT:5/5
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAllNonFlyers | TriggerDescription$ When CARDNAME enters, he deals X damage to each other creature without flying and each player, where X is the number of Mountains you control.
-SVar:TrigDamageAllNonFlyers:DB$ DamageAll | NumDmg$ X | ValidCards$ Creature.Other+withoutFlying | ValidPlayers$ Player | ValidDescription$ each other creature without flying and each player
+SVar:TrigDamageAllNonFlyers:DB$ DamageAll | NumDmg$ X | ValidCards$ Creature.Other+withoutFlying | ValidPlayers$ Player
 S:Mode$ OptionalAttackCost | ValidCard$ Card.Self | Trigger$ TrigPump | Cost$ Exert<1/CARDNAME> | Description$ You may exert CARDNAME as it attacks. When you do, he gains flying until end of turn. (An exerted creature won't untap during your next untap step.)
 SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Flying | SpellDescription$ When you do, he gains flying until end of turn.
 SVar:X:Count$Valid Mountain.YouCtrl
diff --git a/forge-gui/res/cardsfolder/t/thendar_the_overminer.txt b/forge-gui/res/cardsfolder/t/thendar_the_overminer.txt
new file mode 100644
index 00000000000..653940df65d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/thendar_the_overminer.txt
@@ -0,0 +1,10 @@
+Name:Thendar, the Overminer
+ManaCost:2 R R
+Types:Legendary Creature Kavu Pirate
+PT:4/4
+K:Menace
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Land.nonBasic | Execute$ TrigConjure | TriggerDescription$ Whenever a nonbasic land is put into a graveyard from the battlefield, its controller conjures a card named Wastes onto the battlefield tapped.
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Defined$ TriggeredCardController | Name$ Wastes | Zone$ Battlefield | Tapped$ True
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+tapped | PresentCompare$ GE2 | Execute$ TrigDestroy | TriggerDescription$ At the beginning of your end step, if you control two or more tapped creatures, destroy up to one target nonbasic land.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select up to one target nonbasic land | TargetMin$ 0 | TargetMax$ 1
+Oracle:Menace\nWhenever a nonbasic land is put into a graveyard from the battlefield, its controller conjures a card named Wastes onto the battlefield tapped.\nAt the beginning of your end step, if you control two or more tapped creatures, destroy up to one target nonbasic land.
diff --git a/forge-gui/res/cardsfolder/t/they_went_this_way.txt b/forge-gui/res/cardsfolder/t/they_went_this_way.txt
index 04937564b6a..0a881c5d54e 100644
--- a/forge-gui/res/cardsfolder/t/they_went_this_way.txt
+++ b/forge-gui/res/cardsfolder/t/they_went_this_way.txt
@@ -1,7 +1,7 @@
 Name:They Went This Way
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | SubAbility$ DBInvestigate | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | SubAbility$ DBInvestigate | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:DBInvestigate:DB$ Investigate | SpellDescription$ Investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
 DeckHas:Ability$Investigate|Token|Sacrifice & Type$Artifact|Clue
 Oracle:Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. Investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/t/thicket_elemental.txt b/forge-gui/res/cardsfolder/t/thicket_elemental.txt
index 25f9fd86c4e..9f6ac5420cc 100644
--- a/forge-gui/res/cardsfolder/t/thicket_elemental.txt
+++ b/forge-gui/res/cardsfolder/t/thicket_elemental.txt
@@ -4,5 +4,5 @@ Types:Creature Elemental
 PT:4/4
 K:Kicker:1 G
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ ThicketKicker | TriggerDescription$ When CARDNAME enters, if it was kicked, you may reveal cards from the top of your library until you reveal a creature card. If you do, put that card onto the battlefield and shuffle all other cards revealed this way into your library.
-SVar:ThicketKicker:DB$ DigUntil | Valid$ Creature | ValidDescription$ creature card | FoundDestination$ Battlefield | OptionalDecider$ You | RevealedDestination$ Library | Shuffle$ True
+SVar:ThicketKicker:DB$ DigUntil | Valid$ Creature | ValidDescription$ creature card | FoundDestination$ Battlefield | Optional$ True | RevealedDestination$ Library | Shuffle$ True
 Oracle:Kicker {1}{G} (You may pay an additional {1}{G} as you cast this spell.)\nWhen Thicket Elemental enters, if it was kicked, you may reveal cards from the top of your library until you reveal a creature card. If you do, put that card onto the battlefield and shuffle all other cards revealed this way into your library.
diff --git a/forge-gui/res/cardsfolder/t/thief_of_blood.txt b/forge-gui/res/cardsfolder/t/thief_of_blood.txt
index 7a5c5ec2e17..aa08652abed 100644
--- a/forge-gui/res/cardsfolder/t/thief_of_blood.txt
+++ b/forge-gui/res/cardsfolder/t/thief_of_blood.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 PT:1/1
 K:Flying
 K:ETBReplacement:Other:DBRemoveCounterAll
-SVar:DBRemoveCounterAll:DB$ RemoveCounterAll | ValidCards$ Permanent | AllCounterTypes$ True | StackDescription$ SpellDescription | SubAbility$ DBPutCounters | RememberAmount$ True | SpellDescription$ As CARDNAME enters, remove all counters from all permanents. CARDNAME enters with a +1/+1 counter on it for each counter removed this way.
+SVar:DBRemoveCounterAll:DB$ RemoveCounter | Defined$ Valid Permanent | CounterType$ All | SubAbility$ DBPutCounters | RememberAmount$ True | SpellDescription$ As CARDNAME enters, remove all counters from all permanents. CARDNAME enters with a +1/+1 counter on it for each counter removed this way.
 SVar:DBPutCounters:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedNumber
diff --git a/forge-gui/res/cardsfolder/t/thirsting_roots.txt b/forge-gui/res/cardsfolder/t/thirsting_roots.txt
index fa43cdfcec3..32e27b9afe4 100644
--- a/forge-gui/res/cardsfolder/t/thirsting_roots.txt
+++ b/forge-gui/res/cardsfolder/t/thirsting_roots.txt
@@ -2,7 +2,7 @@ Name:Thirsting Roots
 ManaCost:G
 Types:Sorcery
 A:SP$ Charm | Choices$ DBSearch,DBProliferate | CharmNum$ 1
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:DBProliferate:DB$ Proliferate | SpellDescription$ Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
 DeckHas:Ability$Proliferate
 Oracle:Choose one —\n• Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n• Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
diff --git a/forge-gui/res/cardsfolder/t/thought_rattle.txt b/forge-gui/res/cardsfolder/t/thought_rattle.txt
index 8af517e492f..0163fff68c8 100644
--- a/forge-gui/res/cardsfolder/t/thought_rattle.txt
+++ b/forge-gui/res/cardsfolder/t/thought_rattle.txt
@@ -1,10 +1,12 @@
 Name:Thought Rattle
 ManaCost:U B
 Types:Sorcery
-A:SP$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBExile | StackDescription$ REP Target opponent_{p:Targeted} & You choose_{p:You} chooses & Exile_{p:You} exiles & your graveyard_{p:You}'s graveyard & seek_they seek | SpellDescription$ Target opponent reveals each nonland card in their hand. You choose one of those cards. Exile that card. Threshold — If there are seven or more cards in your graveyard, seek a Rat card. It perpetually gains "This spell costs {1} less to cast."
+A:SP$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBExile | StackDescription$ REP Target opponent_{p:Targeted} & You choose_{p:You} chooses & Exile_{p:You} exiles & your graveyard_{p:You}'s graveyard & seek_they seek | SpellDescription$ Target opponent reveals each nonland card in their hand. You choose one of those cards. Exile that card. Threshold — If there are seven or more cards in your graveyard, seek a Rat card. It perpetually gains "This spell costs {1} less to cast." You gain 1 life for each Rat card in your hand.
 SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand | ChangeTypeDesc$ nonland card | Mandatory$ True | SubAbility$ DBClearRemembered | StackDescription$ None
 SVar:DBClearRemembered:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBSeek
 SVar:DBSeek:DB$ Seek | Condition$ Threshold | Num$ 1 | Type$ Rat | RememberFound$ True | SubAbility$ DBAnimate | StackDescription$ None
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ ReduceCost | Duration$ Perpetual | StackDescription$ None
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ ReduceCost | Duration$ Perpetual | StackDescription$ None | SubAbility$ DBGainLife
 SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
-Oracle:Target opponent reveals each nonland card in their hand. You choose one of those cards. Exile that card.\nThreshold — If there are seven or more cards in your graveyard, seek a Rat card. It perpetually gains "This spell costs {1} less to cast."
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ X
+SVar:X:Count$ValidHand Card.YouOwn+Rat
+Oracle:Target opponent reveals each nonland card in their hand. You choose one of those cards. Exile that card.\nThreshold — If there are seven or more cards in your graveyard, seek a Rat card. It perpetually gains "This spell costs {1} less to cast."\nYou gain 1 life for each Rat card in your hand.
diff --git a/forge-gui/res/cardsfolder/t/threats_around_every_corner.txt b/forge-gui/res/cardsfolder/t/threats_around_every_corner.txt
index 7225071fc54..139fa1931f6 100644
--- a/forge-gui/res/cardsfolder/t/threats_around_every_corner.txt
+++ b/forge-gui/res/cardsfolder/t/threats_around_every_corner.txt
@@ -4,5 +4,5 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDread | TriggerDescription$ When CARDNAME enters, manifest dread.
 SVar:TrigDread:DB$ ManifestDread
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.faceDown+YouCtrl | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ Whenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:When Threats Around Every Corner enters, manifest dread.\nWhenever a face-down permanent you control enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt b/forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt
index 53b55eaa654..cb9133f70c2 100644
--- a/forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt
+++ b/forge-gui/res/cardsfolder/t/thrun_breaker_of_silence.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Troll Shaman
 PT:5/5
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
 K:Trample
-S:Mode$ CantTarget | ValidCard$ Card.Self | ValidSource$ Card.nonGreen+OppCtrl | Description$ CARDNAME can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | ValidSource$ Card.nonGreen+OppCtrl | Description$ CARDNAME can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control.
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ During your turn, NICKNAME has indestructible.
 Oracle:This spell can't be countered.\nTrample\nThrun, Breaker of Silence can't be the target of nongreen spells your opponents control or abilities from nongreen sources your opponents control.\nDuring your turn, Thrun has indestructible.
diff --git a/forge-gui/res/cardsfolder/t/thunderherd_migration.txt b/forge-gui/res/cardsfolder/t/thunderherd_migration.txt
index ff46f48b8c1..6bce7b88b9d 100644
--- a/forge-gui/res/cardsfolder/t/thunderherd_migration.txt
+++ b/forge-gui/res/cardsfolder/t/thunderherd_migration.txt
@@ -2,5 +2,5 @@ Name:Thunderherd Migration
 ManaCost:1 G
 Types:Sorcery
 K:AlternateAdditionalCost:Reveal<1/Dinosaur>:1
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | StackDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | StackDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:As an additional cost to cast this spell, reveal a Dinosaur card from your hand or pay {1}.\nSearch your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt b/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
index dc442c80b8a..23552a6ea0b 100644
--- a/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
+++ b/forge-gui/res/cardsfolder/t/thundermaw_hellkite.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Flying
 K:Haste
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ThunderDamage | TriggerDescription$ When CARDNAME enters, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
-SVar:ThunderDamage:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control | SubAbility$ ThunderTap
-SVar:ThunderTap:DB$ TapAll | ValidCards$ Creature.withFlying+OppCtrl | ValidDescription$ each creature with flying you don't control
+SVar:ThunderDamage:DB$ DamageAll | NumDmg$ 1 | ValidCards$ Creature.withFlying+OppCtrl | SubAbility$ ThunderTap
+SVar:ThunderTap:DB$ TapAll | ValidCards$ Creature.withFlying+OppCtrl
 Oracle:Flying\nHaste (This creature can attack and {T} as soon as it comes under your control.)\nWhen Thundermaw Hellkite enters, it deals 1 damage to each creature with flying your opponents control. Tap those creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/thwip.txt b/forge-gui/res/cardsfolder/t/thwip.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/thwip.txt
rename to forge-gui/res/cardsfolder/t/thwip.txt
diff --git a/forge-gui/res/cardsfolder/t/tiamat.txt b/forge-gui/res/cardsfolder/t/tiamat.txt
index 70850d10e36..500ae7cf09e 100644
--- a/forge-gui/res/cardsfolder/t/tiamat.txt
+++ b/forge-gui/res/cardsfolder/t/tiamat.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Dragon God
 PT:7/7
 K:Flying
 T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, if you cast it, search your library for up to five Dragon cards not named Tiamat that each have different names, reveal them, put them into your hand, then shuffle.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Dragon.notnamedTiamat | ChangeNum$ 5 | DifferentNames$ True
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Dragon.!namedTiamat | ChangeNum$ 5 | DifferentNames$ True
 DeckNeeds:Type$Dragon
 Oracle:Flying\nWhen Tiamat enters, if you cast it, search your library for up to five Dragon cards not named Tiamat that each have different names, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/tiger_tribe_hunter.txt b/forge-gui/res/cardsfolder/t/tiger_tribe_hunter.txt
index 3c41872f15a..165f60f22ca 100644
--- a/forge-gui/res/cardsfolder/t/tiger_tribe_hunter.txt
+++ b/forge-gui/res/cardsfolder/t/tiger_tribe_hunter.txt
@@ -7,6 +7,6 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigImmediate | TriggerZones$
 SVar:TrigImmediate:AB$ ImmediateTrigger | Cost$ Sac<1/Creature.Other/another creature> | RememberObjects$ Sacrificed | Execute$ TrigDamage | TriggerDescription$ If you do, CARDNAME deals damage equal to the sacrificed creature's power to target creature.
 SVar:TrigDamage:DB$ DealDamage | ConditionDefined$ DelayTriggerRememberedLKI | ValidTgts$ Creature | NumDmg$ X
 SVar:X:TriggerRemembered$CardPower
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 DeckHas:Ability$Sacrifice
 Oracle:Trample\nPack tactics — Whenever Tiger-Tribe Hunter attacks, if you attacked with creatures with total power 6 or greater this combat, you may sacrifice another creature. When you do, Tiger-Tribe Hunter deals damage equal to the sacrificed creature's power to target creature.
diff --git a/forge-gui/res/cardsfolder/t/time_of_need.txt b/forge-gui/res/cardsfolder/t/time_of_need.txt
index b7bb4760c26..5b90a7b7381 100644
--- a/forge-gui/res/cardsfolder/t/time_of_need.txt
+++ b/forge-gui/res/cardsfolder/t/time_of_need.txt
@@ -1,7 +1,7 @@
 Name:Time of Need
 ManaCost:1 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Legendary | ChangeNum$ 1 | SpellDescription$ Search your library for a legendary creature card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Legendary | ChangeTypeDesc$ legendary creature | SpellDescription$ Search your library for a legendary creature card, reveal it, put it into your hand, then shuffle.
 AI:RemoveDeck:Random
 DeckHints:Type$Legendary
 Oracle:Search your library for a legendary creature card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/tinker.txt b/forge-gui/res/cardsfolder/t/tinker.txt
index 6f09b31821b..c521cec5abc 100644
--- a/forge-gui/res/cardsfolder/t/tinker.txt
+++ b/forge-gui/res/cardsfolder/t/tinker.txt
@@ -3,5 +3,5 @@ ManaCost:2 U
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 U Sac<1/Artifact> | Origin$ Library | Destination$ Battlefield | ChangeType$ Artifact | ChangeNum$ 1 | SpellDescription$ Search your library for an artifact card, put that card onto the battlefield, then shuffle.
 AI:RemoveDeck:Random
-SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ0+nonLegendary+notnamedMox Pearl+notnamedMox Sapphire+notnamedMox Ruby+notnamedMox Emerald+notnamedMox Jet+notnamedBlack Lotus+notnamedLotus Petal,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3
+SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ0+nonLegendary+!namedMox Pearl+!namedMox Sapphire+!namedMox Ruby+!namedMox Emerald+!namedMox Jet+!namedBlack Lotus+!namedLotus Petal,Artifact.cmcEQ1,Artifact.cmcEQ2,Artifact.cmcEQ3
 Oracle:As an additional cost to cast this spell, sacrifice an artifact.\nSearch your library for an artifact card, put that card onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt b/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
index ee9a9c52e0e..bf8991d88c2 100644
--- a/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
+++ b/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
@@ -3,8 +3,8 @@ ManaCost:1 G G
 Types:Legendary Creature Elemental
 PT:3/4
 K:Reach
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigLifegain | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, you gain 2 life.
-SVar:TrigLifegain:DB$ GainLife | LifeAmount$ 2
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, you gain 2 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
 T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE4 | IsPresent$ Card.Self+YouCtrl+YouOwn | IsPresent2$ Land.YouCtrl+YouOwn+namedArgoth; Sanctum of Nature | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if there are four or more land cards in your graveyard and you both own and control CARDNAME and a land named Argoth, Sanctum of Nature, exile them, then meld them into Titania, Gaea Incarnate.
 SVar:Meld:DB$ Meld | Name$ Titania, Gaea Incarnate | Primary$ Titania, Voice of Gaea | Secondary$ Argoth, Sanctum of Nature | SecondaryType$ Land
 SVar:X:Count$ValidGraveyard Land.YouOwn
diff --git a/forge-gui/res/cardsfolder/t/tithe_taker.txt b/forge-gui/res/cardsfolder/t/tithe_taker.txt
index 1f4f33dae51..f5bccde22da 100644
--- a/forge-gui/res/cardsfolder/t/tithe_taker.txt
+++ b/forge-gui/res/cardsfolder/t/tithe_taker.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Creature Human Soldier
 PT:2/1
 K:Afterlife:1
-S:Mode$ RaiseCost | ValidCard$ Card | Activator$ Opponent | ValidSpell$ Spell,Activated.nonManaAbility | Amount$ 1 | Condition$ PlayerTurn | Description$ During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities.
+S:Mode$ RaiseCost | ValidCard$ Card | Activator$ Opponent | ValidSpell$ Spell,Activated.!ManaAbility | Amount$ 1 | Condition$ PlayerTurn | Description$ During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities.
 DeckHas:Ability$Token
 Oracle:During your turn, spells your opponents cast cost {1} more to cast and abilities your opponents activate cost {1} more to activate unless they're mana abilities.\nAfterlife 1 (When this creature dies, create a 1/1 white and black Spirit creature token with flying.)
diff --git a/forge-gui/res/cardsfolder/t/tomb_of_horrors_adventurer.txt b/forge-gui/res/cardsfolder/t/tomb_of_horrors_adventurer.txt
index af5eafc2d13..96b5c6982b1 100644
--- a/forge-gui/res/cardsfolder/t/tomb_of_horrors_adventurer.txt
+++ b/forge-gui/res/cardsfolder/t/tomb_of_horrors_adventurer.txt
@@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigInitiative:DB$ TakeInitiative
 T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | ActivatorThisTurnCast$ EQ2 | ValidActivatingPlayer$ You | TriggerDescription$ Whenever you cast your second spell each turn, copy it. If you've completed a dungeon, copy that spell twice instead. You may choose new targets for the copies. (A copy of a permanent spell becomes a token.)
 SVar:TrigCopy:DB$ CopySpellAbility | Amount$ Y | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 SVar:Y:Count$Compare X GE1.2.1
 DeckHas:Ability$Token
 Oracle:When Tomb of Horrors Adventurer enters, you take the initiative.\nWhenever you cast your second spell each turn, copy it. If you've completed a dungeon, copy that spell twice instead. You may choose new targets for the copies. (A copy of a permanent spell becomes a token.)
diff --git a/forge-gui/res/cardsfolder/upcoming/tombstone_career_criminal.txt b/forge-gui/res/cardsfolder/t/tombstone_career_criminal.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tombstone_career_criminal.txt
rename to forge-gui/res/cardsfolder/t/tombstone_career_criminal.txt
diff --git a/forge-gui/res/cardsfolder/t/tomik_distinguished_advokist.txt b/forge-gui/res/cardsfolder/t/tomik_distinguished_advokist.txt
index d3b1b2c154d..1b9ae85d535 100644
--- a/forge-gui/res/cardsfolder/t/tomik_distinguished_advokist.txt
+++ b/forge-gui/res/cardsfolder/t/tomik_distinguished_advokist.txt
@@ -3,6 +3,6 @@ ManaCost:W W
 Types:Legendary Creature Human Advisor
 PT:2/3
 K:Flying
-S:Mode$ CantTarget | AffectedZone$ Battlefield,Graveyard | ValidCard$ Land | Activator$ Opponent | Description$ Lands on the battlefield and land cards in graveyards can't be the targets of spells or abilities your opponents control.
+S:Mode$ CantTarget | ValidTarget$ Land | AffectedZone$ Battlefield,Graveyard | Activator$ Opponent | Description$ Lands on the battlefield and land cards in graveyards can't be the targets of spells or abilities your opponents control.
 S:Mode$ CantPlayLand | ValidCard$ Land | Player$ Opponent | Origin$ Graveyard | Description$ Your opponents can't play land cards from graveyards.
 Oracle:Flying\nLands on the battlefield and land cards in graveyards can't be the targets of spells or abilities your opponents control.\nYour opponents can't play land cards from graveyards.
diff --git a/forge-gui/res/cardsfolder/upcoming/toph_the_blind_bandit.txt b/forge-gui/res/cardsfolder/t/toph_the_blind_bandit.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/toph_the_blind_bandit.txt
rename to forge-gui/res/cardsfolder/t/toph_the_blind_bandit.txt
index 8e47200f006..285d343ae23 100644
--- a/forge-gui/res/cardsfolder/upcoming/toph_the_blind_bandit.txt
+++ b/forge-gui/res/cardsfolder/t/toph_the_blind_bandit.txt
@@ -7,4 +7,4 @@ SVar:TrigEarthbend:DB$ Earthbend | Num$ 2
 S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | Description$ NICKNAME's power is equal to the number of +1/+1 counters on lands you control.
 SVar:X:Count$Valid Land.YouCtrl$CardCounters.P1P1
 DeckHas:Ability$Counters
-Oracle:When Toph enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nToph's power is equal to the number of +1/+1 counters on lands you control.
\ No newline at end of file
+Oracle:When Toph enters, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)\nToph's power is equal to the number of +1/+1 counters on lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/toph_the_first_metalbender.txt b/forge-gui/res/cardsfolder/t/toph_the_first_metalbender.txt
similarity index 96%
rename from forge-gui/res/cardsfolder/upcoming/toph_the_first_metalbender.txt
rename to forge-gui/res/cardsfolder/t/toph_the_first_metalbender.txt
index 4500e47bb67..f2a3cba7f80 100644
--- a/forge-gui/res/cardsfolder/upcoming/toph_the_first_metalbender.txt
+++ b/forge-gui/res/cardsfolder/t/toph_the_first_metalbender.txt
@@ -6,4 +6,4 @@ S:Mode$ Continuous | Affected$ Artifact.!token+YouCtrl | AddType$ Land | Descrip
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigEarthbend | TriggerDescription$ At the beginning of your end step, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
 SVar:TrigEarthbend:DB$ Earthbend | Num$ 2
 DeckHas:Ability$Counters
-Oracle:Nontoken artifacts you control are lands in addition to their other types. (They don't gain the ability to {T} for mana.)\nAt the beginning of your end step, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
\ No newline at end of file
+Oracle:Nontoken artifacts you control are lands in addition to their other types. (They don't gain the ability to {T} for mana.)\nAt the beginning of your end step, earthbend 2. (Target land you control becomes a 0/0 creature with haste that's still a land. Put two +1/+1 counters on it. When it dies or is exiled, return it to the battlefield tapped.)
diff --git a/forge-gui/res/cardsfolder/t/topiary_stomper.txt b/forge-gui/res/cardsfolder/t/topiary_stomper.txt
index efea016190b..427c1b6c000 100644
--- a/forge-gui/res/cardsfolder/t/topiary_stomper.txt
+++ b/forge-gui/res/cardsfolder/t/topiary_stomper.txt
@@ -4,7 +4,7 @@ Types:Creature Plant Dinosaur
 PT:4/4
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True
 S:Mode$ CantAttack,CantBlock | ValidCard$ Card.Self | IsPresent$ Land.YouCtrl | PresentCompare$ LT7 | Description$ CARDNAME can't attack or block unless you control seven or more lands.
 SVar:BuffedBy:Land
 Oracle:Vigilance\nWhen Topiary Stomper enters, search your library for a basic land card, put it onto the battlefield tapped, then shuffle.\nTopiary Stomper can't attack or block unless you control seven or more lands.
diff --git a/forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt b/forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt
index e4b00532551..37b2bd7c1cf 100644
--- a/forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt
+++ b/forge-gui/res/cardsfolder/t/toralf_god_of_fury_toralfs_hammer.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature God
 PT:5/4
 K:Trample
 T:Mode$ ExcessDamage | ValidTarget$ Creature.OppCtrl,Planeswalker.OppCtrl | CombatDamage$ False | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature or planeswalker an opponent controls is dealt excess noncombat damage, NICKNAME deals damage equal to the excess to any target other than that permanent.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.NotTriggeredTarget,Player,Planeswalker.NotTriggeredTarget | TgtPrompt$ Select any target | NumDmg$ X
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.!TriggeredTarget,Player,Planeswalker.!TriggeredTarget | TgtPrompt$ Select any target | NumDmg$ X
 SVar:X:TriggerCount$DamageAmount
 AlternateMode:Modal
 Oracle:Trample\nWhenever a creature or planeswalker an opponent controls is dealt excess noncombat damage, Toralf deals damage equal to the excess to any target other than that permanent.
diff --git a/forge-gui/res/cardsfolder/t/total_war.txt b/forge-gui/res/cardsfolder/t/total_war.txt
index 8f02f7cd756..1e3f9e89bb0 100644
--- a/forge-gui/res/cardsfolder/t/total_war.txt
+++ b/forge-gui/res/cardsfolder/t/total_war.txt
@@ -2,7 +2,7 @@ Name:Total War
 ManaCost:3 R
 Types:Enchantment
 T:Mode$ AttackersDeclared | Execute$ TrigDestroy | TriggerZones$ Battlefield | AttackingPlayer$ Player | TriggerDescription$ Whenever a player attacks with one or more creatures, destroy all untapped non-Wall creatures that player controls that didn't attack, except for creatures the player hasn't controlled continuously since the beginning of the turn.
-SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.nonWall+!firstTurnControlled+untapped+ActivePlayerCtrl+notattacking
+SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.nonWall+!firstTurnControlled+untapped+ActivePlayerCtrl+!attacking
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 Oracle:Whenever a player attacks with one or more creatures, destroy all untapped non-Wall creatures that player controls that didn't attack, except for creatures the player hasn't controlled continuously since the beginning of the turn.
diff --git a/forge-gui/res/cardsfolder/t/towering_titan.txt b/forge-gui/res/cardsfolder/t/towering_titan.txt
index c7e8a0ea5b6..a6e0610edf4 100644
--- a/forge-gui/res/cardsfolder/t/towering_titan.txt
+++ b/forge-gui/res/cardsfolder/t/towering_titan.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Creature Giant
 PT:0/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters with X +1/+1 counters on it, where X is the total toughness of other creatures you control.
-SVar:X:Count$Valid Creature.Other+YouCtrl$SumToughness
+SVar:X:Count$Valid Creature.Other+YouCtrl$CardToughness
 A:AB$ PumpAll | Cost$ Sac<1/Creature.withDefender/creature with defender> | ValidCards$ Creature | KW$ Trample | SpellDescription$ All creatures gain trample until end of turn.
 SVar:NeedsToPlayVar:Z GE3
 SVar:Z:Count$Valid Creature.YouCtrl+toughnessGE2
diff --git a/forge-gui/res/cardsfolder/t/trail_of_mystery.txt b/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
index 5bfa3a806a0..8130d559d29 100644
--- a/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
+++ b/forge-gui/res/cardsfolder/t/trail_of_mystery.txt
@@ -2,7 +2,7 @@ Name:Trail of Mystery
 ManaCost:1 G
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.faceDown+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever a face-down creature you control enters, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 T:Mode$ TurnFaceUp | ValidCard$ Permanent.Creature+YouCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever a permanent you control is turned face up, if it's a creature, it gets +2/+2 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCard | NumAtt$ +2 | NumDef$ +2 | ConditionDefined$ TriggeredCard | ConditionPresent$ Creature | ConditionCompare$ GE1
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/t/tranquil_landscape.txt b/forge-gui/res/cardsfolder/t/tranquil_landscape.txt
index c54d74eb18b..cad4c454115 100644
--- a/forge-gui/res/cardsfolder/t/tranquil_landscape.txt
+++ b/forge-gui/res/cardsfolder/t/tranquil_landscape.txt
@@ -2,6 +2,6 @@ Name:Tranquil Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Forest+Basic,Land.Plains+Basic,Land.Island+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Forest.Basic,Plains.Basic,Island.Basic | ChangeTypeDesc$ basic Forest, Plains, or Island | SpellDescription$ Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:G W U
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Tranquil Landscape: Search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle.\nCycling {G}{W}{U} ({G}{W}{U}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt b/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
index 680277fe296..4dfa65e6cbb 100644
--- a/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
+++ b/forge-gui/res/cardsfolder/t/transmogrifying_wand.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact
 K:etbCounter:CHARGE:3
 A:AB$ Destroy | Cost$ 1 T SubCounter<1/CHARGE> | ValidTgts$ Creature | AITgts$ BetterThanEvalRating.130 | TgtPrompt$ Select target creature | SorcerySpeed$ True | SubAbility$ OxToken | SpellDescription$ Destroy target creature.
-SVar:OxToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_4_ox | TokenOwner$ TargetedController | SpellDescription$ Its controller creates a 2/4 white Ox creature token. Activate only any time you could cast a sorcery.
+SVar:OxToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_4_ox | TokenOwner$ TargetedController | SpellDescription$ Its controller creates a 2/4 white Ox creature token. Activate only as a sorcery.
 Oracle:Transmogrifying Wand enters with three charge counters on it.\n{1}, {T}, Remove a charge counter from Transmogrifying Wand: Destroy target creature. Its controller creates a 2/4 white Ox creature token. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/trap_essence.txt b/forge-gui/res/cardsfolder/t/trap_essence.txt
index 26ae2c1706e..d763d7b5bb5 100644
--- a/forge-gui/res/cardsfolder/t/trap_essence.txt
+++ b/forge-gui/res/cardsfolder/t/trap_essence.txt
@@ -1,7 +1,7 @@
 Name:Trap Essence
 ManaCost:G U R
 Types:Instant
-A:SP$ Counter | TargetType$ Spell | ValidTgts$ Card.Creature | TgtPrompt$ Select target creature spell | SpellDescription$ Counter target creature spell. Put two +1/+1 counters on up to one target creature. | SubAbility$ DBPutcounter
-SVar:DBPutcounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | ValidTgts$ Creature
+A:SP$ Counter | TargetType$ Spell | ValidTgts$ Card.Creature | TgtPrompt$ Select target creature spell | SpellDescription$ Counter target creature spell. Put two +1/+1 counters on up to one target creature. | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | ValidTgts$ Creature
 DeckHas:Ability$Counters
 Oracle:Counter target creature spell. Put two +1/+1 counters on up to one target creature.
diff --git a/forge-gui/res/cardsfolder/t/travel_through_caradhras.txt b/forge-gui/res/cardsfolder/t/travel_through_caradhras.txt
index 4756dd5e1f5..3db5f1f5d95 100644
--- a/forge-gui/res/cardsfolder/t/travel_through_caradhras.txt
+++ b/forge-gui/res/cardsfolder/t/travel_through_caradhras.txt
@@ -2,7 +2,7 @@ Name:Travel Through Caradhras
 ManaCost:5 G
 Types:Sorcery
 A:SP$ Vote | Defined$ Player | Choices$ VoteRedhornPass,VoteMinesofMoria | StoreVoteNum$ True | SubAbility$ DBExile | SpellDescription$ Council's dilemma — Starting with you, each player votes for Redhorn Pass or Mines of Moria. For each Redhorn Pass vote, search your library for a basic land card and put it onto the battlefield tapped. If you search your library this way, shuffle. For each Mines of Moria vote, return a card from your graveyard to your hand.
-SVar:VoteRedhornPass:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ VoteNum | Tapped$ True | SpellDescription$ Redhorn Pass
+SVar:VoteRedhornPass:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ VoteNum | Tapped$ True | SpellDescription$ Redhorn Pass
 SVar:VoteMinesofMoria:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Card.YouOwn | Mandatory$ True | SelectPrompt$ Return a card from your graveyard to your hand for each Mines of Moria vote | Hidden$ True | ChangeNum$ VoteNum | SpellDescription$ Mines of Moria
 SVar:DBExile:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SpellDescription$ Exile CARDNAME.
 DeckHas:Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/t/travelers_amulet.txt b/forge-gui/res/cardsfolder/t/travelers_amulet.txt
index 6fee0e30ee6..8d32a22dd34 100644
--- a/forge-gui/res/cardsfolder/t/travelers_amulet.txt
+++ b/forge-gui/res/cardsfolder/t/travelers_amulet.txt
@@ -1,5 +1,5 @@
 Name:Traveler's Amulet
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 Oracle:{1}, Sacrifice Traveler's Amulet: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/traverse_the_outlands.txt b/forge-gui/res/cardsfolder/t/traverse_the_outlands.txt
index cca0f270473..66a59a9940f 100644
--- a/forge-gui/res/cardsfolder/t/traverse_the_outlands.txt
+++ b/forge-gui/res/cardsfolder/t/traverse_the_outlands.txt
@@ -1,7 +1,7 @@
 Name:Traverse the Outlands
 ManaCost:4 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is the greatest power among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | Tapped$ True | SpellDescription$ Search your library for up to X basic land cards, where X is the greatest power among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
 SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
 SVar:NeedsToPlay:Creature.YouCtrl+powerGE2
 Oracle:Search your library for up to X basic land cards, where X is the greatest power among creatures you control. Put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/t/traverse_the_ulvenwald.txt b/forge-gui/res/cardsfolder/t/traverse_the_ulvenwald.txt
index fdaa29bf962..87ea20b7db4 100644
--- a/forge-gui/res/cardsfolder/t/traverse_the_ulvenwald.txt
+++ b/forge-gui/res/cardsfolder/t/traverse_the_ulvenwald.txt
@@ -1,7 +1,7 @@
 Name:Traverse the Ulvenwald
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Delirium — If there are four or more card types among cards in your graveyard, instead search your library for a creature or land card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle. Delirium — If there are four or more card types among cards in your graveyard, instead search your library for a creature or land card, reveal it, put it into your hand, then shuffle.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land,Creature | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
 SVar:X:Count$Delirium.1.0
 DeckHints:Ability$Graveyard|Discard
diff --git a/forge-gui/res/cardsfolder/t/treetop_recluse.txt b/forge-gui/res/cardsfolder/t/treetop_recluse.txt
new file mode 100644
index 00000000000..eedb77b645f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/t/treetop_recluse.txt
@@ -0,0 +1,7 @@
+Name:Treetop Recluse
+ManaCost:1 G G
+Types:Creature Spider
+PT:1/6
+K:Vigilance
+K:Reach
+Oracle:Vigilance, reach
diff --git a/forge-gui/res/cardsfolder/t/trial_of_agony.txt b/forge-gui/res/cardsfolder/t/trial_of_agony.txt
index 14aa709be91..b464a3d01b8 100644
--- a/forge-gui/res/cardsfolder/t/trial_of_agony.txt
+++ b/forge-gui/res/cardsfolder/t/trial_of_agony.txt
@@ -1,9 +1,8 @@
 Name:Trial of Agony
 ManaCost:R
 Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures controlled by the same opponent | TargetMin$ 2 | TargetMax$ 2 | TargetsFromSingleZone$ True | IsCurse$ True | RememberTargets$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. CARDNAME deals 5 damage to that creature, and the other can't block this turn.
-SVar:DBChoose:DB$ ChooseCard | Defined$ TargetedController | Mandatory$ True | Choices$ Creature.IsRemembered | ChoiceTitle$ Choose one to take 5 damage | ForgetChosen$ True | SubAbility$ DBDealDamage
+A:SP$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select two target creatures controlled by the same opponent | TargetMin$ 2 | TargetMax$ 2 | TargetsWithSameController$ True | IsCurse$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. CARDNAME deals 5 damage to that creature, and the other can't block this turn.
+SVar:DBChoose:DB$ ChooseCard | Defined$ TargetedController | Mandatory$ True | Choices$ Creature.targetedBy | ChoiceTitle$ Choose one to take 5 damage | SubAbility$ DBDealDamage
 SVar:DBDealDamage:DB$ DealDamage | NumDmg$ 5 | Defined$ ChosenCard | SubAbility$ DBCantBlock
-SVar:DBCantBlock:DB$ Pump | Defined$ Remembered | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBCantBlock:DB$ Pump | Defined$ Remembered.!ChosenCard | KW$ HIDDEN CARDNAME can't block.
 Oracle:Choose two target creatures controlled by the same opponent. That player chooses one of those creatures. Trial of Agony deals 5 damage to that creature, and the other can't block this turn.
diff --git a/forge-gui/res/cardsfolder/t/trickery_charm.txt b/forge-gui/res/cardsfolder/t/trickery_charm.txt
index aa554e7fd87..bc715abef65 100644
--- a/forge-gui/res/cardsfolder/t/trickery_charm.txt
+++ b/forge-gui/res/cardsfolder/t/trickery_charm.txt
@@ -1,10 +1,10 @@
 Name:Trickery Charm
 ManaCost:U
 Types:Instant
-A:SP$ Charm | Choices$ DBPump,DBChooseType,DBRearrage
+A:SP$ Charm | Choices$ DBPump,DBChooseType,DBRearrange
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
 SVar:DBChooseType:DB$ ChooseType | Type$ Creature | Defined$ You | SubAbility$ DBAnimate | SpellDescription$ Target creature becomes the creature type of your choice until end of turn.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ ChosenType | RemoveCreatureTypes$ True
-SVar:DBRearrage:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 4 | SpellDescription$ Look at the top four cards of your library, then put them back in any order.
+SVar:DBRearrange:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 4 | SpellDescription$ Look at the top four cards of your library, then put them back in any order.
 AI:RemoveDeck:All
 Oracle:Choose one —\n• Target creature gains flying until end of turn.\n• Target creature becomes the creature type of your choice until end of turn.\n• Look at the top four cards of your library, then put them back in any order.
diff --git a/forge-gui/res/cardsfolder/t/tromokratis.txt b/forge-gui/res/cardsfolder/t/tromokratis.txt
index 50838ce2c12..a264303dfbc 100644
--- a/forge-gui/res/cardsfolder/t/tromokratis.txt
+++ b/forge-gui/res/cardsfolder/t/tromokratis.txt
@@ -2,6 +2,6 @@ Name:Tromokratis
 ManaCost:5 U U
 Types:Legendary Creature Kraken
 PT:8/8
-S:Mode$ Continuous | Affected$ Card.Self+notattacking+notblocking | AddKeyword$ Hexproof | Description$ CARDNAME has hexproof unless it's attacking or blocking.
+S:Mode$ Continuous | Affected$ Card.Self+!attacking+!blocking | AddKeyword$ Hexproof | Description$ CARDNAME has hexproof unless it's attacking or blocking.
 S:Mode$ MinMaxBlocker | ValidCard$ Card.Self | Min$ All | Description$ CARDNAME can't be blocked unless all creatures defending player controls block it. (If any creature that player controls doesn't block this creature, it can't be blocked.)
 Oracle:Tromokratis has hexproof unless it's attacking or blocking.\nTromokratis can't be blocked unless all creatures defending player controls block it. (If any creature that player controls doesn't block this creature, it can't be blocked.)
diff --git a/forge-gui/res/cardsfolder/upcoming/tundra_wall.txt b/forge-gui/res/cardsfolder/t/tundra_wall.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/tundra_wall.txt
rename to forge-gui/res/cardsfolder/t/tundra_wall.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/turtle_duck.txt b/forge-gui/res/cardsfolder/t/turtle_duck.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/turtle_duck.txt
rename to forge-gui/res/cardsfolder/t/turtle_duck.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/turtle_seals.txt b/forge-gui/res/cardsfolder/t/turtle_seals.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/turtle_seals.txt
rename to forge-gui/res/cardsfolder/t/turtle_seals.txt
diff --git a/forge-gui/res/cardsfolder/t/twisted_landscape.txt b/forge-gui/res/cardsfolder/t/twisted_landscape.txt
index 7a0e2ec5a06..ab99137d4b3 100644
--- a/forge-gui/res/cardsfolder/t/twisted_landscape.txt
+++ b/forge-gui/res/cardsfolder/t/twisted_landscape.txt
@@ -2,6 +2,6 @@ Name:Twisted Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Swamp+Basic,Land.Mountain+Basic,Land.Forest+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Swamp.Basic,Mountain.Basic,Forest.Basic | ChangeTypeDesc$ basic Swamp, Mountain, or Forest | SpellDescription$ Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.
 K:Cycling:B R G
 Oracle:{T}: Add {C}.\n{T}, Sacrifice Twisted Landscape: Search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle.\nCycling {B}{R}{G} ({B}{R}{G}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/upcoming/twisted_spider_clone.txt b/forge-gui/res/cardsfolder/t/twisted_spider_clone.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/twisted_spider_clone.txt
rename to forge-gui/res/cardsfolder/t/twisted_spider_clone.txt
diff --git a/forge-gui/res/cardsfolder/u/ugins_mastery.txt b/forge-gui/res/cardsfolder/u/ugins_mastery.txt
index fea95ec0a39..45be8ee3bdc 100644
--- a/forge-gui/res/cardsfolder/u/ugins_mastery.txt
+++ b/forge-gui/res/cardsfolder/u/ugins_mastery.txt
@@ -5,5 +5,5 @@ T:Mode$ SpellCast | ValidCard$ Creature.Colorless | ValidActivatingPlayer$ You |
 SVar:TrigManifest:DB$ Manifest
 T:Mode$ AttackersDeclared | ValidAttackers$ Creature.YouCtrl | Execute$ TrigState | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Whenever you attack with creatures with total power 6 or greater, you may turn a face-down creature you control face up.
 SVar:TrigState:DB$ SetState | Choices$ Creature.faceDown+YouCtrl | ChoiceTitle$ Select a face-down creature you control | Mode$ TurnFaceUp
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 Oracle:Whenever you cast a colorless creature spell, manifest the top card of your library. (Put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.)\nWhenever you attack with creatures with total power 6 or greater, you may turn a face-down creature you control face up.
diff --git a/forge-gui/res/cardsfolder/u/ultimate_green_goblin.txt b/forge-gui/res/cardsfolder/u/ultimate_green_goblin.txt
new file mode 100644
index 00000000000..60f201e3f45
--- /dev/null
+++ b/forge-gui/res/cardsfolder/u/ultimate_green_goblin.txt
@@ -0,0 +1,9 @@
+Name:Ultimate Green Goblin
+ManaCost:1 BR BR
+Types:Legendary Creature Goblin Villain
+PT:5/4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ At the beginning of your upkeep, discard a card, then create a Treasure token.
+SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+K:Mayhem:2 BR
+Oracle:At the beginning of your upkeep, discard a card, then create a Treasure token.\nMayhem {2}{B/R} (You may cast this card from your graveyard for {2}{B/R} if you discarded it this turn. Timing rules still apply.)
diff --git a/forge-gui/res/cardsfolder/u/ultra_magnus_tactician_ultra_magnus_armored_carrier.txt b/forge-gui/res/cardsfolder/u/ultra_magnus_tactician_ultra_magnus_armored_carrier.txt
index 796f3d422fb..0133ddbdda7 100644
--- a/forge-gui/res/cardsfolder/u/ultra_magnus_tactician_ultra_magnus_armored_carrier.txt
+++ b/forge-gui/res/cardsfolder/u/ultra_magnus_tactician_ultra_magnus_armored_carrier.txt
@@ -25,6 +25,6 @@ K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Formidable — Whenever NICKNAME attacks, attacking creatures you control gain indestructible until end of turn. If those creatures have total power 8 or greater, convert NICKNAME.
 SVar:TrigPump:DB$ PumpAll | ValidCards$ Creature.attacking+YouCtrl | KW$ Indestructible | SubAbility$ DBConvert
 SVar:DBConvert:DB$ SetState | Mode$ Transform | ConditionCheckSVar$ FormidableTest | ConditionSVarCompare$ GE8
-SVar:FormidableTest:Count$SumPower_Creature.attacking+YouCtrl
+SVar:FormidableTest:Count$Valid Creature.attacking+YouCtrl$CardPower
 SVar:HasAttackEffect:TRUE
 Oracle:Living metal (During your turn, this Vehicle is also a creature.)\nHaste\nFormidable — Whenever Ultra Magnus attacks, attacking creatures you control gain indestructible until end of turn. If those creatures have total power 8 or greater, convert Ultra Magnus.
diff --git a/forge-gui/res/cardsfolder/u/undercity.txt b/forge-gui/res/cardsfolder/u/undercity.txt
index 2127bb7c615..686173ae02b 100644
--- a/forge-gui/res/cardsfolder/u/undercity.txt
+++ b/forge-gui/res/cardsfolder/u/undercity.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Dungeon Undercity
 K:You can't enter this dungeon unless you "venture into Undercity".
 K:Dungeon:Entrance,Forge,Well,Trap,Arena,Stash,Archives,Catacombs,Throne
-SVar:Entrance:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | RoomName$ Secret Entrance | NextRoom$ Forge,Well | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+SVar:Entrance:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RoomName$ Secret Entrance | NextRoom$ Forge,Well | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:Forge:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 2 | RoomName$ Forge | NextRoom$ Trap,Arena | SpellDescription$ Put two +1/+1 counters on target creature.
 SVar:Well:DB$ Scry | ScryNum$ 2 | RoomName$ Lost Well | NextRoom$ Arena,Stash | SpellDescription$ Scry 2.
 SVar:Trap:DB$ LoseLife | ValidTgts$ Player | LifeAmount$ 5 | RoomName$ Trap! | NextRoom$ Archives | SpellDescription$ Target player loses 5 life.
diff --git a/forge-gui/res/cardsfolder/u/undercity_necrolisk.txt b/forge-gui/res/cardsfolder/u/undercity_necrolisk.txt
index 1dd0c6fd6d9..e24de68e287 100644
--- a/forge-gui/res/cardsfolder/u/undercity_necrolisk.txt
+++ b/forge-gui/res/cardsfolder/u/undercity_necrolisk.txt
@@ -2,6 +2,6 @@ Name:Undercity Necrolisk
 ManaCost:3 B
 Types:Creature Zombie Lizard
 PT:3/3
-A:AB$ PutCounter | Cost$ 1 Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on CARDNAME. It gains menace until end of turn. Activate only any time you could cast a sorcery.
+A:AB$ PutCounter | Cost$ 1 Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on CARDNAME. It gains menace until end of turn. Activate only as a sorcery.
 SVar:DBPump:DB$ Pump | KW$ Menace | Defined$ Self
 Oracle:{1}, Sacrifice another creature: Put a +1/+1 counter on Undercity Necrolisk. It gains menace until end of turn. Activate only as a sorcery. (It can't be blocked except by two or more creatures.)
diff --git a/forge-gui/res/cardsfolder/u/undermountain_adventurer.txt b/forge-gui/res/cardsfolder/u/undermountain_adventurer.txt
index 2af00567659..363455136e2 100644
--- a/forge-gui/res/cardsfolder/u/undermountain_adventurer.txt
+++ b/forge-gui/res/cardsfolder/u/undermountain_adventurer.txt
@@ -6,6 +6,6 @@ K:Vigilance
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInitiative | TriggerDescription$ When CARDNAME enters, you take the initiative.
 SVar:TrigInitiative:DB$ TakeInitiative
 A:AB$ Mana | Cost$ T | Produced$ G | Amount$ Y | SpellDescription$ Add {G}{G}. If you've completed a dungeon, add six {G} instead.
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 SVar:Y:Count$Compare X GE1.6.2
 Oracle:Vigilance\nWhen Undermountain Adventurer enters, you take the initiative.\n{T}: Add {G}{G}. If you've completed a dungeon, add six {G} instead.
diff --git a/forge-gui/res/cardsfolder/u/university_campus.txt b/forge-gui/res/cardsfolder/u/university_campus.txt
new file mode 100644
index 00000000000..136bfe2d55a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/u/university_campus.txt
@@ -0,0 +1,8 @@
+Name:University Campus
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
+A:AB$ Surveil | Cost$ 4 T | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+Oracle:This land enters tapped.\n{T}: Add {W} or {U}.\n{4}, {T}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/u/unlicensed_hearse.txt b/forge-gui/res/cardsfolder/u/unlicensed_hearse.txt
index aef7be0e981..2f2b45be2b8 100644
--- a/forge-gui/res/cardsfolder/u/unlicensed_hearse.txt
+++ b/forge-gui/res/cardsfolder/u/unlicensed_hearse.txt
@@ -2,7 +2,7 @@ Name:Unlicensed Hearse
 ManaCost:2
 Types:Artifact Vehicle
 PT:*/*
-A:AB$ ChangeZone | Cost$ T | TargetMin$ 0 | TargetMax$ 2 | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select up to two target cards in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from a single graveyard.
+A:AB$ ChangeZone | Cost$ T | TargetMin$ 0 | TargetMax$ 2 | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select up to two target cards in a graveyard | ValidTgts$ Card | SpellDescription$ Exile up to two target cards from a single graveyard.
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards exiled with it.
 SVar:X:Count$ValidExile Card.ExiledWithSource
 K:Crew:2
diff --git a/forge-gui/res/cardsfolder/u/unlikely_alliance.txt b/forge-gui/res/cardsfolder/u/unlikely_alliance.txt
index c89f5ae5336..b8f376742f7 100644
--- a/forge-gui/res/cardsfolder/u/unlikely_alliance.txt
+++ b/forge-gui/res/cardsfolder/u/unlikely_alliance.txt
@@ -1,6 +1,6 @@
 Name:Unlikely Alliance
 ManaCost:1 W
 Types:Enchantment
-A:AB$ Pump | Cost$ 1 W | ValidTgts$ Creature.notattacking+notblocking | TgtPrompt$ Select target nonattacking, nonblocking creature | NumDef$ +2 | SpellDescription$ Target nonattacking, nonblocking creature gets +0/+2 until end of turn.
+A:AB$ Pump | Cost$ 1 W | ValidTgts$ Creature.!attacking+!blocking | TgtPrompt$ Select target nonattacking, nonblocking creature | NumDef$ +2 | SpellDescription$ Target nonattacking, nonblocking creature gets +0/+2 until end of turn.
 AI:RemoveDeck:All
 Oracle:{1}{W}: Target nonattacking, nonblocking creature gets +0/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/u/unmarked_grave.txt b/forge-gui/res/cardsfolder/u/unmarked_grave.txt
index dab2d334e6b..2c2f0ce8908 100644
--- a/forge-gui/res/cardsfolder/u/unmarked_grave.txt
+++ b/forge-gui/res/cardsfolder/u/unmarked_grave.txt
@@ -1,7 +1,7 @@
 Name:Unmarked Grave
 ManaCost:1 B
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.nonLegendary | ChangeNum$ 1 | SpellDescription$ Search your library for a nonlegendary card, put that card into your graveyard, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.!Legendary | ChangeTypeDesc$ nonlegendary | SpellDescription$ Search your library for a nonlegendary card, put that card into your graveyard, then shuffle.
 AI:RemoveDeck:Random
 DeckHas:Ability$Graveyard
 Oracle:Search your library for a nonlegendary card, put that card into your graveyard, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/unstable_experiment.txt b/forge-gui/res/cardsfolder/u/unstable_experiment.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/unstable_experiment.txt
rename to forge-gui/res/cardsfolder/u/unstable_experiment.txt
diff --git a/forge-gui/res/cardsfolder/u/untamed_wilds.txt b/forge-gui/res/cardsfolder/u/untamed_wilds.txt
index 81d2b9c56f4..a0d142adc7c 100644
--- a/forge-gui/res/cardsfolder/u/untamed_wilds.txt
+++ b/forge-gui/res/cardsfolder/u/untamed_wilds.txt
@@ -1,5 +1,5 @@
 Name:Untamed Wilds
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield, then shuffle.
 Oracle:Search your library for a basic land card, put that card onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/u/urban_retreat.txt b/forge-gui/res/cardsfolder/u/urban_retreat.txt
new file mode 100644
index 00000000000..ab21e554bca
--- /dev/null
+++ b/forge-gui/res/cardsfolder/u/urban_retreat.txt
@@ -0,0 +1,8 @@
+Name:Urban Retreat
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ Combo G W U | SpellDescription$ Add {G}, {W}, or {U}.
+A:AB$ ChangeZone | Cost$ 2 Return<1/Creature.tapped/tapped creature> | ActivationZone$ Hand | Origin$ Hand | Defined$ Self | Destination$ Battlefield | SorcerySpeed$ True | SpellDescription$ Put this card from your hand onto the battlefield. Activate only as a sorcery.
+Oracle:This land enters tapped.\n{T}: Add {G}, {W}, or {U}.\n{2}, Return a tapped creature you control to its owner's hand: Put this card from your hand onto the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt b/forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt
index 66b021d3e70..74af59c30db 100644
--- a/forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt
+++ b/forge-gui/res/cardsfolder/u/uro_titan_of_natures_wrath.txt
@@ -8,7 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ When NICKNAME enters or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | SubAbility$ DBLand
-SVar:DBLand:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | OptionalDecider$ You
+SVar:DBLand:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1
 K:Escape:G G U U ExileFromGrave<5/Card.Other/other>
 DeckHas:Ability$LifeGain
 Oracle:When Uro enters, sacrifice it unless it escaped.\nWhenever Uro enters or attacks, you gain 3 life and draw a card, then you may put a land card from your hand onto the battlefield.\nEscape—{G}{G}{U}{U}, Exile five other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)
diff --git a/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt b/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
index 7c3ff24de56..3c3804f783b 100644
--- a/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
+++ b/forge-gui/res/cardsfolder/u/urza_academy_headmaster.txt
@@ -58,8 +58,8 @@ SVar:DBChangeLands11M:DB$ ChangeZoneAll | ChangeType$ Card.Land+IsRemembered | O
 SVar:DBChangeRest11M:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Graveyard | ForgetChanged$ True
 SVar:Tutor12M:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ Search your library for a card and put that card into your hand. Then shuffle your library.
 SVar:Sacrifice13M:DB$ Sacrifice | ValidTgts$ Player | Amount$ 2 | SacValid$ Creature | SpellDescription$ Target player sacrifices two creatures.
-SVar:Token14M:DB$ Token | TokenScript$ b_5_5_demon_flying | SubAbility$ DBLoselife14M | SpellDescription$ Create a 5/5 black Demon creature token with flying. You lose 2 life.
-SVar:DBLoselife14M:DB$ LoseLife | LifeAmount$ 2
+SVar:Token14M:DB$ Token | TokenScript$ b_5_5_demon_flying | SubAbility$ DBLoseLife14M | SpellDescription$ Create a 5/5 black Demon creature token with flying. You lose 2 life.
+SVar:DBLoseLife14M:DB$ LoseLife | LifeAmount$ 2
 SVar:Token15M:DB$ Token | TokenScript$ c_4_4_dragon_flying | SpellDescription$ Create a 4/4 gold Dragon creature token with flying.
 SVar:SetLife16M:DB$ SetLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 10 | SpellDescription$ Target player's life total becomes 10.
 SVar:Destroy17M:DB$ Destroy | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent.
diff --git a/forge-gui/res/cardsfolder/u/urzas_miter.txt b/forge-gui/res/cardsfolder/u/urzas_miter.txt
index e28f79bdea2..e17e5d8f220 100644
--- a/forge-gui/res/cardsfolder/u/urzas_miter.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_miter.txt
@@ -1,10 +1,8 @@
 Name:Urza's Miter
 ManaCost:3
 Types:Artifact
-T:Mode$ Sacrificed | Static$ True | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | ValidPlayer$ You | RememberTriggeringCard$ True | Execute$ DelTrigChangeZone
-SVar:DelTrigChangeZone:DB$ DelayedTrigger | Mode$ ChangesZone | Static$ True | ValidCard$ Artifact.YouCtrl+IsRemembered | Origin$ Battlefield | Destination$ Any | TriggerZones$ Battlefield | Execute$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearTriggered$ True
-T:Mode$ ChangesZone | ValidCard$ Artifact.YouCtrl+IsNotRemembered | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an artifact you control is put into a graveyard from the battlefield, if it wasn't sacrificed, you may pay {3}. If you do, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Artifact.YouCtrl | CheckOnTriggeredCard$ X EQ0 | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an artifact you control is put into a graveyard from the battlefield, if it wasn't sacrificed, you may pay {3}. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 3 | NumCards$ 1 | Defined$ You
+SVar:X:PlayerCountPlayers$SacrificedThisTurn Card.StrictlySelf
 DeckHints:Type$Artifact
 Oracle:Whenever an artifact you control is put into a graveyard from the battlefield, if it wasn't sacrificed, you may pay {3}. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/abby_merciless_soldier.txt b/forge-gui/res/cardsfolder/upcoming/abby_merciless_soldier.txt
new file mode 100644
index 00000000000..d83e8604560
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/abby_merciless_soldier.txt
@@ -0,0 +1,13 @@
+Name:Abby, Merciless Soldier
+ManaCost:1 R G
+Types:Legendary Creature Human Survivor
+PT:4/4
+K:Partner - Survivors
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast this spell, create a number of 1/1 black Fungus Zombie creature tokens named Cordyceps Infected equal to the amount of mana spent to cast it.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ cordyceps_infected | TokenOwner$ You
+SVar:X:Count$CastTotalManaSpent
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ NICKNAME enters under the control of an opponent of your choice.
+SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to | AILogic$ Curse | SubAbility$ MoveToPlay
+SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ ChosenPlayer
+DeckHas:Ability$Token & Type$Zombie|Fungus
+Oracle:When you cast this spell, create a number of 1/1 black Fungus Zombie creature tokens named Cordyceps Infected equal to the amount of mana spent to cast it.\nAbby enters under the control of an opponent of your choice.\nPartner—Survivors (You can have two commanders if both have this ability.)
diff --git a/forge-gui/res/cardsfolder/upcoming/airbending_lesson.txt b/forge-gui/res/cardsfolder/upcoming/airbending_lesson.txt
deleted file mode 100644
index 3e422f67f9a..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/airbending_lesson.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Name:Airbending Lesson
-ManaCost:2 W
-Types:Instant Lesson
-A:SP$ Airbend | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBDraw | SpellDescription$ Airbend target nonland permanent. (Exile it. While it’s exiled, its owner may cast it for {2} rather than its mana cost.)
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
-Oracle:Airbend target nonland permanent. (Exile it. While it’s exiled, its owner may cast it for {2} rather than its mana cost.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/aloy_savior_of_meridian.txt b/forge-gui/res/cardsfolder/upcoming/aloy_savior_of_meridian.txt
new file mode 100644
index 00000000000..ae6ec383090
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/aloy_savior_of_meridian.txt
@@ -0,0 +1,11 @@
+Name:Aloy, Savior of Meridian
+ManaCost:3 G U 
+Types:Legendary Creature Human Warrior
+PT:3/5
+K:Vigilance
+K:Reach
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | ValidAttackers$ Creature.Artifact+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDiscover | TriggerDescription$ In You, All Things Are Possible — Whenever one or more artifact creatures you control attack, discover X, where X is the greatest power among them. (Exile cards from the top of your library until you exile a nonland card with that mana value or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
+SVar:TrigDiscover:DB$ Discover | Num$ X
+SVar:X:TriggerObjectsAttackers$GreatestPower
+DeckNeeds:Type$Artifact & Type$Creature
+Oracle:Vigilance, reach\nIn You, All Things Are Possible — Whenever one or more artifact creatures you control attack, discover X, where X is the greatest power among them. (Exile cards from the top of your library until you exile a nonland card with that mana value or less. Cast it without paying its mana cost or put it into your hand. Put the rest on the bottom in a random order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/amarant_coral.txt b/forge-gui/res/cardsfolder/upcoming/amarant_coral.txt
new file mode 100644
index 00000000000..0f31bca6ea6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/amarant_coral.txt
@@ -0,0 +1,10 @@
+Name:Amarant Coral 
+ManaCost:2 R G
+Types:Legendary Creature Human Monk
+PT:5/4
+K:Trample
+S:Mode$ MustAttack | ValidCreature$ Card.Self | Description$ CARDNAME attacks each combat if able.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDmg | TriggerDescription$ No Mercy - Whenever CARDNAME deals combat damage to an opponent, it deals that much damage to each other opponent
+SVar:TrigDmg:DB$ DamageAll | ValidPlayers$ OppNonTriggeredTarget | NumDmg$ X
+SVar:X:TriggerCount$DamageAmount
+Oracle:Trample\nAmarant Coral attacks each combat if able.\nNo Mercy - Whenever Amarant Coral deals combat damage to an opponent, it deals that much damage to each other opponent. 
diff --git a/forge-gui/res/cardsfolder/upcoming/april_oneil_hacktivist.txt b/forge-gui/res/cardsfolder/upcoming/april_oneil_hacktivist.txt
new file mode 100644
index 00000000000..9d1b0387845
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/april_oneil_hacktivist.txt
@@ -0,0 +1,8 @@
+Name:April O'Neil, Hacktivist
+ManaCost:3 U
+Types:Legendary Creature Human Scientist
+PT:1/5
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, draw a card for each card type among spells you've cast this turn.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:Count$ThisTurnCast_Card.YouCtrl$CardTypes
+Oracle:At the beginning of your end step, draw a card for each card type among spells you've cast this turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/ashling_rekindled_ashling_rimebound.txt b/forge-gui/res/cardsfolder/upcoming/ashling_rekindled_ashling_rimebound.txt
new file mode 100644
index 00000000000..92a3e55badf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ashling_rekindled_ashling_rimebound.txt
@@ -0,0 +1,26 @@
+Name:Ashling, Rekindled
+ManaCost:1 R
+Types:Legendary Creature Elemental Sorcerer
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, you may discard a card. If you do, draw a card.
+T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, you may discard a card. If you do, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card> | NumCards$ 1
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {U}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ U | Defined$ Self | Mode$ Transform
+DeckHas:Ability$Discard
+AlternateMode:DoubleFaced
+Oracle:Whenever this creature enters or transforms into Ashling, Rekindled, you may discard a card. If you do, draw a card.\nAt the beginning of your first main phase, you may pay {U}. If you do, transform Ashling.
+
+ALTERNATE
+
+Name:Ashling, Rimebound
+ManaCost:no cost
+Colors:blue
+Types:Legendary Creature Elemental Wizard
+PT:1/3
+T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$Whenever this creature transforms into CARDNAME and at the beginning of your first main phase, add two mana of any one color. Spend this mana only to cast spells with mana value 4 or greater.
+T:Mode$ Phase | Phase$ Main1 | Secondary$ True | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever this creature transforms into CARDNAME and at the beginning of your first main phase, add two mana of any one color. Spend this mana only to cast spells with mana value 4 or greater.
+SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 2 | RestrictValid$ Spell.cmcGE4
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {R}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ R | Defined$ Self | Mode$ Transform
+Oracle:Whenever this creature transforms into Ashling, Rimebound and at the beginning of your first main phase, add two mana of any one color. Spend this mana only to cast spells with mana value 4 or greater.\nAt the beginning of your first main phase, you may pay {R}. If you do, transform Ashling.
diff --git a/forge-gui/res/cardsfolder/upcoming/ashlings_command.txt b/forge-gui/res/cardsfolder/upcoming/ashlings_command.txt
new file mode 100644
index 00000000000..835e8692ed9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ashlings_command.txt
@@ -0,0 +1,11 @@
+Name:Ashling's Command
+ManaCost:3 U R
+Types:Kindred Instant Elemental
+A:SP$ Charm | Choices$ DBToken,DBDraw,DBDamage,DBTreasure | CharmNum$ 2
+SVar:DBToken:DB$ CopyPermanent | ValidTgts$ Card.Elemental+YouCtrl | TgtPrompt$ Select target Elemental you control | SpellDescription$ Create a token that's a copy of target Elemental you control.
+SVar:DBDraw:DB$ Draw  | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards.
+SVar:DBDamage:DB$ DamageAll | ValidTgts$ Player | NumDmg$ 2 | ValidCards$ Creature | ValidDescription$ each creature target player controls | SpellDescription$ CARDNAME deals 2 damage to each creature target player controls.
+SVar:DBTreasure:DB$ Token | ValidTgts$ Player | TokenOwner$ ThisTargetedPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | SpellDescription$ Target player creates two Treasure tokens.
+DeckHas:Ability$Token & Type$Treasure|Artifact
+DeckHints:Type$Elemental
+Oracle:Choose two —\n• Create a token that's a copy of target Elemental you control.\n• Target player draws two cards.\n• Ashling's Command deals 2 damage to each creature target player controls.\n• Target player creates two Treasure tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/atreus_impulsive_son.txt b/forge-gui/res/cardsfolder/upcoming/atreus_impulsive_son.txt
new file mode 100644
index 00000000000..dd52b26a846
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/atreus_impulsive_son.txt
@@ -0,0 +1,11 @@
+Name:Atreus, Impulsive Son
+ManaCost:1 U R
+Types:Legendary Creature God Archer
+PT:2/4
+K:Reach
+K:Partner - Father & Son
+A:AB$ Draw | Cost$ 3 T | NumCards$ X | SubAbility$ DBDiscard | SpellDescription$ Draw a card for each experience counter you have, then discard a card.
+SVar:DBDiscard:DB$ Discard | Mode$ YouChoose | SubAbility$ DBDamage
+SVar:DBDamage:DB$ DealDamage | NumDmg$ 2 | Defined$ Opponent | SpellDescription$ CARDNAME deals 2 damage to each opponent.
+SVar:X:Count$YourCountersExperience
+Oracle:Reach\n{3}, {T}: Draw a card for each experience counter you have, then discard a card. Atreus, Impulsive Son deals 2 damage to each opponent.\nPartner—Father & son
diff --git a/forge-gui/res/cardsfolder/upcoming/bebop_rocksteady.txt b/forge-gui/res/cardsfolder/upcoming/bebop_rocksteady.txt
new file mode 100644
index 00000000000..4dea5aa9e8b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bebop_rocksteady.txt
@@ -0,0 +1,8 @@
+Name:Bebop & Rocksteady
+ManaCost:1 BG BG
+Types:Legendary Creature Boar Rhino Mutant
+PT:7/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attack or block, sacrifice a permanent unless you discard a card.
+T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigSac | Secondary$ True | TriggerDescription$ Whenever CARDNAME attack or block, sacrifice a permanent unless you discard a card.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent | UnlessCost$ Discard<1/Card> | UnlessPayer$ You
+Oracle:Whenever Bebop & Rocksteady attack or block, sacrifice a permanent unless you discard a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt b/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt
new file mode 100644
index 00000000000..a0a74d7de4f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bitterbloom_bearer.txt
@@ -0,0 +1,12 @@
+Name:Bitterbloom Bearer
+ManaCost:B B
+Types:Creature Faerie Rogue
+PT:1/1
+K:Flash
+K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 1 life and create a 1/1 black Faerie creature token with flying.
+SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ub_1_1_faerie_flying | TokenOwner$ You
+SVar:AICastPreference:NeverCastIfLifeBelow$ 4
+DeckHas:Ability$Token
+Oracle:Flash\nFlying\nAt the beginning of your upkeep, you lose 1 life and create a 1/1 blue and black Faerie creature token with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/brilliant_wings.txt b/forge-gui/res/cardsfolder/upcoming/brilliant_wings.txt
new file mode 100644
index 00000000000..f61f68cb633
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/brilliant_wings.txt
@@ -0,0 +1,9 @@
+Name:Brilliant Wings
+ManaCost:1 W
+Types:Enchantment Aura
+K:Flash
+K:Enchant:Creature.YouCtrl:creature you control
+S:Mode$ Continuous | Affected$ Permanent.EnchantedBy | AddKeyword$ Flying & Hexproof | Description$ Enchanted permanent has flying and hexproof.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAttach | TriggerDescription$ Whenever a creature you control enters, you may pay {1}. If you do, attach this Aura to that creature. 
+SVar:TrigAttach:AB$ Attach | Cost$ 1 | Defined$ TriggeredCardLKICopy
+Oracle:Flash\nEnchant creature you control\nEnchanted permanent has flying and hexproof.\nWhenever a creature you control enters, you may pay {1}. If you do, attach this Aura to that creature. 
diff --git a/forge-gui/res/cardsfolder/upcoming/brood_astronomer.txt b/forge-gui/res/cardsfolder/upcoming/brood_astronomer.txt
new file mode 100644
index 00000000000..2fb9cab7566
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/brood_astronomer.txt
@@ -0,0 +1,10 @@
+Name:Brood Astronomer
+ManaCost:1 G
+Types:Creature Insect Scientist
+PT:2/2
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraft | TriggerDescription$ When this creature enters, you may sacrifice a land. If you do, draft a card from the Planets spellbook and put it onto the battlefield tapped.
+SVar:TrigDraft:AB$ Draft | Cost$ Sac<1/Land> | SpellbookName$ Planets | Spellbook$ Adagia; Windswept Bastion,Evendo; Waking Haven,Kavaron; Memorial World,Susur Secundi; Void Altar,Uthros; Titanic Godcore | Zone$ Battlefield | Tapped$ True
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | SpellDescription$ Add one mana of any color. If you control a Planet with twelve or more charge counters on it, add three mana of any one color instead.
+SVar:X:Count$Compare Y GE1.3.1
+SVar:Y:Count$Valid Planet.YouCtrl+counters_GE12_CHARGE
+Oracle:When this creature enters, you may sacrifice a land. If you do, draft a card from the Planets spellbook and put it onto the battlefield tapped.\n{T}: Add one mana of any color. If you control a Planet with twelve or more charge counters on it, add three mana of any one color instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/campsite_cuisine.txt b/forge-gui/res/cardsfolder/upcoming/campsite_cuisine.txt
new file mode 100644
index 00000000000..7df4eacd01b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/campsite_cuisine.txt
@@ -0,0 +1,12 @@
+Name:Campsite Cuisine
+ManaCost:1 G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Legendary+YouCtrl | Execute$ TrigFood | TriggerDescription$ Whenever this enchantment or a legendary creature you control enters, create a Food token.
+SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
+T:Mode$ AttackersDeclared | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack, you may sacrifice X Foods. When you do, up to X target attacking creatures each get +3/+3 and gain trample and indestructible until end of turn.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ Sac<X/Food> | Execute$ TrigPump | TriggerDescription$ When you do, up to X target attacking creatures each get +3/+3 and gain trample and indestructible until end of turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking | TargetMin$ 0 | TargetMax$ X | TgtPrompt$ Select up to X target attacking creatures | NumAtt$ +3 |  NumDef$ +3 | KW$ Trample & Indestructible
+SVar:X:Count$xPaid
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Food
+DeckHints:Type$Legendary & Type$Creature
+Oracle:Whenever this enchantment or a legendary creature you control enters, create a Food token.\nWhenever you attack, you may sacrifice X Foods. When you do, up to X target attacking creatures each get +3/+3 and gain trample and indestructible until end of turn. 
diff --git a/forge-gui/res/cardsfolder/upcoming/casey_jones_jury_rig_justiciar.txt b/forge-gui/res/cardsfolder/upcoming/casey_jones_jury_rig_justiciar.txt
new file mode 100644
index 00000000000..97946251d1b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/casey_jones_jury_rig_justiciar.txt
@@ -0,0 +1,8 @@
+Name:Casey Jones, Jury-Rig Justiciar
+ManaCost:1 R
+Types:Legendary Creature Human Berserker
+PT:2/1
+K:Haste
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When NICKNAME enters, look at the top four cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Artifact | RestRandomOrder$ True
+Oracle:Haste\nWhen Casey Jones enters, look at the top four cards of your library. You may reveal an artifact card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/upcoming/chaos_shrines_black_crystal.txt b/forge-gui/res/cardsfolder/upcoming/chaos_shrines_black_crystal.txt
new file mode 100644
index 00000000000..0b4bf7a07d0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/chaos_shrines_black_crystal.txt
@@ -0,0 +1,8 @@
+Name:Chaos Shrine's Black Crystal
+ManaCost:3 B
+Types:Legendary Artifact
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ Whenever a nontoken creature you control dies, exile it. 
+SVar:TrigChange:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may put a creature card exiled with CARDNAME onto the battlefield under your control with a finality counter on it. 
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.ExiledWithSource | GainControl$ True | WithCountersType$ FINALITY | WithCountersAmount$ 1 | ChangeNum$ 1
+Oracle:Whenever a nontoken creature you control dies, exile it.\nAt the beginning of your upkeep, you may put a creature card exiled with Chaos Shrine's Black Crystal onto the battlefield under your control with a finality counter on it. 
diff --git a/forge-gui/res/cardsfolder/upcoming/chocobo_camp.txt b/forge-gui/res/cardsfolder/upcoming/chocobo_camp.txt
new file mode 100644
index 00000000000..ffa79a2783f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/chocobo_camp.txt
@@ -0,0 +1,15 @@
+Name:Chocobo Camp
+ManaCost:no cost
+Types:Land
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a legendary creature.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Creature.Legendary+YouCtrl | ConditionCompare$ EQ0
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBEffect | SpellDescription$ Add {G}.
+SVar:DBEffect:DB$ Effect | Triggers$ SpellCastTrig | SpellDescription$ When you next cast a Bird creature spell this turn, it enters with an additional +1/+1 counter on it.
+SVar:SpellCastTrig:Mode$ SpellCast | ValidCard$ Bird | ValidActivatingPlayer$ You | Execute$ TrigCounter | OneOff$ True | TriggerDescription$ When you next cast a Bird creature spell this turn, it enters with an additional +1/+1 counter on it.
+SVar:TrigCounter:DB$ Effect | ReplacementEffects$ ETBCounters | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack
+SVar:ETBCounters:Event$ Moved | Origin$ Stack | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ ETBAddExtraCounter | ReplacementResult$ Updated | Description$ That creature enters with an additional +1/+1 counters on it.
+SVar:ETBAddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ Token | Cost$ 2 G G T | TokenScript$ g_2_2_bird_landfall | SpellDescription$ Creature a 2/2 green Bird creature token with "Whenever a land you control enters, this token gets +1/+0 until end of turn".
+DeckHas:Ability$Token & Type$Artifact|Bird
+DeckHints:Type$Legendary
+Oracle:This Land enters tapped unless you control a legendary creature.\n{T}: Add {G}. When you next cast a Bird creature spell this turn, it enters with an additional +1/+1 counter on it.\n{2}{G}{G}, {T}, Creature a 2/2 green Bird creature token with "Whenever a land you control enters, this token gets +1/+0 until end of turn".  
diff --git a/forge-gui/res/cardsfolder/upcoming/deceit.txt b/forge-gui/res/cardsfolder/upcoming/deceit.txt
new file mode 100644
index 00000000000..772e70b7ea3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/deceit.txt
@@ -0,0 +1,11 @@
+Name:Deceit
+ManaCost:4 UB UB
+Types:Creature Elemental Incarnation
+PT:5/5
+K:Evoke:UB UB
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | CheckSVar$ CastSA>Count$Adamant_2.Blue.2.0 | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this creature enters, if {U}{U} was spent to cast it, return up to one other target nonland permanent to its owner's hand.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+Other | TgtPrompt$ Select up to one other target nonland permanent
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | CheckSVar$ CastSA>Count$Adamant_2.Black.2.0 | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When this creature enters, if {B}{B} was spent to cast it, target opponent reveals their hand. You choose a nonland card from it. That player discards that card.
+SVar:TrigDiscard:DB$ Discard | ValidTgts$ Opponent | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | NumCards$ 1 
+DeckHas:Ability$Discard
+Oracle:When this creature enters, if {U}{U} was spent to cast it, return up to one other target nonland permanent to its owner's hand.\nWhen this creature enters, if {B}{B} was spent to cast it, target opponent reveals their hand. You choose a nonland card from it. That player discards that card.\nEvoke {U/B}{U/B}
diff --git a/forge-gui/res/cardsfolder/upcoming/donatello_rad_scientist.txt b/forge-gui/res/cardsfolder/upcoming/donatello_rad_scientist.txt
new file mode 100644
index 00000000000..fe2d6cdc19a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/donatello_rad_scientist.txt
@@ -0,0 +1,9 @@
+Name:Donatello, Rad Scientist
+ManaCost:5 U
+Types:Legendary Creature Mutant Ninja Turtle
+PT:5/6
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When NICKNAME enters, tap up to three target creatures your opponents control. Put a stun counter on each of them. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Select up to three target creatures your opponents control | SubAbility$ DBCounter
+SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ Stun | CounterNum$ 1
+Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhen Donatello enters, tap up to three target creatures your opponents control. Put a stun counter on each of them. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/donatello_the_brains.txt b/forge-gui/res/cardsfolder/upcoming/donatello_the_brains.txt
new file mode 100644
index 00000000000..f963d47fd9a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/donatello_the_brains.txt
@@ -0,0 +1,9 @@
+Name:Donatello, the Brains
+ManaCost:2 U
+Types:Legendary Creature Mutant Ninja Turtle
+PT:2/4
+R:Event$ CreateToken | ActiveZones$ Battlefield | ValidToken$ Card.YouCtrl | ReplaceWith$ DBReplace | Description$ If one or more tokens would be created under your control, those tokens plus an additional Mutagen token are created instead.
+SVar:DBReplace:DB$ ReplaceToken | Type$ AddToken | Amount$ 1 | TokenScript$ c_a_mutagen_sac
+K:Partner - Character select
+DeckHas:Ability$Sacrifice|Token & Type$Mutagen
+Oracle:If one or more tokens would be created under your control, those tokens plus an additional Mutagen token are created instead.\nPartner—Character select (You can have two commanders if both have this ability.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/donnie_april_adorkable_duo.txt b/forge-gui/res/cardsfolder/upcoming/donnie_april_adorkable_duo.txt
new file mode 100644
index 00000000000..ba44bb71c86
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/donnie_april_adorkable_duo.txt
@@ -0,0 +1,9 @@
+Name:Donnie & April, Adorkable Duo
+ManaCost:4 U
+Types:Legendary Creature Mutant Ninja Human Turtle
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When NICKNAME enters, ABILITY
+SVar:TrigCharm:DB$ Charm | MinCharmNum$ 1 | CharmNum$ 2 | Choices$ DBDraw,DBChangeZone | AdditionalDescription$ or both. Each mode must target a different player.
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | ValidTgts$ Player | TargetUnique$ True | SpellDescription$ Target player draws two cards.
+SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Player | TargetUnique$ True | Hidden$ True | Mandatory$ True | ChangeType$ Artifact.TargetedPlayerOwn,Instant.TargetedPlayerOwn,Sorcery.TargetedPlayerOwn | ChangeTypeDesc$ artifact, instant or sorcery | ChangeNum$ 1 | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Target player returns an artifact, instant, or sorcery card from their graveyard to their hand.
+Oracle:When Donnie & April enter, choose one or both. Each mode must target a different player.\n• Target player draws two cards.\n• Target player returns an artifact, instant, or sorcery card from their graveyard to their hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/duelists_flame.txt b/forge-gui/res/cardsfolder/upcoming/duelists_flame.txt
new file mode 100644
index 00000000000..50fc69fe260
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/duelists_flame.txt
@@ -0,0 +1,12 @@
+Name:Duelist's Flame 
+ManaCost:X R R
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature.blocked+YouCtrl | TgtPrompt$ Select target blocked creature you control | NumAtt$ +X | KW$ Trample | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target blocked creature you control gets +X/+0 and gains trample and "Whenever this creature deals combat damage to a player, look at that many cards from the top of your library. Exile up to one nonland card from among them and put the rest on the bottom of your library in a random order. You may cast the exiled card without paying its mana cost."
+SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Triggers$ DamageTrig
+SVar:DamageTrig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDig | CombatDamage$ True | TriggerDescription$ Whenever this creature deals combat damage to a player, look at that many cards from the top of your library. Exile up to one nonland card from among them and put the rest on the bottom of your library in a random order. You may cast the exiled card without paying its mana cost.
+SVar:TrigDig:DB$ Dig | DigNum$ Y | ChangeNum$ 1 | ChangeValid$ Card.nonLand | Optional$ True | RememberChanged$ True | DestinationZone$ Exile | RestRandomOrder$ True | SubAbility$ DBCast
+SVar:DBCast:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:Y:TriggerCount$DamageAmount
+SVar:X:Count$xPaid
+Oracle:Until end of turn, target blocked creature you control gets +X/+0 and gains trample and "Whenever this creature deals combat damage to a player, look at that many cards from the top of your library. Exile up to one nonland card from among them and put the rest on the bottom of your library in a random order. You may cast the exiled card without paying its mana cost."
diff --git a/forge-gui/res/cardsfolder/upcoming/edea_possessed_sorceress.txt b/forge-gui/res/cardsfolder/upcoming/edea_possessed_sorceress.txt
new file mode 100644
index 00000000000..3956b438c52
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/edea_possessed_sorceress.txt
@@ -0,0 +1,11 @@
+Name:Edea, Possessed Sorceress 
+ManaCost:2 U B R
+Types:Legendary Creature Human Warlock
+PT:2/5
+K:Ward:2
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigGainControl | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
+SVar:TrigGainControl:DB$ GainControl | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | LoseControl$ EOT | Untap$ True | AddKWs$ Haste
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.YouDontOwn+YouCtrl | Execute$ TrigReturn | TriggerDescription$ Whenever a creature you control but don't own dies, return it to the battlefield under it's owner's control and you draw a card. 
+SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy  | Origin$ All | Destination$ Battlefield | SubAbility$ TrigDraw
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+Oracle:Ward {2}\nAt the beginning of combat on your turn, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.\nWhenever a creature you control but don't own dies, return it to the battlefield under it's owner's control and you draw a card. 
diff --git a/forge-gui/res/cardsfolder/upcoming/eirdu_carrier_of_dawn_isilu_carrier_of_twilight.txt b/forge-gui/res/cardsfolder/upcoming/eirdu_carrier_of_dawn_isilu_carrier_of_twilight.txt
new file mode 100644
index 00000000000..a74137a872a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/eirdu_carrier_of_dawn_isilu_carrier_of_twilight.txt
@@ -0,0 +1,26 @@
+Name:Eirdu, Carrier of Dawn
+ManaCost:3 W W
+Types:Legendary Creature Elemental God
+PT:5/5
+K:Flying
+K:Lifelink
+S:Mode$ Continuous | Affected$ Card.Creature+YouCtrl+wasCast | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Creature spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a creature spell pays for {1} or one mana of that creature's color.)
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {B}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ B | Defined$ Self | Mode$ Transform
+AlternateMode:DoubleFaced
+DeckHas:Ability$LifeGain|Counters
+Oracle:Flying, lifelink\nCreature spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a creature spell pays for {1} or one mana of that creature's color.)\nAt the beginning of your first main phase, you may pay {B}. If you do, transform Eirdu.
+
+ALTERNATE
+
+Name:Isilu, Carrier of Twilight
+ManaCost:no cost
+Colors:black
+Types:Legendary Creature Elemental God
+PT:5/5
+K:Flying
+K:Lifelink
+S:Mode$ Continuous | Affected$ Card.Creature+YouCtrl+!token+Other | AffectedZone$ Battlefield | AddKeyword$ Persist | Description$ Each other nontoken creature you control has persist. (When it dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner’s control with a -1/-1 counter on it.)
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {W}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ W | Defined$ Self | Mode$ Transform
+Oracle:Flying, lifelink\nEach other nontoken creature you control has persist. (When it dies, if it had no -1/-1 counters on it, return it to the battlefield under its owner's control with a -1/-1 counter on it.) At the beginning of your first main phase, you may pay {W}. If you do, transform Isilu.
diff --git a/forge-gui/res/cardsfolder/upcoming/electros_bolt.txt b/forge-gui/res/cardsfolder/upcoming/electros_bolt.txt
deleted file mode 100644
index fbdba1ff4af..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/electros_bolt.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Name:Electro's Bolt
-ManaCost:2 R
-Types:Sorcery
-A:SP$ DealDamage | ValidTgts$ Creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-K:Mayhem:1 R
-Oracle:Electro’s Bolt deals 4 damage to target creature.\nMayhem {1}{R} (You may cast this card from your graveyard for {1}{R} if you discarded it this turn. Timing rules still apply.)
-
diff --git a/forge-gui/res/cardsfolder/upcoming/ellie_brick_master.txt b/forge-gui/res/cardsfolder/upcoming/ellie_brick_master.txt
new file mode 100644
index 00000000000..dbf96050654
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ellie_brick_master.txt
@@ -0,0 +1,9 @@
+Name:Ellie, Brick Master
+ManaCost:1 R
+Types:Legendary Creature Human Survivor
+PT:2/1
+K:Partner - Survivors
+T:Mode$ AttackersDeclaredOneTarget | AttackedTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Distract the Horde - Whenever a player attacks one of your opponents, that attacking player creates a tapped 1/1 black Fungus Zombie creature token named Cordyceps Infected that's attacking that opponent.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ cordyceps_infected | TokenOwner$ TriggeredAttackingPlayer | TokenTapped$ True | TokenAttacking$ TriggeredAttackedTarget
+DeckHas:Ability$Token & Type$Zombie|Fungus
+Oracle:Distract the Horde - Whenever a player attacks one of your opponents, that attacking player creates a tapped 1/1 black Fungus Zombie creature token named Cordyceps Infected that's attacking that opponent.\nPartner—Survivors (You can have two commanders if both have this ability.)
diff --git a/forge-gui/res/cardsfolder/upcoming/ellie_vengeful_hunter.txt b/forge-gui/res/cardsfolder/upcoming/ellie_vengeful_hunter.txt
new file mode 100644
index 00000000000..b3a9548c401
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ellie_vengeful_hunter.txt
@@ -0,0 +1,9 @@
+Name:Ellie, Vengeful Hunter
+ManaCost:1 B R
+Types:Legendary Creature Human Survivor
+PT:3/1
+K:Partner - Survivors
+A:AB$ DealDamage | Cost$ PayLife<2> Sac<1/Creature.Other/another creature> | NumDmg$ 2 | ValidTgts$ Player | SubAbility$ DBPump | SpellDescription$ NICKNAME deals 2 damage to target player and gains indestructible until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Indestructible
+DeckHas:Ability$Sacrifice
+Oracle:Pay 2 life, Sacrifice another creature: Ellie deals 2 damage to target player and gains indestructible until end of turn.\nPartner—Survivors (You can have two commanders if both have this ability.)
diff --git a/forge-gui/res/cardsfolder/upcoming/emptiness.txt b/forge-gui/res/cardsfolder/upcoming/emptiness.txt
new file mode 100644
index 00000000000..d754b8efb9b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/emptiness.txt
@@ -0,0 +1,11 @@
+Name:Emptiness
+ManaCost:4 WB WB
+Types:Creature Elemental Incarnation
+PT:3/5
+K:Evoke:WB WB
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | CheckSVar$ CastSA>Count$Adamant_2.White.2.0 | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When this creature enters, if {W}{W} was spent to cast it, return target creature card with mana value 3 or less from your graveyard to the battlefield.
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | CheckSVar$ CastSA>Count$Adamant_2.Black.2.0 | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When this creature enters, if {B}{B} was spent to cast it, put three -1/-1 counters on up to one target creature.
+SVar:TrigPutCounters:DB$ PutCounter | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | CounterNum$ 3 | TgtPrompt$ Select up to one target creature | CounterType$ M1M1 
+DeckHas:Ability$Graveyard|Counters
+Oracle:When this creature enters, if {W}{W} was spent to cast it, return target creature card with mana value 3 or less from your graveyard to the battlefield.\nWhen this creature enters, if {B}{B} was spent to cast it, put three -1/-1 counters on up to one target creature.\nEvoke {W/B}{W/B}
diff --git a/forge-gui/res/cardsfolder/upcoming/eumidian_lifeseed.txt b/forge-gui/res/cardsfolder/upcoming/eumidian_lifeseed.txt
new file mode 100644
index 00000000000..d1131611ef8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/eumidian_lifeseed.txt
@@ -0,0 +1,7 @@
+Name:Eumidian Lifeseed
+ManaCost:G
+Types:Artifact
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraft | TriggerDescription$ When this artifact enters, draft a card from CARDNAME's spellbook.
+SVar:TrigDraft:DB$ Draft | Spellbook$ Adagia; Windswept Bastion,Blast Zone,Cascading Cataracts,Contested War Zone,Deserted Temple,Dust Bowl,Kavaron; Memorial World,Mutavault,Nesting Grounds,Plaza of Heroes,Sunken Citadel,Susur Secundi; Void Altar,Terrain Generator,Uthros; Titanic Godcore
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Activated.Land | SpellDescription$ Add one mana of any color. Spend this mana only to activate abilities of land sources.
+Oracle:When this artifact enters, draft a card from Eumidian Lifeseed's spellbook.\n{T}: Add one mana of any color. Spend this mana only to activate abilities of land sources.
diff --git a/forge-gui/res/cardsfolder/upcoming/fated_clash.txt b/forge-gui/res/cardsfolder/upcoming/fated_clash.txt
new file mode 100644
index 00000000000..0f7d9d0da34
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/fated_clash.txt
@@ -0,0 +1,8 @@
+Name:Fated Clash  
+ManaCost:3 W W
+Types:Sorcery
+S:Mode$ CastWithFlash | ValidCard$ Card.Self | ValidSA$ Spell | IsPresent$ Creature.attacking | IsPresent2$ Creature.blocking | EffectZone$ All | Caster$ You | Description$ You may cast this spell as though it had flash if a creature is attacking and a creature is blocking. 
+A:SP$ Pump | KW$ Indestructible | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBPumpOpp | SpellDescription$ Target creature you control and target creature an opponent controls each gain indestructible until end of turn. 
+SVar:DBPumpOpp:DB$ Pump | KW$ Indestructible | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBDestroyAll
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature | SpellDescription$ Then destroy all creatures. 
+Oracle:You may cast this spell as though it had flash if a creature is attacking and a creature is blocking.\nTarget creature you control and target creature an opponent controls each gain indestructible until end of turn. Then destoy all creatures. 
diff --git a/forge-gui/res/cardsfolder/upcoming/figure_of_fable.txt b/forge-gui/res/cardsfolder/upcoming/figure_of_fable.txt
new file mode 100644
index 00000000000..a9e20245eeb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/figure_of_fable.txt
@@ -0,0 +1,9 @@
+Name:Figure of Fable
+ManaCost:GW
+Types:Creature Kithkin
+PT:1/1
+A:AB$ Animate | Cost$ GW | Types$ Kithkin,Scout | RemoveCreatureTypes$ True | Duration$ Permanent | Power$ 2 | Toughness$ 3 | SpellDescription$ This creature becomes a Kithkin Scout with base power and toughness 2/3.
+A:AB$ Animate | Cost$ 1 GW GW | ConditionPresent$ Card.Self+Scout | Types$ Kithkin,Soldier | RemoveCreatureTypes$ True | Duration$ Permanent | Power$ 4 | Toughness$ 5 | SpellDescription$ If this creature is a Scout, it becomes a Kithkin Soldier with base power and toughness 4/5.
+A:AB$ Animate | Cost$ 3 GW GW GW | ConditionPresent$ Card.Self+Soldier | Types$ Kithkin,Avatar | RemoveCreatureTypes$ True | Duration$ Permanent | Power$ 7 | Toughness$ 8 | Keywords$ Protection:Player.Opponent:each of your opponents | SpellDescription$ If this creature is a Soldier, it becomes a Kithkin Avatar with base power and toughness 7/8 and protection from each of your opponents.
+DeckHas:Type$Soldier|Scout|Avatar
+Oracle:{G/W}: This creature becomes a Kithkin Scout with base power and toughness 2/3.\n{1}{G/W}{G/W}: If this creature is a Scout, it becomes a Kithkin Soldier with base power and toughness 4/5.\n{3}{G/W}{G/W}{G/W}: If this creature is a Soldier, it becomes a Kithkin Avatar with base power and toughness 7/8 and protection from each of your opponents.
diff --git a/forge-gui/res/cardsfolder/upcoming/fishing_gear.txt b/forge-gui/res/cardsfolder/upcoming/fishing_gear.txt
new file mode 100644
index 00000000000..34453ba2dcc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/fishing_gear.txt
@@ -0,0 +1,11 @@
+Name:Fishing Gear 
+ManaCost:3
+Types:Artifact Equipment
+K:Equip:2
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, exile the top card of that player's library. If it's a permanent card, you may put it onto the battlefield under your control. If you don't, create a 1/1 blue Fish creature token.
+SVar:TrigExile:DB$ Dig | Defined$ TriggeredTarget | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChange
+SVar:DBChange:DB$ ChangeZone | ConditionDefined$ Remembered | ConditionPresent$ Permanent | GainControl$ True | Defined$ Remembered | Origin$ Exile | Optional$ True | Imprint$ True | Destination$ Battlefield | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_1_1_fish | TokenOwner$ You | ConditionDefined$ Imprinted | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearRemembered$ True
+DeckHas:Ability$Token & Type$Fish
+Oracle:Whenever equipped creature deals combat damage to a player, exile the top card of that player's library. If it's a permanent card, you may put it onto the battlefield under your control. If you don't, create a 1/1 blue Fish creature token.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/upcoming/flash_photography.txt b/forge-gui/res/cardsfolder/upcoming/flash_photography.txt
new file mode 100644
index 00000000000..9a46cfeed1c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/flash_photography.txt
@@ -0,0 +1,8 @@
+Name:Flash Photography
+ManaCost:2 U U
+Types:Sorcery
+K:Flashback:4 U U
+S:Mode$ CastWithFlash | ValidCard$ Card.Self | ValidSA$ Spell.IsTargeting Valid Permanent.YouCtrl | EffectZone$ All | Caster$ You | Description$ You may cast this spell as though it had flash if it targets a permanent you control. 
+A:SP$ CopyPermanent | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | StackDescription$ SpellDescription | SpellDescription$ Create a token that's a copy of target permanent.
+DeckHas:Ability$Token
+Oracle:You may cast this spell as though it had flash if it targets a permanent you control.\nCreate a token that's a copy of target permanent.\nFlashback {4}{U)}U)
diff --git a/forge-gui/res/cardsfolder/upcoming/formidable_speaker.txt b/forge-gui/res/cardsfolder/upcoming/formidable_speaker.txt
new file mode 100644
index 00000000000..c929e42c203
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/formidable_speaker.txt
@@ -0,0 +1,8 @@
+Name:Formidable Speaker
+ManaCost:2 G
+Types:Creature Elf Druid
+PT:2/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When this creature enters, you may discard a card. If you do, search your library for a creature card, reveal it, put it into your hand, then shuffle.
+SVar:TrigSearch:AB$ ChangeZone | Cost$ Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 1
+A:AB$ Untap | Cost$ 1 T | ValidTgts$ Permanent.Other | TgtPrompt$ Select another target permanent. | SpellDescription$ Untap another target permanent.
+Oracle:When this creature enters, you may discard a card. If you do, search your library for a creature card, reveal it, put it into your hand, then shuffle.\n{1}, {T}: Untap another target permanent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/garland_royal_kidnapper.txt b/forge-gui/res/cardsfolder/upcoming/garland_royal_kidnapper.txt
new file mode 100644
index 00000000000..ea349288514
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/garland_royal_kidnapper.txt
@@ -0,0 +1,15 @@
+Name:Garland, Royal Kidnapper 
+ManaCost:2 U B
+Types:Legendary Creature Human Knight
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When NICKNAME enters, target opponent becomes the monarch.
+SVar:TrigMonarch:DB$ BecomeMonarch | ValidTgts$ Opponent
+T:Mode$ BecomeMonarch | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Whenever an opponent becomes the monarch, gain control of target creature that player controls for as long as they're the monarch.
+SVar:TrigEffect:DB$ Effect | ImprintCards$ Targeted | ValidTgts$ Creature.ControlledBy TriggeredPlayer | TgtPrompt$ Choose target creature that player controls | RememberObjects$ TriggeredPlayer | Triggers$ ExileMe | StaticAbilities$ GainControl | Duration$ Permanent 
+SVar:GainControl:Mode$ Continuous | Affected$ Card.IsImprinted | CheckSVar$ X | SVarCompare$ EQ1 | GainControl$ You | Description$ You gain control of that creature for as long as that player is the monarch. 
+SVar:ExileMe:Mode$ Always | Static$ True | Execute$ ExileEffect | CheckSVar$ X | SVarCompare$ EQ0 
+SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:X:PlayerCountRememberedPlayer$HasPropertyisMonarch
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+YouDontOwn| AddPower$ 2 | AddToughness$ 2 | Description$ Creatures you control but don't own get +2/+2 and can't be sacrificed. 
+S:Mode$ CantSacrifice | ValidCard$ Creature.YouCtrl+YouDontOwn | Secondary$ True | SpellDescription$ Creatures you control but don't own get +2/+2 and can't be sacrificed. 
+Oracle:When Garland enters, target opponent becomes the monarch.\nWhenever an opponent becomes the monarch, gain control of target creature that player controls for as long as they're the monarch.\nCreatures you control but don't own get +2/+2 and can't be sacrificed. 
diff --git a/forge-gui/res/cardsfolder/upcoming/heroes_in_a_half_shell.txt b/forge-gui/res/cardsfolder/upcoming/heroes_in_a_half_shell.txt
new file mode 100644
index 00000000000..61d5aed1558
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/heroes_in_a_half_shell.txt
@@ -0,0 +1,12 @@
+Name:Heroes in a Half Shell
+ManaCost:W U B R G
+Types:Legendary Creature Mutant Ninja Turtle
+PT:5/5
+K:Vigilance
+K:Menace
+K:Trample
+K:Haste
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Mutant.YouCtrl,Ninja.YouCtrl,Turtle.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more Mutants, Ninjas, and/or Turtles you control deal combat damage to a player, put a +1/+1 counter on each of those creatures and draw a card.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ TriggeredSources | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+Oracle:Vigilance, menace, trample, haste\nWhenever one or more Mutants, Ninjas, and/or Turtles you control deal combat damage to a player, put a +1/+1 counter on each of those creatures and draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/hydroponics_architect.txt b/forge-gui/res/cardsfolder/upcoming/hydroponics_architect.txt
new file mode 100644
index 00000000000..c84afd5041e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hydroponics_architect.txt
@@ -0,0 +1,12 @@
+Name:Hydroponics Architect
+ManaCost:U
+Types:Creature Insect
+PT:1/2
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRandom | TriggerDescription$ Whenever this creature attacks, a random land card in your library perpetually becomes a basic Island in addition to its other types and gains "When this land enters, draw a card."
+SVar:TrigRandom:DB$ ChooseCard | Choices$ Land.YouOwn | ChoiceZone$ Library | AtRandom$ True | Amount$ 1 | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | Types$ Basic,Island | Triggers$ LandETBDraw | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:LandETBDraw:Mode$ ChangesZone | ValidCard$ Card.Self | Execute$ TrigDraw | Origin$ Any | Destination$ Battlefield | TriggerDescription$ When this land enters, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+Oracle:Flying\nWhenever this creature attacks, a random land card in your library perpetually becomes a basic Island in addition to its other types and gains "When this land enters, draw a card."
diff --git a/forge-gui/res/cardsfolder/upcoming/jaws_relentless_predator.txt b/forge-gui/res/cardsfolder/upcoming/jaws_relentless_predator.txt
new file mode 100644
index 00000000000..e0343194db1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jaws_relentless_predator.txt
@@ -0,0 +1,15 @@
+Name:Jaws, Relentless Predator
+ManaCost:3 R R
+Types:Legendary Creature Shark
+PT:5/5
+K:Trample
+K:Haste
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, create that many Blood tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_blood_draw | TokenOwner$ You
+SVar:X:TriggerCount$DamageAmount
+T:Mode$ Sacrificed | ValidCard$ Artifact.nonCreature | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a noncreature artifact is sacrificed or destroyed, NICKNAME deals 1 damage to each opponent.
+T:Mode$ Destroyed | ValidCard$ Artifact.nonCreature | Execute$ TrigDamage | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a noncreature artifact is sacrificed or destroyed, NICKNAME deals 1 damage to each opponent.
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ 1 | Defined$ Opponent
+DeckHints:Ability$Sacrifice|Token & Type$Blood|Treasure|Map|Clue
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Blood
+Oracle:Trample, haste\nWhenever Jaws deals combat damage to a player, create that many Blood tokens.\nWhenever a noncreature artifact is sacrificed or destroyed, Jaws deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/upcoming/jin_sakai_ghost_of_tsushima.txt b/forge-gui/res/cardsfolder/upcoming/jin_sakai_ghost_of_tsushima.txt
new file mode 100644
index 00000000000..de33dbf3392
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jin_sakai_ghost_of_tsushima.txt
@@ -0,0 +1,12 @@
+Name:Jin Sakai, Ghost of Tsushima
+ManaCost:1 W U B
+Types:Legendary Creature Human Samurai
+PT:2/4
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Creature.YouCtrl | AttackedTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigCharm | ValidAttackersAmount$ EQ1 | TriggerDescription$ Whenever a creature you control attacks a player, if no other creatures are attacking that player, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ Standoff,Ghost
+SVar:Standoff:DB$ Pump | Defined$ TriggeredAttackers | KW$ Double Strike | SpellDescription$ Standoff — It gains double strike until end of turn.
+SVar:Ghost:DB$ Effect | RememberObjects$ TriggeredAttackers | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | SpellDescription$ Ghost — It can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this turn.
+Oracle:Whenever Jin Sakai deals combat damage to a player, draw a card.\nWhenever a creature you control attacks a player, if no other creatures are attacking that player, choose one —-\n• Standoff — It gains double strike until end of turn.\n• Ghost — It can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/joel_resolute_survivor.txt b/forge-gui/res/cardsfolder/upcoming/joel_resolute_survivor.txt
new file mode 100644
index 00000000000..ae7278635c5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/joel_resolute_survivor.txt
@@ -0,0 +1,12 @@
+Name:Joel, Resolute Survivor
+ManaCost:3 B G
+Types:Legendary Creature Human Survivor
+PT:4/4
+K:Menace
+K:Partner - Survivors
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.token | Execute$ TrigPutCounter | ActivationLimit$ 1 | TriggerDescription$ Whenever a creature token dies, put a +1/+1 counter on NICKNAME and draw a card. This ability triggers only once each turn.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+DeckHas:Ability$Counters
+DeckHints:Ability$Sacrifice|Token
+Oracle:Menace\nWhenever a creature token dies, put a +1/+1 counter on Joel and draw a card. This ability triggers only once each turn.\nPartner—Survivors (You can have two commanders if both have this ability.)
diff --git a/forge-gui/res/cardsfolder/upcoming/judgment_of_alexander.txt b/forge-gui/res/cardsfolder/upcoming/judgment_of_alexander.txt
new file mode 100644
index 00000000000..8674cdf8c81
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/judgment_of_alexander.txt
@@ -0,0 +1,11 @@
+Name:Judgment of Alexander
+ManaCost:2 W
+Types:Instant
+A:SP$ Effect | ReplacementEffects$ PreventDamage | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt to you this turn by sources your opponents control. Whenever damage from a creature is prevented this way, each commander creature you control deals damage equal to its power to that creature. 
+SVar:PreventDamage:Event$ DamageDone | ActiveZones$ Command | ValidTarget$ You | ValidSource$ Card.OppCtrl,Emblem.OppCtrl | ReplaceWith$ DBTrigger | PreventionEffect$ True | ExecuteMode$ PerSource | Description$ Prevent all damage that would be dealt to you this turn by sources your opponents control. Whenever damage from a creature is prevented this way, each commander creature you control deals damage equal to its power to that creature. 
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ TrigDamageCreature | RememberObjects$ ReplacedSource | ConditionCheckSVar$ Y | TriggerDescription$ Whenever damage from a creature is prevented this way, each commander creature you control deals damage equal to its power to that creature. 
+SVar:TrigDamageCreature:DB$ DealDamage | Defined$ DelayTriggerRemembered | DamageSource$ Valid Card.IsCommander+YouCtrl | NumDmg$ X 
+SVar:X:Count$Valid Card.IsCommander+YouCtrl$CardPower
+SVar:Y:ReplacedSource$Valid Card.Creature
+AI:RemoveDeck:NonCommander
+Oracle:Prevent all damage that would be dealt to you this turn by sources your opponents control.\nWhenever damage from a creature is prevented this way, each commander creature you control deals damage equal to its power to that creature. 
diff --git a/forge-gui/res/cardsfolder/upcoming/kavaron_consumed.txt b/forge-gui/res/cardsfolder/upcoming/kavaron_consumed.txt
new file mode 100644
index 00000000000..f7d3e3faa2c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kavaron_consumed.txt
@@ -0,0 +1,7 @@
+Name:Kavaron Consumed
+ManaCost:3 R R
+Types:Sorcery
+A:SP$ ChangeZone | Hidden$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Artifact.YouOwn,Creature.YouOwn | SelectPrompt$ Select an artifact or creature card in your hand | RememberChanged$ True | AtEOT$ Sacrifice | Optional$ True | SubAbility$ DBAnimatePerpetual | StackDescription$ REP You_{p:You} & your hand_their hand & Sacrifice_{p:You} sacrifices | SpellDescription$ You may put an artifact or creature card from your hand onto the battlefield. It perpetually becomes an artifact creature with base power and toughness 4/4 and gains haste. Sacrifice it at the beginning of the next end step.
+SVar:DBAnimatePerpetual:DB$ Animate | Defined$ Remembered | Types$ Creature,Artifact | Keywords$ Haste | Power$ 4 | Toughness$ 4 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:You may put an artifact or creature card from your hand onto the battlefield. It perpetually becomes an artifact creature with base power and toughness 4/4 and gains haste. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/upcoming/krang_master_mind.txt b/forge-gui/res/cardsfolder/upcoming/krang_master_mind.txt
new file mode 100644
index 00000000000..4396b490a88
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/krang_master_mind.txt
@@ -0,0 +1,12 @@
+Name:Krang, Master Mind
+ManaCost:6 U U
+Types:Legendary Artifact Creature Utrom Warrior
+PT:1/4
+K:Affinity:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ LT4 | Execute$ TrigDraw | TriggerDescription$ When NICKNAME enters, if you have fewer than four cards in hand, draw cards equal to the difference.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ Y
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ Z | Description$ NICKNAME gets +1/+0 for each other artifact you control.
+SVar:X:Count$ValidHand Card.YouOwn
+SVar:Y:Number$4/Minus.X
+SVar:Z:Count$Valid Artifact.Other+YouCtrl
+Oracle:Affinity for artifacts (This spell costs {1} less to cast for each artifact you control.)\nWhen Krang enters, if you have fewer than four cards in hand, draw cards equal to the difference.\nKrang gets +1/+0 for each other artifact you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/kratos_god_of_war.txt b/forge-gui/res/cardsfolder/upcoming/kratos_god_of_war.txt
new file mode 100644
index 00000000000..ebdc6fd9082
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kratos_god_of_war.txt
@@ -0,0 +1,10 @@
+Name:Kratos, God of War
+ManaCost:R R R
+Types:Legendary Creature God Warrior
+PT:2/3
+K:Double Strike
+S:Mode$ Continuous | Affected$ Creature | AddKeyword$ Haste | Description$ All creatures have haste.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's end step, NICKNAME deals damage to that player equal to the number of creatures that player controls that didn't attack this turn.
+SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X
+SVar:X:Count$Valid Creature.!attackedThisTurn+ActivePlayerCtrl
+Oracle:Double strike\nAll creatures have haste.\nAt the beginning of each player's end step, Kratos deals damage to that player equal to the number of creatures that player controls that didn't attack this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/kratos_stoic_father.txt b/forge-gui/res/cardsfolder/upcoming/kratos_stoic_father.txt
new file mode 100644
index 00000000000..1bbaca1f92e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kratos_stoic_father.txt
@@ -0,0 +1,14 @@
+Name:Kratos, Stoic Father
+ManaCost:2 R W
+Types:Legendary Creature God Warrior
+PT:4/4
+K:Partner - Father & Son
+T:Mode$ AttackersDeclared | ValidAttackers$ God.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigExperience | TriggerDescription$ Whenever you attack with one or more Gods and whenever a God dies, you get an experience counter.
+T:Mode$ ChangesZone | ValidCard$ God | TriggerZones$ Battlefield | Secondary$ True | Destination$ Graveyard | Execute$ TrigExperience | TriggerDescription$ Whenever you attack with one or more Gods and whenever a God dies, you get an experience counter.
+SVar:TrigExperience:DB$ PutCounter | Defined$ You | CounterType$ Experience | CounterNum$ 1
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your end step, put a number of +1/+1 counters on target creature equal to the number of experience counters you have.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Count$YourCountersExperience
+DeckHas:Ability$Counters
+DeckHints:Type$God
+Oracle:Whenever you attack with one or more Gods and whenever a God dies, you get an experience counter.\nAt the beginning of your end step, put a number of +1/+1 counters on target creature equal to the number of experience counters you have.\nPartner—Father & son (You can have two commanders if both have this ability.)
diff --git a/forge-gui/res/cardsfolder/upcoming/leonardo_the_balance.txt b/forge-gui/res/cardsfolder/upcoming/leonardo_the_balance.txt
new file mode 100644
index 00000000000..1c7b2d49070
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/leonardo_the_balance.txt
@@ -0,0 +1,10 @@
+Name:Leonardo, the Balance
+ManaCost:3 W
+Types:Legendary Creature Mutant Ninja Turtle
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.token+YouCtrl | TriggerZones$ Battlefield | Execute$ DBPutCounterAll | OptionalDecider$ You | ResolvedLimit$ 1 | TriggerDescription$ Whenever a token you control enters, you may put a +1/+1 counter on each creature you control. Do this only once each turn.
+SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ PumpAll | Cost$ W U B R G | ValidCards$ Creature.YouCtrl | KW$ Menace & Trample & Lifelink | SpellDescription$ Creatures you control gain menace, trample, and lifelink until end of turn.
+K:Partner - Character select
+DeckHints:Ability$Token
+Oracle:Whenever a token you control enters, you may put a +1/+1 counter on each creature you control. Do this only once each turn.\n{W}{U}{B}{R}{G}: Creatures you control gain menace, trample, and lifelink until end of turn.\nPartner—Character select (You can have two commanders if both have this ability.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/leonardo_worldly_warrior.txt b/forge-gui/res/cardsfolder/upcoming/leonardo_worldly_warrior.txt
new file mode 100644
index 00000000000..bf3b0ad8eb6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/leonardo_worldly_warrior.txt
@@ -0,0 +1,8 @@
+Name:Leonardo, Worldly Warrior
+ManaCost:7 W
+Types:Legendary Creature Mutant Ninja Turtle
+PT:5/5
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature you control.
+K:Double Strike
+SVar:X:Count$Valid Creature.YouCtrl
+Oracle:This spell costs {1} less to cast for each creature you control.\nDouble strike
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/machinists_dismissal.txt b/forge-gui/res/cardsfolder/upcoming/machinists_dismissal.txt
new file mode 100644
index 00000000000..3df073978a1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/machinists_dismissal.txt
@@ -0,0 +1,7 @@
+Name:Machinist's Dismissal
+ManaCost:4 U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each artifact you control and each artifact card in your hand.
+SVar:X:Count$ValidBattlefield,Hand Artifact.YouCtrl
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+Oracle:This spell costs {1} less to cast for each artifact you control and each artifact card in your hand.\nCounter target noncreature spell.
diff --git a/forge-gui/res/cardsfolder/upcoming/mega_flare.txt b/forge-gui/res/cardsfolder/upcoming/mega_flare.txt
new file mode 100644
index 00000000000..01f128f6e89
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mega_flare.txt
@@ -0,0 +1,10 @@
+Name:Mega Flare
+ManaCost:2 R
+Types:Sorcery
+K:Kicker:3 R R
+A:SP$ Token | Condition$ Kicked | TokenScript$ r_6_6_dragon_flying | SubAbility$ DBDamage | SpellDescription$ If this spell was kicked, create a 6/6 red Dragon creature token with flying. For each opponent, choose up to one target creature that player controls. CARDNAME deals damage equal to the greatest power among creatures you control to each of the chosen creatures.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ For each opponent, choose up to one target creature that player controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | NumDmg$ X
+SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
+SVar:OneEach:PlayerCountOpponents$Amount
+DeckHas:Ability$Token
+Oracle:Kicker {3}{R}{R}\nIf this spell was kicked, create a 6/6 red Dragon creature token with flying.\nFor each opponent, choose up to one target creature that player controls. Mega Flare deals damage equal to the greatest power among creatures you control to each of the chosen creatures.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/michelangelo_on_the_scene.txt b/forge-gui/res/cardsfolder/upcoming/michelangelo_on_the_scene.txt
new file mode 100644
index 00000000000..2f02e6215a7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/michelangelo_on_the_scene.txt
@@ -0,0 +1,11 @@
+Name:Michelangelo, On the Scene
+ManaCost:4 G G
+Types:Legendary Creature Mutant Ninja Turtle
+PT:2/2
+K:Trample
+K:etbCounter:P1P1:X:no Condition:NICKNAME enters with a +1/+1 counter on him for each land you control.
+SVar:X:Count$Valid Land.YouCtrl
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When NICKNAME dies, return this card to your hand.
+SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Hand
+DeckHas:Ability$Counters
+Oracle:Trample (This creature can deal excess combat damage to the player it's attacking.)\nMichelangelo enters with a +1/+1 counter on him for each land you control.\nWhen Michelangelo dies, return this card to your hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/michelangelo_the_heart.txt b/forge-gui/res/cardsfolder/upcoming/michelangelo_the_heart.txt
new file mode 100644
index 00000000000..f501f177008
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/michelangelo_the_heart.txt
@@ -0,0 +1,11 @@
+Name:Michelangelo, the Heart
+ManaCost:1 G
+Types:Legendary Creature Mutant Ninja Turtle
+PT:2/1
+K:Trample
+T:Mode$ Phase | Phase$ Main | PhaseCount$ 2 | ValidPlayer$ You | CheckSVar$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Raid (the Fridge) — At the beginning of your second main phase, if you attacked this turn, put a +1/+1 counter on target creature and create a Food token.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenScript$ c_a_food_sac
+K:Partner - Character select
+SVar:RaidTest:Count$AttackersDeclared
+Oracle:Trample\nRaid (the Fridge) — At the beginning of your second main phase, if you attacked this turn, put a +1/+1 counter on target creature and create a Food token.\nPartner—Character select (You can have two commanders if both have this ability.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mine_security.txt b/forge-gui/res/cardsfolder/upcoming/mine_security.txt
new file mode 100644
index 00000000000..4d3038f8db9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mine_security.txt
@@ -0,0 +1,11 @@
+Name:Mine Security
+ManaCost:1 R
+Types:Creature Kavu Soldier
+PT:3/1
+K:Trample
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigConjure | TriggerDescription$ When this creature enters, conjure a card named Flametongue Kavu into the top eight cards of your library at random. It perpetually gains "You may pay {0} rather than pay this spell's mana cost."
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Flametongue Kavu | Zone$ Library | LibraryPosition$ Count$Random.0.8 | RememberMade$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ FreeCast | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:FreeCast:Mode$ Continuous | MayPlay$ True | MayPlayAltManaCost$ 0 | MayPlayDontGrantZonePermissions$ True | Affected$ Card.Self | AffectedZone$ Hand,Graveyard,Exile,Library,Command | EffectZone$ All | Description$ You may pay {0} rather than pay this spell's mana cost.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Trample\nWhen this creature enters, conjure a card named Flametongue Kavu into the top eight cards of your library at random. It perpetually gains "You may pay {0} rather than pay this spell's mana cost."
diff --git a/forge-gui/res/cardsfolder/upcoming/monoist_gravliner.txt b/forge-gui/res/cardsfolder/upcoming/monoist_gravliner.txt
new file mode 100644
index 00000000000..d56da20c2db
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/monoist_gravliner.txt
@@ -0,0 +1,9 @@
+Name:Monoist Gravliner
+ManaCost:1 B
+Types:Artifact Spacecraft
+PT:2/3
+K:Station:6
+T:Mode$ Stationed | ValidCard$ Card.Self | ValidCrew$ Creature | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature stations this Spacecraft, that creature perpetually gains deathtouch and lifelink.
+SVar:TrigPump:DB$ Pump | Defined$ Valid Creature.TriggeredCrew | KW$ Deathtouch & Lifelink | Duration$ Perpetual
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE6_CHARGE | AddType$ Creature | AddKeyword$ Flying & Deathtouch & Lifelink | Description$ STATION 6+ Flying, deathtouch, lifelink
+Oracle:Whenever a creature stations this Spacecraft, that creature perpetually gains deathtouch and lifelink.\nStation\nSTATION 6+\nFlying, deathtouch, lifelink
diff --git a/forge-gui/res/cardsfolder/upcoming/morningtides_light.txt b/forge-gui/res/cardsfolder/upcoming/morningtides_light.txt
new file mode 100644
index 00000000000..38c22e865a5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/morningtides_light.txt
@@ -0,0 +1,12 @@
+Name:Morningtide's Light
+ManaCost:3 W
+Types:Sorcery
+A:SP$ ChangeZone | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select any number of target creatures | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile any number of target creatures. At the beginning of the next end step, return those cards to the battlefield tapped under their owners' control.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return exiled permanent to the battlefield under their owner's control | SubAbility$ DBCleanup
+SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Tapped$ True | Defined$ DelayTriggerRememberedLKI
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ PreventDamage | AILogic$ Fog | Duration$ UntilYourNextTurn | SubAbility$ DBExileSelf | SpellDescription$ Until your next turn, prevent all damage that would be dealt to you.
+SVar:PreventDamage:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ You | Description$ Until your next turn, prevent all damage that would be dealt to you.
+SVar:DBExileSelf:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ None | SpellDescription$ Exile CARDNAME.
+SVar:X:Count$Valid Creature
+Oracle:Exile any number of target creatures. At the beginning of the next end step, return those cards to the battlefield tapped under their owners' control.\nUntil your next turn, prevent all damage that would be dealt to you.\nExile Morningtide's Light.
diff --git a/forge-gui/res/cardsfolder/upcoming/mutable_explorer.txt b/forge-gui/res/cardsfolder/upcoming/mutable_explorer.txt
new file mode 100644
index 00000000000..db04d9a1fd7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mutable_explorer.txt
@@ -0,0 +1,9 @@
+Name:Mutable Explorer
+ManaCost:2 G
+Types:Creature Shapeshifter
+PT:1/1
+K:Changeling
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a tapped Mutavault token. (It's a land with "{T}: Add {C}" and "{1}: This token becomes a 2/2 creature with all creature types until end of turn. It's still a land.")
+SVar:TrigToken:DB$ CopyPermanent |  DefinedName$ Mutavault | TokenTapped$ True 
+DeckHas:Ability$Token & Type$Land
+Oracle:Changeling (This card is every creature type.)\nWhen this creature enters, create a tapped Mutavault token. (It's a land with "{T}: Add {C}" and "{1}: This token becomes a 2/2 creature with all creature types until end of turn. It's still a land.")
diff --git a/forge-gui/res/cardsfolder/upcoming/mutable_pupa.txt b/forge-gui/res/cardsfolder/upcoming/mutable_pupa.txt
new file mode 100644
index 00000000000..a0710448992
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mutable_pupa.txt
@@ -0,0 +1,8 @@
+Name:Mutable Pupa
+ManaCost:G
+Types:Creature Insect
+PT:1/1
+K:Evolve
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control enters, this creature perpetually gains flying if that creature has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ First Strike & Flying & Deathtouch & Double Strike & Haste & Hexproof & Indestructible & Lifelink & Menace & Reach & Trample & Vigilance | SharedKeywordsZone$ Battlefield,Hand,Graveyard,Exile,Library,Command | SharedRestrictions$ Card.TriggeredCard | Duration$ Perpetual
+Oracle:Evolve\nWhenever another creature you control enters, this creature perpetually gains flying if that creature has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/nathan_drake_treasure_hunter.txt b/forge-gui/res/cardsfolder/upcoming/nathan_drake_treasure_hunter.txt
new file mode 100644
index 00000000000..2a035bb2972
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/nathan_drake_treasure_hunter.txt
@@ -0,0 +1,11 @@
+Name:Nathan Drake, Treasure Hunter
+ManaCost:U B R
+Types:Legendary Creature Human Rogue
+PT:3/2
+K:First Strike
+S:Mode$ ManaConvert | ValidPlayer$ You | ValidCard$ Card.YouDontOwn+YouCtrl | ValidSA$ Spell,Activated | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast spells you don't own or to activate abilities of permanents you control but don't own.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever NICKNAME attacks, exile the top card of each player's library. You may cast a spell from among those cards.
+SVar:TrigExile:DB$ Dig | Defined$ Player | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidSA$ Spell | ValidZone$ Exile | Controller$ You | Optional$ True | Amount$ 1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:First strike\nYou may spend mana as though it were mana of any color to cast spells you don't own or to activate abilities of permanents you control but don't own.\nWhenever Nathan Drake attacks, exile the top card of each player's library. You may cast a spell from among those cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/network_marauder.txt b/forge-gui/res/cardsfolder/upcoming/network_marauder.txt
new file mode 100644
index 00000000000..f9fd4c5afe9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/network_marauder.txt
@@ -0,0 +1,8 @@
+Name:Network Marauder
+ManaCost:2 U
+Types:Artifact Creature Robot Pirate
+PT:1/2
+K:Warp:1 U
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Artifact.YouCtrl+cmcGE3 | Execute$ TrigPump | TriggerDescription$ When this creature enters and whenever another artifact you control with mana value 3 or greater enters, all artifact creature cards and Spacecraft cards you own perpetually get +1/+0.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Artifact.Creature+YouOwn+!token,Spacecraft.YouOwn+!token | PumpZone$ All | NumAtt$ +1 | Duration$ Perpetual
+Oracle:When this creature enters and whenever another artifact you control with mana value 3 or greater enters, all artifact creature cards and Spacecraft cards you own perpetually get +1/+0.\nWarp {1}{U}
diff --git a/forge-gui/res/cardsfolder/upcoming/noctis_heir_apparent.txt b/forge-gui/res/cardsfolder/upcoming/noctis_heir_apparent.txt
new file mode 100644
index 00000000000..d3605fb39c6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/noctis_heir_apparent.txt
@@ -0,0 +1,14 @@
+Name:Noctis, Heir Apparent
+ManaCost:W U B
+Types:Legendary Creature Human Noble
+PT:2/3
+T:Mode$ ChangesZone | Phase$ BeginCombat->EndCombat | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | Execute$ EquipmentSelection | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control enters during combat, you may attach target Equipment you control to target creature you control.
+SVar:EquipmentSelection:DB$ Pump | ValidTgts$ Equipment.YouCtrl | TgtPrompt$ Select target equipment you control | SubAbility$ DBAttach | StackDescription$ None
+SVar:DBAttach:DB$ Attach | Object$ ParentTarget | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control.
+A:AB$ ChangeZone | PrecostDesc$ Warp-Strike — | Cost$ 3 | Defined$ Self | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile NICKNAME. Return it to the battlefield under its owner's control tapped and attacking at the beginning of that player's next declare attackers step. It can't be blocked that combat.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | ValidPlayer$ Player.CardOwner | Phase$ Declare Attackers | Execute$ TrigReturn | ConditionDefined$ Remembered | ConditionPresent$ Card | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ Return NICKNAME to the battlefield under its owner's control tapped and attacking at the beginning of that player's next declare attackers step. It can't be blocked that combat.
+SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield | Tapped$ True | Attacking$ True | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedLKI | StaticAbilities$ STUnblockable | Duration$ UntilEndOfCombat | ExileOnMoved$ Battlefield | SubAbility$ DBCleanup
+SVar:STUnblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this combat.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever a creature you control enters during combat, you may attach target Equipment you control to target creature you control.\nWarp-Strike — {3}: Exile Noctis. Return it to the battlefield under its owner's control tapped and attacking at the beginning of that player's next declare attackers step. It can't be blocked that combat.
diff --git a/forge-gui/res/cardsfolder/upcoming/prototype_x_8.txt b/forge-gui/res/cardsfolder/upcoming/prototype_x_8.txt
new file mode 100644
index 00000000000..c543c1e3498
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/prototype_x_8.txt
@@ -0,0 +1,12 @@
+Name:Prototype X-8
+ManaCost:6 U B
+Types:Legendary Artifact Creature Robot Octopus
+PT:8/8
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature card in your graveyard.
+SVar:X:Count$ValidGraveyard Creature.YouOwn
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Creature.wasCastByYou+YouCtrl+Other | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever another creature you control enters, if you cast it, sacrifice it. Conjure a duplicate of it onto the battlefield. The duplicate perpetually becomes a Robot artifact in addition to its other types.
+SVar:TrigSac:DB$ SacrificeAll | Defined$ TriggeredCardLKICopy | SubAbility$ DBConjure
+SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ TriggeredCardLKICopy | Zone$ Battlefield | RememberMade$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Types$ Artifact,Robot | Duration$ Perpetual | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:This spell costs {1} less to cast for each creature card in your graveyard.\nWhenever another creature you control enters, if you cast it, sacrifice it. Conjure a duplicate of it onto the battlefield. The duplicate perpetually becomes a Robot artifact in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/upcoming/raphael_the_muscle.txt b/forge-gui/res/cardsfolder/upcoming/raphael_the_muscle.txt
new file mode 100644
index 00000000000..7c8b4212bec
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/raphael_the_muscle.txt
@@ -0,0 +1,11 @@
+Name:Raphael, the Muscle
+ManaCost:4 R
+Types:Legendary Creature Mutant Ninja Turtle
+PT:4/4
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl+HasCounters | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ Double all damage that creatures you control with counters on them would deal.
+SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create a Mutagen token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_mutagen_sac | TokenOwner$ You
+K:Partner - Character select
+SVar:X:ReplaceCount$DamageAmount/Twice
+Oracle:Double all damage that creatures you control with counters on them would deal.\nWhen Raphael enters, create a Mutagen token.\nPartner—Character select (You can have two commanders if both have this ability.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/rinoa_angel_wing.txt b/forge-gui/res/cardsfolder/upcoming/rinoa_angel_wing.txt
new file mode 100644
index 00000000000..c36355c5c03
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/rinoa_angel_wing.txt
@@ -0,0 +1,9 @@
+Name:Rinoa, Angel Wing
+ManaCost:2 W
+Types:Legendary Creature Human Rebel Warlock
+PT:2/4
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ At the beginning of combat on your turn, creatures you control with flying get +1/+1 and gain vigilance until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl+withFlying | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.attacking+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | OptionalDecider$ You | ResolvedLimit$ 1 | Execute$ TrigChangeZone | TriggerDescription$ Whenever one or more attacking creatures you control die, you may return one of them to the battlefield tapped under its owner's control with a flying counter on it. Do this only once each turn.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | ChangeNum$ 1 | Destination$ Battlefield | Hidden$ True | Tapped$ True | ChooseFromDefined$ TriggeredCards | Mandatory$ True | WithCountersType$ Flying
+Oracle:At the beginning of combat on your turn, creatures you control with flying get +1/+1 and gain vigilance until end of turn.\nWhenever one or more attacking creatures you control die, you may return one of them to the battlefield tapped under its owner's control with a flying counter on it. Do this only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/search_for_dagger.txt b/forge-gui/res/cardsfolder/upcoming/search_for_dagger.txt
new file mode 100644
index 00000000000..63722e79fc8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/search_for_dagger.txt
@@ -0,0 +1,7 @@
+Name:Search for Dagger
+ManaCost:1 W
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever your commander enters or attacks, look at the top six cards of your library. You may reveal a legendary creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+T:Mode$ Attacks | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigDig | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever your commander enters or attacks, look at the top six cards of your library. You may reveal a legendary creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Creature.Legendary | RestRandomOrder$ True
+Oracle:Whenever your commander enters or attacks, look at the top six cards of your library. You may reveal a legendary creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/seifer_balamb_rival.txt b/forge-gui/res/cardsfolder/upcoming/seifer_balamb_rival.txt
new file mode 100644
index 00000000000..782ee963b4a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/seifer_balamb_rival.txt
@@ -0,0 +1,11 @@
+Name:Seifer, Balamb Rival
+ManaCost:2 B R
+Types:Legendary Creature Human Mercenary
+PT:4/3
+K:First Strike
+T:Mode$ AttackersDeclaredOneTarget | AttackedTarget$ Player | ValidAttackers$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGoad | TriggerDescription$ Whenever you attack a player, goad target creature that player controls.
+SVar:TrigGoad:DB$ Goad | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredAttackedTarget | TgtPrompt$ Select target creature that player controls
+T:Mode$ AttackerBlocked | ValidCard$ Creature.attacking Opponent | ValidBlocker$ Creature | Execute$ TrigPump | ValidBlockerAmount$ GE2 | TriggerDescription$ Whenever a creature attacking one of your opponents becomes blocked by two or more creatures, that attacking creature gains deathtouch until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttacker | KW$ Deathtouch
+SVar:PlayMain1:TRUE
+Oracle:First strike\nWhenever you attack a player, goad target creature that player controls.\nWhenever a creature attacking one of your opponents becomes blocked by two or more creatures, that attacking creature gains deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/sliver_weftwinder.txt b/forge-gui/res/cardsfolder/upcoming/sliver_weftwinder.txt
new file mode 100644
index 00000000000..ca92378651b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sliver_weftwinder.txt
@@ -0,0 +1,11 @@
+Name:Sliver Weftwinder
+ManaCost:W U B R G
+Types:Legendary Creature Sliver
+PT:6/6
+K:Warp:3
+S:Mode$ Continuous | Affected$ Sliver.YouOwn | AffectedZone$ Hand | AddKeyword$ Warp:3 | Description$ Sliver cards in your hand have warp {3}.
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ WeftwinderTrig | Description$ Sliver creatures you control have "When this creature enters, conjure a random card from the Slivers spellbook into the top ten cards of your library at random, then draw a card."
+SVar:WeftwinderTrig:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ WeftwinderConjure | TriggerDescription$ When this creature enters, conjure a random card from the Slivers spellbook into the top ten cards of your library at random, then draw a card.
+SVar:WeftwinderConjure:DB$ MakeCard | Conjure$ True | AtRandom$ True | Zone$ Library | LibraryPosition$ Count$Random.0.10 | SpellbookName$ Slivers | Spellbook$ Belligerent Sliver,Bladeback Sliver,Blur Sliver,Bonescythe Sliver,Cleaving Sliver,Cloudshredder Sliver,Diffusion Sliver,Dregscape Sliver,Enduring Sliver,First Sliver's Chosen,Hollowhead Sliver,Lancer Sliver,Lavabelly Sliver,Leeching Sliver,Manaweft Sliver,Predatory Sliver,Scuttling Sliver,Sentinel Sliver,Sliver Hivelord,Spiteful Sliver,Steelform Sliver,Striking Sliver,Tempered Sliver,The First Sliver | SubAbility$ WeftwinderDraw
+SVar:WeftwinderDraw:DB$ Draw
+Oracle:Sliver cards in your hand have warp {3}.\nSliver creatures you control have "When this creature enters, conjure a random card from the Slivers spellbook into the top ten cards of your library at random, then draw a card."\nWarp {3}
diff --git a/forge-gui/res/cardsfolder/upcoming/spirited_simulacrum.txt b/forge-gui/res/cardsfolder/upcoming/spirited_simulacrum.txt
new file mode 100644
index 00000000000..aae28d246c9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/spirited_simulacrum.txt
@@ -0,0 +1,12 @@
+Name:Spirited Simulacrum
+ManaCost:4
+Types:Artifact Creature Robot
+PT:2/1
+K:Warp:4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSeekLand | TriggerDescription$ When this creature enters, seek a land card and put it onto the battlefield tapped.
+SVar:TrigSeekLand:DB$ Seek | Type$ Card.Land | RememberFound$ True | SubAbility$ DBPut
+SVar:DBPut:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Defined$ Remembered | Tapped$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigSeekNonLand | TriggerDescription$ When this creature leaves the battlefield, seek a nonland card.
+SVar:TrigSeekNonLand:DB$ Seek | Type$ Card.nonLand
+Oracle:When this creature enters, seek a land card and put it onto the battlefield tapped.\nWhen this creature leaves the battlefield, seek a nonland card.\nWarp {4}
diff --git a/forge-gui/res/cardsfolder/upcoming/splinter_the_mentor.txt b/forge-gui/res/cardsfolder/upcoming/splinter_the_mentor.txt
new file mode 100644
index 00000000000..714f02dcdfd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/splinter_the_mentor.txt
@@ -0,0 +1,10 @@
+Name:Splinter, the Mentor
+ManaCost:1 B
+Types:Legendary Creature Mutant Ninja Rat
+PT:2/2
+K:Menace
+T:Mode$ ChangesZone | ValidCard$ Card.Self,Creature.Other+!token+YouCtrl | Origin$ Battlefield | Destination$ Any | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME or another nontoken creature you control leaves the battlefield, create a Mutagen token.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_mutagen_sac | TokenOwner$ You
+K:Partner - Character select
+DeckHas:Ability$Token & Type$Artifact|Mutagen
+Oracle:Menace\nWhenever Splinter or another nontoken creature you control leaves the battlefield, create a Mutagen token.\nPartner—Character select (You can have two commanders if both have this ability.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/squadron_carrier.txt b/forge-gui/res/cardsfolder/upcoming/squadron_carrier.txt
new file mode 100644
index 00000000000..18ffa7c260c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/squadron_carrier.txt
@@ -0,0 +1,10 @@
+Name:Squadron Carrier
+ManaCost:2 W
+Types:Artifact Spacecraft
+PT:4/4
+K:Station:10
+S:Mode$ Continuous | Affected$ Spacecraft.YouCtrl | AddAbility$ ABConjureExh | Description$ Spacecraft you control have "Exhaust — {W}: Conjure a card named Starfighter Pilot onto the battlefield."
+SVar:ABConjureExh:AB$ MakeCard | Cost$ W | Conjure$ True | Name$ Starfighter Pilot | Zone$ Battlefield | Exhaust$ True | SpellDescription$ Conjure a card named Starfighter Pilot onto the battlefield.
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE10_CHARGE | AddType$ Creature | AddStaticAbility$ CarrierStatic | Description$ STATION 10+ Creatures you control have flying.
+SVar:CarrierStatic:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Flying | Description$ Creatures you control have flying.
+Oracle:Spacecraft you control have "Exhaust — {W}: Conjure a card named Starfighter Pilot onto the battlefield."\nStation\nSTATION 10+\nCreatures you control have flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/squall_gunblade_duelist.txt b/forge-gui/res/cardsfolder/upcoming/squall_gunblade_duelist.txt
new file mode 100644
index 00000000000..2a310097f3a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/squall_gunblade_duelist.txt
@@ -0,0 +1,12 @@
+Name:Squall, Gunblade Duelist
+ManaCost:R W B
+Types:Legendary Creature Human Mercenary
+PT:3/2
+K:First Strike
+K:ETBReplacement:Other:ChooseNumber
+SVar:ChooseNumber:DB$ ChooseNumber | Defined$ You | SpellDescription$ As NICKNAME enters, choose a number.
+T:Mode$ AttackersDeclaredOneTarget | AttackedTarget$ Opponent | ValidAttackers$ Creature.powerEQChosen,Creature.toughnessEQChosen | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever one or more creatures attack one of your opponents, if any of those creatures have power or toughness equal to the chosen number, NICKNAME deals damage equal to its power to defending player.
+SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredAttackedTarget | NumDmg$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1
+SVar:X:Count$CardPower
+SVar:Y:Count$Valid Creature.TriggeredAttackers+powerEQChosen,Creature.TriggeredAttackers+toughnessEQChosen
+Oracle:First strike\nAs Squall enters, choose a number.\nWhenever one or more creatures attack one of your opponents, if any of those creatures have power or toughness equal to the chosen number, Squall deals damage equal to its power to defending player.
diff --git a/forge-gui/res/cardsfolder/upcoming/super_shredder.txt b/forge-gui/res/cardsfolder/upcoming/super_shredder.txt
new file mode 100644
index 00000000000..1b3164b9ea4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/super_shredder.txt
@@ -0,0 +1,9 @@
+Name:Super Shredder
+ManaCost:1 B
+Types:Legendary Creature Mutant Ninja Human
+PT:1/1
+K:Menace
+T:Mode$ ChangesZone | ValidCard$ Permanent.Other | Origin$ Battlefield | Destination$ Any | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever another permanent leaves the battlefield, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
+Oracle:Menace\nWhenever another permanent leaves the battlefield, put a +1/+1 counter on Super Shredder.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sygg_wanderwine_wisdom_sygg_wanderbrine_shield.txt b/forge-gui/res/cardsfolder/upcoming/sygg_wanderwine_wisdom_sygg_wanderbrine_shield.txt
new file mode 100644
index 00000000000..11d6dcce0b5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sygg_wanderwine_wisdom_sygg_wanderbrine_shield.txt
@@ -0,0 +1,28 @@
+Name:Sygg, Wanderwine Wisdom
+ManaCost:1 U
+Types:Legendary Creature Merfolk Wizard
+PT:2/2
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, target creature gains "Whenever this creature deals combat damage to a player or planeswalker, draw a card" until end of turn.
+T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigAnimate | Secondary$ True | TriggerDescription$ Whenever this creature enters or transforms into CARDNAME, target creature gains "Whenever this creature deals combat damage to a player or planeswalker, draw a card" until end of turn.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature | Triggers$ DamageTrig
+SVar:DamageTrig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Planeswalker | Execute$ TrigDraw | CombatDamage$ True | TriggerDescription$ Whenever this creature deals combat damage to a player or planeswalker, draw a card
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {W}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ W | Defined$ Self | Mode$ Transform
+AlternateMode:DoubleFaced
+Oracle:Sygg can't be blocked.\nWhenever this creature enters or transforms into Sygg, Wanderwine Wisdom, target creature gains "Whenever this creature deals combat damage to a player or planeswalker, draw a card" until end of turn.\nAt the beginning of your first main phase, you may pay {W}. If you do, transform Sygg.
+
+ALTERNATE
+
+Name:Sygg, Wanderbrine Shield
+ManaCost:no cost
+Colors:white
+Types:Legendary Creature Merfolk Rogue
+PT:2/2
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ TrigProt | TriggerDescription$ Whenever this creature transforms into CARDNAME, target creature you control gains protection from each color until your next turn.
+SVar:TrigProt:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Protection from each color | Duration$ UntilYourNextTurn
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of your first main phase, you may pay {U}. If you do, transform NICKNAME.
+SVar:TrigTransform:AB$ SetState | Cost$ U | Defined$ Self | Mode$ Transform
+Oracle:Sygg can't be blocked.\nWhenever this creature transforms into Sygg, Wanderbrine Shield, target creature you control gains protection from each color until your next turn.\nAt the beginning of your first main phase, you may pay {U}. If you do, transform Sygg.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_destined_black_mage.txt b/forge-gui/res/cardsfolder/upcoming/the_destined_black_mage.txt
new file mode 100644
index 00000000000..ac77619e6f1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_destined_black_mage.txt
@@ -0,0 +1,14 @@
+Name:The Destined Black Mage
+ManaCost:2 B
+Types:Legendary Creature Human Wizard
+PT:3/2
+K:Deathtouch
+A:AB$ Pump | Cost$ B T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | KW$ Deathtouch | SpellDescription$ Another target creature you control gains deathtouch until end of turn.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever you cast a noncreature spell, CARDNAME deals 1 damage to each opponent. If you have a full party, it deals 3 damage to each opponent instead.
+SVar:TrigDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ X
+SVar:X:Count$Compare Y EQ4.3.1
+SVar:Y:Count$Party
+SVar:BuffedBy:Cleric,Rogue,Warrior
+DeckHas:Ability$Party
+DeckHints:Type$Cleric|Rogue|Warrior
+Oracle:Deathtouch\n{B}, {T}: Another target creature you control gains deathtouch until end of turn.\nWhenever you cast a noncreature spell, The Destined Black Mage deals 1 damage to each opponent. If you have a full party, it deals 3 damage to each opponent instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_destined_thief.txt b/forge-gui/res/cardsfolder/upcoming/the_destined_thief.txt
new file mode 100644
index 00000000000..6c3dfac6341
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_destined_thief.txt
@@ -0,0 +1,17 @@
+Name:The Destined Thief
+ManaCost:2 U
+Types:Legendary Creature Human Rogue
+PT:2/2
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
+A:AB$ Effect | Cost$ U T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | AILogic$ Pump | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Another target creature you control can't be blocked this turn.
+SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
+T:Mode$ DamageAll | CombatDamage$ True | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Whenever one or more creatures you control deal combat damage to one or more players, draw a card, then discard a card. If you have a full party, instead draw three cards.
+SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$EQ4 | TrueSubAbility$ DBDraw1 | FalseSubAbility$ DBDraw2
+SVar:DBDraw1:DB$ Draw | NumCards$ 3
+SVar:DBDraw2:DB$ Draw | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
+SVar:X:Count$Party
+SVar:BuffedBy:Cleric,Warrior,Wizard
+DeckHas:Ability$Party
+DeckHints:Type$Cleric|Warrior|Wizard
+Oracle:The Destined Thief can't be blocked.\n{U}, {T}: Another target creature you control can't be blocked this turn.\nWhenever one or more creatures you control deal combat damage to one or more players, draw a card, then discard a card. If you have a full party, instead draw three cards.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_destined_warrior.txt b/forge-gui/res/cardsfolder/upcoming/the_destined_warrior.txt
new file mode 100644
index 00000000000..8c9cf62f330
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_destined_warrior.txt
@@ -0,0 +1,16 @@
+Name:The Destined Warrior
+ManaCost:1 W U B
+Types:Legendary Creature Human Warrior
+PT:3/3
+K:First Strike
+K:Vigilance
+K:Menace
+S:Mode$ ReduceCost | ValidCard$ Cleric,Rogue,Warrior,Wizard | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Cleric, Rogue, Warrior, and Wizard spells you cast cost {1} less to cast.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ At the beginning of combat on your turn, creatures you control get +1/+0 until end of turn. If you have a full party, creatures you control get +3/+0 until end of turn instead.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +X
+SVar:X:Count$Compare Y EQ4.3.1
+SVar:Y:Count$Party
+SVar:BuffedBy:Cleric,Rogue,Wizard
+DeckHas:Ability$Party
+DeckHints:Type$Cleric|Rogue|Warrior|Wizard
+Oracle:First strike, vigilance, menace\nCleric, Rogue, Warrior, and Wizard spells you cast cost {1} less to cast.\nAt the beginning of combat on your turn, creatures you control get +1/+0 until end of turn. If you have a full party, creatures you control get +3/+0 until end of turn instead.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_destined_white_mage.txt b/forge-gui/res/cardsfolder/upcoming/the_destined_white_mage.txt
new file mode 100644
index 00000000000..5621c7503dc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_destined_white_mage.txt
@@ -0,0 +1,14 @@
+Name:The Destined White Mage
+ManaCost:2 W
+Types:Legendary Creature Human Cleric
+PT:2/3
+K:Lifelink
+A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | KW$ Lifelink | SpellDescription$ Another target creature you control gains lifelink until end of turn.
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put a +1/+1 counter on target creature you control. If you have a full party, put three +1/+1 counters on that creature instead.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Count$Compare Y EQ4.3.1
+SVar:Y:Count$Party
+SVar:BuffedBy:Rogue,Warrior,Wizard
+DeckHas:Ability$Party
+DeckHints:Type$Rogue|Warrior|Wizard
+Oracle:Lifelink\n{W}, {T}: Another target creature you control gains lifelink until end of turn.\nWhenever you gain life, put a +1/+1 counter on target creature you control. If you have a full party, put three +1/+1 counters on that creature instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/thought_partition.txt b/forge-gui/res/cardsfolder/upcoming/thought_partition.txt
new file mode 100644
index 00000000000..3344644497f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/thought_partition.txt
@@ -0,0 +1,8 @@
+Name:Thought Partition
+ManaCost:W
+Types:Sorcery
+A:SP$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBChooseCard | StackDescription$ REP Target opponent_{p:Targeted} & You may_{p:You} may & If you_If they | SpellDescription$ Target opponent reveals all nonland cards in their hand. You may choose one of those cards. If you do, it perpetually becomes white and its mana cost perpetually becomes {5}.
+SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | ChoiceZone$ Hand | Choices$ Card.IsRemembered | ChoiceTitle$ Choose a card that was revealed in targeted player's hand | SubAbility$ DBAnimate | StackDescription$ None
+SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | Colors$ White | OverwriteColors$ True | ManaCost$ 5 | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Target opponent reveals all nonland cards in their hand. You may choose one of those cards. If you do, it perpetually becomes white and its mana cost perpetually becomes {5}.
diff --git a/forge-gui/res/cardsfolder/upcoming/turtles_forever.txt b/forge-gui/res/cardsfolder/upcoming/turtles_forever.txt
new file mode 100644
index 00000000000..3feabc1db18
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/turtles_forever.txt
@@ -0,0 +1,8 @@
+Name:Turtles Forever
+ManaCost:3 W
+Types:Instant
+A:SP$ ChangeZone | Origin$ Library,Sideboard | ChangeType$ Creature.Legendary | ChangeNum$ 4 | RememberChanged$ True | Exactly$ True | Reveal$ True | Shuffle$ False | DifferentNames$ True | SubAbility$ DBChangeZone | SpellDescription$ Search your library and/or outside the game for exactly four legendary creature cards you own with different names, then reveal those cards. An opponent chooses two of them. Put the chosen cards into your hand and shuffle the rest into your library.
+SVar:DBChangeZone:DB$ ChangeZone | Chooser$ Opponent | SelectPrompt$ Choose two cards for the hand | NoLooking$ True | Hidden$ True | Origin$ Library,Sideboard | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | Mandatory$ True | SelectPrompt$ Select two cards for the hand | Shuffle$ False | ForgetChanged$ True | SubAbility$ DBChangeZoneAll
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Library,Sideboard | Destination$ Library | ChangeType$ Card.IsRemembered | Shuffle$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Search your library and/or outside the game for exactly four legendary creature cards you own with different names, then reveal those cards. An opponent chooses two of them. Put the chosen cards into your hand and shuffle the rest into your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/vivis_persistence.txt b/forge-gui/res/cardsfolder/upcoming/vivis_persistence.txt
new file mode 100644
index 00000000000..f0ba1f67b23
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vivis_persistence.txt
@@ -0,0 +1,9 @@
+Name:Vivi's Persistence
+ManaCost:1 R
+Types:Instant
+A:SP$ Token | TokenScript$ b_0_1_wizard_snipe | TokenAmount$ 1 | TokenOwner$ You | SpellDescription$ Create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigChangeZone | TriggerZones$ Graveyard | TriggerDescription$ Whenever your commander enters or attacks, you may pay {2}. If you do, return this card from your graveyard to your hand.
+T:Mode$ Attacks | ValidCard$ Card.IsCommander+YouOwn | Execute$ TrigChangeZone | TriggerZones$ Graveyard | Secondary$ True | TriggerDescription$ Whenever your commander enters or attacks, you may pay {2}. If you do, return this card from your graveyard to your hand.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 2 | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+DeckHas:Ability$Token
+Oracle:Create a 0/1 black Wizard creature token with "Whenever you cast a noncreature spell, this token deals 1 damage to each opponent."\nWhenever your commander enters or attacks, you may pay {2}. If you do, return this card from your graveyard to your hand.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/volatile_orbit.txt b/forge-gui/res/cardsfolder/upcoming/volatile_orbit.txt
new file mode 100644
index 00000000000..093afb64140
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/volatile_orbit.txt
@@ -0,0 +1,7 @@
+Name:Volatile Orbit
+ManaCost:R G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | IsPresent$ Planet.YouCtrl | TriggerDescription$ When this enchantment enters, if you control a Planet, this enchantment deals 4 damage to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 4
+A:AB$ MakeCard | Cost$ 1 R G Sac<1/CARDNAME/this enchantment> | Conjure$ True | SorcerySpeed$ True | SpellbookName$ Planets | Spellbook$ Adagia; Windswept Bastion,Evendo; Waking Haven,Kavaron; Memorial World,Susur Secundi; Void Altar,Uthros; Titanic Godcore | Zone$ Battlefield | Tapped$ True | WithCounter$ CHARGE | WithCounterNum$ 8 | SpellDescription$ Conjure a card of your choice from the Planets spellbook onto the battlefield tapped with eight charge counters on it. Activate only as a sorcery.
+Oracle:When this enchantment enters, if you control a Planet, this enchantment deals 4 damage to any target.\n{1}{R}{G}, Sacrifice this enchantment: Conjure a card of your choice from the Planets spellbook onto the battlefield tapped with eight charge counters on it. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/warriors_resolve.txt b/forge-gui/res/cardsfolder/upcoming/warriors_resolve.txt
new file mode 100644
index 00000000000..17b6338b4e6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/warriors_resolve.txt
@@ -0,0 +1,8 @@
+Name:Warrior's Resolve
+ManaCost:2 W
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Training | Description$ Creatures you control have training. (Whenever a creature you control attacks with another creature with greater power, put a +1/+1 counter on the creature with lesser power.)
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl+counters_GE1_P1P1+attackedThisTurn | PresentCompare$ GE1 | TriggerDescription$ At the beginning of your end step, if you control a creature with a +1/+1 counter on it that attacked this turn, draw a card.
+SVar:TrigDraw:DB$ Draw
+SVar:PlayMain1:TRUE
+Oracle:Creatures you control have training. (Whenever a creature you control attacks with another creature with greater power, put a +1/+1 counter on the creature with lesser power.)\nAt the beginning of your end step, if you control a creature with a +1/+1 counter on it that attacked this turn, draw a card.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/val_marooned_surveyor.txt b/forge-gui/res/cardsfolder/v/val_marooned_surveyor.txt
new file mode 100644
index 00000000000..e6440d8db98
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/val_marooned_surveyor.txt
@@ -0,0 +1,13 @@
+Name:Val, Marooned Surveyor
+ManaCost:R GW
+Types:Legendary Creature Human Scout
+PT:2/3
+K:Vigilance
+T:Mode$ Discover | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you discover, investigate, scry, surveil, or seek one or more cards, NICKNAME deals 1 damage to each opponent and you gain 1 life.
+T:Mode$ Investigated | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | Secondary$ True | TriggerDescription$ Whenever you discover, investigate, scry, surveil, or seek one or more cards, NICKNAME deals 1 damage to each opponent and you gain 1 life.
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | Secondary$ True | TriggerDescription$ Whenever you discover, investigate, scry, surveil, or seek one or more cards, NICKNAME deals 1 damage to each opponent and you gain 1 life.
+T:Mode$ Surveil | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | Secondary$ True | TriggerDescription$ Whenever you discover, investigate, scry, surveil, or seek one or more cards, NICKNAME deals 1 damage to each opponent and you gain 1 life.
+T:Mode$ SeekAll | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDmg | Secondary$ True | TriggerDescription$ Whenever you discover, investigate, scry, surveil, or seek one or more cards, NICKNAME deals 1 damage to each opponent and you gain 1 life.
+SVar:TrigDmg:DB$ DamageAll | ValidPlayers$ Opponent | NumDmg$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+Oracle:Vigilance\nWhenever you discover, investigate, scry, surveil, or seek one or more cards, Val deals 1 damage to each opponent and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt b/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
index 3fae1dd8263..e97d901375a 100644
--- a/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
+++ b/forge-gui/res/cardsfolder/v/valakut_the_molten_pinnacle.txt
@@ -4,6 +4,6 @@ Types:Land
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
 SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 T:Mode$ ChangesZone | ValidCard$ Mountain.YouCtrl | Origin$ Any | Destination$ Battlefield | Execute$ TrigDamage | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE6 | NoResolvingCheck$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Mountain you control enters, if you control at least five other Mountains, you may have CARDNAME deal 3 damage to any target.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | ConditionPresent$ Mountain.YouCtrl+NotTriggeredCard | ConditionCompare$ GE5 | OptionalDecider$ You
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 3 | ConditionPresent$ Mountain.YouCtrl+!TriggeredCard | ConditionCompare$ GE5 | OptionalDecider$ You
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 Oracle:Valakut, the Molten Pinnacle enters tapped.\nWhenever a Mountain you control enters, if you control at least five other Mountains, you may have Valakut, the Molten Pinnacle deal 3 damage to any target.\n{T}: Add {R}.
diff --git a/forge-gui/res/cardsfolder/v/vastwood_surge.txt b/forge-gui/res/cardsfolder/v/vastwood_surge.txt
index 3386505c769..4bcb308f651 100644
--- a/forge-gui/res/cardsfolder/v/vastwood_surge.txt
+++ b/forge-gui/res/cardsfolder/v/vastwood_surge.txt
@@ -2,7 +2,7 @@ Name:Vastwood Surge
 ManaCost:3 G
 Types:Sorcery
 K:Kicker:4
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBPutCounterAll | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. If this spell was kicked, put two +1/+1 counters on each creature you control.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Tapped$ True | SubAbility$ DBPutCounterAll | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. If this spell was kicked, put two +1/+1 counters on each creature you control.
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 2 | Condition$ Kicked | StackDescription$ None
 DeckHas:Ability$Counters
 Oracle:Kicker {4} (You may pay an additional {4} as you cast this spell.)\nSearch your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle. If this spell was kicked, put two +1/+1 counters on each creature you control.
diff --git a/forge-gui/res/cardsfolder/v/veilstone_amulet.txt b/forge-gui/res/cardsfolder/v/veilstone_amulet.txt
index bd23b0a4f20..4c708d9c135 100644
--- a/forge-gui/res/cardsfolder/v/veilstone_amulet.txt
+++ b/forge-gui/res/cardsfolder/v/veilstone_amulet.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Whenever you cast a spell, creatures you control can't be the targets of spells or abilities your opponents control this turn.
 SVar:TrigEffect:DB$ Effect | StaticAbilities$ CantTarget
-SVar:CantTarget:Mode$ CantTarget | ValidCard$ Creature.YouCtrl | Activator$ Opponent | Description$ Creatures you control can't be the targets of spells or abilities your opponents control.
+SVar:CantTarget:Mode$ CantTarget | ValidTarget$ Creature.YouCtrl | Activator$ Opponent | Description$ Creatures you control can't be the targets of spells or abilities your opponents control.
 SVar:BuffedBy:Card
 AI:RemoveDeck:Random
 Oracle:Whenever you cast a spell, creatures you control can't be the targets of spells or abilities your opponents control this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/venom_blast.txt b/forge-gui/res/cardsfolder/v/venom_blast.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venom_blast.txt
rename to forge-gui/res/cardsfolder/v/venom_blast.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/venom_eddie_brock.txt b/forge-gui/res/cardsfolder/v/venom_eddie_brock.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/upcoming/venom_eddie_brock.txt
rename to forge-gui/res/cardsfolder/v/venom_eddie_brock.txt
index d9ddc26fae9..cef924879ed 100644
--- a/forge-gui/res/cardsfolder/upcoming/venom_eddie_brock.txt
+++ b/forge-gui/res/cardsfolder/v/venom_eddie_brock.txt
@@ -1,7 +1,7 @@
 Name:Venom, Eddie Brock
 ManaCost:4 B B
 Types:Legendary Creature Symbiote Villain
-PT:3/3
+PT:6/4
 K:Menace
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on NICKNAME. If that creature was a Villain, draw a card.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
diff --git a/forge-gui/res/cardsfolder/upcoming/venom_evil_unleashed.txt b/forge-gui/res/cardsfolder/v/venom_evil_unleashed.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venom_evil_unleashed.txt
rename to forge-gui/res/cardsfolder/v/venom_evil_unleashed.txt
diff --git a/forge-gui/res/cardsfolder/v/venomized_cat.txt b/forge-gui/res/cardsfolder/v/venomized_cat.txt
new file mode 100644
index 00000000000..6bd832b56e3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/venomized_cat.txt
@@ -0,0 +1,9 @@
+Name:Venomized Cat
+ManaCost:2 B
+Types:Creature Symbiote Cat Villain
+PT:2/3
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When this creature enters, mill two cards. (Put the top two cards of your library into your graveyard.)
+SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 2
+DeckHints:Ability$Mill|Graveyard
+Oracle:Deathtouch\nWhen this creature enters, mill two cards. (Put the top two cards of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/upcoming/venoms_hunger.txt b/forge-gui/res/cardsfolder/v/venoms_hunger.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/venoms_hunger.txt
rename to forge-gui/res/cardsfolder/v/venoms_hunger.txt
diff --git a/forge-gui/res/cardsfolder/v/ventifact_bottle.txt b/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
index 123b6adc22a..3460e3acb7b 100644
--- a/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
+++ b/forge-gui/res/cardsfolder/v/ventifact_bottle.txt
@@ -1,7 +1,7 @@
 Name:Ventifact Bottle
 ManaCost:3
 Types:Artifact
-A:AB$ PutCounter | Cost$ X 1 T | CounterType$ CHARGE | CounterNum$ X | SorcerySpeed$ True | SpellDescription$ Put X charge counters on CARDNAME. Activate only any time you could cast a sorcery.
+A:AB$ PutCounter | Cost$ X 1 T | CounterType$ CHARGE | CounterNum$ X | SorcerySpeed$ True | SpellDescription$ Put X charge counters on CARDNAME. Activate only as a sorcery.
 T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGetMana | CheckSVar$ Y | SVarCompare$ GE1 | TriggerDescription$ At the beginning of your first main phase, if CARDNAME has a charge counter on it, tap it and remove all charge counters from it. Add {C} for each charge counter removed this way.
 SVar:TrigGetMana:DB$ Mana | Produced$ C | Amount$ Y | SubAbility$ TrigRemove
 SVar:TrigRemove:DB$ RemoveCounter | CounterType$ CHARGE | CounterNum$ Y | SubAbility$ DBTap
diff --git a/forge-gui/res/cardsfolder/v/verdant_catacombs.txt b/forge-gui/res/cardsfolder/v/verdant_catacombs.txt
index 89420bcd044..7b82954e7a8 100644
--- a/forge-gui/res/cardsfolder/v/verdant_catacombs.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_catacombs.txt
@@ -1,5 +1,5 @@
 Name:Verdant Catacombs
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Forest | ChangeNum$ 1 | SpellDescription$ Search your library for a Swamp or Forest card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Swamp,Forest | SpellDescription$ Search your library for a Swamp or Forest card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Verdant Catacombs: Search your library for a Swamp or Forest card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/verdant_confluence.txt b/forge-gui/res/cardsfolder/v/verdant_confluence.txt
index 1571878ba23..edc8d290804 100644
--- a/forge-gui/res/cardsfolder/v/verdant_confluence.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_confluence.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Charm | Choices$ DBPutCounter,DBChangeZone1,DBChangeZone2 | CharmNum$ 3 | CanRepeatModes$ True
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature.
 SVar:DBChangeZone1:DB$ ChangeZone | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target permanent card from your graveyard to your hand.
-SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:Choose three. You may choose the same mode more than once.\n• Put two +1/+1 counters on target creature.\n• Return target permanent card from your graveyard to your hand.\n• Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/verdant_crescendo.txt b/forge-gui/res/cardsfolder/v/verdant_crescendo.txt
index f4de7e8a0b4..1db3073a687 100644
--- a/forge-gui/res/cardsfolder/v/verdant_crescendo.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_crescendo.txt
@@ -1,7 +1,7 @@
 Name:Verdant Crescendo
 ManaCost:3 G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | Shuffle$ False | SubAbility$ DBSearch | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped. Search your library and graveyard for a card named Nissa, Nature's Artisan, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Shuffle$ False | SubAbility$ DBSearch | SpellDescription$ Search your library for a basic land card and put it onto the battlefield tapped. Search your library and graveyard for a card named Nissa, Nature's Artisan, reveal it, put it into your hand, then shuffle.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library,Graveyard | Destination$ Hand | ChangeType$ Card.namedNissa; Nature's Artisan | ChangeNum$ 1
 DeckHints:Name$Nissa, Nature's Artisan
 Oracle:Search your library for a basic land card and put it onto the battlefield tapped. Search your library and graveyard for a card named Nissa, Nature's Artisan, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/verdant_mastery.txt b/forge-gui/res/cardsfolder/v/verdant_mastery.txt
index 66bbc7cb3a6..230ea585e83 100644
--- a/forge-gui/res/cardsfolder/v/verdant_mastery.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_mastery.txt
@@ -2,7 +2,7 @@ Name:Verdant Mastery
 ManaCost:5 G
 Types:Sorcery
 S:Mode$ AlternativeCost | ValidSA$ Spell.Self | EffectZone$ All | Cost$ 3 G | Description$ You may pay {3}{G} rather than pay this spell's mana cost. | StackDescription$ Search your library for up to four basic land cards and reveal them. Put one of them onto the battlefield tapped under an opponent's control if the {3}{G} cost was paid. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle.
-A:SP$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 4 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBBranch | StackDescription$ Search your library for up to four basic land cards and reveal them. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle. | SpellDescription$ Search your library for up to four basic land cards and reveal them. Put one of them onto the battlefield tapped under an opponent's control if the {3}{G} cost was paid. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 4 | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBBranch | StackDescription$ Search your library for up to four basic land cards and reveal them. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle. | SpellDescription$ Search your library for up to four basic land cards and reveal them. Put one of them onto the battlefield tapped under an opponent's control if the {3}{G} cost was paid. Put two of them onto the battlefield tapped under your control and the rest into your hand. Then shuffle.
 SVar:DBBranch:DB$ Branch | BranchConditionSVar$ AltCostPaid | BranchConditionSVarCompare$ GE1 | TrueSubAbility$ OppShare | FalseSubAbility$ DBChangeZone2
 SVar:OppShare:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | SelectPrompt$ Select a land to put onto the battlefield tapped under an opponent's control | GainControl$ ChosenPlayer | ForgetChanged$ True | NoShuffle$ True | SubAbility$ DBChangeZone2
diff --git a/forge-gui/res/cardsfolder/v/verrak_warped_sengir.txt b/forge-gui/res/cardsfolder/v/verrak_warped_sengir.txt
index 89c4ee547fb..84c4a28a1fc 100644
--- a/forge-gui/res/cardsfolder/v/verrak_warped_sengir.txt
+++ b/forge-gui/res/cardsfolder/v/verrak_warped_sengir.txt
@@ -5,7 +5,7 @@ PT:2/2
 K:Flying
 K:Deathtouch
 K:Lifelink
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | Condition$ LifePaid | TriggerZones$ Battlefield | Execute$ TrigCopySpell | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.!ManaAbility | Condition$ LifePaid | TriggerZones$ Battlefield | Execute$ TrigCopySpell | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ PayLife<X> | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 SVar:X:TriggerCount$LifeAmount
 Oracle:Flying, deathtouch, lifelink\nWhenever you activate an ability that isn't a mana ability, if life was paid to activate it, you may pay that much life again. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/v/vesuva.txt b/forge-gui/res/cardsfolder/v/vesuva.txt
index 95dfe9dbf7f..8a73c32230c 100644
--- a/forge-gui/res/cardsfolder/v/vesuva.txt
+++ b/forge-gui/res/cardsfolder/v/vesuva.txt
@@ -3,5 +3,5 @@ ManaCost:no cost
 Types:Land
 K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Land.Other | IntoPlayTapped$ True | SpellDescription$ You may have CARDNAME enter tapped as a copy of any land on the battlefield.
-SVar:NeedsToPlay:Land.YouDontCtrl+notnamedVesuva,Land.YouCtrl+nonLegendary+notnamedVesuva
+SVar:NeedsToPlay:Land.YouDontCtrl+!namedVesuva,Land.YouCtrl+nonLegendary+!namedVesuva
 Oracle:You may have Vesuva enter tapped as a copy of any land on the battlefield.
diff --git a/forge-gui/res/cardsfolder/v/veteran_explorer.txt b/forge-gui/res/cardsfolder/v/veteran_explorer.txt
index 76fee79cbd2..b72b63d14e6 100644
--- a/forge-gui/res/cardsfolder/v/veteran_explorer.txt
+++ b/forge-gui/res/cardsfolder/v/veteran_explorer.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Human Soldier Scout
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, each player may search their library for up to two basic land cards, put them onto the battlefield, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | DefinedPlayer$ Player | ChangeNum$ 2 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | DefinedPlayer$ Player | ChangeNum$ 2 | ShuffleNonMandatory$ True
 Oracle:When Veteran Explorer dies, each player may search their library for up to two basic land cards, put them onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/vibrant_cityscape.txt b/forge-gui/res/cardsfolder/v/vibrant_cityscape.txt
new file mode 100644
index 00000000000..118b71918cc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/vibrant_cityscape.txt
@@ -0,0 +1,5 @@
+Name:Vibrant Cityscape
+ManaCost:no cost
+Types:Land
+A:AB$ ChangeZone | Cost$ T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+Oracle:{T}, Sacrifice this land: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt b/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
index fe202451d2b..c6a663a3ff2 100644
--- a/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
+++ b/forge-gui/res/cardsfolder/v/viewpoint_synchronization.txt
@@ -2,7 +2,7 @@ Name:Viewpoint Synchronization
 ManaCost:4 G
 Types:Sorcery
 K:Freerunning:2 G
-A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeNum$ 3 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 3 | RememberChanged$ True | Reveal$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for up to three basic land cards and reveal them. Put two of them onto the battlefield tapped and the other into your hand, then shuffle.
 SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.IsRemembered | ChangeNum$ 2 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put onto the battlefield | Tapped$ True | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to put into your hand | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/v/villainous_wrath.txt b/forge-gui/res/cardsfolder/v/villainous_wrath.txt
new file mode 100644
index 00000000000..02a27c454be
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/villainous_wrath.txt
@@ -0,0 +1,7 @@
+Name:Villainous Wrath
+ManaCost:3 B B
+Types:Sorcery
+A:SP$ LoseLife | ValidTgts$ Opponent | LifeAmount$ X | SubAbility$ DBDestroyAll | SpellDescription$ Target opponent loses life equal to the number of creatures they control. Then destroy all creatures.
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature
+SVar:X:Count$Valid Creature.TargetedPlayerCtrl
+Oracle:Target opponent loses life equal to the number of creatures they control. Then destroy all creatures.
diff --git a/forge-gui/res/cardsfolder/upcoming/vindictive_warden.txt b/forge-gui/res/cardsfolder/v/vindictive_warden.txt
similarity index 92%
rename from forge-gui/res/cardsfolder/upcoming/vindictive_warden.txt
rename to forge-gui/res/cardsfolder/v/vindictive_warden.txt
index 01bac8a17b1..423b2a75186 100644
--- a/forge-gui/res/cardsfolder/upcoming/vindictive_warden.txt
+++ b/forge-gui/res/cardsfolder/v/vindictive_warden.txt
@@ -5,4 +5,4 @@ PT:2/3
 K:Menace
 K:Firebending:1
 A:AB$ DealDamage | Cost$ 3 | Defined$ Player.Opponent | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each opponent.
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nFirebending 1 (Whenever this creature attacks, add {R}. This mana lasts until end of combat.)\n{3}: This creature deals 1 damage to each opponent.
\ No newline at end of file
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nFirebending 1 (Whenever this creature attacks, add {R}. This mana lasts until end of combat.)\n{3}: This creature deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/v/vines_of_vastwood.txt b/forge-gui/res/cardsfolder/v/vines_of_vastwood.txt
index 59185119b8f..db766cb9809 100644
--- a/forge-gui/res/cardsfolder/v/vines_of_vastwood.txt
+++ b/forge-gui/res/cardsfolder/v/vines_of_vastwood.txt
@@ -4,6 +4,6 @@ Types:Instant
 K:Kicker:G
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ +X | SubAbility$ DBEffect | SpellDescription$ Target creature can't be the target of spells or abilities your opponents control this turn. If this spell was kicked, that creature gets +4/+4 until end of turn.
 SVar:DBEffect:DB$ Effect | Defined$ Targeted | AILogic$ Always | StaticAbilities$ STCantTarget | RememberObjects$ Targeted | ExileOnMoved$ Battlefield
-SVar:STCantTarget:Mode$ CantTarget | ValidCard$ Card.IsRemembered | Activator$ Player.Opponent | Description$ Target creature can't be the target of spells or abilities your opponents control this turn.
+SVar:STCantTarget:Mode$ CantTarget | ValidTarget$ Card.IsRemembered | Activator$ Player.Opponent | Description$ Target creature can't be the target of spells or abilities your opponents control this turn.
 SVar:X:Count$Kicked.4.0
 Oracle:Kicker {G} (You may pay an additional {G} as you cast this spell.)\nTarget creature can't be the target of spells or abilities your opponents control this turn. If this spell was kicked, that creature gets +4/+4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/viridian_emissary.txt b/forge-gui/res/cardsfolder/v/viridian_emissary.txt
index e73166fe97b..efc60a40b3d 100644
--- a/forge-gui/res/cardsfolder/v/viridian_emissary.txt
+++ b/forge-gui/res/cardsfolder/v/viridian_emissary.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Phyrexian Elf Scout
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:When Viridian Emissary dies, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/virtuss_maneuver.txt b/forge-gui/res/cardsfolder/v/virtuss_maneuver.txt
index ec3fc71676a..32a7bdea77b 100644
--- a/forge-gui/res/cardsfolder/v/virtuss_maneuver.txt
+++ b/forge-gui/res/cardsfolder/v/virtuss_maneuver.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ AssignGroup | Defined$ Player | Choices$ DBToHand,DBSacrifice | AILogic$ FriendOrFoe | SpellDescription$ For each player, choose friend or foe. Each friend returns a creature card from their graveyard to their hand. Each foe sacrifices a creature they control.
 SVar:DBToHand:DB$ ChangeZone | DefinedPlayer$ Remembered | ChangeType$ Creature | Hidden$ True | Mandatory$ True | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Each friend returns a creature card from their graveyard to their hand
-SVar:DBSacrifice:DB$ Sacrifice | Defined$ Remembered | SacValid$ Creature | SacMessage$ creature | StackDescription$ SpellDescription | SpellDescription$ Each foe sacrifices a creature they control.
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ Remembered | SacValid$ Creature | SacMessage$ creature | StackDescription$ SpellDescription | SpellDescription$ Each foe sacrifices a creature they control
 SVar:NeedsToPlayVar:Z GE2
 SVar:Z:SVar$Z1/Plus.Z2
 SVar:Z1:Count$ValidGraveyard Creature.YourTeamCtrl
diff --git a/forge-gui/res/cardsfolder/v/voidcalled_devotee.txt b/forge-gui/res/cardsfolder/v/voidcalled_devotee.txt
new file mode 100644
index 00000000000..956a57e1841
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/voidcalled_devotee.txt
@@ -0,0 +1,9 @@
+Name:Voidcalled Devotee
+ManaCost:1 B B
+Types:Creature Human Soldier
+PT:3/3
+K:Haste
+K:Warp:1 B
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigConjure | TriggerDescription$ Whenever this creature attacks, conjure a card named Cantor of the Refrain into your graveyard.
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Cantor of the Refrain | Zone$ Graveyard
+Oracle:Haste\nWhenever this creature attacks, conjure a card named Cantor of the Refrain into your graveyard.\nWarp {1}{B}
diff --git a/forge-gui/res/cardsfolder/v/voidslime.txt b/forge-gui/res/cardsfolder/v/voidslime.txt
index bc575a6f1a4..2146e05533f 100644
--- a/forge-gui/res/cardsfolder/v/voidslime.txt
+++ b/forge-gui/res/cardsfolder/v/voidslime.txt
@@ -2,5 +2,4 @@ Name:Voidslime
 ManaCost:G U U
 Types:Instant
 A:SP$ Counter | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target spell, activated ability, or triggered ability.
-AI:RemoveDeck:All
 Oracle:Counter target spell, activated ability, or triggered ability. (Mana abilities can't be targeted.)
diff --git a/forge-gui/res/cardsfolder/v/volatile_fault.txt b/forge-gui/res/cardsfolder/v/volatile_fault.txt
index 2f335b71539..f6b76ac11a1 100644
--- a/forge-gui/res/cardsfolder/v/volatile_fault.txt
+++ b/forge-gui/res/cardsfolder/v/volatile_fault.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land Cave
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Destroy | Cost$ 1 T Sac<1/CARDNAME> | ValidTgts$ Land.nonBasic+OppCtrl | TgtPrompt$ Select target nonbasic land an opponent controls | SubAbility$ DBSearch | AILogic$ GhostQuarter | SpellDescription$ Destroy target nonbasic land an opponent controls. That player may search their library for a basic land card, put it onto the battlefield, then shuffle. You create a Treasure token.
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBTreasure | StackDescription$ That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You create a Treasure token.
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SubAbility$ DBTreasure | StackDescription$ That land's controller may search their library for a basic land card, put it onto the battlefield, then shuffle. You create a Treasure token.
 SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac
 DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact
 Oracle:{T}: Add {C}.\n{1}, {T}, Sacrifice Volatile Fault: Destroy target nonbasic land an opponent controls. That player may search their library for a basic land card, put it onto the battlefield, then shuffle. You create a Treasure token.
diff --git a/forge-gui/res/cardsfolder/v/volcanic_salvo.txt b/forge-gui/res/cardsfolder/v/volcanic_salvo.txt
index d4c7da8aca3..6d47bbd8c25 100644
--- a/forge-gui/res/cardsfolder/v/volcanic_salvo.txt
+++ b/forge-gui/res/cardsfolder/v/volcanic_salvo.txt
@@ -2,6 +2,6 @@ Name:Volcanic Salvo
 ManaCost:10 R R
 Types:Sorcery
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ CARDNAME costs {X} less to cast, where X is the total power of creatures you control.
-SVar:X:Count$SumPower_Creature.YouCtrl
+SVar:X:Count$Valid Creature.YouCtrl$CardPower
 A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target creature and/or planeswalkers | NumDmg$ 6 | SpellDescription$ CARDNAME deals 6 damage to each of up to two target creatures and/or planeswalkers.
 Oracle:This spell costs {X} less to cast, where X is the total power of creatures you control.\nVolcanic Salvo deals 6 damage to each of up to two target creatures and/or planeswalkers.
diff --git a/forge-gui/res/cardsfolder/v/vulpine_harvester.txt b/forge-gui/res/cardsfolder/v/vulpine_harvester.txt
index 59b77e89ad2..83ecf16216d 100644
--- a/forge-gui/res/cardsfolder/v/vulpine_harvester.txt
+++ b/forge-gui/res/cardsfolder/v/vulpine_harvester.txt
@@ -4,7 +4,7 @@ Types:Creature Phyrexian Fox
 PT:3/3
 T:Mode$ AttackersDeclared | ValidAttackers$ Phyrexian.YouCtrl | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Phyrexians you control attack, return target artifact card from your graveyard to the battlefield if its mana value is less than or equal to their total power.
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl | ConditionDefined$ Targeted | ConditionPresent$ Card.cmcLEX | TgtPrompt$ Select target artifact in your graveyard | Origin$ Graveyard | Destination$ Battlefield
-SVar:X:Count$SumPower_Phyrexian.YouCtrl+attacking
+SVar:X:Count$Valid Phyrexian.YouCtrl+attacking$CardPower
 DeckHas:Ability$Graveyard
 DeckHints:Type$Artifact
 DeckNeeds:Type$Phyrexian
diff --git a/forge-gui/res/cardsfolder/v/vulture_scheming_scavenger.txt b/forge-gui/res/cardsfolder/v/vulture_scheming_scavenger.txt
new file mode 100644
index 00000000000..15cdd4ce10d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/vulture_scheming_scavenger.txt
@@ -0,0 +1,9 @@
+Name:Vulture, Scheming Scavenger
+ManaCost:5 UB
+Types:Legendary Creature Human Artificer Villain
+PT:4/6
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever NICKNAME attacks, other Villains you control gain flying until end of turn.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Villain.YouCtrl+StrictlyOther | KW$ Flying
+DeckHints:Type$Villain
+Oracle:Flying\nWhenever Vulture attacks, other Villains you control gain flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/vvviza_orbital_overseer.txt b/forge-gui/res/cardsfolder/v/vvviza_orbital_overseer.txt
new file mode 100644
index 00000000000..a77d4f7bfce
--- /dev/null
+++ b/forge-gui/res/cardsfolder/v/vvviza_orbital_overseer.txt
@@ -0,0 +1,13 @@
+Name:Vv'viza, Orbital Overseer
+ManaCost:1 G W U
+Types:Legendary Creature Jellyfish Advisor
+PT:4/4
+K:Flying
+K:Vigilance
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When NICKNAME enters, conjure a card of your choice from the Planets spellbook onto the battlefield.
+SVar:TrigConjure:DB$ MakeCard | Conjure$ True | SpellbookName$ Planets | Spellbook$ Adagia; Windswept Bastion,Evendo; Waking Haven,Kavaron; Memorial World,Susur Secundi; Void Altar,Uthros; Titanic Godcore | Zone$ Battlefield
+T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, create a Lander token. It becomes a 2/1 artifact creature and gains flying.
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_lander_sac_search | TokenAmount$ 1 | RememberTokens$ True | SubAbility$ DBAnimate
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Power$ 2 | Toughness$ 1 | Types$ Creature,Artifact | Keywords$ Flying | Duration$ Permanent
+DeckHas:Ability$Token
+Oracle:Flying, vigilance\nWhen Vv'viza enters, conjure a card of your choice from the Planets spellbook onto the battlefield.\nWhenever you attack, create a Lander token. It becomes a 2/1 artifact creature and gains flying.
diff --git a/forge-gui/res/cardsfolder/w/wake_the_dead.txt b/forge-gui/res/cardsfolder/w/wake_the_dead.txt
index 1bc518c106b..f174b37b7cc 100644
--- a/forge-gui/res/cardsfolder/w/wake_the_dead.txt
+++ b/forge-gui/res/cardsfolder/w/wake_the_dead.txt
@@ -2,8 +2,7 @@ Name:Wake the Dead
 ManaCost:X B B
 Types:Instant
 Text:Cast this spell only during combat on an opponent's turn.
-A:SP$ ChangeZone | TargetMin$ X | TargetMax$ X | OpponentTurn$ True | ActivationPhases$ BeginCombat->EndCombat | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select X target creatures in your graveyard | GainControl$ True | SubAbility$ DBPump | StackDescription$ Return X target creature cards [{c:Targeted}] from your graveyard to the battlefield. Sacrifice those creatures at the beginning of the next end step. | SpellDescription$ Return X target creature cards from your graveyard to the battlefield. Sacrifice those creatures at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | AtEOT$ Sacrifice
+A:SP$ ChangeZone | TargetMin$ X | TargetMax$ X | OpponentTurn$ True | ActivationPhases$ BeginCombat->EndCombat | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select X target creatures in your graveyard | GainControl$ True | AtEOT$ Sacrifice | StackDescription$ Return X target creature cards [{c:Targeted}] from your graveyard to the battlefield. Sacrifice those creatures at the beginning of the next end step. | SpellDescription$ Return X target creature cards from your graveyard to the battlefield. Sacrifice those creatures at the beginning of the next end step.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 DeckHas:Ability$Graveyard|Sacrifice
diff --git a/forge-gui/res/cardsfolder/w/wall_crawl.txt b/forge-gui/res/cardsfolder/w/wall_crawl.txt
new file mode 100644
index 00000000000..0b2113f08c3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/wall_crawl.txt
@@ -0,0 +1,11 @@
+Name:Wall Crawl
+ManaCost:3 G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this enchantment enters, create a 2/1 green Spider creature token with reach, then you gain 1 life for each Spider you control.
+SVar:TrigToken:DB$ Token | TokenScript$ g_2_1_spider_reach | TokenOwner$ You | TokenAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
+S:Mode$ Continuous | Affected$ Spider.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Spiders you control get +1/+1 and can't be blocked by creatures with defender.
+S:Mode$ CantBlockBy | ValidAttacker$ Spider.YouCtrl | ValidBlocker$ Creature.withDefender | Secondary$ True | Description$ Spiders you control get +1/+1 and can't be blocked by creatures with defender.
+SVar:X:Count$Valid Spider.YouCtrl
+DeckHints:Type$Spider
+Oracle:When this enchantment enters, create a 2/1 green Spider creature token with reach, then you gain 1 life for each Spider you control.\nSpiders you control get +1/+1 and can't be blocked by creatures with defender.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_shadows.txt b/forge-gui/res/cardsfolder/w/wall_of_shadows.txt
index cae8d55bbe9..1769231c074 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_shadows.txt
@@ -4,6 +4,6 @@ Types:Creature Wall
 PT:0/1
 K:Defender
 R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.blockedBySource | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures it's blocking.
-S:Mode$ CantTarget | ValidCard$ Card.Self | SourceCanOnlyTarget$ Wall | Description$ CARDNAME can't be the target of spells that can target only Walls or of abilities that can target only Walls.
+S:Mode$ CantTarget | ValidTarget$ Card.Self | SourceCanOnlyTarget$ Wall | Description$ CARDNAME can't be the target of spells that can target only Walls or of abilities that can target only Walls.
 AI:RemoveDeck:All
 Oracle:Defender (This creature can't attack.)\nPrevent all damage that would be dealt to Wall of Shadows by creatures it's blocking.\nWall of Shadows can't be the target of spells that can target only Walls or of abilities that can target only Walls.
diff --git a/forge-gui/res/cardsfolder/w/wanderers_twig.txt b/forge-gui/res/cardsfolder/w/wanderers_twig.txt
index fd2b863e2d3..f3b910ce4ce 100644
--- a/forge-gui/res/cardsfolder/w/wanderers_twig.txt
+++ b/forge-gui/res/cardsfolder/w/wanderers_twig.txt
@@ -1,5 +1,5 @@
 Name:Wanderer's Twig
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle.
+A:AB$ ChangeZone | Cost$ 1 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle.
 Oracle:{1}, Sacrifice Wanderer's Twig: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/warped_landscape.txt b/forge-gui/res/cardsfolder/w/warped_landscape.txt
index 790a70854f1..ef0f4fb95b1 100644
--- a/forge-gui/res/cardsfolder/w/warped_landscape.txt
+++ b/forge-gui/res/cardsfolder/w/warped_landscape.txt
@@ -2,5 +2,5 @@ Name:Warped Landscape
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{T}: Add {C}.\n{2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/warship_scout.txt b/forge-gui/res/cardsfolder/w/warship_scout.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/warship_scout.txt
rename to forge-gui/res/cardsfolder/w/warship_scout.txt
diff --git a/forge-gui/res/cardsfolder/w/waste_management.txt b/forge-gui/res/cardsfolder/w/waste_management.txt
index 9237fb2c9d5..2d9013edbce 100644
--- a/forge-gui/res/cardsfolder/w/waste_management.txt
+++ b/forge-gui/res/cardsfolder/w/waste_management.txt
@@ -2,7 +2,7 @@ Name:Waste Management
 ManaCost:2 B
 Types:Instant
 K:Kicker:3 B
-A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ X | TargetsFromSingleZone$ True | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | AITgts$ Creature | ValidTgts$ Card | TgtPrompt$ Choose up to two target cards in a single graveyard | SubAbility$ ExileGrave | SpellDescription$ Exile up to two target cards from a single graveyard.
+A:SP$ ChangeZone | TargetMin$ 0 | TargetMax$ X | TargetsWithSameController$ True | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | AITgts$ Creature | ValidTgts$ Card | TgtPrompt$ Choose up to two target cards in a single graveyard | SubAbility$ ExileGrave | SpellDescription$ Exile up to two target cards from a single graveyard.
 SVar:ExileGrave:DB$ ChangeZoneAll | TargetMin$ Y | TargetMax$ Y | ValidTgts$ Player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | RememberChanged$ True | SubAbility$ DBToken | SpellDescription$ If this spell was kicked, instead exile target player's graveyard.
 SVar:DBToken:DB$ Token | TokenAmount$ Z | TokenScript$ b_2_2_rogue | SubAbility$ DBCleanup | SpellDescription$ Create a 2/2 black Rogue creature token for each creature card exiled this way.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/w/wave_of_vitriol.txt b/forge-gui/res/cardsfolder/w/wave_of_vitriol.txt
index 5556d6f296f..f4864796cfd 100644
--- a/forge-gui/res/cardsfolder/w/wave_of_vitriol.txt
+++ b/forge-gui/res/cardsfolder/w/wave_of_vitriol.txt
@@ -3,7 +3,7 @@ ManaCost:5 G G
 Types:Sorcery
 A:SP$ SacrificeAll | ValidCards$ Artifact,Enchantment,Land.nonBasic | RememberSacrificed$ True | SubAbility$ DBRepeat | SpellDescription$ Each player sacrifices all artifacts, enchantments, and nonbasic lands they control. For each land sacrificed this way, its controller may search their library for a basic land card and put it onto the battlefield tapped. Then each player who searched their library this way shuffles.
 SVar:DBRepeat:DB$ RepeatEach | DefinedCards$ DirectRemembered.Land | UseImprinted$ True | RepeatSubAbility$ DBSearch | ClearRemembered$ True | SubAbility$ DBShuffle
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True | RememberSearched$ True | DefinedPlayer$ ImprintedController | Chooser$ ImprintedController | NoShuffle$ True | Optional$ True
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True | RememberSearched$ True | DefinedPlayer$ ImprintedController | Chooser$ ImprintedController | NoShuffle$ True | Optional$ True
 SVar:DBShuffle:DB$ Shuffle | Defined$ Player.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/w/wayfarers_bauble.txt b/forge-gui/res/cardsfolder/w/wayfarers_bauble.txt
index 333b41df7c6..7d4e5d3673a 100644
--- a/forge-gui/res/cardsfolder/w/wayfarers_bauble.txt
+++ b/forge-gui/res/cardsfolder/w/wayfarers_bauble.txt
@@ -1,5 +1,5 @@
 Name:Wayfarer's Bauble
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
 Oracle:{2}, {T}, Sacrifice Wayfarer's Bauble: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/web_of_life_and_destiny.txt b/forge-gui/res/cardsfolder/w/web_of_life_and_destiny.txt
new file mode 100644
index 00000000000..b3040dd524e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/web_of_life_and_destiny.txt
@@ -0,0 +1,8 @@
+Name:Web of Life and Destiny
+ManaCost:6 G G
+Types:Enchantment
+K:Convoke
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of combat on your turn, look at the top five cards of your library. You may put a creature card from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | ChangeValid$ Creature | Optional$ True | DestinationZone$ Battlefield | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True
+SVar:PlayMain1:TRUE
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nAt the beginning of combat on your turn, look at the top five cards of your library. You may put a creature card from among them onto the battlefield. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/w/web_shooters.txt b/forge-gui/res/cardsfolder/w/web_shooters.txt
new file mode 100644
index 00000000000..c2a2d98a909
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/web_shooters.txt
@@ -0,0 +1,9 @@
+Name:Web-Shooters
+ManaCost:1 W
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Reach | AddTrigger$ AttackTrig | AddSVar$ AE | Description$ Equipped creature gets +1/+1 and has reach and "Whenever this creature attacks, tap target creature an opponent controls."
+SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever this creature attacks, tap target creature an opponent controls.
+SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls
+K:Equip:2
+SVar:AE:SVar:HasAttackEffect:TRUE
+Oracle:Equipped creature gets +1/+1 and has reach and "Whenever this creature attacks, tap target creature an opponent controls."\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/upcoming/web_up.txt b/forge-gui/res/cardsfolder/w/web_up.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/web_up.txt
rename to forge-gui/res/cardsfolder/w/web_up.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/web_warriors.txt b/forge-gui/res/cardsfolder/w/web_warriors.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/web_warriors.txt
rename to forge-gui/res/cardsfolder/w/web_warriors.txt
diff --git a/forge-gui/res/cardsfolder/w/weird_harvest.txt b/forge-gui/res/cardsfolder/w/weird_harvest.txt
index fb8db36e313..b5966efd3e5 100644
--- a/forge-gui/res/cardsfolder/w/weird_harvest.txt
+++ b/forge-gui/res/cardsfolder/w/weird_harvest.txt
@@ -1,7 +1,7 @@
 Name:Weird Harvest
 ManaCost:X G G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | DefinedPlayer$ Player | ChangeType$ Card.Creature | Reveal$ True | Optional$ True | ShuffleNonMandatory$ True | ChangeNum$ X | SpellDescription$ Each player may search their library for up to X creature cards, reveal those cards, put them into their hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | DefinedPlayer$ Player | ChangeType$ Creature | Reveal$ True | Optional$ True | ShuffleNonMandatory$ True | ChangeNum$ X | SpellDescription$ Each player may search their library for up to X creature cards, reveal those cards, put them into their hand, then shuffle.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 Oracle:Each player may search their library for up to X creature cards, reveal those cards, put them into their hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/werewolf_pack_leader.txt b/forge-gui/res/cardsfolder/w/werewolf_pack_leader.txt
index 75f0c997f1e..2a1d2a003c6 100644
--- a/forge-gui/res/cardsfolder/w/werewolf_pack_leader.txt
+++ b/forge-gui/res/cardsfolder/w/werewolf_pack_leader.txt
@@ -5,5 +5,5 @@ PT:3/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerZones$ Battlefield | CheckSVar$ PackTactics | SVarCompare$ GE6 | NoResolvingCheck$ True | TriggerDescription$ Pack tactics — Whenever CARDNAME attacks, if you attacked with creatures with total power 6 or greater this combat, draw a card.
 A:AB$ Animate | Cost$ 3 G | Defined$ Self | Power$ 5 | Toughness$ 3 | Keywords$ Trample | RemoveTypes$ Human | SpellDescription$ Until end of turn, CARDNAME has base power and toughness 5/3, gains trample, and isn't a Human.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-SVar:PackTactics:Count$SumPower_Creature.attacking
+SVar:PackTactics:Count$Valid Creature.attacking$CardPower
 Oracle:Pack tactics — Whenever Werewolf Pack Leader attacks, if you attacked with creatures with total power 6 or greater this combat, draw a card.\n{3}{G}: Until end of turn, Werewolf Pack Leader has base power and toughness 5/3, gains trample, and isn't a Human.
diff --git a/forge-gui/res/cardsfolder/w/wheel_of_fortune.txt b/forge-gui/res/cardsfolder/w/wheel_of_fortune.txt
index 592a3c65c59..dda2fa73ceb 100644
--- a/forge-gui/res/cardsfolder/w/wheel_of_fortune.txt
+++ b/forge-gui/res/cardsfolder/w/wheel_of_fortune.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Discard | Mode$ Hand | Defined$ Player | SubAbility$ DBEachDraw | SpellDescription$ Each player discards their hand, then draws seven cards.
 SVar:DBEachDraw:DB$ Draw | Defined$ Player | NumCards$ 7
 SVar:NeedsToPlayVar:Y LE2
-SVar:Y:Count$ValidHand Card.YouOwn+notnamedWheel of Fortune
+SVar:Y:Count$ValidHand Card.YouOwn+!namedWheel of Fortune
 Oracle:Each player discards their hand, then draws seven cards.
diff --git a/forge-gui/res/cardsfolder/w/white_mages_staff.txt b/forge-gui/res/cardsfolder/w/white_mages_staff.txt
index 3f24d19d5b6..c1c86a4c1c0 100644
--- a/forge-gui/res/cardsfolder/w/white_mages_staff.txt
+++ b/forge-gui/res/cardsfolder/w/white_mages_staff.txt
@@ -8,4 +8,4 @@ SVar:TrigAttack:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigGainLife | T
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:AE:SVar:HasAttackEffect:TRUE
 DeckHas:Ability$LifeGain|Token & Type$Cleric
-Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +1/+1, has "Whenever this creature attacks, you gain 1 life," and is a Cleric in addition to its other types.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery)
+Oracle:Job select (When this Equipment enters, create a 1/1 colorless Hero creature token, then attach this to it.)\nEquipped creature gets +1/+1, has "Whenever this creature attacks, you gain 1 life," and is a Cleric in addition to its other types.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/w/white_orchid_phantom.txt b/forge-gui/res/cardsfolder/w/white_orchid_phantom.txt
index 1e2d4e58252..8940a099e7e 100644
--- a/forge-gui/res/cardsfolder/w/white_orchid_phantom.txt
+++ b/forge-gui/res/cardsfolder/w/white_orchid_phantom.txt
@@ -6,5 +6,5 @@ K:Flying
 K:First Strike
 T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy up to one target nonbasic land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select up to one target nonbasic land | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBSearch | AILogic$ GhostQuarter
-SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeNum$ 1 | Tapped$ True
+SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | DefinedPlayer$ TargetedController | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Tapped$ True
 Oracle:Flying, first strike\nWhen White Orchid Phantom enters, destroy up to one target nonbasic land. Its controller may search their library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/white_plume_adventurer.txt b/forge-gui/res/cardsfolder/w/white_plume_adventurer.txt
index 0441ab0e7eb..4bd103e86a9 100644
--- a/forge-gui/res/cardsfolder/w/white_plume_adventurer.txt
+++ b/forge-gui/res/cardsfolder/w/white_plume_adventurer.txt
@@ -8,5 +8,5 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefiel
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | TrueSubAbility$ DBUntapAll | FalseSubAbility$ DBUntap
 SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl
 SVar:DBUntap:DB$ Untap | UntapExactly$ True | UntapType$ Creature.YouCtrl+tapped | Amount$ 1
-SVar:X:PlayerCountPropertyYou$DungeonsCompleted
+SVar:X:DungeonsCompleted$Amount
 Oracle:When White Plume Adventurer enters battlefield, you take the initiative.\nAt the beginning of each opponent's upkeep, untap a creature you control. If you've completed a dungeon, untap all creatures you control instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/whoosh.txt b/forge-gui/res/cardsfolder/w/whoosh.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/whoosh.txt
rename to forge-gui/res/cardsfolder/w/whoosh.txt
diff --git a/forge-gui/res/cardsfolder/w/wild_crocodile.txt b/forge-gui/res/cardsfolder/w/wild_crocodile.txt
index a31753e29e7..49d36be5464 100644
--- a/forge-gui/res/cardsfolder/w/wild_crocodile.txt
+++ b/forge-gui/res/cardsfolder/w/wild_crocodile.txt
@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Host Creature Crocodile
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | Host$ True | TriggerDescription$ When this creature enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:When this creature enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/wild_endeavor.txt b/forge-gui/res/cardsfolder/w/wild_endeavor.txt
index c777509bae9..65cd84be586 100644
--- a/forge-gui/res/cardsfolder/w/wild_endeavor.txt
+++ b/forge-gui/res/cardsfolder/w/wild_endeavor.txt
@@ -3,6 +3,6 @@ ManaCost:4 G G
 Types:Sorcery
 A:SP$ RollDice | Amount$ 2 | Sides$ 4 | ChosenSVar$ X | OtherSVar$ Y | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ Roll two d4 and choose one result. Create a number of 3/3 green Beast creature tokens equal to that result. Then search your library for a number of basic land cards equal to the other result, put them onto the battlefield tapped, then shuffle.
 SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ g_3_3_beast | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | ChangeNum$ Y | ChangeType$ Land.Basic | Destination$ Battlefield | Tapped$ True | StackDescription$ None
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | ChangeNum$ Y | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | Destination$ Battlefield | Tapped$ True | StackDescription$ None
 DeckHas:Ability$Token
 Oracle:Roll two d4 and choose one result. Create a number of 3/3 green Beast creature tokens equal to that result. Then search your library for a number of basic land cards equal to the other result, put them onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/wild_field_scarecrow.txt b/forge-gui/res/cardsfolder/w/wild_field_scarecrow.txt
index 65d534edb1c..2166d0c21fc 100644
--- a/forge-gui/res/cardsfolder/w/wild_field_scarecrow.txt
+++ b/forge-gui/res/cardsfolder/w/wild_field_scarecrow.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact Creature Scarecrow
 PT:1/4
 K:Defender
-A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
 Oracle:Defender\n{2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/wild_pack_squad.txt b/forge-gui/res/cardsfolder/w/wild_pack_squad.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/upcoming/wild_pack_squad.txt
rename to forge-gui/res/cardsfolder/w/wild_pack_squad.txt
index 65b255a3f89..d950b866108 100644
--- a/forge-gui/res/cardsfolder/upcoming/wild_pack_squad.txt
+++ b/forge-gui/res/cardsfolder/w/wild_pack_squad.txt
@@ -1,7 +1,7 @@
 Name:Wild Pack Squad
 ManaCost:2 W
 Types:Creature Human Mercenary
-PT:2/2
+PT:2/3
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, up to one target creature gains first strike and vigilance until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | KW$ First Strike & Vigilance
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/w/wild_wanderer.txt b/forge-gui/res/cardsfolder/w/wild_wanderer.txt
index d2fdfbfc414..0ea0c69ec85 100644
--- a/forge-gui/res/cardsfolder/w/wild_wanderer.txt
+++ b/forge-gui/res/cardsfolder/w/wild_wanderer.txt
@@ -3,5 +3,5 @@ ManaCost:3 G
 Types:Creature Elf Druid
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land
 Oracle:When Wild Wanderer enters, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/winds_of_abandon.txt b/forge-gui/res/cardsfolder/w/winds_of_abandon.txt
index 202b5843423..5ce0a168546 100644
--- a/forge-gui/res/cardsfolder/w/winds_of_abandon.txt
+++ b/forge-gui/res/cardsfolder/w/winds_of_abandon.txt
@@ -4,7 +4,7 @@ Types:Sorcery
 A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | SubAbility$ DBGetLandsAll | RememberLKI$ True | SpellDescription$ Exile target creature you don't control. For each creature exiled this way, its controller searches their library for a basic land card. Those players put those cards onto the battlefield tapped, then shuffle.
 SVar:DBGetLandsAll:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBGetLandsOne | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBGetLandsOne:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ X | DefinedPlayer$ Player.IsRemembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
+SVar:DBGetLandsOne:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ X | DefinedPlayer$ Player.IsRemembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
 SVar:X:RememberedLKI$FilterControlledByRemembered_Number$1
 K:Overload:4 W W
 Oracle:Exile target creature you don't control. For each creature exiled this way, its controller searches their library for a basic land card. Those players put those cards onto the battlefield tapped, then shuffle.\nOverload {4}{W}{W} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/forge-gui/res/cardsfolder/w/windswept_heath.txt b/forge-gui/res/cardsfolder/w/windswept_heath.txt
index 3f654c895c6..b9b85aabc94 100644
--- a/forge-gui/res/cardsfolder/w/windswept_heath.txt
+++ b/forge-gui/res/cardsfolder/w/windswept_heath.txt
@@ -1,5 +1,5 @@
 Name:Windswept Heath
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | ChangeNum$ 1 | SpellDescription$ Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Forest,Plains | SpellDescription$ Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Windswept Heath: Search your library for a Forest or Plains card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/wisecrack.txt b/forge-gui/res/cardsfolder/w/wisecrack.txt
new file mode 100644
index 00000000000..a2d0840472e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/wisecrack.txt
@@ -0,0 +1,7 @@
+Name:Wisecrack
+ManaCost:2 R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | DamageSource$ Targeted | SubAbility$ DBDamage | SpellDescription$ Target creature deals damage equal to its power to itself. If that creature is attacking, CARDNAME deals 2 damage to that creature's controller.
+SVar:DBDamage:DB$ DealDamage | Defined$ TargetedController | NumDmg$ 2 | ConditionPresent$ Creature.targetedBy+attacking | ConditionCompare$ GE1
+SVar:X:Targeted$CardPower
+Oracle:Target creature deals damage equal to its power to itself. If that creature is attacking, Wisecrack deals 2 damage to that creature's controller.
diff --git a/forge-gui/res/cardsfolder/w/with_great_power.txt b/forge-gui/res/cardsfolder/w/with_great_power.txt
new file mode 100644
index 00000000000..fad13c949d5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/with_great_power.txt
@@ -0,0 +1,11 @@
+Name:With Great Power...
+ManaCost:3 W
+Types:Enchantment Aura
+K:Enchant:Creature.YouCtrl:creature you control
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | AddSVar$ EqMe & EnMe | Description$ Enchanted creature gets +2/+2 for each Aura and Equipment attached to it.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ You | ReplaceWith$ DmgEnchanted | DamageTarget$ Enchanted | Description$ All damage that would be dealt to you is dealt to enchanted creature instead.
+SVar:DmgEnchanted:DB$ ReplaceEffect | VarName$ Affected | VarValue$ Enchanted | VarType$ Card
+SVar:X:Count$Valid Aura.AttachedTo Creature.EnchantedBy,Equipment.AttachedTo Creature.EnchantedBy/Times.2
+SVar:EqMe:SVar:EquipMe:Multiple
+SVar:EnMe:SVar:EnchantMe:Multiple
+Oracle:Enchant creature you control\nEnchanted creature gets +2/+2 for each Aura and Equipment attached to it.\nAll damage that would be dealt to you is dealt to enchanted creature instead.
diff --git a/forge-gui/res/cardsfolder/w/wizened_mentor.txt b/forge-gui/res/cardsfolder/w/wizened_mentor.txt
index c159c94a484..2ed3cf369e0 100644
--- a/forge-gui/res/cardsfolder/w/wizened_mentor.txt
+++ b/forge-gui/res/cardsfolder/w/wizened_mentor.txt
@@ -2,6 +2,6 @@ Name:Wizened Mentor
 ManaCost:1 W
 Types:Creature Zombie Cleric
 PT:2/2
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidSA$ Activated.nonManaAbility | ActivationLimit$ 1 | TriggerZones$ Battlefield | ValidCard$ Permanent.inZoneBattlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent activates an ability of a permanent that isn't a mana ability, you create a 1/1 white Zombie creature token. This ability triggers only once each turn.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidSA$ Activated.!ManaAbility | ActivationLimit$ 1 | TriggerZones$ Battlefield | ValidCard$ Permanent.inZoneBattlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent activates an ability of a permanent that isn't a mana ability, you create a 1/1 white Zombie creature token. This ability triggers only once each turn.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_zombie
 Oracle:Whenever an opponent activates an ability of a permanent that isn't a mana ability, you create a 1/1 white Zombie creature token. This ability triggers only once each turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/wolf_cove_villager.txt b/forge-gui/res/cardsfolder/w/wolf_cove_villager.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/wolf_cove_villager.txt
rename to forge-gui/res/cardsfolder/w/wolf_cove_villager.txt
diff --git a/forge-gui/res/cardsfolder/w/wooded_foothills.txt b/forge-gui/res/cardsfolder/w/wooded_foothills.txt
index 48ba0218285..fb49cea9c94 100644
--- a/forge-gui/res/cardsfolder/w/wooded_foothills.txt
+++ b/forge-gui/res/cardsfolder/w/wooded_foothills.txt
@@ -1,5 +1,5 @@
 Name:Wooded Foothills
 ManaCost:no cost
 Types:Land
-A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Mountain,Forest | ChangeNum$ 1 | SpellDescription$ Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
+A:AB$ ChangeZone | Cost$ T PayLife<1> Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | ChangeType$ Mountain,Forest | SpellDescription$ Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
 Oracle:{T}, Pay 1 life, Sacrifice Wooded Foothills: Search your library for a Mountain or Forest card, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/woodland_champion.txt b/forge-gui/res/cardsfolder/w/woodland_champion.txt
index dea1d487785..0d393b2dc98 100644
--- a/forge-gui/res/cardsfolder/w/woodland_champion.txt
+++ b/forge-gui/res/cardsfolder/w/woodland_champion.txt
@@ -2,8 +2,8 @@ Name:Woodland Champion
 ManaCost:1 G
 Types:Creature Elf Scout
 PT:2/2
-T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutcounter | TriggerDescription$ Whenever one or more tokens you control enter, put that many +1/+1 counters on CARDNAME.
-SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X
+T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more tokens you control enter, put that many +1/+1 counters on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X
 SVar:X:TriggerCount$Amount
 DeckHints:Ability$Token
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/w/woodland_investigation.txt b/forge-gui/res/cardsfolder/w/woodland_investigation.txt
index 4c3098a4a69..11139a5c75c 100644
--- a/forge-gui/res/cardsfolder/w/woodland_investigation.txt
+++ b/forge-gui/res/cardsfolder/w/woodland_investigation.txt
@@ -1,7 +1,7 @@
 Name:Woodland Investigation
 ManaCost:G
 Types:Sorcery
-A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:DBAnimate:DB$ Animate | Types$ Clue,Artifact | Duration$ Perpetual | Abilities$ ClueSac | Defined$ Remembered | SubAbility$ DBCleanup | SpellDescription$ It perpetually becomes a Clue artifact in addition to its other types and gains "{2}, Sacrifice this permanent: Draw a card."
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:ClueSac:AB$ Draw | Cost$ 2 Sac<1/CARDNAME/this permanent> | NumCards$ 1 | SpellDescription$ Draw a card.
diff --git a/forge-gui/res/cardsfolder/w/world_map.txt b/forge-gui/res/cardsfolder/w/world_map.txt
index cc25adc9bb3..a3cb6c9d1ac 100644
--- a/forge-gui/res/cardsfolder/w/world_map.txt
+++ b/forge-gui/res/cardsfolder/w/world_map.txt
@@ -1,6 +1,6 @@
 Name:World Map
 ManaCost:1
 Types:Artifact
-A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+A:AB$ ChangeZone | Cost$ 1 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 A:AB$ ChangeZone | Cost$ 3 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | SpellDescription$ Search your library for a land card, reveal it, put it into your hand, then shuffle.
 Oracle:{1}, {T}, Sacrifice this artifact: Search your library for a basic land card, reveal it, put it into your hand, then shuffle.\n{3}, {T}, Sacrifice this artifact: Search your library for a land card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/w/worldweave.txt b/forge-gui/res/cardsfolder/w/worldweave.txt
new file mode 100644
index 00000000000..b990b437bca
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/worldweave.txt
@@ -0,0 +1,8 @@
+Name:Worldweave
+ManaCost:2 G
+Types:Enchantment
+T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigSeek | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell, seek a land card and put it onto the battlefield tapped.
+SVar:TrigSeek:DB$ Seek | Type$ Land | RememberFound$ True | SubAbility$ DBPut
+SVar:DBPut:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Defined$ Remembered | Tapped$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever you cast a creature spell, seek a land card and put it onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/w/wraith_vicious_vigilante.txt b/forge-gui/res/cardsfolder/w/wraith_vicious_vigilante.txt
new file mode 100644
index 00000000000..9bb02898ba9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/w/wraith_vicious_vigilante.txt
@@ -0,0 +1,7 @@
+Name:Wraith, Vicious Vigilante
+ManaCost:1 W U
+Types:Legendary Creature Human Detective Hero
+PT:1/1
+K:Double Strike
+S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ Fear Gas — NICKNAME can't be blocked.
+Oracle:Double strike\nFear Gas — Wraith can't be blocked.
diff --git a/forge-gui/res/cardsfolder/y/yavimaya_elder.txt b/forge-gui/res/cardsfolder/y/yavimaya_elder.txt
index cf09af3c89e..077f3e093ce 100644
--- a/forge-gui/res/cardsfolder/y/yavimaya_elder.txt
+++ b/forge-gui/res/cardsfolder/y/yavimaya_elder.txt
@@ -3,6 +3,6 @@ ManaCost:1 G G
 Types:Creature Human Druid
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFetch | OptionalDecider$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
-SVar:TrigFetch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | ShuffleNonMandatory$ True
+SVar:TrigFetch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | ShuffleNonMandatory$ True
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:When Yavimaya Elder dies, you may search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.\n{2}, Sacrifice Yavimaya Elder: Draw a card.
diff --git a/forge-gui/res/cardsfolder/y/yavimaya_granger.txt b/forge-gui/res/cardsfolder/y/yavimaya_granger.txt
index ae41326e259..00126f4288c 100644
--- a/forge-gui/res/cardsfolder/y/yavimaya_granger.txt
+++ b/forge-gui/res/cardsfolder/y/yavimaya_granger.txt
@@ -4,5 +4,5 @@ Types:Creature Elf
 PT:2/2
 K:Echo:2 G
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
-SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ShuffleNonMandatory$ True
 Oracle:Echo {2}{G} (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)\nWhen Yavimaya Granger enters, you may search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/y/you_happen_on_a_glade.txt b/forge-gui/res/cardsfolder/y/you_happen_on_a_glade.txt
index 5cce37a5ed4..8d7f5974f85 100644
--- a/forge-gui/res/cardsfolder/y/you_happen_on_a_glade.txt
+++ b/forge-gui/res/cardsfolder/y/you_happen_on_a_glade.txt
@@ -2,6 +2,6 @@ Name:You Happen On a Glade
 ManaCost:2 G
 Types:Instant
 A:SP$ Charm | Choices$ JourneyOn,MakeCamp
-SVar:JourneyOn:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | Reveal$ True | StackDescription$ SpellDescription | SpellDescription$ Journey On — Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
+SVar:JourneyOn:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | ChangeNum$ 2 | Reveal$ True | StackDescription$ SpellDescription | SpellDescription$ Journey On — Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.
 SVar:MakeCamp:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouOwn | SpellDescription$ Make Camp — Return target permanent card from your graveyard to your hand.
 Oracle:Choose one —\n• Journey On — Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle.\n• Make Camp — Return target permanent card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/yuyan_archers.txt b/forge-gui/res/cardsfolder/y/yuyan_archers.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/yuyan_archers.txt
rename to forge-gui/res/cardsfolder/y/yuyan_archers.txt
diff --git a/forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt b/forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt
index d9a947d6470..e37c07c77c3 100644
--- a/forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt
+++ b/forge-gui/res/cardsfolder/z/zar_ojanen_scion_of_efrava.txt
@@ -2,8 +2,8 @@ Name:Zar Ojanen, Scion of Efrava
 ManaCost:3 G W
 Types:Legendary Creature Cat Warrior
 PT:4/4
-T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigPutcounter | TriggerZones$ Battlefield | TriggerDescription$ Domain — Whenever CARDNAME becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
-SVar:TrigPutcounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+toughnessLTX | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Domain — Whenever CARDNAME becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
+SVar:TrigPutCounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+toughnessLTX | CounterType$ P1P1 | CounterNum$ 1
 SVar:X:Count$Domain
 DeckHas:Ability$Counters
 Oracle:Domain — Whenever Zar Ojanen, Scion of Efrava becomes tapped, put a +1/+1 counter on each creature you control with toughness less than the number of basic land types among lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/zhao_the_seething_flame.txt b/forge-gui/res/cardsfolder/z/zhao_the_seething_flame.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zhao_the_seething_flame.txt
rename to forge-gui/res/cardsfolder/z/zhao_the_seething_flame.txt
diff --git a/forge-gui/res/cardsfolder/z/zirda_the_dawnwaker.txt b/forge-gui/res/cardsfolder/z/zirda_the_dawnwaker.txt
index 3919feeb886..71af28fe384 100644
--- a/forge-gui/res/cardsfolder/z/zirda_the_dawnwaker.txt
+++ b/forge-gui/res/cardsfolder/z/zirda_the_dawnwaker.txt
@@ -3,6 +3,6 @@ ManaCost:1 RW RW
 Types:Legendary Creature Elemental Fox
 PT:3/3
 K:Companion:Permanent.hasAbility Activated,Instant,Sorcery:Each permanent card in your starting deck has an activated ability.
-S:Mode$ ReduceCost | ValidCard$ Card | Activator$ You | ValidSpell$ Activated.nonManaAbility | Amount$ 2 | MinMana$ 1 | Description$ Abilities you activate that aren't mana abilities cost {2} less to activate. This effect can't reduce the mana in that cost to less than one mana.
+S:Mode$ ReduceCost | ValidCard$ Card | Activator$ You | ValidSpell$ Activated.!ManaAbility | Amount$ 2 | MinMana$ 1 | Description$ Abilities you activate that aren't mana abilities cost {2} less to activate. This effect can't reduce the mana in that cost to less than one mana.
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
 Oracle:Companion — Each permanent card in your starting deck has an activated ability. (If this card is your chosen companion, you may put it into your hand from outside the game for {3} any time you could cast a sorcery.)\nAbilities you activate that aren't mana abilities cost {2} less to activate. This effect can't reduce the mana in that cost to less than one mana.\n{1}, {T}: Target creature can't block this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/zuko_avatar_hunter.txt b/forge-gui/res/cardsfolder/z/zuko_avatar_hunter.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zuko_avatar_hunter.txt
rename to forge-gui/res/cardsfolder/z/zuko_avatar_hunter.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zuko_exiled_prince.txt b/forge-gui/res/cardsfolder/z/zuko_exiled_prince.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zuko_exiled_prince.txt
rename to forge-gui/res/cardsfolder/z/zuko_exiled_prince.txt
diff --git a/forge-gui/res/cardsfolder/upcoming/zukos_offense.txt b/forge-gui/res/cardsfolder/z/zukos_offense.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/zukos_offense.txt
rename to forge-gui/res/cardsfolder/z/zukos_offense.txt
diff --git a/forge-gui/res/cardsfolder/z/zurs_weirding.txt b/forge-gui/res/cardsfolder/z/zurs_weirding.txt
index 9b13cca8e4f..914d35bad81 100644
--- a/forge-gui/res/cardsfolder/z/zurs_weirding.txt
+++ b/forge-gui/res/cardsfolder/z/zurs_weirding.txt
@@ -4,8 +4,8 @@ Types:Enchantment
 S:Mode$ Continuous | AffectedZone$ Hand | MayLookAt$ Player | Description$ Players play with their hands revealed.
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ Player | ReplaceWith$ RevealTop | Description$ If a player would draw a card, they reveal it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card.
 SVar:RevealTop:DB$ PeekAndReveal | Defined$ ReplacedPlayer | NoPeek$ True | SubAbility$ DBMill
-SVar:DBMill:DB$ Dig | Defined$ ReplacedPlayer | DestinationZone$ Graveyard | DigNum$ 1 | ChangeNum$ All | SubAbility$ DBDraw | UnlessPayer$ NonReplacedPlayer | UnlessCost$ PayLife<2> | UnlessSwitched$ True | UnlessResolveSubs$ WhenNotPaid | StackDescription$ None
-SVar:DBDraw:DB$ Draw | Defined$ ReplacedPlayer | NumCards$ 1 | StackDescription$ that player draws a card
+SVar:DBMill:DB$ Dig | Defined$ ReplacedPlayer | DestinationZone$ Graveyard | DigNum$ 1 | ChangeNum$ All | SubAbility$ DBDraw | UnlessPayer$ NonReplacedPlayer | UnlessCost$ PayLife<2> | UnlessSwitched$ True | UnlessResolveSubs$ WhenNotPaid
+SVar:DBDraw:DB$ Draw | Defined$ ReplacedPlayer | NumCards$ 1
 SVar:NonStackingEffect:True
 AI:RemoveDeck:All
 Oracle:Players play with their hands revealed.\nIf a player would draw a card, they reveal it instead. Then any other player may pay 2 life. If a player does, put that card into its owner's graveyard. Otherwise, that player draws a card.
diff --git a/forge-gui/res/draft/rankings/spm.rnk b/forge-gui/res/draft/rankings/spm.rnk
new file mode 100644
index 00000000000..f1fff822bf8
--- /dev/null
+++ b/forge-gui/res/draft/rankings/spm.rnk
@@ -0,0 +1,233 @@
+//Rank|Name|Rarity|Set
+#1|Arachne, Psionic Weaver|R|SPM
+#2|Origin of Spider-Man|R|SPM
+#3|Spectacular Spider-Man|R|SPM
+#4|Silk, Web Weaver|R|SPM
+#5|Rite of Replication|M|SPM
+#6|Skithiryx, the Blight Dragon|M|SPM
+#7|Goblin Bombardment|M|SPM
+#8|Najeela, the Blade-Blossom|M|SPM
+#9|Lizard, Connors's Curse|R|SPM
+#10|Sandman, Shifting Scoundrel|R|SPM
+#11|Biorganic Carapace|R|SPM
+#12|Doctor Octopus, Master Planner|M|SPM
+#13|The Spot, Living Portal|R|SPM
+#14|Agent Venom|R|SPM
+#15|Gwenom, Remorseless|M|SPM
+#16|Miles Morales|M|SPM
+#17|Arana, Heart of the Spider|R|SPM
+#18|Mister Negative|M|SPM
+#19|Scarlet Spider, Ben Reilly|R|SPM
+#20|Symbiote Spider-Man|R|SPM
+#21|Ultimate Green Goblin|R|SPM
+#22|Arasta of the Endless Web|M|SPM
+#23|Mysterio, Master of Illusion|R|SPM
+#24|Villainous Wrath|R|SPM
+#25|Strength of Will|R|SPM
+#26|Iron Spider, Stark Upgrade|R|SPM
+#27|Anti-Venom, Horrifying Healer|M|SPM
+#28|Friendly Neighborhood|R|SPM
+#29|Peter Parker|M|SPM
+#30|With Great Power|R|SPM
+#31|Hydro-Man, Fluid Felon|R|SPM
+#32|Impostor Syndrome|M|SPM
+#33|Behold the Sinister Six!|M|SPM
+#34|Black Cat, Cunning Thief|R|SPM
+#35|Eddie Brock|M|SPM
+#36|Morlun, Devourer of Spiders|R|SPM
+#37|Spider-Punk|R|SPM
+#38|Spinneret and Spiderling|R|SPM
+#39|Kraven's Last Hunt|R|SPM
+#40|Spider-Ham, Peter Porker|R|SPM
+#41|Carnage, Crimson Chaos|R|SPM
+#42|Cheering Crowd|R|SPM
+#43|Cosmic Spider-Man|M|SPM
+#44|Kraven the Hunter|R|SPM
+#45|Mary Jane Watson|R|SPM
+#46|Rhino, Barreling Brute|U|SPM
+#47|Spider-Man 2099|R|SPM
+#48|Mystic Confluence|M|SPM
+#49|Savage Beating|M|SPM
+#50|Silkguard|M|SPM
+#51|Norman Osborn|M|SPM
+#52|Gwen Stacy|M|SPM
+#53|Green Goblin, Revenant|U|SPM
+#54|Morbius the Living Vampire|U|SPM
+#55|SP//Piloted by Peni|U|SPM
+#56|Spider-Woman, Stunning Savior|R|SPM
+#57|Doc Ock's Tentacles|R|SPM
+#58|Silver Sable, Mercenary Leader|U|SPM
+#59|Spectacular Tactics|C|SPM
+#60|Spider-Man, Web-Slinger|C|SPM
+#61|Spider-UK|U|SPM
+#62|Whoosh!|C|SPM
+#63|Scorpion's Sting|C|SPM
+#64|Electro, Assaulting Battery|R|SPM
+#65|J. Jonah Jameson|R|SPM
+#66|Radioactive Spider|R|SPM
+#67|Spiders-Man, Heroic Horde|U|SPM
+#68|Terrific Team-Up|U|SPM
+#69|Gallant Citizen|C|SPM
+#70|Kraven, Proud Predator|U|SPM
+#71|Superior Spider-Man|R|SPM
+#72|Rocket-Powered Goblin Glider|R|SPM
+#73|Urban Retreat|R|SPM
+#74|Vibrant Cityscape|C|SPM
+#75|Oscorp Industries|R|SPM
+#76|Leyline Binding|M|SPM
+#77|Lorthos, the Tidemaker|M|SPM
+#78|Shock MAR|M|SPM
+#79|Arachnogenesis|M|SPM
+#80|Alibou, Ancient Witness|M|SPM
+#81|Daily Bugle Reporters|C|SPM
+#82|Web Up|C|SPM
+#83|Doc Ock, Sinister Scientist|C|SPM
+#84|Madame Web, Clairvoyant|U|SPM
+#85|Spider-Byte, Web Warden|U|SPM
+#86|The Death of Gwen Stacy|R|SPM
+#87|Spider-Man Noir|U|SPM
+#88|The Spot's Portal|U|SPM
+#89|Tombstone, Career Criminal|U|SPM
+#90|Electro's Bolt|C|SPM
+#91|Shadow of the Goblin|R|SPM
+#92|Shock|C|SPM
+#93|Shocker, Unshakable|U|SPM
+#94|Damage Control Crew|U|SPM
+#95|Kapow!|C|SPM
+#96|Scout the City|C|SPM
+#97|Spider-Man, Brooklyn Visionary|C|SPM
+#98|Wall Crawl|U|SPM
+#99|Prowler, Clawed Thief|U|SPM
+#100|Rhino's Rampage|U|SPM
+#101|Scarlet Spider, Kaine|U|SPM
+#102|Spider-Girl, Legacy Hero|U|SPM
+#103|Spider-Man India|U|SPM
+#104|Wraith, Vicious Vigilante|U|SPM
+#105|Clever Impersonator|M|SPM
+#106|Ponder|M|SPM
+#107|Infernal Grasp|M|SPM
+#108|Saw in Half|M|SPM
+#109|Terminate|M|SPM
+#110|Aunt May|U|SPM
+#111|Flash Thompson, Spider-Fan|U|SPM
+#112|Selfless Police Captain|C|SPM
+#113|Wild Pack Squad|C|SPM
+#114|Chameleon, Master of Disguise|U|SPM
+#115|Flying Octobot|U|SPM
+#116|Robotics Mastery|U|SPM
+#117|School Daze|U|SPM
+#118|Secret Identity|U|SPM
+#119|Scorpion, Seething Striker|U|SPM
+#120|Spider-Gwen, Free Spirit|C|SPM
+#121|Spider-Islanders|C|SPM
+#122|Ezekiel Sims, Spider-Totem|U|SPM
+#123|Pictures of Spider-Man|U|SPM
+#124|Pumpkin Bombardment|C|SPM
+#125|Shriek, Treblemaker|U|SPM
+#126|Spider Manifestation|C|SPM
+#127|Path to Exile|M|SPM
+#128|Beetle, Legacy Criminal|C|SPM
+#129|The Clone Saga|R|SPM
+#130|Mysterio's Phantasm|C|SPM
+#131|Prison Break|U|SPM
+#132|Superior Foes of Spider-Man|U|SPM
+#133|Guy in the Chair|C|SPM
+#134|Skyward Spider|C|SPM
+#135|Spider-Bot|C|SPM
+#136|Ominous Asylum|C|SPM
+#137|Savage Mansion|C|SPM
+#138|Sinister Hideout|C|SPM
+#139|Suburban Sanctuary|C|SPM
+#140|University Campus|C|SPM
+#141|Reprieve|M|SPM
+#142|Opposition Agent|M|SPM
+#143|Relentless Assault|M|SPM
+#144|City Pigeon|C|SPM
+#145|Sudden Strike|U|SPM
+#146|Thwip!|C|SPM
+#147|Amazing Acrobatics|C|SPM
+#148|Doc Ock's Henchmen|C|SPM
+#149|Spider-Man No More|C|SPM
+#150|Unstable Experiment|C|SPM
+#151|Common Crook|C|SPM
+#152|Swarm, Being of Bees|C|SPM
+#153|Venom, Evil Unleashed|C|SPM
+#154|Venomized Cat|C|SPM
+#155|Venom's Hunger|C|SPM
+#156|Angry Rabble|C|SPM
+#157|Hobgoblin, Mantled Marauder|U|SPM
+#158|Masked Meower|C|SPM
+#159|Raging Goblinoids|U|SPM
+#160|Romantic Rendezvous|C|SPM
+#161|Stegron the Dinosaur Man|C|SPM
+#162|Taxi Driver|C|SPM
+#163|Wisecrack|U|SPM
+#164|Grow Extra Arms|C|SPM
+#165|Kraven's Cats|C|SPM
+#166|Lurking Lizards|C|SPM
+#167|Professional Wrestler|C|SPM
+#168|Supportive Parents|U|SPM
+#169|Mob Lookout|C|SPM
+#170|Eerie Gravestone|C|SPM
+#171|Living Brain, Mechanical Marvel|U|SPM
+#172|Mechanical Mobster|C|SPM
+#173|Spider-Slayer, Hatred Honed|U|SPM
+#174|Spider-Suit|U|SPM
+#175|Counterspell|M|SPM
+#176|Feed the Swarm|M|SPM
+#177|Thrill of Possibility|M|SPM
+#178|Unexpected Windfall|M|SPM
+#179|Costume Closet|U|SPM
+#180|Starling, Aerial Ally|C|SPM
+#181|Web-Shooters|U|SPM
+#182|Oscorp Research Team|C|SPM
+#183|Inner Demons Gangsters|C|SPM
+#184|Merciless Enforcers|C|SPM
+#185|Risky Research|C|SPM
+#186|Sandman's Quicksand|U|SPM
+#187|Heroes' Hangout|U|SPM
+#188|Spider-Rex, Daring Dino|C|SPM
+#189|Web-Warriors|U|SPM
+#190|Passenger Ferry|C|SPM
+#191|Subway Train|C|SPM
+#192|Vulture, Scheming Scavenger|U|SPM
+#193|Hot Dog Cart|C|SPM
+#194|Interdimensional Web Watch|R|SPM
+#195|Spider-Mobile|U|SPM
+#196|Steel Wrecking Ball|C|SPM
+#197|Rent Is Due|R|SPM
+#198|Hide on the Ceiling|R|SPM
+#199|Lady Octopus, Inspired Inventor|R|SPM
+#200|Alien Symbiosis|U|SPM
+#201|Molten Man, Inferno Incarnate|U|SPM
+#202|Spider-Verse|M|SPM
+#203|Web of Life and Destiny|M|SPM
+#204|Jackal, Genius Geneticist|R|SPM
+#205|Sun-Spider, Nimble Webber|U|SPM
+#206|Bagel and Schmear|C|SPM
+#207|Peter Parker's Camera|R|SPM
+#208|Daily Bugle Building|U|SPM
+#209|Multiversal Passage|R|SPM
+#210|Comeuppance|M|SPM
+#211|Traumatize|M|SPM
+#212|Reanimate|M|SPM
+#213|Heroic Intervention|M|SPM
+#214|News Helicopter|C|SPM
+#215|Parallel Lives|M|SPM
+#216|Hex|M|SPM
+#217|Tangle|M|SPM
+#218|Spider-Sense|R|SPM
+#219|Parker Luck|R|SPM
+#220|The Soul Stone|M|SPM
+#221|Maximum Carnage|R|SPM
+#222|Nine Lives|M|SPM
+#223|Rest in Peace|M|SPM
+#224|Mindbreak Trap|M|SPM
+#225|Winds of Change|M|SPM
+#226|Beast Within|M|SPM
+#227|Hunter's Insight|M|SPM
+#228|Plains|C|SPM
+#229|Island|C|SPM
+#230|Swamp|C|SPM
+#231|Mountain|C|SPM
+#232|Forest|C|SPM
diff --git a/forge-gui/res/editions/Aetherdrift.txt b/forge-gui/res/editions/Aetherdrift.txt
index c5d90fff761..cd8201ffa54 100644
--- a/forge-gui/res/editions/Aetherdrift.txt
+++ b/forge-gui/res/editions/Aetherdrift.txt
@@ -648,4 +648,6 @@ Replace=.011F Mythic:fromSheet("DFT cards")
 12 c_3_2_a_vehicle_crew_1 @Devin Elle Kurtz
 
 [other]
-14 emblem_chandra_spark_hunter @Devin Elle Kurtz
+13 emblem_chandra_spark_hunter @Devin Elle Kurtz
+14 speed @Josiah "Jo" Cameron
+14☇ max_speed @Josiah "Jo" Cameron
\ No newline at end of file
diff --git a/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt b/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt
index 56c3c6f731e..1e4faa0757a 100644
--- a/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt	
+++ b/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt	
@@ -328,15 +328,15 @@ A-259 C A-Lantern of Revealing @Eytan Zana
 A-262 U A-Navigation Orb @Robin Olausson
 
 [conjured]
-45a R Hag of Ceaseless Torment @Konstantin Porubov
-45b R Hag of Dark Duress @Konstantin Porubov
-45c R Hag of Death's Legion @Konstantin Porubov
-45d R Hag of Inner Weakness @Konstantin Porubov
-45e R Hag of Mage's Doom @Konstantin Porubov
-45f R Hag of Noxious Nightmares @Konstantin Porubov
-45g R Hag of Scoured Thoughts @Konstantin Porubov
-45h R Hag of Syphoned Breath @Konstantin Porubov
-45i R Hag of Twisted Visions @Konstantin Porubov
+H17 R Hag of Ceaseless Torment @Konstantin Porubov
+H18 R Hag of Dark Duress @Konstantin Porubov
+H19 R Hag of Death's Legion @Konstantin Porubov
+H20 R Hag of Inner Weakness @Konstantin Porubov
+H21 R Hag of Mage's Doom @Konstantin Porubov
+H22 R Hag of Noxious Nightmares @Konstantin Porubov
+H23 R Hag of Scoured Thoughts @Konstantin Porubov
+H24 R Hag of Syphoned Breath @Konstantin Porubov
+H25 R Hag of Twisted Visions @Konstantin Porubov
 902 U Archipelagore @Svetlin Velinov
 903 U Junk Winder @Campbell White
 904 C Moat Piranhas @Rudy Siswanto
diff --git a/forge-gui/res/editions/Amonkhet.txt b/forge-gui/res/editions/Amonkhet.txt
index fb59b29580f..2859e50699a 100644
--- a/forge-gui/res/editions/Amonkhet.txt
+++ b/forge-gui/res/editions/Amonkhet.txt
@@ -2,7 +2,6 @@
 Code=AKH
 Date=2017-04-28
 Name=Amonkhet
-Code2=AKH
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromSheet("AKH cards"), 3 Uncommon:fromSheet("AKH cards"), 1 RareMythic:fromSheet("AKH cards"), 1 BasicLand AKH
@@ -11,7 +10,6 @@ FatPack=10
 FatPackExtraSlots=80 BasicLands
 AdditionalSetUnlockedInQuest=MPS_AKH
 ChaosDraftThemes=GRAVEYARD_MATTERS
-ScryfallCode=AKH
 
 [cards]
 1 M Angel of Sanctions @Min Yum
@@ -316,18 +314,18 @@ ScryfallCode=AKH
 24 g_5_5_wurm @Slawomir Maniak
 
 [other]
-embalm_angel_of_sanctions
-embalm_anointer_priest
-embalm_aven_initiate
-embalm_aven_wind_guide
-embalm_glyph_keeper
-embalm_heart-piercer_manticore
-embalm_honored_hydra
-embalm_labyrinth_guardian
-embalm_oketra's_attendant
-embalm_sacred_cat
-embalm_tah-crop_skirmisher
-embalm_temmet_vizier_of_naktamun
-embalm_trueheart_duelist
-embalm_unwavering_initiate
-embalm_vizier_of_many_faces
\ No newline at end of file
+1 embalm_angel_of_sanctions @Min Yum
+2 embalm_anointer_priest @Lake Hurwitz
+3 embalm_aven_initiate @Jakub Kasper
+4 embalm_aven_wind_guide @Sidharth Chaturvedi
+5 embalm_glyph_keeper @Chris Rahn
+6 embalm_heart-piercer_manticore @Scott Murphy
+7 embalm_honored_hydra @Todd Lockwood
+8 embalm_labyrinth_guardian @Yeong-Hao Han
+9 embalm_oketra's_attendant @Lake Hurwitz
+10 embalm_sacred_cat @Zezhou Chen
+11 embalm_tah-crop_skirmisher @Victor Adame Minguez
+12 embalm_temmet_vizier_of_naktamun @Anna Steinbauer
+13 embalm_trueheart_duelist @Izzy
+14 embalm_unwavering_initiate @Greg Opalinski
+15 embalm_vizier_of_many_faces @Ryan Yee
\ No newline at end of file
diff --git a/forge-gui/res/editions/Arena Anthology 3.txt b/forge-gui/res/editions/Arena Anthology 3.txt
new file mode 100644
index 00000000000..dc2cdd155be
--- /dev/null
+++ b/forge-gui/res/editions/Arena Anthology 3.txt	
@@ -0,0 +1,33 @@
+[metadata]
+Code=AA3
+Date=2025-09-23
+Name=Arena Anthology 3
+Type=Online
+ScryfallCode=AA3
+
+[cards]
+1 M Emrakul, the Aeons Torn @Mark Tedin
+2 M Ulamog, the Infinite Gyre @Aleksi Briclot
+3 U Flickerwisp @Jeremy Enecio
+4 R Staff of the Storyteller @Dan Murayama Scott
+5 C Force Spike @Nelson DeCastro
+6 C Miscalculation @Jeff Laubenstein
+7 C Peek @Adam Rex
+8 R Dauthi Voidwalker @Sidharth Chaturvedi
+9 U Necromancy @Pete Venters
+10 C Assault Strobe @Kev Walker
+11 R Broadside Bombardiers @Tomek Larek
+12 C Chain Lightning @Christopher Moeller
+13 U Gut, True Soul Zealot @Wayne Reynolds
+14 U Oxidda Scrapmelter @Igor Kieryluk
+15 C Ambush Viper @Alan Pollack
+16 C Crop Rotation @DiTerlizzi
+17 R Exploration @Lindsey Look
+18 R Noble Hierarch @Mark Zug
+19 R Fallen Shinobi @Dmitry Burmak
+20 M Batterskull @Mark Zug
+21 M Kaldra Compleat @Vincent Proce
+22 R Memory Jar @Donato Giancola
+23 R Umezawa's Jitte @Christopher Moeller
+24 R Shelldock Isle @Mark Tedin
+25 R Yavimaya, Cradle of Growth @Sarah Finnigan
diff --git a/forge-gui/res/editions/Arena Anthology 4.txt b/forge-gui/res/editions/Arena Anthology 4.txt
new file mode 100644
index 00000000000..54a5e0b8bcb
--- /dev/null
+++ b/forge-gui/res/editions/Arena Anthology 4.txt	
@@ -0,0 +1,36 @@
+[metadata]
+Code=AA4
+Date=2025-09-23
+Name=Arena Anthology 4
+Type=Online
+ScryfallCode=AA4
+
+[cards]
+1 R Blazing Archon @Zoltan Boros & Gabor Szikszai
+2 R Bringer of the White Dawn @Kev Walker
+3 M Iona, Shield of Emeria @Jason Chan
+4 C Stormfront Pegasus @rk post
+5 R Bringer of the Blue Dawn @Greg Staples
+6 R Chromescale Drake @Ben Thompson
+7 R Hoverguard Sweepers @Mark A. Nelson
+8 C Kraken Hatchling @Jason Felix
+9 R Thing from the Deep @Paolo Parente
+10 R Tidespout Tyrant @Dany Orizio
+11 R Baleful Force @Eytan Zana
+12 R Bringer of the Black Dawn @Carl Critchlow
+13 M Demon of Death's Gate @Vance Kovacs
+14 R Dread Cacodemon @Izzy
+15 R Kuro, Pitlord @Jon Foster
+16 R Bringer of the Red Dawn @Christopher Moeller
+17 R Dragon Tyrant @Kev Walker
+18 R Fire Dragon @William Simpson
+19 R Furnace Dragon @Matthew D. Wilson
+20 R Magmatic Force @Jung Park
+21 R Bringer of the Green Dawn @Jim Murray
+22 C Crash of Rhinos @Steve White
+23 R Gigantomancer @Chippy
+24 R Regal Force @Brandon Kitkouski
+25 C Scaled Wurm @Wayne England
+26 R Wolf Pack @Yang Jun Kwon
+27 R Colossus of Sardia @Greg Staples
+28 U Stratadon @Brian Snõddy
diff --git a/forge-gui/res/editions/Avatar The Last Airbender Eternal.txt b/forge-gui/res/editions/Avatar The Last Airbender Eternal.txt
index 5cab223e390..2bd102bd231 100644
--- a/forge-gui/res/editions/Avatar The Last Airbender Eternal.txt	
+++ b/forge-gui/res/editions/Avatar The Last Airbender Eternal.txt	
@@ -56,7 +56,7 @@ ScryfallCode=TLE
 251 C Frog-Squirrels @Daniel Romanovsky
 252 C Hippo-Cows @Brandon L. Hunt
 253 U Match the Odds @Eilene Cherie
-254 R Seismic Tutelage
+254 R Seismic Tutelage @Florent Lebrun
 255 U Hog-Monkey Rampage @Daniel Romanovsky
 256 C Mechanical Glider @Salvatorre Zee Yazzie
 257 C Feed the Swarm @Kotakan
diff --git a/forge-gui/res/editions/Commander Collection Black.txt b/forge-gui/res/editions/Commander Collection Black.txt
index ddddd300eae..67af1cbee9a 100644
--- a/forge-gui/res/editions/Commander Collection Black.txt	
+++ b/forge-gui/res/editions/Commander Collection Black.txt	
@@ -18,5 +18,4 @@ TokensCode=CC2
 
 [tokens]
 9 b_1_1_snake_deathtouch @Caroline Gariba
-# Double sided tokens are not supported yet.
-# 9☇ b_2_2_zombie @Xavier Ribeiro
+9☇ b_2_2_zombie @Xavier Ribeiro
diff --git a/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt b/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt
index f39cf042490..491370350ca 100644
--- a/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt	
+++ b/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt	
@@ -961,7 +961,7 @@ ScryfallCode=CLB
 936 R Elder Brain @Nino Is
 
 [dungeons]
-S Undercity
+20 Undercity
 
 [foils]
 Abdel Adrian, Gorion's Ward+|CLB
@@ -1193,3 +1193,6 @@ Zevlor, Elturel Exile|CLB
 46 rg_2_2_satyr_haste @Johann Bodin
 47 c_a_clue_draw @Campbell White
 48 c_a_gold_sac @Yeong-Hao Han
+
+[other]
+20☇ initiative @Ioannis Fiore
\ No newline at end of file
diff --git a/forge-gui/res/editions/Core Set 2020.txt b/forge-gui/res/editions/Core Set 2020.txt
index fcf71e24622..2b635b6bbd7 100644
--- a/forge-gui/res/editions/Core Set 2020.txt	
+++ b/forge-gui/res/editions/Core Set 2020.txt	
@@ -359,6 +359,9 @@ ScryfallCode=M20
 343 C Titanic Growth @Ryan Pancoast
 344 C Woodland Mystic @Uriah Voth
 
+[rebalanced]
+A-115 A-Sorin, Imperious Bloodlord @Chase Stone
+
 [Lands]
 6 Bloodfell Caves|M20
 6 Blossoming Sands|M20
diff --git a/forge-gui/res/editions/Dark Ascension.txt b/forge-gui/res/editions/Dark Ascension.txt
index 5ac0f8e350c..4f2be83f121 100644
--- a/forge-gui/res/editions/Dark Ascension.txt	
+++ b/forge-gui/res/editions/Dark Ascension.txt	
@@ -2,7 +2,6 @@
 Code=DKA
 Date=2012-02-03
 Name=Dark Ascension
-Code2=DKA
 Type=Expansion
 BoosterCovers=3
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc, 1 BasicLand ISD
diff --git a/forge-gui/res/editions/Darksteel.txt b/forge-gui/res/editions/Darksteel.txt
index c1a519b57ba..104e0ba949b 100644
--- a/forge-gui/res/editions/Darksteel.txt
+++ b/forge-gui/res/editions/Darksteel.txt
@@ -26,7 +26,7 @@ ScryfallCode=DST
 12 U Purge @Pete Venters
 13 C Ritual of Restoration @Dany Orizio
 14 R Soulscour @Kev Walker
-15 R Steelshaper Apprentice @Tim Hildebrandt
+15 R Steelshaper Apprentice @Greg Hildebrandt
 16 U Stir the Pride @Matt Cavotta
 17 U Test of Faith @Vance Kovacs
 18 R Turn the Tables @Christopher Moeller
@@ -41,7 +41,7 @@ ScryfallCode=DST
 27 U Neurok Transmuter @Mark Zug
 28 U Psychic Overload @Jeremy Jarvis
 29 R Pulse of the Grid @Wayne England
-30 C Quicksilver Behemoth @Anthony S. Waters
+30 C Quicksilver Behemoth @Anthony S. Waters & Cara Mitten
 31 R Reshape @Jon Foster
 32 R Retract @Matt Cavotta
 33 U Second Sight @Luca Zontini
@@ -141,7 +141,7 @@ ScryfallCode=DST
 127 C Leonin Bola @Christopher Moeller
 128 R Lich's Tomb @Matt Cavotta
 129 R Memnarch @Carl Critchlow
-130 R Mycosynth Lattice @Anthony S. Waters
+130 R Mycosynth Lattice @Anthony S. Waters & Cara Mitten
 131 C Myr Landshaper @Greg Staples
 132 R Myr Matrix @Mark Tedin
 133 C Myr Moonvessel @Dany Orizio
@@ -177,13 +177,3 @@ ScryfallCode=DST
 163 R Blinkmoth Nexus @Brian Snõddy
 164 C Darksteel Citadel @John Avon
 165 U Mirrodin's Core @Greg Staples
-
-[tokens]
-twin
-wirefly
-u_2_2_elemental_flying
-r_3_3_elemental
-g_3_3_beast
-g_1_1_insect
-c_1_1_a_myr
-c_2_2_a_spawn
diff --git a/forge-gui/res/editions/Dissension.txt b/forge-gui/res/editions/Dissension.txt
index 7dfb8b6119a..7dd5d6d7534 100644
--- a/forge-gui/res/editions/Dissension.txt
+++ b/forge-gui/res/editions/Dissension.txt
@@ -2,7 +2,6 @@
 Code=DIS
 Date=2006-05-05
 Name=Dissension
-Code2=DIS
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -193,11 +192,3 @@ ScryfallCode=DIS
 178 C Rakdos Carnarium @John Avon
 179 U Rix Maadi, Dungeon Palace @Martina Pilcerova
 180 C Simic Growth Chamber @John Avon
-
-[tokens]
-r_3_1_elemental
-r_2_1_goblin_haste
-g_1_1_saproling
-wu_1_1_bird_flying
-gu_2_2_drake_flying
-gu_1_1_snake
diff --git a/forge-gui/res/editions/Doctor Who Commander.txt b/forge-gui/res/editions/Doctor Who Commander.txt
index 6e4a5e11ad9..16193a51f99 100644
--- a/forge-gui/res/editions/Doctor Who Commander.txt	
+++ b/forge-gui/res/editions/Doctor Who Commander.txt	
@@ -1202,3 +1202,6 @@ ScryfallCode=WHO
 29 c_a_treasure_sac @Justyna Dura
 30 c_a_treasure_sac @Justyna Dura
 31 c_a_treasure_sac @Justyna Dura
+
+[other]
+1 copy @Xabi Gaztelua
\ No newline at end of file
diff --git a/forge-gui/res/editions/Dominaria Remastered.txt b/forge-gui/res/editions/Dominaria Remastered.txt
index 2468216dcbd..86f7293b3e3 100644
--- a/forge-gui/res/editions/Dominaria Remastered.txt	
+++ b/forge-gui/res/editions/Dominaria Remastered.txt	
@@ -2,7 +2,6 @@
 Code=DMR
 Date=2023-01-13
 Name=Dominaria Remastered
-Code2=DMR
 Type=Reprint
 BoosterCovers=3
 Booster=9 Common:fromsheet("DMR cards"), 3 Uncommon:fromSheet("DMR cards"), 1 RareMythic:fromSheet("DMR cards"), 1 BasicLand:fromSheet("DMR retro frame"), 1 !BasicLand:fromSheet("DMR retro frame")
diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt
index a7bf8df8028..8a5b5ea851d 100644
--- a/forge-gui/res/editions/Dominaria United.txt	
+++ b/forge-gui/res/editions/Dominaria United.txt	
@@ -2,7 +2,6 @@
 Code=DMU
 Date=2022-09-09
 Name=Dominaria United
-Code2=DMU
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromsheet("DMU cards"), 3 Uncommon:fromSheet("DMU cards"), 1 RareMythic:fromSheet("DMU cards"), 1 fromSheet("DMU lands")
diff --git a/forge-gui/res/editions/Dominaria.txt b/forge-gui/res/editions/Dominaria.txt
index 423dac28d21..f97a57d5fec 100644
--- a/forge-gui/res/editions/Dominaria.txt
+++ b/forge-gui/res/editions/Dominaria.txt
@@ -308,6 +308,10 @@ ScryfallCode=DOM
 9 r_1_1_goblin @Kev Walker
 10 karox_bladewing @XiaoDi Jin
 11 g_1_1_saproling @Mike Burns
-11 g_1_1_saproling @Mike Burns
-11 g_1_1_saproling @Mike Burns
+12 g_1_1_saproling @Mike Burns
+13 g_1_1_saproling @Mike Burns
 14 c_0_0_a_construct_total_artifacts @Victor Adame Minguez
+
+[other]
+15 emblem_jaya_ballard @Magali Villeneuve
+16 emblem_teferi_hero_of_dominaria @Chris Rallis
diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 2364beb783e..c60adc98d11 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -960,3 +960,7 @@ ScryfallCode=2X2
 20 bg_1_1_worm @Chuck Lukacs
 21 c_3_3_a_phyrexian_golem @Volkan Baǵa
 22 c_a_treasure_sac @Alayna Danner
+
+[other]
+23 emblem_liliana_the_last_hope @Jaime Jones
+24 emblem_wrenn_and_six @Chase Stone
\ No newline at end of file
diff --git a/forge-gui/res/editions/Double Masters.txt b/forge-gui/res/editions/Double Masters.txt
index 32d1f13ea30..141da142150 100644
--- a/forge-gui/res/editions/Double Masters.txt	
+++ b/forge-gui/res/editions/Double Masters.txt	
@@ -745,10 +745,10 @@ ScryfallCode=2XM
 4 w_2_2_cat @Jesper Ejsing
 5 w_1_1_human_soldier @Deruchenko Alexander
 6 w_1_1_soldier @Jakub Kasper
-7 u_2_1_a_phyrexian_myr @Daarken
+7 u_2_1_a_myr @Daarken
 8 u_1_1_a_thopter_flying @Andrew Murray
 9 b_5_5_demon_flying @Sidharth Chaturvedi
-10 b_0_0_phyrexian_germ @Igor Kieryluk
+10 b_0_0_germ @Igor Kieryluk
 11 marit_lage @Stephan Martiniere
 12 g_3_3_ape @Lars Grant-West
 13 g_3_3_beast @Jason Felix
@@ -761,7 +761,7 @@ ScryfallCode=2XM
 20 gw_x_x_elemental_total_creatures @Mark Winters
 21 gw_1_1_elf_warrior @Carl Frank
 22 c_a_clue_draw @Noah Bradley
-23 c_3_3_a_phyrexian_golem @Daarken
+23 c_3_3_a_golem @Daarken
 24 c_1_1_a_myr @Ryan Pancoast
 25 c_1_1_a_servo @Igor Kieryluk
 26 c_1_1_a_thopter_flying @Richard Wright
diff --git a/forge-gui/res/editions/Dragon's Maze.txt b/forge-gui/res/editions/Dragon's Maze.txt
index 9873c7f486e..2a4e436f6ec 100644
--- a/forge-gui/res/editions/Dragon's Maze.txt	
+++ b/forge-gui/res/editions/Dragon's Maze.txt	
@@ -2,7 +2,6 @@
 Code=DGM
 Date=2013-05-03
 Name=Dragon's Maze
-Code2=DGM
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:!land, 3 Uncommon, 1 RareMythic:!land, 1 fromSheet("DGM Lands")
diff --git a/forge-gui/res/editions/Dragons of Tarkir.txt b/forge-gui/res/editions/Dragons of Tarkir.txt
index 031ce33ae8a..7aa2bf87bb5 100644
--- a/forge-gui/res/editions/Dragons of Tarkir.txt	
+++ b/forge-gui/res/editions/Dragons of Tarkir.txt	
@@ -2,7 +2,6 @@
 Code=DTK
 Date=2015-03-27
 Name=Dragons of Tarkir
-Code2=DTK
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand DTK
@@ -283,3 +282,7 @@ ScryfallCode=DTK
 4 b_x_x_zombie_horror @Nils Hamm
 5 r_4_4_dragon_flying @Gabor Szikszai
 6 r_1_1_goblin @Mike Bierek
+
+[other]
+7 morph @Raymond Swanland
+8 emblem_narset_transcendent @Magali Villeneuve
\ No newline at end of file
diff --git a/forge-gui/res/editions/Drake Stone.txt b/forge-gui/res/editions/Drake Stone.txt
index 13660c20e8f..8dbe5408225 100644
--- a/forge-gui/res/editions/Drake Stone.txt	
+++ b/forge-gui/res/editions/Drake Stone.txt	
@@ -6,8 +6,10 @@ Code2=DS0
 Type=Funny
 
 [cards]
-1 U Illusory Thoughts
-2 U Concentrate
-3 U Distract
-4 U Enthrall
-5 M Drake Stone
+1 U Illusory Thoughts @Kevin Smith
+3 U Distract @Kevin Smith
+4 U Enthrall @Kevin Smith
+5 M Drake Stone @Kevin Smith
+
+[eternal]
+2 U Concentrate @Kevin Smith
diff --git a/forge-gui/res/editions/Duel Decks Blessed vs. Cursed.txt b/forge-gui/res/editions/Duel Decks Blessed vs. Cursed.txt
index f5e891b6885..aebaf333e3c 100644
--- a/forge-gui/res/editions/Duel Decks Blessed vs. Cursed.txt	
+++ b/forge-gui/res/editions/Duel Decks Blessed vs. Cursed.txt	
@@ -2,9 +2,9 @@
 Code=DDQ
 Date=2016-02-26
 Name=Duel Decks: Blessed vs. Cursed
-Code2=DDQ
 Type=Duel_Deck
 ScryfallCode=DDQ
+TokensCode=DDQ
 
 [cards]
 1 M Geist of Saint Traft @Daarken
@@ -85,7 +85,7 @@ ScryfallCode=DDQ
 76 L Swamp @Jung Park
 
 [tokens]
-w_4_4_angel_flying
-w_1_1_human
-w_1_1_spirit_flying
-b_2_2_zombie
+77 w_4_4_angel_flying @Winona Nelson
+78 w_1_1_human @John Stanko
+79 w_1_1_spirit_flying @Kev Walker
+80 b_2_2_zombie @Lucas Graciano
diff --git a/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt b/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt
index bf8b30e20fe..e00e2123c1a 100644
--- a/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt	
+++ b/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt	
@@ -2,7 +2,6 @@
 Code=DDC
 Date=2009-04-10
 Name=Duel Decks: Divine vs. Demonic
-Code2=DDC
 Type=Duel_Deck
 ScryfallCode=DDC
 
diff --git a/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt b/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt
index bda8d78e07b..c7908cc2b8a 100644
--- a/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt	
+++ b/forge-gui/res/editions/Duel Decks Elspeth vs. Kiora.txt	
@@ -4,6 +4,7 @@ Date=2015-02-27
 Name=Duel Decks: Elspeth vs. Kiora
 Type=Duel_Deck
 ScryfallCode=DDO
+TokensCode=DDO
 
 [cards]
 1 M Elspeth, Sun's Champion @Tyler Jacobson
@@ -73,6 +74,5 @@ ScryfallCode=DDO
 65 L Forest @Raoul Vitale
 
 [tokens]
-w_4_4_angel_flying
-w_1_1_soldier
-u_9_9_kraken
+66 w_1_1_soldier @Svetlin Velinov
+67 u_9_9_kraken @Dan Murayama Scott
diff --git a/forge-gui/res/editions/Duel Decks Elves vs. Inventors.txt b/forge-gui/res/editions/Duel Decks Elves vs. Inventors.txt
index 4e28f6166e7..81ce0d92b0c 100644
--- a/forge-gui/res/editions/Duel Decks Elves vs. Inventors.txt	
+++ b/forge-gui/res/editions/Duel Decks Elves vs. Inventors.txt	
@@ -87,4 +87,4 @@ ScryfallCode=DDU
 1 g_1_1_elf_warrior @William O'Connor
 2 c_1_1_a_myr @Ryan Pancoast
 3 c_1_1_a_thopter_flying @Svetlin Velinov
-4 c_1_1_a_thopter_flying @Svetlin Velinov
+4 c_1_1_a_thopter_flying @Richard Wright
diff --git a/forge-gui/res/editions/Duel Decks Merfolk vs. Goblins.txt b/forge-gui/res/editions/Duel Decks Merfolk vs. Goblins.txt
index e5ac3b5d82f..6bb7c76f863 100644
--- a/forge-gui/res/editions/Duel Decks Merfolk vs. Goblins.txt	
+++ b/forge-gui/res/editions/Duel Decks Merfolk vs. Goblins.txt	
@@ -2,7 +2,6 @@
 Code=DDT
 Date=2017-10-24
 Name=Duel Decks: Merfolk vs. Goblins
-Code2=DDT
 Type=Duel_Deck
 ScryfallCode=DDT
 
@@ -75,4 +74,3 @@ ScryfallCode=DDT
 1 u_1_0_elemental @Svetlin Velinov
 2 u_5_5_wall_defender @Brian Snõddy
 3 r_1_1_goblin @Karl Kopinski
-4 r_1_1_goblin_haste @Karl Kopinski
diff --git a/forge-gui/res/editions/Duel Decks Mind vs. Might.txt b/forge-gui/res/editions/Duel Decks Mind vs. Might.txt
index 435ca413ac8..37a79126a1c 100644
--- a/forge-gui/res/editions/Duel Decks Mind vs. Might.txt	
+++ b/forge-gui/res/editions/Duel Decks Mind vs. Might.txt	
@@ -2,7 +2,6 @@
 Code=DDS
 Date=2017-03-31
 Name=Duel Decks: Mind vs. Might
-Code2=DDS
 Type=Duel_Deck
 ScryfallCode=DDS
 
diff --git a/forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt b/forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt
index afb3900c02e..b99ce941fa5 100644
--- a/forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt	
+++ b/forge-gui/res/editions/Duel Decks Mirrodin Pure vs. New Phyrexia.txt	
@@ -94,13 +94,3 @@ ScryfallCode=TD2
 86 L Forest @Mark Tedin
 87 L Forest @Mark Tedin
 88 L Forest @Mark Tedin
-
-[tokens]
-w_2_2_cat
-b_0_0_phyrexian_germ
-g_5_5_beast
-g_1_1_insect
-g_1_1_ooze
-g_2_2_ooze_mitotic
-c_1_1_a_phyrexian_myr
-c_2_2_a_spawn
diff --git a/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt b/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt
index 25634f0ff82..5c5939b595c 100644
--- a/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt	
+++ b/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt	
@@ -4,6 +4,7 @@ Date=2014-09-05
 Name=Duel Decks: Speed vs. Cunning
 Type=Duel_Deck
 ScryfallCode=DDN
+TokensCode=DDN
 
 [cards]
 1 M Zurgo Helmsmasher @Ryan Alexander Lee
@@ -89,4 +90,4 @@ ScryfallCode=DDN
 81 L Plains @Andreas Rocha
 
 [tokens]
-r_1_1_goblin
+82 r_1_1_goblin @Karl Kopinski
diff --git a/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt b/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt
index 850a0c19a0f..63b4f080a13 100644
--- a/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt	
+++ b/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt	
@@ -2,9 +2,9 @@
 Code=DDP
 Date=2015-08-28
 Name=Duel Decks: Zendikar vs. Eldrazi
-Code2=DDP
 Type=Duel_Deck
 ScryfallCode=DDP
+TokensCode=DDP
 
 [cards]
 1 M Avenger of Zendikar @Aleksi Briclot
@@ -84,8 +84,8 @@ ScryfallCode=DDP
 75 L Mountain @James Paick
 
 [tokens]
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-c_0_1_eldrazi_spawn_sac
-r_4_4_hellion
-g_0_1_plant
+76 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+77 c_0_1_eldrazi_spawn_sac @Véronique Meignaud
+78 c_0_1_eldrazi_spawn_sac @Mark Tedin
+79 r_4_4_hellion @Anthony Francisco
+80 g_0_1_plant @Daren Bader
diff --git a/forge-gui/res/editions/Duels of the Planeswalkers.txt b/forge-gui/res/editions/Duels of the Planeswalkers.txt
index c1643c0b896..85393232ff0 100644
--- a/forge-gui/res/editions/Duels of the Planeswalkers.txt	
+++ b/forge-gui/res/editions/Duels of the Planeswalkers.txt	
@@ -119,8 +119,3 @@ ScryfallCode=DPA
 111 L Forest @John Avon
 112 L Forest @Steven Belledin
 113 L Forest @Jim Nelson
-
-[tokens]
-g_1_1_elf_warrior
-g_1_1_saproling
-g_2_2_wolf
diff --git a/forge-gui/res/editions/Duskmourn House of Horror Commander.txt b/forge-gui/res/editions/Duskmourn House of Horror Commander.txt
index e097c8a2a7c..1502dc11b11 100644
--- a/forge-gui/res/editions/Duskmourn House of Horror Commander.txt	
+++ b/forge-gui/res/editions/Duskmourn House of Horror Commander.txt	
@@ -390,17 +390,17 @@ ScryfallCode=DSC
 7 r_1_1_devil_burn @Maxime Minard
 8 g_3_3_beast @Johan Grenier
 9 g_5_3_elemental @Nils Hamm
-12 g_1_1_insect @Martina Pilcerova
-12 g_1_1_insect @Martina Pilcerova
-13 g_1_1_insect_flying_deathtouch @Martina Pilcerova
+10 g_1_1_insect @Jakub Kasper
+11 g_1_1_insect @Christopher Moeller
+12 g_1_1_insect_flying_deathtouch @Martina Pilcerova
 13 g_2_2_ooze @Lake Hurwitz
 14 g_x_x_ooze @Daniel Ljunggren
 15 g_4_4_phyrexian_beast @Svetlin Velinov
 16 g_1_2_spider_reach @Slawomir Maniak
 17 g_x_x_treefolk_reach_total_lands @Yeong-Hao Han
-18 gu_0_0_fractal @Livia Prima
-19 g_5_5_wurm @Diana Franco
-20 g_5_5_wurm_trample @Diana Franco
+18 g_5_5_wurm @Slawomir Maniak
+19 g_5_5_wurm_trample @Diana Franco
+20 gu_0_0_fractal @Andreas Zafiratos
 21 wb_2_1_inkling_flying @Scott Murphy
 22 bg_1_1_insect @Kim Sokol
 23 c_4_4_a_scarecrow_vigilance @Johan Grenier
diff --git a/forge-gui/res/editions/Eighth Edition Promos.txt b/forge-gui/res/editions/Eighth Edition Promos.txt
index 75c17e26e63..fc762c5a0c6 100644
--- a/forge-gui/res/editions/Eighth Edition Promos.txt	
+++ b/forge-gui/res/editions/Eighth Edition Promos.txt	
@@ -7,6 +7,3 @@ ScryfallCode=P8ED
 
 [cards]
 216★ R Rukh Egg @Mark Zug
-
-[tokens]
-r_4_4_bird_flying
\ No newline at end of file
diff --git a/forge-gui/res/editions/Eighth Edition.txt b/forge-gui/res/editions/Eighth Edition.txt
index 872a238b87e..60451f4fb42 100644
--- a/forge-gui/res/editions/Eighth Edition.txt	
+++ b/forge-gui/res/editions/Eighth Edition.txt	
@@ -133,14 +133,17 @@ ScryfallCode=8ED
 119 C Bog Imp @Carl Critchlow
 120 U Bog Wraith @Dave Dorman
 121 U Carrion Wall @Tony Szczudlo
+121s U Carrion Wall @Pete Venters
 122 C Coercion @DiTerlizzi
 123 C Dark Banishing @Dermot Power
 124 R Death Pit Offering @Pete Venters
 125 R Death Pits of Rath @Joel Biske
+125s R Death Pits of Rath @Greg Hildebrandt & Tim Hildebrandt
 126 U Deathgazer @Donato Giancola
 127 C Deepwood Ghoul @Alan Pollack
 128 U Diabolic Tutor @Rick Farrell
 129 C Drudge Skeletons @Jim Nelson
+129s C Drudge Skeletons @Arnie Swekel
 130 C Dusk Imp @Edward P. Beard, Jr.
 131 R Eastern Paladin @Carl Critchlow
 132 U Execute @Gary Ruddell
@@ -367,8 +370,6 @@ S2 U Vengeance @Paolo Parente
 S3 C Giant Octopus @Heather Hudson
 S4 C Sea Eagle @Anthony S. Waters
 S5 R Vizzerdrix @Dave Dorman
+S5a R Vizzerdrix @Dave Dorman
 S6 U Enormous Baloth @Mark Tedin
 S7 U Silverback Ape @Ron Spears
-
-[tokens]
-r_4_4_bird_flying
diff --git a/forge-gui/res/editions/Eternal Masters.txt b/forge-gui/res/editions/Eternal Masters.txt
index af77852dd4c..333ddc9bd51 100644
--- a/forge-gui/res/editions/Eternal Masters.txt	
+++ b/forge-gui/res/editions/Eternal Masters.txt	
@@ -276,3 +276,6 @@ ScryfallCode=EMA
 13 g_6_6_wurm @Anthony Francisco
 14 ur_5_5_elemental_flying @Randy Gallegos
 15 rw_1_1_goblin_soldier @Filip Burburan
+
+[other]
+16 emblem_dack_fayden @Eric Deschamps
diff --git a/forge-gui/res/editions/Eventide.txt b/forge-gui/res/editions/Eventide.txt
index 5c895b9933e..5a5f8fb3bdc 100644
--- a/forge-gui/res/editions/Eventide.txt
+++ b/forge-gui/res/editions/Eventide.txt
@@ -2,7 +2,6 @@
 Code=EVE
 Date=2008-07-25
 Name=Eventide
-Code2=EVE
 Alias=EVT
 Type=Expansion
 BoosterCovers=3
diff --git a/forge-gui/res/editions/Exodus.txt b/forge-gui/res/editions/Exodus.txt
index cf6bd3b96e4..169059af826 100644
--- a/forge-gui/res/editions/Exodus.txt
+++ b/forge-gui/res/editions/Exodus.txt
@@ -153,8 +153,3 @@ ScryfallCode=EXO
 141 U Transmogrifying Licid @Jim Nelson
 142 R Workhorse @DiTerlizzi
 143 R City of Traitors @Kev Walker
-
-[tokens]
-c_1_1_a_thopter_flying
-w_1_1_pegasus_flying
-g_2_2_beast
diff --git a/forge-gui/res/editions/Explorers of Ixalan.txt b/forge-gui/res/editions/Explorers of Ixalan.txt
index 8f29f48abf1..17d419525f0 100644
--- a/forge-gui/res/editions/Explorers of Ixalan.txt	
+++ b/forge-gui/res/editions/Explorers of Ixalan.txt	
@@ -2,9 +2,9 @@
 Code=E02
 Date=2017-11-24
 Name=Explorers of Ixalan
-Code2=E02
 Type=Boxed_Set
 ScryfallCode=E02
+TokensCode=E02
 
 [cards]
 1 R Beacon of Immortality @Rob Alexander
@@ -56,4 +56,4 @@ ScryfallCode=E02
 47 U Tainted Field @Don Hazeltine
 
 [tokens]
-g_1_1_saproling
+T1 g_1_1_saproling @Joseph Meehan
diff --git a/forge-gui/res/editions/Fallen Empires.txt b/forge-gui/res/editions/Fallen Empires.txt
index 5c8d12eb868..3d8a5d6243e 100644
--- a/forge-gui/res/editions/Fallen Empires.txt	
+++ b/forge-gui/res/editions/Fallen Empires.txt	
@@ -198,10 +198,3 @@ ScryfallCode=FEM
 100 U Ruins of Trokair @Mark Poole
 101 R Sand Silos @Pat Lewis
 102 U Svyelunite Temple @Mark Poole
-
-[tokens]
-w_1_1_citizen
-u_1_1_camarid
-b_0_1_thrull
-r_1_1_goblin
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Fallout Commander.txt b/forge-gui/res/editions/Fallout.txt
similarity index 99%
rename from forge-gui/res/editions/Fallout Commander.txt
rename to forge-gui/res/editions/Fallout.txt
index f309f4cd620..90ca2731c56 100644
--- a/forge-gui/res/editions/Fallout Commander.txt	
+++ b/forge-gui/res/editions/Fallout.txt
@@ -1,7 +1,7 @@
 [metadata]
 Code=PIP
 Date=2024-03-08
-Name=Fallout Commander
+Name=Fallout
 Type=Commander
 ScryfallCode=PIP
 
@@ -1087,14 +1087,15 @@ ScryfallCode=PIP
 10 rw_1_1_soldier_haste @Justine Cruz
 11 c_a_clue_draw @Ashley Mackenzie
 12 c_a_food_sac @David Astruga
-13 c_a_food_sac @David Astruga
-14 c_a_food_sac @David Astruga
+13 c_a_food_sac @Bruno Biazotto
+14 c_a_food_sac @Kamila Szutenberg
 15 c_a_junk_sac_exileplay @Justine Cruz
 16 c_3_3_a_robot @Sergio Cosmai
 17 c_1_1_a_thopter_flying @Victor Harmatiuk
 18 c_a_treasure_sac @Rafater
-19 c_a_treasure_sac @Rafater
+19 c_a_treasure_sac @Kim Sokol
 20 wasteland_survival_guide @Sergio Cosmai
 
 [other]
+1 copy @Monztre
 22 radiation @Skinnyelbows
\ No newline at end of file
diff --git a/forge-gui/res/editions/Fate Reforged.txt b/forge-gui/res/editions/Fate Reforged.txt
index 78800dea686..10bbe3ad781 100644
--- a/forge-gui/res/editions/Fate Reforged.txt	
+++ b/forge-gui/res/editions/Fate Reforged.txt	
@@ -223,6 +223,8 @@ ScryfallCode=FRF
 
 [tokens]
 1 w_1_1_monk_prowess @Steven Belledin
-2 w_1_1_monk_prowess @Steven Belledin
-3 w_1_1_spirit_flying @Aaron Miller
+2 w_1_1_spirit_flying @Aaron Miller
 3 b_2_1_warrior @Zoltan Boros
+
+[other]
+4 manifest @Raymond Swanland
\ No newline at end of file
diff --git a/forge-gui/res/editions/Fifth Dawn.txt b/forge-gui/res/editions/Fifth Dawn.txt
index d8ea2cf3bc3..c7dfc11d671 100644
--- a/forge-gui/res/editions/Fifth Dawn.txt	
+++ b/forge-gui/res/editions/Fifth Dawn.txt	
@@ -177,9 +177,3 @@ ScryfallCode=5DN
 163 R Vedalken Orrery @John Avon
 164 R Vedalken Shackles @Mark Zug
 165 C Wayfarer's Bauble @Darrell Riche
-
-[tokens]
-kaldra
-c_2_2_pincher
-g_3_3_beast
-g_1_1_insect
diff --git a/forge-gui/res/editions/Fifth Edition.txt b/forge-gui/res/editions/Fifth Edition.txt
index d2c2645b6bb..319545b011d 100644
--- a/forge-gui/res/editions/Fifth Edition.txt	
+++ b/forge-gui/res/editions/Fifth Edition.txt	
@@ -461,14 +461,3 @@ ScryfallCode=5ED
 447 L Forest @David O'Connor
 448 L Forest @David O'Connor
 449 L Forest @David O'Connor
-
-[tokens]
-wasp
-c_1_1_a_snake_poison
-c_5_5_a_djinn_flying
-w_0_1_caribou
-w_1_1_citizen
-b_0_1_serf
-b_0_1_thrull
-b_x_x_spirit
-r_1_1_goblin
diff --git a/forge-gui/res/editions/Final Fantasy Commander.txt b/forge-gui/res/editions/Final Fantasy Commander.txt
index 27d4733e4ee..38511d0b529 100644
--- a/forge-gui/res/editions/Final Fantasy Commander.txt	
+++ b/forge-gui/res/editions/Final Fantasy Commander.txt	
@@ -202,7 +202,7 @@ ScryfallCode=FIC
 194 R Summon: Good King Mog XII @Minoru
 195 R Summon: Ixion @Yoshiya
 196 R Summon: Yojimbo @Hisashi Momose
-197 R Summon: Valefor @SENNSU
+197 R Summon: Valefor @Maiko Aoji
 198 R Summon: Esper Valigarmanda @TAKUMI
 199 R Summon: Kujata @Yoshiya
 200 R Summon: Magus Sisters @Karo ARAI
@@ -254,7 +254,7 @@ ScryfallCode=FIC
 246 M Luminous Broodmoth @Kazto Furuya
 247 U Palace Jailer @Touge369
 248 U Path to Exile @Yumi Yaoshida
-249 R Promise of Loyalty @Lack
+249 R Promise of Loyalty @KOHEI YAMADA
 250 R Puresteel Paladin @Ignatius Budi
 251 R Resourceful Defense @Shiyu
 252 R Scholar of New Horizons @Allen Morris
@@ -340,7 +340,7 @@ ScryfallCode=FIC
 332 C Arcane Signet @Grace Zhu
 333 C Arcane Signet @Randy Gallegos
 334 C Arcane Signet @Russell Lu
-335 C Arcane Signet @Russell Lu
+335 C Arcane Signet @Madeline Boni
 336 R Armory Automaton @Gas1
 337 R Champion's Helm @Russell Lu
 338 U Colossus Hammer @Kevin Sidharta
@@ -447,6 +447,48 @@ ScryfallCode=FIC
 439 R Underground River @Shahab Alizadeh
 440 R Vineglimmer Snarl @Mauricio Calle
 441 C Wooded Ridgeline @Hristo D. Chukov
+442 R Garland, Royal Kidnapper @David Rapoza
+443 R The Destined Warrior @David Rapoza
+444 R The Destined White Mage @David Rapoza
+445 R Chaos Shrine's Black Crystal @David Rapoza
+446 R The Destined Thief @David Rapoza
+447 R The Destined Black Mage @David Rapoza
+448 R Edea, Possessed Sorceress @Lius Lasahido
+449 R Fated Clash @Lius Lasahido
+450 R Rinoa, Angel Wing @Lius Lasahido
+451 R Seifer, Balamb Rival @Lius Lasahido
+452 R Duelist's Flame @Lius Lasahido
+453 R Squall, Gunblade Duelist @Lius Lasahido
+454 R Brilliant Wings @Erion Makuo
+455 R Judgment of Alexander @Erion Makuo
+456 R Mega Flare @Erion Makuo
+457 R Amarant Coral @Erion Makuo
+458 R Vivi's Persistence @Erion Makuo
+459 R Search for Dagger @Erion Makuo
+460 R Noctis, Heir Apparent @Winona Nelson
+461 R Fishing Gear @Winona Nelson
+462 R Chocobo Camp @Winona Nelson
+463 R Flash Photography @Winona Nelson
+464 R Campsite Cuisine @Winona Nelson
+465 R Warrior's Resolve @Winona Nelson
+466 R Tataru Taru @Domco.
+467 R Lulu, Stern Guardian @Hiromu
+468 R Rikku, Resourceful Guardian @Ayuko
+469 M Snapcaster Mage @Canata Katana
+470 R Yuffie, Materia Hunter @Nijihayashi
+471 R Aerith, Last Ancient @MiDQN
+472 R Barret, Avalanche Leader @Dai-XT
+473 R Emet-Selch of the Third Seat @Kuregure
+474 R Estinien Varlineau @Yakotakos
+475 R Locke, Treasure Hunter @Kato Ayaka
+476 R Mog, Moogle Warrior @Rorubei
+477 R Wakka, Devoted Guardian @Dai-XT
+478 L Plains @Fuzichoco
+479 L Island @Ai Nanahira
+480 L Swamp @Ryuichi Sakuma
+481 L Mountain @Nao Miyoshi
+482 L Forest @ZOUNOSE
+483 R Birds of Paradise @Takotto
 484 C Command Tower @Anthony Devine
 485 C Command Tower @Eduardo Francisco
 486 C Command Tower @Jonas De Ro
diff --git a/forge-gui/res/editions/Final Fantasy.txt b/forge-gui/res/editions/Final Fantasy.txt
index c9d4e536a78..b43e27275d0 100644
--- a/forge-gui/res/editions/Final Fantasy.txt	
+++ b/forge-gui/res/editions/Final Fantasy.txt	
@@ -631,6 +631,14 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
 551c M Traveling Chocobo @Toni Infante
 551d M Traveling Chocobo @Toni Infante
 551f M Traveling Chocobo @Toni Infante
+564 M Cloud, Midgar Mercenary @Inuchiyo Meimaru
+565 R Stiltzkin, Moogle Merchant @Yukihiro Maruo
+566 R A Realm Reborn @Susumu Kuroi
+567 R Tifa Lockhart @Yoshiro Ambe
+568 M Traveling Chocobo @Ishikawa Kenta
+569 R Choco, Seeker of Paradise @Kemonomichi
+570 M Vivi Ornitier @Ryanroro
+571 M Yuna, Hope of Spira @Yuichi Murakami
 572 L Plains @Jonas De Ro
 573 L Island @Eddie Mendoza
 574 L Swamp @Domenico Cava
diff --git a/forge-gui/res/editions/Foundations.txt b/forge-gui/res/editions/Foundations.txt
index 9601c8ab074..af79dc7b4af 100644
--- a/forge-gui/res/editions/Foundations.txt
+++ b/forge-gui/res/editions/Foundations.txt
@@ -822,6 +822,7 @@ Replace=.024F Uncommon:fromSheet("FDN borderless")
 11 komas_coil @Simon Dominic
 12 u_2_1_ninja @Diana Cearley
 13 scion_of_the_deep @Brent Hollowell
+14 b_1_1_rat @Mike Bierek
 15 b_2_2_zombie @Anna Steinbauer
 16 r_4_4_dragon_flying @Alexander Ostrowski
 17 r_5_5_dragon_flying @Raymond Swanland
@@ -831,12 +832,17 @@ Replace=.024F Uncommon:fromSheet("FDN borderless")
 21 bg_1_1_insect_flying @Helge C. Balzer
 22 c_a_food_sac @Alexander Mokhov
 23 c_a_treasure_sac @Alayna Danner
-27 w_1_1_cat @Filip Burburan
-28 w_1_1_cat_lifelink @Filip Burburan
+27 w_1_1_cat_lifelink @Filip Burburan
 28 w_2_2_cat_beast @Bayard Wu
 29 w_1_1_dog @Manuel Castañón
-30 b_1_1_rat @Kim Sokol
-31 b_1_1_rat_noblock @Kim Sokol
+30 b_1_1_rat_noblock @Kim Sokol
 31 r_1_1_phyrexian_goblin @Jokubas Uogintas
+# Duplicated as there is no r_1_1_phyrexian_goblin_haste token yet
+31 r_1_1_phyrexian_goblin_haste @Jokubas Uogintas
 32 g_3_3_beast @John Donahue
 33 g_4_4_beast @Steve Prescott
+
+[other]
+24 emblem_kaito_cunning_infiltrator @Evyn Fong
+25 emblem_vivien_reid @Anna Steinbauer
+26 copy @Brian Valeza
\ No newline at end of file
diff --git a/forge-gui/res/editions/Fourth Edition.txt b/forge-gui/res/editions/Fourth Edition.txt
index 3a229924bd7..46e041272a9 100644
--- a/forge-gui/res/editions/Fourth Edition.txt	
+++ b/forge-gui/res/editions/Fourth Edition.txt	
@@ -390,8 +390,3 @@ ScryfallCode=4ED
 376 L Forest @Christopher Rush
 377 L Forest @Christopher Rush
 378 L Forest @Christopher Rush
-
-[tokens]
-wasp
-c_1_1_a_tetravite_flying_noenchant
-c_5_5_a_djinn_flying
diff --git a/forge-gui/res/editions/Friday Night Magic 2012.txt b/forge-gui/res/editions/Friday Night Magic 2012.txt
index 6a6edf356b9..bf5ae64e69c 100644
--- a/forge-gui/res/editions/Friday Night Magic 2012.txt	
+++ b/forge-gui/res/editions/Friday Night Magic 2012.txt	
@@ -4,6 +4,7 @@ Date=2012-01-01
 Name=Friday Night Magic 2012
 Type=Promo
 ScryfallCode=F12
+TokensCode=F12
 
 [cards]
 1 R Glistener Elf @Mark Zug
@@ -20,5 +21,5 @@ ScryfallCode=F12
 12 R Gitaxian Probe @Trevor Claxton
 
 [tokens]
-w_1_1_human
-g_2_2_wolf
+1a w_1_1_human @Lars Grant-West
+1a☇ g_2_2_wolf @Lars Grant-West
diff --git a/forge-gui/res/editions/Friday Night Magic 2017.txt b/forge-gui/res/editions/Friday Night Magic 2017.txt
index f7bd19b41ff..bc5f6a6a013 100644
--- a/forge-gui/res/editions/Friday Night Magic 2017.txt	
+++ b/forge-gui/res/editions/Friday Night Magic 2017.txt	
@@ -4,6 +4,7 @@ Date=2017-01-01
 Name=Friday Night Magic 2017
 Type=Promo
 ScryfallCode=F17
+TokensCode=F17
 
 [cards]
 1 R Noose Constrictor @Kev Walker
@@ -15,3 +16,11 @@ ScryfallCode=F17
 7 R Reverse Engineer @Jason Kang
 8 R Fatal Push @Alex Konstad
 9 R Renegade Rallier @David Palumbo
+
+[tokens]
+10 w_1_1_vampire_lifelink @John Severin Brassell
+10☇ c_a_treasure_sac @Zoltan Boros
+11 g_3_3_dinosaur_trample @Filip Burburan
+11☇ c_a_treasure_sac @Florian de Gesincourt
+12 b_2_2_pirate_menace @Matt Stewart
+12☇ c_a_treasure_sac @Milivoj Ćeran
\ No newline at end of file
diff --git a/forge-gui/res/editions/From the Vault Angels.txt b/forge-gui/res/editions/From the Vault Angels.txt
index b03a0dee87e..6b51cc66212 100644
--- a/forge-gui/res/editions/From the Vault Angels.txt	
+++ b/forge-gui/res/editions/From the Vault Angels.txt	
@@ -21,6 +21,3 @@ ScryfallCode=V15
 13 M Platinum Angel @Brom
 14 M Serra Angel @Rebecca Guay
 15 M Tariel, Reckoner of Souls @Wayne Reynolds
-
-[tokens]
-w_4_4_angel_flying
diff --git a/forge-gui/res/editions/From the Vault Annihilation.txt b/forge-gui/res/editions/From the Vault Annihilation.txt
index 0db73b1199e..4b1bd6811da 100644
--- a/forge-gui/res/editions/From the Vault Annihilation.txt	
+++ b/forge-gui/res/editions/From the Vault Annihilation.txt	
@@ -21,6 +21,3 @@ ScryfallCode=V14
 13 M Upheaval @Kev Walker
 14 M Virtue's Ruin @Mike Dringenberg
 15 M Wrath of God @Willian Murai
-
-[tokens]
-w_1_1_soldier
diff --git a/forge-gui/res/editions/From the Vault Dragons.txt b/forge-gui/res/editions/From the Vault Dragons.txt
index 601da6268c4..861bb6f9ffd 100644
--- a/forge-gui/res/editions/From the Vault Dragons.txt	
+++ b/forge-gui/res/editions/From the Vault Dragons.txt	
@@ -21,6 +21,3 @@ ScryfallCode=DRB
 13 R Shivan Dragon @Justin Sweet
 14 R Thunder Dragon @Chris Rahn
 15 R Two-Headed Dragon @Sam Wood
-
-[tokens]
-g_1_1_saproling
diff --git a/forge-gui/res/editions/From the Vault Legends.txt b/forge-gui/res/editions/From the Vault Legends.txt
index 8a2846362e9..16791ccb20c 100644
--- a/forge-gui/res/editions/From the Vault Legends.txt	
+++ b/forge-gui/res/editions/From the Vault Legends.txt	
@@ -1,9 +1,9 @@
 [metadata]
-Code=FVL
+Code=V11
+Code2=FVL
 Date=2011-08-26
 Name=From the Vault: Legends
 Type=Collector_Edition
-Alias=V11
 ScryfallCode=V11
 
 [cards]
@@ -22,6 +22,3 @@ ScryfallCode=V11
 13 M Teferi, Mage of Zhalfir @Volkan Baǵa
 14 M Ulamog, the Infinite Gyre @Aleksi Briclot
 15 M Visara the Dreadful @Brad Rigney
-
-[tokens]
-ub_1_1_faerie_rogue_flying
diff --git a/forge-gui/res/editions/From the Vault Lore.txt b/forge-gui/res/editions/From the Vault Lore.txt
index 12d55cd99ee..41b352bcfc7 100644
--- a/forge-gui/res/editions/From the Vault Lore.txt	
+++ b/forge-gui/res/editions/From the Vault Lore.txt	
@@ -4,6 +4,7 @@ Date=2016-08-19
 Name=From the Vault: Lore
 Type=Collector_Edition
 ScryfallCode=V16
+TokensCode=V16
 
 [cards]
 1 M Beseech the Queen @Jason Chan
@@ -23,5 +24,4 @@ ScryfallCode=V16
 15 M Unmask @rk post
 
 [tokens]
-marit_lage
-b_x_x_phyrexian_minion
+16 marit_lage @Stephan Martiniere
diff --git a/forge-gui/res/editions/From the Vault Realms.txt b/forge-gui/res/editions/From the Vault Realms.txt
index ba83da8d783..453936286bb 100644
--- a/forge-gui/res/editions/From the Vault Realms.txt	
+++ b/forge-gui/res/editions/From the Vault Realms.txt	
@@ -21,6 +21,3 @@ ScryfallCode=V12
 13 M Urborg, Tomb of Yawgmoth @John Avon
 14 M Vesuva @Zoltan Boros & Gabor Szikszai
 15 M Windbrisk Heights @Omar Rayyan
-
-[tokens]
-c_1_1_spirit
diff --git a/forge-gui/res/editions/From the Vault Relics.txt b/forge-gui/res/editions/From the Vault Relics.txt
index 88fdfac5606..fc212ab133d 100644
--- a/forge-gui/res/editions/From the Vault Relics.txt	
+++ b/forge-gui/res/editions/From the Vault Relics.txt	
@@ -1,9 +1,9 @@
 [metadata]
-Code=FVR
+Code=V10
+Code2=FVR
 Date=2010-08-27
 Name=From the Vault: Relics
 Type=Collector_Edition
-Alias=V10
 ScryfallCode=V10
 
 [cards]
@@ -22,6 +22,3 @@ ScryfallCode=V10
 13 M Sundering Titan @Jim Murray
 14 M Sword of Body and Mind @Chris Rahn
 15 M Zuran Orb @Ryan Pancoast
-
-[tokens]
-g_2_2_wolf
diff --git a/forge-gui/res/editions/From the Vault Transform.txt b/forge-gui/res/editions/From the Vault Transform.txt
index 382b614f193..2dd0bfd7e0e 100644
--- a/forge-gui/res/editions/From the Vault Transform.txt	
+++ b/forge-gui/res/editions/From the Vault Transform.txt	
@@ -21,11 +21,3 @@ ScryfallCode=V17
 13 M Kytheon, Hero of Akros @Willian Murai
 14 M Liliana, Heretical Healer @Karla Ortiz
 15 M Nissa, Vastwood Seer @Wesley Burt
-
-[tokens]
-ashaya_the_awoken_world
-b_2_2_vampire_flying
-b_1_1_wolf_deathtouch
-b_2_2_zombie
-g_2_2_wolf
-g_2_2_wolf
diff --git a/forge-gui/res/editions/Future Sight.txt b/forge-gui/res/editions/Future Sight.txt
index 9706d3cbbe7..f8cf8c38214 100644
--- a/forge-gui/res/editions/Future Sight.txt	
+++ b/forge-gui/res/editions/Future Sight.txt	
@@ -2,7 +2,6 @@
 Code=FUT
 Date=2007-05-04
 Name=Future Sight
-Code2=FUT
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -191,16 +190,3 @@ ScryfallCode=FUT
 178 R Nimbus Maze @Jason Chan
 179 R River of Tears @Chris J. Anderson
 180 U Zoetic Cavern @Lars Grant-West
-
-[tokens]
-goldmeadow_harrier
-cloud_sprite
-festering_goblin
-spark_elemental
-llanowar_elves
-metallic_sliver
-w_1_1_soldier
-b_2_2_zombie
-r_4_4_giant
-g_1_1_saproling
-g_x_x_wurm
diff --git a/forge-gui/res/editions/Game Day Promos.txt b/forge-gui/res/editions/Game Day Promos.txt
index 3f389e73fe5..7e940d12d5f 100644
--- a/forge-gui/res/editions/Game Day Promos.txt	
+++ b/forge-gui/res/editions/Game Day Promos.txt	
@@ -15,7 +15,3 @@ ScryfallCode=GDY
 7 R Recruitment Officer @Zoltan Boros
 8 R Braids, Arisen Nightmare @Anastasia Balakchina
 9 M Surge Engine @Volkan Baǵa
-
-[tokens]
-u_x_x_illusion
-g_4_4_rhino_warrior
diff --git a/forge-gui/res/editions/Game Night 2019.txt b/forge-gui/res/editions/Game Night 2019.txt
index 75fb49e8ba9..51ed3156bf1 100644
--- a/forge-gui/res/editions/Game Night 2019.txt	
+++ b/forge-gui/res/editions/Game Night 2019.txt	
@@ -2,7 +2,6 @@
 Code=GN2
 Date=2019-11-15
 Name=Game Night 2019
-Code2=GN2
 Type=Multiplayer
 ScryfallCode=GN2
 
diff --git a/forge-gui/res/editions/Game Night.txt b/forge-gui/res/editions/Game Night.txt
index 96d7a0e6488..eb1ab65235c 100644
--- a/forge-gui/res/editions/Game Night.txt	
+++ b/forge-gui/res/editions/Game Night.txt	
@@ -2,7 +2,6 @@
 Code=GNT
 Date=2018-11-16
 Name=Game Night
-Code2=GNT
 Type=Multiplayer
 ScryfallCode=GNT
 
@@ -75,9 +74,3 @@ ScryfallCode=GNT
 66 L Mountain @Nils Hamm
 67 L Forest @Noah Bradley
 68 L Forest @Dimitar Marinski
-
-[tokens]
-w_2_2_knight_vigilance
-b_2_2_zombie
-r_1_1_goblin
-c_1_1_a_thopter_flying
diff --git a/forge-gui/res/editions/Gatecrash.txt b/forge-gui/res/editions/Gatecrash.txt
index c8ff73cb3e6..c6949a44616 100644
--- a/forge-gui/res/editions/Gatecrash.txt
+++ b/forge-gui/res/editions/Gatecrash.txt
@@ -2,7 +2,6 @@
 Code=GTC
 Date=2013-02-01
 Name=Gatecrash
-Code2=GTC
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand RTR
@@ -269,7 +268,7 @@ TokenFallbackCode=RTR
 3 g_3_3_frog_lizard @Jack Wang
 4 wb_1_1_cleric_deathpact @Jason Chan
 5 ub_1_1_horror_flying @Adam Paquette
-6 rw_1_1_soldier_haste @David Palumbo
+6 rw_1_1_soldier @David Palumbo
 7 wb_1_1_spirit_flying @Cliff Childs
 
 [other]
diff --git a/forge-gui/res/editions/Global Series Jiang Yanggu & Mu Yanling.txt b/forge-gui/res/editions/Global Series Jiang Yanggu & Mu Yanling.txt
index e9916e8a500..76fb344228c 100644
--- a/forge-gui/res/editions/Global Series Jiang Yanggu & Mu Yanling.txt	
+++ b/forge-gui/res/editions/Global Series Jiang Yanggu & Mu Yanling.txt	
@@ -4,6 +4,7 @@ Date=2018-06-22
 Name=Global Series Jiang Yanggu & Mu Yanling
 Type=Duel_Deck
 ScryfallCode=GS1
+TokensCode=GS1
 
 [cards]
 1 M Mu Yanling @林玄泰
@@ -48,5 +49,5 @@ ScryfallCode=GS1
 40 L Forest @Xin-Yu Liu
 
 [tokens]
-mowu
-mowu
+T1 mowu @XiaoDi Jin
+T1☇ mowu @XiaoDi Jin
diff --git a/forge-gui/res/editions/Grand Prix Promos.txt b/forge-gui/res/editions/Grand Prix Promos.txt
index 42e52155579..b6ef10ace82 100644
--- a/forge-gui/res/editions/Grand Prix Promos.txt	
+++ b/forge-gui/res/editions/Grand Prix Promos.txt	
@@ -1,6 +1,5 @@
 [metadata]
 Code=PGPX
-Code2=PGPX
 Date=2007-02-24
 Name=Grand Prix Promos
 Type=Promo
@@ -22,8 +21,8 @@ ScryfallCode=PGPX
 2016b R Sword of Feast and Famine @Efrem Palacios
 2017 M Progenitus @Jaime Jones
 2018 R Mutavault @John Avon
-2018a L Plains @Donato Giancola
-2018b L Island @Donato Giancola
-2018c L Swamp @Donato Giancola
-2018d L Mountain @Donato Giancola
-2018f L Forest @Donato Giancola
+2018a R Plains @Donato Giancola
+2018b R Island @Donato Giancola
+2018c R Swamp @Donato Giancola
+2018d R Mountain @Donato Giancola
+2018f R Forest @Donato Giancola
diff --git a/forge-gui/res/editions/Guildpact.txt b/forge-gui/res/editions/Guildpact.txt
index dea0cf9b17f..1a9f8bbd87c 100644
--- a/forge-gui/res/editions/Guildpact.txt
+++ b/forge-gui/res/editions/Guildpact.txt
@@ -27,6 +27,7 @@ ScryfallCode=GPT
 12 U Martyred Rusalka @Alex Horley-Orlandelli
 13 U Order of the Stars @Heather Hudson
 14 U Shadow Lance @Hideaki Takamura
+14★ U Shadow Lance @Hideaki Takamura
 15 C Shrieking Grotesque @Dany Orizio
 16 U Sinstriker's Will @Ben Thompson
 17 C Skyrider Trainee @Adam Rex
@@ -50,6 +51,7 @@ ScryfallCode=GPT
 35 C Steamcore Weird @Justin Norman
 36 U Stratozeppelid @Ittoku
 37 U Thunderheads @Hideaki Takamura
+37★ U Thunderheads @Hideaki Takamura
 38 C Torch Drake @Daren Bader
 39 C Train of Thought @Matt Thompson
 40 U Vacuumelt @Nottsuo
@@ -178,12 +180,3 @@ ScryfallCode=GPT
 163 U Skarrg, the Rage Pits @Martina Pilcerova
 164 R Steam Vents @Rob Alexander
 165 R Stomping Ground @Rob Alexander
-
-[tokens]
-c_1_1_sand
-w_1_1_pegasus_flying
-w_1_1_spirit_flying
-u_3_3_weird_defender_flying
-b_1_1_bat_flying
-g_1_1_saproling
-g_6_6_wurm
diff --git a/forge-gui/res/editions/Guilds of Ravnica Guild Kit.txt b/forge-gui/res/editions/Guilds of Ravnica Guild Kit.txt
index 93258d7f752..839361a7dbc 100644
--- a/forge-gui/res/editions/Guilds of Ravnica Guild Kit.txt	
+++ b/forge-gui/res/editions/Guilds of Ravnica Guild Kit.txt	
@@ -2,7 +2,6 @@
 Code=GK1
 Date=2018-11-02
 Name=Guilds of Ravnica Guild Kit
-Code2=GK1
 Type=Boxed_Set
 ScryfallCode=GK1
 TokenFallbackCode=GRN
@@ -137,12 +136,15 @@ TokenFallbackCode=GRN
 127 L Forest @Alayna Danner
 
 [tokens]
-2 ub_1_1_horror_flying @Adam Paquette
+# Should be 2
+1☇ ub_1_1_horror_flying @Adam Paquette
 3 u_3_3_weird_defender_flying @Hideaki Takamura
-4 r_1_1_goblin @Karl Kopinski
+# Should be 4
+3☇ r_1_1_goblin @Karl Kopinski
 5 g_1_1_saproling @Raoul Vitale
-6 rw_1_1_soldier_haste @David Palumbo
-7 g_3_3_centaur @Slawomir Maniak
+6 rw_1_1_soldier @David Palumbo
+# Should be 7
+10☇ g_3_3_centaur @Slawomir Maniak
 8 g_1_1_saproling @Brad Rigney
 9 g_5_5_wurm_trample @Anthony Palumbo
 10 gw_8_8_elemental_vigilance @Yeong-Hao Han
diff --git a/forge-gui/res/editions/Guilds of Ravnica.txt b/forge-gui/res/editions/Guilds of Ravnica.txt
index f16ab025faa..90909170ad9 100644
--- a/forge-gui/res/editions/Guilds of Ravnica.txt	
+++ b/forge-gui/res/editions/Guilds of Ravnica.txt	
@@ -2,7 +2,6 @@
 Code=GRN
 Date=2018-10-05
 Name=Guilds of Ravnica
-Code2=GRN
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:!fromSheet("GRN lands"):fromSheet("GRN cards"), 3 Uncommon:fromSheet("GRN cards"), 1 RareMythic:fromSheet("GRN cards"), 1 fromSheet("GRN lands")
@@ -310,3 +309,7 @@ Boros Guildgate|GRN|2
 4 r_1_1_goblin @Mark Zug
 5 bg_1_1_insect @Ben Wootten
 6 gw_2_2_elf_knight_vigilance @Tomasz Jedruszek
+
+[other]
+7 emblem_ral_izzet_viceroy @Kieran Yanner
+8 emblem_vraska_golgari_queen @Magali Villeneuve
\ No newline at end of file
diff --git a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt
index d1970ad414b..dd3fbf2859f 100644
--- a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
+++ b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
@@ -7,8 +7,6 @@ BoosterCovers=3
 Booster=10 Common:fromSheet("IKO cards"):!fromSheet("IKO Lands"), 3 Uncommon:fromSheet("IKO cards"), 1 RareMythic:fromSheet("IKO cards"), 1 fromSheet("IKO Lands")
 Prerelease=6 Boosters, 1 RareMythic+
 FatPackExtraSlots=20 BasicLands, 20 BasicLands+
-#, 1 Colossification+|IKO|3
-ScryfallCode=IKO
 
 [cards]
 1 C Adaptive Shimmerer @Jason Felix
@@ -288,7 +286,7 @@ ScryfallCode=IKO
 
 [buy a box]
 275 M Zilortha, Strength Incarnate @Antonio José Manzanedo
-275a M Zilortha, Strength Incarnate @Chase Stone
+275y M Zilortha, Strength Incarnate @Chase Stone
 
 [borderless]
 276 M Lukka, Coppercoat Outcast @Kieran Yanner
diff --git a/forge-gui/res/editions/Innistrad Crimson Vow.txt b/forge-gui/res/editions/Innistrad Crimson Vow.txt
index 4cfcd9b8885..5eeb6195b94 100644
--- a/forge-gui/res/editions/Innistrad Crimson Vow.txt	
+++ b/forge-gui/res/editions/Innistrad Crimson Vow.txt	
@@ -470,5 +470,4 @@ A-248 U A-Skull Skaab @Nicholas Gregory
 19 copy @Brian Valeza
 20 emblem_chandra_dressed_to_kill @Viktor Titov
 21 day @Johan Grenier
-# Double-faced tokens are not supported yet
-# 21☇ night @Johan Grenier
\ No newline at end of file
+21☇ night @Johan Grenier
\ No newline at end of file
diff --git a/forge-gui/res/editions/Innistrad Midnight Hunt.txt b/forge-gui/res/editions/Innistrad Midnight Hunt.txt
index 44cbc85b7be..c4879fae8cd 100644
--- a/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
+++ b/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
@@ -447,5 +447,4 @@ A-218 U A-Devoted Grafkeeper @Raoul Vitale
 17 emblem_teferi_who_slows_the_sunset @Heonhwa Choe
 18 emblem_wrenn_and_seven @Heonhwa Choe
 19 day @Johan Grenier
-# Double-faced tokens are not supported yet
-# 21☇ night @Johan Grenier
+21☇ night @Johan Grenier
diff --git a/forge-gui/res/editions/Innistrad Remastered.txt b/forge-gui/res/editions/Innistrad Remastered.txt
index 070201904fa..324cefdd4bf 100644
--- a/forge-gui/res/editions/Innistrad Remastered.txt	
+++ b/forge-gui/res/editions/Innistrad Remastered.txt	
@@ -551,8 +551,8 @@ Replace=.04 Mythic:fromSheet("INR cards")
 7 b_1_1_vampire @Volkan Baǵa
 8 b_2_2_vampire_flying @Svetlin Velinov
 9 b_1_1_wolf_deathtouch @Daniel Ljunggren
-11 b_2_2_zombie @Sam White
-12 b_2_2_zombie_decayed @Sam White
+10 b_2_2_zombie @Sam White
+11 b_2_2_zombie_decayed @Sam White
 12 b_x_x_zombie @Daarken
 13 r_x_x_elemental_trample_grave_exile @Deruchenko Alexander
 14 r_1_1_human @Kieran Yanner
diff --git a/forge-gui/res/editions/Jumpstart Historic Horizons.txt b/forge-gui/res/editions/Jumpstart Historic Horizons.txt
index 597fb4b6a8f..b8fb260eecb 100644
--- a/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
+++ b/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
@@ -380,10 +380,6 @@ ScryfallCode=J21
 770 C Khalni Garden @Ryan Pancoast
 776 R Sliver Hive @Igor Kieryluk
 
-[rebalanced]
-A-438 U A-Dragon's Rage Channeler @Martina Fackova
-A-529 C A-Unholy Heat @Kari Christensen
-
 [conjured]
 777 C Light of Hope @Kimonas Theodossiou
 778 U Stormfront Pegasus @rk post
diff --git a/forge-gui/res/editions/Jurassic World Collection.txt b/forge-gui/res/editions/Jurassic World Collection.txt
index c0c5034bdff..47658aaee55 100644
--- a/forge-gui/res/editions/Jurassic World Collection.txt	
+++ b/forge-gui/res/editions/Jurassic World Collection.txt	
@@ -27,17 +27,17 @@ ScryfallCode=REX
 19 R Swooping Pteranodon @Slawomir Maniak
 20 R Dino DNA @Leonardo Santanna
 21 L Plains @Véronique Meignaud
-21b L Plains @Véronique Meignaud
+21☇ L Plains @Véronique Meignaud
 22 L Island @Svetlin Velinov
-22b L Island @Svetlin Velinov
+22☇ L Island @Svetlin Velinov
 23 L Swamp @Pablo Mendoza
-23b L Swamp @Pablo Mendoza
+23☇ L Swamp @Pablo Mendoza
 24 L Mountain @Simon Dominic
-24b L Mountain @Simon Dominic
+24☇ L Mountain @Simon Dominic
 25 L Forest @Yeong-Hao Han
-25b L Forest @Yeong-Hao Han
+25☇ L Forest @Yeong-Hao Han
 26 C Command Tower @Xabi Gaztelua
-26b C Command Tower @Xabi Gaztelua
+26☇ C Command Tower @Xabi Gaztelua
 27 R Don't Move @Inkognit
 28 R Cresting Mosasaurus @Chris Rallis
 29 R Spitting Dilophosaurus @Francisco Badilla
diff --git a/forge-gui/res/editions/Legacy Championship.txt b/forge-gui/res/editions/Legacy Championship.txt
index 17215fc70c0..bfdafe4b4fa 100644
--- a/forge-gui/res/editions/Legacy Championship.txt	
+++ b/forge-gui/res/editions/Legacy Championship.txt	
@@ -30,6 +30,6 @@ ScryfallCode=OLGC
 2022A S Gaea's Cradle @Ralph Horsley
 2022B S Scrubland @Raoul Vitale
 2022C S The Tabernacle at Pendrell Vale @Milivoj Ćeran
-2023 M Lightning Bolt @rk post
-2023A M Volcanic Island @Mark Tedin
-2023EU M Force of Will @Alan Pollack
+2023 S Lightning Bolt @rk post
+2023A S Volcanic Island @Mark Tedin
+2023EU S Force of Will @Alan Pollack
diff --git a/forge-gui/res/editions/Lorwyn Eclipsed.txt b/forge-gui/res/editions/Lorwyn Eclipsed.txt
new file mode 100644
index 00000000000..f33b3f8df99
--- /dev/null
+++ b/forge-gui/res/editions/Lorwyn Eclipsed.txt	
@@ -0,0 +1,46 @@
+[metadata]
+Code=ECL
+Date=2026-01-23
+Name=Lorwyn Eclipsed
+Type=Expansion
+ScryfallCode=ECL
+
+[cards]
+13 M Eirdu, Carrier of Dawn @Lucas Graciano
+27 M Morningtide's Light @Mark Poole
+76 R Sygg, Wanderwine Wisdom @Justin Gerard
+88 M Bitterbloom Bearer @Chris Rahn
+124 R Ashling, Rekindled @Ilse Gort
+176 R Formidable Speaker @Aurore Folny
+186 R Mutable Explorer @Wayne Reynolds
+205 R Ashling's Command @Iris Compiet
+212 M Deceit @Svetlin Velinov
+222 M Emptiness @Ryan Pancoast
+224 R Figure of Fable @Omar Rayyan
+262 R Blood Crypt @Adam Paquette
+265 R Hallowed Fountain @Adam Paquette
+266 R Overgrown Tomb @Adam Paquette
+267 R Steam Vents @Adam Paquette
+268 R Temple Garden @Adam Paquette
+286 M Eirdu, Carrier of Dawn @Omar Rayyan
+288 R Sygg, Wanderwine Wisdom @Warren Mahy
+290 R Ashling, Rekindled @Chuck Lukacs
+293 M Deceit @Kev Walker
+294 M Emptiness @Jeff Miracola
+301 M Morningtide's Light @adelinaillustration
+310 M Bitterbloom Bearer @Taryn Knight
+327 R Mutable Explorer @Felicita Sala
+330 R Ashling's Command @adelinaillustration
+347 R Hallowed Fountain @Justin Gerard
+347☇ R Hallowed Fountain @Justin Gerard
+348 R Steam Vents @Raoul Vitale
+348☇ R Steam Vents @Raoul Vitale
+349 R Blood Crypt @Valera Lutfullina
+349☇ R Blood Crypt @Valera Lutfullina
+350 R Overgrown Tomb @Matt Stewart
+350☇ R Overgrown Tomb @Matt Stewart
+351 R Temple Garden @Annie Stegg
+351☇ R Temple Garden @Annie Stegg
+352 M Bitterbloom Bearer @Rebecca Guay
+366 R Formidable Speaker @Aurore Folny
+372 R Figure of Fable @Omar Rayyan
diff --git a/forge-gui/res/editions/MagicFest 2025.txt b/forge-gui/res/editions/MagicFest 2025.txt
index e3c619a8783..c28a241c3fb 100644
--- a/forge-gui/res/editions/MagicFest 2025.txt	
+++ b/forge-gui/res/editions/MagicFest 2025.txt	
@@ -18,4 +18,8 @@ F8 R All-You-Can-Eat Buffet @Mark Rosewater
 9 R Tifa Lockhart @Nijihayashi
 10 R Arcane Signet @David Astruga
 11 R Rograkh, Son of Rohgahh @Square Enix
-13 R Swords to Plowshares @Kodai Okamoto
+12 R Swords to Plowshares @Kodai Okamoto
+13 R Lightning Bolt @Christopher Moeller
+14 R Scourge of Valkas @Svetlin Velinov
+15 M The Ur-Dragon @Jaime Jones
+F16 R Spaghetti Junction @Mark Rosewater
diff --git a/forge-gui/res/editions/March of the Machine.txt b/forge-gui/res/editions/March of the Machine.txt
index 00d84d7dee2..4eeca174c24 100644
--- a/forge-gui/res/editions/March of the Machine.txt	
+++ b/forge-gui/res/editions/March of the Machine.txt	
@@ -513,8 +513,8 @@ ScryfallCode=MOM
 8 g_1_1_phyrexian_saproling @Maxime Minard
 9 ur_1_1_elemental @Ryan Valle
 10 wu_2_2_knight_vigilance @Ernanda Souza
-11 gw_3_3_phyrexian_hydra_lifelink @Néstor Ossandón Leal
-12 gw_3_3_phyrexian_hydra_reach @Néstor Ossandón Leal
+11 gw_3_3_phyrexian_hydra_reach @Néstor Ossandón Leal
+12 gw_3_3_phyrexian_hydra_lifelink @Néstor Ossandón Leal
 13 rw_3_2_spirit @Michael Walsh
 14 wb_1_1_spirit_flying @Bruno Biazotto
 15 rw_3_2_warrior_symbiotic_attack @Viko Menezes
diff --git a/forge-gui/res/editions/Marvel Universe.txt b/forge-gui/res/editions/Marvel Universe.txt
new file mode 100644
index 00000000000..679e31df132
--- /dev/null
+++ b/forge-gui/res/editions/Marvel Universe.txt	
@@ -0,0 +1,48 @@
+[metadata]
+Code=MAR
+Date=2025-09-26
+Name=Marvel Universe
+Type=Collector_Edition
+ScryfallCode=MAR
+
+[cards]
+1 M Comeuppance @Paulo Siqueira & Amilton Santos
+2 M Leyline Binding @Ron Frenz & Joe Rubinstein
+3 M Nine Lives @C.F. Villa & Brian Reber
+4 M Path to Exile @John Romita Sr.
+5 M Reprieve @Alex Ross & Frank Giacoia
+6 M Rest in Peace @Mark Buckingham & D'Israeli
+7 M Wedding Ring @John Romita Sr.
+8 M Clever Impersonator @Mark Bagley & Andrew Hennessy
+9 M Counterspell @Steve Ditko
+10 M Lorthos, the Tidemaker @John Romita Sr.
+11 M Mindbreak Trap @Todd McFarlane
+12 M Mystic Confluence @Mike Zeck
+13 M Ponder @Moebius
+14 M Rite of Replication @Mark Bagley & Randy Emberlin
+15 M Traumatize @John Romita Sr. & Gil Kane
+16 M Feed the Swarm @Ed Hannigan & Pablo Marcos
+17 M Hex @Erik Larsen & Walter Simonson
+18 M Infernal Grasp @Erik Larsen & Randy Emberlin
+19 M Opposition Agent @Tyler Kirkham
+20 M Reanimate @Mike Zeck & Bob McLeod
+21 M Saw in Half @John Romita Jr. & John Romita Sr.
+22 M Skithiryx, the Blight Dragon @Ryan Stegman & JP Mayer
+23 M Goblin Bombardment @John Romita Sr.
+24 M Najeela, the Blade-Blossom @Cliff Chiang
+25 M Relentless Assault @Federico Vicentini & Alejandro Sánchez
+26 M Savage Beating @Todd McFarlane
+27 M Shock @John Romita Sr.
+28 M Thrill of Possibility @Dave Rapoza
+29 M Unexpected Windfall @John Romita Sr.
+30 M Winds of Change @Ron Frenz & Klaus Janson
+31 M Arachnogenesis @Todd McFarlane
+32 M Arasta of the Endless Web @David Baldeon & Walden Wong
+33 M Beast Within @Todd McFarlane
+34 M Heroic Intervention @Jack Kirby & Steve Ditko
+35 M Hunter's Insight @Sergio Davila & Sean Parsons
+36 M Parallel Lives @Jim Cheung & Justin Ponsor
+37 M Silkguard @Dave Johnson
+38 M Tangle @Humberto Ramos & Edgar Delgado
+39 M Alibou, Ancient Witness @Michael Turner & Mark Roslan
+40 M Terminate @Mark Bagley & Randy Emberlin
diff --git a/forge-gui/res/editions/Marvel's Spider-Man Promos.txt b/forge-gui/res/editions/Marvel's Spider-Man Promos.txt
index 28e0d44a300..d2be111ec99 100644
--- a/forge-gui/res/editions/Marvel's Spider-Man Promos.txt	
+++ b/forge-gui/res/editions/Marvel's Spider-Man Promos.txt	
@@ -7,5 +7,9 @@ ScryfallCode=PSPM
 
 [cards]
 1 M Peter Parker @Randy Gallegos
-3 R J. Jonah Jameson @Borja Pindado
-3? R Carnage, Crimson Chaos @
+2 M Behold the Sinister Six! @Jonas De Ro
+2b R Spider-Ham, Peter Porker @Paolo Rivera
+3a R J. Jonah Jameson @Borja Pindado
+3b R Carnage, Crimson Chaos @Lucio Parrillo
+4 R Mary Jane Watson @Paolo Rivera
+5 R Ultimate Green Goblin @Tyler Walpole
diff --git a/forge-gui/res/editions/Marvel's Spider-Man.txt b/forge-gui/res/editions/Marvel's Spider-Man.txt
index e93f7695099..0caf16d3fc9 100644
--- a/forge-gui/res/editions/Marvel's Spider-Man.txt	
+++ b/forge-gui/res/editions/Marvel's Spider-Man.txt	
@@ -4,83 +4,273 @@ Date=2025-09-26
 Name=Marvel's Spider-Man
 Type=Expansion
 ScryfallCode=SPM
+DoublePick=WhenPodSizeIs4
+RecommendedPodSize=4
+#https://magic.wizards.com/en/news/feature/collecting-marvels-spider-man
+BoosterSlots=Common,Common-Borderless,Uncommon,RareMythic,Land,Wildcard,WildcardFoil
+Booster=6 Common, 1 Common-Borderless, 3 Uncommon, 1 RareMythic, 1 Wildcard, 1 WildcardFoil+, 1 Land
+Prerelease=6 Boosters, 1 RareMythic+
+BoosterBox=30
+
+[Common]
+Base=Common:fromSheet("SPM cards")
+
+[Common-Borderless]
+Base=Common:fromSheet("SPM cards")
+Replace=.0416F fromSheet("SPM borderless")
+
+[Uncommon]
+Base=Uncommon:fromSheet("SPM cards")
+Replace=0.0517 Uncommon:fromSheet("SPM scene cards")
+
+[RareMythic]
+Base=Rare:fromSheet("SPM cards")
+Replace=.117F Mythic:fromSheet("SPM cards")
+Replace=.012F Rare:fromSheet("SPM webslinger")
+Replace=.004F Mythic:fromSheet("SPM webslinger")
+Replace=.021F Rare:fromSheet("SPM panel cards")
+Replace=.004F Mythic:fromSheet("SPM panel cards")
+Replace=.01F Rare:fromSheet("SPM scene cards")
+Replace=.0005F Mythic:fromSheet("SPM scene cards")
+
+[Wildcard]
+Base=Common:fromSheet("SPM cards")
+Replace=0.041F Uncommon:fromSheet("SPM cards")
+Replace=0.209F Rare:fromSheet("SPM cards")
+Replace=0.0029F Mythic:fromSheet("SPM cards")
+Replace=.0012F Rare:fromSheet("SPM webslinger")
+Replace=.0004F Mythic:fromSheet("SPM webslinger")
+Replace=.0021F Rare:fromSheet("SPM panel cards")
+Replace=.0004F Mythic:fromSheet("SPM panel cards")
+Replace=.007F Uncommon:fromSheet("SPM scene cards")
+Replace=.001F Rare:fromSheet("SPM scene cards")
+Replace=.00005F Mythic:fromSheet("SPM scene cards")
+
+[WildcardFoil]
+Base=Common:fromSheet("SPM cards")
+Replace=0.241F Uncommon:fromSheet("SPM cards")
+Replace=0.078F Rare:fromSheet("SPM cards")
+Replace=0.011F Mythic:fromSheet("SPM cards")
+Replace=.0012F Rare:fromSheet("SPM webslinger")
+Replace=.0004F Mythic:fromSheet("SPM webslinger")
+Replace=.0021F Rare:fromSheet("SPM panel cards")
+Replace=.0004F Mythic:fromSheet("SPM panel cards")
+Replace=.007F Uncommon:fromSheet("SPM scene cards")
+Replace=.001F Rare:fromSheet("SPM scene cards")
+Replace=.00005F Mythic:fromSheet("SPM scene cards")
+
+[Land]
+Base=fromSheet("SPM allied lands")
+Replace=0.125F fromSheet("SPM allied lands")+
+Replace=0.20F BasicLand:fromSheet("SPM full art")
+Replace=0.05F BasicLand:fromSheet("SPM full art")+
+Replace=0.20F BasicLand:fromSheet("SPM cards"):!fromSheet("SPM allied lands")
+Replace=0.05F BasicLand:fromSheet("SPM cards"):!fromSheet("SPM allied lands")
 
 [cards]
 1 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal
+2 R Arachne, Psionic Weaver @Steve Argyle
 3 U Aunt May @Randy Gallegos
+4 C City Pigeon @David Szabo
+5 U Costume Closet @Bastien Grivet
 6 C Daily Bugle Reporters @Zoltan Boros
-8 R Friendly Neighborhood @
+7 U Flash Thompson, Spider-Fan @Gal Or
+8 R Friendly Neighborhood @Pablo Mendoza
 9 R Origin of Spider-Man @Bill Sienkiewicz
 10 M Peter Parker @Thanh Tuấn
+11 R Rent Is Due @Gal Or
 12 C Selfless Police Captain @Aniekan Udofia
+13 U Silver Sable, Mercenary Leader @JB Casacop
 14 R Spectacular Spider-Man @Roberta Ingranata
 15 C Spectacular Tactics @Zoltan Boros
 16 C Spider-Man, Web-Slinger @Ryan Pancoast
+17 U Spider-UK @Allen Morris
 18 C Starling, Aerial Ally @Aniekan Udofia
+19 U Sudden Strike @Le Vuong
 20 C Thwip! @Lordigan
 21 C Web Up @David Palumbo
+22 U Web-Shooters @Javier Charro
 23 C Wild Pack Squad @John Tyler Christopher
+24 R With Great Power... @E. M. Gist
+25 C Amazing Acrobatics @Justyna Dura
 26 C Beetle, Legacy Criminal @Carlos Dattoli
+27 U Chameleon, Master of Disguise @Javier Charro
+28 R The Clone Saga @Bill Sienkiewicz
 29 C Doc Ock, Sinister Scientist @Piotr Dura
 30 C Doc Ock's Henchmen @Nathaniel Himawan
 31 U Flying Octobot @John Tyler Christopher
+32 R Hide on the Ceiling @Fariba Khamseh
+33 R Hydro-Man, Fluid Felon @Borja Pindado
+34 M Impostor Syndrome @Javier Charro
+35 R Lady Octopus, Inspired Inventor @Fariba Khamseh
+36 U Madame Web, Clairvoyant @Pavel Kolomeyets
+37 R Mysterio, Master of Illusion @Alexander Gering
+38 C Mysterio's Phantasm @Piotr Dura
+39 M Norman Osborn @Scott M. Fischer
 40 C Oscorp Research Team @Gal Or
+41 U Robotics Mastery @Domenico Cava
+42 U School Daze @Domenico Cava
+43 U Secret Identity @rk post
 44 U Spider-Byte, Web Warden @Thanh Tuấn
+45 C Spider-Man No More @Aniekan Udofia
+46 R Spider-Sense @Borja Pindado
 47 C Unstable Experiment @David Palumbo
 48 C Whoosh! @Nathaniel Himawan
+49 R Agent Venom @Kevin Sidharta
+50 U Alien Symbiosis @JB Casacop
+51 M Behold the Sinister Six! @Nathaniel Himawan
+52 R Black Cat, Cunning Thief @Alessandra Pisano
+53 C Common Crook @Ben Harvey
+54 R The Death of Gwen Stacy @Bill Sienkiewicz
+55 M Eddie Brock @Greg Staples
+56 M Gwenom, Remorseless @Lordigan
+57 C Inner Demons Gangsters @Nathaniel Himawan
 58 C Merciless Enforcers @Alex Horley-Orlandelli
+59 R Morlun, Devourer of Spiders @Randy Gallegos
+60 R Parker Luck @Raoul Vitale
+61 U Prison Break @John Tyler Christopher
 62 C Risky Research @Rafater
+63 U Sandman's Quicksand @Michele Giorgi
 64 U Scorpion, Seething Striker @Simon Dominic
 65 C Scorpion's Sting @Lee Woo-chul
 66 M The Soul Stone @Volkan Baǵa
 67 U Spider-Man Noir @Xabi Gaztelua
+68 U The Spot's Portal @Carlos Dattoli
+69 C Swarm, Being of Bees @Alex Horley-Orlandelli
 70 U Tombstone, Career Criminal @Bartek Fedyczak
 71 C Venom, Evil Unleashed @Jesper Ejsing
+72 C Venomized Cat @Jessica Fong
 73 C Venom's Hunger @Dave DeVries
+74 R Villainous Wrath @InHyuk Lee
 75 C Angry Rabble @Bartek Fedyczak
+76 R Electro, Assaulting Battery @Piotr Dura
 77 C Electro's Bolt @JB Casacop
 78 M Gwen Stacy @Victor Adame Minguez
+79 U Heroes' Hangout @Smirtouille
+80 U Hobgoblin, Mantled Marauder @Dave DeVries
+81 R J. Jonah Jameson @Paolo Rivera
 82 C Masked Meower @Narendra Bintara Adi
+83 R Maximum Carnage @Bill Sienkiewicz
+84 U Molten Man, Inferno Incarnate @Lie Setiawan
+85 U Raging Goblinoids @Filipe Pagliuso
 86 C Romantic Rendezvous @Nereida
+87 R Shadow of the Goblin @Pavel Kolomeyets
 88 C Shock @Piotr Dura
 89 U Shocker, Unshakable @Kevin Glint
 90 C Spider-Gwen, Free Spirit @Lie Setiawan
 91 C Spider-Islanders @Helge C. Balzer
 92 R Spider-Punk @Forrest Imel
+93 M Spider-Verse @Alexander Gering
+94 R Spinneret and Spiderling @Le Vuong
 95 C Stegron the Dinosaur Man @John Tyler Christopher
+96 U Superior Foes of Spider-Man @Ben Harvey
 97 C Taxi Driver @Néstor Ossandón Leal
+98 U Wisecrack @Wayne Reynolds
+99 U Damage Control Crew @Borja Pindado
+100 U Ezekiel Sims, Spider-Totem @Wei Guan
 101 C Grow Extra Arms @Kevin Sidharta
 102 C Guy in the Chair @Zoltan Boros
 103 C Kapow! @Jessica Fong
 104 C Kraven's Cats @Kevin Glint
 105 R Kraven's Last Hunt @Bill Sienkiewicz
+106 R Lizard, Connors's Curse @Steve Prescott
 107 C Lurking Lizards @Rafater
 108 M Miles Morales @LA Draws
+109 U Pictures of Spider-Man @Rafater
+110 C Professional Wrestler @Kevin Sidharta
+111 R Radioactive Spider @Pavel Kolomeyets
+112 R Sandman, Shifting Scoundrel @Bartek Fedyczak
 113 C Scout the City @Rafater
 114 R Spider-Ham, Peter Porker @Filipe Pagliuso
 115 C Spider-Man, Brooklyn Visionary @Aniekan Udofia
 116 C Spider-Rex, Daring Dino @Narendra Bintara Adi
+117 U Spiders-Man, Heroic Horde @Lars Grant-West
+118 R Strength of Will @Ryan Pancoast
+119 U Supportive Parents @Kim Sokol
+120 U Terrific Team-Up @InHyuk Lee
+121 U Wall Crawl @Alexander Gering
+122 M Web of Life and Destiny @Jonas De Ro
+123 R Araña, Heart of the Spider @Kevin Glint
+124 R Biorganic Carapace @David Álvarez
+125 R Carnage, Crimson Chaos @Lordigan
+126 R Cheering Crowd @Kim Sokol
+127 M Cosmic Spider-Man @Zoltan Boros
 128 M Doctor Octopus, Master Planner @Xabi Gaztelua
+129 C Gallant Citizen @Allen Morris
 130 U Green Goblin, Revenant @Chris Rahn
+131 R Jackal, Genius Geneticist @Pavel Kolomeyets
+132 U Kraven, Proud Predator @Alexander Mokhov
+133 R Kraven the Hunter @Greg Staples
+134 R Mary Jane Watson @Steve Argyle
+135 M Mister Negative @Thanh Tuấn
+136 C Mob Lookout @David Palumbo
+137 U Morbius the Living Vampire @Borja Pindado
+138 U Prowler, Clawed Thief @Anthony Devine
+139 C Pumpkin Bombardment @Leon Tukker
+140 U Rhino, Barreling Brute @Filipe Pagliuso
+141 U Rhino's Rampage @Nino Is
+142 R Scarlet Spider, Ben Reilly @Javier Charro
+143 U Scarlet Spider, Kaine @Forrest Imel
+144 U Shriek, Treblemaker @Borja Pindado
+145 R Silk, Web Weaver @Carissa Susilo
+146 C Skyward Spider @Bachzim
 147 U SP//dr, Piloted by Peni @Toni Infante
+148 C Spider Manifestation @Helge C. Balzer
+149 U Spider-Girl, Legacy Hero @Lixin Yin
 150 R Spider-Man 2099 @Toni Infante
+151 U Spider-Man India @Lie Setiawan
+152 R Spider-Woman, Stunning Savior @Justyna Dura
+153 R The Spot, Living Portal @Bastien Grivet
+154 U Sun-Spider, Nimble Webber @Justyna Dura
+155 R Superior Spider-Man @Carlos Dattoli
 156 R Symbiote Spider-Man @Paolo Rivera
+157 R Ultimate Green Goblin @Jesper Ejsing
+158 U Vulture, Scheming Scavenger @Kevin Sidharta
 159 U Web-Warriors @Thanh Tuấn
+160 U Wraith, Vicious Vigilante @Nereida
+161 C Bagel and Schmear @Javier Charro
+162 R Doc Ock's Tentacles @David Álvarez
 163 C Eerie Gravestone @Lordigan
+164 C Hot Dog Cart @David Álvarez
+165 R Interdimensional Web Watch @Toni Infante
 166 R Iron Spider, Stark Upgrade @Kevin Glint
+167 U Living Brain, Mechanical Marvel @Nathaniel Himawan
 168 C Mechanical Mobster @David Szabo
+169 C News Helicopter @Lee Woo-chul
+170 C Passenger Ferry @Leon Tukker
+171 R Peter Parker's Camera @Lixin Yin
+172 R Rocket-Powered Goblin Glider @Pavel Kolomeyets
 173 C Spider-Bot @Carlos Dattoli
+174 U Spider-Mobile @Bastien Grivet
+175 U Spider-Slayer, Hatred Honed @David Álvarez
+176 U Spider-Suit @Alex Horley-Orlandelli
+177 C Steel Wrecking Ball @Michele Giorgi
+178 C Subway Train @Jonas De Ro
+179 U Daily Bugle Building @David Álvarez
 180 R Multiversal Passage @Pablo Mendoza
-189 L Plains @Sarah Finnigan
-190 L Island @Sarah Finnigan
-191 L Swamp @Sarah Finnigan
-192 L Mountain @Sarah Finnigan
-193 L Forest @Sarah Finnigan
+181 L Ominous Asylum @Pavel Kolomeyets
+182 R Oscorp Industries @Bastien Grivet
+183 L Savage Mansion @David Álvarez
+184 L Sinister Hideout @Pavel Kolomeyets
+185 L Suburban Sanctuary @David Frasheski
+186 L University Campus @David Álvarez
+187 R Urban Retreat @Jonas De Ro
+188 C Vibrant Cityscape @Wei Guan
 194 L Plains @Jonas De Ro
 195 L Island @Jonas De Ro
 196 L Swamp @Jonas De Ro
 197 L Mountain @Jonas De Ro
 198 L Forest @Jonas De Ro
+
+[full art]
+189 L Plains @Sarah Finnigan
+190 L Island @Sarah Finnigan
+191 L Swamp @Sarah Finnigan
+192 L Mountain @Sarah Finnigan
+193 L Forest @Sarah Finnigan
+
+[borderless]
+199 U SP//dr, Piloted by Peni @Jim Cheung & Jay David Ramos
 200 M Miles Morales @Jim Cheung & Jay David Ramos
 201 R Spider-Ham, Peter Porker @Jim Cheung & Jay David Ramos
 202 M Gwen Stacy @Jim Cheung & Jay David Ramos
@@ -93,16 +283,146 @@ ScryfallCode=SPM
 209 M Gwen Stacy @Roberta Ingranata
 210 R Spider-Punk @Chris Bachalo
 211 M Miles Morales @Ivan Shavrin
+212 R Radioactive Spider @Tyler Walpole
+213 R Araña, Heart of the Spider @Logan Lubera
+214 R Scarlet Spider, Ben Reilly @Logan Lubera
+215 R Silk, Web Weaver @Veronica Fish
 216 R Spider-Man 2099 @Jim Cheung & Jay David Ramos
 217 R Symbiote Spider-Man @Tyler Walpole
 218 R Origin of Spider-Man @Jim Cheung & Jay David Ramos
+219 R The Clone Saga @Logan Lubera
+220 M Norman Osborn @Steve Ellis
+221 M Behold the Sinister Six! @Leinil Francis Yu & Sunny Gho
+222 R Black Cat, Cunning Thief @Veronica Fish
+223 R The Death of Gwen Stacy @Nicola Scott
+224 M Eddie Brock @Logan Lubera
+225 R Maximum Carnage @Jim Cheung & Jay David Ramos
 226 R Kraven's Last Hunt @Leinil Francis Yu & Sunny Gho
+227 R Carnage, Crimson Chaos @Leinil Francis Yu & Sunny Gho
 228 M Doctor Octopus, Master Planner @Jim Cheung & Jay David Ramos
+229 R Mary Jane Watson @Roberta Ingranata
+230 R Spider-Woman, Stunning Savior @Roberta Ingranata
+231 R The Spot, Living Portal @Tyler Walpole
 232 M Peter Parker @Jack Kirby & Steve Ditko
+233 M Eddie Brock @Todd McFarlane & Bob Sharen
 234 M Miles Morales @Sara Pichelli & Justin Ponsor
 242 M The Soul Stone @Madeline Boni
+
+[etched]
+235 R Spectacular Spider-Man @Roberta Ingranata
+236 R Spectacular Spider-Man @Roberta Ingranata
+237 R Spectacular Spider-Man @Roberta Ingranata
+238 R Spectacular Spider-Man @Roberta Ingranata
+239 R Spectacular Spider-Man @Roberta Ingranata
+240 R Spectacular Spider-Man @Roberta Ingranata
+241 R Spectacular Spider-Man @Roberta Ingranata
+
+[extended art]
 243 M The Soul Stone @Leinil Francis Yu & Sunny Gho
 244 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal
+245 R Arachne, Psionic Weaver @Steve Argyle
+246 R Friendly Neighborhood @Pablo Mendoza
+247 R Rent Is Due @Gal Or
+248 R With Great Power... @E. M. Gist
+249 R Hide on the Ceiling @Fariba Khamseh
+250 R Hydro-Man, Fluid Felon @Borja Pindado
+251 M Impostor Syndrome @Javier Charro
+252 R Lady Octopus, Inspired Inventor @Fariba Khamseh
+253 R Mysterio, Master of Illusion @Alexander Gering
+254 R Spider-Sense @Borja Pindado
+255 R Agent Venom @Kevin Sidharta
+256 M Gwenom, Remorseless @Lordigan
+257 R Morlun, Devourer of Spiders @Randy Gallegos
+258 R Parker Luck @Raoul Vitale
+259 R Villainous Wrath @InHyuk Lee
+260 R Electro, Assaulting Battery @Piotr Dura
+261 R J. Jonah Jameson @Paolo Rivera
+262 R Shadow of the Goblin @Pavel Kolomeyets
+263 M Spider-Verse @Alexander Gering
+264 R Spinneret and Spiderling @Le Vuong
+265 R Lizard, Connors's Curse @Steve Prescott
+266 R Sandman, Shifting Scoundrel @Bartek Fedyczak
+267 R Strength of Will @Ryan Pancoast
+268 M Web of Life and Destiny @Jonas De Ro
+269 R Biorganic Carapace @David Álvarez
+270 R Cheering Crowd @Kim Sokol
+271 M Cosmic Spider-Man @Zoltan Boros
+272 R Jackal, Genius Geneticist @Pavel Kolomeyets
+273 R Kraven the Hunter @Greg Staples
+274 M Mister Negative @Thanh Tuấn
+275 R Superior Spider-Man @Carlos Dattoli
+276 R Ultimate Green Goblin @Jesper Ejsing
+277 R Doc Ock's Tentacles @David Álvarez
+278 R Interdimensional Web Watch @Toni Infante
 279 R Iron Spider, Stark Upgrade @Kevin Glint
-9998 M Gwenom, Remorseless @
-9999 R Carnage, Crimson Chaos @
+280 R Peter Parker's Camera @Lixin Yin
+281 R Rocket-Powered Goblin Glider @Pavel Kolomeyets
+282 R Oscorp Industries @Bastien Grivet
+283 R Urban Retreat @Jonas De Ro
+
+[promo]
+284 R Spider-Sense @David Álvarez
+285 R Radioactive Spider @Toni Infante
+286 M Gwenom, Remorseless @Jesper Ejsing
+
+[allied lands]
+1 Ominous Asylum|SPM
+1 Savage Mansion|SPM
+1 Sinister Hideout|SPM
+1 Suburban Sanctuary|SPM
+1 University Campus|SPM
+
+[scene cards]
+1 SP//dr, Piloted by Peni|SPM|[199]
+1 Miles Morales|SPM|[200]
+1 Spider-Ham, Peter Porker|SPM|[201]
+1 Gwen Stacy|SPM|[202]
+1 Web-Warriors|SPM|[203]
+1 Spider-Man Noir|SPM|[204]
+1 Spider-Man 2099|SPM|[205]
+1 Multiversal Passage|SPM|[206]
+1 Spider-Punk|SPM|[207]
+
+[webslinger]
+1 Peter Parker|SPM|[208]
+1 Gwen Stacy|SPM|[209]
+1 Spider-Punk|SPM|[210]
+1 Miles Morales|SPM|[211]
+1 Radioactive Spider|SPM|[212]
+1 Araña, Heart of the Spider|SPM|[213]
+1 Scarlet Spider, Ben Reilly|SPM|[214]
+1 Silk, Web Weaver|SPM|[215]
+1 Spider-Man 2099|SPM|[216]
+1 Symbiote Spider-Man|SPM|[217]
+
+[panel cards]
+1 Origin of Spider-Man|SPM|[218]
+1 The Clone Saga|SPM|[219]
+1 Norman Osborn|SPM|[220]
+1 Behold the Sinister Six!|SPM|[221]
+1 Black Cat, Cunning Thief|SPM|[222]
+1 The Death of Gwen Stacy|SPM|[223]
+1 Eddie Brock|SPM|[224]
+1 Maximum Carnage|SPM|[225]
+1 Kraven's Last Hunt|SPM|[226]
+1 Carnage, Crimson Chaos|SPM|[227]
+1 Doctor Octopus, Master Planner|SPM|[228]
+1 Mary Jane Watson|SPM|[229]
+1 Spider-Woman, Stunning Savior|SPM|[230]
+1 The Spot, Living Portal|SPM|[231]
+
+[classic comic]
+1 Peter Parker|SPM|[232]
+1 Eddie Brock|SPM|[233]
+1 Miles Morales|SPM|[234]
+
+[tokens]
+2 u_3_3_illusion_villain @Anthony Devine
+3 g_2_1_spider_reach @Domenico Cava
+4 gw_1_1_human_citizen @Bartek Fedyczak
+5 c_a_food_sac @David Szabo
+6 c_1_1_a_robot_flying @Kevin Glint
+7 c_a_treasure_sac @Pablo Mendoza
+
+[other]
+1 copy @Javier Charro
diff --git a/forge-gui/res/editions/Media and Collaboration Promos.txt b/forge-gui/res/editions/Media and Collaboration Promos.txt
index 592f12e7a92..13cf87faf04 100644
--- a/forge-gui/res/editions/Media and Collaboration Promos.txt	
+++ b/forge-gui/res/editions/Media and Collaboration Promos.txt	
@@ -83,3 +83,6 @@ ScryfallCode=PMEI
 2025-16 R Spectacular Spider-Man @Alex Horley-Orlandelli
 2025-17 R Huntmaster of the Fells @Mark Spears
 2025-18 R Iron Spider, Stark Upgrade @Bachzim
+2025-19 M Kaalia of the Vast @Justyna Dura
+2025-20 R Chrome Host Seedshark @Donato Giancola
+2025-21 M Cloud, Midgar Mercenary @Square Enix
diff --git a/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt b/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt
index 6f542e2f761..65147adc252 100644
--- a/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt	
+++ b/forge-gui/res/editions/Mythic Edition - Ravnica Allegiance.txt	
@@ -22,3 +22,4 @@ R1 c_0_0_a_construct_total_artifacts @Victor Adame Minguez
 R2 emblem_dack_fayden @Jason Rainville
 R3 emblem_domri_chaos_bringer @Jason Rainville
 R4 emblem_jaya_ballard @Kieran Yanner
+R5 emblem_tamiyo_the_moon_sage @Lius Lasahido
\ No newline at end of file
diff --git a/forge-gui/res/editions/Nemesis.txt b/forge-gui/res/editions/Nemesis.txt
index 2a7f85ded26..b8daa538195 100644
--- a/forge-gui/res/editions/Nemesis.txt
+++ b/forge-gui/res/editions/Nemesis.txt
@@ -156,9 +156,3 @@ FoilAlwaysInCommonSlot=False
 141 R Kor Haven @Darrell Riche
 142 R Rath's Edge @Ron Spencer
 143 U Terrain Generator @Alan Pollack
-
-[tokens]
-w_4_4_angel_flying
-r_1_1_goblin
-g_1_1_saproling
-g_x_x_saproling_burst
diff --git a/forge-gui/res/editions/New Phyrexia.txt b/forge-gui/res/editions/New Phyrexia.txt
index cab7613f1cb..7c5e28f5229 100644
--- a/forge-gui/res/editions/New Phyrexia.txt	
+++ b/forge-gui/res/editions/New Phyrexia.txt	
@@ -2,7 +2,6 @@
 Code=NPH
 Date=2011-05-13
 Name=New Phyrexia
-Code2=NPH
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -191,6 +190,6 @@ TokenFallbackCode=MBS
 
 [tokens]
 1 g_3_3_beast @Dave Allsop
-2 r_1_1_phyrexian_goblin_haste @Jaime Jones
-3 c_3_3_a_phyrexian_golem @Volkan Baǵa
-4 c_1_1_a_phyrexian_myr @Matt Stewart
+2 r_1_1_goblin @Jaime Jones
+3 c_3_3_a_golem @Volkan Baǵa
+4 c_1_1_a_myr @Matt Stewart
diff --git a/forge-gui/res/editions/Ninth Edition.txt b/forge-gui/res/editions/Ninth Edition.txt
index 6fe5a493f96..7358a11786d 100644
--- a/forge-gui/res/editions/Ninth Edition.txt	
+++ b/forge-gui/res/editions/Ninth Edition.txt	
@@ -370,10 +370,7 @@ S3 C Coral Eel @Una Fricker
 S4 C Giant Octopus @Heather Hudson
 S5 C Index @Kev Walker
 S7 R Vizzerdrix @Dave Dorman
+S7a R Vizzerdrix @Dave Dorman
 S8 C Goblin Raider @Greg Staples
 S9 U Enormous Baloth @Mark Tedin
 S10 C Spined Wurm @Carl Critchlow
-
-[tokens]
-r_4_4_bird_flying
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Oath of the Gatewatch.txt b/forge-gui/res/editions/Oath of the Gatewatch.txt
index f2ac602e1fe..0df75ac8914 100644
--- a/forge-gui/res/editions/Oath of the Gatewatch.txt	
+++ b/forge-gui/res/editions/Oath of the Gatewatch.txt	
@@ -2,7 +2,6 @@
 Code=OGW
 Date=2016-01-22
 Name=Oath of the Gatewatch
-Code2=OGW
 Type=Expansion
 BoosterCovers=4
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand BFZ
@@ -203,13 +202,13 @@ TokenFallbackCode=BFZ
 
 [tokens]
 1 c_1_1_eldrazi_scion_sac @Izzy
-2 c_1_1_eldrazi_scion_sac @Izzy
-3 c_1_1_eldrazi_scion_sac @Izzy
+2 c_1_1_eldrazi_scion_sac @Craig J Spearing
+3 c_1_1_eldrazi_scion_sac @Svetlin Velinov
 4 c_1_1_eldrazi_scion_sac @Izzy
-5 c_1_1_eldrazi_scion_sac @Izzy
-6 c_1_1_eldrazi_scion_sac @Izzy
+5 c_1_1_eldrazi_scion_sac @Winona Nelson
+6 c_1_1_eldrazi_scion_sac @Svetlin Velinov
 7 w_3_3_angel_flying @Anastasia Ovchinnikova
 8 b_2_2_zombie @Kev Walker
-9 r_3_1_elemental_haste @Raymond Swanland
+9 r_3_1_elemental @Raymond Swanland
 10 g_x_x_elemental @Vincent Proce
 11 g_0_1_plant @Daren Bader
diff --git a/forge-gui/res/editions/Odyssey.txt b/forge-gui/res/editions/Odyssey.txt
index 26b1a95ae41..7a7cd9cc699 100644
--- a/forge-gui/res/editions/Odyssey.txt
+++ b/forge-gui/res/editions/Odyssey.txt
@@ -363,12 +363,3 @@ ScryfallCode=ODY
 348 L Forest @Rob Alexander
 349 L Forest @Jerry Tiritilli
 350 L Forest @Tony Szczudlo
-
-[tokens]
-w_1_1_spirit_flying
-b_2_2_zombie
-g_2_2_bear
-g_4_4_beast
-g_3_3_elephant
-g_1_1_squirrel
-g_6_6_wurm
diff --git a/forge-gui/res/editions/Onslaught.txt b/forge-gui/res/editions/Onslaught.txt
index 10ce937ceb7..cfa4f83db8d 100644
--- a/forge-gui/res/editions/Onslaught.txt
+++ b/forge-gui/res/editions/Onslaught.txt
@@ -363,12 +363,3 @@ ScryfallCode=ONS
 348 L Forest @John Matson
 349 L Forest @John Avon
 350 L Forest @David Martin
-
-[tokens]
-w_1_1_soldier
-b_2_2_zombie
-r_5_5_dragon_flying
-g_2_2_bear
-g_3_3_centaur
-g_7_7_elemental_trample
-g_1_1_insect
diff --git a/forge-gui/res/editions/Open the Helvault.txt b/forge-gui/res/editions/Open the Helvault.txt
index b89b0adcf85..5b02458f3f6 100644
--- a/forge-gui/res/editions/Open the Helvault.txt	
+++ b/forge-gui/res/editions/Open the Helvault.txt	
@@ -4,6 +4,7 @@ Date=2012-04-28
 Name=Open the Helvault
 Type=Promo
 ScryfallCode=PHEL
+TokensCode=PHEL
 
 [cards]
 6 M Avacyn, Angel of Hope @Jason Chan
@@ -13,5 +14,5 @@ ScryfallCode=PHEL
 210 M Sigarda, Host of Herons @Chris Rahn
 
 [tokens]
-w_4_4_angel_flying
-b_5_5_demon_flying
+1★ w_4_4_angel_flying @James Ryman
+1★☇ b_5_5_demon_flying @Karl Kopinski
diff --git a/forge-gui/res/editions/Outlaws of Thunder Junction.txt b/forge-gui/res/editions/Outlaws of Thunder Junction.txt
index 9ac6aac1490..a1ecd470837 100644
--- a/forge-gui/res/editions/Outlaws of Thunder Junction.txt	
+++ b/forge-gui/res/editions/Outlaws of Thunder Junction.txt	
@@ -481,3 +481,7 @@ Base=Land:fromSheet("OTJ cards")
 16 c_a_clue_draw @Clint Lockwood
 17 meteorite @Ina Wong
 18 c_a_treasure_sac @Monztre
+
+[other]
+1 copy @Brian Valeza
+20 plot @Olena Richards
diff --git a/forge-gui/res/editions/Phyrexia All Will Be One.txt b/forge-gui/res/editions/Phyrexia All Will Be One.txt
index bc234217a72..c4e80b53e0a 100644
--- a/forge-gui/res/editions/Phyrexia All Will Be One.txt	
+++ b/forge-gui/res/editions/Phyrexia All Will Be One.txt	
@@ -510,6 +510,8 @@ ScryfallCode=ONE
 1 w_2_2_cat @April Prime
 2 w_2_2_samurai_double_strike @Gaboleps
 3 r_1_1_phyrexian_goblin @Jokubas Uogintas
+# Duplicated as there is no r_1_1_phyrexian_goblin_haste token yet
+3 r_1_1_phyrexian_goblin_haste @Jokubas Uogintas
 4 r_x_1_phyrexian_horror_trample_haste @Camille Alquier
 5 r_2_2_rebel @Bram Sels
 6 g_3_3_phyrexian_beast_toxic @Uriah Voth
@@ -518,4 +520,7 @@ ScryfallCode=ONE
 9 the_hollow_sentinel @Igor Kieryluk
 10 c_3_3_a_phyrexian_golem @Samuel Araya
 11 c_1_1_a_phyrexian_mite_toxic_noblock @Oriana Menendez
-12 c_1_1_a_phyrexian_mite_toxic_noblock @Oriana Menendez
+12 c_1_1_a_phyrexian_mite_toxic_noblock @Dave Kendall
+
+[other]
+13 emblem_koth_fire_of_resistance @Eric Wilkerson
diff --git a/forge-gui/res/editions/Planar Chaos.txt b/forge-gui/res/editions/Planar Chaos.txt
index 4f8efaa3fc6..1162b210913 100644
--- a/forge-gui/res/editions/Planar Chaos.txt	
+++ b/forge-gui/res/editions/Planar Chaos.txt	
@@ -2,7 +2,6 @@
 Code=PLC
 Date=2007-02-02
 Name=Planar Chaos
-Code2=PLC
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -176,11 +175,3 @@ ScryfallCode=PLC
 163 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
 164 R Vorosh, the Hunter @Mark Zug
 165 R Urborg, Tomb of Yawgmoth @John Avon
-
-[tokens]
-w_1_1_soldier
-b_2_2_knight_flanking_pro_white_haste
-g_3_3_ape
-g_2_2_cat_warrior_forestwalk
-g_6_1_insect_shroud
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Planechase 2012.txt b/forge-gui/res/editions/Planechase 2012.txt
index 614ef5d878c..8d28e1a256e 100644
--- a/forge-gui/res/editions/Planechase 2012.txt	
+++ b/forge-gui/res/editions/Planechase 2012.txt	
@@ -2,7 +2,6 @@
 Code=PC2
 Date=2012-06-01
 Name=Planechase 2012
-Code2=PC2
 Type=Multiplayer
 ScryfallCode=PC2
 
@@ -27,7 +26,7 @@ ScryfallCode=PC2
 18 R Higure, the Still Wind @Christopher Moeller
 19 U Illusory Angel @Allen Williams
 20 C Mistblade Shinobi @Kev Walker
-21 C Ninja of the Deep Hours @Dan Scott
+21 C Ninja of the Deep Hours @Dan Murayama Scott
 22 U Peregrine Drake @Bob Eggleton
 23 C Primal Plasma @Luca Zontini
 24 R Sakashima's Student @Brian Snõddy
@@ -135,7 +134,7 @@ ScryfallCode=PC2
 126 C Shimmering Grotto @Cliff Childs
 127 U Skarrg, the Rage Pits @Martina Pilcerova
 128 U Tainted Isle @Alan Pollack
-129 C Terramorphic Expanse @Dan Scott
+129 C Terramorphic Expanse @Dan Murayama Scott
 130 U Vitu-Ghazi, the City-Tree @Martina Pilcerova
 131 U Vivid Creek @Fred Fields
 132 L Plains @John Avon
@@ -203,24 +202,3 @@ OPC237 C Trail of the Mage-Rings @Vincent Proce
 OPC238 C Truga Jungle @Jim Nelson
 OPC239 C Windriddle Palaces @Kekai Kotaki
 OPC240 C The Zephyr Maze @rk post
-
-[tokens]
-c_0_1_eldrazi_spawn_sac
-c_7_7_eldrazi_annihilator
-w_4_4_angel_flying
-b_0_0_phyrexian_germ
-b_2_4_spider_reach
-b_2_2_zombie
-r_1_1_goblin
-r_1_1_goblin
-r_4_4_hellion
-g_3_3_beast
-g_3_3_boar
-g_1_1_insect
-g_1_1_ooze
-g_2_2_ooze_mitotic
-g_0_1_plant
-g_1_1_saproling
-g_1_1_saproling
-g_1_1_saproling
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Planechase Anthology.txt b/forge-gui/res/editions/Planechase Anthology.txt
index 741f6d5365f..d13488535f4 100644
--- a/forge-gui/res/editions/Planechase Anthology.txt	
+++ b/forge-gui/res/editions/Planechase Anthology.txt	
@@ -2,7 +2,6 @@
 Code=PCA
 Date=2016-11-25
 Name=Planechase Anthology
-Code2=PCA
 Type=Multiplayer
 ScryfallCode=PCA
 
@@ -253,11 +252,11 @@ OPCA86 C The Zephyr Maze @rk post
 [tokens]
 1 c_7_7_eldrazi_annihilator @Vincent Proce
 2 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
-3 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
-4 c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+3 c_0_1_eldrazi_spawn_sac @Mark Tedin
+4 c_0_1_eldrazi_spawn_sac @Véronique Meignaud
 5 w_4_4_angel_flying @Cyril Van Der Haegen
 6 w_0_1_goat @Terese Nielsen
-7 b_0_0_phyrexian_germ @Igor Kieryluk
+7 b_0_0_germ @Igor Kieryluk
 8 b_2_4_spider_reach @Lars Grant-West
 9 b_2_2_zombie @Dave Kendall
 10 r_5_5_dragon_flying @Jim Pavelec
diff --git a/forge-gui/res/editions/Planechase.txt b/forge-gui/res/editions/Planechase.txt
index b8d609743bf..043ed8fd3c1 100644
--- a/forge-gui/res/editions/Planechase.txt
+++ b/forge-gui/res/editions/Planechase.txt
@@ -9,7 +9,7 @@ ScryfallCode=HOP
 [cards]
 1 R Akroma's Vengeance @Greg Hildebrandt & Tim Hildebrandt
 2 C Congregate @Mark Zug
-3 C Kor Sanctifiers @Dan Scott
+3 C Kor Sanctifiers @Dan Murayama Scott
 4 C Oblivion Ring @Franz Vohwinkel
 5 C Orim's Thunder @Carl Critchlow
 6 U Prison Term @Zoltan Boros & Gabor Szikszai
@@ -145,7 +145,7 @@ ScryfallCode=HOP
 136 C Seat of the Synod @John Avon
 137 U Shivan Oasis @Rob Alexander
 138 U Sunhome, Fortress of the Legion @Martina Pilcerova
-139 C Terramorphic Expanse @Dan Scott
+139 C Terramorphic Expanse @Dan Murayama Scott
 140 C Tree of Tales @John Avon
 141 C Vault of Whispers @Rob Alexander
 142 L Plains @Martina Pilcerova
@@ -216,14 +216,3 @@ OHOP37 C Stronghold Furnace @Jim Pavelec
 OHOP38 C Turri Island @Raymond Swanland
 OHOP39 C Undercity Reaches @Stephan Martiniere
 OHOP40 C Velis Vel @Terese Nielsen
-
-[tokens]
-w_0_1_goat
-b_2_2_zombie
-r_5_5_dragon_flying
-r_1_1_goblin
-g_3_3_elephant
-g_1_1_insect
-g_1_1_saproling
-c_1_1_a_pentavite_flying
-c_0_1_a_pest
diff --git a/forge-gui/res/editions/Planeshift.txt b/forge-gui/res/editions/Planeshift.txt
index 71e622e3185..c176514da90 100644
--- a/forge-gui/res/editions/Planeshift.txt
+++ b/forge-gui/res/editions/Planeshift.txt
@@ -5,11 +5,10 @@ Name=Planeshift
 Code2=PS
 Type=Expansion
 BoosterCovers=1
-Booster=11 Common, 3 Uncommon, 1 Rare, 0 Special
+Booster=11 Common, 3 Uncommon, 1 Rare
 FatPack=6
 Foil=OldStyle
 FoilAlwaysInCommonSlot=False
-ScryfallCode=PLS
 
 [cards]
 1 C Aura Blast @Ron Walotsky
@@ -158,8 +157,3 @@ ScryfallCode=PLS
 141 U Rith's Grove @Scott Bailey
 142 U Terminal Moraine @Scott Bailey
 143 U Treva's Ruins @Jerry Tiritilli
-
-[tokens]
-w_1_1_spirit_flying
-g_1_1_hippo
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Planeswalker Championship Promos.txt b/forge-gui/res/editions/Planeswalker Championship Promos.txt
index 44fa63ac0b9..9473e817f0c 100644
--- a/forge-gui/res/editions/Planeswalker Championship Promos.txt	
+++ b/forge-gui/res/editions/Planeswalker Championship Promos.txt	
@@ -43,3 +43,5 @@ ScryfallCode=PWCS
 2024-09 M Jace Reawakened @Hozan Shinomaru
 2025-1 R Get Lost @Oka Yuka
 2025-2 M Nissa, Resurgent Animist @Hitowa
+2025-3 M Delney, Streetwise Lookout @Kei Satsuki
+2025-4 R Inti, Seneschal of the Sun @Hagiya Kaoru
diff --git a/forge-gui/res/editions/Premium Deck Series Graveborn.txt b/forge-gui/res/editions/Premium Deck Series Graveborn.txt
index cf035ad7e8a..8d4e02ebe0f 100644
--- a/forge-gui/res/editions/Premium Deck Series Graveborn.txt	
+++ b/forge-gui/res/editions/Premium Deck Series Graveborn.txt	
@@ -36,8 +36,3 @@ ScryfallCode=PD3
 28 L Swamp @James Paick
 29 L Swamp @Jung Park
 30 L Swamp @Alan Pollack
-
-[tokens]
-b_2_2_zombie
-g_3_3_elephant
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Prophecy.txt b/forge-gui/res/editions/Prophecy.txt
index ae48f93c1b4..76c30f9b440 100644
--- a/forge-gui/res/editions/Prophecy.txt
+++ b/forge-gui/res/editions/Prophecy.txt
@@ -155,8 +155,3 @@ FoilAlwaysInCommonSlot=False
 141 U Well of Life @Tom Wänerstrand
 142 U Rhystic Cave @Rob Alexander
 143 R Wintermoon Mesa @Tom Wänerstrand
-
-[tokens]
-b_1_1_minion
-g_x_x_elephant_resurgence
-g_1_1_squirrel
diff --git a/forge-gui/res/editions/Ravnica Allegiance.txt b/forge-gui/res/editions/Ravnica Allegiance.txt
index bf2c577c907..02c4df46b9d 100644
--- a/forge-gui/res/editions/Ravnica Allegiance.txt	
+++ b/forge-gui/res/editions/Ravnica Allegiance.txt	
@@ -2,7 +2,6 @@
 Code=RNA
 Date=2019-01-25
 Name=Ravnica Allegiance
-Code2=RNA
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromSheet("RNA cards"):!fromSheet("RNA Lands"), 3 Uncommon:fromSheet("RNA cards"), 1 RareMythic:fromSheet("RNA cards"), 1 fromSheet("RNA Lands")
@@ -310,3 +309,6 @@ Simic Guildgate|RNA
 10 wb_1_1_spirit_flying @Josh Hass
 11 c_1_1_a_thopter_flying @Darren Tan
 12 c_a_treasure_sac @Mark Behm
+
+[other]
+13 emblem_domri_chaos_bringer @Zack Stella
diff --git a/forge-gui/res/editions/Ravnica City of Guilds.txt b/forge-gui/res/editions/Ravnica City of Guilds.txt
index de2e192c5cb..a877f6f424b 100644
--- a/forge-gui/res/editions/Ravnica City of Guilds.txt	
+++ b/forge-gui/res/editions/Ravnica City of Guilds.txt	
@@ -2,7 +2,6 @@
 Code=RAV
 Date=2005-10-07
 Name=Ravnica: City of Guilds
-Code2=RAV
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -319,13 +318,3 @@ ScryfallCode=RAV
 304 L Forest @Christopher Moeller
 305 L Forest @Anthony S. Waters
 306 L Forest @Richard Wright
-
-[tokens]
-voja
-w_2_2_knight
-w_1_1_spirit_flying
-u_1_1_faerie_flying
-b_4_4_horror
-r_1_1_goblin
-g_3_3_centaur_pro_black
-g_1_1_saproling
diff --git a/forge-gui/res/editions/Return to Ravnica.txt b/forge-gui/res/editions/Return to Ravnica.txt
index 014266fdebc..b2304fa2a7d 100644
--- a/forge-gui/res/editions/Return to Ravnica.txt	
+++ b/forge-gui/res/editions/Return to Ravnica.txt	
@@ -2,7 +2,6 @@
 Code=RTR
 Date=2012-10-05
 Name=Return to Ravnica
-Code2=RTR
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -290,13 +289,11 @@ ScryfallCode=RTR
 [tokens]
 1 w_1_1_bird_flying @James Ryman
 2 w_2_2_knight_vigilance @Matt Stewart
-3 w_2_2_knight_vigilance @Matt Stewart
 3 w_1_1_soldier @Steve Prescott
 4 b_1_1_assassin_lose_con @Svetlin Velinov
 5 r_6_6_dragon_flying @Mark Zug
 6 r_1_1_goblin @Christopher Moeller
 7 g_3_3_centaur @Slawomir Maniak
-7 g_3_3_centaur @Slawomir Maniak
 8 g_x_x_ooze @Marco Nelor
 9 g_4_4_rhino_trample @Tomasz Jedruszek
 10 g_1_1_saproling @Raoul Vitale
diff --git a/forge-gui/res/editions/Revised Edition.txt b/forge-gui/res/editions/Revised Edition.txt
index 596977eb95c..b1a3656cb91 100644
--- a/forge-gui/res/editions/Revised Edition.txt	
+++ b/forge-gui/res/editions/Revised Edition.txt	
@@ -318,7 +318,3 @@ ScryfallCode=3ED
 304 L Forest @Christopher Rush
 305 L Forest @Christopher Rush
 306 L Forest @Christopher Rush
-
-[tokens]
-wasp
-c_5_5_a_djinn_flying
diff --git a/forge-gui/res/editions/Rise of the Eldrazi.txt b/forge-gui/res/editions/Rise of the Eldrazi.txt
index 77af2730d4e..278d242efa7 100644
--- a/forge-gui/res/editions/Rise of the Eldrazi.txt	
+++ b/forge-gui/res/editions/Rise of the Eldrazi.txt	
@@ -2,7 +2,6 @@
 Code=ROE
 Date=2010-04-23
 Name=Rise of the Eldrazi
-Code2=ROE
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -263,8 +262,8 @@ TokenFallbackCode=WWK
 
 [tokens]
 1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
-1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
-1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+1a c_0_1_eldrazi_spawn_sac @Mark Tedin
+1a c_0_1_eldrazi_spawn_sac @Véronique Meignaud
 2 r_x_x_elemental @Jung Park
 3 r_4_4_hellion @Anthony Francisco
 4 g_x_x_ooze @Daniel Ljunggren
diff --git a/forge-gui/res/editions/Rivals of Ixalan Promos.txt b/forge-gui/res/editions/Rivals of Ixalan Promos.txt
index 7c40b7766ca..698ccbf7f76 100644
--- a/forge-gui/res/editions/Rivals of Ixalan Promos.txt	
+++ b/forge-gui/res/editions/Rivals of Ixalan Promos.txt	
@@ -12,6 +12,3 @@ ScryfallCode=PRIX
 130 R Ghalta, Primal Hunger @Johann Bodin
 177 R Captain's Hook @Kev Walker
 186 C Evolving Wilds @Daniel Ljunggren
-
-[tokens]
-c_a_treasure_sac
\ No newline at end of file
diff --git a/forge-gui/res/editions/Rivals of Ixalan.txt b/forge-gui/res/editions/Rivals of Ixalan.txt
index b84ef690d3d..7aa6f081c3c 100644
--- a/forge-gui/res/editions/Rivals of Ixalan.txt	
+++ b/forge-gui/res/editions/Rivals of Ixalan.txt	
@@ -2,7 +2,6 @@
 Code=RIX
 Date=2018-01-19
 Name=Rivals of Ixalan
-Code2=RIX
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromSheet("RIX cards"), 3 Uncommon:fromSheet("RIX cards"), 1 RareMythic:fromSheet("RIX cards"), 1 BasicLand:fromSheet("RIX Basic Lands")
@@ -241,4 +240,4 @@ TokenFallbackCode=XLN
 
 [other]
 5 emblem_huatli_radiant_champion @Chris Rahn
-6 blessing @Yeong-Hao Han
\ No newline at end of file
+6 blessing @Yeong-Hao Han
diff --git a/forge-gui/res/editions/Saviors of Kamigawa.txt b/forge-gui/res/editions/Saviors of Kamigawa.txt
index 083b5af01f6..ce2cabc3cf1 100644
--- a/forge-gui/res/editions/Saviors of Kamigawa.txt	
+++ b/forge-gui/res/editions/Saviors of Kamigawa.txt	
@@ -2,7 +2,6 @@
 Code=SOK
 Date=2005-06-03
 Name=Saviors of Kamigawa
-Code2=SOK
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -176,10 +175,3 @@ ScryfallCode=SOK
 163 R Miren, the Moaning Well @Rob Alexander
 164 R Oboro, Palace in the Clouds @Rob Alexander
 165 R Tomb of Urami @Alex Horley-Orlandelli
-
-[tokens]
-urami
-c_1_1_spirit
-r_3_1_elemental_haste
-r_1_1_warrior
-g_1_1_snake
diff --git a/forge-gui/res/editions/Scars of Mirrodin.txt b/forge-gui/res/editions/Scars of Mirrodin.txt
index cd8c3588ba5..208eee07321 100644
--- a/forge-gui/res/editions/Scars of Mirrodin.txt	
+++ b/forge-gui/res/editions/Scars of Mirrodin.txt	
@@ -2,7 +2,6 @@
 Code=SOM
 Date=2010-10-01
 Name=Scars of Mirrodin
-Code2=SOM
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -266,7 +265,7 @@ ScryfallCode=SOM
 1 w_2_2_cat @Scott Chou
 2 w_1_1_soldier @Goran Josic
 3 r_1_1_goblin @Goran Josic
-4 g_1_1_phyrexian_insect_infect @Adrian Smith
+4 g_1_1_insect_infect @Adrian Smith
 5 g_2_2_wolf @Chris Rahn
 6 c_3_3_a_golem @Nic Klein
 7 c_1_1_a_myr @Ryan Pancoast
diff --git a/forge-gui/res/editions/Scourge.txt b/forge-gui/res/editions/Scourge.txt
index 3bc6b064057..b1e2d6f4c27 100644
--- a/forge-gui/res/editions/Scourge.txt
+++ b/forge-gui/res/editions/Scourge.txt
@@ -156,10 +156,3 @@ ScryfallCode=SCG
 141 U Proteus Machine @Greg Staples
 142 R Stabilizer @David Martin
 143 U Temple of the False God @Brian Snõddy
-
-[tokens]
-w_4_4_angel_flying
-w_1_1_soldier
-r_5_5_dragon_flying
-r_1_1_goblin
-g_4_4_beast
diff --git a/forge-gui/res/editions/Secret Lair Drop Series.txt b/forge-gui/res/editions/Secret Lair Drop Series.txt
index b2afce59119..d321805ff3d 100644
--- a/forge-gui/res/editions/Secret Lair Drop Series.txt	
+++ b/forge-gui/res/editions/Secret Lair Drop Series.txt	
@@ -139,7 +139,7 @@ TokensCode=SLD
 135 R Scavenging Ooze @Wizard of Barge
 136 M The Mimeoplasm @Wizard of Barge
 137 R Voidslime @Wizard of Barge
-138 R Anguished Unmaking @Rafal Wechterowicz
+138 R Anguished Unmaking @Rafal Wechterowicz (Too Many Skulls)
 139 R Assassin's Trophy @Scott Buoncristiano
 140 R Decimate @Illustranesia
 141 R Dreadbore @Vance Kelly
@@ -356,20 +356,20 @@ TokensCode=SLD
 376 M Craterhoof Behemoth @Kira
 377 R Metalwork Colossus @Chris Rahn
 378 R Metalwork Colossus @Hyan Tran
-379a R Zndrsplt, Eye of Wisdom @Alexis Ziritt
-379b R Zndrsplt, Eye of Wisdom @Alexis Ziritt
-379c R Zndrsplt, Eye of Wisdom @Alexis Ziritt
-379d R Zndrsplt, Eye of Wisdom @Alexis Ziritt
-380a R Okaun, Eye of Chaos @Alexis Ziritt
-380b R Okaun, Eye of Chaos @Alexis Ziritt
-380c R Okaun, Eye of Chaos @Alexis Ziritt
-380d R Okaun, Eye of Chaos @Alexis Ziritt
-381a R Propaganda @Scott Balmer
-381b R Propaganda @Scott Balmer
-382a R Stitch in Time @Micha Huigen
-382b R Stitch in Time @Micha Huigen
-383a R Krark's Thumb @Wooden Cyclops
-383b R Krark's Thumb @Wooden Cyclops
+379 R Zndrsplt, Eye of Wisdom @Alexis Ziritt
+379☇ R Zndrsplt, Eye of Wisdom @Alexis Ziritt
+379★ R Zndrsplt, Eye of Wisdom @Alexis Ziritt
+379★☇ R Zndrsplt, Eye of Wisdom @Alexis Ziritt
+380 R Okaun, Eye of Chaos @Alexis Ziritt
+380☇ R Okaun, Eye of Chaos @Alexis Ziritt
+380★ R Okaun, Eye of Chaos @Alexis Ziritt
+380★☇ R Okaun, Eye of Chaos @Alexis Ziritt
+381 R Propaganda @Scott Balmer
+381☇ R Propaganda @Scott Balmer
+382 R Stitch in Time @Micha Huigen
+382☇ R Stitch in Time @Micha Huigen
+383 R Krark's Thumb @Wooden Cyclops
+383☇ R Krark's Thumb @Wooden Cyclops
 384 R Swamp @Jeanne D'Angelo
 385 R Island @Jeanne D'Angelo
 386 R Island @Jeanne D'Angelo
@@ -579,7 +579,7 @@ TokensCode=SLD
 593 R Persistent Petitioners @Brandi Milne
 595 R Persistent Petitioners @Casimir Lee
 596 R Persistent Petitioners @CROM
-597 R Persistent Petitioners @Death Burger
+597 R Persistent Petitioners @Deathburger
 598 R Persistent Petitioners @Feifei Ruan
 599 R Persistent Petitioners @Galen Dara
 600 R Persistent Petitioners @NIARK1
@@ -611,10 +611,10 @@ TokensCode=SLD
 631 R Dregscape Sliver @Zack Stella
 632 R Leeching Sliver @Svetlin Velinov
 633 R Plague Sliver @Dave Allsop
-633b R Plague Sliver @Dave Allsop
+633Φ R Plague Sliver @Dave Allsop
 634 R Syphon Sliver @Tyler Jacobson
 635 R Toxin Sliver @Lars Grant-West
-635b R Toxin Sliver @Lars Grant-West
+635Φ R Toxin Sliver @Lars Grant-West
 636 R Belligerent Sliver @Raymond Swanland
 637 R Blur Sliver @Daarken
 638 R Fury Sliver @Paolo Parente
@@ -637,7 +637,7 @@ TokensCode=SLD
 656 R Root Sliver @Matt Thompson
 657 R Tempered Sliver @Mitchell Malloy
 659 R Virulent Sliver @Franz Vohwinkel
-659b R Virulent Sliver @Franz Vohwinkel
+659Φ R Virulent Sliver @Franz Vohwinkel
 660 R Cloudshredder Sliver @Filip Burburan
 661 R Crystalline Sliver @Allen Williams
 662 R Frenetic Sliver @Luca Zontini
@@ -660,7 +660,7 @@ TokensCode=SLD
 679 R Ghost Quarter @Sidharth Chaturvedi
 680 R Shadowborn Apostle @AlbaBG
 681 R Shadowborn Apostle @Boneface
-681b R Shadowborn Apostle @Boneface
+681Φ R Shadowborn Apostle @Boneface
 682 R Shadowborn Apostle @Diego Andrade
 683 R Shadowborn Apostle @Jakub Rebelka
 684 R Shadowborn Apostle @Laynes
@@ -721,17 +721,17 @@ TokensCode=SLD
 741★ R Chaos Warp @Zack Stella
 744 R Command Tower @Serena Malyon
 745 M Ajani Goldmane @Fay Dalton & Scott Okumura
-745b M Ajani Goldmane @Fay Dalton & Scott Okumura
+745☇ M Ajani Goldmane @Fay Dalton & Scott Okumura
 746 M Jace Beleren @Fay Dalton & Scott Okumura
-746b M Jace Beleren @Fay Dalton & Scott Okumura
+746☇ M Jace Beleren @Fay Dalton & Scott Okumura
 747 M Liliana Vess @Fay Dalton & Scott Okumura
-747b M Liliana Vess @Fay Dalton & Scott Okumura
+747☇ M Liliana Vess @Fay Dalton & Scott Okumura
 748 M Chandra Nalaar @Fay Dalton & Scott Okumura
-748b M Chandra Nalaar @Fay Dalton & Scott Okumura
+748☇ M Chandra Nalaar @Fay Dalton & Scott Okumura
 749 M Garruk Wildspeaker @Fay Dalton & Scott Okumura
-749b M Garruk Wildspeaker @Fay Dalton & Scott Okumura
+749☇ M Garruk Wildspeaker @Fay Dalton & Scott Okumura
 750 R Terror @Sidharth Chaturvedi & Scott Okumura
-750b R Terror @Sidharth Chaturvedi & Scott Okumura
+750☇ R Terror @Sidharth Chaturvedi & Scott Okumura
 752 R Relentless Rats @Ellie Livingston
 754 R Relentless Rats @Sachin Teng
 755 R Relentless Rats @Sadboi
@@ -763,16 +763,13 @@ TokensCode=SLD
 786 R Frilled Mystic @Randy Vargas
 788 R Poison-Tip Archer @Dmitry Burmak
 789 R Shaman of the Pack @Dan Murayama Scott
-790 R Codex Shredder @AKQA
 790★ R Codex Shredder @AKQA
 791 R Solemn Simulacrum @Dani Pendergast
 791★ R Solemn Simulacrum @Dani Pendergast
 792 R Command Tower @Kamila Szutenberg
 793 R Nine Lives @Fiona Hsieh
 794 M Yoshimaru, Ever Faithful @Fiona Hsieh
-795 R Wastes @AKQA
 795★ R Wastes @AKQA
-796 M Mana Vault @AKQA
 796★ M Mana Vault @AKQA
 797 R Seraph Sanctuary @Alayna Danner
 F798 M Discord, Lord of Disharmony @Narendra Bintara Adi
@@ -804,7 +801,7 @@ F798 M Discord, Lord of Disharmony @Narendra Bintara Adi
 825 R Goblin Bombardment @Craig J Spearing
 826 R Kezzerdrix @Bill McConkey
 827 R Norin the Wary @Jarel Threat
-827b R Norin the Wary @Jarel Threat
+827☇ R Norin the Wary @Jarel Threat
 828 R Keen Duelist @Thanh Tuấn
 834 R Cleaver Skaab @Johann Bodin
 835 R Fatestitcher @E. M. Gist
@@ -873,6 +870,7 @@ F869 R Blacker Lotus @Scott Okumura
 902 R Deadeye Navigator @Jon Vermilyea
 903 M The Locust God @See Machine
 904 M The Scorpion God @Ricardo Cavolo
+905 R Cryptic Command @Alexander Khabbazi
 906 R Ignoble Hierarch @John F. Malta
 907 R Seedborn Muse @Princess Hidir
 908 R Arcane Signet @Alexander Forssberg
@@ -955,12 +953,12 @@ F869 R Blacker Lotus @Scott Okumura
 1076 R Goblin Settler @Roman Klonek
 1077 R Collector Ouphe @Roman Klonek
 1078 M Vengevine @Roman Klonek
-1079a M Blightsteel Colossus @Volta Creation
-1079b M Blightsteel Colossus @Volta Creation
-1080a R Doubling Cube @Volta Creation
-1080b R Doubling Cube @Volta Creation
-1081a M Darksteel Colossus @Volta Creation
-1081b M Darksteel Colossus @Volta Creation
+1079 M Blightsteel Colossus @Volta Creation
+1079☇ M Blightsteel Colossus @Volta Creation
+1080 R Doubling Cube @Volta Creation
+1080☇ R Doubling Cube @Volta Creation
+1081 M Darksteel Colossus @Volta Creation
+1081☇ M Darksteel Colossus @Volta Creation
 1082 R True Conviction @Volta Creation
 1083 R Dramatic Reversal @Volta Creation
 1084 R Fabricate @Volta Creation
@@ -997,12 +995,12 @@ F869 R Blacker Lotus @Scott Okumura
 1115 R Doomsday @Junji Ito
 1116 R Plaguecrafter @Junji Ito
 1117 R Thoughtseize @Junji Ito
-1122a M Ulamog, the Ceaseless Hunger @Mike Burns
-1122b M Ulamog, the Ceaseless Hunger @Mike Burns
-1123a R Etali, Primal Storm @Mike Burns
-1123b R Etali, Primal Storm @Mike Burns
-1124a R Ghalta, Primal Hunger @Mike Burns
-1124b R Ghalta, Primal Hunger @Mike Burns
+1122 M Ulamog, the Ceaseless Hunger @Mike Burns
+1122☇ M Ulamog, the Ceaseless Hunger @Mike Burns
+1123 R Etali, Primal Storm @Mike Burns
+1123☇ R Etali, Primal Storm @Mike Burns
+1124 R Ghalta, Primal Hunger @Mike Burns
+1124☇ R Ghalta, Primal Hunger @Mike Burns
 1125 R Serra Ascendant @kozyndan
 1126 R Rapid Hybridization @kozyndan
 1127 R Demonic Consultation @kozyndan
@@ -1182,7 +1180,7 @@ F869 R Blacker Lotus @Scott Okumura
 1305 M Worldspine Wurm @Ryan Alexander Lee
 1307 R Pack Rat @Leonardo Santanna
 1308 R Shared Summons @Leonardo Santanna
-1309 R Sylvan Offering @Igor Krstic
+1309 R Sylvan Offering @Jodie Muir
 1310 M Sliver Legion @Igor Krstic
 1311 R Goblin Lackey @Wizard of Barge
 1311★ R Goblin Lackey @Wizard of Barge
@@ -1204,13 +1202,13 @@ F869 R Blacker Lotus @Scott Okumura
 1323 R Secluded Glen @Hari & Deepti
 1324 R Wanderwine Hub @Hari & Deepti
 1325 R Estrid's Invocation @Simen Meyer
-1325b R Estrid's Invocation @Simen Meyer
+1325☇ R Estrid's Invocation @Simen Meyer
 1326 R Steely Resolve @Yehrin Tong
-1326b R Steely Resolve @Yehrin Tong
+1326☇ R Steely Resolve @Yehrin Tong
 1327 M Estrid, the Masked @Jessica Hische
-1327b M Estrid, the Masked @Jessica Hische
+1327☇ M Estrid, the Masked @Jessica Hische
 1328 M Tuvasa the Sunlit @Teagan White
-1328b M Tuvasa the Sunlit @Teagan White
+1328☇ M Tuvasa the Sunlit @Teagan White
 1329 R Gargos, Vicious Watcher @CatDirty
 1330 M Primordial Hydra @CatDirty
 1331 M Unbound Flourishing @CatDirty
@@ -1344,25 +1342,25 @@ F869 R Blacker Lotus @Scott Okumura
 1451 M Samut, Voice of Dissent @Ekaterina Burmak
 1452 R Marchesa, the Black Rose @Andreas Zafiratos
 1453 M Ajani Goldmane @Fay Dalton & Scott Okumura
-1453b M Ajani Goldmane @Fay Dalton & Scott Okumura
+1453☇ M Ajani Goldmane @Fay Dalton & Scott Okumura
 1454 M Jace Beleren @Fay Dalton & Scott Okumura
-1454b M Jace Beleren @Fay Dalton & Scott Okumura
+1454☇ M Jace Beleren @Fay Dalton & Scott Okumura
 1455 M Liliana Vess @Fay Dalton & Scott Okumura
-1455b M Liliana Vess @Fay Dalton & Scott Okumura
+1455☇ M Liliana Vess @Fay Dalton & Scott Okumura
 1456 M Chandra Nalaar @Fay Dalton & Scott Okumura
-1456b M Chandra Nalaar @Fay Dalton & Scott Okumura
+1456☇ M Chandra Nalaar @Fay Dalton & Scott Okumura
 1457 M Garruk Wildspeaker @Fay Dalton & Scott Okumura
-1457b M Garruk Wildspeaker @Fay Dalton & Scott Okumura
+1457☇ M Garruk Wildspeaker @Fay Dalton & Scott Okumura
 1458 R Death Baron @Michael Walsh & Scott Okumura
-1458b R Death Baron @Michael Walsh & Scott Okumura
+1458☇ R Death Baron @Michael Walsh & Scott Okumura
 1459 R Noxious Ghoul @Jarel Threat & Scott Okumura
-1459b R Noxious Ghoul @Jarel Threat & Scott Okumura
+1459☇ R Noxious Ghoul @Jarel Threat & Scott Okumura
 1460 R Zombie Master @Andrea De Dominicis & Scott Okumura
-1460b R Zombie Master @Andrea De Dominicis & Scott Okumura
+1460☇ R Zombie Master @Andrea De Dominicis & Scott Okumura
 1461 M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura
-1461b M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura
+1461☇ M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura
 1462 R Unholy Grotto @Cabrol & Scott Okumura
-1462b R Unholy Grotto @Cabrol & Scott Okumura
+1462☇ R Unholy Grotto @Cabrol & Scott Okumura
 1463 R Giver of Runes @Jesse LeDoux
 1463★ R Giver of Runes @Jesse LeDoux
 1464 R Distant Melody @Jesse LeDoux
@@ -1436,15 +1434,15 @@ F869 R Blacker Lotus @Scott Okumura
 1505 R Shadowspear @Bartek Fedyczak
 1506 R Academy Ruins @Eliz Roxs
 1508 M Rin and Seri, Inseparable @Andrea Radeck
-1508b M Rin and Seri, Inseparable @Andrea Radeck
+1508☇ M Rin and Seri, Inseparable @Andrea Radeck
 1509 M Jetmir, Nexus of Revels @Nicole Gustafsson
-1509b M Jetmir, Nexus of Revels @Nicole Gustafsson
+1509☇ M Jetmir, Nexus of Revels @Nicole Gustafsson
 1510 R Jinnie Fay, Jetmir's Second @Jack Hughes
-1510b R Jinnie Fay, Jetmir's Second @Jack Hughes
+1510☇ R Jinnie Fay, Jetmir's Second @Jack Hughes
 1511 R Anointed Procession @Jakob Eirich
-1511b R Anointed Procession @Jakob Eirich
+1511☇ R Anointed Procession @Jakob Eirich
 1512 R Sol Ring @Nana Qi
-1512b R Sol Ring @Nana Qi
+1512☇ R Sol Ring @Nana Qi
 1513 R Plains @Alayna Danner
 1514 R Mountain @Alayna Danner
 1515 R Forest @Alayna Danner
@@ -1482,21 +1480,13 @@ F1538 M Fluttershy @Anna Steinbauer
 F1539 M Pinkie Pie @Rudy Siswanto
 F1540 M Rainbow Dash @John Thacker
 1541 M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura
-1541b M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura
-1541c M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura
-1541d M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura
+1541☇ M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura
 1542 R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura
-1542b R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura
-1542c R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura
-1542d R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura
+1542☇ R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura
 1543 R Krark, the Thumbless @Mike Burns & Scott Okumura
-1543b R Krark, the Thumbless @Mike Burns & Scott Okumura
-1543c R Krark, the Thumbless @Mike Burns & Scott Okumura
-1543d R Krark, the Thumbless @Mike Burns & Scott Okumura
+1543☇ R Krark, the Thumbless @Mike Burns & Scott Okumura
 1544 M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura
-1544b M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura
-1544c M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura
-1544d M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura
+1544☇ M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura
 1545 R Arcane Denial @Graham Yarrington
 1545★ R Arcane Denial @Graham Yarrington
 1546 R Nightscape Familiar @Graham Yarrington
@@ -1507,16 +1497,16 @@ F1540 M Rainbow Dash @John Thacker
 1548★ R Simian Spirit Guide @Graham Yarrington
 1549 M Prince of Thralls @Graham Yarrington
 1549★ M Prince of Thralls @Graham Yarrington
-1550 R Sun Titan @Jesper Ejsing
+1550 M Sun Titan @Jesper Ejsing
 1551 R Breeches, Eager Pillager @Jesper Ejsing
 1552 R Deflecting Swat @Jesper Ejsing
 1553 R Llanowar Elves @Jesper Ejsing
 1554 M Rin and Seri, Inseparable @Andrea Radeck
-1554b M Rin and Seri, Inseparable @Andrea Radeck
+1554☇ M Rin and Seri, Inseparable @Andrea Radeck
 1555 M Jetmir, Nexus of Revels @Nicole Gustafsson
-1555b M Jetmir, Nexus of Revels @Nicole Gustafsson
+1555☇ M Jetmir, Nexus of Revels @Nicole Gustafsson
 1556 R Jinnie Fay, Jetmir's Second @Jack Hughes
-1556b R Jinnie Fay, Jetmir's Second @Jack Hughes
+1556☇ R Jinnie Fay, Jetmir's Second @Jack Hughes
 1557 M Najeela, the Blade-Blossom @Clint Cearley & Diana Cearley
 1558 M Kelsien, the Plague @Dan Watson
 1559 M Queen Marchesa @Narendra Bintara Adi
@@ -1524,7 +1514,7 @@ F1540 M Rainbow Dash @John Thacker
 1561 M Admiral Beckett Brass @Fajareka Setiawan
 1562 M Skithiryx, the Blight Dragon @Abigail Larson
 1563 M Kaalia of the Vast @Abigail Larson
-1564 U Angel of Despair @Abigail Larson
+1564 R Angel of Despair @Abigail Larson
 1565 M Master of Cruelties @Abigail Larson
 1566 R Gonti, Lord of Luxury @Ivan Shavrin
 1566★ R Gonti, Lord of Luxury @Ivan Shavrin
@@ -1577,7 +1567,7 @@ F1540 M Rainbow Dash @John Thacker
 1601 R Brago, King Eternal @Micah Epstein
 1602 R Feather, the Redeemed @Yuko Shimizu
 1602★ R Feather, the Redeemed @Yuko Shimizu
-1603 R Song of Creation @PE-nekoR
+1603 R Song of Creation @Penekor
 1604 R Sol Ring @Narendra Bintara Adi
 1605 R Inspiring Vantage @Dani Pendergast
 1605★ R Inspiring Vantage @Dani Pendergast
@@ -1670,7 +1660,7 @@ F1540 M Rainbow Dash @John Thacker
 1673 R Buried Alive @Filipe Pagliuso
 1674 R Dismember @Greg Staples
 1675 R Birds of Paradise @Stephen Andrade
-1675b R Birds of Paradise @Stephen Andrade
+1675☇ R Birds of Paradise @Stephen Andrade
 1676 R Three Visits @Chris Rallis
 1678 R Door to Nothingness @Sam Hogg
 1679 R Ashnod's Altar @Dmitry Burmak
@@ -1685,20 +1675,13 @@ F1540 M Rainbow Dash @John Thacker
 1689 M Dack Fayden @Dibujante Nocturno
 1690 R Greasefang, Okiba Boss @Michael Walsh
 1691 R Teferi's Protection @Steve Argyle
-1691★ R Teferi's Protection @Steve Argyle
 1692 R Eladamri's Vineyard @Alayna Danner
-1692★ R Eladamri's Vineyard @Alayna Danner
 1693 R Greater Good @Johannes Voss
-1693★ R Greater Good @Johannes Voss
 1694 R Inkshield @Donato Giancola
-1694★ R Inkshield @Donato Giancola
 1695 M Ruhan of the Fomori @Livia Prima
-1695★ M Ruhan of the Fomori @Livia Prima
 1696 R Sol Ring @Lindsey Look
-1696★ R Sol Ring @Lindsey Look
 1697 R Command Tower @Titus Lunter
-1697★ R Command Tower @Titus Lunter
-1698 R Sorin Markov @Leonardo Santanna
+1698 M Sorin Markov @Leonardo Santanna
 1699 M Huatli, Radiant Champion @Nathaniel Himawan
 1700 R Kiora, Behemoth Beckoner @Justin Gerard
 1701 M Tezzeret, Master of the Bridge @Javier Charro
@@ -1806,7 +1789,7 @@ F1540 M Rainbow Dash @John Thacker
 1805 R Thrill of Possibility @Johannes Voss
 1806 R Dolmen Gate @Justyna Dura
 1807 M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach
-1807b M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach
+1807☇ M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach
 1808 R Phyrexian Reclamation @Justine Cruz
 1809 R Varragoth, Bloodsky Sire @Domenico Cava
 1810 R Twinflame @Sean Vo
@@ -1847,6 +1830,10 @@ F1540 M Rainbow Dash @John Thacker
 1850 U Crib Swap @Brandon Dorman
 1851 R Homeward Path @Franz Vohwinkel
 1853 M Go-Shintai of Life's Origin @Yuko Shimizu
+1854 M Armageddon @Kieran Yanner
+1855 R Northern Paladin @Kieran Yanner
+1856 M Demonic Tutor @Kieran Yanner
+1857 R Lord of the Pit @Kieran Yanner
 1858 R Day of Judgment @Néstor Ossandón Leal
 1859 R Temporal Extortion @Aurore Folny
 1860 R Toxic Deluge @Evyn Fong
@@ -1863,13 +1850,13 @@ F1540 M Rainbow Dash @John Thacker
 1871 R Lightning Bolt @Evyn Fong
 1872 R Heroic Intervention @Justyna Dura
 1873 M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura
-1873b M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura
+1873☇ M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura
 1874 M Anje Falkenrath @Stephen Andrade & Scott Okumura
-1874b M Anje Falkenrath @Stephen Andrade & Scott Okumura
+1874☇ M Anje Falkenrath @Stephen Andrade & Scott Okumura
 1875 M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura
-1875b M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura
+1875☇ M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura
 1876 R Radha, Heart of Keld @Stephen Andrade & Scott Okumura
-1876b R Radha, Heart of Keld @Stephen Andrade & Scott Okumura
+1876☇ R Radha, Heart of Keld @Stephen Andrade & Scott Okumura
 1877 R Light-Paws, Emperor's Voice @Mitsuhiro Arita
 1878 M Murktide Regent @Mitsuhiro Arita
 1879 R Lightning Bolt @Mitsuhiro Arita
@@ -1890,7 +1877,7 @@ F1540 M Rainbow Dash @John Thacker
 1900 M Avenger of Zendikar @Wojtek Łebski
 1901 R Kindred Summons @Caroline Gariba
 1902 R Tendershoot Dryad @Meel Tamphanon
-1903 C Coat of Arms @Nathan Jurevicius
+1903 R Coat of Arms @Nathan Jurevicius
 1904 R Maskwood Nexus @Rian Gonzales
 1905 R Sol Ring @Ejiwa "Edge" Ebenebe
 1910 M Rin and Seri, Inseparable @Leesha Hannigan
@@ -1927,6 +1914,16 @@ F1540 M Rainbow Dash @John Thacker
 1942 R Mountain @Jon Vermilyea
 1943 R Forest @Jon Vermilyea
 1944 M Morophon, the Boundless @Natalie Andrewson
+1945 R Plains @Ashley Dreyfus
+1946 R Island @Ashley Dreyfus
+1947 R Swamp @Ashley Dreyfus
+1948 R Mountain @Ashley Dreyfus
+1949 R Forest @Ashley Dreyfus
+1950 R Plains @Pedro Potier
+1951 R Island @Pedro Potier
+1952 R Swamp @Pedro Potier
+1953 R Mountain @Pedro Potier
+1954 R Forest @Pedro Potier
 1955 R Big Score @Kirokaze & Chuck Lukacs
 1956 R Final Fortune @6VCR & Chuck Lukacs
 1957 R Heat Shimmer @Kirokaze & Chuck Lukacs
@@ -1936,31 +1933,51 @@ F1540 M Rainbow Dash @John Thacker
 1961 R Liesa, Shroud of Dusk @Craig Drake
 1962 M Oloro, Ageless Ascetic @Craig Drake
 1963 R Sythis, Harvest's Hand @Craig Drake
-1964 C Parhelion II @Ivan Shavrin & Rob Pavic
-1964b C Parhelion II @Doogie Horner
+1964 R Parhelion II @Ivan Shavrin & Rob Pavic
+1964☇ R Parhelion II @Doogie Horner
 1965 R Mechtitan Core @Ivan Shavrin & Rob Pavic
-1965b R Mechtitan Core @Doogie Horner
+1965☇ R Mechtitan Core @Doogie Horner
 1966 R Peacewalker Colossus @Ivan Shavrin & Rob Pavic
-1966b R Peacewalker Colossus @Doogie Horner
+1966☇ R Peacewalker Colossus @Doogie Horner
 1967 R Reckoner Bankbuster @Ivan Shavrin & Rob Pavic
-1967b R Reckoner Bankbuster @Doogie Horner
+1967☇ R Reckoner Bankbuster @Doogie Horner
 1968 R Smuggler's Copter @Ivan Shavrin & Rob Pavic
-1968b R Smuggler's Copter @Doogie Horner
+1968☇ R Smuggler's Copter @Doogie Horner
 1970 M Dragonlord Atarka @Antonio José Manzanedo
-1970b M Dragonlord Atarka @Antonio José Manzanedo
+1970☇ M Dragonlord Atarka @Antonio José Manzanedo
 1971 M Dragonlord Dromoka @Allen Douglas
-1971b M Dragonlord Dromoka @Allen Douglas
+1971☇ M Dragonlord Dromoka @Allen Douglas
 1972 M Dragonlord Kolaghan @Brooklyn Smith
-1972b M Dragonlord Kolaghan @Brooklyn Smith
+1972☇ M Dragonlord Kolaghan @Brooklyn Smith
 1973 M Dragonlord Ojutai @Crystal Sully
-1973b M Dragonlord Ojutai @Crystal Sully
+1973☇ M Dragonlord Ojutai @Crystal Sully
 1974 M Dragonlord Silumgar @Alison Johnstun
-1974b M Dragonlord Silumgar @Alison Johnstun
+1974☇ M Dragonlord Silumgar @Alison Johnstun
 1980 R Deadly Dispute @Frank Frazetta
 1981 R Murderous Rider @Frank Frazetta
 1982 R Zulaport Cutthroat @Frank Frazetta
 1983 R Aggravated Assault @Frank Frazetta
 1984 R Desperate Ritual @Frank Frazetta
+1985 R Deadly Dispute @Terry Dodson
+1986 R Go for the Throat @Kael Ngu
+1987 R Lightning Greaves @Todd Nauck
+1988 R Sol Ring @Roberta Ingranata
+1989 R Command Tower @Roberta Ingranata
+1990 R Ephemerate @Lucas Werneck
+1991 R Three Visits @Lucas Werneck
+1992 R Lightning Greaves @Swayart
+1993 R Sol Ring @Todd Nauck
+1994 R Command Tower @Elena Casagrande
+1995 R Fact or Fiction @Carissa Susilo & Scott Okumura
+1996 R Frantic Search @Javier Charro & Scott Okumura
+1997 R Scheming Symmetry @Ryan Pancoast & Scott Okumura
+1998 R Blasphemous Act @Gal Or & Scott Okumura
+1999 R Impact Tremors @Zoltan Boros & Scott Okumura
+2000 R Damnation @Mark Bagley & Jay David Ramos
+2001 R Dark Ritual @Mark Bagley & Jay David Ramos
+2002 R Peer into the Abyss @Mark Bagley & Jay David Ramos
+2003 R Surgical Extraction @Mark Bagley & Jay David Ramos
+2004 R Tendrils of Agony @Mark Bagley & Jay David Ramos
 2005 R Agent of Treachery @Jay Howell
 2006 R Priest of Forgotten Gods @Jay Howell
 2007 R Treasonous Ogre @Jay Howell
@@ -1971,11 +1988,16 @@ F1540 M Rainbow Dash @John Thacker
 2016 R Harrow @Jordan Crane
 2017 R World Shaper @Jordan Crane
 2018 R Horn of Greed @Jordan Crane
+2019 R Damnation @Mark Bagley
+2020 R Dark Ritual @Mark Bagley
+2021 R Peer into the Abyss @Mark Bagley
+2022 R Surgical Extraction @Mark Bagley
+2023 R Tendrils of Agony @Mark Bagley
 2024 R Goblin Bombardment @Phil Foglio
 2025 R Orcish Lumberjack @Phil Foglio
 2026 R Constant Mists @Phil Foglio
 2027 R Song of the Dryads @Phil Foglio
-2028 R Consecrated Sphinx @Imiri Sakabashira
+2028 M Consecrated Sphinx @Imiri Sakabashira
 2029 R Resculpt @Imiri Sakabashira
 2030 R Mirage Mirror @Imiri Sakabashira
 2031 M Scion of Draco @Imiri Sakabashira
@@ -2006,10 +2028,15 @@ F1540 M Rainbow Dash @John Thacker
 2061 M Xenagos, God of Revels @Alexis Ziritt
 2062 R Lightning Greaves @Izzy
 2063 R Sol Ring @Izzy
+2066 R Counterbalance @Diego Andrade
+2067 R Gitaxian Probe @Pedro Correa
+2068 R Opt @BLUMOO
+2069 R Otherworldly Gaze @Molly Mendoza
+2070 R Baleful Strix @Martin Ontiveros
 2071 R Cultural Exchange @Bene Rohlmann
 2072 R Folio of Fancies @Bráulio Amado
 2073 R Concordant Crossroads @Jay Ryan
-2074 R Rites of Flourishing @Max Loeffler
+2074 R Rites of Flourishing @Max Löffler
 2075 R Font of Mythos @Jesse LeDoux
 2076 R Plains @Dan Black
 2077 R Island @Jessica Seamans
@@ -2045,6 +2072,117 @@ F1540 M Rainbow Dash @John Thacker
 2109 R Sylvan Safekeeper @Ian Permana
 2110 M Crucible of Worlds @Ian Permana
 2111 R Zuran Orb @Ian Permana
+2138 R Dandân @Kelogsloops
+2139 R Dandân @Kelogsloops
+2140 R Accumulated Knowledge @Ed He
+2141 R Magical Hack @Samuele Bandini
+2142 R Memory Lapse @Wylie Beckert
+2143 R Mystic Sanctuary @Amélie Flechais
+2144 R Island @Kelogsloops
+2145 R Island @Kelogsloops
+2146 R Island @Kelogsloops
+2147 R Island @Kelogsloops
+2148 C Brainstorm @DiTerlizzi
+2149 M Capture of Jingzhou @Jack Wei
+2150 U Chart a Course @Olena Richards
+2151 U Control Magic @Clint Cearley
+2152 R Crystal Spray @Jeff Miracola
+2153 R Day's Undoing @Jonas De Ro
+2154 C Mental Note @Bradley Williams
+2155 U Metamorphose @Ron Spencer
+2156 U Predict @Rebecca Guay
+2157 U Telling Time @Scott M. Fischer
+2158 U Unsubstantiate @Victor Adame Minguez
+2159 C Halimar Depths @Volkan Baǵa
+2160 C Haunted Fengraf @Adam Paquette
+2161 C Lonely Sandbar @Heather Hudson
+2162 C Remote Isle @Ciruelo
+2163 C The Surgical Bay @Sarah Finnigan
+2164 U Svyelunite Temple @Liz Danforth
+2165 M Heliod, Sun-Crowned @Magali Villeneuve
+2166 R Steelshaper's Gift @Greg Staples
+2167 R Swords to Plowshares @Lie Setiawan
+2168 R Baral, Chief of Compliance @Kieran Yanner
+2169 M Garruk Relentless @Justyna Dura
+2170 R Reaper King @Alexander Mokhov
+2171 R Glen Elendra Archmage @Jim Woodring
+2172 M Guardian Project @Jim Woodring
+2173 R Roon of the Hidden Realm @Jim Woodring
+2174 R Soulherder @Jim Woodring
+2175 M Jaws, Relentless Predator @Stephen Andrade
+2176 R Descent into Avernus @Stephen Andrade
+2177 R Reckless Endeavor @Stephen Andrade
+2178 M Sneak Attack @Stephen Andrade
+2179 R Abrade @Stephen Andrade
+2181 M Bruvac the Grandiloquent @Akirant
+2182 R Windfall @Dan Mumford
+2183 M Captain N'ghathrod @Akirant
+2184 R Nekusar, the Mindrazer @Akirant
+2185 R Iron Maiden @Dan Mumford
+2186 R Mindcrank @Dan Mumford
+2187 R Lethal Scheme @Iron Maiden
+2188 M Grave Titan @Iron Maiden
+2189 R Animate Dead @Iron Maiden
+2190 M Temporal Trespass @Iron Maiden
+2191 R Unearth @Iron Maiden
+2192 R Lignify @Iron Maiden
+2193 M Greensleeves, Maro-Sorcerer @Jason Loik & Matthew Cohen
+2194 M Polyraptor @Ben Millar
+2195 R Academy Manufactor @Ben Millar
+2196 M Wurmcoil Engine @Jason Loik & Matthew Cohen
+2197 M Ellie, Brick Master @Irvin Rodriguez
+2198 M Joel, Resolute Survivor @Yongjae Choi
+2199 R Cabal Ritual @Bastien L. Deharme
+2200 M Haunted One @Bastien L. Deharme
+2202 M Abby, Merciless Soldier @Wayne Wu
+2203 M Ellie, Vengeful Hunter @Irvin Rodriguez
+2204 R Dictate of Erebos @Bastien L. Deharme
+2205 R Mycoloth @Yongjae Choi
+2207 M Kratos, God of War @Magali Villeneuve
+2208 R World at War @Lie Setiawan
+2209 R Rite of Flame @Johan Grenier
+2210 R Sulfuric Vortex @Aleksi Briclot
+2211 R Pyrohemia @Chris Rahn
+2212 M Atreus, Impulsive Son @Nathaniel Himawan
+2213 M Kratos, Stoic Father @Nathaniel Himawan
+2214 R Teferi's Ageless Insight @Aleksi Briclot & Alix Branwyn
+2214☇ R Teferi's Ageless Insight @Aleksi Briclot & Alix Branwyn
+2215 M Iroas, God of Victory @Joshua Raphael
+2216 M Nathan Drake, Treasure Hunter @Piotr Dura
+2217 R Midnight Clock @Nereida
+2218 R Whip of Erebos @Justyna Dura
+2219 R Chain Reaction @Lie Setiawan
+2220 M Passionate Archaeologist @Justyna Dura
+2221 M Aloy, Savior of Meridian @Crystal Fae
+2222 R Farseek @Toni Infante
+2223 M Blightsteel Colossus @Narendra Bintara Adi
+2224 R Tarrian's Soulcleaver @Gaboleps
+2225 R Meteor Golem @Narendra Bintara Adi
+2226 M Jin Sakai, Ghost of Tsushima @Dominik Mayer
+2227 R Path to Exile @Dominik Mayer
+2228 R Borne Upon a Wind @Matteo Bassini
+2229 R Ghostly Flicker @Dominik Mayer
+2230 R Eiganjo Castle @Matteo Bassini
+2282 R Vito, Thorn of the Dusk Rose @Sam Heimer
+2283 R Satoru Umezawa @Sam Heimer
+2284 M Voja, Jaws of the Conclave @Ryan Roadkill
+2285 M Wilhelt, the Rotcleaver @Sam Heimer
+2286 R Liberator, Urza's Battlethopter @Ryan Roadkill
+2311 R Distant Melody @Paul Scott Canavan
+2312 R Explore @Natalie Andrewson
+2313 R Inspiring Call @Rian Gonzales
+2314 R Chromatic Lantern @Rian Gonzales
+2315 R Sol Ring @Nathan Jurevicius
+2316 R Sphere of Safety @Evyn Fong
+2317 R Miscast @Justyna Dura
+2318 R Phyrexian Arena @Daarken
+2319 R Tormenting Voice @Igor Krstic
+2320 R Tamiyo's Safekeeping @Evyn Fong
+2321 R Hullbreaker Horror @Narendra Bintara Adi
+2322 R Maddening Cacophony @Nathaniel Himawan
+2323 R Serum Visions @Justin Gerard
+2324 M Umbris, Fear Manifest @Antonio José Manzanedo
+2325 R Spellskite @Madeline Boni
 7001 R Feed the Swarm @Stanislav Sherbakov
 7002 R Forge Anew @Yongjae Choi
 7003 R Silence @Evyn Fong
@@ -2057,6 +2195,15 @@ F1540 M Rainbow Dash @John Thacker
 7010 R Counterspell @Tyler Walpole
 7011 R Dismember @Gregg Schigiel
 7012 R Command Tower @Jon Vermilyea
+7013 R Brainstorm @Roberta Ingranata
+7014 R Fatal Push @Veronica Fish
+7015 R Harmonize @Terry Dodson
+7016 R Brainstorm @Roberta Ingranata
+7017 R Fatal Push @Veronica Fish
+7018 R Harmonize @Terry Dodson
+7019 R Brainstorm @Roberta Ingranata
+7020 R Fatal Push @Veronica Fish
+7021 R Harmonize @Terry Dodson
 7022 R Goblin Bombardment @Phil Foglio
 7023 M Consecrated Sphinx @Imiri Sakabashira
 7024 R Resculpt @Imiri Sakabashira
@@ -2073,6 +2220,7 @@ F1540 M Rainbow Dash @John Thacker
 7035 M Lotus Petal @Mike Burns
 7036 M Lotus Petal @Mike Burns
 7037 M Lotus Petal @Mike Burns
+7040 R Vision Charm @
 8001 M Jace, the Mind Sculptor @Wizard of Barge
 9990 R Doom Blade @Cynthia Sheppard
 9991 R Massacre @Andrey Kuzinskiy
@@ -2084,8 +2232,8 @@ F1540 M Rainbow Dash @John Thacker
 9997 R Geralf's Messenger @Chris Seaman
 9998 R Empress Galina @Matt Stewart
 9999 R Sisay, Weatherlight Captain @Volkan Baǵa
-VS C Viscera Seer @John Stanko
 SCTLR R Counterspell @Mark Poole
+VS C Viscera Seer @John Stanko
 
 [tokens]
 13 b_1_1_faerie_rogue_flying @Olena Richards
@@ -2128,6 +2276,7 @@ SCTLR R Counterspell @Mark Poole
 1909 u_2_2_shapeshifter_changeling @Aeron Ng
 1938 c_a_food_sac @Tyler Walpole
 1969 mechtitan @Ivan Shavrin & Rob Pavic
+1969☇ mechtitan @Doogie Horner
 2010 c_a_food_sac @MAOMOMIJI
 2011 c_a_food_sac @MAOMOMIJI
 2012 c_a_food_sac @MAOMOMIJI
@@ -2136,3 +2285,6 @@ SCTLR R Counterspell @Mark Poole
 2065 c_a_treasure_sac @Josu Hernaiz
 2094 c_a_treasure_sac @John Thacker
 2101 c_1_1_a_myr @Caleb Meurer
+2180 c_a_blood_draw @Stephen Andrade
+2201 cordyceps_infected @Wayne Wu
+2206 cordyceps_infected @Irvin Rodriguez
diff --git a/forge-gui/res/editions/Secret Lair Showdown.txt b/forge-gui/res/editions/Secret Lair Showdown.txt
index 585caaef160..dda2aafd701 100644
--- a/forge-gui/res/editions/Secret Lair Showdown.txt	
+++ b/forge-gui/res/editions/Secret Lair Showdown.txt	
@@ -49,3 +49,6 @@ ScryfallCode=SLP
 42 M Garruk Wildspeaker @Merwan Chabane
 43 R Shoot the Sheriff @Dan Black
 44 R Laughing Jasper Flint @Ed Repka
+45 R Innkeeper's Talent @Ben Newman
+46 R Flowerfoot Swordmaster @Ampreh
+47 R Manifold Mouse @Neo.G
diff --git a/forge-gui/res/editions/Shadowmoor.txt b/forge-gui/res/editions/Shadowmoor.txt
index 7c6ab767549..a2fbe93b643 100644
--- a/forge-gui/res/editions/Shadowmoor.txt
+++ b/forge-gui/res/editions/Shadowmoor.txt
@@ -2,7 +2,6 @@
 Code=SHM
 Date=2008-05-02
 Name=Shadowmoor
-Code2=SHM
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
diff --git a/forge-gui/res/editions/Shadows over Innistrad.txt b/forge-gui/res/editions/Shadows over Innistrad.txt
index 0a0f41b6eb2..c6707fc0ba2 100644
--- a/forge-gui/res/editions/Shadows over Innistrad.txt	
+++ b/forge-gui/res/editions/Shadows over Innistrad.txt	
@@ -2,7 +2,6 @@
 Code=SOI
 Date=2016-04-08
 Name=Shadows over Innistrad
-Code2=SOI
 Type=Expansion
 BoosterCovers=5
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand
@@ -323,8 +322,12 @@ ScryfallCode=SOI
 9 g_2_2_wolf @Aaron Miller
 10 wb_1_1_human_cleric @Min Yum
 11 c_a_clue_draw @John Avon
-12 c_a_clue_draw @John Avon
-13 c_a_clue_draw @John Avon
-14 c_a_clue_draw @John Avon
-15 c_a_clue_draw @John Avon
-16 c_a_clue_draw @John Avon
+12 c_a_clue_draw @Noah Bradley
+13 c_a_clue_draw @Zezhou Chen
+14 c_a_clue_draw @Cliff Childs
+15 c_a_clue_draw @James Paick
+16 c_a_clue_draw @Franz Vohwinkel
+
+[other]
+17 emblem_jace_unraveler_of_secrets @Tyler Jacobson
+18 emblem_arlinn_embraced_by_the_moon @Winona Nelson
diff --git a/forge-gui/res/editions/Shards of Alara.txt b/forge-gui/res/editions/Shards of Alara.txt
index b77dafb8602..911b25b4880 100644
--- a/forge-gui/res/editions/Shards of Alara.txt	
+++ b/forge-gui/res/editions/Shards of Alara.txt	
@@ -2,7 +2,6 @@
 Code=ALA
 Date=2008-10-03
 Name=Shards of Alara
-Code2=ALA
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromsheet("ALA cards"), 3 Uncommon:fromSheet("ALA cards"), 1 RareMythic:fromSheet("ALA cards"), 1 BasicLand:fromSheet("ALA cards")
@@ -272,7 +271,6 @@ ScryfallCode=ALA
 5 b_2_2_zombie @Dave Kendall
 6 r_4_4_dragon_flying @Vance Kovacs
 7 r_1_1_goblin @Brandon Kitkouski
-8 r_1_1_goblin_haste @Brandon Kitkouski
 8 g_x_x_ooze @Anthony S. Waters
 9 g_1_1_saproling @Trevor Claxton
 10 rgw_8_8_beast @Paolo Parente
diff --git a/forge-gui/res/editions/Starter Commander Decks.txt b/forge-gui/res/editions/Starter Commander Decks.txt
index a9d73e64e61..e074fa48bc2 100644
--- a/forge-gui/res/editions/Starter Commander Decks.txt	
+++ b/forge-gui/res/editions/Starter Commander Decks.txt	
@@ -385,3 +385,7 @@ ScryfallCode=SCD
 23 g_1_1_saproling @Joseph Meehan
 24 c_1_1_a_thopter_flying @Richard Wright
 25 c_a_treasure_sac @Alayna Danner
+
+[other]
+26 emblem_ob_nixilis_reignited @Chris Rahn
+27 emblem_sarkhan_the_dragonspeaker @Daarken
diff --git a/forge-gui/res/editions/Streets of New Capenna.txt b/forge-gui/res/editions/Streets of New Capenna.txt
index 2683782d219..56180da8a00 100644
--- a/forge-gui/res/editions/Streets of New Capenna.txt	
+++ b/forge-gui/res/editions/Streets of New Capenna.txt	
@@ -2,7 +2,6 @@
 Code=SNC
 Date=2022-04-29
 Name=Streets of New Capenna
-Code2=SNC
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromsheet("SNC cards"), 3 Uncommon:fromSheet("SNC cards"), 1 RareMythic:fromSheet("SNC cards"), 1 fromSheet("SNC lands")
@@ -576,10 +575,10 @@ A-242 C A-Paragon of Modernity @Volkan Baǵa
 11 g_4_4_rhino_warrior @Zoltan Boros
 12 gw_1_1_citizen @Maria Poliakova
 13 c_a_treasure_sac @Nadia Hurianova
-14 c_a_treasure_sac @Nadia Hurianova
-15 c_a_treasure_sac @Nadia Hurianova
-16 c_a_treasure_sac @Nadia Hurianova
-17 c_a_treasure_sac @Nadia Hurianova
+14 c_a_treasure_sac @Alex Stone
+15 c_a_treasure_sac @Minttu Hynninen
+16 c_a_treasure_sac @Brigitte Roka
+17 c_a_treasure_sac @Forrest Imel
 
 [other]
 1 copy @David Palumbo
diff --git a/forge-gui/res/editions/Strixhaven School of Mages.txt b/forge-gui/res/editions/Strixhaven School of Mages.txt
index d2864c21ef4..8c9203f722b 100644
--- a/forge-gui/res/editions/Strixhaven School of Mages.txt	
+++ b/forge-gui/res/editions/Strixhaven School of Mages.txt	
@@ -2,7 +2,6 @@
 Code=STX
 Date=2021-04-23
 Name=Strixhaven: School of Mages
-Code2=STX
 Type=Expansion
 BoosterCovers=5
 DraftBooster=1 fromSheet("STX lesson"), 9 Common:fromSheet("STX cards"), 3 Uncommon:fromSheet("STX cards"), 1 RareMythic:fromSheet("STX cards"), 1 Any STA
diff --git a/forge-gui/res/editions/Stronghold.txt b/forge-gui/res/editions/Stronghold.txt
index 54c78ef966a..8d14954c45f 100644
--- a/forge-gui/res/editions/Stronghold.txt
+++ b/forge-gui/res/editions/Stronghold.txt
@@ -153,10 +153,3 @@ ScryfallCode=STH
 141 R Sword of the Chosen @Adam Rex
 142 R Volrath's Laboratory @Brom
 143 R Volrath's Stronghold @Kev Walker
-
-[tokens]
-hornet
-c_1_1_sliver
-b_1_1_rat
-r_1_1_goblin
-g_1_1_spike
diff --git a/forge-gui/res/editions/Summer Vacation Promos 2022.txt b/forge-gui/res/editions/Summer Vacation Promos 2022.txt
index a51fa96b67d..4a667f07d51 100644
--- a/forge-gui/res/editions/Summer Vacation Promos 2022.txt	
+++ b/forge-gui/res/editions/Summer Vacation Promos 2022.txt	
@@ -4,6 +4,7 @@ Date=2022-08-01
 Name=Summer Vacation Promos 2022
 Type=Promo
 ScryfallCode=PSVC
+CardLang=ja
 
 [cards]
 1 R Ephemerate @Bastien L. Deharme
diff --git a/forge-gui/res/editions/Tarkir Dragonstorm.txt b/forge-gui/res/editions/Tarkir Dragonstorm.txt
index 2d4682fbfd1..0747d2859ae 100644
--- a/forge-gui/res/editions/Tarkir Dragonstorm.txt	
+++ b/forge-gui/res/editions/Tarkir Dragonstorm.txt	
@@ -3,7 +3,7 @@ Code=TDM
 Date=2025-04-11
 Name=Tarkir: Dragonstorm
 Type=Expansion
-TokensCode=TTDM
+ScryfallCode=TDM
 # https://mtgscribe.com/2025/03/20/play-booster-fact-sheet-dragonstorm/
 BoosterSlots=Common,Common-Guest,Uncommon,RareMythic,AnyLand,Wildcard,FoilWildcard
 Booster=6 Common, 1 Common-Guest, 3 Uncommon, 1 RareMythic, 1 AnyLand, 1 Wildcard, 1 FoilWildcard
@@ -427,17 +427,17 @@ Replace=.012F Mythic:fromSheet("TDM cards")
 375 R Yathan Roadwatcher @Kevin Glint
 376 R Zurgo, Thunder's Decree @Chuck Lukacs
 377 R Clarion Conqueror @Crystal Sully
-377b R Clarion Conqueror @Crystal Sully
+377☇ R Clarion Conqueror @Crystal Sully
 378 R Marang River Regent @Brian Valeza
-378b R Marang River Regent @Brian Valeza
+378☇ R Marang River Regent @Brian Valeza
 379 R Scavenger Regent @Allen Douglas
-379b R Scavenger Regent @Allen Douglas
+379☇ R Scavenger Regent @Allen Douglas
 380 R Magmatic Hellkite @Alison Johnstun
-380b R Magmatic Hellkite @Alison Johnstun
+380☇ R Magmatic Hellkite @Alison Johnstun
 381 R Bloomvine Regent @Brooklyn Smith
-381b R Bloomvine Regent @Brooklyn Smith
+381☇ R Bloomvine Regent @Brooklyn Smith
 382 M Ugin, Eye of the Storms @Antonio José Manzanedo
-382b M Ugin, Eye of the Storms @Antonio José Manzanedo
+382☇ M Ugin, Eye of the Storms @Antonio José Manzanedo
 399 M Ugin, Eye of the Storms @Joshua Raphael
 400 M Clarion Conqueror @Nathaniel Himawan
 401 M Elspeth, Storm Slayer @Ekaterina Burmak
@@ -489,6 +489,9 @@ Replace=.012F Mythic:fromSheet("TDM cards")
 425 R Temur Battlecrier @Valera Lutfullina
 426 R Qarsi Revenant @Diana Franco
 
+[rebalanced]
+A-103 A-Cori-Steel Cutter @Xabi Gaztelua
+
 [gain lands]
 1 Bloodfell Caves|TDM
 1 Blossoming Sands|TDM
diff --git a/forge-gui/res/editions/Teenage Mutant Hero Turtles Source Material.txt b/forge-gui/res/editions/Teenage Mutant Hero Turtles Source Material.txt
new file mode 100644
index 00000000000..30cb0c7f5ca
--- /dev/null
+++ b/forge-gui/res/editions/Teenage Mutant Hero Turtles Source Material.txt	
@@ -0,0 +1,8 @@
+[metadata]
+Code=PZA
+Date=2026-03-06
+Name=Teenage Mutant Hero Turtles Source Material
+Type=Collector_Edition
+
+[cards]
+11 M Doubling Season @Kevin Eastman
diff --git a/forge-gui/res/editions/Teenage Mutant Ninja Turtles Eternal.txt b/forge-gui/res/editions/Teenage Mutant Ninja Turtles Eternal.txt
new file mode 100644
index 00000000000..c2a47d1028c
--- /dev/null
+++ b/forge-gui/res/editions/Teenage Mutant Ninja Turtles Eternal.txt	
@@ -0,0 +1,19 @@
+[metadata]
+Code=TMC
+Date=2026-03-06
+Name=Teenage Mutant Ninja Turtles Eternal
+Type=Expansion
+
+[cards]
+1 M Leonardo, the Balance @Inkognit
+2 M Donatello, the Brains @Jason Rainville
+3 M Splinter, the Mentor @Andrea Tentori Montalto
+4 M Raphael, the Muscle @Ryan Pancoast
+5 M Michelangelo, the Heart @Néstor Ossandón Leal
+6 M Heroes in a Half Shell @Victor Maury
+101 M Leonardo, Worldly Warrior @Nathaniel Himawan
+109 M Donatello, Rad Scientist @Thomas Chamberlain-Keen
+111 R Donnie & April, Adorkable Duo @Le Vuong
+118 M Raphael, Tag Team Tough @Randy Vargas
+124 M Michelangelo, On the Scene @Lie Setiawan
+131 M Dark Ritual @Filipe Pagliuso
diff --git a/forge-gui/res/editions/Teenage Mutant Ninja Turtles.txt b/forge-gui/res/editions/Teenage Mutant Ninja Turtles.txt
new file mode 100644
index 00000000000..c3dc850faab
--- /dev/null
+++ b/forge-gui/res/editions/Teenage Mutant Ninja Turtles.txt	
@@ -0,0 +1,27 @@
+[metadata]
+Code=TMT
+Date=2026-03-06
+Name=Teenage Mutant Ninja Turtles
+Type=Expansion
+
+[cards]
+17 M Leonardo, Sewer Samurai @Ryan Pancoast
+27 R Turtles Forever @Devin Elle Kurtz
+29 R April O'Neil, Hacktivist @Xabi Gaztelua
+43 R Krang, Master Mind @Narendra Bintara Adi
+83 M Super Shredder @Néstor Ossandón Leal
+87 U Casey Jones, Jury-Rig Justiciar @Lordigan
+105 R Raphael's Technique @Andreas Zafiratos
+140 R Bebop & Rocksteady @Néstor Ossandón Leal
+253 L Plains @Gaboleps
+254 L Island @Gaboleps
+255 L Swamp @Gaboleps
+256 L Mountain @Gaboleps
+257 L Forest @Gaboleps
+261 R Turtles Forever @Devin Elle Kurtz
+301 M Leonardo, Sewer Samurai @Kevin Eastman
+310 L Plains @Gaboleps
+311 L Island @Gaboleps
+312 L Swamp @Gaboleps
+313 L Mountain @Gaboleps
+314 L Forest @Gaboleps
diff --git a/forge-gui/res/editions/Through the Omenpaths 1 Bonus Sheet.txt b/forge-gui/res/editions/Through the Omenpaths 1 Bonus Sheet.txt
new file mode 100644
index 00000000000..328dc6083fa
--- /dev/null
+++ b/forge-gui/res/editions/Through the Omenpaths 1 Bonus Sheet.txt	
@@ -0,0 +1,48 @@
+[metadata]
+Code=OMB
+Date=2025-09-23
+Name=Through the Omenpaths 1 Bonus Sheet
+Type=Online
+ScryfallCode=OMB
+
+[cards]
+1 R Comeuppance @Igor Krstic
+2 R Leyline Binding @Cristi Balanescu
+3 R Nine Lives @Paul Scott Canavan
+4 R Path to Exile @Todd Lockwood
+5 U Reprieve @Mariah Tekulve
+6 R Rest in Peace @Jarel Threat
+7 M Wedding Ring @Olena Richards
+8 M Clever Impersonator @Slawomir Maniak
+9 R Counterspell @Gao Yan
+10 M Lorthos, the Tidemaker @Kekai Kotaki
+11 M Mindbreak Trap @Christopher Moeller
+12 R Mystic Confluence @Kieran Yanner
+13 C Ponder @Ernanda Souza
+14 R Rite of Replication @Matt Cavotta
+15 R Traumatize @Greg Staples
+16 C Feed the Swarm @Nino Is
+17 R Hex @Michael Sutfin
+18 U Infernal Grasp @Naomi Baker
+19 M Opposition Agent @Scott Murphy
+20 R Reanimate @Johann Bodin
+21 R Saw in Half @Alexander Mokhov
+22 M Skithiryx, the Blight Dragon @Chippy
+23 R Goblin Bombardment @Dave Kendall
+24 M Najeela, the Blade-Blossom @Matt Stewart
+25 R Relentless Assault @Greg Hildebrandt
+26 M Savage Beating @Matt Thompson
+27 C Shock @Jon Foster
+28 C Thrill of Possibility @Izzy
+29 C Unexpected Windfall @Lorenzo Mastroianni
+30 U Winds of Change @Adam Rex
+31 R Arachnogenesis @Johannes Voss
+32 R Arasta of the Endless Web @Sam Rowan
+33 U Beast Within @Jesper Ejsing
+34 R Heroic Intervention @James Ryman
+35 U Hunter's Insight @Jim Murray
+36 M Parallel Lives @Steve Prescott
+37 R Silkguard @Dan Murayama Scott
+38 U Tangle @Néstor Ossandón Leal
+39 M Alibou, Ancient Witness @Matt Stewart
+40 U Terminate @Wayne Reynolds
diff --git a/forge-gui/res/editions/Through the Omenpaths 1.txt b/forge-gui/res/editions/Through the Omenpaths 1.txt
new file mode 100644
index 00000000000..dc6544ae233
--- /dev/null
+++ b/forge-gui/res/editions/Through the Omenpaths 1.txt	
@@ -0,0 +1,196 @@
+[metadata]
+Code=OM1
+Date=2025-09-23
+Name=Through the Omenpaths 1
+Type=Online
+ScryfallCode=OM1
+
+[cards]
+1 R Ademi of the Silkchutes @Filip Burburan
+2 U Archangler's Skyrod @Camille Alquier
+3 U Basil, Cabaretti Loudmouth @Elizabeth Peiró
+4 R Chosen by Valgavoth @Nils Hamm
+5 C City Pigeon @Michele Giorgi
+6 R Confessor's Bindings @Campbell White
+7 U Costume Closet @Ben Maier
+8 C Crime-Scene Instructor @Loïc Canavaggia
+9 C Darval, Whose Web Protects @Xavier Ribeiro
+10 C Eztli of the Thousand Moons @Justyna Dura
+11 C Freestrider Aces @Bartek Fedyczak
+12 U Generous Betty Wray @Caio Cacau
+13 C Lively Leap @Alexandre Honoré
+14 R A Most Helpful Weaver @Caio Cacau
+15 C Mothwing Shroud @Andrew Mar
+16 C Principled Referee @Leonardo Santanna
+17 R Remarkable Readings @Carlos Palma Cruchaga
+18 U Sarn of the Silken Throne @Jodie Muir
+19 C Spectacular Tactics @Cristi Balanescu
+20 U Sudden Strike @Edgar Sánchez Hidalgo
+21 M Surris, Spidersilk Innovator @Chris Mangum
+22 M Verilax the Havenskin @Raoul Vitale
+23 R Yera and Oski, Weaver and Guide @Julia Metzger
+24 U Zora, Spider Fancier @Chris Mangum
+25 C Arala, Hedron Scaler @Andreia Ugrai
+26 U Argyr, Tidal Spinner @Randy Gallegos
+27 R Belion, the Parched @David Palumbo
+28 R Detect Intrusion @Diana Franco
+29 C Drix Interception @Francis Tneh
+30 M Goben, Gene-Splice Savant @Nicholas Gregory
+31 C Hide in Mundanity @Julia Metzger
+32 M Impostor Syndrome @Tehani Farr
+33 R Lost in Littjara @Slawomir Maniak
+34 R Merata, Neuron Hacker @Claudio Pozas
+35 C Obscura Alleylurkers @Matheus Graef
+36 U Olx, Mouth to Many Eyes @Mathias Kollros
+37 U Outsmart the Amateur @Mark Behm
+38 C Ozor, Chronicler of Collapse @Kev Fang
+39 C Phantasmal Vision @Igor Krstic
+40 C Pinnacle Research Team @Nino Vecia
+41 U Robotics Mastery @Andrew Mar
+42 U Secret Identity @Bram Sels
+43 C Snatch Back @Maxime Minard
+44 R Spectral Restitching @Justyna Dura
+45 C Unstable Experiment @Adrián Rodríguez Pérez
+46 U Vazin, Two-Faced Trickster @Andrey Kuzinskiy
+47 U Vexed Bots @Jonathan Wayshak
+48 R The Watcher on the Road @Leonardo Santanna
+49 U Aggressive Symbiosis @Helge C. Balzer
+50 C Bane-Marked Leonin @Kev Walker
+51 C Caldaia Brawlers @Warren Mahy
+52 C Clandestine Work @Will Gist
+53 C Common Crook @Gil Martimiano
+54 C Damning Caress @Marko Manev
+55 R Duskmourn's Claim @Camille Alquier
+56 M Egrix the Bile Bulwark @Lars Grant-West
+57 M Hex of Undeath @Karl Kopinski
+58 R The House Grows Hungry @Carlos Palma Cruchaga
+59 U Kroble, Envoy of the Bog @Michele Giorgi
+60 R Luis, Pompous Pillager @Loïc Canavaggia
+61 C Merciless Enforcers @Cristi Balanescu
+62 U Miasmic Mist @Mathias Kollros
+63 U Nill, Vessel of Valgavoth @Carlos Palma Cruchaga
+64 U Prison Break @Hristo D. Chukov
+65 U Remorseless Coup @Warren Mahy
+66 R Rhilex the Accursed @Diana Franco
+67 C Scorpion's Sting @Inkognit
+68 U Scorvus Ames, Crimelord @Dmitry Burmak
+69 M The Terminus of Return @Adam Paquette
+70 C Tethex, Gift of Malice @Javier Charro
+71 M Viggo, Enforcer of Ig's Crossing @Michael Phillippi
+72 R Villainous Wrath @Jonathan Wayshak
+73 C Wekhdu, Midnight Hunter @Inkognit
+74 R Wrench, Speedway Saboteur @Yohann Schepacz
+75 M Arachnomania @Karl Kopinski
+76 R Bayo, Irritable Instructor @Dmitry Burmak
+77 U Cam and Farrik, Havoc Duo @Warren Mahy
+78 C Deathflame Burst @Claudio Pozas
+79 U Fire-Brained Scheme @Simon Dominic
+80 C Full-Throttle Fanatic @Caio Monteiro
+81 C Galvanized Workforce @Diego Gisbert
+82 U The Infernus @Tuan Duong Chu
+83 U Kazuo, Ruthless Rival @Julian Kok Joon Wen
+84 C Kephon, Rage Incubator @Lars Grant-West
+85 R Kraza, the Swarm as One @Vincent Proce
+86 U Lavaborn Goblins @Tuan Duong Chu
+87 R Lavabrink Repels the Magmaloth @Tiffany Turrill
+88 R Lazlo, Enthusiastic Accuser @Olivier Bernard
+89 M Nia, Skysail Storyteller @Jakob Eirich
+90 R Quint's Insight @Dallas Williams
+91 U Restless Razorkin @Mirko Failoni
+92 R Rizna, the Spider-Crowned @Igor Krstic
+93 C Romantic Rendezvous @Mariah Tekulve
+94 C Sadistic String-Puller @Helge C. Balzer
+95 C Shock @Jason Rainville
+96 C Skittering Kitten @Deruchenko Alexander
+97 C Wardens of Silverweb Summit @Jesper Ejsing
+98 U Wisecrack @Xabi Gaztelua
+99 U Ancestral Carvings @Andrew Mar
+100 C Chizak, Apex Arachnosaur @Caio Monteiro
+101 U The Clutter Cluster @Michele Giorgi
+102 M Cren, Undercity Dreamer @Loïc Canavaggia
+103 C Cruel Caracals @Warren Mahy
+104 C Eccentric Arachnologist @Ben Maier
+105 R Fateweaver @Gonzalo Kenny
+106 C Favored Fighter @Chris Mangum
+107 C Grow Extra Arms @Mathias Kollros
+108 R King of the Coldblood Curse @Andrew Mar
+109 C Lurking Lizards @Henry Peters
+110 U Orris, Last of the Web Lords @Yohann Schepacz
+111 C Perilous Lunge @Arif Wijaya
+112 U Rouse the Swarm @Vincent Proce
+113 R The Scouring Stormsoul @Bartek Fedyczak
+114 C Scout the City @Caio Monteiro
+115 U Selesnya Archivist @Caio Cacau
+116 R Strength of Will @Rhonda Libbey
+117 U Supportive Parents @Elizabeth Peiró
+118 R Tarantusk, Unwisely Awoken @Andrew Mar
+119 U Terrific Team-Up @Hristo D. Chukov
+120 M Through the Omenpath @Allen Panakal
+121 R A Trail of Teacups @Volkan Baǵa
+122 C Zan, Tunnelweb Explorer @John Tedrick
+123 R Alenni, Brood Recruiter @Dmitry Burmak
+124 U Alessos and Pras, Acrobats @Viko Menezes
+125 R Angler's Shield @Randy Gallegos
+126 R Borys, the Spider Rider @Alexandre Honoré
+127 R Brako, Heartless Hunter @Diego Gisbert
+128 U Carlo, Suave Schemer @Cristi Balanescu
+129 R Cheering Crowd @Deruchenko Alexander
+130 U Cirina Bargainspinner @Alexandre Honoré
+131 U Crash, Reckless Endrider @Billy Christian
+132 R Demera, Soul of a Spider @Inkognit
+133 R Desecrex, Gift of Servitude @Diana Franco
+134 U Diligent Webkeepers @Michele Giorgi
+135 U Dreadfang, Loathed by Fans @Inkognit
+136 R Druneth, Reviver of the Hive @Arif Wijaya
+137 C Gallant Citizen @Mirko Failoni
+138 R Gloria, the Great Armorer @Alexander Mokhov
+139 U Janai and Hoppy, Roofskippers @Mathias Kollros
+140 R Kavaero, Mind-Bitten @Claudio Pozas
+141 U Kivni, Orb Weaver @Alexander Mokhov
+142 C Knife Trick @Javier Charro
+143 U Kumonosu, the Watchful @Joe Slucher
+144 C Leyline Weaver @Xavier Ribeiro
+145 R Makdee and Itla, Skysnarers @Mirko Failoni
+146 U Margot, On the Case @Andreia Ugrai
+147 C Mob Lookout @Francisco Badilla
+148 M Neach, Pinnacle Pariah @Artur Nakhodkin
+149 U Nu and Sumi, Career Criminals @Daren Bader
+150 R Qoneus, Horizon Splicer @Andreas Zafiratos
+151 U Rhino's Rampage @Gonzalo Kenny
+152 U Rishei, Getaway Accomplice @Josh Hass
+153 R Ruzic, Booed but Victorious @Caio Cacau
+154 M Scions of the Ur-Spider @Jesper Ejsing
+155 R Skv'x the Augmenter @Igor Krstic
+156 U Tearle, Entropic Hunger @Andrey Kuzinskiy
+157 R Uharis, the Stormspinner @Slawomir Maniak
+158 M Withar, Cocoon Keeper @Vincent Proce
+159 C Wonderweave Aerialist @Eelis Kyttanen
+160 U Xecau, Predation's Shadow @Inkognit
+161 U Cactarantula Saddle @Daniel Ljunggren
+162 C Carriage of Dreams @Carlos Palma Cruchaga
+163 C Data Scrubber @Caio Monteiro
+164 C Eerie Gravestone @Francisco Badilla
+165 U Error-9, Viral Node @Steve Ellis
+166 R Fizik, Etherium Mechanic @Joshua Cairos
+167 R Giantcraft Helm @Claudio Pozas
+168 U Goro Rel, Scourge to Spiders @Warren Mahy
+169 C Opulent Valet @Victor Sales
+170 C Perfected Pastry @Henry Peters
+171 R Phenomena Recorder @Tianxing Xu
+172 R Reality Fulcrum @Alex Konstad
+173 U Scuttling Spidercoach @Filip Burburan
+174 C Steelweb Surveyor @Joshua Cairos
+175 R Stitcher's Wings @Kev Fang
+176 C Temple Trap @Kev Fang
+177 C Treat Trolley @Josiah "Jo" Cameron
+178 C Vinewoven Chariot @Camille Alquier
+179 R Exclusive Nightclub @Francisco Badilla
+180 U Fearsome Ridgeline @Adam Paquette
+181 R Multiversal Passage @Daren Bader
+182 C Ominous Asylum @Daniel Ljunggren
+183 C Savage Mansion @Vincent Proce
+184 C Sinister Hideout @Julian Kok Joon Wen
+185 C Suburban Sanctuary @Victor Sales
+186 C University Campus @Randy Gallegos
+187 R Urban Retreat @Julia Metzger
+188 C Vibrant Cityscape @Julian Kok Joon Wen
diff --git a/forge-gui/res/editions/Unknown Event.txt b/forge-gui/res/editions/Unknown Event.txt
index fe3d1872e91..7e579d8bc2a 100644
--- a/forge-gui/res/editions/Unknown Event.txt	
+++ b/forge-gui/res/editions/Unknown Event.txt	
@@ -396,7 +396,8 @@ PLA014 C The Food Court @
 RB14 R Another Night in Vegas @
 UU14a U Tax Draw @
 UU14b U Tax Sweeper @
-CR15a C Fast // Furious @
+# Commented out below to fix conflict with existing legal card with the same name
+# CR15a C Fast // Furious @
 PLA015 C High Noon At Thunder Junction @
 RR15 R Force of Rowan @
 RW15 R Crux of Mirrodin @
diff --git a/forge-gui/res/editions/Unstable.txt b/forge-gui/res/editions/Unstable.txt
index 312526fc461..c7e51a7bcb8 100644
--- a/forge-gui/res/editions/Unstable.txt
+++ b/forge-gui/res/editions/Unstable.txt
@@ -128,7 +128,6 @@ ScryfallCode=UST
 90 C Just Desserts @Zoltan Boros
 91 C Painiac @McLean Kendree
 92 U Party Crasher @Mike Burns
-93 R Steamflogger Boss @Warren Mahy
 94 R Steamflogger of the Month @Warren Mahy
 95 U Steamflogger Temp @Jeff Miracola
 96 U Steamfloggery @Emrah Elmasli
@@ -276,6 +275,9 @@ ScryfallCode=UST
 215 L Mountain @John Avon
 216 L Forest @John Avon
 
+[eternal]
+93 R Steamflogger Boss @Warren Mahy
+
 [tokens]
 1 w_4_4_angel_flying @Magali Villeneuve
 2 w_0_1_goat @Carl Critchlow
diff --git a/forge-gui/res/editions/Vintage Championship.txt b/forge-gui/res/editions/Vintage Championship.txt
index 4623dadd3f5..d369647653d 100644
--- a/forge-gui/res/editions/Vintage Championship.txt	
+++ b/forge-gui/res/editions/Vintage Championship.txt	
@@ -17,27 +17,27 @@ ScryfallCode=OVNT
 2011 R Time Walk @Chris Rahn
 2012 R Timetwister @Matt Stewart
 2013 R Ancestral Recall @Ryan Pancoast
-2014 M Mox Pearl @Raoul Vitale
-2015 M Mox Emerald @Raoul Vitale
-2016EU M Mox Jet @Raoul Vitale
-2016NA M Mox Sapphire @Raoul Vitale
-2017EU M Mox Ruby @Raoul Vitale
-2017NA M Black Lotus @Steven Belledin
-2018 M Ancestral Recall @Raoul Vitale
-2018A M Timetwister @Ralph Horsley
-2018NA M Time Walk @Chris Seaman
+2014 S Mox Pearl @Raoul Vitale
+2015 S Mox Emerald @Raoul Vitale
+2016EU S Mox Jet @Raoul Vitale
+2016NA S Mox Sapphire @Raoul Vitale
+2017EU S Mox Ruby @Raoul Vitale
+2017NA S Black Lotus @Steven Belledin
+2018 S Ancestral Recall @Raoul Vitale
+2018A S Timetwister @Ralph Horsley
+2018NA S Time Walk @Chris Seaman
 2019 M Mox Pearl @Sidharth Chaturvedi
 2019A M Mox Sapphire @Tyler Walpole
-2019NA M Mox Jet @Filip Burburan
+2019NA S Mox Jet @Filip Burburan
 2020A M Tolarian Academy @Raoul Vitale
 2020B M Library of Alexandria @Volkan Baǵa
 2020C M Mishra's Workshop @Drew Baker
 2021A M Mox Emerald @Eric Wilkerson
 2021B M Timetwister @Chris Seaman
 2021C M Mox Ruby @Jarel Threat
-2022A M Bazaar of Baghdad @Chris Seaman
-2022B M Time Walk @Tyler Walpole
-2022C M Ancestral Recall @Volkan Baǵa
-2023A M Black Lotus @Jarel Threat
-2023EU M Black Lotus @Raoul Vitale
-2023NA M Black Lotus @Scott M. Fischer
+2022A S Bazaar of Baghdad @Chris Seaman
+2022B S Time Walk @Tyler Walpole
+2022C S Ancestral Recall @Volkan Baǵa
+2023A S Black Lotus @Jarel Threat
+2023EU S Black Lotus @Raoul Vitale
+2023NA S Black Lotus @Scott M. Fischer
diff --git a/forge-gui/res/formats/Archived/Alchemy/2025-07-29.txt b/forge-gui/res/formats/Archived/Alchemy/2025-07-29.txt
index f0de8ec816c..77cfe09943c 100644
--- a/forge-gui/res/formats/Archived/Alchemy/2025-07-29.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2025-07-29.txt
@@ -4,6 +4,5 @@ Type:Archived
 Subtype:Arena
 Effective:2025-07-29
 Sets:ANA, ANB, BLB, YBLB, DSK, YDSK, FDN, DFT, YDFT, TDM, YTDM, FIN, EOE
-Banned:Monstrous Rage
 // Due to format rotation, Alchemy loses access to several mana-fixing lands. Therefore, the following cards are legal ahead of schedule due to their inclusion in YEOE on 19 August 2025.
 Additional:Clifftop Retreat; Dragonskull Summit; Drowned Catacomb; Glacial Fortress; Hinterland Harbor; Isolated Chapel; Rootbound Crag; Sulfur Falls; Sunpetal Grove; Woodland Cemetery
diff --git a/forge-gui/res/formats/Archived/Alchemy/2025-08-19.txt b/forge-gui/res/formats/Archived/Alchemy/2025-08-19.txt
index 1dc6d843e90..758501395b3 100644
--- a/forge-gui/res/formats/Archived/Alchemy/2025-08-19.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2025-08-19.txt
@@ -4,4 +4,3 @@ Type:Archived
 Subtype:Arena
 Effective:2025-08-19
 Sets:ANA, ANB, BLB, YBLB, DSK, YDSK, FDN, DFT, YDFT, TDM, YTDM, FIN, EOE, YEOE
-Banned:Monstrous Rage
diff --git a/forge-gui/res/formats/Archived/Alchemy/2025-09-23.txt b/forge-gui/res/formats/Archived/Alchemy/2025-09-23.txt
new file mode 100644
index 00000000000..dc1af079cdd
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Alchemy/2025-09-23.txt
@@ -0,0 +1,6 @@
+[format]
+Name:Alchemy (OM1)
+Type:Archived
+Subtype:Arena
+Effective:2025-09-23
+Sets:ANA, ANB, BLB, YBLB, DSK, YDSK, FDN, DFT, YDFT, TDM, YTDM, FIN, EOE, YEOE, OM1
diff --git a/forge-gui/res/formats/Archived/Arena Standard/2025-09-23.txt b/forge-gui/res/formats/Archived/Arena Standard/2025-09-23.txt
new file mode 100644
index 00000000000..51679cd2799
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Arena Standard/2025-09-23.txt	
@@ -0,0 +1,7 @@
+[format]
+Name:Arena Standard (OM1)
+Type:Archived
+Subtype:Standard
+Effective:2025-09-23
+Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, OM1
+Banned:Abuelo's Awakening; Cori-Steel Cutter; Heartfire Hero; Hopeless Nightmare; Leyline of Resonance; Monstrous Rage; This Town Ain't Big Enough; Up the Beanstalk
diff --git a/forge-gui/res/formats/Archived/Historic/2025-09-23.txt b/forge-gui/res/formats/Archived/Historic/2025-09-23.txt
new file mode 100644
index 00000000000..dc175f25ab4
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Historic/2025-09-23.txt
@@ -0,0 +1,8 @@
+[format]
+Name:Historic (OM1)
+Type:Archived
+Subtype:Arena
+Effective:2025-09-23
+Sets:KTK, XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4, STX, STA, HA5, AFR, J21, MID, VOW, YMID, NEO, YNEO, SNC, YSNC, HBG, HA6, EA1, DMU, YDMU, BRO, BRR, YBRO, EA2, ONE, YONE, SIR, SIS, MOM, MUL, MAT, LTR, HA7, EA3, WOE, WOT, YWOE, LCI, YLCI, MKM, YMKM, OTJ, OTP, BIG, YOTJ, MH3, BLB, YBLB, DSK, YDSK, FDN, J25, PIO, DFT, YDFT, TDM, YTDM, PA1, FIN, FCA, EOE, EOS, YEOE, AA1, AA2, OM1, OMB, AA3, AA4
+Banned:Agent of Treachery; Ancient Tomb; Arid Mesa; Blood Moon; Bloodstained Mire; Brainstorm; Channel; Chrome Mox; Commandeer; Dark Ritual; Demonic Tutor; Endurance; Field of the Dead; Flare of Cultivation; Flare of Denial; Flare of Duplication; Flare of Fortitude; Flare of Malice; Flooded Strand; Force of Vigor; Fury; Grief; Harbinger of the Seas; Intruder Alarm; Land Tax; Lightning Bolt; Magus of the Moon; Mana Drain; Marsh Flats; Memory Lapse; Mishra's Bauble; Misty Rainforest; Mox Opal; Natural Order; Necropotence; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Polluted Delta; Ragavan, Nimble Pilferer; Reanimate; Scalding Tarn; Show and Tell; Sneak Attack; Solitude; Spreading Seas; Strip Mine; Subtlety; Swords to Plowshares; Temporal Manipulation; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Verdant Catacombs; Wilderness Reclamation; Windswept Heath; Winter Moon; Wooded Foothills
+Additional:Admiral Brass, Unsinkable; Burden of Guilt; Clavileño, First of the Blessed; Crashing Footfalls; Crumbling Vestige; Desert; Desertion; Dismember; Duskmantle, House of Shadow; Enlisted Wurm; Evolutionary Leap; Fabricate; Gamble; Ghostly Prison; Gonti, Canny Acquisitor; Goro-Goro and Satoru; Ixidor, Reality Sculptor; Katilda and Lier; Kuldotha Rebirth; Leonin Relic-Warder; Magmaw; Mass Hysteria; Metalspinner's Puzzleknot; Mistveil Plains; Molten Psyche; Monologue Tax; Mystery Key; Mystic Snake; Notion Thief; Nyx Weaver; Olivia, Opulent Outlaw; Pantlaza, Sun-Favored; Persist; Port Razer; Possibility Storm; Prismatic Ending; Prismatic Vista; Putrid Warrior; Shard of Broken Glass; Slimefoot and Squee; Smuggler's Copter; Spell Snare; Stella Lee, Wild Card; Stoneforge Mystic; Timeless Dragon; Treacherous Terrain; Victimize; Xolatoyac, the Smiling Flood; Yuma, Proud Protector
diff --git a/forge-gui/res/formats/Archived/Legacy/2025-09-26.txt b/forge-gui/res/formats/Archived/Legacy/2025-09-26.txt
new file mode 100644
index 00000000000..33c966ec7d3
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Legacy/2025-09-26.txt
@@ -0,0 +1,8 @@
+[format]
+Name:Legacy (SPM)
+Type:Archived
+Subtype:Legacy
+Effective:2025-09-26
+Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS, SPM, SPE, MAR
+Banned:"Lifetime" Pass Holder; _____ _____ _____ Trespasser; _____ _____ Rocketship; _____ Balls of Fire; _____ Bird Gets the Worm; _____ Goblin; _____-o-saurus; Adriana's Valor; Advantageous Proclamation; Aerialephant; Ambassador Blorpityblorpboop; Amulet of Quoz; Ancestral Recall; Arcum's Astrolabe; Assemble the Rank and Vile; Baaallerina; Backup Plan; Balance; Bazaar of Baghdad; Bioluminary; Black Lotus; Brago's Favor; Bronze Tablet; Carnival Carnivore; Channel; Chaos Orb; Chicken Troupe; Clandestine Chameleon; Cleanse; Coming Attraction; Command Performance; Complaints Clerk; Contract from Below; Crusade; Darkpact; Deadbeat Attendant; Deathrite Shaman; Dee Kay, Finder of the Lost; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dig Through Time; Discourtesy Clerk; Done for the Day; Double Stroke; Draconian Gate-Bot; Dreadhorde Arcanist; Earthcraft; Echoing Boon; Emissary's Ploy; Expressive Iteration; Falling Star; Fastbond; Fight the _____ Fight; Finishing Move; Flash; Frantic Search; Gitaxian Probe; Glitterflitter; Goblin Recruiter; Grief; Gush; Hermit Druid; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Imperial Seal; Imprison; Incendiary Dissent; Invoke Prejudice; Iterative Analysis; Jeweled Bird; Jihad; Last Voyage of the _____; Library of Alexandria; Line Cutter; Lineprancers; Lurrus of the Dream-Den; Make a _____ Splash; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mental Misstep; Mind Twist; Minotaur de Force; Mishra's Workshop; Monitor Monitor; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Muzzio's Preparations; Myra the Magnificent; Mystical Tutor; Natural Unity; Necropotence; Oath of Druids; Oko, Thief of Crowns; Park Bleater; Petting Zookeeper; Pin Collection; Power Play; Pradesh Gypsies; Prize Wall; Proficient Pyrodancer; Psychic Frog; Quick Fixer; Rad Rascal; Ragavan, Nimble Pilferer; Rebirth; Ride Guide; Robo-Piñata; Roxi, Publicist to the Stars; Scampire; Seasoned Buttoneer; Secret Summoning; Secrets of Paradise; Sensei's Divining Top; Sentinel Dispatch; Shahrazad; Skullclamp; Sol Ring; Soul Swindler; Sovereign's Realm; Sowing Mycospawn; Spinnerette, Arachnobat; Squirrel Squatters; Step Right Up; Stiltstrider; Stone-Throwing Devils; Strip Mine; Summoner's Bond; Survival of the Fittest; Sword-Swallowing Seraph; Tempest Efreet; The Most Dangerous Gamer; Ticketomaton; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Treasure Cruise; Troll of Khazad-dûm; Tusk and Whiskers; Underworld Breach; Unexpected Potential; Vampiric Tutor; Vexing Bauble; Weight Advantage; Wheel of Fortune; White Plume Adventurer; Wicker Picker; Windfall; Wizards of the _____; Wolf in _____ Clothing; Worldknit; Wrenn and Six; Yawgmoth's Bargain; Yawgmoth's Will; Zirda, the Dawnwaker
+Additional:Aisha of Sparks and Smoke; Amy Rose; Arden Angel; Arvinox, the Mind Flail; Baldin, Century Herdmaster; Bjorna, Nightfall Alchemist; Black Panther, Wakandan King; Blanka, Ferocious Friend; Bohn, Beguiling Balladeer; Captain America, First Avenger; Casal, Lurkwood Pathfinder; Cecily, Haunted Mage; Chief Jim Hopper; Chun-Li, Countless Kicks; Daryl, Hunter of Walkers; Deadpool, Trading Card; Dhalsim, Pliable Pacifist; Doric, Nature's Warden; Dr. Eggman; Dustin, Gadget Genius; E. Honda, Sumo Champion; Edgin, Larcenous Lutenist; Eleven, the Mage; Elmar, Ulvenwald Informant; Enkira, Hostile Scavenger; Evin, Waterdeep Opportunist; Forge, Neverwinter Charlatan; Gisa's Favorite Shovel; Glenn, the Voice of Calm; Gregor, Shrewd Magistrate; Greymond, Avacyn's Stalwart; Guile, Sonic Soldier; Hansk, Slayer Zealot; Hargilde, Kindly Runechanter; Havengul Laboratory; Hawkins National Laboratory; Holga, Relentless Rager; Immard, the Stormcleaver; Iron Man, Titan of Innovation; Jurin, Leading the Charge; Ken, Burning Brawler; Knuckles the Echidna; Lara Croft, Tomb Raider; Lucas, the Sharpshooter; Lucille; Maarika, Brutal Gladiator; Malik, Grim Manipulator; Mathise, Surge Channeler; Max, the Daredevil; Michonne, Ruthless Survivor; Mike, the Dungeon Master; Miles "Tails" Prower; Mind Flayer, the Shadow; Negan, the Cold-Blooded; Othelm, Sigardian Outcast; Rashel, Fist of Torm; Rick, Steadfast Leader; Rose Noble; Ryu, World Warrior; Shadow the Hedgehog; Simon, Wild Magic Sorcerer; Sonic the Hedgehog; Sophina, Spearsage Deserter; Storm, Force of Nature; Super State; Tadeas, Juniper Ascendant; The Celestial Toymaker; The Fifteenth Doctor; The Fourteenth Doctor; The Howling Abomination; The Meep; Themberchaud; Vikya, Scorching Stalwart; Wernog, Rider's Chaplain; Will the Wise; Wolverine, Best There Is; Xenk, Paladin Unbroken; Zangief, the Red Cyclone; Zethi, Arcane Blademaster
diff --git a/forge-gui/res/formats/Archived/Modern/2025-09-26.txt b/forge-gui/res/formats/Archived/Modern/2025-09-26.txt
new file mode 100644
index 00000000000..977284c8023
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Modern/2025-09-26.txt
@@ -0,0 +1,7 @@
+[format]
+Name:Modern (SPM)
+Type:Archived
+Subtype:Modern
+Effective:2025-09-26
+Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, DPA, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, MMA, M14, THS, BNG, JOU, MD1, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, MM3, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, GK1, G18, RNA, GK2, WAR, MH1, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, MH2, AFR, MID, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, LTR, WOE, LCI, MKM, OTJ, BIG, MH3, ACR, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
+Banned:Amped Raptor; Ancient Den; Arcum's Astrolabe; Birthing Pod; Blazing Shoal; Bridge from Below; Chrome Mox; Cloudpost; Dark Depths; Deathrite Shaman; Dig Through Time; Dread Return; Eye of Ugin; Field of the Dead; Fury; Gitaxian Probe; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Grief; Hogaak, Arisen Necropolis; Hypergenesis; Jegantha, the Wellspring; Krark-Clan Ironworks; Lurrus of the Dream-Den; Mental Misstep; Mycosynth Lattice; Mystic Sanctuary; Nadu, Winged Wisdom; Oko, Thief of Crowns; Once Upon a Time; Ponder; Punishing Fire; Rite of Flame; Seat of the Synod; Second Sunrise; Seething Song; Sensei's Divining Top; Simian Spirit Guide; Skullclamp; Summer Bloom; The One Ring; Tibalt's Trickery; Treasure Cruise; Tree of Tales; Umezawa's Jitte; Underworld Breach; Up the Beanstalk; Uro, Titan of Nature's Wrath; Vault of Whispers; Violent Outburst; Yorion, Sky Nomad
diff --git a/forge-gui/res/formats/Archived/Pioneer/2025-09-26.txt b/forge-gui/res/formats/Archived/Pioneer/2025-09-26.txt
new file mode 100644
index 00000000000..fa203c5c750
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Pioneer/2025-09-26.txt
@@ -0,0 +1,7 @@
+[format]
+Name:Pioneer (SPM)
+Type:Archived
+Subtype:Pioneer
+Effective:2025-09-26
+Sets:RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, Q06, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
+Banned:Amalia Benavides Aguirre; Balustrade Spy; Bloodstained Mire; Expressive Iteration; Felidar Guardian; Field of the Dead; Flooded Strand; Geological Appraiser; Inverter of Truth; Jegantha, the Wellspring; Karn, the Great Creator; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Polluted Delta; Sorin, Imperious Bloodlord; Teferi, Time Raveler; Undercity Informer; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Walking Ballista; Wilderness Reclamation; Windswept Heath; Winota, Joiner of Forces; Wooded Foothills
diff --git a/forge-gui/res/formats/Archived/Standard/2025-09-26.txt b/forge-gui/res/formats/Archived/Standard/2025-09-26.txt
new file mode 100644
index 00000000000..b81331182a3
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Standard/2025-09-26.txt
@@ -0,0 +1,7 @@
+[format]
+Name:Standard (SPM)
+Type:Archived
+Subtype:Standard
+Effective:2025-09-26
+Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
+Banned:Abuelo's Awakening; Cori-Steel Cutter; Heartfire Hero; Hopeless Nightmare; Monstrous Rage; This Town Ain't Big Enough; Up the Beanstalk
diff --git a/forge-gui/res/formats/Archived/Timeless/2025-09-23.txt b/forge-gui/res/formats/Archived/Timeless/2025-09-23.txt
new file mode 100644
index 00000000000..d0c0a1053d4
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Timeless/2025-09-23.txt
@@ -0,0 +1,8 @@
+[format]
+Name:Timeless (OM1)
+Type:Archived
+Subtype:Vintage
+Effective:2025-09-23
+Sets:KTK, XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4, STX, STA, HA5, AFR, J21, MID, VOW, YMID, NEO, YNEO, SNC, YSNC, HBG, HA6, EA1, DMU, YDMU, BRO, BRR, YBRO, EA2, ONE, YONE, SIR, SIS, MOM, MUL, MAT, LTR, HA7, EA3, WOE, WOT, YWOE, LCI, YLCI, MKM, YMKM, OTJ, OTP, BIG, YOTJ, MH3, BLB, YBLB, DSK, YDSK, FDN, J25, PIO, DFT, YDFT, TDM, YTDM, PA1, FIN, FCA, EOE, EOS, YEOE, AA1, AA2, OM1, OMB, AA3, AA4
+Restricted:Channel; Demonic Tutor; Tibalt's Trickery
+Additional:Admiral Brass, Unsinkable; Burden of Guilt; Clavileño, First of the Blessed; Crashing Footfalls; Crumbling Vestige; Desert; Desertion; Dismember; Duskmantle, House of Shadow; Endurance; Enlisted Wurm; Evolutionary Leap; Fabricate; Fury; Gamble; Ghostly Prison; Gonti, Canny Acquisitor; Goro-Goro and Satoru; Grief; Ixidor, Reality Sculptor; Katilda and Lier; Kuldotha Rebirth; Leonin Relic-Warder; Magmaw; Mass Hysteria; Metalspinner's Puzzleknot; Mistveil Plains; Molten Psyche; Monologue Tax; Mystery Key; Mystic Snake; Notion Thief; Nyx Weaver; Olivia, Opulent Outlaw; Pantlaza, Sun-Favored; Persist; Port Razer; Possibility Storm; Prismatic Ending; Prismatic Vista; Putrid Warrior; Shard of Broken Glass; Show and Tell; Slimefoot and Squee; Smuggler's Copter; Solitude; Spell Snare; Stella Lee, Wild Card; Stoneforge Mystic; Subtlety; Timeless Dragon; Treacherous Terrain; Victimize; Xolatoyac, the Smiling Flood; Yuma, Proud Protector
diff --git a/forge-gui/res/formats/Archived/Vintage/2025-09-26.txt b/forge-gui/res/formats/Archived/Vintage/2025-09-26.txt
new file mode 100644
index 00000000000..7c46b50af15
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Vintage/2025-09-26.txt
@@ -0,0 +1,9 @@
+[format]
+Name:Vintage (SPM)
+Type:Archived
+Subtype:Vintage
+Effective:2025-09-26
+Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS, SPM, SPE, MAR
+Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Chalice of the Void; Channel; Demonic Consultation; Demonic Tutor; Dig Through Time; Flash; Gitaxian Probe; Golgari Grave-Troll; Gush; Imperial Seal; Karn, the Great Creator; Library of Alexandria; Lion's Eye Diamond; Lodestone Golem; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mental Misstep; Merchant Scroll; Mind's Desire; Monastery Mentor; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystic Forge; Mystical Tutor; Narset, Parter of Veils; Necropotence; Sol Ring; Strip Mine; Thorn of Amethyst; Time Vault; Time Walk; Timetwister; Tinker; Tolarian Academy; Treasure Cruise; Trinisphere; Urza's Saga; Vampiric Tutor; Vexing Bauble; Wheel of Fortune; Windfall; Yawgmoth's Will
+Banned:"Lifetime" Pass Holder; _____ _____ _____ Trespasser; _____ _____ Rocketship; _____ Balls of Fire; _____ Bird Gets the Worm; _____ Goblin; _____-o-saurus; Adriana's Valor; Advantageous Proclamation; Aerialephant; Ambassador Blorpityblorpboop; Amulet of Quoz; Assemble the Rank and Vile; Baaallerina; Backup Plan; Bioluminary; Brago's Favor; Bronze Tablet; Carnival Carnivore; Chaos Orb; Chicken Troupe; Clandestine Chameleon; Cleanse; Coming Attraction; Command Performance; Complaints Clerk; Contract from Below; Crusade; Darkpact; Deadbeat Attendant; Dee Kay, Finder of the Lost; Demonic Attorney; Discourtesy Clerk; Done for the Day; Double Stroke; Draconian Gate-Bot; Echoing Boon; Emissary's Ploy; Falling Star; Fight the _____ Fight; Finishing Move; Glitterflitter; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Imprison; Incendiary Dissent; Invoke Prejudice; Iterative Analysis; Jeweled Bird; Jihad; Last Voyage of the _____; Line Cutter; Lineprancers; Make a _____ Splash; Minotaur de Force; Monitor Monitor; Muzzio's Preparations; Myra the Magnificent; Natural Unity; Park Bleater; Petting Zookeeper; Pin Collection; Power Play; Pradesh Gypsies; Prize Wall; Proficient Pyrodancer; Quick Fixer; Rad Rascal; Rebirth; Ride Guide; Robo-Piñata; Roxi, Publicist to the Stars; Scampire; Seasoned Buttoneer; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Shahrazad; Soul Swindler; Sovereign's Realm; Spinnerette, Arachnobat; Squirrel Squatters; Step Right Up; Stiltstrider; Stone-Throwing Devils; Summoner's Bond; Sword-Swallowing Seraph; Tempest Efreet; The Most Dangerous Gamer; Ticketomaton; Timmerian Fiends; Tusk and Whiskers; Unexpected Potential; Weight Advantage; Wicker Picker; Wizards of the _____; Wolf in _____ Clothing; Worldknit
+Additional:Aisha of Sparks and Smoke; Amy Rose; Arden Angel; Arvinox, the Mind Flail; Baldin, Century Herdmaster; Bjorna, Nightfall Alchemist; Black Panther, Wakandan King; Blanka, Ferocious Friend; Bohn, Beguiling Balladeer; Captain America, First Avenger; Casal, Lurkwood Pathfinder; Cecily, Haunted Mage; Chief Jim Hopper; Chun-Li, Countless Kicks; Daryl, Hunter of Walkers; Deadpool, Trading Card; Dhalsim, Pliable Pacifist; Doric, Nature's Warden; Dr. Eggman; Dustin, Gadget Genius; E. Honda, Sumo Champion; Edgin, Larcenous Lutenist; Eleven, the Mage; Elmar, Ulvenwald Informant; Enkira, Hostile Scavenger; Evin, Waterdeep Opportunist; Forge, Neverwinter Charlatan; Gisa's Favorite Shovel; Glenn, the Voice of Calm; Gregor, Shrewd Magistrate; Greymond, Avacyn's Stalwart; Guile, Sonic Soldier; Hansk, Slayer Zealot; Hargilde, Kindly Runechanter; Havengul Laboratory; Hawkins National Laboratory; Holga, Relentless Rager; Immard, the Stormcleaver; Iron Man, Titan of Innovation; Jurin, Leading the Charge; Ken, Burning Brawler; Knuckles the Echidna; Lara Croft, Tomb Raider; Lucas, the Sharpshooter; Lucille; Maarika, Brutal Gladiator; Malik, Grim Manipulator; Mathise, Surge Channeler; Max, the Daredevil; Michonne, Ruthless Survivor; Mike, the Dungeon Master; Miles "Tails" Prower; Mind Flayer, the Shadow; Negan, the Cold-Blooded; Othelm, Sigardian Outcast; Rashel, Fist of Torm; Rick, Steadfast Leader; Rose Noble; Ryu, World Warrior; Shadow the Hedgehog; Simon, Wild Magic Sorcerer; Sonic the Hedgehog; Sophina, Spearsage Deserter; Storm, Force of Nature; Super State; Tadeas, Juniper Ascendant; The Celestial Toymaker; The Fifteenth Doctor; The Fourteenth Doctor; The Howling Abomination; The Meep; Themberchaud; Vikya, Scorching Stalwart; Wernog, Rider's Chaplain; Will the Wise; Wolverine, Best There Is; Xenk, Paladin Unbroken; Zangief, the Red Cyclone; Zethi, Arcane Blademaster
diff --git a/forge-gui/res/formats/Casual/Brawl.txt b/forge-gui/res/formats/Casual/Brawl.txt
index 2b8cc075d14..c23a9d3b4c9 100644
--- a/forge-gui/res/formats/Casual/Brawl.txt
+++ b/forge-gui/res/formats/Casual/Brawl.txt
@@ -3,5 +3,5 @@ Name:Brawl
 Order:101
 Type:Casual
 Subtype:Commander
-Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE
+Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, OM1
 Additional:Arcane Signet; Command Tower
diff --git a/forge-gui/res/formats/Sanctioned/Historic.txt b/forge-gui/res/formats/Sanctioned/Historic.txt
index a0fec0240f0..dac663817b9 100644
--- a/forge-gui/res/formats/Sanctioned/Historic.txt
+++ b/forge-gui/res/formats/Sanctioned/Historic.txt
@@ -4,6 +4,6 @@ Type:Digital
 Subtype:Arena
 Effective:2019-11-21
 Order:142
-Sets:KTK, XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4, STX, STA, HA5, AFR, J21, MID, VOW, YMID, NEO, YNEO, SNC, YSNC, HBG, HA6, EA1, DMU, YDMU, BRO, BRR, YBRO, EA2, ONE, YONE, SIR, SIS, MOM, MUL, MAT, LTR, HA7, EA3, WOE, WOT, YWOE, LCI, YLCI, MKM, YMKM, OTJ, OTP, BIG, YOTJ, MH3, BLB, YBLB, DSK, YDSK, FDN, J25, PIO, DFT, YDFT, TDM, YTDM, PA1, FIN, FCA, EOE, EOS, YEOE, AA1, AA2
+Sets:KTK, XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4, STX, STA, HA5, AFR, J21, MID, VOW, YMID, NEO, YNEO, SNC, YSNC, HBG, HA6, EA1, DMU, YDMU, BRO, BRR, YBRO, EA2, ONE, YONE, SIR, SIS, MOM, MUL, MAT, LTR, HA7, EA3, WOE, WOT, YWOE, LCI, YLCI, MKM, YMKM, OTJ, OTP, BIG, YOTJ, MH3, BLB, YBLB, DSK, YDSK, FDN, J25, PIO, DFT, YDFT, TDM, YTDM, PA1, FIN, FCA, EOE, EOS, YEOE, AA1, AA2, OM1, OMB, AA3, AA4
 Banned:Agent of Treachery; Ancient Tomb; Arid Mesa; Blood Moon; Bloodstained Mire; Brainstorm; Channel; Chrome Mox; Commandeer; Dark Ritual; Demonic Tutor; Endurance; Field of the Dead; Flare of Cultivation; Flare of Denial; Flare of Duplication; Flare of Fortitude; Flare of Malice; Flooded Strand; Force of Vigor; Fury; Grief; Harbinger of the Seas; Intruder Alarm; Land Tax; Lightning Bolt; Magus of the Moon; Mana Drain; Marsh Flats; Memory Lapse; Mishra's Bauble; Misty Rainforest; Mox Opal; Natural Order; Necropotence; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Polluted Delta; Ragavan, Nimble Pilferer; Reanimate; Scalding Tarn; Show and Tell; Sneak Attack; Solitude; Spreading Seas; Strip Mine; Subtlety; Swords to Plowshares; Temporal Manipulation; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Verdant Catacombs; Wilderness Reclamation; Windswept Heath; Winter Moon; Wooded Foothills
-Additional:Admiral Brass, Unsinkable; Burden of Guilt; Clavileño, First of the Blessed; Crashing Footfalls; Desert; Desertion; Dismember; Duskmantle, House of Shadow; Enlisted Wurm; Evolutionary Leap; Fabricate; Gamble; Ghostly Prison; Gonti, Canny Acquisitor; Goro-Goro and Satoru; Ixidor, Reality Sculptor; Katilda and Lier; Kuldotha Rebirth; Leonin Relic-Warder; Magmaw; Mass Hysteria; Metalspinner's Puzzleknot; Mistveil Plains; Molten Psyche; Monologue Tax; Mystery Key; Mystic Snake; Notion Thief; Nyx Weaver; Olivia, Opulent Outlaw; Pantlaza, Sun-Favored; Persist; Port Razer; Possibility Storm; Prismatic Ending; Prismatic Vista; Putrid Warrior; Shard of Broken Glass; Slimefoot and Squee; Smuggler's Copter; Spell Snare; Stella Lee, Wild Card; Stoneforge Mystic; Timeless Dragon; Treacherous Terrain; Victimize; Xolatoyac, the Smiling Flood; Yuma, Proud Protector
+Additional:Admiral Brass, Unsinkable; Burden of Guilt; Clavileño, First of the Blessed; Crashing Footfalls; Crumbling Vestige; Desert; Desertion; Dismember; Duskmantle, House of Shadow; Enlisted Wurm; Evolutionary Leap; Fabricate; Gamble; Ghostly Prison; Gonti, Canny Acquisitor; Goro-Goro and Satoru; Ixidor, Reality Sculptor; Katilda and Lier; Kuldotha Rebirth; Leonin Relic-Warder; Magmaw; Mass Hysteria; Metalspinner's Puzzleknot; Mistveil Plains; Molten Psyche; Monologue Tax; Mystery Key; Mystic Snake; Notion Thief; Nyx Weaver; Olivia, Opulent Outlaw; Pantlaza, Sun-Favored; Persist; Port Razer; Possibility Storm; Prismatic Ending; Prismatic Vista; Putrid Warrior; Shard of Broken Glass; Slimefoot and Squee; Smuggler's Copter; Spell Snare; Stella Lee, Wild Card; Stoneforge Mystic; Timeless Dragon; Treacherous Terrain; Victimize; Xolatoyac, the Smiling Flood; Yuma, Proud Protector
diff --git a/forge-gui/res/formats/Sanctioned/Legacy.txt b/forge-gui/res/formats/Sanctioned/Legacy.txt
index 25e157afc5e..8cc75e8a478 100644
--- a/forge-gui/res/formats/Sanctioned/Legacy.txt
+++ b/forge-gui/res/formats/Sanctioned/Legacy.txt
@@ -3,5 +3,5 @@ Name:Legacy
 Order:105
 Subtype:Legacy
 Type:Sanctioned
-Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, SLD, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, SLX, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, SPG, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS
+Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, SLD, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, SLX, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, SPG, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS, SPM, SPE, MAR
 Banned:"Lifetime" Pass Holder; _____ _____ _____ Trespasser; _____ _____ Rocketship; _____ Balls of Fire; _____ Bird Gets the Worm; _____ Goblin; _____-o-saurus; Adriana's Valor; Advantageous Proclamation; Aerialephant; Ambassador Blorpityblorpboop; Amulet of Quoz; Ancestral Recall; Arcum's Astrolabe; Assemble the Rank and Vile; Baaallerina; Backup Plan; Balance; Bazaar of Baghdad; Bioluminary; Black Lotus; Brago's Favor; Bronze Tablet; Carnival Carnivore; Channel; Chaos Orb; Chicken Troupe; Clandestine Chameleon; Cleanse; Coming Attraction; Command Performance; Complaints Clerk; Contract from Below; Crusade; Darkpact; Deadbeat Attendant; Deathrite Shaman; Dee Kay, Finder of the Lost; Demonic Attorney; Demonic Consultation; Demonic Tutor; Dig Through Time; Discourtesy Clerk; Done for the Day; Double Stroke; Draconian Gate-Bot; Dreadhorde Arcanist; Earthcraft; Echoing Boon; Emissary's Ploy; Expressive Iteration; Falling Star; Fastbond; Fight the _____ Fight; Finishing Move; Flash; Frantic Search; Gitaxian Probe; Glitterflitter; Goblin Recruiter; Grief; Gush; Hermit Druid; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Imperial Seal; Imprison; Incendiary Dissent; Invoke Prejudice; Iterative Analysis; Jeweled Bird; Jihad; Last Voyage of the _____; Library of Alexandria; Line Cutter; Lineprancers; Lurrus of the Dream-Den; Make a _____ Splash; Mana Crypt; Mana Drain; Mana Vault; Memory Jar; Mental Misstep; Mind Twist; Minotaur de Force; Mishra's Workshop; Monitor Monitor; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Muzzio's Preparations; Myra the Magnificent; Mystical Tutor; Natural Unity; Necropotence; Oath of Druids; Oko, Thief of Crowns; Park Bleater; Petting Zookeeper; Pin Collection; Power Play; Pradesh Gypsies; Prize Wall; Proficient Pyrodancer; Psychic Frog; Quick Fixer; Rad Rascal; Ragavan, Nimble Pilferer; Rebirth; Ride Guide; Robo-Piñata; Roxi, Publicist to the Stars; Scampire; Seasoned Buttoneer; Secret Summoning; Secrets of Paradise; Sensei's Divining Top; Sentinel Dispatch; Shahrazad; Skullclamp; Sol Ring; Soul Swindler; Sovereign's Realm; Sowing Mycospawn; Spinnerette, Arachnobat; Squirrel Squatters; Step Right Up; Stiltstrider; Stone-Throwing Devils; Strip Mine; Summoner's Bond; Survival of the Fittest; Sword-Swallowing Seraph; Tempest Efreet; The Most Dangerous Gamer; Ticketomaton; Time Vault; Time Walk; Timetwister; Timmerian Fiends; Tinker; Tolarian Academy; Treasure Cruise; Troll of Khazad-dûm; Tusk and Whiskers; Underworld Breach; Unexpected Potential; Vampiric Tutor; Vexing Bauble; Weight Advantage; Wheel of Fortune; White Plume Adventurer; Wicker Picker; Windfall; Wizards of the _____; Wolf in _____ Clothing; Worldknit; Wrenn and Six; Yawgmoth's Bargain; Yawgmoth's Will; Zirda, the Dawnwaker
diff --git a/forge-gui/res/formats/Sanctioned/Modern.txt b/forge-gui/res/formats/Sanctioned/Modern.txt
index dac6401ca38..737f7fefea5 100644
--- a/forge-gui/res/formats/Sanctioned/Modern.txt
+++ b/forge-gui/res/formats/Sanctioned/Modern.txt
@@ -3,5 +3,5 @@ Name:Modern
 Order:103
 Subtype:Modern
 Type:Sanctioned
-Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, DPA, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, MMA, M14, THS, BNG, JOU, MD1, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, MM3, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, GK1, G18, RNA, GK2, WAR, MH1, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, MH2, AFR, MID, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, LTR, WOE, LCI, MKM, OTJ, BIG, MH3, ACR, BLB, DSK, FDN, DFT, TDM, FIN, EOE
+Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, DPA, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, MMA, M14, THS, BNG, JOU, MD1, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, MM3, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, GK1, G18, RNA, GK2, WAR, MH1, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, MH2, AFR, MID, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, LTR, WOE, LCI, MKM, OTJ, BIG, MH3, ACR, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
 Banned:Amped Raptor; Ancient Den; Arcum's Astrolabe; Birthing Pod; Blazing Shoal; Bridge from Below; Chrome Mox; Cloudpost; Dark Depths; Deathrite Shaman; Dig Through Time; Dread Return; Eye of Ugin; Field of the Dead; Fury; Gitaxian Probe; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Grief; Hogaak, Arisen Necropolis; Hypergenesis; Jegantha, the Wellspring; Krark-Clan Ironworks; Lurrus of the Dream-Den; Mental Misstep; Mycosynth Lattice; Mystic Sanctuary; Nadu, Winged Wisdom; Oko, Thief of Crowns; Once Upon a Time; Ponder; Punishing Fire; Rite of Flame; Seat of the Synod; Second Sunrise; Seething Song; Sensei's Divining Top; Simian Spirit Guide; Skullclamp; Summer Bloom; The One Ring; Tibalt's Trickery; Treasure Cruise; Tree of Tales; Umezawa's Jitte; Underworld Breach; Up the Beanstalk; Uro, Titan of Nature's Wrath; Vault of Whispers; Violent Outburst; Yorion, Sky Nomad
diff --git a/forge-gui/res/formats/Sanctioned/Pioneer.txt b/forge-gui/res/formats/Sanctioned/Pioneer.txt
index d6bb093baab..f36089d0431 100644
--- a/forge-gui/res/formats/Sanctioned/Pioneer.txt
+++ b/forge-gui/res/formats/Sanctioned/Pioneer.txt
@@ -3,5 +3,5 @@ Name:Pioneer
 Order:102
 Subtype:Pioneer
 Type:Sanctioned
-Sets:RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, Q06, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE
+Sets:RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, ORI, BFZ, OGW, SOI, W16, EMN, KLD, AER, W17, AKH, HOU, XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, Q06, VOW, DBL, NEO, SNC, DMU, BRO, ONE, MOM, MAT, WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
 Banned:Amalia Benavides Aguirre; Balustrade Spy; Bloodstained Mire; Expressive Iteration; Felidar Guardian; Field of the Dead; Flooded Strand; Geological Appraiser; Inverter of Truth; Jegantha, the Wellspring; Karn, the Great Creator; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Polluted Delta; Sorin, Imperious Bloodlord; Teferi, Time Raveler; Undercity Informer; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Walking Ballista; Wilderness Reclamation; Windswept Heath; Winota, Joiner of Forces; Wooded Foothills
diff --git a/forge-gui/res/formats/Sanctioned/Standard.txt b/forge-gui/res/formats/Sanctioned/Standard.txt
index 9f7918298c6..131130e5cfa 100644
--- a/forge-gui/res/formats/Sanctioned/Standard.txt
+++ b/forge-gui/res/formats/Sanctioned/Standard.txt
@@ -3,5 +3,5 @@ Name:Standard
 Order:101
 Subtype:Standard
 Type:Sanctioned
-Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE
+Sets:WOE, LCI, MKM, OTJ, BIG, BLB, DSK, FDN, DFT, TDM, FIN, EOE, SPM
 Banned:Abuelo's Awakening; Cori-Steel Cutter; Heartfire Hero; Hopeless Nightmare; Monstrous Rage; This Town Ain't Big Enough; Up the Beanstalk
diff --git a/forge-gui/res/formats/Sanctioned/Vintage.txt b/forge-gui/res/formats/Sanctioned/Vintage.txt
index 7b6a3472e8c..cc1f91cde21 100644
--- a/forge-gui/res/formats/Sanctioned/Vintage.txt
+++ b/forge-gui/res/formats/Sanctioned/Vintage.txt
@@ -3,6 +3,6 @@ Name:Vintage
 Order:104
 Subtype:Vintage
 Type:Sanctioned
-Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, SLD, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, SLX, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, SPG, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS
+Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, PHPR, FEM, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, POR, WTH, TMP, STH, EXO, PO2, USG, ATH, ULG, 6ED, UDS, S99, PTK, MMQ, BRB, NMS, S00, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, MED, LRW, DD1, MOR, SHM, EVE, DRB, ME2, ALA, DD2, CFX, DDC, ARB, M10, TD0, FVE, HOP, ME3, ZEN, DDD, PDS, WWK, DDE, ROE, DPA, ARC, M11, FVR, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, FVL, DDH, ISD, PD3, DKA, DDI, AVR, PC2, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK, C14, DVD, EVG, GVL, JVC, FRF, UGF, DDO, DTK, TPR, MM2, ORI, V15, DDP, BFZ, EXP, C15, PZ1, OGW, DDQ, SOI, W16, EMA, EMN, V16, CN2, DDR, KLD, MPS_KLD, C16, PZ2, PCA, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, E01, HOU, C17, XLN, DDT, IMA, V17, E02, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR, MH1, SS2, M20, C19, ELD, MB1, GN2, SLD, THB, IKO, C20, SS3, M21, JMP, 2XM, ZNR, ZNE, ZNC, CMR, CC1, KHM, KHC, TSR, STX, STA, C21, MH2, H1R, AFR, AFC, MID, MIC, Q06, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, SLX, CLB, 2X2, DMU, DMC, 40K, UNF, GN3, BRO, BRC, BRR, BOT, J22, SCD, DMR, ONE, ONC, MOM, MOC, MUL, MAT, LTR, LTC, CMM, WOE, WOC, WOT, WHO, LCI, LCC, REX, SPG, RVR, MKM, MKC, CLU, PIP, OTJ, OTC, OTP, BIG, MH3, M3C, H2R, ACR, BLB, BLC, MB2, DSK, DSC, FDN, FDC, J25, INR, DFT, DRC, TDM, TDC, FIN, FIC, FCA, EOE, EOC, EOS, SPM, SPE, MAR
 Restricted:Ancestral Recall; Balance; Black Lotus; Brainstorm; Chalice of the Void; Channel; Demonic Consultation; Demonic Tutor; Dig Through Time; Flash; Gitaxian Probe; Golgari Grave-Troll; Gush; Imperial Seal; Karn, the Great Creator; Library of Alexandria; Lion's Eye Diamond; Lodestone Golem; Lotus Petal; Mana Crypt; Mana Vault; Memory Jar; Mental Misstep; Merchant Scroll; Mind's Desire; Monastery Mentor; Mox Emerald; Mox Jet; Mox Pearl; Mox Ruby; Mox Sapphire; Mystic Forge; Mystical Tutor; Narset, Parter of Veils; Necropotence; Sol Ring; Strip Mine; Thorn of Amethyst; Time Vault; Time Walk; Timetwister; Tinker; Tolarian Academy; Treasure Cruise; Trinisphere; Urza's Saga; Vampiric Tutor; Vexing Bauble; Wheel of Fortune; Windfall; Yawgmoth's Will
 Banned:"Lifetime" Pass Holder; _____ _____ _____ Trespasser; _____ _____ Rocketship; _____ Balls of Fire; _____ Bird Gets the Worm; _____ Goblin; _____-o-saurus; Adriana's Valor; Advantageous Proclamation; Aerialephant; Ambassador Blorpityblorpboop; Amulet of Quoz; Assemble the Rank and Vile; Baaallerina; Backup Plan; Bioluminary; Brago's Favor; Bronze Tablet; Carnival Carnivore; Chaos Orb; Chicken Troupe; Clandestine Chameleon; Cleanse; Coming Attraction; Command Performance; Complaints Clerk; Contract from Below; Crusade; Darkpact; Deadbeat Attendant; Dee Kay, Finder of the Lost; Demonic Attorney; Discourtesy Clerk; Done for the Day; Double Stroke; Draconian Gate-Bot; Echoing Boon; Emissary's Ploy; Falling Star; Fight the _____ Fight; Finishing Move; Glitterflitter; Hired Heist; Hold the Perimeter; Hymn of the Wilds; Immediate Action; Imprison; Incendiary Dissent; Invoke Prejudice; Iterative Analysis; Jeweled Bird; Jihad; Last Voyage of the _____; Line Cutter; Lineprancers; Make a _____ Splash; Minotaur de Force; Monitor Monitor; Muzzio's Preparations; Myra the Magnificent; Natural Unity; Park Bleater; Petting Zookeeper; Pin Collection; Power Play; Pradesh Gypsies; Prize Wall; Proficient Pyrodancer; Quick Fixer; Rad Rascal; Rebirth; Ride Guide; Robo-Piñata; Roxi, Publicist to the Stars; Scampire; Seasoned Buttoneer; Secret Summoning; Secrets of Paradise; Sentinel Dispatch; Shahrazad; Soul Swindler; Sovereign's Realm; Spinnerette, Arachnobat; Squirrel Squatters; Step Right Up; Stiltstrider; Stone-Throwing Devils; Summoner's Bond; Sword-Swallowing Seraph; Tempest Efreet; The Most Dangerous Gamer; Ticketomaton; Timmerian Fiends; Tusk and Whiskers; Unexpected Potential; Weight Advantage; Wicker Picker; Wizards of the _____; Wolf in _____ Clothing; Worldknit
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index e7c02dccd8b..56cbd2770a5 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -2838,6 +2838,7 @@ lblDecklistTitle=Deckliste
 lblSummaryStats=Gesamt-Statistik
 lblDeckSection=Bereich
 lblNewDeckCheckbox=Erzeuge ein neues Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importiere Karten
 lblCreateNewCmd=Neues Deck
 lblErrNotAllowedCard=Set ist nicht erlaubt in {0}
@@ -2845,6 +2846,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set verträgt sich nicht mit der Erscheinungsdatum-Option
 lblErrUnsupportedCard=Ist nicht erlaubt in {0}
 lblWarnUnknownCardMsg=Unbekannte oder in Forge nicht unterstützte Karte
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Aktueller {0}-Bereich enthält {1} mögliche Commander-Karten: {2}
 lblWarnCommandersInSideExtra=Bitte prüfen und, falls nötig, min. eine Karte in den Commander-Bereich verschieben.
 lblWarnDeckSectionNotAllowedInEditor=In {1} ist der {0}-Bereich nicht erlaubt. 
@@ -2936,6 +2938,7 @@ lblCardImportWarning=\nWarnung: Das Deck {0} wird umbenannt in {1}.
 lblConfirmCreateNewDeck=Du bist dabei das neue Deck {0} zu erzeugen. {1}\n\nWillst du fortfahren?\n\n Hinweis: \
   Bitte denk daran den "Save"-Knopf im Deck-Editor zu klicken, um das neue Deck dem Deck-Katalog hinzuzufügen!
 lblNewDeckWarning=\nWarnung: Alle ungesicherten Änderungen am aktuellen Deck {0} werden verlorengehen.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importiere Karten in aktuelles Deck
 lblNewDeckDialogTitle=Erzeuge neues Deck
 #FNetOverlay.java
@@ -3542,4 +3545,7 @@ cbPreloadCustomDrafts=Benutzerdefinierte Entwürfe vorladen
 nlPreloadCustomDrafts=Wenn aktiviert, werden die benutzerdefinierten Entwurfsdateien beim Start vorab geladen (Forge benötigt beim Parsen von Entwurfsdateien eine längere Startzeit).
 lblRepairCost=Reparaturkosten: {0} ?
 lblRepair=Reparieren
-lblDataMigrationMsg=Datenmigration abgeschlossen!\nBitte überprüfen Sie Ihr Inventar und Ihre Ausrüstung.\nBitte erstellen Sie an dieser Stelle eine Sicherungskopie Ihrer Spielstände, da der aktuelle Spielstand noch nicht überschrieben wird, wenn Sie im Menü „Szene“ den Punkt „Daten“ -> „Sicherungskopie“ verwenden.
\ No newline at end of file
+lblDataMigrationMsg=Datenmigration abgeschlossen!\nBitte überprüfen Sie Ihr Inventar und Ihre Ausrüstung.\nBitte erstellen Sie an dieser Stelle eine Sicherungskopie Ihrer Spielstände, da der aktuelle Spielstand noch nicht überschrieben wird, wenn Sie im Menü „Szene“ den Punkt „Daten“ -> „Sicherungskopie“ verwenden.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Verwijder niet-ondersteunde kaart
+lblRemoveAllUnsupportedCards=Nicht unterstützte Karten wurden aus Ihrem Inventar entfernt.
\ No newline at end of file
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index e82665d5aaf..4b49dcbf189 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -2898,6 +2898,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2905,6 +2906,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -3001,6 +3003,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java
@@ -3296,4 +3299,7 @@ cbPreloadCustomDrafts=Preload Custom Drafts
 nlPreloadCustomDrafts=If enabled, the custom drafts files are preloaded on startup (Forge will have longer startup time when parsing drafts files).
 lblRepairCost=Repair Cost: {0} ?
 lblRepair=Repair
-lblDataMigrationMsg=Data Migration completed!\nPlease check your Inventory and Equipments.\nPlease make a backup of your saves at this point since the actual save is not yet overwritten by using the Data -> Backup at the Menu Scene.
\ No newline at end of file
+lblDataMigrationMsg=Data Migration completed!\nPlease check your Inventory and Equipments.\nPlease make a backup of your saves at this point since the actual save is not yet overwritten by using the Data -> Backup at the Menu Scene.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Remove unsupported card
+lblRemoveAllUnsupportedCards=Unsupported cards have been remove from your inventory.
\ No newline at end of file
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 0e10be48fd8..663759c9bdf 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -2847,6 +2847,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2854,6 +2855,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -2950,6 +2952,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java
@@ -3546,4 +3549,7 @@ cbPreloadCustomDrafts=Precargar borradores personalizados
 nlPreloadCustomDrafts=Si está habilitado, los archivos de borradores personalizados se precargan al inicio (Forge tendrá un tiempo de inicio más largo al analizar los archivos de borradores).
 lblRepairCost=Costo de reparación: {0} ?
 lblRepair=Reparar
-lblDataMigrationMsg=¡Migración de datos completada!\nPor favor revise su inventario y equipos.\nPor favor, haz una copia de seguridad de tus partidas guardadas en este punto, ya que la partida guardada real aún no se sobrescribe al usar Datos -> Copia de seguridad en la Escena del menú.
\ No newline at end of file
+lblDataMigrationMsg=¡Migración de datos completada!\nPor favor revise su inventario y equipos.\nPor favor, haz una copia de seguridad de tus partidas guardadas en este punto, ya que la partida guardada real aún no se sobrescribe al usar Datos -> Copia de seguridad en la Escena del menú.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Quitar tarjeta incompatible
+lblRemoveAllUnsupportedCards=Las tarjetas no compatibles se han eliminado de tu inventario.
\ No newline at end of file
diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties
index 3504790fa5d..6d1a5e71b96 100644
--- a/forge-gui/res/languages/fr-FR.properties
+++ b/forge-gui/res/languages/fr-FR.properties
@@ -2840,6 +2840,7 @@ lblDecklistTitle=Liste de deck
 lblSummaryStats=Statistiques récapitulatives
 lblDeckSection=Section
 lblNewDeckCheckbox=Créer un nouveau deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importer des cartes
 lblCreateNewCmd=Nouveau Deck
 lblErrNotAllowedCard=Définir non autorisé dans {0}
@@ -2847,6 +2848,7 @@ lblWarnLimitedCard={0} dans {1}
 lblErrCardEditionDate=Set non conforme avec l'option de date de sortie
 lblErrUnsupportedCard=Non autorisé dans {0}
 lblWarnUnknownCardMsg=Carte inconnue ou non prise en charge dans Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=La section {0} actuelle contient {1} cartes de commandant potentielles : {2}
 lblWarnCommandersInSideExtra=Veuillez vérifier et en déplacer un vers la section Commandant, au cas où.
 lblWarnDeckSectionNotAllowedInEditor={0} La section n'est pas autorisée dans {1}
@@ -2944,6 +2946,7 @@ lblCardImportWarning=\nAttention : Le deck {0} sera renommé en {1}.
 lblConfirmCreateNewDeck=Vous êtes sur le point de créer un nouveau deck {0}. {1}\n\nVoulez-vous continuer ?\n\n Remarque : \
   N'oubliez pas de cliquer sur le bouton "Enregistrer" dans l'éditeur de deck pour ajouter le nouveau deck au catalogue !
 lblNewDeckWarning=\nAttention : Toute modification non enregistrée dans le deck actuel {0} sera perdue.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importer des cartes dans le Deck actuel
 lblNewDeckDialogTitle=Créer un nouveau deck
 #FNetOverlay.java
@@ -3547,4 +3550,7 @@ cbPreloadCustomDrafts=Précharger les brouillons personnalisés
 nlPreloadCustomDrafts=Si cette option est activée, les fichiers de brouillons personnalisés sont préchargés au démarrage (Forge aura un temps de démarrage plus long lors de l'analyse des fichiers de brouillons).
 lblRepairCost=Coût de réparation : {0} ?
 lblRepair=Réparation
-lblDataMigrationMsg=Migration des données terminée!\nVeuillez vérifier votre inventaire et vos équipements.\nVeuillez effectuer une sauvegarde de vos sauvegardes à ce stade, car la sauvegarde réelle n'est pas encore écrasée en utilisant Données -> Sauvegarde dans le menu Scène.
\ No newline at end of file
+lblDataMigrationMsg=Migration des données terminée!\nVeuillez vérifier votre inventaire et vos équipements.\nVeuillez effectuer une sauvegarde de vos sauvegardes à ce stade, car la sauvegarde réelle n'est pas encore écrasée en utilisant Données -> Sauvegarde dans le menu Scène.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Supprimer la carte non prise en charge
+lblRemoveAllUnsupportedCards=Les cartes non prises en charge ont été supprimées de votre inventaire.
\ No newline at end of file
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index 60765f4a8e4..f95f2d0c3e1 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -2836,6 +2836,7 @@ lblDecklistTitle=Lista delle Carte da Importare
 lblSummaryStats=Statistiche Generali
 lblDeckSection=Sezione
 lblNewDeckCheckbox=Crea un nuovo mazzo
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importa le carte
 lblCreateNewCmd=Nuovo mazzo
 lblErrNotAllowedCard=Edizione non permessa in {0}
@@ -2843,6 +2844,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Edizione non valida secondo l'opzione sulla data di pubblicazione selezionata
 lblErrUnsupportedCard=Non Permesso in {0}
 lblWarnUnknownCardMsg=Carta Sconosciuta, o non supportata in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=La Sezione {0} contiene {1} potenziali carte Commander: {2}
 lblWarnCommandersInSideExtra=Per favore, controlla e nel caso spostane una nella sezione Commander.
 lblWarnDeckSectionNotAllowedInEditor={0} Sezione non è permessa in {1}
@@ -2942,6 +2944,7 @@ lblCardImportWarning=\nAttenzione: Il mazzo {0} sarà rinominato come {1}.
 lblConfirmCreateNewDeck=Si sta per creare un nuovo mazzo {0}. {1}\n\nSi desidera procedere?\n\n Nota: \
   Non dimenticare di premere il tasto "Salva" una volta importate le carte per aggiungere il nuovo mazzo al catalogo!
 lblNewDeckWarning=\nAttenzione: Qualsiasi modifica non salvata al mazzo corrente {0} sarà persa.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importa le carte nel mazzo corrente
 lblNewDeckDialogTitle=Crea un nuovo mazzo
 #FNetOverlay.java
@@ -3545,4 +3548,7 @@ cbPreloadCustomDrafts=Precarica bozze personalizzate
 nlPreloadCustomDrafts=Se abilitato, i file delle bozze personalizzate vengono precaricati all'avvio (Forge avrà tempi di avvio più lunghi durante l'analisi dei file delle bozze).
 lblRepairCost=Costo di riparazione: {0} ?
 lblRepair=Riparazione
-lblDataMigrationMsg=Migrazione dati completata!\nControlla il tuo inventario e le tue attrezzature.\nA questo punto, esegui un backup dei tuoi salvataggi, poiché il salvataggio effettivo non è ancora stato sovrascritto, utilizzando Dati -> Backup nel menu Scena.
\ No newline at end of file
+lblDataMigrationMsg=Migrazione dati completata!\nControlla il tuo inventario e le tue attrezzature.\nA questo punto, esegui un backup dei tuoi salvataggi, poiché il salvataggio effettivo non è ancora stato sovrascritto, utilizzando Dati -> Backup nel menu Scena.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Rimuovi la carta non supportata
+lblRemoveAllUnsupportedCards=Le carte non supportate sono state rimosse dal tuo inventario.
\ No newline at end of file
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index 8612c0ac14f..471d530fa74 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -2835,6 +2835,7 @@ lblDecklistTitle=Decklist
 lblSummaryStats=Summary Statistics
 lblDeckSection=Section
 lblNewDeckCheckbox=Create a New Deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Import Cards
 lblCreateNewCmd=New Deck
 lblErrNotAllowedCard=Set not allowed in {0}
@@ -2842,6 +2843,7 @@ lblWarnLimitedCard={0} in {1}
 lblErrCardEditionDate=Set not compliant with Release Date option
 lblErrUnsupportedCard=Not allowed in {0}
 lblWarnUnknownCardMsg=Unknown Card or Unsupported in Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Current {0} Section contains {1} potential Commander Cards: {2}
 lblWarnCommandersInSideExtra=Please check and move one to the Commander Section, in case.
 lblWarnDeckSectionNotAllowedInEditor={0} Section is not allowed in {1}
@@ -2938,6 +2940,7 @@ lblCardImportWarning=\nWarning: The deck {0} will be renamed as {1}.
 lblConfirmCreateNewDeck=You are about to create a new deck {0}. {1}\n\nWould you like to proceed?\n\n Note: \
   Please remember to click on the "Save" button in the Deck Editor to add the new deck to the Catalog!
 lblNewDeckWarning=\nWarning: Any unsaved changes to the current deck {0} will be lost.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Import cards in the Current Deck
 lblNewDeckDialogTitle=Create a New Deck
 #FNetOverlay.java
@@ -3541,4 +3544,7 @@ cbPreloadCustomDrafts=カスタムドラフトをプリロードする
 nlPreloadCustomDrafts=有効にすると、起動時にカスタム ドラフト ファイルがプリロードされます (ドラフト ファイルを解析するときに Forge の起動時間が長くなります)。
 lblRepairCost=修理費用: {0}?
 lblRepair=修理
-lblDataMigrationMsg=データ移行が完了しました！\nインベントリと装備を確認してください。\n実際の保存はまだメニューシーンの「データ」->「バックアップ」を使用して上書きされていないため、この時点で保存のバックアップを作成してください。
\ No newline at end of file
+lblDataMigrationMsg=データ移行が完了しました！\nインベントリと装備を確認してください。\n実際の保存はまだメニューシーンの「データ」->「バックアップ」を使用して上書きされていないため、この時点で保存のバックアップを作成してください。
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=サポートされていないカードを削除する
+lblRemoveAllUnsupportedCards=サポートされていないカードはインベントリから削除されました。
\ No newline at end of file
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 5dbb6aa09ea..1386999433d 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -2917,6 +2917,7 @@ lblDecklistTitle=Lista de decks
 lblSummaryStats=Estatísticas Resumidas
 lblDeckSection=Seção
 lblNewDeckCheckbox=Criar um Novo deck
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=Importar Cartas
 lblCreateNewCmd=Novo Deck
 lblErrNotAllowedCard=Coleção não permitida em {0}
@@ -2924,6 +2925,7 @@ lblWarnLimitedCard={0} em {1}
 lblErrCardEditionDate=Coleção não compatível com a opção de Data de Lançamento
 lblErrUnsupportedCard=Não permitido em {0}
 lblWarnUnknownCardMsg=Carta desconhecida ou não suportada no Forge
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=Seção {0} Atual contém {1} Cartas de Comandante em potencial\: {2}
 lblWarnCommandersInSideExtra=Verifique e mova um para a seção do Comandante.
 lblWarnDeckSectionNotAllowedInEditor=Seção {0} não é permitida em {1}
@@ -3012,6 +3014,7 @@ Deseja prosseguir?\n\
  Nota\: Por favor, lembre-se de clicar no botão "Salvar" no Editor do Deck para adicioná-lo ao Catálogo\!
 lblNewDeckWarning=\n\
 Aviso\: Qualquer alteração não salva no deck atual {0} será perdida.
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=Importar cartas no Deck Atual
 lblNewDeckDialogTitle=Criar um Novo deck
 #FNetOverlay.java
@@ -3630,4 +3633,7 @@ cbPreloadCustomDrafts=Pré-carregar rascunhos personalizados
 nlPreloadCustomDrafts=Se habilitado, os arquivos de rascunhos personalizados serão pré-carregados na inicialização (o Forge terá um tempo de inicialização maior ao analisar arquivos de rascunhos).
 lblRepairCost=Custo do reparo: {0} ?
 lblRepair=Reparar
-lblDataMigrationMsg=Migração de dados concluída!\nVerifique seu inventário e equipamentos.\nPor favor, faça um backup dos seus arquivos salvos neste momento, já que o arquivo salvo atual ainda não foi sobrescrito usando Dados -> Backup na Cena do Menu.
\ No newline at end of file
+lblDataMigrationMsg=Migração de dados concluída!\nVerifique seu inventário e equipamentos.\nPor favor, faça um backup dos seus arquivos salvos neste momento, já que o arquivo salvo atual ainda não foi sobrescrito usando Dados -> Backup na Cena do Menu.
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=Remover cartão não suportado
+lblRemoveAllUnsupportedCards=Cartas não suportadas foram removidas do seu inventário.
\ No newline at end of file
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index 55bcd7cc03b..b1d79ab5f0f 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -2844,6 +2844,7 @@ lblDecklistTitle=套牌列表
 lblSummaryStats=统计摘要
 lblDeckSection=部分
 lblNewDeckCheckbox=创建一个新套牌
+lblReplaceDeckCheckbox=Replace Current Deck
 lblImportCardsCmd=导入牌张
 lblCreateNewCmd=新建套牌
 lblErrNotAllowedCard=系列{0}不被允许
@@ -2851,6 +2852,7 @@ lblWarnLimitedCard={0}中的{1}
 lblErrCardEditionDate=不符合上市日期选项
 lblErrUnsupportedCard={0}不被允许
 lblWarnUnknownCardMsg=未知的牌张或未被forge支持的牌张
+lblWarnNotInInventory=Card not found in inventory
 lblWarnTooManyCommanders=现在{0}部分包含{1}张潜在的指挥官牌张: {2}
 lblWarnCommandersInSideExtra=如果确实是指挥官，请进行进行检查并将其中的一张移动到指挥官区。
 lblWarnDeckSectionNotAllowedInEditor={0}部分中的{1}不被允许
@@ -2928,6 +2930,7 @@ lblCardImportWarning=\n警告：套牌{0}将被重命名为{1}。
 lblConfirmCreateNewDeck=你即将创建一个新套牌{0}。{1}\n\n你想要继续吗？\n\n 注意：请记得点击套牌编辑器中的\"保存按钮\"以\
   将新建的套牌保存到目录中！
 lblNewDeckWarning=\n警告：对于当前套牌{0}的任何未保存更改丢将被丢弃。
+lblConfirmReplaceDeck=This will replace the contents of the current deck ({0}) with the imported cards.\n\nWould you like to proceed?
 lblImportCardsDialogTitle=将牌张导入到当前套牌
 lblNewDeckDialogTitle=创建一个新套牌
 #FNetOverlay.java
@@ -3532,4 +3535,7 @@ cbPreloadCustomDrafts=预加载自定义草稿
 nlPreloadCustomDrafts=如果启用，自定义草稿文件将在启动时预加载（Forge 在解析草稿文件时会有更长的启动时间）。
 lblRepairCost=维修费用：{0}？
 lblRepair=维修
-lblDataMigrationMsg=数据迁移完成！\n请检查您的库存和设备。此时请备份您的保存内容，因为尚未使用菜单场景中的数据->备份覆盖实际保存内容。
\ No newline at end of file
+lblDataMigrationMsg=数据迁移完成！\n请检查您的库存和设备。此时请备份您的保存内容，因为尚未使用菜单场景中的数据->备份覆盖实际保存内容。
+#AdventureDeckEditor.java
+lblRemoveUnsupportedCard=移除不受支持的卡
+lblRemoveAllUnsupportedCards=不受支持的卡已从您的库存中移除。
\ No newline at end of file
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 2f6adb4fe83..d3a368b2758 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -283,6 +283,7 @@ Snail:Snails
 Snake:Snakes
 Soldier:Soldiers
 Soltari:Soltaris
+Sorcerer:Sorcerers
 Spawn:Spawns
 Specter:Specters
 Spellshaper:Spellshapers
@@ -315,6 +316,7 @@ Troll:Trolls
 Turtle:Turtles
 Tyranid:Tyranids
 Unicorn:Unicorns
+Utrom:Utroms
 Vampire:Vampires
 Varmint:Varmints
 Vedalken:Vedalkens
@@ -368,12 +370,15 @@ Food:Foods
 Fortification
 Gold
 Incubator:Incubators
+Infinity
 Junk
 Key:Keys
 Lander:Landers
 Map
+Mutagen
 Powerstone:Powerstones
 Spacecraft:Spacecraft
+Stone:Stones
 Treasure:Treasures
 Vehicle:Vehicles
 [WalkerTypes]
diff --git a/forge-gui/res/puzzle/PS_EOE3.pzl b/forge-gui/res/puzzle/PS_EOE3.pzl
new file mode 100644
index 00000000000..789f6572258
--- /dev/null
+++ b/forge-gui/res/puzzle/PS_EOE3.pzl
@@ -0,0 +1,16 @@
+[metadata]
+Name:Possibility Storm - Edge of Eternities #03
+URL:https://www.cardforge.org
+Goal:Win
+Turns:1
+Difficulty:Rare
+Description:Win this turn. Your opponent has 10000 life! Deal at least that much damage this turn to win. Ensure your solution satisfies all possible blocks. Good luck!
+[state]
+turn=1
+activeplayer=p0
+activephase=MAIN1
+p0life=-1
+p0hand=Welcome the Darkness;Bloodthirsty Conqueror;Vayne's Treachery;Syr Vondam, Sunstar Exemplar
+p0battlefield=Herald of Eternal Dawn;Jumbo Cactuar;The Masamune;Enduring Tenacity;Plains;Plains;Plains;Swamp;Swamp;Swamp;Forest;Forest
+p1life=10000
+p1battlefield=Zidane, Tantalus Thief;Absolute Virtue|Id:1;Pain for All|AttachedTo:1
diff --git a/forge-gui/res/puzzle/PS_SPM1.pzl b/forge-gui/res/puzzle/PS_SPM1.pzl
new file mode 100644
index 00000000000..84014ec7896
--- /dev/null
+++ b/forge-gui/res/puzzle/PS_SPM1.pzl
@@ -0,0 +1,16 @@
+[metadata]
+Name:Possibility Storm - Marvel's Spider-Man #01
+URL:https://i1.wp.com/www.possibilitystorm.com/wp-content/uploads/2025/09/latest-1-scaled.jpg?ssl=1
+Goal:Win
+Turns:1
+Difficulty:Uncommon
+Description:Win this turn. Ensure your solution satisfies all possible blocks. Good luck!
+[state]
+turn=1
+activeplayer=p0
+activephase=MAIN1
+p0life=20
+p0hand=Rhino, Barreling Brute;Spider-Man India;Daily Bugle Reporters;Become Brutes;Lurking Lizards
+p0battlefield=Scarlet Spider, Ben Reilly;Spider Manifestation;Gene Pollinator;Forest;Forest;Forest;Plains;Plains;Kavaron, Memorial World|Counters:CHARGE=2
+p1life=14
+p1battlefield=Carnage, Crimson Chaos
diff --git a/forge-gui/res/puzzle/PS_TLA1.pzl b/forge-gui/res/puzzle/PS_TLA1.pzl
new file mode 100644
index 00000000000..63ccd26d299
--- /dev/null
+++ b/forge-gui/res/puzzle/PS_TLA1.pzl
@@ -0,0 +1,17 @@
+[metadata]
+Name:Possibility Storm - Avatar the Last Airbender #01
+URL:https://i2.wp.com/www.possibilitystorm.com/wp-content/uploads/2025/08/latest-3-scaled.jpg?ssl=1
+Goal:Win
+Turns:1
+Difficulty:Rare
+Description:Win this turn. Your Forest is a 0/0 creature (with one +1/+1 counter on it.) Ensure your solution satisfies all blocks. Good luck!
+[state]
+turn=1
+activeplayer=p0
+activephase=MAIN1
+p0life=3
+p0hand=Jeong Jeong's Deserters;Earthbending Student;Bulk Up;How to Start a Riot
+p0battlefield=Haru, Hidden Talent;Garruk's Uprising;Forest|Id:1;Forgotten Monument;Forgotten Monument;Forgotten Monument;Restless Ridgeline;Cavernous Maw
+p1life=11
+p1battlefield=Vindictive Warden;Vindictive Warden
+p0precast=Haru, Hidden Talent:TrigEarthbend->1
diff --git a/forge-gui/res/setlookup/2ED.txt b/forge-gui/res/setlookup/2ED.txt
new file mode 100644
index 00000000000..4f0734cbe3a
--- /dev/null
+++ b/forge-gui/res/setlookup/2ED.txt
@@ -0,0 +1 @@
+U
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/3ED.txt b/forge-gui/res/setlookup/3ED.txt
new file mode 100644
index 00000000000..ac044e5e464
--- /dev/null
+++ b/forge-gui/res/setlookup/3ED.txt
@@ -0,0 +1 @@
+R
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/4ED.txt b/forge-gui/res/setlookup/4ED.txt
new file mode 100644
index 00000000000..8a3adbd30da
--- /dev/null
+++ b/forge-gui/res/setlookup/4ED.txt
@@ -0,0 +1 @@
+4E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/5DN.txt b/forge-gui/res/setlookup/5DN.txt
new file mode 100644
index 00000000000..0fcb81693bf
--- /dev/null
+++ b/forge-gui/res/setlookup/5DN.txt
@@ -0,0 +1 @@
+FD
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/5ED.txt b/forge-gui/res/setlookup/5ED.txt
new file mode 100644
index 00000000000..b63377ac325
--- /dev/null
+++ b/forge-gui/res/setlookup/5ED.txt
@@ -0,0 +1 @@
+5E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/6ED.txt b/forge-gui/res/setlookup/6ED.txt
new file mode 100644
index 00000000000..75637338e0d
--- /dev/null
+++ b/forge-gui/res/setlookup/6ED.txt
@@ -0,0 +1 @@
+6E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/7ED.txt b/forge-gui/res/setlookup/7ED.txt
new file mode 100644
index 00000000000..9a61bd8f0a4
--- /dev/null
+++ b/forge-gui/res/setlookup/7ED.txt
@@ -0,0 +1 @@
+7E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/8ED.txt b/forge-gui/res/setlookup/8ED.txt
new file mode 100644
index 00000000000..0707bf72370
--- /dev/null
+++ b/forge-gui/res/setlookup/8ED.txt
@@ -0,0 +1 @@
+8E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/9ED.txt b/forge-gui/res/setlookup/9ED.txt
new file mode 100644
index 00000000000..4fd473a3e67
--- /dev/null
+++ b/forge-gui/res/setlookup/9ED.txt
@@ -0,0 +1 @@
+9E
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ALL.txt b/forge-gui/res/setlookup/ALL.txt
new file mode 100644
index 00000000000..62fec3c1a32
--- /dev/null
+++ b/forge-gui/res/setlookup/ALL.txt
@@ -0,0 +1 @@
+AL
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/APC.txt b/forge-gui/res/setlookup/APC.txt
new file mode 100644
index 00000000000..64f61e6c4cb
--- /dev/null
+++ b/forge-gui/res/setlookup/APC.txt
@@ -0,0 +1 @@
+AP
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ARN.txt b/forge-gui/res/setlookup/ARN.txt
new file mode 100644
index 00000000000..27524c76687
--- /dev/null
+++ b/forge-gui/res/setlookup/ARN.txt
@@ -0,0 +1 @@
+AN
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ATQ.txt b/forge-gui/res/setlookup/ATQ.txt
new file mode 100644
index 00000000000..02b33c76390
--- /dev/null
+++ b/forge-gui/res/setlookup/ATQ.txt
@@ -0,0 +1 @@
+AQ
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/CHR.txt b/forge-gui/res/setlookup/CHR.txt
new file mode 100644
index 00000000000..f4053f06a49
--- /dev/null
+++ b/forge-gui/res/setlookup/CHR.txt
@@ -0,0 +1 @@
+CH
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/CMD.txt b/forge-gui/res/setlookup/CMD.txt
new file mode 100644
index 00000000000..2ce1fe653b3
--- /dev/null
+++ b/forge-gui/res/setlookup/CMD.txt
@@ -0,0 +1 @@
+COM
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/CSP.txt b/forge-gui/res/setlookup/CSP.txt
new file mode 100644
index 00000000000..9dc4634006b
--- /dev/null
+++ b/forge-gui/res/setlookup/CSP.txt
@@ -0,0 +1 @@
+CS
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/DCI.txt b/forge-gui/res/setlookup/DCI.txt
new file mode 100644
index 00000000000..b8e58f21709
--- /dev/null
+++ b/forge-gui/res/setlookup/DCI.txt
@@ -0,0 +1 @@
+PDCI
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/DRK.txt b/forge-gui/res/setlookup/DRK.txt
new file mode 100644
index 00000000000..295879af704
--- /dev/null
+++ b/forge-gui/res/setlookup/DRK.txt
@@ -0,0 +1 @@
+DK
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/DST.txt b/forge-gui/res/setlookup/DST.txt
new file mode 100644
index 00000000000..a26da2793bc
--- /dev/null
+++ b/forge-gui/res/setlookup/DST.txt
@@ -0,0 +1 @@
+DS
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/EXO.txt b/forge-gui/res/setlookup/EXO.txt
new file mode 100644
index 00000000000..251aee8903c
--- /dev/null
+++ b/forge-gui/res/setlookup/EXO.txt
@@ -0,0 +1 @@
+EX
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/FEM.txt b/forge-gui/res/setlookup/FEM.txt
new file mode 100644
index 00000000000..7c161d74e91
--- /dev/null
+++ b/forge-gui/res/setlookup/FEM.txt
@@ -0,0 +1 @@
+FE
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/GPT.txt b/forge-gui/res/setlookup/GPT.txt
new file mode 100644
index 00000000000..a599d8d3123
--- /dev/null
+++ b/forge-gui/res/setlookup/GPT.txt
@@ -0,0 +1 @@
+GP
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/H1R.txt b/forge-gui/res/setlookup/H1R.txt
new file mode 100644
index 00000000000..99cbbcea634
--- /dev/null
+++ b/forge-gui/res/setlookup/H1R.txt
@@ -0,0 +1 @@
+RMH1
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/HML.txt b/forge-gui/res/setlookup/HML.txt
new file mode 100644
index 00000000000..95a4d662960
--- /dev/null
+++ b/forge-gui/res/setlookup/HML.txt
@@ -0,0 +1 @@
+HL
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/HOP.txt b/forge-gui/res/setlookup/HOP.txt
new file mode 100644
index 00000000000..dbe6497d536
--- /dev/null
+++ b/forge-gui/res/setlookup/HOP.txt
@@ -0,0 +1 @@
+PCH
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ICE.txt b/forge-gui/res/setlookup/ICE.txt
new file mode 100644
index 00000000000..1e6df89332d
--- /dev/null
+++ b/forge-gui/res/setlookup/ICE.txt
@@ -0,0 +1 @@
+IA
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/INV.txt b/forge-gui/res/setlookup/INV.txt
new file mode 100644
index 00000000000..586886e561e
--- /dev/null
+++ b/forge-gui/res/setlookup/INV.txt
@@ -0,0 +1 @@
+IN
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/J21.txt b/forge-gui/res/setlookup/J21.txt
deleted file mode 100644
index 16a79d0a55c..00000000000
--- a/forge-gui/res/setlookup/J21.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-AFR
-MH2
-STX
-TSR
-KHM
-CMR
-KLR
-ZNC
-ZNR
-AKR
-ANB
-2XM
-JMP
-M21
-IKO
-C20
-THB
-SLD
-GN2
-ELD
-C19
-M20
-MH1
-WAR
-GK2
-RNA
-UMA
-GK1
-GRN
-C18
-M19
-BBD
-CM2
-DOM
-A25
-RIX
-IMA
-DDT
-XLN
-HOU
-AKH
-MM3
-AER
-PCA
-DDR
-CN2
-SOI
-W16
-DDQ
-OGW
-BFZ
-ORI
-MM2
-DTK
-FRF
-KTK
-EMN
-M15
-VMA
-THS
-M14
-DGM
-GTC
-ISD
-MBS
-ALA
-MOR
-LRW
-10E
-LGN
-ONS
-PCY
-P02
-WTH
-P2
-WL
diff --git a/forge-gui/res/setlookup/JP1.txt b/forge-gui/res/setlookup/JP1.txt
new file mode 100644
index 00000000000..4ec53cda2c1
--- /dev/null
+++ b/forge-gui/res/setlookup/JP1.txt
@@ -0,0 +1 @@
+PHJ
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/JUD.txt b/forge-gui/res/setlookup/JUD.txt
new file mode 100644
index 00000000000..7f9e8688cd7
--- /dev/null
+++ b/forge-gui/res/setlookup/JUD.txt
@@ -0,0 +1 @@
+JU
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/LEA.txt b/forge-gui/res/setlookup/LEA.txt
new file mode 100644
index 00000000000..8c7e5a667f1
--- /dev/null
+++ b/forge-gui/res/setlookup/LEA.txt
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/LEB.txt b/forge-gui/res/setlookup/LEB.txt
new file mode 100644
index 00000000000..7371f47a6f8
--- /dev/null
+++ b/forge-gui/res/setlookup/LEB.txt
@@ -0,0 +1 @@
+B
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/LEG.txt b/forge-gui/res/setlookup/LEG.txt
new file mode 100644
index 00000000000..2c31703e6e3
--- /dev/null
+++ b/forge-gui/res/setlookup/LEG.txt
@@ -0,0 +1 @@
+LG
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/LGN.txt b/forge-gui/res/setlookup/LGN.txt
new file mode 100644
index 00000000000..f1f05ca5a7d
--- /dev/null
+++ b/forge-gui/res/setlookup/LGN.txt
@@ -0,0 +1 @@
+LE
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ME1.txt b/forge-gui/res/setlookup/ME1.txt
new file mode 100644
index 00000000000..3e08e2c0c84
--- /dev/null
+++ b/forge-gui/res/setlookup/ME1.txt
@@ -0,0 +1 @@
+MED
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/MIR.txt b/forge-gui/res/setlookup/MIR.txt
new file mode 100644
index 00000000000..17f7ade37c5
--- /dev/null
+++ b/forge-gui/res/setlookup/MIR.txt
@@ -0,0 +1 @@
+MI
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/MMQ.txt b/forge-gui/res/setlookup/MMQ.txt
new file mode 100644
index 00000000000..4b67ce33c5f
--- /dev/null
+++ b/forge-gui/res/setlookup/MMQ.txt
@@ -0,0 +1 @@
+MM
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/MP2.txt b/forge-gui/res/setlookup/MP2.txt
new file mode 100644
index 00000000000..c79813222cc
--- /dev/null
+++ b/forge-gui/res/setlookup/MP2.txt
@@ -0,0 +1 @@
+MPS_AKH
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/MRD.txt b/forge-gui/res/setlookup/MRD.txt
new file mode 100644
index 00000000000..5748b72aeee
--- /dev/null
+++ b/forge-gui/res/setlookup/MRD.txt
@@ -0,0 +1 @@
+MR
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/NMS.txt b/forge-gui/res/setlookup/NMS.txt
new file mode 100644
index 00000000000..3ce670e547a
--- /dev/null
+++ b/forge-gui/res/setlookup/NMS.txt
@@ -0,0 +1 @@
+NE
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ODY.txt b/forge-gui/res/setlookup/ODY.txt
new file mode 100644
index 00000000000..efadb986e75
--- /dev/null
+++ b/forge-gui/res/setlookup/ODY.txt
@@ -0,0 +1 @@
+OD
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ONS.txt b/forge-gui/res/setlookup/ONS.txt
new file mode 100644
index 00000000000..8cefb6a89ea
--- /dev/null
+++ b/forge-gui/res/setlookup/ONS.txt
@@ -0,0 +1 @@
+ON
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PCY.txt b/forge-gui/res/setlookup/PCY.txt
new file mode 100644
index 00000000000..4d81e651943
--- /dev/null
+++ b/forge-gui/res/setlookup/PCY.txt
@@ -0,0 +1 @@
+PY
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PLG20.txt b/forge-gui/res/setlookup/PLG20.txt
new file mode 100644
index 00000000000..3d22f9f2847
--- /dev/null
+++ b/forge-gui/res/setlookup/PLG20.txt
@@ -0,0 +1 @@
+PLGS
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PLS.txt b/forge-gui/res/setlookup/PLS.txt
new file mode 100644
index 00000000000..a8afa5efee9
--- /dev/null
+++ b/forge-gui/res/setlookup/PLS.txt
@@ -0,0 +1 @@
+PS
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PLST.txt b/forge-gui/res/setlookup/PLST.txt
new file mode 100644
index 00000000000..0225ac2c686
--- /dev/null
+++ b/forge-gui/res/setlookup/PLST.txt
@@ -0,0 +1 @@
+PLIST
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PO2.txt b/forge-gui/res/setlookup/PO2.txt
new file mode 100644
index 00000000000..62e9b0e1ed8
--- /dev/null
+++ b/forge-gui/res/setlookup/PO2.txt
@@ -0,0 +1 @@
+P2
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/POR.txt b/forge-gui/res/setlookup/POR.txt
new file mode 100644
index 00000000000..6eedcc962ae
--- /dev/null
+++ b/forge-gui/res/setlookup/POR.txt
@@ -0,0 +1 @@
+PT
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PTK.txt b/forge-gui/res/setlookup/PTK.txt
new file mode 100644
index 00000000000..2b664e3fc9d
--- /dev/null
+++ b/forge-gui/res/setlookup/PTK.txt
@@ -0,0 +1 @@
+P3
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PW11.txt b/forge-gui/res/setlookup/PW11.txt
new file mode 100644
index 00000000000..b0ed9a1cc94
--- /dev/null
+++ b/forge-gui/res/setlookup/PW11.txt
@@ -0,0 +1 @@
+PWP11
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PW12.txt b/forge-gui/res/setlookup/PW12.txt
new file mode 100644
index 00000000000..4b09eaef4b4
--- /dev/null
+++ b/forge-gui/res/setlookup/PW12.txt
@@ -0,0 +1 @@
+PWP12
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/PW21.txt b/forge-gui/res/setlookup/PW21.txt
new file mode 100644
index 00000000000..52ea083edd5
--- /dev/null
+++ b/forge-gui/res/setlookup/PW21.txt
@@ -0,0 +1 @@
+PWP21
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/S99.txt b/forge-gui/res/setlookup/S99.txt
new file mode 100644
index 00000000000..86aa1faf165
--- /dev/null
+++ b/forge-gui/res/setlookup/S99.txt
@@ -0,0 +1 @@
+ST
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/SCG.txt b/forge-gui/res/setlookup/SCG.txt
new file mode 100644
index 00000000000..e807b90e78b
--- /dev/null
+++ b/forge-gui/res/setlookup/SCG.txt
@@ -0,0 +1 @@
+SC
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/STH.txt b/forge-gui/res/setlookup/STH.txt
new file mode 100644
index 00000000000..5e158786ed9
--- /dev/null
+++ b/forge-gui/res/setlookup/STH.txt
@@ -0,0 +1 @@
+SH
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/TMP.txt b/forge-gui/res/setlookup/TMP.txt
new file mode 100644
index 00000000000..331ee1ff669
--- /dev/null
+++ b/forge-gui/res/setlookup/TMP.txt
@@ -0,0 +1 @@
+TE
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/TOR.txt b/forge-gui/res/setlookup/TOR.txt
new file mode 100644
index 00000000000..30841306fc0
--- /dev/null
+++ b/forge-gui/res/setlookup/TOR.txt
@@ -0,0 +1 @@
+TO
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/UDS.txt b/forge-gui/res/setlookup/UDS.txt
new file mode 100644
index 00000000000..4a1abd4d2b8
--- /dev/null
+++ b/forge-gui/res/setlookup/UDS.txt
@@ -0,0 +1 @@
+UD
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/ULG.txt b/forge-gui/res/setlookup/ULG.txt
new file mode 100644
index 00000000000..9d3de336384
--- /dev/null
+++ b/forge-gui/res/setlookup/ULG.txt
@@ -0,0 +1 @@
+UL
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/USG.txt b/forge-gui/res/setlookup/USG.txt
new file mode 100644
index 00000000000..4547d977b95
--- /dev/null
+++ b/forge-gui/res/setlookup/USG.txt
@@ -0,0 +1 @@
+US
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/V10.txt b/forge-gui/res/setlookup/V10.txt
new file mode 100644
index 00000000000..04c292e8775
--- /dev/null
+++ b/forge-gui/res/setlookup/V10.txt
@@ -0,0 +1 @@
+FVR
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/V11.txt b/forge-gui/res/setlookup/V11.txt
new file mode 100644
index 00000000000..8980752f3a2
--- /dev/null
+++ b/forge-gui/res/setlookup/V11.txt
@@ -0,0 +1 @@
+FVL
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/VIS.txt b/forge-gui/res/setlookup/VIS.txt
new file mode 100644
index 00000000000..ff96225abf1
--- /dev/null
+++ b/forge-gui/res/setlookup/VIS.txt
@@ -0,0 +1 @@
+VI
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/WMC.txt b/forge-gui/res/setlookup/WMC.txt
new file mode 100644
index 00000000000..b66c665bb87
--- /dev/null
+++ b/forge-gui/res/setlookup/WMC.txt
@@ -0,0 +1 @@
+PWCQ
\ No newline at end of file
diff --git a/forge-gui/res/setlookup/WTH.txt b/forge-gui/res/setlookup/WTH.txt
new file mode 100644
index 00000000000..beb1bb6b31f
--- /dev/null
+++ b/forge-gui/res/setlookup/WTH.txt
@@ -0,0 +1 @@
+WL
\ No newline at end of file
diff --git a/forge-gui/res/tokenscripts/c_1_1_a_robot_flying.txt b/forge-gui/res/tokenscripts/c_1_1_a_robot_flying.txt
new file mode 100644
index 00000000000..458141a056c
--- /dev/null
+++ b/forge-gui/res/tokenscripts/c_1_1_a_robot_flying.txt
@@ -0,0 +1,6 @@
+Name:Robot Token
+ManaCost:no cost
+Types:Artifact Creature Robot
+PT:1/1
+K:Flying
+Oracle:Flying
diff --git a/forge-gui/res/tokenscripts/c_a_lander_sac_search.txt b/forge-gui/res/tokenscripts/c_a_lander_sac_search.txt
index a653f6ef453..45d3f1ff151 100644
--- a/forge-gui/res/tokenscripts/c_a_lander_sac_search.txt
+++ b/forge-gui/res/tokenscripts/c_a_lander_sac_search.txt
@@ -1,5 +1,5 @@
 Name:Lander Token
 ManaCost:no cost
 Types:Artifact Lander
-A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
+A:AB$ ChangeZone | Cost$ 2 T Sac<1/CARDNAME> | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeTypeDesc$ basic land | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
 Oracle:{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/tokenscripts/c_a_mutagen_sac.txt b/forge-gui/res/tokenscripts/c_a_mutagen_sac.txt
new file mode 100644
index 00000000000..51db6b5b78c
--- /dev/null
+++ b/forge-gui/res/tokenscripts/c_a_mutagen_sac.txt
@@ -0,0 +1,5 @@
+Name:Mutagen Token
+ManaCost:no cost
+Types:Artifact Mutagen
+A:AB$ PutCounter | Cost$ 1 T Sac<1/CARDNAME/this token> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SorcerySpeed$ True | SpellDescription$ Put a +1/+1 counter on target creature. Activate only as a sorcery.
+Oracle:{1}, {T}, Sacrifice this token: Put a +1/+1 counter on target creature. Activate only as a sorcery.
\ No newline at end of file
diff --git a/forge-gui/res/tokenscripts/cordyceps_infected.txt b/forge-gui/res/tokenscripts/cordyceps_infected.txt
new file mode 100644
index 00000000000..52dad650b09
--- /dev/null
+++ b/forge-gui/res/tokenscripts/cordyceps_infected.txt
@@ -0,0 +1,6 @@
+Name:Cordyceps Infected
+ManaCost:no cost
+Colors:black
+Types:Creature Fungus Zombie
+PT:1/1
+Oracle:
diff --git a/forge-gui/res/tokenscripts/g_1_1_forest_dryad_squirrel.txt b/forge-gui/res/tokenscripts/g_1_1_forest_dryad_squirrel.txt
new file mode 100644
index 00000000000..b2c5e0c0e6d
--- /dev/null
+++ b/forge-gui/res/tokenscripts/g_1_1_forest_dryad_squirrel.txt
@@ -0,0 +1,6 @@
+Name:Forest Dryad Squirrel Token
+ManaCost:no cost
+Colors:green
+Types:Land Creature Forest Dryad Squirrel
+PT:1/1
+Oracle:({T}: Add {G}.)
diff --git a/forge-gui/res/tokenscripts/g_1_1_insect_infect.txt b/forge-gui/res/tokenscripts/g_1_1_insect_infect.txt
new file mode 100644
index 00000000000..7c1db36ec34
--- /dev/null
+++ b/forge-gui/res/tokenscripts/g_1_1_insect_infect.txt
@@ -0,0 +1,7 @@
+Name:Insect Token
+ManaCost:no cost
+Colors:green
+Types:Creature Insect
+PT:1/1
+K:Infect
+Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
diff --git a/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt b/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
index 88c2145b493..86d29bd7081 100644
--- a/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
+++ b/forge-gui/res/tokenscripts/g_x_x_treefolk_warrior_total_forests.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Colors:green
 Types:Creature Treefolk Warrior
 PT:*/*
-S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of Forests you control.
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ This creature's power and toughness are each equal to the number of Forests you control.
 SVar:X:Count$Valid Forest.YouCtrl
 SVar:BuffedBy:Forest
-Oracle:CARDNAMEs power and toughness are each equal to the number of Forests you control.
+Oracle:This creature's power and toughness are each equal to the number of Forests you control.
diff --git a/forge-gui/res/tokenscripts/r_2_2_soldier_firebending_1.txt b/forge-gui/res/tokenscripts/r_2_2_soldier_firebending_1.txt
index cb6bdbd40dc..49f8996b9bd 100644
--- a/forge-gui/res/tokenscripts/r_2_2_soldier_firebending_1.txt
+++ b/forge-gui/res/tokenscripts/r_2_2_soldier_firebending_1.txt
@@ -1,7 +1,7 @@
-Name:Soldier Token
-ManaCost:no cost
-Colors:red
-Types:Creature Soldier
-PT:2/2
-K:Firebending:1
-Oracle:Firebending 1 (Whenever this token attacks, add {R}. This mana lasts until end of combat.)
\ No newline at end of file
+Name:Soldier Token
+ManaCost:no cost
+Colors:red
+Types:Creature Soldier
+PT:2/2
+K:Firebending:1
+Oracle:Firebending 1 (Whenever this token attacks, add {R}. This mana lasts until end of combat.)
diff --git a/forge-gui/res/tokenscripts/u_2_1_a_myr.txt b/forge-gui/res/tokenscripts/u_2_1_a_myr.txt
new file mode 100644
index 00000000000..25ca79e0111
--- /dev/null
+++ b/forge-gui/res/tokenscripts/u_2_1_a_myr.txt
@@ -0,0 +1,6 @@
+Name:Myr Token
+ManaCost:no cost
+Colors:blue
+Types:Artifact Creature Myr
+PT:2/1
+Oracle:
diff --git a/forge-gui/res/tokenscripts/u_3_3_illusion_villain.txt b/forge-gui/res/tokenscripts/u_3_3_illusion_villain.txt
new file mode 100644
index 00000000000..c812cfb42f2
--- /dev/null
+++ b/forge-gui/res/tokenscripts/u_3_3_illusion_villain.txt
@@ -0,0 +1,6 @@
+Name:Illusion Villain Token
+ManaCost:no cost
+Colors:blue
+Types:Creature Illusion Villain
+PT:3/3
+Oracle:
diff --git a/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt b/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt
new file mode 100644
index 00000000000..cc6178832c9
--- /dev/null
+++ b/forge-gui/res/tokenscripts/ub_1_1_faerie_flying.txt
@@ -0,0 +1,7 @@
+Name:Faerie Token
+ManaCost:no cost
+Colors:blue,black
+Types:Creature Faerie
+PT:1/1
+K:Flying
+Oracle:Flying
diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java
index 8ba686c67ce..0686e65b2ff 100644
--- a/forge-gui/src/main/java/forge/deck/DeckImportController.java
+++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java
@@ -13,15 +13,25 @@ import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
+import forge.util.ItemPool;
 import forge.util.Localizer;
+import forge.util.StreamUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.text.DateFormatSymbols;
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class DeckImportController {
-    private boolean createNewDeck;
+    public enum ImportBehavior {
+        MERGE,
+        CREATE_NEW,
+        REPLACE_CURRENT
+    }
+
+    private ImportBehavior importBehavior;
     // Date filter
     private final ICheckBox dateTimeCheck;
     private final IComboBox<String> monthDropdown;
@@ -30,7 +40,7 @@ public class DeckImportController {
     private CardDb.CardArtPreference artPreference;
     private boolean smartCardArt;
     // Block Preference Filter
-    private boolean inlcludeBnRInDeck = false;
+    private boolean includeBnRInDeck = false;
 
     private final List<Token> tokens = new ArrayList<>();
     private final Map<PaperCard, Token> cardsInTokens = new HashMap<>();
@@ -38,7 +48,14 @@ public class DeckImportController {
     private Deck currentDeckInEditor = null;
     private DeckFormat currentDeckFormat;
     private GameFormat currentGameFormat;
+    private GameType currentGameType;
     private final List<DeckSection> allowedSections = new ArrayList<>();
+    private ItemPool<PaperCard> playerInventory;
+    /**
+     * If a free card is missing from a player's inventory (e.g. a basic land), it gets run through this function, which
+     * can handle creation of a usable print.
+     */
+    private Function<PaperCard, PaperCard> freePrintSupplier;
 
     public DeckImportController(ICheckBox dateTimeCheck0,
                                 IComboBox<String> monthDropdown0, IComboBox<Integer> yearDropdown0,
@@ -54,13 +71,14 @@ public class DeckImportController {
          */
         this.currentDeckNotEmpty = currentDeckNotEmpty;
         // this option will control the "new deck" action controlled by UI widget
-        createNewDeck = false;
+        this.importBehavior = ImportBehavior.MERGE;
 
         // Init default parameters
         this.artPreference = StaticData.instance().getCardArtPreference();  // default
         this.smartCardArt = StaticData.instance().isEnabledCardArtSmartSelection();
         this.currentDeckFormat = null;
         this.currentGameFormat = null;
+        this.currentGameType = null;
         fillDateDropdowns();
     }
 
@@ -68,13 +86,23 @@ public class DeckImportController {
         if (gameType == null){
             this.currentGameFormat = null;
             this.currentDeckFormat = null;
+            this.currentGameType = null;
         } else {
             // get the game format with the same name of current game type (if any)
             this.currentDeckFormat = gameType.getDeckFormat();
             this.currentGameFormat = FModel.getFormats().get(gameType.name());
+            this.currentGameType = gameType;
         }
     }
 
+    public void setPlayerInventory(ItemPool<PaperCard> inventory) {
+        this.playerInventory = inventory;
+    }
+
+    public void setFreePrintConverter(Function<PaperCard, PaperCard> freePrintSupplier) {
+        this.freePrintSupplier = freePrintSupplier;
+    }
+
     public void setCurrentDeckInEditor(Deck deckInEditor){
         this.currentDeckInEditor = deckInEditor;
     }
@@ -105,11 +133,13 @@ public class DeckImportController {
         return this.smartCardArt;
     }
 
-    public void setCreateNewDeck(boolean createNewDeck){
-        this.createNewDeck = createNewDeck;
+    public void setImportBehavior(ImportBehavior importBehavior) {
+        this.importBehavior = importBehavior;
     }
 
-    public boolean getCreateNewDeck() { return this.createNewDeck; }
+    public ImportBehavior getImportBehavior() {
+        return importBehavior;
+    }
 
     private void fillDateDropdowns() {
         DateFormatSymbols dfs = new DateFormatSymbols();
@@ -159,10 +189,10 @@ public class DeckImportController {
     }
 
     public void importBannedAndRestrictedCards(boolean includeBannedAndRestricted){
-        this.inlcludeBnRInDeck = includeBannedAndRestricted;
+        this.includeBnRInDeck = includeBannedAndRestricted;
     }
 
-    public boolean importBannedAndRestrictedCards(){ return this.inlcludeBnRInDeck; }
+    public boolean importBannedAndRestrictedCards(){ return this.includeBnRInDeck; }
 
     public List<Token> parseInput(String input) {
         tokens.clear();
@@ -186,7 +216,7 @@ public class DeckImportController {
         if (!this.allowedSections.isEmpty())
             recognizer.setAllowedDeckSections(this.allowedSections);
         // Banned and Restricted Card Policy
-        if (this.inlcludeBnRInDeck)
+        if (this.includeBnRInDeck)
             recognizer.forceImportBannedAndRestrictedCards();
 
         String[] lines = input.split("\n");
@@ -196,8 +226,13 @@ public class DeckImportController {
 
         if (this.currentGameFormatAllowsCommander()) {
             List<Pair<Integer, Token>> commanderTokens = getTokensInSection(DeckSection.Commander);
-            if (commanderTokens.isEmpty())  // Check commanders in Sideboard only if the commander section is empty
-                checkAndFixCommanderIn(DeckSection.Sideboard);
+            if (commanderTokens.isEmpty()) {
+                // Check commanders in Sideboard only if the commander section is empty
+                if(!getTokensInSection(DeckSection.Sideboard).isEmpty())
+                    checkAndFixCommanderIn(DeckSection.Sideboard);
+                else
+                    checkAndFixCommanderIn(DeckSection.Main);
+            }
             checkAndFixCommanderIn(DeckSection.Commander);
         }
 
@@ -309,7 +344,7 @@ public class DeckImportController {
     }
 
     public boolean currentGameFormatAllowsCommander(){
-        return this.allowedSections.contains(DeckSection.Commander);
+        return this.allowedSections.contains(DeckSection.Commander) || this.currentGameType == GameType.PlanarConquest;
     }
 
     public List<Token> optimiseCardArtInTokens(){
@@ -332,13 +367,8 @@ public class DeckImportController {
             else
                 refTokenMap = tokensPerSectionWithSet;
 
-            List<Token> tokensInSection = refTokenMap.getOrDefault(tokenSection, null);
-            if (tokensInSection == null) {
-                tokensInSection = new ArrayList<>();
-                tokensInSection.add(token);
-                refTokenMap.put(tokenSection, tokensInSection);
-            } else
-                tokensInSection.add(token);
+            List<Token> tokensInSection = refTokenMap.computeIfAbsent(tokenSection, e -> new ArrayList<>());
+            tokensInSection.add(token);
         }
 
         if (tokensPerSectionWithNoSet.isEmpty())
@@ -356,7 +386,7 @@ public class DeckImportController {
 
         Map<DeckSection, CardPool> referencePoolPerSection = new HashMap<>();
 
-        if (this.currentDeckNotEmpty && !this.createNewDeck && this.currentDeckInEditor != null){
+        if (this.currentDeckNotEmpty && this.importBehavior == ImportBehavior.MERGE && this.currentDeckInEditor != null){
             // We will always consider ONLY sections for cards needing art optimisation
             for (DeckSection section : tokensPerSectionWithNoSet.keySet()){
                 CardPool cardsInDeck = this.currentDeckInEditor.get(section);
@@ -436,6 +466,102 @@ public class DeckImportController {
         return tokens;
     }
 
+    public List<Token> constrainTokensToInventory() {
+        if(this.playerInventory == null)
+            return tokens;
+        CardPool availableInventory = new CardPool(this.playerInventory);
+        //Map of tokens to the things we're gonna replace them with.
+        Map<Token, List<Token>> tokenReplacers = new LinkedHashMap<>();
+        //If we're adding to our existing deck, ensure we aren't counting the cards already in it.
+        if(this.importBehavior == ImportBehavior.MERGE && this.currentDeckInEditor != null)
+            availableInventory.removeAll(this.currentDeckInEditor.getAllCardsInASinglePool(true, true));
+        if(this.currentGameType == GameType.PlanarConquest && currentDeckInEditor != null)
+            availableInventory.removeAllFlat(this.currentDeckInEditor.getCommanders());
+        //Step 1: For each token, if it's asking for more copies of a print than we can supply, split the difference out
+        //into a token that's indifferent to the edition. Reduce available inventory accordingly.
+        for (Token token : this.tokens) {
+            if (!token.isCardToken())
+                continue;
+            PaperCard card = token.getCard();
+            int requestedAmount = token.getQuantity();
+            if (card == null)
+                continue;
+            if (token.cardRequestHasNoCode()) {
+                List<Token> list = new ArrayList<>();
+                tokenReplacers.put(token, list);
+                continue;
+            }
+            int available = availableInventory.count(card);
+            if (available <= 0) {
+                List<Token> list = new ArrayList<>();
+                tokenReplacers.put(token, list);
+                continue;
+            }
+            int numTaken = Math.min(requestedAmount, available);
+            availableInventory.remove(card, numTaken);
+            if (available >= requestedAmount)
+                continue;
+
+            List<Token> list = new ArrayList<>();
+            list.add(Token.LegalCard(card, numTaken, token.getTokenSection(), true));
+            tokenReplacers.put(token, list);
+        }
+        if(tokenReplacers.isEmpty())
+            return tokens; //We have every card that was requested.
+        //Step 2: Try to find alternative prints for the ones that do not request an edition.
+        int capacity = tokens.size();
+        for(Map.Entry<Token, List<Token>> tokenReplacer : tokenReplacers.entrySet()) {
+            Token token = tokenReplacer.getKey();
+            DeckSection tokenSection = token.getTokenSection();
+            List<Token> replacementList = tokenReplacer.getValue();
+            PaperCard card = token.getCard();
+            String cardName = card.getName();
+            CardPool substitutes = availableInventory.getFilteredPool(c -> c.getName().equals(cardName));
+            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
+            // ref: https://developer.android.com/reference/java/util/stream/Stream#toList()
+            List<Map.Entry<PaperCard, Integer>> sortedSubstitutes = StreamUtil.stream(substitutes).sorted(Comparator.comparingInt(Map.Entry::getValue)).collect(Collectors.toList());
+            int neededQuantity = token.getQuantity();
+            for(Token found : replacementList) {
+                //If there's an item in the replacement list already it means we've already found some of the needed copies.
+                neededQuantity -= found.getQuantity();
+            }
+            for(int i = 0; i < sortedSubstitutes.size() && neededQuantity > 0; i++) {
+                Map.Entry<PaperCard, Integer> item = sortedSubstitutes.get(i);
+                PaperCard replacement = item.getKey();
+                int toMove = Math.min(neededQuantity, item.getValue());
+                replacementList.add(Token.LegalCard(replacement, toMove, tokenSection, true));
+                availableInventory.remove(replacement, toMove);
+                neededQuantity -= toMove;
+                capacity++;
+            }
+            if(neededQuantity > 0) {
+                PaperCard freePrint = getInfiniteSupplyPrinting(card);
+                if(freePrint != null)
+                    replacementList.add(Token.NotInInventoryFree(freePrint, neededQuantity, tokenSection));
+                else
+                    replacementList.add(Token.NotInInventory(card, neededQuantity, tokenSection));
+                capacity++;
+            }
+        }
+        //Step 3: Apply the replacement list.
+        List<Token> newList = new ArrayList<>(capacity);
+        for(Token t : this.tokens) {
+            if(tokenReplacers.containsKey(t))
+                newList.addAll(tokenReplacers.get(t));
+            else
+                newList.add(t);
+        }
+        this.tokens.clear();
+        this.tokens.addAll(newList);
+        return tokens;
+    }
+
+    private PaperCard getInfiniteSupplyPrinting(PaperCard card) {
+        if(this.freePrintSupplier == null)
+            return null;
+        return freePrintSupplier.apply(card);
+    }
+
     private int countTokens(List<Token> tokensInSection){
         if (tokensInSection == null || tokensInSection.isEmpty())
             return 0;
@@ -487,27 +613,31 @@ public class DeckImportController {
         if (tokens.isEmpty()) { return null; }
 
         String deckName = "";
-        if (currentDeckName != null && currentDeckName.trim().length() > 0)
+        if (currentDeckName != null && !currentDeckName.trim().isEmpty())
             deckName = String.format("\"%s\"", currentDeckName.trim());
 
         String tokenDeckName = getTokenDeckNameIfAny();
-        if (tokenDeckName.length() > 0)
+        if (!tokenDeckName.isEmpty())
             tokenDeckName = String.format("\"%s\"", tokenDeckName);
 
-        if (createNewDeck){
-            String extraWarning = currentDeckNotEmpty ? localizer.getMessage("lblNewDeckWarning", deckName) : "";
-            final String warning = localizer.getMessage("lblConfirmCreateNewDeck", tokenDeckName, extraWarning);
-            if (!SOptionPane.showConfirmDialog(warning, localizer.getMessage("lblNewDeckDialogTitle"),
-                    localizer.getMessage("lblYes"), localizer.getMessage("lblNo"))) {
-                return null;
+        if(this.currentDeckNotEmpty) {
+            final String warning;
+            final String title;
+            if (this.importBehavior == ImportBehavior.CREATE_NEW) {
+                String extraWarning = localizer.getMessage("lblNewDeckWarning", deckName);
+                warning = localizer.getMessage("lblConfirmCreateNewDeck", tokenDeckName, extraWarning);
+                title = localizer.getMessage("lblNewDeckDialogTitle");
+            } else if (this.importBehavior == ImportBehavior.MERGE){
+                String extraWarning = (!tokenDeckName.isEmpty() && !tokenDeckName.equals(deckName)) ?
+                        localizer.getMessage("lblCardImportWarning", deckName, tokenDeckName) : "";
+                warning = localizer.getMessage("lblConfirmCardImport", deckName, extraWarning);
+                title = localizer.getMessage("lblImportCardsDialogTitle");
             }
-        }
-        else if (this.currentDeckNotEmpty){
-            String extraWarning = (tokenDeckName.length() > 0 && !tokenDeckName.equals(deckName)) ?
-                    localizer.getMessage("lblCardImportWarning", deckName, tokenDeckName) : "";
-            final String warning = localizer.getMessage("lblConfirmCardImport", deckName, extraWarning);
-            if (!SOptionPane.showConfirmDialog(warning,
-                    localizer.getMessage("lblImportCardsDialogTitle"),
+            else {
+                warning = localizer.getMessage("lblConfirmReplaceDeck", deckName);
+                title = localizer.getMessage("lblNewDeckDialogTitle");
+            }
+            if (!SOptionPane.showConfirmDialog(warning, title,
                     localizer.getMessage("lblYes"), localizer.getMessage("lblNo")))
                 return null;
         }
@@ -516,7 +646,7 @@ public class DeckImportController {
             final TokenType type = t.getType();
             // only Deck Name, legal card and limited card tokens will be analysed!
             if (!t.isTokenForDeck() ||
-                    (type == TokenType.LIMITED_CARD && !this.inlcludeBnRInDeck))
+                    (type == TokenType.LIMITED_CARD && !this.includeBnRInDeck))
                 continue;  // SKIP token
 
             if (type == TokenType.DECK_NAME) {
@@ -547,4 +677,66 @@ public class DeckImportController {
         }
         return "";  // no deck name
     }
+
+    public String getTokenMessage(DeckRecognizer.Token token) {
+        return switch (token.getType()) {
+            case LEGAL_CARD, LIMITED_CARD, CARD_FROM_NOT_ALLOWED_SET, CARD_FROM_INVALID_SET,
+                 CARD_NOT_IN_INVENTORY, FREE_CARD_NOT_IN_INVENTORY ->
+                    String.format("%s x %s %s", token.getQuantity(), token.getText(), getTokenFoilLabel(token));
+            // Card Warning Msgs
+            case UNKNOWN_CARD, UNSUPPORTED_CARD ->
+                    token.getQuantity() > 0 ? String.format("%s x %s", token.getQuantity(), token.getText())
+                            : token.getText();
+            case UNSUPPORTED_DECK_SECTION ->
+                    String.format("%s: %s", Localizer.getInstance().getMessage("lblWarningMsgPrefix"),
+                            Localizer.getInstance()
+                                    .getMessage("lblWarnDeckSectionNotAllowedInEditor", token.getText(),
+                                            this.currentGameType.name()));
+
+            // Special Case of Card moved into another section (e.g. Commander from Sideboard)
+            case WARNING_MESSAGE -> String.format("%s: %s", Localizer.getInstance()
+                    .getMessage("lblWarningMsgPrefix"), token.getText());
+
+            // Placeholders
+            case DECK_SECTION_NAME -> String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckSection"),
+                    token.getText());
+            case CARD_RARITY -> String.format("%s: %s", Localizer.getInstance().getMessage("lblRarity"),
+                    token.getText());
+            case CARD_TYPE, CARD_CMC, MANA_COLOUR, COMMENT, UNKNOWN_TEXT -> token.getText();
+            case DECK_NAME -> String.format("%s: %s", Localizer.getInstance().getMessage("lblDeckName"),
+                    token.getText());
+        };
+    }
+
+    public String getTokenStatusMessage(DeckRecognizer.Token token) {
+        if (token == null)
+            return "";
+
+        final Localizer localizer = Localizer.getInstance();
+        return switch (token.getType()) {
+            case LIMITED_CARD -> String.format("%s: %s", localizer.getMessage("lblWarningMsgPrefix"),
+                    localizer.getMessage("lblWarnLimitedCard",
+                            StringUtils.capitalize(token.getLimitedCardType().name()), getGameFormatLabel()));
+            case CARD_FROM_NOT_ALLOWED_SET ->
+                    localizer.getMessage("lblErrNotAllowedCard", getGameFormatLabel());
+            case CARD_FROM_INVALID_SET -> localizer.getMessage("lblErrCardEditionDate");
+            case UNSUPPORTED_CARD -> localizer.getMessage("lblErrUnsupportedCard", this.currentGameType);
+            case UNKNOWN_CARD -> String.format("%s: %s", localizer.getMessage("lblWarningMsgPrefix"),
+                    localizer.getMessage("lblWarnUnknownCardMsg"));
+            case CARD_NOT_IN_INVENTORY -> localizer.getMessage("lblWarnNotInInventory");
+            default -> "";
+        };
+    }
+
+
+    private String getTokenFoilLabel(DeckRecognizer.Token token) {
+        if (!token.isCardToken())
+            return "";
+        final String foilMarker = "- (Foil)";
+        return token.getCard().isFoil() ? foilMarker : "";
+    }
+
+    private String getGameFormatLabel() {
+        return String.format("\"%s\"", this.getCurrentGameFormatName());
+    }
 }
diff --git a/forge-gui/src/main/java/forge/deck/DeckProxy.java b/forge-gui/src/main/java/forge/deck/DeckProxy.java
index d0c473003c5..ae90813cf6d 100644
--- a/forge-gui/src/main/java/forge/deck/DeckProxy.java
+++ b/forge-gui/src/main/java/forge/deck/DeckProxy.java
@@ -774,7 +774,7 @@ public class DeckProxy implements InventoryItem {
 
         for (PaperCard c : deck.getAllCardsInASinglePool().toFlatList()) {
             CardEdition edition = FModel.getMagicDb().getEditions().get(c.getEdition());
-            if (edition == null)
+            if (edition == null || !edition.hasBasicLands())
                 continue;
             availableEditions.add(edition);
         }
diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java
index a2c6080bf14..f42980bdbd2 100644
--- a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java
+++ b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java
@@ -19,6 +19,7 @@ package forge.gamemodes.limited;
 
 import forge.StaticData;
 import forge.card.CardEdition;
+import forge.card.DraftOptions;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
@@ -54,15 +55,17 @@ public class BoosterDraft implements IBoosterDraft {
     private int nextId = 0;
     private static final int N_PLAYERS = 8;
     public static final String FILE_EXT = ".draft";
+
+    int podSize;
     private final List<LimitedPlayer> players = new ArrayList<>();
     private final LimitedPlayer localPlayer;
     private boolean readyForComputerPick = false;
 
     private IDraftLog draftLog = null;
 
-    private String doublePickDuringDraft = ""; // "FirstPick" or "Always"
     private boolean shouldShowDraftLog = false;
 
+    private DraftOptions.DoublePick doublePickDuringDraft;
     protected int nextBoosterGroup = 0;
     private int currentBoosterSize = 0;
     private int currentBoosterPick = 0;
@@ -80,6 +83,7 @@ public class BoosterDraft implements IBoosterDraft {
         if (!draft.generateProduct()) {
             return null;
         }
+
         draft.initializeBoosters();
         return draft;
     }
@@ -157,11 +161,15 @@ public class BoosterDraft implements IBoosterDraft {
                     CardEdition edition = FModel.getMagicDb().getEditions().get(setCode);
                     // If this is metaset, edtion will be null
                     if (edition != null) {
-                        doublePickDuringDraft = edition.getDoublePickDuringDraft();
+                        if (podSize != edition.getDraftOptions().getRecommendedPodSize()) {
+                            // Auto choosing recommended pod size. In the future we may want to allow user to choose
+                            setPodSize(edition.getDraftOptions().getRecommendedPodSize());
+                        }
+                        doublePickDuringDraft = edition.getDraftOptions().isDoublePick(this.getPodSize());
                     }
 
                     final IUnOpenedProduct product1 = block.getBooster(setCode);
-
+                    // lets associate the booster here so we can reference it later
                     for (int i = 0; i < nPacks; i++) {
                         this.product.add(product1);
                     }
@@ -267,8 +275,24 @@ public class BoosterDraft implements IBoosterDraft {
     }
 
     public static BoosterDraft createDraft(final LimitedPoolType draftType, final CardBlock block, final String[] boosters) {
+        return createDraft(draftType, block, boosters, null);
+    }
+
+    public static BoosterDraft createDraft(final LimitedPoolType draftType, final CardBlock block, final String[] boosters, Integer numPlayers) {
         final BoosterDraft draft = new BoosterDraft(draftType);
 
+        String setCode = boosters[0];
+        CardEdition edition = FModel.getMagicDb().getEditions().get(setCode);
+        // If this is metaset, edtion will be null
+        if (edition != null) {
+            // Auto choosing recommended pod size. If we've chosen the podsize it should be passed in via numPlayers
+            int newPodSize = Objects.requireNonNullElseGet(numPlayers, () -> edition.getDraftOptions().getRecommendedPodSize());
+            if (newPodSize != draft.getPodSize()) {
+                draft.setPodSize(edition.getDraftOptions().getRecommendedPodSize());
+            }
+            draft.doublePickDuringDraft = edition.getDraftOptions().isDoublePick(draft.getPodSize());
+        }
+
         for (String booster : boosters) {
             try {
                 draft.product.add(block.getBooster(booster));
@@ -296,10 +320,11 @@ public class BoosterDraft implements IBoosterDraft {
 
     protected BoosterDraft(final LimitedPoolType draftType, int numPlayers) {
         this.draftFormat = draftType;
+        this.podSize = numPlayers;
 
         localPlayer = new LimitedPlayer(0, this);
         players.add(localPlayer);
-        for (int i = 1; i < numPlayers; i++) {
+        for (int i = 1; i < this.podSize; i++) {
             players.add(new LimitedPlayerAI(i, this));
         }
     }
@@ -309,6 +334,25 @@ public class BoosterDraft implements IBoosterDraft {
         return new DraftPack(product.get(), nextId++);
     }
 
+    public void setPodSize(int size) {
+        if (size < 2 || size > N_PLAYERS) {
+            throw new IllegalArgumentException("BoosterDraft : invalid pod size " + size);
+        }
+        this.podSize = size;
+
+        // Resize players list if it was already generated
+        while (this.players.size() < this.podSize) {
+            this.players.add(new LimitedPlayerAI(this.players.size(), this));
+        }
+        while (this.players.size() > this.podSize) {
+            this.players.remove(this.players.size() - 1);
+        }
+    }
+
+    public int getPodSize() {
+        return this.podSize;
+    }
+
     @Override
     public boolean isPileDraft() {
         return false;
@@ -336,7 +380,7 @@ public class BoosterDraft implements IBoosterDraft {
 
     @Override
     public LimitedPlayer getNeighbor(LimitedPlayer player, boolean left) {
-        return players.get((player.order + (left ? 1 : -1) + N_PLAYERS) % N_PLAYERS);
+        return players.get((player.order + (left ? 1 : -1) + this.podSize) % this.podSize);
     }
 
     private void setupCustomDraft(final CustomLimited draft) {
@@ -347,6 +391,8 @@ public class BoosterDraft implements IBoosterDraft {
 
         final SealedTemplate tpl = draft.getSealedProductTemplate();
 
+        // TODO Determine PodSize from custom draft
+
         final UnOpenedProduct toAdd = new UnOpenedProduct(tpl, dPool);
         toAdd.setLimitedPool(draft.isSingleton());
         for (int i = 0; i < draft.getNumPacks(); i++) {
@@ -395,7 +441,7 @@ public class BoosterDraft implements IBoosterDraft {
                 CompletableFuture.allOf(futuresArray).join();
                 futures.clear();
             }
-            // stream().toList() causes crash on Android, use Collectors.toList()
+            // stream().toList() causes crash on Android 8-13, use Collectors.toList()
             customs.addAll(queue.stream().collect(Collectors.toList()));
         }
         return customs;
@@ -438,7 +484,7 @@ public class BoosterDraft implements IBoosterDraft {
     public void initializeBoosters() {
 
         for (Supplier<List<PaperCard>> boosterRound : this.product) {
-            for (int i = 0; i < N_PLAYERS; i++) {
+            for (int i = 0; i < this.podSize; i++) {
                 DraftPack pack = new DraftPack(boosterRound.get(), nextId++);
                 this.players.get(i).receiveUnopenedPack(pack);
             }
@@ -454,6 +500,7 @@ public class BoosterDraft implements IBoosterDraft {
         if (firstPlayer.unopenedPacks.isEmpty()) {
             return false;
         }
+        // todo set pick two logic  for this booster group
 
         for (LimitedPlayer pl : this.players) {
             pl.newPack();
@@ -467,8 +514,8 @@ public class BoosterDraft implements IBoosterDraft {
 
     @Override
     public Deck[] getComputerDecks() {
-        Deck[] decks = new Deck[7];
-        for (int i = 1; i < N_PLAYERS; i++) {
+        Deck[] decks = new Deck[this.podSize - 1];
+        for (int i = 1; i < this.podSize; i++) {
             decks[i - 1] = ((LimitedPlayerAI) this.players.get(i)).buildDeck(IBoosterDraft.LAND_SET_CODE[0] != null ? IBoosterDraft.LAND_SET_CODE[0].getCode() : null);
         }
         return decks;
@@ -476,7 +523,7 @@ public class BoosterDraft implements IBoosterDraft {
 
     @Override
     public LimitedPlayer[] getOpposingPlayers() {
-        return this.players.subList(1, players.size()).toArray(new LimitedPlayer[7]);
+        return this.players.subList(1, players.size()).toArray(new LimitedPlayer[this.podSize - 1]);
     }
 
     @Override
@@ -501,9 +548,9 @@ public class BoosterDraft implements IBoosterDraft {
     public void passPacks() {
         // Alternate direction of pack passing
         int adjust = this.nextBoosterGroup % 2 == 1 ? 1 : -1;
-        if ("FirstPick".equals(this.doublePickDuringDraft) && currentBoosterPick == 1) {
+        if (DraftOptions.DoublePick.FIRST_PICK.equals(this.doublePickDuringDraft) && currentBoosterPick == 0) {
             adjust = 0;
-        } else if (currentBoosterPick % 2 == 1 && "Always".equals(this.doublePickDuringDraft)) {
+        } else if (currentBoosterPick % 2 == 0 && DraftOptions.DoublePick.ALWAYS.equals(this.doublePickDuringDraft)) {
             // This may not work with Conspiracy cards that mess with the draft
             // But it probably doesn't matter since Conspiracy doesn't have double pick?
             adjust = 0;
@@ -518,7 +565,7 @@ public class BoosterDraft implements IBoosterDraft {
         }
 
         Map<DraftPack, LimitedPlayer> toPass = new HashMap<>();
-        for (int i = 0; i < N_PLAYERS; i++) {
+        for (int i = 0; i < this.podSize; i++) {
             LimitedPlayer pl = this.players.get(i);
             DraftPack passingPack = pl.passPack();
 
@@ -555,7 +602,7 @@ public class BoosterDraft implements IBoosterDraft {
             }
 
             if (passToPlayer == null) {
-                passToPlayer = this.players.get((i + adjust + N_PLAYERS) % N_PLAYERS);
+                passToPlayer = this.players.get((i + adjust + this.podSize) % this.podSize);
             }
 
             assert(!toPass.containsKey(passingPack));
@@ -573,7 +620,7 @@ public class BoosterDraft implements IBoosterDraft {
 
     protected void computerChoose() {
         // Loop through players 1-7 to draft their current pack
-        for (int i = 1; i < N_PLAYERS; i++) {
+        for (int i = 1; i < this.podSize; i++) {
             LimitedPlayer pl = this.players.get(i);
             if (pl.shouldSkipThisPick()) {
                 pl.debugPrint("Skipped (shouldSkipThisPick)");
diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CubeImporter.java b/forge-gui/src/main/java/forge/gamemodes/limited/CubeImporter.java
index 9dcafb9c37a..765d7c0ff11 100644
--- a/forge-gui/src/main/java/forge/gamemodes/limited/CubeImporter.java
+++ b/forge-gui/src/main/java/forge/gamemodes/limited/CubeImporter.java
@@ -50,7 +50,7 @@ public class CubeImporter {
         }
     }
 
-    private static CustomLimited parseFromURL(final URL url) {
+    private CustomLimited parseFromURL(final URL url) {
         // Use a generic 15-cards booster template with no rarity slots
         // Nice to have: Infos about the slots and the draft format can be found on the platform and imported via JSON api.
         List<Pair<String, Integer>> slots = SealedTemplate.genericNoSlotBooster.getSlots();
@@ -70,7 +70,7 @@ public class CubeImporter {
         cd.setCardPool(deckCube.getMain());
 
         // Save the cube ID in preferences as the last imported cube
-        FModel.getPreferences().setPref(ForgePreferences.FPref.LAST_IMPORTED_CUBE_ID, deckCube.getName());
+        FModel.getPreferences().setPref(ForgePreferences.FPref.LAST_IMPORTED_CUBE_ID, parseCubeId(url.toString()));
         FModel.getPreferences().save();
 
         return cd;
@@ -83,7 +83,7 @@ public class CubeImporter {
      * "https://cubecobra.com/cube/list/cubeid",
      * it returns "cubeid".
      * Otherwise, it returns the string as is considering it as a plain cube ID.
-     * @param inputStr
+     * @param inputStr the input string which can be a cube ID or a URL
      * @return string representing the cube ID
      */
     private String parseCubeId(String inputStr) {
@@ -92,10 +92,8 @@ public class CubeImporter {
                 String[] parts = inputStr.trim().split("/");
                 yield parts[parts.length - 1];
             }
-            case CUBEARTISAN -> {
-                // Not implemented yet, but could be similar to CubeCobra
-                yield null;
-            }
+            case CUBEARTISAN -> // Not implemented yet, but could be similar to CubeCobra
+                null;
         };
 
         // Check if parsedStr is alphanumeric only, allow hyphens as well since full Cube IDs can contain them
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
index 7d9d879b8bb..5226a923e36 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
@@ -350,9 +350,9 @@ public class HostedMatch {
         @Override
         public Void visit(final UiEventBlockerAssigned event) {
             for (final PlayerControllerHuman humanController : humanControllers) {
-                humanController.getGui().updateSingleCard(event.blocker);
+                humanController.getGui().updateSingleCard(event.blocker());
                 final PlayerView p = humanController.getPlayer().getView();
-                if (event.attackerBeingBlocked != null && event.attackerBeingBlocked.getController().equals(p)) {
+                if (event.attackerBeingBlocked() != null && event.attackerBeingBlocked().getController().equals(p)) {
                     humanController.getGui().autoPassCancel(p);
                 }
             }
@@ -362,27 +362,27 @@ public class HostedMatch {
         @Override
         public Void visit(final UiEventAttackerDeclared event) {
             for (final PlayerControllerHuman humanController : humanControllers) {
-                humanController.getGui().updateSingleCard(event.attacker);
+                humanController.getGui().updateSingleCard(event.attacker());
             }
             return null;
         }
 
         @Override
         public Void visit(final UiEventNextGameDecision event) {
-            addNextGameDecision(event.getController(), event.getDecision());
+            addNextGameDecision(event.controller(), event.decision());
             return null;
         }
 
         @Override
         public Void visit(final GameEventSubgameStart event) {
             subGameCount++;
-            event.subgame.subscribeToEvents(SoundSystem.instance);
-            event.subgame.subscribeToEvents(visitor);
+            event.subgame().subscribeToEvents(SoundSystem.instance);
+            event.subgame().subscribeToEvents(visitor);
 
-            final GameView gameView = event.subgame.getView();
+            final GameView gameView = event.subgame().getView();
 
             Runnable switchGameView = () -> {
-                for (final Player p : event.subgame.getPlayers()) {
+                for (final Player p : event.subgame().getPlayers()) {
                     if (p.getController() instanceof PlayerControllerHuman) {
                         final PlayerControllerHuman humanController = (PlayerControllerHuman) p.getController();
                         final IGuiGame gui = guis.get(p.getRegisteredPlayer());
@@ -393,8 +393,8 @@ public class HostedMatch {
                         gui.openView(new TrackableCollection<>(p.getView()));
                         gui.setGameView(null);
                         gui.setGameView(gameView);
-                        event.subgame.subscribeToEvents(new FControlGameEventHandler(humanController));
-                        gui.message(event.message);
+                        event.subgame().subscribeToEvents(new FControlGameEventHandler(humanController));
+                        gui.message(event.message());
                     }
                 }
             };
@@ -404,7 +404,7 @@ public class HostedMatch {
                 GuiBase.getInterface().invokeInEdtAndWait(switchGameView);
 
             //ensure opponents set properly
-            for (final Player p : event.subgame.getPlayers()) {
+            for (final Player p : event.subgame().getPlayers()) {
                 p.updateOpponentsForView();
             }
 
@@ -413,9 +413,9 @@ public class HostedMatch {
 
         @Override
         public Void visit(final GameEventSubgameEnd event) {
-            final GameView gameView = event.maingame.getView();
+            final GameView gameView = event.maingame().getView();
             Runnable switchGameView = () -> {
-                for (final Player p : event.maingame.getPlayers()) {
+                for (final Player p : event.maingame().getPlayers()) {
                     if (p.getController() instanceof PlayerControllerHuman) {
                         final PlayerControllerHuman humanController = (PlayerControllerHuman) p.getController();
                         final IGuiGame gui = guis.get(p.getRegisteredPlayer());
@@ -426,7 +426,7 @@ public class HostedMatch {
                         gui.setGameView(null);
                         gui.setGameView(gameView);
                         gui.updatePhase(true);
-                        gui.message(event.message);
+                        gui.message(event.message());
                     }
                 }
             };
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java
index b7e6bb21952..ece5b77ad90 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java
@@ -246,10 +246,8 @@ public abstract class InputPayMana extends InputSyncronizedBase {
                 int maAmount = ma.totalAmountOfManaGenerated(saPaidFor, true);
                 if (amountOfMana == -1) {
                     amountOfMana = maAmount;
-                } else {
-                    if (amountOfMana != maAmount) {
-                        guessAbilityWithRequiredColors = false;
-                    }
+                } else if (amountOfMana != maAmount) {
+                    guessAbilityWithRequiredColors = false;
                 }
 
                 abilitiesMap.put(ma.getView(), ma);
@@ -278,7 +276,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
 
             // If the card has any ability that tracks mana spent, skip express Mana choice
             if (saPaidFor.tracksManaSpent()) {
-                colorCanUse = ColorSet.ALL_COLORS.getColor();
+                colorCanUse = ColorSet.WUBRG.getColor();
                 guessAbilityWithRequiredColors = false;
             }
 
@@ -290,8 +288,7 @@ public abstract class InputPayMana extends InputSyncronizedBase {
                     //avoid unnecessary prompt by pretending we need White
                     //for the sake of "Add one mana of any color" effects
                     colorNeeded = MagicColor.WHITE;
-                }
-                else {
+                } else {
                     final HashMap<SpellAbilityView, SpellAbility> colorMatches = new HashMap<>();
                     for (SpellAbility sa : abilitiesMap.values()) {
                         if (sa.isManaAbilityFor(saPaidFor, colorNeeded)) {
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java
index dd191418360..6861b922ddd 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java
@@ -169,9 +169,12 @@ public final class InputSelectTargets extends InputSyncronizedBase {
         // TODO should use sa.canTarget(card) instead?
         // it doesn't have messages
 
-        if (sa.isSpell() && sa.getHostCard().isAura() && !card.canBeAttached(sa.getHostCard(), sa)) {
-            showMessage(sa.getHostCard() + " - Cannot enchant this card (Shroud? Protection? Restrictions?).");
-            return false;
+        if (sa.isSpell() && sa.getHostCard().isAura()) {
+            String msg = card.cantBeAttachedMsg(sa.getHostCard(), sa);
+            if (msg != null) {
+                showMessage(sa.getHostCard() + " - " + msg);
+                return false;
+            }
         }
         //If the card is not a valid target
         if (!card.canBeTargetedBy(sa)) {
@@ -179,12 +182,6 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             return false;
         }
 
-        // If all cards must be from the same zone
-        if (tgt.isSingleZone() && lastTarget != null && !card.getController().equals(lastTarget.getController())) {
-            showMessage(sa.getHostCard() + " - Cannot target this card (not in the same zone)");
-            return false;
-        }
-
         // If the cards can't share a creature type
         if (tgt.isWithoutSameCreatureType() && lastTarget != null && card.sharesCreatureTypeWith(lastTarget)) {
             showMessage(sa.getHostCard() + " - Cannot target this card (should not share a creature type)");
@@ -273,7 +270,6 @@ public final class InputSelectTargets extends InputSyncronizedBase {
                 showMessage(sa.getHostCard() + " - Cannot target this card (must have equal toughness)");
                 return false;
             }
-
         }
 
         // If all cards must have different mana values
@@ -291,6 +287,15 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             }
         }
 
+        if (tgt.isDifferentNames()) {
+            for (final GameObject o : targets) {
+                if (o instanceof Card c && c.sharesNameWith(card)) {
+                    showMessage(sa.getHostCard() + " - Cannot target this card (must have different names)");
+                    return false;
+                }
+            }
+        }
+
         if (!choices.contains(card)) {
             showMessage(sa.getHostCard() + " - The selected card is not a valid choice to be targeted.");
             return false;
@@ -400,15 +405,18 @@ public final class InputSelectTargets extends InputSyncronizedBase {
     }
 
     private void removeTarget(final GameEntity ge) {
+        if (divisionValues != null) {
+            divisionValues.add(sa.getDividedValue(ge));
+        }
         targets.remove(ge);
         sa.getTargets().remove(ge);
-        if (ge instanceof Card) {
-            getController().getGui().setUsedToPay(CardView.get((Card) ge), false);
+        if (ge instanceof Card c) {
+            getController().getGui().setUsedToPay(CardView.get(c), false);
             // try to get last selected card
             lastTarget = Iterables.getLast(IterableUtil.filter(targets, Card.class), null);
         }
-        else if (ge instanceof Player) {
-            getController().getGui().setHighlighted(PlayerView.get((Player) ge), false);
+        else if (ge instanceof Player p) {
+            getController().getGui().setHighlighted(PlayerView.get(p), false);
         }
 
         this.showMessage();
diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
index 544a57e84db..778f989cab3 100644
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
@@ -18,15 +18,11 @@
 package forge.gamemodes.planarconquest;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import forge.card.CardDb;
 import forge.gamemodes.planarconquest.ConquestPreferences.CQPref;
@@ -199,14 +195,11 @@ public final class ConquestData {
     }
 
     public int getAccessiblePlaneCount() {
-        // TODO: Java 8 stream implementation of filtering
-        int i = 0;
-        for (ConquestPlane plane : FModel.getPlanes()) {
-            if (!plane.isUnreachable()) {
-                i++;
-            }
-        }
-        return i;
+        return (int) FModel.getPlanes().stream().filter(Predicate.not(ConquestPlane::isUnreachable)).count();
+    }
+
+    public Set<ConquestPlane> getUnlockedPlanes() {
+        return planeDataMap.values().stream().map(ConquestPlaneData::getLocation).map(ConquestLocation::getPlane).collect(Collectors.toSet());
     }
 
     public void unlockPlane(ConquestPlane plane) {
@@ -301,8 +294,8 @@ public final class ConquestData {
                     commandersUsingCard.append("\n").append(CardTranslation.getTranslatedName(commander.getName()));
                 }
             }
-
-            if (commandersUsingCard.length() > 0) {
+            // Android API StringBuilder isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+            if (commandersUsingCard.length() != 0) {
                 SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCommandersCardCannotBeExiledByCard", CardTranslation.getTranslatedName(card.getName()), commandersUsingCard), title, SOptionPane.INFORMATION_ICON);
                 return false;
             }
diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java
index 70caed02419..dc51523487f 100644
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPlane.java
@@ -50,6 +50,7 @@ public class ConquestPlane {
     private FCollection<PaperCard> commanders;
     private ConquestAwardPool awardPool;
     private ConquestEvent[] events;
+    private final Set<CardEdition> editions = new HashSet<>();
 
     private ConquestPlane(String name0, String description0, int regionSize0, boolean unreachable0) {
         name = name0;
@@ -153,6 +154,10 @@ public class ConquestPlane {
         return planeCards;
     }
 
+    public Set<CardEdition> getEditions() {
+        return editions;
+    }
+
     private void ensureRegionsLoaded() {
         if (regions != null) { return; }
 
@@ -193,6 +198,8 @@ public class ConquestPlane {
             if (edition == null)
                 continue;
 
+            editions.add(edition);
+
             for (EditionEntry card : edition.getObtainableCards()) {
                 if (bannedCardSet == null || !bannedCardSet.contains(card.name())) {
                     addCard(commonCards.getCard(card.name(), setCode));
diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPreferences.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPreferences.java
index ac7a8485c4a..317a2bbfffc 100644
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPreferences.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestPreferences.java
@@ -21,6 +21,7 @@ import java.io.Serializable;
 
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.properties.PreferencesStore;
+import forge.model.FModel;
 
 @SuppressWarnings("serial")
 public class ConquestPreferences extends PreferencesStore<ConquestPreferences.CQPref> implements Serializable {
@@ -74,7 +75,7 @@ public class ConquestPreferences extends PreferencesStore<ConquestPreferences.CQ
     @Override
     public void save() {
         super.save();
-        ConquestUtil.updateRarityFilterOdds();
+        ConquestUtil.updateRarityFilterOdds(FModel.getConquestPreferences());
     }
 
     protected CQPref[] getEnumValues() {
diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
index 36481c91475..bcab7af219c 100644
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestRegion.java
@@ -105,7 +105,7 @@ public class ConquestRegion {
         protected ConquestRegion read(String line) {
             String name = null;
             String artCardName = null;
-            ColorSet colorSet = ColorSet.ALL_COLORS;
+            ColorSet colorSet = ColorSet.WUBRG;
             Predicate<PaperCard> pred = x -> true;
 
             String key, value;
diff --git a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
index e70544d620b..46a81c04541 100644
--- a/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
+++ b/forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
@@ -1,23 +1,16 @@
 package forge.gamemodes.planarconquest;
 
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import forge.card.CardRarity;
-import forge.card.CardRules;
-import forge.card.CardType;
+import forge.card.*;
 import forge.card.CardType.CoreType;
-import forge.card.ColorSet;
-import forge.card.MagicColor;
-import forge.card.mana.ManaCostShard;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckFormat;
@@ -109,9 +102,9 @@ public class ConquestUtil {
         while (true) {
             name = SOptionPane.showInputDialog(Localizer.getInstance().getMessage("lblHistoriiansWillRecallYourConquestAs"), Localizer.getInstance().getMessage("lblConquestName"));
             if (name == null) { return null; }
-    
+
             name = QuestUtil.cleanString(name);
-    
+
             if (name.isEmpty()) {
                 SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblPleaseSpecifyConquestName"));
                 continue;
@@ -143,6 +136,27 @@ public class ConquestUtil {
         return pool;
     }
 
+    public static List<CardEdition> getBasicLandSets(Deck currentDeck) {
+        ConquestData model = FModel.getConquest().getModel();
+        List<ConquestPlane> planes = new ArrayList<>(model.getUnlockedPlanes());
+        ConquestPlane currentPlane = model.getCurrentPlane();
+        //Move the current plane to the front.
+        if(currentPlane != null && planes.contains(currentPlane)) {
+            planes.remove(currentPlane);
+            planes.add(0, currentPlane);
+        }
+        //Move editions of cards already in the deck to the front.
+        Map<CardEdition, Integer> editionStats = currentDeck.getAllCardsInASinglePool().getCardEditionStatistics(true);
+        // use flatMap instead of mapMulti for Android 13 and below
+        //https://developer.android.com/reference/java/util/stream/Stream#mapMulti
+        List<CardEdition> out = planes.stream()
+            .flatMap(p -> p.getEditions().stream())
+            .filter(CardEdition::hasBasicLands)
+            .sorted(Comparator.comparing(e -> editionStats.getOrDefault(e, 0)))
+            .collect(Collectors.toList());
+        return out;
+    }
+
     public static ConquestPlane getPlaneByName(String planeName) {
         for (ConquestPlane plane : FModel.getPlanes()) {
             if (plane.getName().equals(planeName)) {
@@ -189,242 +203,38 @@ public class ConquestUtil {
     public static int getShardValue(CardRarity rarity, CQPref baseValuePref) {
         ConquestPreferences prefs = FModel.getConquestPreferences();
         int baseValue = prefs.getPrefInt(baseValuePref);
-        switch (rarity) {
-        case Common:
-            return baseValue;
-        case Uncommon:
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_UNCOMMON_MULTIPLIER));
-        case Rare:
-        case Special:
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_RARE_MULTIPLIER));
-        case MythicRare:
-            return Math.round((float)baseValue * (float)prefs.getPrefInt(CQPref.AETHER_MYTHIC_MULTIPLIER));
-        default:
-            return 0;
-        }
+        return switch (rarity) {
+            case Common -> baseValue;
+            case Uncommon ->
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_UNCOMMON_MULTIPLIER));
+            case Rare, Special ->
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_RARE_MULTIPLIER));
+            case MythicRare ->
+                    Math.round((float) baseValue * (float) prefs.getPrefInt(CQPref.AETHER_MYTHIC_MULTIPLIER));
+            default -> 0;
+        };
     }
 
-    public enum AEtherFilter implements IHasSkinProp {
-        C (null, new ColorFilter(MagicColor.COLORLESS), "Playable in {C}"),
-        W (null, new ColorFilter(MagicColor.WHITE), "Playable in {W}"),
-        U (null, new ColorFilter(MagicColor.BLUE), "Playable in {U}"),
-        B (null, new ColorFilter(MagicColor.BLACK), "Playable in {B}"),
-        R (null, new ColorFilter(MagicColor.RED), "Playable in {R}"),
-        G (null, new ColorFilter(MagicColor.GREEN), "Playable in {G}"),
-
-        WU (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE), "Playable in {W}{U}"),
-        WB (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLACK), "Playable in {W}{B}"),
-        UB (null, new ColorFilter(MagicColor.BLUE | MagicColor.BLACK), "Playable in {U}{B}"),
-        UR (null, new ColorFilter(MagicColor.BLUE | MagicColor.RED), "Playable in {U}{R}"),
-        BR (null, new ColorFilter(MagicColor.BLACK | MagicColor.RED), "Playable in {B}{R}"),
-        BG (null, new ColorFilter(MagicColor.BLACK | MagicColor.GREEN), "Playable in {B}{G}"),
-        RG (null, new ColorFilter(MagicColor.RED | MagicColor.GREEN), "Playable in {R}{G}"),
-        RW (null, new ColorFilter(MagicColor.RED | MagicColor.WHITE), "Playable in {R}{W}"),
-        GW (null, new ColorFilter(MagicColor.GREEN | MagicColor.WHITE), "Playable in {G}{W}"),
-        GU (null, new ColorFilter(MagicColor.GREEN | MagicColor.BLUE), "Playable in {G}{U}"),
-
-        WUB (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK), "Playable in {W}{U}{B}"),
-        WBG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLACK | MagicColor.GREEN), "Playable in {W}{B}{G}"),
-        UBR (null, new ColorFilter(MagicColor.BLUE | MagicColor.BLACK | MagicColor.RED), "Playable in {U}{B}{R}"),
-        URW (null, new ColorFilter(MagicColor.BLUE | MagicColor.RED | MagicColor.WHITE), "Playable in {U}{R}{W}"),
-        BRG (null, new ColorFilter(MagicColor.BLACK | MagicColor.RED | MagicColor.GREEN), "Playable in {B}{R}{G}"),
-        BGU (null, new ColorFilter(MagicColor.BLACK | MagicColor.GREEN | MagicColor.BLUE), "Playable in {B}{G}{U}"),
-        RGW (null, new ColorFilter(MagicColor.RED | MagicColor.GREEN | MagicColor.WHITE), "Playable in {R}{G}{W}"),
-        RWB (null, new ColorFilter(MagicColor.RED | MagicColor.WHITE | MagicColor.BLACK), "Playable in {R}{W}{B}"),
-        GWU (null, new ColorFilter(MagicColor.GREEN | MagicColor.WHITE | MagicColor.BLUE), "Playable in {G}{W}{U}"),
-        GUR (null, new ColorFilter(MagicColor.GREEN | MagicColor.BLUE | MagicColor.RED), "Playable in {G}{U}{R}"),
-
-        WUBR (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK | MagicColor.RED), "Playable in {W}{U}{B}{R}"),
-        WUBG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.BLACK | MagicColor.GREEN), "Playable in {W}{U}{B}{G}"),
-        WURG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLUE | MagicColor.RED | MagicColor.GREEN), "Playable in {W}{U}{R}{G}"),
-        WBRG (null, new ColorFilter(MagicColor.WHITE | MagicColor.BLACK | MagicColor.RED | MagicColor.GREEN), "Playable in {W}{B}{R}{G}"),
-        UBRG (null, new ColorFilter(MagicColor.BLUE | MagicColor.BLACK | MagicColor.RED | MagicColor.GREEN), "Playable in {U}{B}{R}{G}"),
-
-        WUBRG     (null, new ColorFilter(MagicColor.ALL_COLORS), "Playable in {W}{U}{B}{R}{G}"),
-
-        CREATURE              (FSkinProp.IMG_CREATURE, new TypeFilter(EnumSet.of(CoreType.Creature)), "Creature"),
-        NONCREATURE_PERMANENT (FSkinProp.IMG_ENCHANTMENT, new TypeFilter(EnumSet.of(CoreType.Artifact, CoreType.Enchantment, CoreType.Planeswalker, CoreType.Land), EnumSet.of(CoreType.Creature)), "Noncreature Permanent"),
-        INSTANT_SORCERY       (FSkinProp.IMG_SORCERY, new TypeFilter(EnumSet.of(CoreType.Instant, CoreType.Sorcery)), "Instant or Sorcery"),
-
-        COMMON   (FSkinProp.IMG_PW_BADGE_COMMON, new RarityFilter(EnumSet.of(CardRarity.Common, CardRarity.Uncommon, CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)), "Common"),
-        UNCOMMON (FSkinProp.IMG_PW_BADGE_UNCOMMON, new RarityFilter(EnumSet.of(CardRarity.Uncommon, CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)), "Uncommon"),
-        RARE     (FSkinProp.IMG_PW_BADGE_RARE, new RarityFilter(EnumSet.of(CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)), "Rare"),
-        MYTHIC   (FSkinProp.IMG_PW_BADGE_MYTHIC, new RarityFilter(EnumSet.of(CardRarity.MythicRare)), "Mythic Rare (100%)"),
-
-        CMC_LOW      (FSkinProp.IMG_CMC_LOW, new CMCFilter(0, 3), "Mana Value 0-3"),
-        CMC_LOW_MID  (FSkinProp.IMG_CMC_LOW_MID, new CMCFilter(2, 5), "Mana Value 2-5"),
-        CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, new CMCFilter(4, 7), "Mana Value 4-7"),
-        CMC_HIGH     (FSkinProp.IMG_CMC_HIGH, new CMCFilter(6, -1), "Mana Value 6+");
-
+    public enum TypeFilter implements IHasSkinProp, Predicate<PaperCard>
+    {
+        CREATURE              (FSkinProp.IMG_CREATURE, EnumSet.of(CoreType.Creature), "Creature"),
+        NONCREATURE_PERMANENT (FSkinProp.IMG_ENCHANTMENT, EnumSet.of(CoreType.Artifact, CoreType.Enchantment, CoreType.Planeswalker, CoreType.Land), EnumSet.of(CoreType.Creature), "Noncreature Permanent"),
+        INSTANT_SORCERY       (FSkinProp.IMG_SORCERY, EnumSet.of(CoreType.Instant, CoreType.Sorcery), "Instant or Sorcery")
+        ;
         private final FSkinProp skinProp;
-        private final Predicate<PaperCard> predicate;
-        private String caption;
-
-        AEtherFilter(final FSkinProp skinProp0, final Predicate<PaperCard> predicate0, final String caption0) {
-            skinProp = skinProp0;
-            predicate = predicate0;
-            caption = caption0;
-        }
-
-        @Override
-        public FSkinProp getSkinProp() {
-            return skinProp;
-        }
-
-        public Predicate<PaperCard> getPredicate() {
-            return predicate;
-        }
-
-        public ColorSet getColor() {
-            if (predicate instanceof ColorFilter) {
-                return ((ColorFilter)predicate).color;
-            }
-            return null;
-        }
-
-        public CardRarity getRarity() {
-            return getRarity(0d);
-        }
-        public CardRarity getRarity(double random) {
-            if (predicate instanceof RarityFilter) {
-                double total = 0d;
-                CardRarity rarity = null;
-                Map<CardRarity, Double> rarityOdds = ((RarityFilter)predicate).rarityOdds;
-                for (final Entry<CardRarity, Double> entry : rarityOdds.entrySet()) {
-                    rarity = entry.getKey();
-                    total += entry.getValue();
-                    if (random < total) {
-                        return rarity;
-                    }
-                }
-                return rarity;
-            }
-            return null;
-        }
-
-        @Override
-        public String toString() {
-            return caption;
-        }
-    }
-
-    public static AEtherFilter getColorFilter(ColorSet color) {
-        StringBuilder name = new StringBuilder();
-        for (ManaCostShard s : color.getOrderedShards()) {
-            name.append(s.toString());
-        }
-        name = new StringBuilder(name.toString().replaceAll("[{}]", "")); //remove all brackets
-        try {
-            return AEtherFilter.valueOf(name.toString());
-        }
-        catch (Exception e) {
-            System.err.println("No color filter with name " + name);
-            return AEtherFilter.WUBRG; //return 5-color filter as fallback
-        }
-    }
-
-    public static void updateRarityFilterOdds() {
-        ConquestPreferences prefs = FModel.getConquestPreferences();
-
-        Map<CardRarity, Double> odds = Maps.newEnumMap(CardRarity.class);
-        if (prefs.getPrefBoolean(CQPref.AETHER_USE_DEFAULT_RARITY_ODDS)) {
-            odds.put(CardRarity.Common, 1d);
-            odds.put(CardRarity.Uncommon, 0.17);
-            odds.put(CardRarity.Rare, 0.03);
-            odds.put(CardRarity.MythicRare, 0.005);
-        } else {
-            double commonsPerBooster = prefs.getPrefInt(CQPref.BOOSTER_COMMONS);
-            double uncommonPerBooster = prefs.getPrefInt(CQPref.BOOSTER_UNCOMMONS);
-            double raresPerBooster = prefs.getPrefInt(CQPref.BOOSTER_RARES);
-            double mythicsPerBooster = raresPerBooster / (double)prefs.getPrefInt(CQPref.BOOSTERS_PER_MYTHIC);
-
-            odds.put(CardRarity.Common, 1d);
-            odds.put(CardRarity.Uncommon, uncommonPerBooster / commonsPerBooster);
-            odds.put(CardRarity.Rare, raresPerBooster / commonsPerBooster);
-            odds.put(CardRarity.MythicRare, mythicsPerBooster / commonsPerBooster);
-        }
-
-        for (AEtherFilter filter : RARITY_FILTERS) {
-            filter.caption = ((RarityFilter)filter.predicate).updateOdds(odds);
-        }
-    }
-
-    public static final AEtherFilter[] COLOR_FILTERS = new AEtherFilter[] {
-        AEtherFilter.C,
-        AEtherFilter.W,
-        AEtherFilter.U,
-        AEtherFilter.B,
-        AEtherFilter.R,
-        AEtherFilter.G,
-        AEtherFilter.WU,
-        AEtherFilter.WB,
-        AEtherFilter.UB,
-        AEtherFilter.UR,
-        AEtherFilter.BR,
-        AEtherFilter.BG,
-        AEtherFilter.RG,
-        AEtherFilter.RW,
-        AEtherFilter.GW,
-        AEtherFilter.GU,
-        AEtherFilter.WUB,
-        AEtherFilter.WBG,
-        AEtherFilter.UBR,
-        AEtherFilter.URW,
-        AEtherFilter.BRG,
-        AEtherFilter.BGU,
-        AEtherFilter.RGW,
-        AEtherFilter.RWB,
-        AEtherFilter.GWU,
-        AEtherFilter.GUR,
-        AEtherFilter.WUBR,
-        AEtherFilter.WUBG,
-        AEtherFilter.WURG,
-        AEtherFilter.WBRG,
-        AEtherFilter.UBRG,
-        AEtherFilter.WUBRG};
-
-    public static final AEtherFilter[] TYPE_FILTERS = new AEtherFilter[] {
-        AEtherFilter.CREATURE,
-        AEtherFilter.NONCREATURE_PERMANENT,
-        AEtherFilter.INSTANT_SORCERY };
-
-    public static final AEtherFilter[] RARITY_FILTERS = new AEtherFilter[] {
-        AEtherFilter.COMMON,
-        AEtherFilter.UNCOMMON,
-        AEtherFilter.RARE,
-        AEtherFilter.MYTHIC };
-
-    public static final AEtherFilter[] CMC_FILTERS = new AEtherFilter[] {
-        AEtherFilter.CMC_LOW,
-        AEtherFilter.CMC_LOW_MID,
-        AEtherFilter.CMC_MID_HIGH,
-        AEtherFilter.CMC_HIGH };
-
-    private static class ColorFilter implements Predicate<PaperCard> {
-        private final ColorSet color;
-
-        private ColorFilter(int colorMask0) {
-            color = ColorSet.fromMask(colorMask0);
-        }
-
-        @Override
-        public boolean test(PaperCard card) {
-            return card.getRules().getColorIdentity().hasNoColorsExcept(color);
-        }
-    }
-
-    private static class TypeFilter implements Predicate<PaperCard> {
         private final Iterable<CoreType> types;
         private final Iterable<CoreType> nonTypes;
+        private final String caption;
 
-        private TypeFilter(Iterable<CoreType> types0) {
-            types = types0;
-            nonTypes = null;
+        private TypeFilter(FSkinProp skinProp, Iterable<CoreType> types0, final String caption0) {
+            this(skinProp, types0, null, caption0);
         }
 
-        private TypeFilter(Iterable<CoreType> types0, Iterable<CoreType> nonTypes0) {
+        private TypeFilter(FSkinProp skinProp0, Iterable<CoreType> types0, Iterable<CoreType> nonTypes0, final String caption0) {
+            skinProp = skinProp0;
             types = types0;
             nonTypes = nonTypes0;
+            caption = caption0;
         }
 
         @Override
@@ -444,23 +254,57 @@ public class ConquestUtil {
             }
             return false;
         }
+        @Override
+        public FSkinProp getSkinProp() {
+            return skinProp;
+        }
+        @Override
+        public String toString() {
+            return caption;
+        }
     }
 
-    private static class RarityFilter implements Predicate<PaperCard> {
-        private final Map<CardRarity, Double> rarityOdds;
 
-        private RarityFilter(Iterable<CardRarity> rarities0) {
+    public enum RarityFilter implements IHasSkinProp, Predicate<PaperCard>
+    {
+        COMMON   (FSkinProp.IMG_PW_BADGE_COMMON, EnumSet.of(CardRarity.Common, CardRarity.Uncommon, CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)),
+        UNCOMMON (FSkinProp.IMG_PW_BADGE_UNCOMMON, EnumSet.of(CardRarity.Uncommon, CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)),
+        RARE     (FSkinProp.IMG_PW_BADGE_RARE, EnumSet.of(CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)),
+        MYTHIC   (FSkinProp.IMG_PW_BADGE_MYTHIC, EnumSet.of(CardRarity.MythicRare)),
+        ;
+        private final FSkinProp skinProp;
+        private final Map<CardRarity, Double> rarityOdds;
+        private String caption = "";
+
+        private RarityFilter(FSkinProp skinProp0, Iterable<CardRarity> rarities0) {
+            skinProp = skinProp0;
             rarityOdds = Maps.newEnumMap(CardRarity.class);
             for (CardRarity rarity : rarities0) {
                 rarityOdds.put(rarity, 0d); //values will be set later
             }
         }
 
-        private String updateOdds(Map<CardRarity, Double> oddsLookup) {
+        public CardRarity getRarity() {
+            return getRarity(0d);
+        }
+        public CardRarity getRarity(double random) {
+            double total = 0d;
+            CardRarity rarity = null;
+            for (final Entry<CardRarity, Double> entry : rarityOdds.entrySet()) {
+                rarity = entry.getKey();
+                total += entry.getValue();
+                if (random < total) {
+                    return rarity;
+                }
+            }
+            return rarity;
+        }
+
+        private void updateOdds(Map<CardRarity, Double> oddsLookup) {
             double baseOdds = 0;
             double remainingOdds = 1;
             CardRarity baseRarity = null;
-            StringBuilder caption = new StringBuilder();
+            StringBuilder sb = new StringBuilder();
 
             for (CardRarity rarity : rarityOdds.keySet()) {
                 Double odds = oddsLookup.get(rarity);
@@ -477,28 +321,68 @@ public class ConquestUtil {
                     final String display = rounded < 1d
                             ? Double.toString(rounded) // Display decimal if < 1%
                             : Long.toString(Math.round(rounded));
-                    caption.append(", ").append(rarity.getLongName()).append(" (").append(display).append("%)");
+                    sb.append(", ").append(rarity.getLongName()).append(" (").append(display).append("%)");
                     rarityOdds.put(rarity, odds);
                 }
             }
 
             //prepend base rarity and odds
-            caption.insert(0, baseRarity.getLongName() + " (" + (Math.round(1000 * remainingOdds) / 10) + "%)");
+            sb.insert(0, baseRarity.getLongName() + " (" + (Math.round(1000 * remainingOdds) / 10) + "%)");
             rarityOdds.put(baseRarity, remainingOdds);
 
-            return caption.toString();
+            caption = sb.toString();
         }
 
         @Override
         public boolean test(PaperCard card) {
             return rarityOdds.containsKey(card.getRarity());
         }
+        @Override
+        public FSkinProp getSkinProp() {
+            return skinProp;
+        }
+        @Override
+        public String toString() {
+            return caption;
+        }
     }
 
-    private static class CMCFilter implements Predicate<PaperCard> {
+    public static void updateRarityFilterOdds(ConquestPreferences prefs) {
+        Map<CardRarity, Double> odds = Maps.newEnumMap(CardRarity.class);
+        if (prefs.getPrefBoolean(CQPref.AETHER_USE_DEFAULT_RARITY_ODDS)) {
+            odds.put(CardRarity.Common, 1d);
+            odds.put(CardRarity.Uncommon, 0.17);
+            odds.put(CardRarity.Rare, 0.03);
+            odds.put(CardRarity.MythicRare, 0.005);
+        } else {
+            double commonsPerBooster = prefs.getPrefInt(CQPref.BOOSTER_COMMONS);
+            double uncommonPerBooster = prefs.getPrefInt(CQPref.BOOSTER_UNCOMMONS);
+            double raresPerBooster = prefs.getPrefInt(CQPref.BOOSTER_RARES);
+            double mythicsPerBooster = raresPerBooster / (double)prefs.getPrefInt(CQPref.BOOSTERS_PER_MYTHIC);
+
+            odds.put(CardRarity.Common, 1d);
+            odds.put(CardRarity.Uncommon, uncommonPerBooster / commonsPerBooster);
+            odds.put(CardRarity.Rare, raresPerBooster / commonsPerBooster);
+            odds.put(CardRarity.MythicRare, mythicsPerBooster / commonsPerBooster);
+        }
+
+        for (RarityFilter filter : RarityFilter.values()) {
+            filter.updateOdds(odds);
+        }
+    }
+
+    public enum CMCFilter implements IHasSkinProp, Predicate<PaperCard>
+    {
+        CMC_LOW      (FSkinProp.IMG_CMC_LOW, 0, 3),
+        CMC_LOW_MID  (FSkinProp.IMG_CMC_LOW_MID, 2, 5),
+        CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, 4, 7),
+        CMC_HIGH     (FSkinProp.IMG_CMC_HIGH, 6, -1);
+
+        private final FSkinProp skinProp;
         private final int cmcMin, cmcMax;
 
-        private CMCFilter(int cmcMin0, int cmcMax0) {
+        private CMCFilter(FSkinProp skinProp0, int cmcMin0, int cmcMax0) {
+            skinProp = skinProp0;
             cmcMin = cmcMin0;
             cmcMax = cmcMax0;
         }
@@ -509,5 +393,17 @@ public class ConquestUtil {
             if (cardCmc < cmcMin) { return false; }
             return cmcMax == -1 || cardCmc <= cmcMax;
         }
+        @Override
+        public FSkinProp getSkinProp() {
+            return skinProp;
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder("Mana Value ");
+            sb.append(cmcMin);
+            sb.append(cmcMax == -1 ? "+" : "-" + cmcMax);
+            return sb.toString();
+        }
     }
 }
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java
index ceea7e594e9..8ffe5316f36 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java
@@ -99,7 +99,10 @@ public final class BoosterUtils {
 
         if (userPrefs != null && userPrefs.getPoolType() == StartingPoolPreferences.PoolType.BOOSTERS) {
 
-            for (InventoryItem inventoryItem : generateRandomBoosterPacks(userPrefs.getNumberOfBoosters(), formatStartingPool.editionLegalPredicate)) {
+            Predicate<CardEdition> editionLegalPredicate = formatStartingPool == null
+                    ? cardEdition -> true
+                    : formatStartingPool.editionLegalPredicate;
+            for (InventoryItem inventoryItem : generateRandomBoosterPacks(userPrefs.getNumberOfBoosters(), editionLegalPredicate)) {
                 cards.addAll(((BoosterPack) inventoryItem).getCards());
             }
 
@@ -557,7 +560,7 @@ public final class BoosterUtils {
     public static void sort(List<PaperCard> cards) {
         //sort cards alphabetically so colors appear together and rares appear on top
         cards.sort(Comparator.comparing(PaperCard::getName));
-        cards.sort(Comparator.comparing(c -> c.getRules().getColor()));
+        cards.sort(Comparator.comparing(c -> c.getRules().getColor().getOrderWeight()));
         cards.sort(Comparator.comparing(PaperCard::getRarity).reversed());
     }
 }
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java
index 5bd6af0bb2d..05dd5907ec2 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestController.java
@@ -19,6 +19,7 @@ package forge.gamemodes.quest;
 
 import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
 import com.google.common.eventbus.Subscribe;
@@ -549,9 +550,9 @@ public class QuestController {
         if (ev instanceof GameEventMulligan) {
             GameEventMulligan mev = (GameEventMulligan) ev;
             // First mulligan is free
-            if (mev.player.getLobbyPlayer() == GamePlayerUtil.getGuiPlayer()
-                    && getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player.getStats().getMulliganCount() < 7) {
-                mev.player.drawCard();
+            if (mev.player().getLobbyPlayer().equals(GamePlayerUtil.getGuiPlayer())
+                    && getAssets().hasItem(QuestItemType.SLEIGHT) && mev.player().getStats().getMulliganCount() < 7) {
+                mev.player().drawCard();
             }
         }
     }
@@ -620,17 +621,21 @@ public class QuestController {
     }
 
     public CardEdition getDefaultLandSet() {
-        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
-        List<CardEdition> availableEditions = new ArrayList<>();
-
-        for (String s : availableEditionCodes) {
-            availableEditions.add(FModel.getMagicDb().getEditions().get(s));
-        }
+        List<CardEdition> availableEditions = getAvailableLandSets();
 
         CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
         return randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet;
     }
 
+    public List<CardEdition> getAvailableLandSets() {
+        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
+        CardEdition.Collection editions = FModel.getMagicDb().getEditions();
+        return availableEditionCodes.stream()
+                .map(editions::get)
+                .filter(CardEdition::hasBasicLands)
+                .collect(Collectors.toList());
+    }
+
     public String getCurrentDeck() {
         return model.currentDeck;
     }
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java
index 2b5649eeeb0..9681fa17fc8 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java
@@ -62,7 +62,6 @@ import forge.util.storage.IStorage;
 public class QuestEventDraft implements IQuestEvent {
 
     public static class QuestDraftPrizes {
-
         public int credits;
         public List<BoosterPack> boosterPacks;
         public List<PaperCard> individualCards;
@@ -85,7 +84,6 @@ public class QuestEventDraft implements IQuestEvent {
         public void addSelectedCard(final PaperCard card) {
             FModel.getQuest().getCards().addSingleCard(card, 1);
         }
-
     }
 
     public static final String UNDETERMINED = "quest_draft_undetermined_place";
@@ -233,7 +231,6 @@ public class QuestEventDraft implements IQuestEvent {
     }
 
     public void setWinner(final String playerName) {
-
         if (QuestDraftUtils.TOURNAMENT_TOGGLE) {
             TournamentPairing pairing = bracket.getNextPairing();
             for(TournamentPlayer player : pairing.getPairedPlayers()) {
@@ -290,7 +287,6 @@ public class QuestEventDraft implements IQuestEvent {
      * Generates the prizes for the player and saves them to the current quest.
      */
     public QuestDraftPrizes collectPrizes() {
-
         final int place = getPlayerPlacement();
         int prizePool = entryFee * 9;
 
@@ -345,11 +341,9 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return null;
-
     }
 
     private QuestDraftPrizes generateFirstPlacePrizes(final int prizePool) {
-
         int credits = 2 * (prizePool / 3); //First place gets 2/3 the total prize pool
         final List<PaperCard> cards = new ArrayList<>();
         final List<BoosterPack> boosters = new ArrayList<>();
@@ -366,11 +360,9 @@ public class QuestEventDraft implements IQuestEvent {
         awardSelectedRare(prizes);
 
         return prizes;
-
     }
 
     private QuestDraftPrizes generateSecondPlacePrizes(final int prizePool) {
-
         int credits = prizePool / 3; //Second place gets 1/3 the total prize pool
         final List<PaperCard> cards = new ArrayList<>();
         final List<BoosterPack> boosters = new ArrayList<>();
@@ -388,11 +380,9 @@ public class QuestEventDraft implements IQuestEvent {
         awardSelectedRare(prizes);
 
         return prizes;
-
     }
 
     private QuestDraftPrizes generateThirdPlacePrizes() {
-
         final int credits = 0;
         final List<PaperCard> cards = new ArrayList<>();
 
@@ -407,11 +397,9 @@ public class QuestEventDraft implements IQuestEvent {
         prizes.individualCards = cards;
 
         return prizes;
-
     }
 
     private QuestDraftPrizes generateFourthPlacePrizes() {
-
         final int credits = 0;
         final List<PaperCard> cards = new ArrayList<>();
 
@@ -440,17 +428,20 @@ public class QuestEventDraft implements IQuestEvent {
     }
 
     private void awardSelectedRare(final QuestDraftPrizes prizes) {
-
         final List<PaperCard> possibleCards = new ArrayList<>();
-        final List<String> cardNames = new ArrayList<>();
+        final HashSet<String> cardNames = new HashSet<>();
 
         for (final CardEdition edition : getAllEditions()) {
             for (final EditionEntry card : edition.getObtainableCards()) {
+                if (cardNames.contains(card.name())) {
+                    continue;
+                }
+
                 if (card.rarity() == CardRarity.Rare || card.rarity() == CardRarity.MythicRare) {
-                    final PaperCard cardToAdd = FModel.getMagicDb().getCommonCards().getCard(card.name(), edition.getCode());
-                    if (cardToAdd != null && !cardNames.contains(cardToAdd.getName())) {
+                    final PaperCard cardToAdd = FModel.getMagicDb().getCommonCards().getCard(card.name(), edition.getCode(), card.collectorNumber());
+                    if (cardToAdd != null) {
                         possibleCards.add(cardToAdd);
-                        cardNames.add(cardToAdd.getName());
+                        cardNames.add(card.name());
                     }
                 }
             }
@@ -466,18 +457,24 @@ public class QuestEventDraft implements IQuestEvent {
     }
 
     private PaperCard getPromoCard() {
-
         final CardEdition randomEdition = getRandomEdition();
         final List<EditionEntry> cardsInEdition = new ArrayList<>();
-        final List<String> cardNames = new ArrayList<>();
+        final HashSet<String> cardNames = new HashSet<>();
 
         for (final EditionEntry card : randomEdition.getObtainableCards()) {
-            if (card.rarity() == CardRarity.Rare || card.rarity() == CardRarity.MythicRare) {
-                if (!cardNames.contains(card.name())) {
-                    cardsInEdition.add(card);
-                    cardNames.add(card.name());
-                }
+            if (cardNames.contains(card.name())) {
+                continue;
             }
+
+            if (card.rarity() == CardRarity.Rare || card.rarity() == CardRarity.MythicRare) {
+                cardsInEdition.add(card);
+                cardNames.add(card.name());
+            }
+        }
+
+        // For sets such as MB1 that only have cards from PLST, or without any rare+ at all
+        if (cardsInEdition.isEmpty()) {
+            return FModel.getQuest().getCards().addRandomRare();
         }
 
         EditionEntry randomCard;
@@ -487,7 +484,7 @@ public class QuestEventDraft implements IQuestEvent {
 
         while (promo == null && attempts-- > 0) {
             randomCard = cardsInEdition.get((int) (MyRandom.getRandom().nextDouble() * cardsInEdition.size()));
-            promo = FModel.getMagicDb().getCommonCards().getCard(randomCard.name(), randomEdition.getCode());
+            promo = FModel.getMagicDb().getCommonCards().getCard(randomCard.name(), randomEdition.getCode(), randomCard.collectorNumber());
         }
 
         if (promo == null) {
@@ -495,7 +492,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return promo;
-
     }
 
     private CardEdition getRandomEdition() {
@@ -506,7 +502,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return editions.get((int) (MyRandom.getRandom().nextDouble() * editions.size()));
-
     }
 
     private Set<CardEdition> getAllEditions() {
@@ -517,7 +512,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return editions;
-
     }
 
     private static int getBoosterPrice(final BoosterPack booster) {
@@ -528,11 +522,9 @@ public class QuestEventDraft implements IQuestEvent {
         value = MAP_PRICES.getOrDefault(boosterName, 395);
 
         return value;
-
     }
 
     public boolean playerHasMatchesLeft() {
-
         if (QuestDraftUtils.TOURNAMENT_TOGGLE) {
             return !bracket.isTournamentOver() && bracket.isPlayerRemaining(-1);
         }
@@ -585,7 +577,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return nextMatchIndex != -1 && standings[nextMatchIndex].equals(UNDETERMINED);
-
     }
 
     public int getPlayerPlacement() {
@@ -622,11 +613,9 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return -1;
-
     }
 
     public String getPlacementString() {
-
         final int place = getPlayerPlacement();
 
         String output;
@@ -650,7 +639,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return output;
-
     }
 
     public boolean canEnter() {
@@ -661,7 +649,7 @@ public class QuestEventDraft implements IQuestEvent {
     public BoosterDraft enter() {
         FModel.getQuest().getAchievements().setCurrentDraft(this);
         FModel.getQuest().getAssets().subtractCredits(getEntryFee());
-        return BoosterDraft.createDraft(LimitedPoolType.Block, FModel.getBlocks().get(getBlock()), getBoosterConfiguration());
+        return BoosterDraft.createDraft(LimitedPoolType.Block, FModel.getBlocks().get(getBlock()), getBoosterConfiguration(), 8);
     }
 
     public boolean isStarted() {
@@ -683,7 +671,6 @@ public class QuestEventDraft implements IQuestEvent {
     }
 
     public static class QuestDraftFormat implements Comparable<QuestDraftFormat> {
-
         private CardEdition edition;
         private CardBlock block;
 
@@ -746,11 +733,9 @@ public class QuestEventDraft implements IQuestEvent {
         public int compareTo(final QuestDraftFormat other) {
             return toString().compareToIgnoreCase(other.toString());
         }
-
     }
 
     private static List<CardEdition> getAllowedSets(final QuestController quest) {
-
         final List<CardEdition> allowedQuestSets = new ArrayList<>();
 
         if (quest.getFormat() != null) {
@@ -771,11 +756,9 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return allowedQuestSets;
-
     }
 
     private static List<CardBlock> getBlocks() {
-
         final List<CardBlock> blocks = new ArrayList<>();
         final IStorage<CardBlock> storage = FModel.getBlocks();
 
@@ -786,11 +769,9 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return blocks;
-
     }
 
     public static List<QuestDraftFormat> getAvailableFormats(final QuestController quest) {
-
         final List<CardEdition> allowedQuestSets = getAllowedSets(quest);
         final List<QuestDraftFormat> possibleFormats = new ArrayList<>();
         final List<CardBlock> blocks = getBlocks();
@@ -812,7 +793,6 @@ public class QuestEventDraft implements IQuestEvent {
                 if (blockAllowed) {
                     possibleFormats.add(new QuestDraftFormat(block));
                 } 
-
             }
 
             for (CardEdition allowedQuestSet : allowedQuestSets) {
@@ -840,7 +820,6 @@ public class QuestEventDraft implements IQuestEvent {
 
         Collections.sort(possibleFormats);
         return possibleFormats;
-
     }
 
     /**
@@ -849,7 +828,6 @@ public class QuestEventDraft implements IQuestEvent {
      * @return The created draft or null in the event no draft could be created.
      */
     public static QuestEventDraft getRandomDraftOrNull(final QuestController quest) {
-
         final List<QuestDraftFormat> possibleFormats = getAvailableFormats(quest);
 
         if (possibleFormats.isEmpty()) {
@@ -858,7 +836,6 @@ public class QuestEventDraft implements IQuestEvent {
 
         Collections.shuffle(possibleFormats);
         return getDraftOrNull(quest, possibleFormats.get(0));
-
     }
 
     /**
@@ -866,7 +843,6 @@ public class QuestEventDraft implements IQuestEvent {
      * @return The created draft or null in the event no draft could be created.
      */
     public static QuestEventDraft getDraftOrNull(final QuestController quest, final QuestDraftFormat format) {
-
         final QuestEventDraft event = new QuestEventDraft(format.getName());
 
         if (format.isSet()) {
@@ -936,13 +912,11 @@ public class QuestEventDraft implements IQuestEvent {
             event.aiIcons[i] = icon;
             usedNames.add(event.aiNames[i]);
             usedIcons.add(icon);
-
         }
 
         event.bracket = createBracketFromStandings(event.standings, event.aiNames, event.aiIcons);
 
         return event;
-
     }
 
     private static int calculateEntryFee(final String[] boosters) {
@@ -960,7 +934,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return (int) (entryFee * 1.5);
-
     }
 
     private static Set<String> getSetCombos(final QuestController quest, final CardBlock block) {
@@ -1041,7 +1014,6 @@ public class QuestEventDraft implements IQuestEvent {
         }
 
         return possibleCombinations;
-
     }
 
     public static TournamentBracket createBracketFromStandings(String[] standings, String[] aiNames, int[] aiIcons) {
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java
index 853751014e3..1d4e8efbc8c 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilCards.java
@@ -792,6 +792,11 @@ public final class QuestUtilCards {
         Predicate<PaperCard> filter = PaperCardPredicates.printedInSet(edition);
         Iterable<PaperCard> editionCards = IterableUtil.filter(FModel.getMagicDb().getCommonCards().getAllCards(), filter);
 
+        // For editions such as MB1 which only contains PLST cards.
+        if (!editionCards.iterator().hasNext()) {
+            return 0;
+        }
+
         ItemPool<PaperCard> ownedCards = questAssets.getCardPool();
         // 100% means at least one of every basic land and at least 4 of every other card in the set
         int completeCards = 0;
diff --git a/forge-gui/src/main/java/forge/gui/GuiBase.java b/forge-gui/src/main/java/forge/gui/GuiBase.java
index 27757308a5b..3c79cd3c409 100644
--- a/forge-gui/src/main/java/forge/gui/GuiBase.java
+++ b/forge-gui/src/main/java/forge/gui/GuiBase.java
@@ -13,6 +13,7 @@ public class GuiBase {
     private static boolean interrupted = false;
     private static int androidAPI = 0;
     private static int deviceRAM = 0;
+    private static String downloadsDir = "";
     private static boolean usingAppDirectory = false;
     private static ForgePreferences forgePrefs;
     private static HWInfo hwInfo;
@@ -34,14 +35,30 @@ public class GuiBase {
     public static void setUsingAppDirectory(boolean value) { usingAppDirectory = value; }
     public static boolean isUsingAppDirectory() { return usingAppDirectory; }
 
-    public static void setDeviceInfo(HWInfo hw, int AndroidAPI, int RAM) {
+    public static void setDeviceInfo(HWInfo hw, int AndroidAPI, int RAM, String dir) {
         hwInfo = hw;
         androidAPI = AndroidAPI;
         deviceRAM = RAM;
+        downloadsDir = dir;
+    }
+    public static String getHWInfo() {
+        if (hwInfo != null) {
+            return "##########################################\n" +
+                    "APP: Forge v." + getInterface().getCurrentVersion() +
+                    "\nDEV: " + hwInfo.device().getName() + (hwInfo.getChipset() ?
+                    "\nSOC: " + hwInfo.device().getChipset() :
+                    "\nCPU: " + hwInfo.device().getCpuDescription()) +
+                    "\nRAM: " + deviceRAM + " MB" +
+                    "\nOS: " + hwInfo.os().getRawDescription() +
+                    "\n##########################################";
+        }
+        return "";
+    }
+    public static String getDownloadsDir() {
+        return downloadsDir;
     }
     public static int getAndroidAPILevel() { return androidAPI; }
     public static int getDeviceRAM() { return deviceRAM; }
-    public static HWInfo getHWInfo() { return hwInfo; }
 
     public static boolean isNetworkplay() { return networkplay; }
     public static void setNetworkplay(boolean value) { networkplay = value; }
diff --git a/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
index 699d85aac5f..335f37dcb50 100644
--- a/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
+++ b/forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
@@ -5,7 +5,6 @@ import forge.card.CardRarity;
 import forge.card.CardStateName;
 import forge.card.ColorSet;
 import forge.card.MagicColor;
-import forge.card.mana.ManaCostShard;
 import forge.deck.DeckRecognizer;
 import forge.game.GameView;
 import forge.game.card.Card;
@@ -100,7 +99,7 @@ public class CardDetailUtil {
                 borderColors.add(DetailColors.MULTICOLOR);
             }
             else { //for 3 colors or fewer, return all colors in shard order
-                for (ManaCostShard shard : cardColors.getOrderedShards()) {
+                for (MagicColor.Color shard : cardColors.getOrderedColors()) {
                     switch (shard.getColorMask()) {
                     case MagicColor.WHITE:
                         borderColors.add(DetailColors.WHITE);
@@ -452,7 +451,7 @@ public class CardDetailUtil {
         if (card.getMarkedColors() != null && !card.getMarkedColors().isColorless()) {
             area.append("\n");
             area.append("(").append(Localizer.getInstance().getMessage("lblSelected")).append(": ");
-            area.append(Lang.joinHomogenous(card.getMarkedColors().stream().map(MagicColor.Color::getLocalizedName).collect(Collectors.toList())));
+            area.append(Lang.joinHomogenous(card.getMarkedColors().stream().map(MagicColor.Color::getTranslatedName).collect(Collectors.toList())));
             area.append(")");
         }
 
diff --git a/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java b/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java
index 6f80e3165b9..9a4eadd99df 100644
--- a/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java
+++ b/forge-gui/src/main/java/forge/gui/card/CardScriptParser.java
@@ -469,11 +469,11 @@ public final class CardScriptParser {
             "leastPower", "leastToughness", "greatestCMC",
             "greatestRememberedCMC", "lowestRememberedCMC", "lowestCMC",
             "enchanted", "enchanting", "equipped",
-            "equipping", "modified", "token", "nonToken", "hasXCost", "suspended",
-            "delved", "attacking", "attackingYou", "notattacking",
+            "equipping", "modified", "token", "hasXCost", "suspended",
+            "delved", "attacking", "attackingYou",
             "attackedBySourceThisCombat", "blocking", "blockingSource",
             "blockingCreatureYouCtrl", "blockingRemembered",
-            "sharesBlockingAssignmentWith", "notblocking", "blocked",
+            "sharesBlockingAssignmentWith", "blocked",
             "blockedBySource", "blockedThisTurn", "blockedByThisTurn",
             "blockedBySourceThisTurn", "isBlockedByRemembered", "blockedRemembered",
             "blockedByRemembered", "unblocked", "attackersBandedWith",
@@ -485,7 +485,7 @@ public final class CardScriptParser {
             "wasNotCast", "ChosenType", "IsNotChosenType", "IsCommander",
             "IsRenowned");
     private static final Set<String> VALID_EXCLUSIVE_STARTSWITH = ImmutableSortedSet
-            .of("named", "notnamed", "OwnedBy", "ControlledBy",
+            .of("named", "OwnedBy", "ControlledBy",
                     "ControllerControls", "AttachedTo", "EnchantedBy",
                     "TopGraveyard", "SharesColorWith",
                     "MostProminentColor", "notSharesColorWith",
diff --git a/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java
index 6d949a18f49..d0319ca3135 100644
--- a/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java
+++ b/forge-gui/src/main/java/forge/gui/control/FControlGameEventHandler.java
@@ -190,9 +190,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventTurnPhase ev) {
         needPhaseUpdate = true;
-        needSaveState = !"dev".equals(ev.phaseDesc);
+        needSaveState = !"dev".equals(ev.phaseDesc());
 
-        Player ap = ev.playerTurn;
+        Player ap = ev.playerTurn();
         boolean refreshField = !ap.getTokensInPlay().isEmpty() || (FModel.getPreferences().getPrefBoolean(FPref.UI_STACK_CREATURES) && !ap.getCreaturesInPlay().isEmpty());
         if (refreshField) {
             updateZone(ap, ZoneType.Battlefield);
@@ -209,15 +209,15 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventTurnBegan event) {
-        turnUpdate = event.turnOwner.getView();
-        processPlayer(event.turnOwner, livesUpdate);
+        turnUpdate = event.turnOwner().getView();
+        processPlayer(event.turnOwner(), livesUpdate);
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventAnteCardsSelected ev) {
         final List<CardView> options = Lists.newArrayList();
-        for (final Entry<Player, Card> kv : ev.cards.entries()) {
+        for (final Entry<Player, Card> kv : ev.cards().entries()) {
             //use fake card so real cards appear with proper formatting
             final CardView fakeCard = new CardView(-1, null, "  -- From " + Lang.getInstance().getPossesive(kv.getKey().getName()) + " deck --");
             options.add(fakeCard);
@@ -229,17 +229,17 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventPlayerControl ev) {
-        if (ev.player.getGame().isGameOver()) {
+        if (ev.player().getGame().isGameOver()) {
             return null;
         }
 
         final PlayerControllerHuman newController;
-        if (ev.newController instanceof PlayerControllerHuman) {
-            newController = (PlayerControllerHuman) ev.newController;
+        if (ev.newController() instanceof PlayerControllerHuman) {
+            newController = (PlayerControllerHuman) ev.newController();
         } else {
             newController = null;
         }
-        matchController.setGameController(PlayerView.get(ev.player), newController);
+        matchController.setGameController(PlayerView.get(ev.player()), newController);
 
         needPlayerControlUpdate = true;
         return processEvent();
@@ -293,8 +293,8 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventSubgameEnd event) {
-        if (event.maingame != null) {
-            for (Player p : event.maingame.getPlayers()) {
+        if (event.maingame() != null) {
+            for (Player p : event.maingame().getPlayers()) {
                 updateZone(p, ZoneType.Battlefield);
                 updateZone(p, ZoneType.Hand);
                 updateZone(p, ZoneType.Graveyard);
@@ -302,9 +302,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
                 updateZone(p, ZoneType.Command);
             }
             //update matchscreen view to reflect maingame/previous daytime
-            if (event.maingame.isDay())
+            if (event.maingame().isDay())
                 matchController.updateDayTime("Day");
-            else if (event.maingame.isNight())
+            else if (event.maingame().isNight())
                 matchController.updateDayTime("Night");
             return processEvent();
         }
@@ -313,9 +313,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventZone event) {
-        if (event.player != null) {
+        if (event.player() != null) {
             // anything except stack will get here
-            updateZone(event.player, event.zoneType);
+            updateZone(event.player(), event.zoneType());
             return processEvent();
         }
         return null;
@@ -323,13 +323,13 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventCardAttachment event) {
-        final Game game = event.equipment.getGame();
-        final Zone zEq = game.getZoneOf(event.equipment);
-        if (event.oldEntiy instanceof Card) {
-            updateZone(game.getZoneOf((Card)event.oldEntiy));
+        final Game game = event.equipment().getGame();
+        final Zone zEq = game.getZoneOf(event.equipment());
+        if (event.oldEntity() instanceof Card oldCard) {
+            updateZone(game.getZoneOf(oldCard));
         }
-        if (event.newTarget instanceof Card) {
-            updateZone(game.getZoneOf((Card)event.newTarget));
+        if (event.newTarget() instanceof Card newCard) {
+            updateZone(game.getZoneOf(newCard));
         }
         updateZone(zEq);
         return processEvent();
@@ -338,32 +338,32 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventCardTapped event) {
         refreshFieldUpdate = true; //update all players field when event un/tapped
-        processCard(event.card, cardsUpdate);
+        processCard(event.card(), cardsUpdate);
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventCardPhased event) {
-        processCard(event.card, cardsUpdate);
+        processCard(event.card(), cardsUpdate);
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventCardDamaged event) {
-        processCard(event.card, cardsUpdate);
+        processCard(event.card(), cardsUpdate);
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventCardCounters event) {
-        processCard(event.card, cardsUpdate);
+        processCard(event.card(), cardsUpdate);
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventBlockersDeclared event) {
         final Set<Card> cards = new HashSet<>();
-        for (final MapOfLists<Card, Card> kv : event.blockers.values()) {
+        for (final MapOfLists<Card, Card> kv : event.blockers().values()) {
             for (final Collection<Card> blockers : kv.values()) {
                 cards.addAll(blockers);
             }
@@ -373,7 +373,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventAttackersDeclared event) {
-        return processCards(event.attackersMap.values(), cardsUpdate);
+        return processCards(event.attackersMap().values(), cardsUpdate);
     }
 
     @Override
@@ -387,8 +387,8 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
         needCombatUpdate = true;
 
         // This should remove sword/shield icons from combatants by the time game moves to M2
-        processCards(event.attackers, cardsUpdate);
-        return processCards(event.blockers, cardsUpdate);
+        processCards(event.attackers(), cardsUpdate);
+        return processCards(event.blockers(), cardsUpdate);
     }
 
     @Override
@@ -397,8 +397,8 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
             return null; //not needed if single player only...
 
         final CardCollection cards = new CardCollection();
-        cards.addAll(event.attackers);
-        cards.addAll(event.blockers);
+        cards.addAll(event.attackers());
+        cards.addAll(event.blockers());
 
         refreshFieldUpdate = true;
 
@@ -409,8 +409,8 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventCardChangeZone event) {
         if (GuiBase.getInterface().isLibgdxPort()) {
-            updateZone(event.from);
-            return updateZone(event.to);
+            updateZone(event.from());
+            return updateZone(event.to());
         } else {
             return processEvent();
         }
@@ -419,14 +419,14 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventCardStatsChanged event) {
         refreshFieldUpdate = true;
-        processCards(event.cards, cardsRefreshDetails);
-        return processCards(event.cards, cardsUpdate);
+        processCards(event.cards(), cardsRefreshDetails);
+        return processCards(event.cards(), cardsUpdate);
     }
 
     @Override
     public Void visit(final GameEventCardForetold event) {
         showExileUpdate = true;
-        activatingPlayer = event.activatingPlayer.getView();
+        activatingPlayer = event.activatingPlayer().getView();
         playersWithValidTargets.put(activatingPlayer, null);
         return processEvent();
     }
@@ -434,7 +434,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventCardPlotted event) {
         showExileUpdate = true;
-        activatingPlayer = event.activatingPlayer.getView();
+        activatingPlayer = event.activatingPlayer().getView();
         playersWithValidTargets.put(activatingPlayer, null);
         return processEvent();
     }
@@ -442,8 +442,8 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventPlayerStatsChanged event) {
         final CardCollection cards = new CardCollection();
-        for (final Player p : event.players) {
-            if (event.updateCards) {
+        for (final Player p : event.players()) {
+            if (event.updateCards()) {
                 cards.addAll(p.getAllCards());
             }
             processPlayer(p, livesUpdate);
@@ -453,22 +453,22 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     }
 
     public Void visit(final GameEventLandPlayed event) {
-        processPlayer(event.player, livesUpdate);
-        matchController.handleLandPlayed(event.land);
-        return processCard(event.land, cardsRefreshDetails);
+        processPlayer(event.player(), livesUpdate);
+        matchController.handleLandPlayed(event.land());
+        return processCard(event.land(), cardsRefreshDetails);
     }
 
     @Override
     public Void visit(final GameEventCardRegenerated event) {
         refreshFieldUpdate = true;
-        processCards(event.cards, cardsRefreshDetails);
-        return processCards(event.cards, cardsUpdate);
+        processCards(event.cards(), cardsRefreshDetails);
+        return processCards(event.cards(), cardsUpdate);
     }
 
     @Override
     public Void visit(final GameEventShuffle event) {
         if (GuiBase.getInterface().isLibgdxPort()) {
-            return updateZone(event.player.getZone(ZoneType.Library));
+            return updateZone(event.player().getZone(ZoneType.Library));
         } else {
             return processEvent();
         }
@@ -476,44 +476,44 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventDayTimeChanged event) {
-        matchController.updateDayTime(event.daytime ? "Day" : "Night");
+        matchController.updateDayTime(event.daytime() ? "Day" : "Night");
         return processEvent();
     }
 
     @Override
     public Void visit(GameEventSprocketUpdate event) {
-        updateZone(event.contraption.getZone());
+        updateZone(event.contraption().getZone());
         return processEvent();
     }
 
     @Override
     public Void visit(final GameEventManaPool event) {
-        return processPlayer(event.player, manaPoolUpdate);
+        return processPlayer(event.player(), manaPoolUpdate);
     }
 
     @Override
     public Void visit(final GameEventPlayerLivesChanged event) {
-        return processPlayer(event.player, livesUpdate);
+        return processPlayer(event.player(), livesUpdate);
     }
 
     @Override
     public Void visit(final GameEventPlayerShardsChanged event) {
-        return processPlayer(event.player, shardsUpdate);
+        return processPlayer(event.player(), shardsUpdate);
     }
 
     @Override
     public Void visit(GameEventManaBurn event) {
-        return processPlayer(event.player, livesUpdate);
+        return processPlayer(event.player(), livesUpdate);
     }
 
     @Override
     public Void visit(final GameEventPlayerPoisoned event) {
-        return processPlayer(event.receiver, livesUpdate);
+        return processPlayer(event.receiver(), livesUpdate);
     }
 
     @Override
     public Void visit(final GameEventPlayerRadiation event) {
-        return processPlayer(event.receiver, livesUpdate);
+        return processPlayer(event.receiver(), livesUpdate);
     }
 
     @Override
@@ -523,6 +523,6 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventPlayerCounters event) {
-        return processPlayer(event.receiver, livesUpdate);
+        return processPlayer(event.receiver(), livesUpdate);
     }
 }
diff --git a/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java
index 0430f64fef1..a9f720f2684 100644
--- a/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java
+++ b/forge-gui/src/main/java/forge/gui/control/FControlGamePlayback.java
@@ -75,9 +75,9 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
     @Override
     public Void visit(final GameEventTurnPhase ev) {
         try {
-            final boolean isUiToStop = !humanController.getGui().isUiSetToSkipPhase(ev.playerTurn.getView(), ev.phase);
+            final boolean isUiToStop = !humanController.getGui().isUiSetToSkipPhase(ev.playerTurn().getView(), ev.phase());
 
-            switch (ev.phase) {
+            switch (ev.phase()) {
             case COMBAT_END:
             case COMBAT_DECLARE_ATTACKERS:
             case COMBAT_DECLARE_BLOCKERS:
@@ -121,7 +121,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventSpellResolved event) {
-        FThreads.invokeInEdtNowOrLater(() -> humanController.getGui().setCard(CardView.get(event.spell.getHostCard())));
+        FThreads.invokeInEdtNowOrLater(() -> humanController.getGui().setCard(CardView.get(event.spell().getHostCard())));
         pauseForEvent(resolveDelay);
         return null;
     }
@@ -131,7 +131,7 @@ public class FControlGamePlayback extends IGameEventVisitor.Base<Void> {
      */
     @Override
     public Void visit(final GameEventSpellAbilityCast event) {
-        FThreads.invokeInEdtNowOrLater(() -> humanController.getGui().setCard(CardView.get(event.sa.getHostCard())));
+        FThreads.invokeInEdtNowOrLater(() -> humanController.getGui().setCard(CardView.get(event.sa().getHostCard())));
         pauseForEvent(castDelay);
         return null;
     }
diff --git a/forge-gui/src/main/java/forge/gui/error/BugReporter.java b/forge-gui/src/main/java/forge/gui/error/BugReporter.java
index 868df2b552a..92f27cc54b8 100644
--- a/forge-gui/src/main/java/forge/gui/error/BugReporter.java
+++ b/forge-gui/src/main/java/forge/gui/error/BugReporter.java
@@ -26,6 +26,8 @@ import forge.util.Localizer;
 import io.sentry.Sentry;
 
 import java.io.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * The class ErrorViewer. Enables showing and saving error messages that
@@ -86,7 +88,7 @@ public class BugReporter {
         if (isSentryEnabled()) {
             sendSentry();
         } else {
-            GuiBase.getInterface().showBugReportDialog(Localizer.getInstance().getMessage("lblReportCrash"), sb.toString(), true);
+            GuiBase.getInterface().showBugReportDialog(Localizer.getInstance().getMessageorUseDefault("lblReportCrash", "Report a Crash"), sb.toString(), true);
         }
     }
 
@@ -121,22 +123,31 @@ public class BugReporter {
         if (isSentryEnabled()) {
             sendSentry();
         } else {
-            GuiBase.getInterface().showBugReportDialog(Localizer.getInstance().getMessage("btnReportBug"), message, false);
+            GuiBase.getInterface().showBugReportDialog(Localizer.getInstance().getMessageorUseDefault("btnReportBug", "Report a Bug"), message, false);
         }
     }
 
-    public static void saveToFile(final String text) {
+    public static void saveToFile(final String error) {
         File f;
-        final long curTime = System.currentTimeMillis();
-        for (int i = 0;; i++) {
-            final String name = String.format("%TF-%02d.txt", curTime, i);
-            f = new File(name);
-            if (!f.exists()) {
-                break;
+        String text;
+        if (GuiBase.getInterface().isLibgdxPort()) {
+            text = GuiBase.getHWInfo() + "\n\n" + error;
+            // Save in downloads directory instead for easy access without filepicker
+            String filename = "forge-bug-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss")) + ".txt";
+            f = new File(GuiBase.getDownloadsDir() + filename);
+        } else {
+            text = error;
+            final long curTime = System.currentTimeMillis();
+            for (int i = 0; ; i++) {
+                final String name = String.format("%TF-%02d.txt", curTime, i);
+                f = new File(name);
+                if (!f.exists()) {
+                    break;
+                }
             }
-        }
 
-        f = GuiBase.getInterface().getSaveFile(f);
+            f = GuiBase.getInterface().getSaveFile(f);
+        }
 
         try (BufferedWriter bw = new BufferedWriter(new FileWriter(f))){
             bw.write(text);
@@ -147,11 +158,13 @@ public class BugReporter {
     }
 
     public static void sendSentry() {
-        if (exception != null) {
-            Sentry.captureException(exception);
-        } else if (message !=null) {
-            Sentry.captureMessage(message);
-        }
+        try {
+            if (exception != null) {
+                Sentry.captureException(exception);
+            } else if (message !=null) {
+                Sentry.captureMessage(message);
+            }
+        } catch (Exception ignored) {}
     }
 
     /**
diff --git a/forge-gui/src/main/java/forge/gui/events/UiEvent.java b/forge-gui/src/main/java/forge/gui/events/UiEvent.java
index 5d809973830..b3ece37a1be 100644
--- a/forge-gui/src/main/java/forge/gui/events/UiEvent.java
+++ b/forge-gui/src/main/java/forge/gui/events/UiEvent.java
@@ -2,7 +2,7 @@ package forge.gui.events;
 
 import forge.game.event.Event;
 
-public abstract class UiEvent extends Event {
+public interface UiEvent extends Event {
 
     public abstract <T> T visit(IUiEventVisitor<T> visitor);
 }
\ No newline at end of file
diff --git a/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java b/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java
index a90cc213417..cba1099721f 100644
--- a/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java
+++ b/forge-gui/src/main/java/forge/gui/events/UiEventAttackerDeclared.java
@@ -3,14 +3,7 @@ package forge.gui.events;
 import forge.game.GameEntityView;
 import forge.game.card.CardView;
 
-public class UiEventAttackerDeclared extends UiEvent {
-    public final CardView attacker; 
-    public final GameEntityView defender;
-
-    public UiEventAttackerDeclared(final CardView card, final GameEntityView currentDefender) {
-        attacker = card;
-        defender = currentDefender;
-    }
+public record UiEventAttackerDeclared(CardView attacker, GameEntityView defender) implements UiEvent {
 
     @Override
     public <T> T visit(final IUiEventVisitor<T> visitor) {
diff --git a/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java b/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java
index c169140285c..8858a126ad3 100644
--- a/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java
+++ b/forge-gui/src/main/java/forge/gui/events/UiEventBlockerAssigned.java
@@ -2,14 +2,7 @@ package forge.gui.events;
 
 import forge.game.card.CardView;
 
-public class UiEventBlockerAssigned extends UiEvent {
-    public final CardView blocker;
-    public final CardView attackerBeingBlocked; 
-
-    public UiEventBlockerAssigned(final CardView card, final CardView currentAttacker) {
-        blocker = card;
-        attackerBeingBlocked = currentAttacker;
-    }
+public record UiEventBlockerAssigned(CardView blocker, CardView attackerBeingBlocked) implements UiEvent {
 
     @Override
     public <T> T visit(final IUiEventVisitor<T> visitor) {
diff --git a/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java b/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java
index e4d6ed80044..bdc73e860c9 100644
--- a/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java
+++ b/forge-gui/src/main/java/forge/gui/events/UiEventNextGameDecision.java
@@ -3,22 +3,7 @@ package forge.gui.events;
 import forge.gamemodes.match.NextGameDecision;
 import forge.player.PlayerControllerHuman;
 
-public final class UiEventNextGameDecision extends UiEvent {
-
-    private final PlayerControllerHuman controller;
-    private final NextGameDecision decision;
-
-    public UiEventNextGameDecision(final PlayerControllerHuman controller, final NextGameDecision decision) {
-        this.controller = controller;
-        this.decision = decision;
-    }
-
-    public PlayerControllerHuman getController() {
-        return controller;
-    }
-    public NextGameDecision getDecision() {
-        return decision;
-    }
+public record UiEventNextGameDecision(PlayerControllerHuman controller, NextGameDecision decision) implements UiEvent {
 
     @Override
     public <T> T visit(IUiEventVisitor<T> visitor) {
diff --git a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
index bf74ef77fc0..a9c34302926 100644
--- a/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
+++ b/forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
@@ -7,7 +7,6 @@ import forge.localinstance.skin.FSkinProp;
 import forge.localinstance.skin.ISkinImage;
 import forge.sound.IAudioClip;
 import forge.sound.IAudioMusic;
-import forge.util.Callback;
 import forge.util.ImageFetcher;
 
 import java.io.File;
@@ -15,6 +14,7 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import org.jupnp.UpnpServiceConfiguration;
@@ -42,7 +42,7 @@ public interface IGuiBase {
     <T> List<T> order(String title, String top, int remainingObjectsMin, int remainingObjectsMax, List<T> sourceChoices, List<T> destChoices);
     String showFileDialog(String title, String defaultDir);
     File getSaveFile(File defaultFile);
-    void download(GuiDownloadService service, Callback<Boolean> callback);
+    void download(GuiDownloadService service, Consumer<Boolean> callback);
     void refreshSkin();
     void showCardList(String title, String message, List<PaperCard> list);
     boolean showBoxedProduct(String title, String message, List<PaperCard> list);
diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
index 81b9d1771da..e58bb3be26b 100644
--- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
+++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
@@ -57,6 +57,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 Set<String> names = new HashSet<>();
@@ -77,6 +78,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 Set<String> names = new HashSet<>();
@@ -98,20 +100,9 @@ public class AdvancedSearch {
             protected Keyword getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<Keyword> getItemValues(PaperCard input) {
-                CardSplitType cardSplitType = input.getRules().getSplitType();
-                if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
-                    Set<Keyword> keywords = new HashSet<>();
-                    if (input.getRules().getOtherPart() != null) {
-                        PaperCard otherPart = FModel.getMagicDb().getCommonCards().getCard(input.getRules().getOtherPart().getName());
-                        if (otherPart != null) {
-                            keywords.addAll(Keyword.getKeywordSet(otherPart));
-                            keywords.addAll(Keyword.getKeywordSet(input));
-                        }
-                    }
-                    return keywords;
-                }
                 return Keyword.getKeywordSet(input);
             }
         }),
@@ -121,11 +112,12 @@ public class AdvancedSearch {
                 return FModel.getMagicDb().getCardEdition(input.getEdition());
             }
         }),
-        CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(PaperCard input) {
                 return FModel.getFormats().getAllFormatsOfCard(input);
@@ -136,6 +128,7 @@ public class AdvancedSearch {
             protected ConquestPlane getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestPlane> getItemValues(PaperCard input) {
                 return ConquestPlane.getAllPlanesOfCard(input);
@@ -146,6 +139,7 @@ public class AdvancedSearch {
             protected ConquestRegion getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestRegion> getItemValues(PaperCard input) {
                 return ConquestRegion.getAllRegionsOfCard(input);
@@ -156,6 +150,7 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(PaperCard input) {
                 return QuestWorld.getAllQuestWorldsOfCard(input);
@@ -166,6 +161,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(PaperCard input) {
                 return input.getRules().getColor().toEnumSet();
@@ -176,6 +172,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(PaperCard input) {
                 return input.getRules().getColorIdentity().toEnumSet();
@@ -192,6 +189,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 final CardType type = input.getRules().getType();
@@ -228,6 +226,7 @@ public class AdvancedSearch {
             protected String getItemValue(PaperCard input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(PaperCard input) {
                 CardSplitType cardSplitType = input.getRules().getSplitType();
@@ -243,7 +242,7 @@ public class AdvancedSearch {
                         return subtypes;
                     }
                 }
-                return (Set<String>)input.getRules().getType().getSubtypes();
+                return (Set<String>) input.getRules().getType().getSubtypes();
             }
         }),
         CARD_CMC("lblCMC", PaperCard.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<PaperCard>(0, 20) {
@@ -294,7 +293,9 @@ public class AdvancedSearch {
             @Override
             protected Boolean getItemValue(PaperCard input) {
                 List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
-                if (cards.size() <= 1) { return true; }
+                if (cards.size() <= 1) {
+                    return true;
+                }
 
                 cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
                 return cards.get(0) == input;
@@ -318,7 +319,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return "";
                 }
-                return ((PaperCard)input).getRules().getOracleText();
+                return ((PaperCard) input).getRules().getOracleText();
             }
         }),
         INVITEM_KEYWORDS("lblKeywords", InventoryItem.class, FilterOperator.COLLECTION_OPS, new CustomListEvaluator<InventoryItem, Keyword>(Keyword.getAllKeywords()) {
@@ -326,38 +327,40 @@ public class AdvancedSearch {
             protected Keyword getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<Keyword> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return Keyword.getKeywordSet((PaperCard)input);
+                return Keyword.getKeywordSet((PaperCard) input);
             }
         }),
         INVITEM_SET("lblSet", InventoryItem.class, FilterOperator.SINGLE_LIST_OPS, new CustomListEvaluator<InventoryItem, CardEdition>(FModel.getMagicDb().getSortedEditions(), CardEdition::getCode) {
             @Override
             protected CardEdition getItemValue(InventoryItem input) {
                 if (input instanceof PaperCard) {
-                    CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard)input).getEdition());
+                    CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard) input).getEdition());
                     return set;
                 } else if (input instanceof SealedProduct) {
-                    return FModel.getMagicDb().getEditions().get(((SealedProduct)input).getEdition());
+                    return FModel.getMagicDb().getEditions().get(((SealedProduct) input).getEdition());
                 } else {
                     return CardEdition.UNKNOWN;
                 }
             }
         }),
-        INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return FModel.getFormats().getAllFormatsOfCard((PaperCard)input);
+                return FModel.getFormats().getAllFormatsOfCard((PaperCard) input);
             }
         }),
         INVITEM_PLANE("lblPlane", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestPlane>(ImmutableList.copyOf(FModel.getPlanes())) {
@@ -365,12 +368,13 @@ public class AdvancedSearch {
             protected ConquestPlane getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestPlane> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ConquestPlane.getAllPlanesOfCard((PaperCard)input);
+                return ConquestPlane.getAllPlanesOfCard((PaperCard) input);
             }
         }),
         INVITEM_REGION("lblRegion", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestRegion>(ConquestRegion.getAllRegions()) {
@@ -378,12 +382,13 @@ public class AdvancedSearch {
             protected ConquestRegion getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<ConquestRegion> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ConquestRegion.getAllRegionsOfCard((PaperCard)input);
+                return ConquestRegion.getAllRegionsOfCard((PaperCard) input);
             }
         }),
         INVITEM_QUEST_WORLD("lblQuestWorld", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, QuestWorld>(ImmutableList.copyOf(FModel.getWorlds())) {
@@ -391,12 +396,13 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return QuestWorld.getAllQuestWorldsOfCard(((PaperCard)input));
+                return QuestWorld.getAllQuestWorldsOfCard(((PaperCard) input));
             }
         }),
         INVITEM_COLOR("lblColor", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -404,12 +410,13 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ((PaperCard)input).getRules().getColor().toEnumSet();
+                return ((PaperCard) input).getRules().getColor().toEnumSet();
             }
         }),
         INVITEM_COLOR_IDENTITY("lblColorIdentity", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -417,12 +424,13 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return ((PaperCard)input).getRules().getColorIdentity().toEnumSet();
+                return ((PaperCard) input).getRules().getColorIdentity().toEnumSet();
             }
         }),
         INVITEM_COLOR_COUNT("lblColorCount", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 5) {
@@ -431,7 +439,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getColor().countColors();
+                return ((PaperCard) input).getRules().getColor().countColors();
             }
         }),
         INVITEM_TYPE("lblType", InventoryItem.class, FilterOperator.COMBINATION_OPS, new CustomListEvaluator<InventoryItem, String>(CardType.getCombinedSuperAndCoreTypes()) {
@@ -439,12 +447,13 @@ public class AdvancedSearch {
             protected String getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                final CardType type = ((PaperCard)input).getRules().getType();
+                final CardType type = ((PaperCard) input).getRules().getType();
                 final Set<String> types = new HashSet<>();
                 for (Supertype t : type.getSupertypes()) {
                     types.add(t.name());
@@ -460,12 +469,13 @@ public class AdvancedSearch {
             protected String getItemValue(InventoryItem input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<String> getItemValues(InventoryItem input) {
                 if (!(input instanceof PaperCard)) {
                     return new HashSet<>();
                 }
-                return (Set<String>)((PaperCard)input).getRules().getType().getSubtypes();
+                return (Set<String>) ((PaperCard) input).getRules().getType().getSubtypes();
             }
         }),
         INVITEM_CMC("lblCMC", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -474,7 +484,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getManaCost().getCMC();
+                return ((PaperCard) input).getRules().getManaCost().getCMC();
             }
         }),
         INVITEM_GENERIC_COST("lblGenericCost", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -483,7 +493,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return 0;
                 }
-                return ((PaperCard)input).getRules().getManaCost().getGenericCost();
+                return ((PaperCard) input).getRules().getManaCost().getGenericCost();
             }
         }),
         INVITEM_POWER("lblPower", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -492,7 +502,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return null;
                 }
-                CardRules rules = ((PaperCard)input).getRules();
+                CardRules rules = ((PaperCard) input).getRules();
                 if (rules.getType().isCreature()) {
                     return rules.getIntPower();
                 }
@@ -505,7 +515,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return null;
                 }
-                CardRules rules = ((PaperCard)input).getRules();
+                CardRules rules = ((PaperCard) input).getRules();
                 if (rules.getType().isCreature()) {
                     return rules.getIntToughness();
                 }
@@ -518,14 +528,16 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return "";
                 }
-                return ((PaperCard)input).getRules().getManaCost().toString();
+                return ((PaperCard) input).getRules().getManaCost().toString();
             }
         }),
         INVITEM_FIRST_PRINTING("lblFirstPrinting", InventoryItem.class, FilterOperator.BOOLEAN_OPS, new BooleanEvaluator<InventoryItem>() {
             @Override
             protected Boolean getItemValue(InventoryItem input) {
                 List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
-                if (cards.size() <= 1) { return true; }
+                if (cards.size() <= 1) {
+                    return true;
+                }
 
                 cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
                 return cards.get(0) == input;
@@ -537,7 +549,7 @@ public class AdvancedSearch {
                 if (!(input instanceof PaperCard)) {
                     return CardRarity.Special;
                 }
-                return ((PaperCard)input).getRarity();
+                return ((PaperCard) input).getRarity();
             }
         }),
         INVITEM_BUY_PRICE("lblBuyPrice", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 10000000) {
@@ -576,11 +588,12 @@ public class AdvancedSearch {
                 return input.isFavoriteDeck();
             }
         }),
-        DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
+        DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
             @Override
             protected GameFormat getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<GameFormat> getItemValues(DeckProxy input) {
                 return input.getExhaustiveFormats();
@@ -591,6 +604,7 @@ public class AdvancedSearch {
             protected QuestWorld getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<QuestWorld> getItemValues(DeckProxy input) {
                 return QuestWorld.getAllQuestWorldsOfDeck(input.getDeck());
@@ -601,6 +615,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
                 return input.getColor().toEnumSet();
@@ -611,6 +626,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(DeckProxy input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
                 return input.getColorIdentity().toEnumSet();
@@ -673,6 +689,7 @@ public class AdvancedSearch {
             protected MagicColor.Color getItemValue(ConquestCommander input) {
                 throw new RuntimeException("getItemValues should be called instead");
             }
+
             @Override
             protected Set<MagicColor.Color> getItemValues(ConquestCommander input) {
                 return input.getCard().getRules().getColorIdentity().toEnumSet();
@@ -825,6 +842,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -846,6 +864,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -867,6 +886,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<String> inputs, List<String> values) {
                 if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -890,6 +910,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null && inputs.size() == values.size()) {
@@ -915,6 +936,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -939,6 +961,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -959,6 +982,7 @@ public class AdvancedSearch {
                 }
                 return false;
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -977,6 +1001,7 @@ public class AdvancedSearch {
             public boolean apply(Object input, List<Object> values) {
                 throw new RuntimeException("shouldn't be called with a single input");
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -994,6 +1019,7 @@ public class AdvancedSearch {
             public boolean apply(Object input, List<Object> values) {
                 throw new RuntimeException("shouldn't be called with a single input");
             }
+
             @Override
             public boolean apply(Set<Object> inputs, List<Object> values) {
                 if (inputs != null) {
@@ -1030,32 +1056,32 @@ public class AdvancedSearch {
             }
         });
 
-        public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[] {
-            IS_TRUE, IS_FALSE
+        public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[]{
+                IS_TRUE, IS_FALSE
         };
-        public static final FilterOperator[] NUMBER_OPS = new FilterOperator[] {
-            EQUALS, NOT_EQUALS, GREATER_THAN, LESS_THAN, GT_OR_EQUAL, LT_OR_EQUAL, BETWEEN_INCLUSIVE, BETWEEN_EXCLUSIVE
+        public static final FilterOperator[] NUMBER_OPS = new FilterOperator[]{
+                EQUALS, NOT_EQUALS, GREATER_THAN, LESS_THAN, GT_OR_EQUAL, LT_OR_EQUAL, BETWEEN_INCLUSIVE, BETWEEN_EXCLUSIVE
         };
-        public static final FilterOperator[] STRING_OPS = new FilterOperator[] {
-            CONTAINS, STARTS_WITH, ENDS_WITH
+        public static final FilterOperator[] STRING_OPS = new FilterOperator[]{
+                CONTAINS, STARTS_WITH, ENDS_WITH
         };
-        public static final FilterOperator[] STRINGS_OPS = new FilterOperator[] {
-            CONTAINS, STARTS_WITH, ENDS_WITH
+        public static final FilterOperator[] STRINGS_OPS = new FilterOperator[]{
+                CONTAINS, STARTS_WITH, ENDS_WITH
         };
-        public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[] {
-            IS_ANY
+        public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[]{
+                IS_ANY
         };
-        public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[] {
-            IS_ANY
+        public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[]{
+                IS_ANY
         };
-        public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[] {
-            IS_EXACTLY, CONTAINS_ANY, CONTAINS_ALL
+        public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[]{
+                IS_EXACTLY, CONTAINS_ANY, CONTAINS_ALL
         };
-        public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[] {
-            CONTAIN_ANY, CONTAIN_ALL
+        public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[]{
+                CONTAIN_ANY, CONTAIN_ALL
         };
-        public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[] {
-            CONTAINS_CARD, CONTAINS_X_COPIES_OF_CARD
+        public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[]{
+                CONTAINS_CARD, CONTAINS_X_COPIES_OF_CARD
         };
 
         private final String caption, formatStr;
@@ -1104,8 +1130,8 @@ public class AdvancedSearch {
             final OperatorEvaluator<V> evaluator = (OperatorEvaluator<V>) operator.evaluator;
             Predicate<T> predicate = input -> evaluator.apply(getItemValue(input), values);
 
-            final FilterOperator[][] manyValueOperators = { FilterOperator.MULTI_LIST_OPS,
-                    FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS };
+            final FilterOperator[][] manyValueOperators = {FilterOperator.MULTI_LIST_OPS,
+                    FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS};
             for (FilterOperator[] oper : manyValueOperators) {
                 if (option.operatorOptions == oper) {
                     predicate = input -> evaluator.apply(getItemValues(input), values);
@@ -1125,8 +1151,7 @@ public class AdvancedSearch {
             final List<V> values;
             try {
                 values = getValuesFromString(initialValueText, option, operator);
-            }
-            catch(Exception e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 return null;
             }
@@ -1134,8 +1159,11 @@ public class AdvancedSearch {
         }
 
         protected abstract List<V> getValues(FilterOption option, FilterOperator operator);
+
         protected abstract List<V> getValuesFromString(String valueText, FilterOption option, FilterOperator operator);
+
         protected abstract String getCaption(List<V> values, FilterOption option, FilterOperator operator);
+
         protected abstract V getItemValue(T input);
 
         protected Set<V> getItemValues(T input) { //available for options that have multiple inputs
@@ -1178,12 +1206,13 @@ public class AdvancedSearch {
             String message;
             if (operator.valueCount == FilterValueCount.ONE) {
                 message = option.name + " " + operator.caption + " ?";
-            }
-            else {
+            } else {
                 message = "? " + operator.caption.replace("|", " " + option.name + " ");
             }
             Integer lowerBound = SGuiChoose.getInteger(message, min, max);
-            if (lowerBound == null) { return null; }
+            if (lowerBound == null) {
+                return null;
+            }
 
             final List<Integer> values = new ArrayList<>();
             values.add(lowerBound);
@@ -1195,7 +1224,9 @@ public class AdvancedSearch {
                     upperBoundMin += 2; //if exclusive, ensure it's possible to have numbers in between
                 }
                 Integer upperBound = SGuiChoose.getInteger(message, upperBoundMin, max);
-                if (upperBound == null) { return null; }
+                if (upperBound == null) {
+                    return null;
+                }
 
                 values.add(upperBound);
             }
@@ -1226,7 +1257,9 @@ public class AdvancedSearch {
         protected List<String> getValues(FilterOption option, FilterOperator operator) {
             String message = option.name + " " + operator.caption + " ?";
             String value = SOptionPane.showInputDialog("", message, null, initialInput);
-            if (value == null) { return null; }
+            if (value == null) {
+                return null;
+            }
 
             initialInput = value; //store value as initial input for next time
 
@@ -1253,9 +1286,11 @@ public class AdvancedSearch {
         public CustomListEvaluator(Collection<V> choices0) {
             this(choices0, null, null);
         }
+
         public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0) {
             this(choices0, toShortString0, null);
         }
+
         public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0, Function<V, String> toLongString0) {
             choices = choices0;
             toShortString = toShortString0;
@@ -1276,9 +1311,9 @@ public class AdvancedSearch {
         }
 
         private boolean eitherStringMatches(V choice, String name) {
-            if(toLongString != null && name.equals(toLongString.apply(choice)))
+            if (toLongString != null && name.equals(toLongString.apply(choice)))
                 return true;
-            if(toShortString != null)
+            if (toShortString != null)
                 return name.equals(toShortString.apply(choice));
             return name.equals(choice.toString());
         }
@@ -1287,16 +1322,16 @@ public class AdvancedSearch {
         protected String getCaption(List<V> values, FilterOption option, FilterOperator operator) {
             String valuesStr;
             switch (operator.valueCount) {
-            case MANY:
-                valuesStr = formatValues(values, " ", " ");
-                break;
-            case MANY_OR:
-                valuesStr = formatValues(values, ", ", " or ");
-                break;
-            case MANY_AND:
-            default:
-                valuesStr = formatValues(values, ", ", " and ");
-                break;
+                case MANY:
+                    valuesStr = formatValues(values, " ", " ");
+                    break;
+                case MANY_OR:
+                    valuesStr = formatValues(values, ", ", " or ");
+                    break;
+                case MANY_AND:
+                default:
+                    valuesStr = formatValues(values, ", ", " and ");
+                    break;
             }
             return String.format(operator.formatStr, option.name, valuesStr);
         }
@@ -1304,18 +1339,18 @@ public class AdvancedSearch {
         protected String formatValues(List<V> values, String delim, String finalDelim) {
             int valueCount = values.size();
             switch (valueCount) {
-            case 1:
-                return formatValue(values.get(0));
-            case 2:
-                return formatValue(values.get(0)) + finalDelim + formatValue(values.get(1));
-            default:
-                int lastValueIdx = valueCount - 1;
-                StringBuilder result = new StringBuilder(formatValue(values.get(0)));
-                for (int i = 1; i < lastValueIdx; i++) {
-                    result.append(delim).append(formatValue(values.get(i)));
-                }
-                result.append(delim.trim()).append(finalDelim).append(formatValue(values.get(lastValueIdx)));
-                return result.toString();
+                case 1:
+                    return formatValue(values.get(0));
+                case 2:
+                    return formatValue(values.get(0)) + finalDelim + formatValue(values.get(1));
+                default:
+                    int lastValueIdx = valueCount - 1;
+                    StringBuilder result = new StringBuilder(formatValue(values.get(0)));
+                    for (int i = 1; i < lastValueIdx; i++) {
+                        result.append(delim).append(formatValue(values.get(i)));
+                    }
+                    result.append(delim.trim()).append(finalDelim).append(formatValue(values.get(lastValueIdx)));
+                    return result.toString();
             }
         }
 
@@ -1350,12 +1385,16 @@ public class AdvancedSearch {
         protected List<Map<String, Integer>> getValues(FilterOption option, FilterOperator operator) {
             String message = option.name + " " + operator.caption + " ?";
             PaperCard card = SGuiChoose.oneOrNone(message, FModel.getMagicDb().getCommonCards().getUniqueCards());
-            if (card == null) { return null; }
+            if (card == null) {
+                return null;
+            }
 
             Integer amount = -1;
             if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) { //prompt for quantity if needed
                 amount = SGuiChoose.getInteger(Localizer.getInstance().getMessage("lblHowManyCopiesOfN", CardTranslation.getTranslatedName(card.getName())), 0, 4);
-                if (amount == null) { return null; }
+                if (amount == null) {
+                    return null;
+                }
             }
 
             Map<String, Integer> map = new HashMap<>();
@@ -1370,13 +1409,12 @@ public class AdvancedSearch {
         protected List<Map<String, Integer>> getValuesFromString(String valueText, FilterOption option, FilterOperator operator) {
             int amount = -1;
             String cardName;
-            if(operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
+            if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
                 //Take the format "2 Mountain"
                 String[] split = valueText.split(" ", 2);
                 amount = Integer.parseInt(split[0]);
                 cardName = split[1];
-            }
-            else
+            } else
                 cardName = valueText;
             Map<String, Integer> map = new HashMap<>();
             map.put(cardName, amount);
@@ -1412,25 +1450,29 @@ public class AdvancedSearch {
                 }
             }
             option = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectAFilterType"), options, defaultOption, null);
-            if (option == null) { return editFilter; }
-        }
-        else {
+            if (option == null) {
+                return editFilter;
+            }
+        } else {
             option = defaultOption;
         }
 
-        if (option == FilterOption.NONE) { return null; } //allow user to clear filter by selecting "(none)"
+        if (option == FilterOption.NONE) {
+            return null;
+        } //allow user to clear filter by selecting "(none)"
 
         final FilterOperator operator;
         if (option.operatorOptions.length > 1) {
             final FilterOperator defaultOperator = option == defaultOption ? editFilter.operator : null;
             operator = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectOperatorFor", option.name), option.operatorOptions, defaultOperator, null);
-            if (operator == null) { return editFilter; }
-        }
-        else {
+            if (operator == null) {
+                return editFilter;
+            }
+        } else {
             operator = option.operatorOptions[0];
         }
 
-        Filter<T> filter = (Filter<T>)option.evaluator.createFilter(option, operator);
+        Filter<T> filter = (Filter<T>) option.evaluator.createFilter(option, operator);
         if (filter == null) {
             filter = editFilter;
         }
@@ -1440,8 +1482,7 @@ public class AdvancedSearch {
     @SuppressWarnings("unchecked")
     public static <T extends InventoryItem> Filter<T> getFilter(Class<? super T> type, String filterText) {
         String[] words = filterText.split(" ", 3);
-        if(words.length < 2)
-        {
+        if (words.length < 2) {
             System.out.printf("Unable to generate filter from expression '%s'%n", filterText);
             return null;
         }
@@ -1454,8 +1495,7 @@ public class AdvancedSearch {
             System.out.printf("Unable to generate filter from FilterOption '%s'%n", words[0]);
             return null;
         }
-        if(option.type != type)
-        {
+        if (option.type != type) {
             System.out.printf("Unable to generate filter from FilterOption '%s' - filter type '%s' != option type '%s' %n", words[0], type, option.type);
             return null;
         }
@@ -1515,14 +1555,23 @@ public class AdvancedSearch {
 
     public interface IFilterControl<T extends InventoryItem> {
         IButton getBtnNotBeforeParen();
+
         IButton getBtnOpenParen();
+
         IButton getBtnNotAfterParen();
+
         IButton getBtnFilter();
+
         IButton getBtnCloseParen();
+
         IButton getBtnAnd();
+
         IButton getBtnOr();
+
         Filter<T> getFilter();
+
         void setFilter(Filter<T> filter0);
+
         Class<? super T> getGenericType();
     }
 
@@ -1554,23 +1603,18 @@ public class AdvancedSearch {
                 Object piece = iterator.get();
                 if (piece.equals(Operator.OPEN_PAREN)) {
                     predPiece = getPredicatePiece(iterator.next());
-                }
-                else if (piece.equals(Operator.CLOSE_PAREN)) {
+                } else if (piece.equals(Operator.CLOSE_PAREN)) {
                     return pred;
-                }
-                else if (piece.equals(Operator.AND)) {
+                } else if (piece.equals(Operator.AND)) {
                     operator = Operator.AND;
                     continue;
-                }
-                else if (piece.equals(Operator.OR)) {
+                } else if (piece.equals(Operator.OR)) {
                     operator = Operator.OR;
                     continue;
-                }
-                else if (piece.equals(Operator.NOT)) {
+                } else if (piece.equals(Operator.NOT)) {
                     applyNot = !applyNot;
                     continue;
-                }
-                else {
+                } else {
                     predPiece = ((AdvancedSearch.Filter<T>) piece).getPredicate();
                 }
                 if (applyNot) {
@@ -1579,11 +1623,9 @@ public class AdvancedSearch {
                 }
                 if (pred == null) {
                     pred = predPiece;
-                }
-                else if (operator == Operator.AND) {
+                } else if (operator == Operator.AND) {
                     pred = pred.and(predPiece);
-                }
-                else if (operator == Operator.OR) {
+                } else if (operator == Operator.OR) {
                     pred = pred.or(predPiece);
                 }
                 operator = null;
@@ -1626,16 +1668,7 @@ public class AdvancedSearch {
                         control.setFilter(filter);
                         if (filter != null) {
                             control.getBtnFilter().setText(GuiBase.getInterface().encodeSymbols(filter.toString(), false));
-
-                            if (filter.getOption() == FilterOption.CARD_KEYWORDS) {
-                                //the first time the user selects keywords, preload keywords for all cards
-                                Runnable preloadTask = Keyword.getPreloadTask();
-                                if (preloadTask != null) {
-                                    GuiBase.getInterface().runBackgroundTask(Localizer.getInstance().getMessage("lblLoadingKeywords"), preloadTask);
-                                }
-                            }
-                        }
-                        else {
+                        } else {
                             control.getBtnFilter().setText(EMPTY_FILTER_TEXT);
                         }
                         if (onChange != null) {
@@ -1657,32 +1690,31 @@ public class AdvancedSearch {
 
         @SuppressWarnings("unchecked")
         public void updateLabel() {
-            if (label == null) { return; }
+            if (label == null) {
+                return;
+            }
 
             StringBuilder builder = new StringBuilder();
             builder.append("Filter: ");
             if (expression.isEmpty()) {
                 builder.append("(none)");
-            }
-            else {
+            } else {
                 int prevFilterEndIdx = -1;
                 AdvancedSearch.Filter<T> filter, prevFilter = null;
                 for (Object piece : expression) {
                     if (piece instanceof AdvancedSearch.Filter) {
-                        filter = (AdvancedSearch.Filter<T>)piece;
+                        filter = (AdvancedSearch.Filter<T>) piece;
                         if (filter.canMergeCaptionWith(prevFilter)) {
                             //convert boolean operators between filters to lowercase
                             builder.replace(prevFilterEndIdx, builder.length(), builder.substring(prevFilterEndIdx).toLowerCase());
                             //append only values for filter
                             builder.append(filter.extractValuesFromCaption());
-                        }
-                        else {
+                        } else {
                             builder.append(filter);
                         }
                         prevFilter = filter;
                         prevFilterEndIdx = builder.length();
-                    }
-                    else {
+                    } else {
                         if (piece.equals(Operator.OPEN_PAREN) || piece.equals(Operator.CLOSE_PAREN)) {
                             prevFilter = null; //prevent merging filters with parentheses in between
                         }
@@ -1695,7 +1727,9 @@ public class AdvancedSearch {
         }
 
         public String getTooltip() {
-            if (expression.isEmpty()) { return ""; }
+            if (expression.isEmpty()) {
+                return "";
+            }
 
             StringBuilder builder = new StringBuilder();
             builder.append("Filter:\n");
@@ -1718,7 +1752,9 @@ public class AdvancedSearch {
             expression.clear();
 
             for (IFilterControl<T> control : controls) {
-                if (control.getFilter() == null) { continue; } //skip any blank filters
+                if (control.getFilter() == null) {
+                    continue;
+                } //skip any blank filters
 
                 if (control.getBtnNotBeforeParen().isSelected()) {
                     expression.add(Operator.NOT);
@@ -1737,8 +1773,7 @@ public class AdvancedSearch {
                 }
                 if (control.getBtnAnd().isSelected()) {
                     expression.add(Operator.AND);
-                }
-                else if (control.getBtnOr().isSelected()) {
+                } else if (control.getBtnOr().isSelected()) {
                     expression.add(Operator.OR);
                 }
             }
@@ -1748,13 +1783,16 @@ public class AdvancedSearch {
 
         private class ExpressionIterator {
             private int index;
+
             private boolean hasNext() {
                 return index < expression.size();
             }
+
             private ExpressionIterator next() {
                 index++;
                 return this;
             }
+
             private Object get() {
                 return expression.get(index);
             }
diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
index 79cdc5f554b..73d3c9071b3 100644
--- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
+++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearchParser.java
@@ -326,6 +326,14 @@ public abstract class AdvancedSearchParser {
                         case "transform":
                             predicate = CardRulesPredicates.isSplitType(CardSplitType.Transform);
                             break;
+
+                        case "vanilla":
+                            predicate = CardRulesPredicates.isVanilla();
+                            break;
+
+                        case "custom":
+                            predicate = card -> card.isCustom();
+                            break;
                     }
                 }
                 break;
diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
index 72100c677e0..f5c2f080810 100644
--- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
+++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
@@ -91,7 +91,7 @@ public enum ColumnDef {
      * The color column.
      */
     COLOR("lblColor", "ttColor", 46, true, SortState.ASC,
-            from -> toColor(from.getKey()),
+            from -> toColor(from.getKey()).getOrderWeight(),
             from -> toColor(from.getKey())),
     /**
      * The power column.
@@ -271,7 +271,7 @@ public enum ColumnDef {
      * The deck color column.
      */
     DECK_COLOR("lblColor", "ttColor", 70, true, SortState.ASC,
-            from -> toDeckColor(from.getKey()),
+            from -> toDeckColor(from.getKey()).getOrderWeight(),
             from -> toDeckColor(from.getKey())),
     /**
      * The deck format column.
@@ -377,7 +377,7 @@ public enum ColumnDef {
     }
 
     private static ColorSet toColor(final InventoryItem i) {
-        return i instanceof IPaperCard ? ((IPaperCard) i).getRules().getColor() : ColorSet.getNullColor();
+        return i instanceof IPaperCard ? ((IPaperCard) i).getRules().getColor() : ColorSet.C;
     }
 
     private static Integer toPower(final InventoryItem i) {
diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
index c5dfea7a662..6e97592adf8 100644
--- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
+++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
@@ -217,7 +217,8 @@ public class SFilterUtil {
             }
             entry.append(ch);
         }
-       if (entry.length() != 0) { // Android API isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+        // Android API StringBuilder isEmpty() is unavailable. https://developer.android.com/reference/java/lang/StringBuilder
+       if (entry.length() != 0) {
             splitText.add(entry.toString());
         }
         return splitText;
@@ -440,7 +441,7 @@ public class SFilterUtil {
         final byte colors = colors0;
         final boolean wantColorless = buttonMap.get(StatTypes.COLORLESS).isSelected();
         final boolean wantMulticolor = buttonMap.get(StatTypes.MULTICOLOR).isSelected();
-        final boolean wantAllColors = colors == ColorSet.ALL_COLORS.getColor();
+        final boolean wantAllColors = colors == ColorSet.WUBRG.getColor();
         //Use color identity instead of color for lands, unless all colors are filtered out anyway.
         final boolean filterLandsByCI = colors != 0 && FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_FILTER_LANDS_BY_COLOR_IDENTITY);
 
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
index f5c89059821..6077429aa06 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
@@ -236,44 +236,44 @@ public final class ForgeConstants {
     }
 
     // data that is only in the profile dirs
-    public static final String USER_QUEST_DIR       = USER_DIR + "quest" + PATH_SEPARATOR;
-    public static final String USER_QUEST_WORLD_DIR = USER_QUEST_DIR + "world" + PATH_SEPARATOR;
-    public static final String USER_CONQUEST_DIR    = USER_DIR + "conquest" + PATH_SEPARATOR;
-    public static final String USER_PREFS_DIR       = USER_DIR + "preferences" + PATH_SEPARATOR;
-    public static final String USER_GAMES_DIR       = USER_DIR + "games" + PATH_SEPARATOR;
-    public static final String USER_PUZZLE_DIR      = USER_DIR + "puzzle" + PATH_SEPARATOR;
-    public static final String LOG_FILE             = USER_DIR + "forge.log";
-    public static final String ACHIEVEMENTS_DIR     = USER_DIR + "achievements" + PATH_SEPARATOR;
-    public static final String USER_CUSTOM_DIR      = USER_DIR + "custom" + PATH_SEPARATOR;
-    public static final String USER_CUSTOM_EDITIONS_DIR = USER_CUSTOM_DIR + "editions" + PATH_SEPARATOR;
-    public static final String USER_CUSTOM_CARDS_DIR = USER_CUSTOM_DIR + "cards" + PATH_SEPARATOR;
-    public static final String USER_CUSTOM_TOKENS_DIR = USER_CUSTOM_DIR + "tokens" + PATH_SEPARATOR;
-    public static final String USER_FORMATS_DIR     = USER_CUSTOM_DIR + "formats" + PATH_SEPARATOR;
-    public static final String CUSTOM_STARTER_DECK_DIR = USER_CUSTOM_DIR + "starterdecks" + PATH_SEPARATOR;
-    public static final String USER_ADVENTURE_DIR   = USER_DIR + "adventure" + PATH_SEPARATOR;
-    public static final String DECK_DRAFT_DIR       = DECK_BASE_DIR + "draft" + PATH_SEPARATOR;
-    public static final String DECK_WINSTON_DIR     = DECK_BASE_DIR + "winston" + PATH_SEPARATOR;
-    public static final String DECK_SEALED_DIR      = DECK_BASE_DIR + "sealed" + PATH_SEPARATOR;
-    public static final String DECK_SCHEME_DIR      = DECK_BASE_DIR + "scheme" + PATH_SEPARATOR;
-    public static final String DECK_PLANE_DIR       = DECK_BASE_DIR + "planar" + PATH_SEPARATOR;
-    public static final String DECK_COMMANDER_DIR   = DECK_BASE_DIR + "commander" + PATH_SEPARATOR;
-    public static final String COMMANDER_PRECON_DIR = QUEST_DIR + "commanderprecons" + PATH_SEPARATOR;
-    public static final String DECK_OATHBREAKER_DIR = DECK_BASE_DIR + "oathbreaker" + PATH_SEPARATOR;
-    public static final String DECK_NET_DIR         = DECK_BASE_DIR + "net" + PATH_SEPARATOR;
-    public static final String DECK_NET_ARCHIVE_DIR = DECK_BASE_DIR + "archive" + PATH_SEPARATOR;
-    public static final String QUEST_SAVE_DIR       = USER_QUEST_DIR + "saves" + PATH_SEPARATOR;
-    public static final String CONQUEST_SAVE_DIR    = USER_CONQUEST_DIR + "saves" + PATH_SEPARATOR;
-    public static final String DECK_TINY_LEADERS_DIR= DECK_BASE_DIR + "tiny_leaders" + PATH_SEPARATOR;
-    public static final String DECK_BRAWL_DIR       = DECK_BASE_DIR + "brawl" + PATH_SEPARATOR;
-    public static final String MAIN_PREFS_FILE      = USER_PREFS_DIR + "forge.preferences";
-    public static final String SERVER_PREFS_FILE    = USER_PREFS_DIR + "server.preferences";
-    public static final String CARD_PREFS_FILE      = USER_PREFS_DIR + "card.preferences";
-    public static final String DECK_PREFS_FILE      = USER_PREFS_DIR + "deck.preferences";
-    public static final String QUEST_PREFS_FILE     = USER_PREFS_DIR + "quest.preferences";
-    public static final String CONQUEST_PREFS_FILE  = USER_PREFS_DIR + "conquest.preferences";
-    public static final String ITEM_VIEW_PREFS_FILE = USER_PREFS_DIR + "item_view.preferences";
-    public static final String CLOSE_CONN_COMMAND   = "<<_EM_ESOLC_<<";
-    public static final String INVALID_HOST_COMMAND   = "<<_TSOH_DILAVNI_<<";
+    public static final String USER_QUEST_DIR             = USER_DIR + "quest" + PATH_SEPARATOR;
+    public static final String USER_QUEST_WORLD_DIR       = USER_QUEST_DIR + "world" + PATH_SEPARATOR;
+    public static final String USER_CONQUEST_DIR          = USER_DIR + "conquest" + PATH_SEPARATOR;
+    public static final String USER_PREFS_DIR             = USER_DIR + "preferences" + PATH_SEPARATOR;
+    public static final String USER_GAMES_DIR             = USER_DIR + "games" + PATH_SEPARATOR;
+    public static final String USER_PUZZLE_DIR            = USER_DIR + "puzzle" + PATH_SEPARATOR;
+    public static final String LOG_FILE                   = USER_DIR + "forge.log";
+    public static final String ACHIEVEMENTS_DIR           = USER_DIR + "achievements" + PATH_SEPARATOR;
+    public static final String USER_CUSTOM_DIR            = USER_DIR + "custom" + PATH_SEPARATOR;
+    public static final String USER_CUSTOM_EDITIONS_DIR   = USER_CUSTOM_DIR + "editions" + PATH_SEPARATOR;
+    public static final String USER_CUSTOM_CARDS_DIR      = USER_CUSTOM_DIR + "cards" + PATH_SEPARATOR;
+    public static final String USER_CUSTOM_TOKENS_DIR     = USER_CUSTOM_DIR + "tokens" + PATH_SEPARATOR;
+    public static final String USER_FORMATS_DIR           = USER_CUSTOM_DIR + "formats" + PATH_SEPARATOR;
+    public static final String CUSTOM_STARTER_DECK_DIR    = USER_CUSTOM_DIR + "starterdecks" + PATH_SEPARATOR;
+    public static final String USER_ADVENTURE_DIR         = USER_DIR + "adventure" + PATH_SEPARATOR;
+    public static final String DECK_DRAFT_DIR             = DECK_BASE_DIR + "draft" + PATH_SEPARATOR;
+    public static final String DECK_WINSTON_DIR           = DECK_BASE_DIR + "winston" + PATH_SEPARATOR;
+    public static final String DECK_SEALED_DIR            = DECK_BASE_DIR + "sealed" + PATH_SEPARATOR;
+    public static final String DECK_SCHEME_DIR            = DECK_BASE_DIR + "scheme" + PATH_SEPARATOR;
+    public static final String DECK_PLANE_DIR             = DECK_BASE_DIR + "planar" + PATH_SEPARATOR;
+    public static final String DECK_COMMANDER_DIR         = DECK_BASE_DIR + "commander" + PATH_SEPARATOR;
+    public static final String COMMANDER_PRECON_DIR       = QUEST_DIR + "commanderprecons" + PATH_SEPARATOR;
+    public static final String DECK_OATHBREAKER_DIR       = DECK_BASE_DIR + "oathbreaker" + PATH_SEPARATOR;
+    public static final String DECK_NET_DIR               = DECK_BASE_DIR + "net" + PATH_SEPARATOR;
+    public static final String DECK_NET_ARCHIVE_DIR       = DECK_BASE_DIR + "archive" + PATH_SEPARATOR;
+    public static final String QUEST_SAVE_DIR             = USER_QUEST_DIR + "saves" + PATH_SEPARATOR;
+    public static final String CONQUEST_SAVE_DIR          = USER_CONQUEST_DIR + "saves" + PATH_SEPARATOR;
+    public static final String DECK_TINY_LEADERS_DIR      = DECK_BASE_DIR + "tiny_leaders" + PATH_SEPARATOR;
+    public static final String DECK_BRAWL_DIR             = DECK_BASE_DIR + "brawl" + PATH_SEPARATOR;
+    public static final String MAIN_PREFS_FILE            = USER_PREFS_DIR + "forge.preferences";
+    public static final String SERVER_PREFS_FILE          = USER_PREFS_DIR + "server.preferences";
+    public static final String CARD_PREFS_FILE            = USER_PREFS_DIR + "card.preferences";
+    public static final String DECK_PREFS_FILE            = USER_PREFS_DIR + "deck.preferences";
+    public static final String QUEST_PREFS_FILE           = USER_PREFS_DIR + "quest.preferences";
+    public static final String CONQUEST_PREFS_FILE        = USER_PREFS_DIR + "conquest.preferences";
+    public static final String ITEM_VIEW_PREFS_FILE       = USER_PREFS_DIR + "item_view.preferences";
+    public static final String CLOSE_CONN_COMMAND         = "<<_EM_ESOLC_<<";
+    public static final String INVALID_HOST_COMMAND       = "<<_TSOH_DILAVNI_<<";
 
     // data that has defaults in the program dir but overrides/additions in the user dir
     private static final String _DEFAULTS_DIR = RES_DIR + "defaults" + PATH_SEPARATOR;
diff --git a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
index 99d9fb683ce..66cf630f5a6 100644
--- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
+++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
@@ -22,7 +22,10 @@ import java.util.Map;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
+import forge.card.MagicColor;
 import forge.card.mana.ManaCostShard;
+import forge.deck.DeckSection;
+import forge.game.zone.ZoneType;
 import forge.localinstance.properties.ForgeConstants;
 
 /**
@@ -705,6 +708,51 @@ public enum FSkinProp {
         MANA_IMG.put("AL6OFF", FSkinProp.IMG_ATTR_6_OFF);
     }
 
+    public static FSkinProp iconFromColor(MagicColor.Color color) {
+        return switch (color) {
+            case WHITE -> IMG_MANA_W;
+            case BLUE -> IMG_MANA_U;
+            case BLACK -> IMG_MANA_B;
+            case RED -> IMG_MANA_R;
+            case GREEN -> IMG_MANA_G;
+            case COLORLESS -> IMG_MANA_COLORLESS;
+        };
+    }
+
+    public static FSkinProp iconFromZone(ZoneType zoneType, boolean hdbuttons) {
+        return switch (zoneType) {
+            case Hand -> hdbuttons ? IMG_HDZONE_HAND : IMG_ZONE_HAND;
+            case Library -> hdbuttons ? IMG_HDZONE_LIBRARY : IMG_ZONE_LIBRARY;
+            case Graveyard -> hdbuttons ? IMG_HDZONE_GRAVEYARD : IMG_ZONE_GRAVEYARD;
+            case Exile -> hdbuttons ? IMG_HDZONE_EXILE : IMG_ZONE_EXILE;
+            case Sideboard -> hdbuttons ? IMG_HDZONE_SIDEBOARD : IMG_ZONE_SIDEBOARD;
+            case Flashback -> hdbuttons ? IMG_HDZONE_FLASHBACK : IMG_ZONE_FLASHBACK;
+            case Command -> IMG_ZONE_COMMAND; //IMG_PLANESWALKER
+            case PlanarDeck -> IMG_ZONE_PLANAR;
+            case SchemeDeck -> IMG_ZONE_SCHEME;
+            case AttractionDeck -> IMG_ZONE_ATTRACTION;
+            case ContraptionDeck -> IMG_ZONE_CONTRAPTION;
+            case Ante -> IMG_ZONE_ANTE;
+            case Junkyard ->IMG_ZONE_JUNKYARD;
+            default -> IMG_HDZONE_LIBRARY;
+        };
+    }
+
+    public static FSkinProp iconFromDeckSection(DeckSection deckSection, boolean hdbuttons) {
+        return switch (deckSection) {
+            case Main -> hdbuttons ? IMG_HDZONE_LIBRARY : ICO_DECKLIST;
+            case Sideboard -> hdbuttons ? IMG_HDZONE_SIDEBOARD : IMG_ZONE_SIDEBOARD;
+            case Commander -> IMG_ZONE_COMMAND;
+            case Avatar -> IMG_ZONE_AVATAR;
+            case Conspiracy -> IMG_ZONE_CONSPIRACY;
+            case Planes -> IMG_ZONE_PLANAR;
+            case Schemes -> IMG_ZONE_SCHEME;
+            case Attractions -> IMG_ZONE_ATTRACTION;
+            case Contraptions -> IMG_ZONE_CONTRAPTION;
+            default -> IMG_HDZONE_SIDEBOARD;
+        };
+    }
+
     public enum PropType {
         BACKGROUND(null),
         COLOR(null),
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index c3500d92f0a..7ae9a94341c 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -17,6 +17,8 @@
  */
 package forge.model;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.Maps;
 import forge.*;
 import forge.CardStorageReader.ProgressObserver;
@@ -61,7 +63,6 @@ import forge.util.storage.StorageBase;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 
 /**
@@ -76,43 +77,92 @@ import java.util.function.Function;
 public final class FModel {
     private FModel() { } //don't allow creating instance
 
-    private static StaticData magicDb;
-
-    private static QuestPreferences questPreferences;
-    private static ConquestPreferences conquestPreferences;
+    private static CardStorageReader reader, tokenReader, customReader, customTokenReader;
+    private static final Supplier<StaticData> magicDb = Suppliers.memoize(() ->
+        new StaticData(reader, tokenReader, customReader, customTokenReader, ForgeConstants.EDITIONS_DIR,
+            ForgeConstants.USER_CUSTOM_EDITIONS_DIR, ForgeConstants.BLOCK_DATA_DIR, ForgeConstants.SETLOOKUP_DIR,
+            getPreferences().getPref(FPref.UI_PREFERRED_ART),
+            getPreferences().getPrefBoolean(FPref.UI_LOAD_UNKNOWN_CARDS),
+            getPreferences().getPrefBoolean(FPref.UI_LOAD_NONLEGAL_CARDS),
+            getPreferences().getPrefBoolean(FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE),
+            getPreferences().getPrefBoolean(FPref.UI_SMART_CARD_ART)));
+    private static final Supplier<QuestPreferences> questPreferences = Suppliers.memoize(QuestPreferences::new);
+    private static final Supplier<ConquestPreferences> conquestPreferences = Suppliers.memoize(() -> {
+       final ConquestPreferences cp = new ConquestPreferences();
+       ConquestUtil.updateRarityFilterOdds(cp);
+       return cp;
+    });
     private static ForgePreferences preferences;
-    private static ForgeNetPreferences netPreferences;
-    private static Map<GameType, AchievementCollection> achievements;
+    private static final Supplier<ForgeNetPreferences> netPreferences = Suppliers.memoize(ForgeNetPreferences::new);
+    private static final Supplier<Map<GameType, AchievementCollection>> achievements = Suppliers.memoize(() -> {
+        final Map<GameType, AchievementCollection> a = Maps.newHashMap();
+        a.put(GameType.Constructed, new ConstructedAchievements());
+        a.put(GameType.Draft, new DraftAchievements());
+        a.put(GameType.Sealed, new SealedAchievements());
+        a.put(GameType.Quest, new QuestAchievements());
+        a.put(GameType.PlanarConquest, new PlanarConquestAchievements());
+        a.put(GameType.Puzzle, new PuzzleAchievements());
+        a.put(GameType.Adventure, new AdventureAchievements());
+        return a;
+    });
 
     // Someone should take care of 2 gauntlets here
     private static TournamentData tournamentData;
     private static GauntletData gauntletData;
-    private static GauntletMini gauntlet;
+    private static final Supplier<GauntletMini> gauntletMini = Suppliers.memoize(GauntletMini::new);
 
-    private static QuestController quest;
-    private static ConquestController conquest;
-    private static CardCollections decks;
+    private static final Supplier<QuestController> quest = Suppliers.memoize(QuestController::new);
+    private static final Supplier<ConquestController> conquest = Suppliers.memoize(ConquestController::new);
+    private static final Supplier<CardCollections> decks = Suppliers.memoize(CardCollections::new);
 
-    private static IStorage<CardBlock> blocks;
-    private static IStorage<CardBlock> fantasyBlocks;
-    private static IStorage<ThemedChaosDraft> themedChaosDrafts;
-    private static IStorage<ConquestPlane> planes;
-    private static IStorage<QuestWorld> worlds;
-    private static GameFormat.Collection formats;
-    private static ItemPool<PaperCard> uniqueCardsNoAlt, allCardsNoAlt, planechaseCards, archenemyCards,
-            brawlCommander, oathbreakerCommander, tinyLeadersCommander, commanderPool,
-            avatarPool, conspiracyPool, dungeonPool, attractionPool, contraptionPool;
+    private static final Supplier<IStorage<CardBlock>> blocks = Suppliers.memoize(() -> {
+        final IStorage<CardBlock> cb = new StorageBase<>("Block definitions", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "blocks.txt", getMagicDb().getEditions()));
+        // SetblockLands
+        for (final CardBlock b : cb) {
+            try {
+                getMagicDb().getBlockLands().add(b.getLandSet().getCode());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return cb;
+    });
+    private static final Supplier<IStorage<CardBlock>> fantasyBlocks = Suppliers.memoize(() -> new StorageBase<>("Custom blocks", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "fantasyblocks.txt", getMagicDb().getEditions())));
+    private static final Supplier<IStorage<ThemedChaosDraft>> themedChaosDrafts = Suppliers.memoize(() -> new StorageBase<>("Themed Chaos Drafts", new ThemedChaosDraft.Reader(ForgeConstants.BLOCK_DATA_DIR + "chaosdraftthemes.txt")));
+    private static final Supplier<IStorage<ConquestPlane>> planes = Suppliers.memoize(() -> new StorageBase<>("Conquest planes", new ConquestPlane.Reader(ForgeConstants.CONQUEST_PLANES_DIR + "planes.txt")));
+    private static final Supplier<IStorage<QuestWorld>> worlds = Suppliers.memoize(() -> {
+        final Map<String, QuestWorld> standardWorlds = new QuestWorld.Reader(ForgeConstants.QUEST_WORLD_DIR + "worlds.txt").readAll();
+        final Map<String, QuestWorld> customWorlds = new QuestWorld.Reader(ForgeConstants.USER_QUEST_WORLD_DIR + "customworlds.txt").readAll();
+        customWorlds.values().forEach(world -> world.setCustom(true));
+        standardWorlds.putAll(customWorlds);
+        final IStorage<QuestWorld> w = new StorageBase<>("Quest worlds", null, standardWorlds);
+        return w;
+    });
+    private static final Supplier<GameFormat.Collection> formats = Suppliers.memoize(() -> new GameFormat.Collection(new GameFormat.Reader( new File(ForgeConstants.FORMATS_DATA_DIR), new File(ForgeConstants.USER_FORMATS_DIR), preferences.getPrefBoolean(FPref.LOAD_ARCHIVED_FORMATS))));
+    private static final Supplier<ItemPool<PaperCard>> uniqueCardsNoAlt = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getUniqueCardsNoAlt(), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> allCardsNoAlt = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> planechaseCards = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_PLANE_OR_PHENOMENON)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> archenemyCards = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_SCHEME)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> brawlCommander = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(getFormats().get("Brawl").getFilterPrinted().and(PaperCardPredicates.fromRules(CardRulesPredicates.CAN_BE_BRAWL_COMMANDER))), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> oathbreakerCommander = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.fromRules(CardRulesPredicates.CAN_BE_OATHBREAKER.or(CardRulesPredicates.CAN_BE_SIGNATURE_SPELL))), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> tinyLeadersCommander = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.fromRules(CardRulesPredicates.CAN_BE_TINY_LEADERS_COMMANDER)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> commanderPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.CAN_BE_COMMANDER), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> avatarPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_VANGUARD)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> conspiracyPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_CONSPIRACY)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> dungeonPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_DUNGEON)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> attractionPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_ATTRACTION)), PaperCard.class));
+    private static final Supplier<ItemPool<PaperCard>> contraptionPool = Suppliers.memoize(() -> ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_CONTRAPTION)), PaperCard.class));
 
     public static void initialize(final IProgressBar progressBar, Function<ForgePreferences, Void> adjustPrefs) {
         initialize(progressBar, adjustPrefs, false);
     }
     public static void initialize(final IProgressBar progressBar, Function<ForgePreferences, Void> adjustPrefs, boolean isSimTest) {
         ImageKeys.initializeDirs(
-                ForgeConstants.CACHE_CARD_PICS_DIR, ForgeConstants.CACHE_CARD_PICS_SUBDIR,
-                ForgeConstants.CACHE_TOKEN_PICS_DIR, ForgeConstants.CACHE_ICON_PICS_DIR,
-                ForgeConstants.CACHE_BOOSTER_PICS_DIR, ForgeConstants.CACHE_FATPACK_PICS_DIR,
-                ForgeConstants.CACHE_BOOSTERBOX_PICS_DIR, ForgeConstants.CACHE_PRECON_PICS_DIR,
-                ForgeConstants.CACHE_TOURNAMENTPACK_PICS_DIR);
+            ForgeConstants.CACHE_CARD_PICS_DIR, ForgeConstants.CACHE_CARD_PICS_SUBDIR,
+            ForgeConstants.CACHE_TOKEN_PICS_DIR, ForgeConstants.CACHE_ICON_PICS_DIR,
+            ForgeConstants.CACHE_BOOSTER_PICS_DIR, ForgeConstants.CACHE_FATPACK_PICS_DIR,
+            ForgeConstants.CACHE_BOOSTERBOX_PICS_DIR, ForgeConstants.CACHE_PRECON_PICS_DIR,
+            ForgeConstants.CACHE_TOURNAMENTPACK_PICS_DIR);
 
         // Instantiate preferences: quest and regular
         // Preferences are initialized first so that the splash screen can be translated.
@@ -127,8 +177,8 @@ public final class FModel {
             throw new RuntimeException(exn);
         }
 
-        Lang.createInstance(FModel.getPreferences().getPref(FPref.UI_LANGUAGE));
-        Localizer.getInstance().initialize(FModel.getPreferences().getPref(FPref.UI_LANGUAGE), ForgeConstants.LANG_DIR);
+        Lang.createInstance(getPreferences().getPref(FPref.UI_LANGUAGE));
+        Localizer.getInstance().initialize(getPreferences().getPref(FPref.UI_LANGUAGE), ForgeConstants.LANG_DIR);
 
         final ProgressObserver progressBarBridge = (progressBar == null) ?
                 ProgressObserver.emptyObserver : new ProgressObserver() {
@@ -149,46 +199,37 @@ public final class FModel {
             }
         };
 
-        //if (new AutoUpdater(true).attemptToUpdate()) {}
-        // load types before loading cards
+        // if (new AutoUpdater(true).attemptToUpdate()) {}
+        // Load types before loading cards
         loadDynamicGamedata();
 
-        //load card database
+        // Load card database
         // Lazy loading currently disabled
-        final CardStorageReader reader = new CardStorageReader(ForgeConstants.CARD_DATA_DIR, progressBarBridge,
+        reader = new CardStorageReader(ForgeConstants.CARD_DATA_DIR, progressBarBridge,
                 false);
-        final CardStorageReader tokenReader = new CardStorageReader(ForgeConstants.TOKEN_DATA_DIR, progressBarBridge,
+        tokenReader = new CardStorageReader(ForgeConstants.TOKEN_DATA_DIR, progressBarBridge,
                 false);
-        CardStorageReader customReader;
+
         try {
            customReader  = new CardStorageReader(ForgeConstants.USER_CUSTOM_CARDS_DIR, progressBarBridge, false);
         } catch (Exception e) {
             customReader = null;
         }
-        CardStorageReader customTokenReader;
+
         try {
             customTokenReader  = new CardStorageReader(ForgeConstants.USER_CUSTOM_TOKENS_DIR, progressBarBridge, false);
         } catch (Exception e) {
             customTokenReader = null;
         }
 
-        // do this first so PaperCards see the real preference
+        // Do this first so PaperCards see the real preference
         CardTranslation.preloadTranslation(preferences.getPref(FPref.UI_LANGUAGE), ForgeConstants.LANG_DIR);
 
-        magicDb = new StaticData(reader, tokenReader, customReader, customTokenReader, ForgeConstants.EDITIONS_DIR,
-                                 ForgeConstants.USER_CUSTOM_EDITIONS_DIR, ForgeConstants.BLOCK_DATA_DIR, ForgeConstants.SETLOOKUP_DIR,
-                                 FModel.getPreferences().getPref(FPref.UI_PREFERRED_ART),
-                                 FModel.getPreferences().getPrefBoolean(FPref.UI_LOAD_UNKNOWN_CARDS),
-                                 FModel.getPreferences().getPrefBoolean(FPref.UI_LOAD_NONLEGAL_CARDS),
-                                 FModel.getPreferences().getPrefBoolean(FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE),
-                                 FModel.getPreferences().getPrefBoolean(FPref.UI_SMART_CARD_ART)
-                );
-
-        //create profile dirs if they don't already exist
+        // Create profile dirs if they don't already exist
         for (final String dname : ForgeConstants.PROFILE_DIRS) {
             final File path = new File(dname);
             if (path.isDirectory()) {
-                // already exists
+                // Already exists
                 continue;
             }
             if (!path.mkdirs()) {
@@ -199,202 +240,108 @@ public final class FModel {
         ForgePreferences.DEV_MODE = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
         ForgePreferences.UPLOAD_DRAFT = ForgePreferences.NET_CONN;
 
-        formats = new GameFormat.Collection(new GameFormat.Reader( new File(ForgeConstants.FORMATS_DATA_DIR),
-                new File(ForgeConstants.USER_FORMATS_DIR), preferences.getPrefBoolean(FPref.LOAD_ARCHIVED_FORMATS)));
+        getMagicDb().setStandardPredicate(getFormats().getStandard().getFilterRules());
+        getMagicDb().setPioneerPredicate(getFormats().getPioneer().getFilterRules());
+        getMagicDb().setModernPredicate(getFormats().getModern().getFilterRules());
+        getMagicDb().setCommanderPredicate(getFormats().get("Commander").getFilterRules());
+        getMagicDb().setOathbreakerPredicate(getFormats().get("Oathbreaker").getFilterRules());
+        getMagicDb().setBrawlPredicate(getFormats().get("Brawl").getFilterRules());
 
-        magicDb.setStandardPredicate(formats.getStandard().getFilterRules());
-        magicDb.setPioneerPredicate(formats.getPioneer().getFilterRules());
-        magicDb.setModernPredicate(formats.getModern().getFilterRules());
-        magicDb.setCommanderPredicate(formats.get("Commander").getFilterRules());
-        magicDb.setOathbreakerPredicate(formats.get("Oathbreaker").getFilterRules());
-        magicDb.setBrawlPredicate(formats.get("Brawl").getFilterRules());
-
-        magicDb.setFilteredHandsEnabled(preferences.getPrefBoolean(FPref.FILTERED_HANDS));
+        getMagicDb().setFilteredHandsEnabled(preferences.getPrefBoolean(FPref.FILTERED_HANDS));
         try {
-            magicDb.setMulliganRule(MulliganDefs.MulliganRule.valueOf(preferences.getPref(FPref.MULLIGAN_RULE)));
+            getMagicDb().setMulliganRule(MulliganDefs.MulliganRule.valueOf(preferences.getPref(FPref.MULLIGAN_RULE)));
         } catch(Exception e) {
-            magicDb.setMulliganRule(MulliganDefs.MulliganRule.London);
+            getMagicDb().setMulliganRule(MulliganDefs.MulliganRule.London);
         }
 
-        blocks = new StorageBase<>("Block definitions", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "blocks.txt", magicDb.getEditions()));
-        //setblockLands
-        for (final CardBlock b : blocks) {
-            magicDb.getBlockLands().add(b.getLandSet().getCode());
-        }
-        questPreferences = new QuestPreferences();
-        conquestPreferences = new ConquestPreferences();
-        netPreferences = new ForgeNetPreferences();
-        fantasyBlocks = new StorageBase<>("Custom blocks", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "fantasyblocks.txt", magicDb.getEditions()));
-        themedChaosDrafts = new StorageBase<>("Themed Chaos Drafts", new ThemedChaosDraft.Reader(ForgeConstants.BLOCK_DATA_DIR + "chaosdraftthemes.txt"));
-        planes = new StorageBase<>("Conquest planes", new ConquestPlane.Reader(ForgeConstants.CONQUEST_PLANES_DIR + "planes.txt"));
-        Map<String, QuestWorld> standardWorlds = new QuestWorld.Reader(ForgeConstants.QUEST_WORLD_DIR + "worlds.txt").readAll();
-        Map<String, QuestWorld> customWorlds = new QuestWorld.Reader(ForgeConstants.USER_QUEST_WORLD_DIR + "customworlds.txt").readAll();
-        for (QuestWorld world:customWorlds.values()){
-            world.setCustom(true);
-        }
-        standardWorlds.putAll(customWorlds);
-        worlds = new StorageBase<>("Quest worlds", null, standardWorlds);
-
         Spell.setPerformanceMode(preferences.getPrefBoolean(FPref.PERFORMANCE_MODE));
 
         if (progressBar != null) {
             FThreads.invokeInEdtLater(() -> progressBar.setDescription(Localizer.getInstance().getMessage("splash.loading.decks")));
         }
 
-        decks = new CardCollections();
-        quest = new QuestController();
-        conquest = new ConquestController();
-
         CardPreferences.load();
         DeckPreferences.load();
         ItemManagerConfig.load();
-        ConquestUtil.updateRarityFilterOdds();
 
-        achievements = Maps.newHashMap();
-        achievements.put(GameType.Constructed, new ConstructedAchievements());
-        achievements.put(GameType.Draft, new DraftAchievements());
-        achievements.put(GameType.Sealed, new SealedAchievements());
-        achievements.put(GameType.Quest, new QuestAchievements());
-        achievements.put(GameType.PlanarConquest, new PlanarConquestAchievements());
-        achievements.put(GameType.Puzzle, new PuzzleAchievements());
-        achievements.put(GameType.Adventure, new AdventureAchievements());
-
-        //preload AI profiles
+        // Preload AI profiles
         AiProfileUtil.loadAllProfiles(ForgeConstants.AI_PROFILE_DIR);
-        AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(FModel.getPreferences().getPref(FPref.MATCH_AI_SIDEBOARDING_MODE)));
+        AiProfileUtil.setAiSideboardingMode(AiProfileUtil.AISideboardingMode.normalizedValueOf(getPreferences().getPref(FPref.MATCH_AI_SIDEBOARDING_MODE)));
 
-        //generate Deck Gen matrix
-        if(FModel.getPreferences().getPrefBoolean(FPref.DECKGEN_CARDBASED)) {
+        // Generate Deck Gen matrix
+        if(getPreferences().getPrefBoolean(FPref.DECKGEN_CARDBASED)) {
             boolean commanderDeckGenMatrixLoaded=CardRelationMatrixGenerator.initialize();
             deckGenMatrixLoaded=CardArchetypeLDAGenerator.initialize();
             if(!commanderDeckGenMatrixLoaded){
                 deckGenMatrixLoaded=false;
             }
         }
-
-        if (GuiBase.getInterface().isLibgdxPort() && GuiBase.getDeviceRAM() < 5000)
-            return; // don't preload ItemPool on mobile port with less than 5GB RAM
-
-        //common ItemPool to preload
-        allCardsNoAlt = getAllCardsNoAlt();
-        archenemyCards = getArchenemyCards();
-        planechaseCards = getPlanechaseCards();
-        attractionPool = getAttractionPool();
-        contraptionPool = getContraptionPool();
-        if (GuiBase.getInterface().isLibgdxPort()) {
-            //preload mobile Itempool
-            uniqueCardsNoAlt = getUniqueCardsNoAlt();
-        } else {
-            //preload Desktop Itempool
-            commanderPool = getCommanderPool();
-            brawlCommander = getBrawlCommander();
-            tinyLeadersCommander = getTinyLeadersCommander();
-            avatarPool = getAvatarPool();
-            conspiracyPool = getConspiracyPool();
-        }
     }
 
-    private static boolean deckGenMatrixLoaded=false;
+    private static boolean deckGenMatrixLoaded = false;
 
     public static boolean isdeckGenMatrixLoaded(){
         return deckGenMatrixLoaded;
     }
 
     public static QuestController getQuest() {
-        return quest;
+        return quest.get();
     }
 
     public static ConquestController getConquest() {
-        return conquest;
+        return conquest.get();
     }
 
     public static ItemPool<PaperCard> getUniqueCardsNoAlt() {
-        if (uniqueCardsNoAlt == null)
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getUniqueCardsNoAlt(), PaperCard.class);
-        return uniqueCardsNoAlt;
+        return uniqueCardsNoAlt.get();
     }
 
     public static ItemPool<PaperCard> getAllCardsNoAlt() {
-        if (allCardsNoAlt == null)
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(), PaperCard.class);
-        return allCardsNoAlt;
+        return allCardsNoAlt.get();
     }
 
     public static ItemPool<PaperCard> getArchenemyCards() {
-        if (archenemyCards == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_SCHEME)), PaperCard.class);
-        return archenemyCards;
+        return archenemyCards.get();
     }
 
     public static ItemPool<PaperCard> getPlanechaseCards() {
-        if (planechaseCards == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(CardRulesPredicates.IS_PLANE_OR_PHENOMENON)), PaperCard.class);
-        return planechaseCards;
+        return planechaseCards.get();
     }
 
     public static ItemPool<PaperCard> getBrawlCommander() {
-        if (brawlCommander == null) {
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(
-                    FModel.getFormats().get("Brawl").getFilterPrinted()
-                            .and(PaperCardPredicates.fromRules(CardRulesPredicates.CAN_BE_BRAWL_COMMANDER))
-            ), PaperCard.class);
-        }
-        return brawlCommander;
+        return brawlCommander.get();
     }
 
     public static ItemPool<PaperCard> getOathbreakerCommander() {
-        if (oathbreakerCommander == null)
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.CAN_BE_OATHBREAKER.or(CardRulesPredicates.CAN_BE_SIGNATURE_SPELL))), PaperCard.class);
-        return oathbreakerCommander;
+        return oathbreakerCommander.get();
     }
 
     public static ItemPool<PaperCard> getTinyLeadersCommander() {
-        if (tinyLeadersCommander == null)
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.CAN_BE_TINY_LEADERS_COMMANDER)), PaperCard.class);
-        return tinyLeadersCommander;
+        return tinyLeadersCommander.get();
     }
 
     public static ItemPool<PaperCard> getCommanderPool() {
-        if (commanderPool == null)
-            return ItemPool.createFrom(getMagicDb().getCommonCards().getAllCardsNoAlt(PaperCardPredicates.CAN_BE_COMMANDER), PaperCard.class);
-        return commanderPool;
+        return commanderPool.get();
     }
 
     public static ItemPool<PaperCard> getAvatarPool() {
-        if (avatarPool == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.IS_VANGUARD)), PaperCard.class);
-        return avatarPool;
+        return avatarPool.get();
     }
 
     public static ItemPool<PaperCard> getConspiracyPool() {
-        if (conspiracyPool == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.IS_CONSPIRACY)), PaperCard.class);
-        return conspiracyPool;
+        return conspiracyPool.get();
     }
 
     public static ItemPool<PaperCard> getDungeonPool() {
-        if (dungeonPool == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.IS_DUNGEON)), PaperCard.class);
-        return dungeonPool;
+        return dungeonPool.get();
     }
 
     public static ItemPool<PaperCard> getAttractionPool() {
-        if (attractionPool == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.IS_ATTRACTION)), PaperCard.class);
-        return attractionPool;
+        return attractionPool.get();
     }
 
     public static ItemPool<PaperCard> getContraptionPool() {
-        if(contraptionPool == null)
-            return ItemPool.createFrom(getMagicDb().getVariantCards().getAllCards(PaperCardPredicates.fromRules(
-                    CardRulesPredicates.IS_CONTRAPTION)), PaperCard.class);
-        return contraptionPool;
+        return contraptionPool.get();
     }
 
     private static boolean keywordsLoaded = false;
@@ -404,50 +351,13 @@ public final class FModel {
      */
     public static void loadDynamicGamedata() {
         if (!CardType.Constant.LOADED.isSet()) {
-            final List<String> typeListFile = FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE);
-
-            Set<String> addTo = null;
-
-            for (final String s : typeListFile) {
-                if (s.equals("[BasicTypes]")) {
-                    addTo = CardType.Constant.BASIC_TYPES;
-                } else if (s.equals("[LandTypes]")) {
-                    addTo = CardType.Constant.LAND_TYPES;
-                } else if (s.equals("[CreatureTypes]")) {
-                    addTo = CardType.Constant.CREATURE_TYPES;
-                } else if (s.equals("[SpellTypes]")) {
-                    addTo = CardType.Constant.SPELL_TYPES;
-                } else if (s.equals("[EnchantmentTypes]")) {
-                    addTo = CardType.Constant.ENCHANTMENT_TYPES;
-                } else if (s.equals("[ArtifactTypes]")) {
-                    addTo = CardType.Constant.ARTIFACT_TYPES;
-                } else if (s.equals("[WalkerTypes]")) {
-                    addTo = CardType.Constant.WALKER_TYPES;
-                } else if (s.equals("[DungeonTypes]")) {
-                    addTo = CardType.Constant.DUNGEON_TYPES;
-                } else if (s.equals("[BattleTypes]")) {
-                    addTo = CardType.Constant.BATTLE_TYPES;
-                } else if (s.equals("[PlanarTypes]")) {
-                    addTo = CardType.Constant.PLANAR_TYPES;
-                } else if (s.length() > 1) {
-                    if (addTo != null) {
-                        if (s.contains(":")) {
-                            String[] k = s.split(":");
-                            addTo.add(k[0]);
-                            CardType.Constant.pluralTypes.put(k[0], k[1]);
-
-                            if (k[0].contains(" ")) {
-                                CardType.Constant.MultiwordTypes.add(k[0]);
-                            }
-                        } else {
-                            addTo.add(s);
-                            if (s.contains(" ")) {
-                                CardType.Constant.MultiwordTypes.add(s);
-                            }
-                        }
-                    }
-                }
+            
+            final Map<String, List<String>> contents = FileSection.parseSections(FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE));
+            
+            for (String sectionName: contents.keySet()) {
+                CardType.Helper.parseTypes(sectionName, contents.get(sectionName));
             }
+
             CardType.Constant.LOADED.set();
         }
 
@@ -466,49 +376,36 @@ public final class FModel {
     }
 
     public static StaticData getMagicDb() {
-        return magicDb;
+        return magicDb.get();
     }
 
     public static ForgePreferences getPreferences() {
         return preferences;
     }
     public static ForgeNetPreferences getNetPreferences() {
-        return netPreferences;
+        return netPreferences.get();
     }
 
     public static AchievementCollection getAchievements(GameType gameType) {
-        switch (gameType) { //translate gameType to appropriate type if needed
-        case Constructed:
-        case Draft:
-        case Sealed:
-        case Quest:
-        case PlanarConquest:
-        case Puzzle:
-        case Adventure:
-            break;
-        case AdventureEvent:
-            gameType = GameType.Adventure;
-            break;
-        case QuestDraft:
-            gameType = GameType.Quest;
-            break;
-        default:
-            gameType = GameType.Constructed;
-            break;
-        }
-        return achievements.get(gameType);
+        // Translate gameType to appropriate type if needed
+        return switch (gameType) {
+            case Constructed, Draft, Sealed, Quest, PlanarConquest, Puzzle, Adventure -> achievements.get().get(gameType);
+            case AdventureEvent -> achievements.get().get(GameType.Adventure);
+            case QuestDraft -> achievements.get().get(GameType.Quest);
+            default -> achievements.get().get(GameType.Constructed);
+        };
     }
 
     public static IStorage<CardBlock> getBlocks() {
-        return blocks;
+        return blocks.get();
     }
 
     public static QuestPreferences getQuestPreferences() {
-        return questPreferences;
+        return questPreferences.get();
     }
 
     public static ConquestPreferences getConquestPreferences() {
-        return conquestPreferences;
+        return conquestPreferences.get();
     }
 
     public static GauntletData getGauntletData() {
@@ -520,37 +417,34 @@ public final class FModel {
     }
 
     public static GauntletMini getGauntletMini() {
-        if (gauntlet == null) {
-            gauntlet = new GauntletMini();
-        }
-        return gauntlet;
+        return gauntletMini.get();
     }
 
     public static CardCollections getDecks() {
-        return decks;
+        return decks.get();
     }
 
     public static IStorage<ConquestPlane> getPlanes() {
-        return planes;
+        return planes.get();
     }
 
     public static IStorage<QuestWorld> getWorlds() {
-        return worlds;
+        return worlds.get();
     }
 
     public static GameFormat.Collection getFormats() {
-        return formats;
+        return formats.get();
     }
 
     public static IStorage<CardBlock> getFantasyBlocks() {
-        return fantasyBlocks;
+        return fantasyBlocks.get();
     }
 
     public static IStorage<ThemedChaosDraft> getThemedChaosDrafts() {
-        return themedChaosDrafts;
+        return themedChaosDrafts.get();
     }
 
     public static TournamentData getTournamentData() { return tournamentData; }
 
-    public static void setTournamentData(TournamentData tournamentData) { FModel.tournamentData = tournamentData;  }
+    public static void setTournamentData(TournamentData tournamentData0) { tournamentData = tournamentData0;  }
 }
diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index 71ed024c605..b8824798392 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -113,7 +113,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
             }
             return PaymentDecision.card(randomSubset);
         }
-        if (discardType.equals("DifferentNames")) {
+        if (discardType.contains("+WithDifferentNames")) {
             final CardCollection discarded = new CardCollection();
             while (c > 0) {
                 final InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, 1, 1, hand, ability);
@@ -1393,7 +1393,7 @@ public class HumanCostDecision extends CostDecisionMakerBase {
     public PaymentDecision visit(final CostUntapType cost) {
         CardCollection typeList = CardLists.getValidCards(player.getGame().getCardsIn(ZoneType.Battlefield), cost.getType().split(";"),
                 player, source, ability);
-        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterType.get(CounterEnumType.STUN)));
+        typeList = CardLists.filter(typeList, CardPredicates.TAPPED, c -> c.getCounters(CounterEnumType.STUN) == 0 || c.canRemoveCounters(CounterEnumType.STUN));
         int c = cost.getAbilityAmount(ability);
         final InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, c, c, typeList, ability);
         inp.setCancelAllowed(true);
diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
index baacfa86b8b..009f552a28d 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlay.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -425,7 +425,7 @@ public class HumanPlay {
                 }
             }
             else if (part instanceof CostPayEnergy) {
-                CounterType counterType = CounterType.get(CounterEnumType.ENERGY);
+                CounterType counterType = CounterEnumType.ENERGY;
                 int amount = part.getAbilityAmount(sourceAbility);
 
                 if (!mandatory && !p.getController().confirmPayment(part, Localizer.getInstance().getMessage("lblDoYouWantSpendNTargetTypeCounter", String.valueOf(amount), counterType.getName()), sourceAbility)) {
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index 0c22ed53584..9c4ff34ed04 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -285,7 +285,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
             // maindeck and max sideboard sizes
             // No longer need 1:1 sideboarding in non-limited formats
             List<PaperCard> resp = getGui().sideboard(sideboard, main, message);
-            newMain = ObjectUtils.defaultIfNull(resp, main.toFlatList());
+            newMain = ObjectUtils.getIfNull(resp, main.toFlatList());
         } while (conform && (newMain.size() < deckMinSize || combinedDeckSize - newMain.size() > sbMax));
 
         return newMain;
@@ -353,16 +353,19 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
         final CardView vSource = CardView.get(sa.getHostCard());
         final Map<Object, Integer> vAffected = new LinkedHashMap<>(manaAmount);
         Integer maxAmount = different ? 1 : manaAmount;
-        for (Byte color : colorSet) {
+        for (MagicColor.Color color : colorSet) {
+            if (color == MagicColor.Color.COLORLESS) {
+                continue;
+            }
             vAffected.put(color, maxAmount);
         }
         final Map<Object, Integer> vResult = getGui().assignGenericAmount(vSource, vAffected, manaAmount, false,
                 localizer.getMessage("lblMana").toLowerCase());
         Map<Byte, Integer> result = new HashMap<>();
         if (vResult != null) { //fix for netplay
-            for (Byte color : colorSet) {
+            for (MagicColor.Color  color : colorSet) {
                 if (vResult.containsKey(color)) {
-                    result.put(color, vResult.get(color));
+                    result.put(color.getColorMask(), vResult.get(color));
                 }
             }
         }
@@ -1868,8 +1871,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
         if (withColorless) {
             colorNamesBuilder.add(MagicColor.toLongString(MagicColor.COLORLESS));
         }
-        for (final Byte b : colors) {
-            colorNamesBuilder.add(MagicColor.toLongString(b));
+        for (final MagicColor.Color color : colors) {
+            colorNamesBuilder.add(color.getName());
         }
         final ImmutableList<String> colorNames = colorNamesBuilder.build();
         if (colorNames.size() > 2) {
@@ -2306,6 +2309,16 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
         }
     }
 
+    @Override
+    public void revealUnsupported(final Map<Player, List<PaperCard>> unsupported) {
+        for (final Player p : unsupported.keySet()) {
+            List<PaperCard> removed = unsupported.get(p);
+            if (removed == null || removed.isEmpty())
+                continue;
+            getGui().getChoices(localizer.getMessage("lblActionFromPlayerDeck", localizer.getMessage("lblRemoved"), Lang.getInstance().getPossessedObject(MessageUtil.mayBeYou(player, p), "")), -1, -1, ImmutableList.copyOf(removed));
+        }
+    }
+
     @Override
     public List<PaperCard> chooseCardsYouWonToAddToDeck(final List<PaperCard> losses) {
         return getGui().many(localizer.getMessage("lblSelectCardstoAddtoYourDeck"), localizer.getMessage("lblAddTheseToMyDeck"), 0, losses.size(), losses, null);
@@ -2700,7 +2713,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
             final Card card = gameCacheCounters.get(cv);
 
             final ImmutableList<CounterType> counters = subtract ? ImmutableList.copyOf(card.getCounters().keySet())
-                    : ImmutableList.copyOf(Collections2.transform(CounterEnumType.values, CounterType::get));
+                    : ImmutableList.copyOf(CounterEnumType.values);
 
             final CounterType counter = getGui().oneOrNone(localizer.getMessage("lblWhichTypeofCounter"), counters);
             if (counter == null) {
diff --git a/forge-gui/src/main/java/forge/player/TargetSelection.java b/forge-gui/src/main/java/forge/player/TargetSelection.java
index 2521a39d04b..0f6ac9e50df 100644
--- a/forge-gui/src/main/java/forge/player/TargetSelection.java
+++ b/forge-gui/src/main/java/forge/player/TargetSelection.java
@@ -81,7 +81,6 @@ public class TargetSelection {
         final int maxTargets = numTargets != null ? numTargets : ability.getMaxTargets();
         //final int maxTotalCMC = tgt.getMaxTotalCMC(ability.getHostCard(), ability);
         final int numTargeted = ability.getTargets().size();
-        final boolean isSingleZone = tgt.isSingleZone();
 
         final boolean hasEnoughTargets = minTargets == 0 || numTargeted >= minTargets;
         final boolean hasAllTargets = numTargeted == maxTargets && maxTargets > 0;
@@ -149,19 +148,6 @@ public class TargetSelection {
             validTargets = new CardCollection(IterableUtil.filter(validTargets, filter));
         }
 
-        // single zone
-        if (isSingleZone) {
-            final List<Card> removeCandidates = new ArrayList<>();
-            final Card firstTgt = ability.getTargetCard();
-            if (firstTgt != null) {
-                for (Card t : validTargets) {
-                    if (!t.getController().equals(firstTgt.getController())) {
-                        removeCandidates.add(t);
-                    }
-                }
-                validTargets.removeAll(removeCandidates);
-            }
-        }
         if (validTargets.isEmpty()) {
             // If all targets are filtered after applying MustTarget static ability, the spell can't be cast or the ability can't be activated
             if (mustTargetFiltered) {
diff --git a/forge-gui/src/main/java/forge/sound/EventVisualizer.java b/forge-gui/src/main/java/forge/sound/EventVisualizer.java
index 3cc118fcce4..14dc4a1582d 100644
--- a/forge-gui/src/main/java/forge/sound/EventVisualizer.java
+++ b/forge-gui/src/main/java/forge/sound/EventVisualizer.java
@@ -40,8 +40,8 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
     public SoundEffectType visit(final GameEventCardAttachment event) { return SoundEffectType.Equip; }
     @Override
     public SoundEffectType visit(final GameEventCardChangeZone event) {
-        final ZoneType from = event.from == null ? null : event.from.getZoneType();
-        final ZoneType to = event.to.getZoneType();
+        final ZoneType from = event.from() == null ? null : event.from().getZoneType();
+        final ZoneType to = event.to().getZoneType();
         if( from == ZoneType.Library && to == ZoneType.Hand) {
             return SoundEffectType.Draw;
         }
@@ -54,7 +54,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
 
     @Override
     public SoundEffectType visit(GameEventCardStatsChanged event) {
-        return event.transform ? SoundEffectType.FlipCard : null ;
+        return event.transform() ? SoundEffectType.FlipCard : null ;
     }
 
     @Override
@@ -62,7 +62,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
     @Override
     public SoundEffectType visit(final GameEventCardSacrificed event) { return SoundEffectType.Sacrifice; }
     @Override
-    public SoundEffectType visit(final GameEventCardCounters event) { return event.newValue > event.oldValue ? SoundEffectType.AddCounter : event.newValue < event.oldValue ? SoundEffectType.RemoveCounter : null; }
+    public SoundEffectType visit(final GameEventCardCounters event) { return event.newValue() > event.oldValue() ? SoundEffectType.AddCounter : event.newValue() < event.oldValue() ? SoundEffectType.RemoveCounter : null; }
     @Override
     public SoundEffectType visit(final GameEventTurnEnded event) { return SoundEffectType.EndOfTurn; }
     @Override
@@ -70,7 +70,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
     @Override
     public SoundEffectType visit(final GameEventRollDie event) { return SoundEffectType.RollDie; }
     @Override
-    public SoundEffectType visit(final GameEventPlayerLivesChanged event) { return event.newLives < event.oldLives ? SoundEffectType.LifeLoss : SoundEffectType.LifeGain; }
+    public SoundEffectType visit(final GameEventPlayerLivesChanged event) { return event.newLives() < event.oldLives() ? SoundEffectType.LifeLoss : SoundEffectType.LifeGain; }
     @Override
     public SoundEffectType visit(final GameEventPlayerShardsChanged event) { return SoundEffectType.TakeShard; }
     @Override
@@ -80,27 +80,27 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
     @Override
     public SoundEffectType visit(final GameEventShuffle event) { return SoundEffectType.Shuffle; }
     @Override
-    public SoundEffectType visit(final GameEventSpeedChanged event) { return event.newValue > event.oldValue ? SoundEffectType.SpeedUp : null; }
+    public SoundEffectType visit(final GameEventSpeedChanged event) { return event.newValue() > event.oldValue() ? SoundEffectType.SpeedUp : null; }
     @Override
     public SoundEffectType visit(final GameEventTokenCreated event) { return SoundEffectType.Token; }
     @Override
     public SoundEffectType visit(final GameEventSprocketUpdate event) {
-        if(event.oldSprocket == event.sprocket || event.sprocket <= 0)
+        if(event.oldSprocket() == event.sprocket() || event.sprocket() <= 0)
             return null;
         return SoundEffectType.Sprocket;
     }
     @Override
     public SoundEffectType visit(final GameEventDayTimeChanged event) {
-        return event.daytime ? SoundEffectType.Daytime : SoundEffectType.Nighttime;
+        return event.daytime() ? SoundEffectType.Daytime : SoundEffectType.Nighttime;
     }
     @Override
     public SoundEffectType visit(final GameEventBlockersDeclared event) {
-        final boolean isLocalHuman = event.defendingPlayer.getLobbyPlayer() == player;
+        final boolean isLocalHuman = event.defendingPlayer().getLobbyPlayer().equals(player);
         if (isLocalHuman) {
             return null; // already played sounds in interactive mode
         }
 
-        for (final MapOfLists<Card, Card> ab : event.blockers.values()) {
+        for (final MapOfLists<Card, Card> ab : event.blockers().values()) {
             for(final Collection<Card> bb : ab.values()) {
                 if ( !bb.isEmpty() ) {
                     // hasAnyBlocker = true;
@@ -116,7 +116,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
      */
     @Override
     public SoundEffectType visit(final GameEventGameOutcome event) {
-        final boolean humanWonTheDuel = event.result.getWinningLobbyPlayer() == player;
+        final boolean humanWonTheDuel = event.result().getWinningLobbyPlayer().equals(player);
         return humanWonTheDuel ? SoundEffectType.WinDuel : SoundEffectType.LoseDuel;
     }
 
@@ -126,12 +126,12 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
      */
     @Override
     public SoundEffectType visit(final GameEventSpellResolved evt) {
-        if (evt.spell == null ) {
+        if (evt.spell() == null ) {
             return null;
         }
 
-        final Card source = evt.spell.getHostCard();
-        if (evt.spell.isSpell()) {
+        final Card source = evt.spell().getHostCard();
+        if (evt.spell().isSpell()) {
             // if there's a specific effect for this particular card, play it and
             // we're done.
             if (hasSpecificCardEffect(source)) {
@@ -167,7 +167,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
      */
     @Override
     public SoundEffectType visit(final GameEventCardTapped event) {
-        return event.tapped ? SoundEffectType.Tap : SoundEffectType.Untap;
+        return event.tapped() ? SoundEffectType.Tap : SoundEffectType.Untap;
     }
 
     /**
@@ -185,9 +185,9 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
 
     @Override
     public SoundEffectType visit(GameEventZone event) {
-        Card card = event.card;
-        ZoneType zoneTo = event.zoneType;
-        EventValueChangeType zoneEventMode = event.mode;
+        Card card = event.card();
+        ZoneType zoneTo = event.zoneType();
+        EventValueChangeType zoneEventMode = event.mode();
         SoundEffectType resultSound = null;
         if(zoneEventMode == EventValueChangeType.Added && zoneTo == ZoneType.Battlefield) {
             if(card.isLand()) {
@@ -335,12 +335,11 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
     public String getScriptedSoundEffectName(final GameEvent evt) {
         Card c = null;
 
-        if (evt instanceof GameEventSpellResolved) {
-            c = ((GameEventSpellResolved) evt).spell.getHostCard();
-        } else if (evt instanceof GameEventZone) {
-            GameEventZone evZone = (GameEventZone)evt;
-            if (evZone.zoneType == ZoneType.Battlefield && evZone.mode == EventValueChangeType.Added && evZone.card.isLand()) {
-                c = evZone.card; // assuming a land is played or otherwise put on the battlefield
+        if (evt instanceof GameEventSpellResolved evSpell) {
+            c = evSpell.spell().getHostCard();
+        } else if (evt instanceof GameEventZone evZone) {
+            if (evZone.zoneType() == ZoneType.Battlefield && evZone.mode() == EventValueChangeType.Added && evZone.card().isLand()) {
+                c = evZone.card(); // assuming a land is played or otherwise put on the battlefield
             }
         }
 
@@ -360,7 +359,7 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
 
     @Override
     public SoundEffectType visit(final UiEventBlockerAssigned event) {
-        return event.attackerBeingBlocked == null ? null : SoundEffectType.Block;
+        return event.attackerBeingBlocked() == null ? null : SoundEffectType.Block;
     }
     @Override
     public SoundEffectType visit(final UiEventAttackerDeclared event) {
diff --git a/forge-gui/src/main/java/forge/util/Callback.java b/forge-gui/src/main/java/forge/util/Callback.java
deleted file mode 100644
index acb8cecb424..00000000000
--- a/forge-gui/src/main/java/forge/util/Callback.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package forge.util;
-
-public abstract class Callback<T> {
-    public abstract void run(T result);
-}
diff --git a/forge-gui/src/main/java/forge/util/HWInfo.java b/forge-gui/src/main/java/forge/util/HWInfo.java
index b547c81aaf4..c24aaa68f20 100644
--- a/forge-gui/src/main/java/forge/util/HWInfo.java
+++ b/forge-gui/src/main/java/forge/util/HWInfo.java
@@ -3,5 +3,5 @@ package forge.util;
 import io.sentry.protocol.Device;
 import io.sentry.protocol.OperatingSystem;
 
-public record HWInfo(Device device, OperatingSystem os) {
+public record HWInfo(Device device, OperatingSystem os, boolean getChipset) {
 }
diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java
index 7035786e6ed..5f8716806c1 100644
--- a/forge-gui/src/main/java/forge/util/ImageFetcher.java
+++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java
@@ -236,7 +236,6 @@ public abstract class ImageFetcher {
             }
             final String cardCollectorNumber = paperCard.getCollectorNumber();
             if (!cardCollectorNumber.equals(IPaperCard.NO_COLLECTOR_NUMBER)) {
-                // This function adds to downloadUrls for us
                 this.getScryfallDownloadURL(paperCard, face, useArtCrop, hasSetLookup, filename, downloadUrls);
             }
         } else if (ImageKeys.getTokenKey(ImageKeys.HIDDEN_CARD).equals(imageKey)) {
diff --git a/forge-gui/src/main/java/forge/util/WaitCallback.java b/forge-gui/src/main/java/forge/util/WaitCallback.java
index 95c7c0d4573..71b74e05095 100644
--- a/forge-gui/src/main/java/forge/util/WaitCallback.java
+++ b/forge-gui/src/main/java/forge/util/WaitCallback.java
@@ -2,7 +2,9 @@ package forge.util;
 
 import forge.gui.FThreads;
 
-public abstract class WaitCallback<T> extends Callback<T> implements Runnable {
+import java.util.function.Consumer;
+
+public abstract class WaitCallback<T> implements Consumer<T>, Runnable {
     public class Lock {
     }
 
@@ -11,7 +13,7 @@ public abstract class WaitCallback<T> extends Callback<T> implements Runnable {
     private T result;
 
     @Override
-    public final void run(T result0) {
+    public final void accept(T result0) {
         result = result0;
         synchronized (lock) {
             lock.notify();
diff --git a/forge-gui/tools/RankingScraper.py b/forge-gui/tools/RankingScraper.py
index 4bee7d3534e..06570937901 100644
--- a/forge-gui/tools/RankingScraper.py
+++ b/forge-gui/tools/RankingScraper.py
@@ -3,7 +3,7 @@ import json
 import requests
 
 
-def draftsimRankings(edition='FIN', extra=None):
+def draftsimRankings(edition='SPM', extra=None):
 	edition = edition.upper()
 	url1 = 'https://draftsim.com/generated/%s/' % (edition)
 	url2 = '%s' % edition
diff --git a/forge-installer/pom.xml b/forge-installer/pom.xml
index ff9bfc148aa..27fdd666499 100644
--- a/forge-installer/pom.xml
+++ b/forge-installer/pom.xml
@@ -101,7 +101,7 @@
                     <plugin>
                         <groupId>org.codehaus.izpack</groupId>
                         <artifactId>izpack-maven-plugin</artifactId>
-                        <version>5.2.3</version>
+                        <version>5.2.4</version>
                         <executions>
                             <execution>
                                 <phase>post-integration-test</phase>
@@ -171,7 +171,7 @@
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="INSTALLATION.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="GAMEPAD_README.txt" />
                                             <fileset dir="${basedir}/../forge-gui/release-files/" includes="ISSUES.txt" />
-                                            <fileset dir="${basedir}/../forge-gui/release-files/" includes="CHANGES.txt" />
+                                            <fileset dir="${basedir}/../forge-gui-desktop/target/" includes="CHANGES.txt" />
                                             <fileset dir="${basedir}/../forge-gui/">
                                                 <include name="res/**" />
                                                 <exclude name="res/cardsfolder/**" />
diff --git a/pom.xml b/pom.xml
index f9e9b43ecf6..cd533232ab3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <configSourceDirectory>src/main/config</configSourceDirectory>
         <maven.compiler.release>17</maven.compiler.release>
         <!-- version code - maj.min.rev ie 2.0.00 -->
-        <versionCode>2.0.06</versionCode>
+        <versionCode>2.0.07</versionCode>
         <!-- set snapshotName to blank for release -->
         <snapshotName>-SNAPSHOT</snapshotName>
         <!-- revision will be the global version string -->
@@ -202,7 +202,6 @@
                         <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
                         <checkModificationExcludes>
                           <checkModificationExclude>.mvn/local-settings.xml</checkModificationExclude>
-                          <checkModificationExclude>forge-gui/release-files/CHANGES.txt</checkModificationExclude>
                         </checkModificationExcludes>
                     </configuration>
                 </plugin>