From 6f42fcdc2603a5973292e7c646fe6d2788b05fb5 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@DESKTOP-3P42EN1>
Date: Tue, 24 May 2022 22:36:57 +0200
Subject: [PATCH 001/309] Make charm choices for triggers more like other SA

---
 forge-ai/src/main/java/forge/ai/ComputerUtil.java  | 14 ++++++--------
 .../src/main/java/forge/ai/PlayerControllerAi.java |  5 +++++
 .../src/main/java/forge/ai/ability/CharmAi.java    |  9 ---------
 .../src/main/java/forge/game/zone/MagicStack.java  | 11 -----------
 .../src/main/java/forge/player/HumanPlay.java      | 14 ++++++--------
 5 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 83520cd8c55..5aeb2b21e7c 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -131,10 +131,9 @@ public class ComputerUtil {
 
         sa = GameActionUtil.addExtraKeywordCost(sa);
 
-        if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
-            if (!CharmEffect.makeChoices(sa)) {
-                return false;
-            }
+        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
+            // 603.3c If no mode is chosen, the ability is removed from the stack.
+            return false;
         }
         if (chooseTargets != null) {
             chooseTargets.run();
@@ -295,10 +294,9 @@ public class ComputerUtil {
         if (newSA.isSpell() && !source.isCopiedSpell()) {
             newSA.setHostCard(game.getAction().moveToStack(source, newSA));
 
-            if (newSA.getApi() == ApiType.Charm && !newSA.isWrapper()) {
-                if (!CharmEffect.makeChoices(newSA)) {
-                    return false;
-                }
+            if (newSA.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(newSA)) {
+                // 603.3c If no mode is chosen, the ability is removed from the stack.
+                return false;
             }
         }
 
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 990ab51e3df..4d944408df0 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -34,6 +34,7 @@ import forge.game.GameObject;
 import forge.game.GameType;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
+import forge.game.ability.effects.CharmEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
@@ -1064,6 +1065,10 @@ public class PlayerControllerAi extends PlayerController {
     }
 
     private boolean prepareSingleSa(final Card host, final SpellAbility sa, boolean isMandatory) {
+        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
+            // 603.3c If no mode is chosen, the ability is removed from the stack.
+            return false;
+        }
         if (sa.hasParam("TargetingPlayer")) {
             Player targetingPlayer = AbilityUtils.getDefinedPlayers(host, sa.getParam("TargetingPlayer"), sa).get(0);
             sa.setTargetingPlayer(targetingPlayer);
diff --git a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
index a78406df498..15dc3b6ad26 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
@@ -255,15 +255,6 @@ public class CharmAi extends SpellAbilityAi {
         return Aggregates.random(opponents);
     }
 
-    @Override
-    protected boolean doTriggerAINoCost(final Player aiPlayer, final SpellAbility sa, final boolean mandatory) {
-        // already done by chooseOrderOfSimultaneousStackEntry
-        if (sa.getChosenList() != null) {
-            return true;
-        }
-        return super.doTriggerAINoCost(aiPlayer, sa, mandatory);
-    }
-
     @Override
     public boolean chkDrawbackWithSubs(Player aiPlayer, AbilitySub ab) {
         // choices were already targeted
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 48efbd76acd..f81487fd80c 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -41,7 +41,6 @@ import forge.game.GameObject;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
-import forge.game.ability.effects.CharmEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardUtil;
@@ -826,19 +825,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         }
 
         final List<SpellAbility> activePlayerSAs = Lists.newArrayList();
-        final List<SpellAbility> failedSAs = Lists.newArrayList();
         for (int i = 0; i < simultaneousStackEntryList.size(); i++) {
             SpellAbility sa = simultaneousStackEntryList.get(i);
             Player activator = sa.getActivatingPlayer();
 
-            if (sa.getApi() == ApiType.Charm) {
-                if (!CharmEffect.makeChoices(sa)) {
-                    // 603.3c If no mode is chosen, the ability is removed from the stack.
-                    failedSAs.add(sa);
-                    continue;
-                }
-            }
-
             if (activator == null) {
                 if (sa.getHostCard().getController().equals(activePlayer)) {
                     activePlayerSAs.add(sa);
@@ -850,7 +840,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             }
         }
         simultaneousStackEntryList.removeAll(activePlayerSAs);
-        simultaneousStackEntryList.removeAll(failedSAs);
 
         if (activePlayerSAs.isEmpty()) {
             return false;
diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
index 14087cd9995..b9cfb20351d 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlay.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -105,10 +105,9 @@ public class HumanPlay {
             source.forceTurnFaceUp();
         }
 
-        if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
-            if (!CharmEffect.makeChoices(sa)) {
-                return false;
-            }
+        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
+            // 603.3c If no mode is chosen, the ability is removed from the stack.
+            return false;
         }
 
         sa = AbilityUtils.addSpliceEffects(sa);
@@ -169,10 +168,9 @@ public class HumanPlay {
         source.setSplitStateToPlayAbility(sa);
 
         if (!sa.isCopied()) {
-            if (sa.getApi() == ApiType.Charm && !sa.isWrapper()) {
-                if (!CharmEffect.makeChoices(sa)) {
-                    return;
-                }
+            if (sa.getApi() == ApiType.Charm && !CharmEffect.makeChoices(sa)) {
+                // 603.3c If no mode is chosen, the ability is removed from the stack.
+                return;
             }
             sa = AbilityUtils.addSpliceEffects(sa);
         }

From 41197902ab1a55a81f0d2acdf2cb61dc003447c6 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sat, 18 Jun 2022 10:19:22 +0200
Subject: [PATCH 002/309] GameAction: better handle etb counter + doubler +
 same time

---
 .../src/main/java/forge/game/GameAction.java  |   2 +-
 .../forge/game/GameEntityCounterTable.java    |  10 +-
 .../java/forge/game/ability/AbilityKey.java   |   1 +
 .../game/replacement/ReplaceAddCounter.java   |  19 ++++
 .../ai/simulation/GameSimulationTest.java     | 101 ++++++++++++++++++
 5 files changed, 131 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 6b6844288da..dd71ad57ed0 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -591,7 +591,7 @@ public class GameAction {
             }
         }
 
-        table.replaceCounterEffect(game, null, true);
+        table.replaceCounterEffect(game, null, true, true, params);
 
         // Need to apply any static effects to produce correct triggers
         checkStaticAbilities();
diff --git a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java
index 2f42eb4db4b..1e81b78a21b 100644
--- a/forge-game/src/main/java/forge/game/GameEntityCounterTable.java
+++ b/forge-game/src/main/java/forge/game/GameEntityCounterTable.java
@@ -122,8 +122,12 @@ public class GameEntityCounterTable extends ForwardingTable<Optional<Player>, Ga
         game.getTriggerHandler().runTrigger(TriggerType.CounterAddedAll, runParams, false);
     }
 
-    @SuppressWarnings("unchecked")
     public void replaceCounterEffect(final Game game, final SpellAbility cause, final boolean effect) {
+        replaceCounterEffect(game, cause, effect, false, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public void replaceCounterEffect(final Game game, final SpellAbility cause, final boolean effect, final boolean etb, Map<AbilityKey, Object> params) {
         if (isEmpty()) {
             return;
         }
@@ -135,6 +139,10 @@ public class GameEntityCounterTable extends ForwardingTable<Optional<Player>, Ga
             repParams.put(AbilityKey.Cause, cause);
             repParams.put(AbilityKey.EffectOnly, effect);
             repParams.put(AbilityKey.CounterMap, values);
+            repParams.put(AbilityKey.ETB, etb);
+            if (params != null) {
+                repParams.putAll(params);
+            }
 
             switch (game.getReplacementHandler().run(ReplacementType.AddCounter, repParams)) {
             case NotReplaced:
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
index a3a2ff3681c..896bcc3268f 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
@@ -67,6 +67,7 @@ public enum AbilityKey {
     Explorer("Explorer"),
     ExtraTurn("ExtraTurn"),
     Event("Event"),
+    ETB("ETB"),
     Fighter("Fighter"),
     Fighters("Fighters"),
     FirstTime("FirstTime"),
diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
index 82747d2c755..c60ef67722b 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
@@ -8,9 +8,11 @@ import com.google.common.base.Optional;
 
 import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
+import forge.game.card.CardCollectionView;
 import forge.game.card.CounterType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
+import forge.game.zone.ZoneType;
 
 /**
  * TODO: Write javadoc for this type.
@@ -58,6 +60,23 @@ public class ReplaceAddCounter extends ReplacementEffect {
             return false;
         }
 
+        if (runParams.containsKey(AbilityKey.ETB)) {
+            // if Card does affect something other than itself
+            if (!getParam("ValidCard").equals("Card.Self")) {
+                // and it self is entering, skip
+                if (getHostCard().equals(runParams.get(AbilityKey.Affected))) {
+                    return false;
+                }
+                // and it wasn't already on the field, skip
+                if (getActiveZone().contains(ZoneType.Battlefield) && runParams.containsKey(AbilityKey.LastStateBattlefield)) {
+                    CardCollectionView lastBattlefield = (CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield);
+                    if (!lastBattlefield.contains(getHostCard())) {
+                        return false;
+                    }
+                }
+            }
+        }
+
         return true;
     }
 
diff --git a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
index bf86600cb0c..bd4dad3a7f8 100644
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulationTest.java
@@ -2394,4 +2394,105 @@ public class GameSimulationTest extends SimulationTest {
         AssertJUnit.assertEquals(20, simGame.getPlayers().get(0).getLife());
         AssertJUnit.assertEquals(2, simGame.getPlayers().get(1).getLife());
     }
+
+    @Test
+    public void testETBCounterMowu() {
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(0);
+        //Player p2 = game.getPlayers().get(1);
+
+        String grumName = "Grumgully, the Generous";
+        String mowuName = "Mowu, Loyal Companion";
+
+        addCard(grumName, p);
+        Card mowu = addCardToZone(mowuName, p, ZoneType.Hand);
+
+        for (int i = 0; i < 7; ++i) {
+            addCard("Forest", p);
+        }
+        SpellAbility mowuSA = mowu.getFirstSpellAbility();
+
+        game.getPhaseHandler().devModeSet(PhaseType.MAIN2, p);
+        game.getAction().checkStateEffects(true);
+
+        GameSimulator sim = createSimulator(game, p);
+        sim.simulateSpellAbility(mowuSA);
+        Game simGame = sim.getSimulatedGameState();
+
+        Card simMowu = findCardWithName(simGame, mowuName);
+
+        AssertJUnit.assertNotNull(simMowu);
+        AssertJUnit.assertEquals(2, simMowu.getCounters(CounterEnumType.P1P1));
+    }
+
+    @Test
+    public void testETBCounterCorpsejack() {
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(0);
+        //Player p2 = game.getPlayers().get(1);
+
+        String grumName = "Grumgully, the Generous";
+        String corpsejackName = "Corpsejack Menace";
+
+        addCard(grumName, p);
+        Card corpsejack = addCardToZone(corpsejackName, p, ZoneType.Hand);
+
+        for (int i = 0; i < 7; ++i) {
+            addCard("Forest", p);
+            addCard("Swamp", p);
+        }
+        SpellAbility corpsejackSA = corpsejack.getFirstSpellAbility();
+
+        game.getPhaseHandler().devModeSet(PhaseType.MAIN2, p);
+        game.getAction().checkStateEffects(true);
+
+        GameSimulator sim = createSimulator(game, p);
+        sim.simulateSpellAbility(corpsejackSA);
+        Game simGame = sim.getSimulatedGameState();
+
+        Card simCorpsejack = findCardWithName(simGame, corpsejackName);
+
+        AssertJUnit.assertNotNull(simCorpsejack);
+        AssertJUnit.assertEquals(1, simCorpsejack.getCounters(CounterEnumType.P1P1));
+    }
+
+    @Test
+    public void testETBCounterCorpsejackMentor() {
+        Game game = initAndCreateGame();
+        Player p = game.getPlayers().get(0);
+        //Player p2 = game.getPlayers().get(1);
+
+        String grumName = "Grumgully, the Generous";
+        String corpsejackName = "Corpsejack Menace";
+        String mentorName = "Conclave Mentor";
+        String everAfterName = "Ever After";
+
+        addCard(grumName, p);
+        Card corpsejack = addCardToZone(corpsejackName, p, ZoneType.Graveyard);
+        Card mentor = addCardToZone(mentorName, p, ZoneType.Graveyard);
+
+        Card everAfter = addCardToZone(everAfterName, p, ZoneType.Hand);
+
+        for (int i = 0; i < 7; ++i) {
+            addCard("Swamp", p);
+        }
+        SpellAbility everSA = everAfter.getFirstSpellAbility();
+        everSA.getTargets().add(corpsejack);
+        everSA.getTargets().add(mentor);
+
+        game.getPhaseHandler().devModeSet(PhaseType.MAIN2, p);
+        game.getAction().checkStateEffects(true);
+
+        GameSimulator sim = createSimulator(game, p);
+        sim.simulateSpellAbility(everSA);
+        Game simGame = sim.getSimulatedGameState();
+
+        Card simCorpsejack = findCardWithName(simGame, corpsejackName);
+        Card simMentor = findCardWithName(simGame, mentorName);
+
+        AssertJUnit.assertNotNull(simCorpsejack);
+        AssertJUnit.assertEquals(1, simCorpsejack.getCounters(CounterEnumType.P1P1));
+        AssertJUnit.assertNotNull(simMentor);
+        AssertJUnit.assertEquals(1, simMentor.getCounters(CounterEnumType.P1P1));
+    }
 }

From 52b5dad79ff9173ff3c8295929173bc39ca9c5c2 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Sat, 18 Jun 2022 11:00:04 +0200
Subject: [PATCH 003/309] ~fix NPE

---
 .../src/main/java/forge/game/replacement/ReplaceAddCounter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
index c60ef67722b..466d5552c5b 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
@@ -62,7 +62,7 @@ public class ReplaceAddCounter extends ReplacementEffect {
 
         if (runParams.containsKey(AbilityKey.ETB)) {
             // if Card does affect something other than itself
-            if (!getParam("ValidCard").equals("Card.Self")) {
+            if (!hasParam("ValidCard") || !getParam("ValidCard").equals("Card.Self")) {
                 // and it self is entering, skip
                 if (getHostCard().equals(runParams.get(AbilityKey.Affected))) {
                     return false;

From 48264dfed953d5b4962ac1fd34f6e25757dc4294 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 18 Jun 2022 17:31:01 +0800
Subject: [PATCH 004/309] Add Exit Dialog on Adventure StartScene

---
 .../src/forge/adventure/scene/StartScene.java | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java
index a71ea1698c3..38f4dc0b770 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java
@@ -2,11 +2,14 @@ package forge.adventure.scene;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.utils.Align;
 import forge.Forge;
 import forge.adventure.stage.GameHUD;
 import forge.adventure.stage.MapStage;
 import forge.adventure.util.Config;
+import forge.adventure.util.Controls;
 import forge.adventure.world.WorldSave;
 import forge.screens.TransitionScreen;
 
@@ -16,9 +19,10 @@ import forge.screens.TransitionScreen;
 public class StartScene extends UIScene {
 
     TextButton saveButton, resumeButton, continueButton, newGameButton, newGameButtonPlus, loadButton, settingsButton, exitButton, switchButton;
+    Dialog dialog;
 
     public StartScene() {
-        super(Forge.isLandscapeMode()?"ui/start_menu.json":"ui/start_menu_portrait.json");
+        super(Forge.isLandscapeMode() ? "ui/start_menu.json" : "ui/start_menu_portrait.json");
 
     }
 
@@ -71,7 +75,8 @@ public class StartScene extends UIScene {
     }
 
     public boolean Exit() {
-        Forge.exit(true);
+        if (dialog != null)
+            dialog.show(stage);
         return true;
     }
 
@@ -116,37 +121,43 @@ public class StartScene extends UIScene {
     @Override
     public void resLoaded() {
         super.resLoaded();
-            ui.onButtonPress("Start", () -> StartScene.this.NewGame());
-            ui.onButtonPress("Start+", () -> NewGamePlus());
-            ui.onButtonPress("Load", () -> StartScene.this.Load());
-            ui.onButtonPress("Save", () -> StartScene.this.Save());
-            ui.onButtonPress("Resume", () -> StartScene.this.Resume());
-            ui.onButtonPress("Continue", () -> StartScene.this.Continue());
-            ui.onButtonPress("Settings", () -> StartScene.this.settings());
-            ui.onButtonPress("Exit", () -> StartScene.this.Exit());
-            ui.onButtonPress("Switch", () -> Forge.switchToClassic());
+        ui.onButtonPress("Start", () -> StartScene.this.NewGame());
+        ui.onButtonPress("Start+", () -> NewGamePlus());
+        ui.onButtonPress("Load", () -> StartScene.this.Load());
+        ui.onButtonPress("Save", () -> StartScene.this.Save());
+        ui.onButtonPress("Resume", () -> StartScene.this.Resume());
+        ui.onButtonPress("Continue", () -> StartScene.this.Continue());
+        ui.onButtonPress("Settings", () -> StartScene.this.settings());
+        ui.onButtonPress("Exit", () -> StartScene.this.Exit());
+        ui.onButtonPress("Switch", () -> Forge.switchToClassic());
 
-            newGameButton = ui.findActor("Start");
-            newGameButton.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame"));
-            newGameButtonPlus = ui.findActor("Start+");
-            newGameButtonPlus.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame")+"+");
-            loadButton = ui.findActor("Load");
-            loadButton.getLabel().setText(Forge.getLocalizer().getMessage("lblLoad"));
-            saveButton = ui.findActor("Save");
-            saveButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSave"));
-            resumeButton = ui.findActor("Resume");
-            resumeButton.getLabel().setText(Forge.getLocalizer().getMessage("lblResume"));
-            continueButton = ui.findActor("Continue");
-            continueButton.getLabel().setText(Forge.getLocalizer().getMessage("lblContinue"));
-            settingsButton = ui.findActor("Settings");
-            settingsButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSettings"));
-            exitButton = ui.findActor("Exit");
-            exitButton.getLabel().setText(Forge.getLocalizer().getMessage("lblExit"));
-            switchButton = ui.findActor("Switch");
-            switchButton.getLabel().setText(Forge.getLocalizer().getMessage("lblClassic"));
+        newGameButton = ui.findActor("Start");
+        newGameButton.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame"));
+        newGameButtonPlus = ui.findActor("Start+");
+        newGameButtonPlus.getLabel().setText(Forge.getLocalizer().getMessage("lblNewGame") + "+");
+        loadButton = ui.findActor("Load");
+        loadButton.getLabel().setText(Forge.getLocalizer().getMessage("lblLoad"));
+        saveButton = ui.findActor("Save");
+        saveButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSave"));
+        resumeButton = ui.findActor("Resume");
+        resumeButton.getLabel().setText(Forge.getLocalizer().getMessage("lblResume"));
+        continueButton = ui.findActor("Continue");
+        continueButton.getLabel().setText(Forge.getLocalizer().getMessage("lblContinue"));
+        settingsButton = ui.findActor("Settings");
+        settingsButton.getLabel().setText(Forge.getLocalizer().getMessage("lblSettings"));
+        exitButton = ui.findActor("Exit");
+        exitButton.getLabel().setText(Forge.getLocalizer().getMessage("lblExit"));
+        switchButton = ui.findActor("Switch");
+        switchButton.getLabel().setText(Forge.getLocalizer().getMessage("lblClassic"));
 
-            saveButton.setVisible(false);
-            resumeButton.setVisible(false);
+        saveButton.setVisible(false);
+        resumeButton.setVisible(false);
+        dialog = Controls.newDialog(Forge.getLocalizer().getMessage("lblExitForge"));
+        dialog.getButtonTable().add(Controls.newLabel(Forge.getLocalizer().getMessage("lblAreYouSureYouWishExitForge"))).colspan(2).pad(2, 15, 2, 15);
+        dialog.getButtonTable().row();
+        dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblExit"), () -> Forge.exit(true))).width(60).align(Align.left).padLeft(15);
+        dialog.getButtonTable().add(Controls.newTextButton(Forge.getLocalizer().getMessage("lblCancel"), () -> dialog.hide())).width(60).align(Align.right).padRight(15);
+        dialog.getColor().a = 0;
     }
 
     private void NewGamePlus() {

From da622b6ebe23881da4f400fceb84784ac7247c9a Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 18 Jun 2022 17:50:39 +0800
Subject: [PATCH 005/309] Update ReplaceAddCounter.java

---
 .../src/main/java/forge/game/replacement/ReplaceAddCounter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
index 466d5552c5b..4ed0487dcd6 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
@@ -60,7 +60,7 @@ public class ReplaceAddCounter extends ReplacementEffect {
             return false;
         }
 
-        if (runParams.containsKey(AbilityKey.ETB)) {
+        if (runParams.containsKey(AbilityKey.ETB) && (boolean)runParams.get(AbilityKey.ETB)) {
             // if Card does affect something other than itself
             if (!hasParam("ValidCard") || !getParam("ValidCard").equals("Card.Self")) {
                 // and it self is entering, skip

From 44b6046aa85980d07b82754616236abd6e34ff58 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 18 Jun 2022 17:55:15 +0800
Subject: [PATCH 006/309] Update ReplaceAddCounter.java

---
 .../src/main/java/forge/game/replacement/ReplaceAddCounter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
index 4ed0487dcd6..d1ba490ca1f 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java
@@ -60,7 +60,7 @@ public class ReplaceAddCounter extends ReplacementEffect {
             return false;
         }
 
-        if (runParams.containsKey(AbilityKey.ETB) && (boolean)runParams.get(AbilityKey.ETB)) {
+        if (runParams.containsKey(AbilityKey.ETB) && (Boolean)runParams.get(AbilityKey.ETB)) {
             // if Card does affect something other than itself
             if (!hasParam("ValidCard") || !getParam("ValidCard").equals("Card.Self")) {
                 // and it self is entering, skip

From 14fa511c2825ad5e22220e70ee632fa6bb023dd0 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 19 Jun 2022 13:40:17 +0200
Subject: [PATCH 007/309] Extrinsic ETB tapped: fix for double triggers

---
 forge-gui/res/cardsfolder/a/archon_of_emeria.txt             | 4 ++--
 forge-gui/res/cardsfolder/a/ashlings_prerogative.txt         | 4 ++--
 forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt     | 4 ++--
 forge-gui/res/cardsfolder/b/blind_obedience.txt              | 4 ++--
 forge-gui/res/cardsfolder/d/due_respect.txt                  | 4 ++--
 forge-gui/res/cardsfolder/f/false_floor.txt                  | 4 ++--
 forge-gui/res/cardsfolder/f/frozen_aether.txt                | 4 ++--
 forge-gui/res/cardsfolder/i/imposing_sovereign.txt           | 4 ++--
 forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt            | 4 ++--
 forge-gui/res/cardsfolder/k/kismet.txt                       | 4 ++--
 forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt           | 4 ++--
 forge-gui/res/cardsfolder/m/manglehorn.txt                   | 4 ++--
 forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt         | 4 ++--
 forge-gui/res/cardsfolder/o/orb_of_dreams.txt                | 4 ++--
 .../res/cardsfolder/r/radiant_grace_radiant_restraints.txt   | 4 ++--
 .../reidane_god_of_the_worthy_valkmira_protectors_shield.txt | 4 ++--
 forge-gui/res/cardsfolder/r/root_maze.txt                    | 4 ++--
 forge-gui/res/cardsfolder/s/storyweave.txt                   | 2 +-
 forge-gui/res/cardsfolder/t/tenacious_pup.txt                | 5 ++---
 forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt        | 4 ++--
 forge-gui/res/cardsfolder/u/uphill_battle.txt                | 4 ++--
 forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt          | 4 ++--
 22 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
index f88255abf7e..de161f526d8 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
@@ -4,8 +4,8 @@ Types:Creature Archon
 PT:2/3
 K:Flying
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player | NumLimitEachTurn$ 1 | Description$ Each player can't cast more than one spell each turn.
-R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:Flying\nEach player can't cast more than one spell each turn.\nNonbasic lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt b/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
index 23adf9a7dd6..3725af8ffe7 100644
--- a/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
+++ b/forge-gui/res/cardsfolder/a/ashlings_prerogative.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 K:ETBReplacement:Other:ChooseEvenOdd
 SVar:ChooseEvenOdd:DB$ ChooseEvenOdd | Defined$ You | ListTitle$ Choose ODD or EVEN | AILogic$ CMCInHand | SpellDescription$ As CARDNAME enters the battlefield, choose odd or even. (Zero is even.)
 S:Mode$ Continuous | Affected$ Creature.cmcChosenEvenOdd | AddKeyword$ Haste | Description$ Each creature with mana value of the chosen quality has haste.
-R:Event$ Moved | ValidCard$ Creature.cmcNotChosenEvenOdd | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Each creature without mana value of the chosen quality enters the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.cmcNotChosenEvenOdd | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Each creature without mana value of the chosen quality enters the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:All
 Oracle:As Ashling's Prerogative enters the battlefield, choose odd or even. (Zero is even.)\nEach creature with mana value of the chosen quality has haste.\nEach creature without mana value of the chosen quality enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt b/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
index 8d2366920d5..bc16f8e6d51 100644
--- a/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
+++ b/forge-gui/res/cardsfolder/a/authority_of_the_consuls.txt
@@ -1,8 +1,8 @@
 Name:Authority of the Consuls
 ManaCost:W
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under an opponent's control, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 Oracle:Creatures your opponents control enter the battlefield tapped.\nWhenever a creature enters the battlefield under an opponent's control, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/b/blind_obedience.txt b/forge-gui/res/cardsfolder/b/blind_obedience.txt
index 3cde7005734..18e57c9ad91 100644
--- a/forge-gui/res/cardsfolder/b/blind_obedience.txt
+++ b/forge-gui/res/cardsfolder/b/blind_obedience.txt
@@ -2,6 +2,6 @@ Name:Blind Obedience
 ManaCost:1 W
 Types:Enchantment
 K:Extort
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts and creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated  | ActiveZones$ Battlefield | Description$ Artifacts and creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Extort (Whenever you cast a spell, you may pay {W/B}. If you do, each opponent loses 1 life and you gain that much life.)\nArtifacts and creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/d/due_respect.txt b/forge-gui/res/cardsfolder/d/due_respect.txt
index aa2e89462b8..2552ef3c9d5 100644
--- a/forge-gui/res/cardsfolder/d/due_respect.txt
+++ b/forge-gui/res/cardsfolder/d/due_respect.txt
@@ -2,7 +2,7 @@ Name:Due Respect
 ManaCost:1 W
 Types:Instant
 A:SP$ Effect | Cost$ 1 W | ReplacementEffects$ RepETB | SubAbility$ DBDraw | AILogic$ BeginningOfOppTurn | SpellDescription$ Permanents enter the battlefield tapped this turn.
-SVar:RepETB:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | Description$ Permanents enter the battlefield tapped this turn.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+SVar:RepETB:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Permanents enter the battlefield tapped this turn.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Permanents enter the battlefield tapped this turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/f/false_floor.txt b/forge-gui/res/cardsfolder/f/false_floor.txt
index d3205860dcf..290d4951a9a 100644
--- a/forge-gui/res/cardsfolder/f/false_floor.txt
+++ b/forge-gui/res/cardsfolder/f/false_floor.txt
@@ -2,7 +2,7 @@ Name:False Floor
 ManaCost:4
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-R:Event$ Moved | ValidCard$ Creature | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 A:AB$ ChangeZoneAll | Cost$ 2 T Exile<1/CARDNAME> | ChangeType$ Creature.untapped | Origin$ Battlefield | Destination$ Exile | SorcerySpeed$ True | SpellDescription$ Exile all untapped creatures. Activate only as a sorcery.
 Oracle:False Floor enters the battlefield tapped.\nCreatures enter the battlefield tapped.\n{2}, {T}, Exile False Floor: Exile all untapped creatures. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/f/frozen_aether.txt b/forge-gui/res/cardsfolder/f/frozen_aether.txt
index 90eb810c79e..d550ac8b69c 100644
--- a/forge-gui/res/cardsfolder/f/frozen_aether.txt
+++ b/forge-gui/res/cardsfolder/f/frozen_aether.txt
@@ -1,6 +1,6 @@
 Name:Frozen Aether
 ManaCost:3 U
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
index 1940a17fdaf..5a1e10ab40d 100644
--- a/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
+++ b/forge-gui/res/cardsfolder/i/imposing_sovereign.txt
@@ -2,6 +2,6 @@ Name:Imposing Sovereign
 ManaCost:1 W
 Types:Creature Human Noble
 PT:2/1
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt b/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
index 79496d433e9..c621977d26e 100644
--- a/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
+++ b/forge-gui/res/cardsfolder/k/kinjallis_sunwing.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Dinosaur
 PT:2/3
 K:Flying
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Flying\nCreatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/k/kismet.txt b/forge-gui/res/cardsfolder/k/kismet.txt
index 357baf2a15c..b5221b5979f 100644
--- a/forge-gui/res/cardsfolder/k/kismet.txt
+++ b/forge-gui/res/cardsfolder/k/kismet.txt
@@ -1,6 +1,6 @@
 Name:Kismet
 ManaCost:3 W
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt b/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
index 63f37644f60..7c749174c5b 100644
--- a/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
+++ b/forge-gui/res/cardsfolder/l/loxodon_gatekeeper.txt
@@ -2,6 +2,6 @@ Name:Loxodon Gatekeeper
 ManaCost:2 W W
 Types:Creature Elephant Soldier
 PT:2/3
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/m/manglehorn.txt b/forge-gui/res/cardsfolder/m/manglehorn.txt
index ac3e1b19eca..fab058c759f 100644
--- a/forge-gui/res/cardsfolder/m/manglehorn.txt
+++ b/forge-gui/res/cardsfolder/m/manglehorn.txt
@@ -4,7 +4,7 @@ Types:Creature Beast
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target artifact.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact
-R:Event$ Moved | ValidCard$ Artifact.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:PlayMain1:TRUE
 Oracle:When Manglehorn enters the battlefield, you may destroy target artifact.\nArtifacts your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
index 3ae54a04a06..aae8fc9d9f3 100644
--- a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
+++ b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
@@ -6,8 +6,8 @@ SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBStoreSVar | StackDescription$
 SVar:DBStoreSVar:DB$ StoreSVar | SVar$ XLands | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayMoreLand | ReplacementEffects$ LandETB | SubAbility$ DBCleanup
 SVar:PlayMoreLand:Mode$ Continuous | Affected$ You | AdjustLandPlays$ XLands | EffectZone$ Command | Description$ You may play X additional lands this turn.
-SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | Description$ Lands you control enter the battlefield tapped this turn.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Lands you control enter the battlefield tapped this turn.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
 SVar:Y:Count$RememberedSize
diff --git a/forge-gui/res/cardsfolder/o/orb_of_dreams.txt b/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
index 686c3ff7b58..5e5055ecdcc 100644
--- a/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
+++ b/forge-gui/res/cardsfolder/o/orb_of_dreams.txt
@@ -1,7 +1,7 @@
 Name:Orb of Dreams
 ManaCost:3
 Types:Artifact
-R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Permanents enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Permanents enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:Random
 Oracle:Permanents enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
index 263e24151d3..2ad3fdbc075 100644
--- a/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_grace_radiant_restraints.txt
@@ -18,6 +18,6 @@ Colors:white
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player | AILogic$ Curse
-R:Event$ Moved | ValidCard$ Creature.EnchantedPlayerCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.EnchantedPlayerCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures enchanted player controls enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
index c33244b7600..9319d9462d3 100644
--- a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
+++ b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature God
 PT:2/3
 K:Flying
 K:Vigilance
-R:Event$ Moved | ValidCard$ Land.Snow+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Snow lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Land.Snow+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Snow lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 S:Mode$ RaiseCost | ValidCard$ Card.nonCreature+cmcGE4 | Type$ Spell | Activator$ Opponent | Amount$ 2 | Description$ Noncreature spells your opponents cast with mana value 4 or greater cost {2} more to cast.
 AlternateMode:Modal
 Oracle:Flying, vigilance\nSnow lands your opponents control enter the battlefield tapped.\nNoncreature spells your opponents cast with mana value 4 or greater cost {2} more to cast.
diff --git a/forge-gui/res/cardsfolder/r/root_maze.txt b/forge-gui/res/cardsfolder/r/root_maze.txt
index f585e2996a1..8c677739676 100644
--- a/forge-gui/res/cardsfolder/r/root_maze.txt
+++ b/forge-gui/res/cardsfolder/r/root_maze.txt
@@ -1,7 +1,7 @@
 Name:Root Maze
 ManaCost:G
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Artifact,Land | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Artifacts and lands enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Artifact,Land | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Artifacts and lands enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 AI:RemoveDeck:Random
 Oracle:Artifacts and lands enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/s/storyweave.txt b/forge-gui/res/cardsfolder/s/storyweave.txt
index 16ba45fe97b..b584e9b2d27 100644
--- a/forge-gui/res/cardsfolder/s/storyweave.txt
+++ b/forge-gui/res/cardsfolder/s/storyweave.txt
@@ -5,7 +5,7 @@ A:SP$ Charm | Choices$ P1P1,Lore
 SVar:P1P1:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature you control.
 SVar:Lore:DB$ PutCounter | ValidTgts$ Saga.YouCtrl | TgtPrompt$ Select target Saga you control | CounterType$ LORE | CounterNum$ 2 | SubAbility$ DBEffect | SpellDescription$ Put two lore counters on target Saga you control. The next time one or more enchantment creatures enter the battlefield under your control this turn, each enters with two additional +1/+1 counters on it.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ ReplaceETB | Triggers$ TrigRemove
-SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.Enchantment | ReplaceWith$ DBPutP1P1
+SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.Enchantment | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ DBImprint
 SVar:DBImprint:DB$ Pump | ImprintCards$ ReplacedCard
 SVar:TrigRemove:Mode$ ChangesZoneAll | CheckSVar$ Z | Execute$ ExileSelf | Static$ True
diff --git a/forge-gui/res/cardsfolder/t/tenacious_pup.txt b/forge-gui/res/cardsfolder/t/tenacious_pup.txt
index 981c17ee6ec..17dc6c49442 100644
--- a/forge-gui/res/cardsfolder/t/tenacious_pup.txt
+++ b/forge-gui/res/cardsfolder/t/tenacious_pup.txt
@@ -6,9 +6,8 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1 | SubAbility$ DBDelayedTrigger
 SVar:DBDelayedTrigger:DB$ DelayedTrigger | Execute$ TrigAddAPI | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
 SVar:TrigAddAPI:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ReplaceEnter
-SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | Description$ That creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Trample,Vigilance | CounterNum$ 1  | SubAbility$ ToBattlefield
-SVar:ToBattlefield:DB$ InternalEtbReplacement | SubAbility$ DBExile
+SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Trample,Vigilance | CounterNum$ 1  | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$LifeGain|Counters
 Oracle:When Tenacious Pup enters the battlefield, you gain 1 life. When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it.
diff --git a/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt b/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
index 96551192ac6..50d8e9e0865 100644
--- a/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
+++ b/forge-gui/res/cardsfolder/t/thalia_heretic_cathar.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Legendary Creature Human Soldier
 PT:3/2
 K:First Strike
-R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl,Land.nonBasic+OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures and nonbasic lands your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:First strike\nCreatures and nonbasic lands your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/u/uphill_battle.txt b/forge-gui/res/cardsfolder/u/uphill_battle.txt
index aa869020ccc..94a4a176e27 100644
--- a/forge-gui/res/cardsfolder/u/uphill_battle.txt
+++ b/forge-gui/res/cardsfolder/u/uphill_battle.txt
@@ -1,6 +1,6 @@
 Name:Uphill Battle
 ManaCost:2 R
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures played by your opponents enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures played by your opponents enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Creatures played by your opponents enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt b/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
index 1ecb1cf2c6a..d76cac36bba 100644
--- a/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
+++ b/forge-gui/res/cardsfolder/u/urabrask_the_hidden.txt
@@ -3,8 +3,8 @@ ManaCost:3 R R
 Types:Legendary Creature Phyrexian Praetor
 PT:4/4
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Haste | Description$ Creatures you control have haste.
-R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+R:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Creatures your opponents control enter the battlefield tapped.
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Creature
 Oracle:Creatures you control have haste.\nCreatures your opponents control enter the battlefield tapped.

From ed85c0e5eb1c841c8b3023548359b6cae53fc121 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Sun, 19 Jun 2022 14:13:39 -0500
Subject: [PATCH 008/309] 2ndAttemptAtContrabandLivestock

---
 .../res/cardsfolder/upcoming/contraband_livestock.txt | 11 +++++++++++
 forge-gui/res/tokenscripts/g_4_4_ox.txt               |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/contraband_livestock.txt
 create mode 100644 forge-gui/res/tokenscripts/g_4_4_ox.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/contraband_livestock.txt b/forge-gui/res/cardsfolder/upcoming/contraband_livestock.txt
new file mode 100644
index 00000000000..21b4fec0748
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/contraband_livestock.txt
@@ -0,0 +1,11 @@
+Name:Contraband Livestock
+ManaCost:1 W
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select a target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBRollDice | AILogic$ Pongify | StackDescription$ SpellDescription | SpellDescription$ Exile target creature,
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:GreenOx,10-19:GreenBoar,20:WhiteGoat | SpellDescription$ then roll a d20.
+SVar:GreenOx:DB$ Token | TokenAmount$ 1 | TokenScript$ g_4_4_ox | TokenOwner$ TargetedController | SpellDescription$ 1-9 VERT Its controller creates a 4/4 green Ox creature token.
+SVar:GreenBoar:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_boar | TokenOwner$ TargetedController | SpellDescription$ 10-19 VERT Its controller creates a 2/2 green Boar creature token.
+SVar:WhiteGoat:DB$ Token | TokenAmount$ 1 | TokenScript$ w_0_1_goat | TokenOwner$ TargetedController | SpellDescription$ 20 VERT Its controller creates a 0/1 white Goat creature token.
+DeckHas:Ability$Token
+AI:RemoveDeck:All
+Oracle:Exile target creature, then roll a d20.\n1-9 | Its controller creates a 4/4 green Ox creature token.\n10-19 | Its controller creates a 2/2 green Boar creature token.\n20 | Its controller creates a 0/1 white Goat creature token.
diff --git a/forge-gui/res/tokenscripts/g_4_4_ox.txt b/forge-gui/res/tokenscripts/g_4_4_ox.txt
new file mode 100644
index 00000000000..b7327d5643c
--- /dev/null
+++ b/forge-gui/res/tokenscripts/g_4_4_ox.txt
@@ -0,0 +1,6 @@
+Name:Ox Token
+ManaCost:no cost
+Colors:green
+Types:Creature Ox
+PT:4/4
+Oracle:
\ No newline at end of file

From 071fcd14ed02394f87e3b4f659405797c03dba84 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 20 Jun 2022 09:56:06 +0100
Subject: [PATCH 009/309] Edition and Draft Ranking updates (CLB, YSNC, SNC)

---
 forge-gui/res/draft/rankings.txt              | 496 +++++++++---------
 .../res/editions/Alchemy New Capenna.txt      |   2 +-
 ...ander Legends Battle for Baldur's Gate.txt |  76 +--
 3 files changed, 293 insertions(+), 281 deletions(-)

diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt
index d3a7886b2d0..0b07b5683d2 100644
--- a/forge-gui/res/draft/rankings.txt
+++ b/forge-gui/res/draft/rankings.txt
@@ -1,265 +1,265 @@
 //Rank|Name|Rarity|Set
-#1|Elspeth Resplendent|M|SNC
-#2|Sanctuary Warden|M|SNC
-#3|All-Seeing Arbiter|M|SNC
-#4|Vivien on the Hunt|M|SNC
-#5|Ob Nixilis, the Adversary|M|SNC
-#6|Ziatora, the Incinerator|M|SNC
-#7|Workshop Warchief|R|SNC
-#8|Depopulate|R|SNC
-#9|Rabble Rousing|R|SNC
-#10|Urabrask, Heretic Praetor|M|SNC
-#11|Fight Rigging|R|SNC
-#12|Brokers Ascendancy|R|SNC
+#1|Sanctuary Warden|M|SNC
+#2|All-Seeing Arbiter|M|SNC
+#3|Ziatora, the Incinerator|M|SNC
+#4|Elspeth Resplendent|M|SNC
+#5|Brokers Ascendancy|R|SNC
+#6|Ob Nixilis, the Adversary|M|SNC
+#7|Hostile Takeover|R|SNC
+#8|Raffine, Scheming Seer|M|SNC
+#9|Vivien on the Hunt|M|SNC
+#10|Titan of Industry|M|SNC
+#11|Rabble Rousing|R|SNC
+#12|Fight Rigging|R|SNC
 #13|Evelyn, the Covetous|R|SNC
 #14|Falco Spara, Pactweaver|M|SNC
-#15|Hostile Takeover|R|SNC
-#16|Raffine, Scheming Seer|M|SNC
-#17|Ziatora's Envoy|R|SNC
-#18|Titan of Industry|M|SNC
-#19|Soul of Emancipation|R|SNC
-#20|Body Launderer|M|SNC
-#21|Shakedown Heavy|R|SNC
-#22|Jaxis, the Troublemaker|R|SNC
+#15|Ziatora's Envoy|R|SNC
+#16|Workshop Warchief|R|SNC
+#17|Urabrask, Heretic Praetor|M|SNC
+#18|Shakedown Heavy|R|SNC
+#19|Fleetfoot Dancer|R|SNC
+#20|Jetmir, Nexus of Revels|M|SNC
+#21|Reservoir Kraken|R|SNC
+#22|Body Launderer|M|SNC
 #23|Professional Face-Breaker|R|SNC
-#24|Fleetfoot Dancer|R|SNC
-#25|Jetmir, Nexus of Revels|M|SNC
-#26|Maestros Diabolist|R|SNC
-#27|Toluz, Clever Conductor|R|SNC
-#28|Reservoir Kraken|R|SNC
-#29|Tenacious Underdog|R|SNC
-#30|Jinnie Fay, Jetmir's Second|R|SNC
-#31|Mysterious Limousine|R|SNC
-#32|Ledger Shredder|R|SNC
-#33|Sanguine Spy|R|SNC
-#34|Gala Greeters|R|SNC
-#35|Corpse Appraiser|U|SNC
-#36|Lord Xander, the Collector|M|SNC
+#24|Maestros Diabolist|R|SNC
+#25|Mysterious Limousine|R|SNC
+#26|Sanguine Spy|R|SNC
+#27|Tenacious Underdog|R|SNC
+#28|Jaxis, the Troublemaker|R|SNC
+#29|Corpse Appraiser|U|SNC
+#30|Lord Xander, the Collector|M|SNC
+#31|Toluz, Clever Conductor|R|SNC
+#32|Depopulate|R|SNC
+#33|Jinnie Fay, Jetmir's Second|R|SNC
+#34|Soul of Emancipation|R|SNC
+#35|Giada, Font of Hope|R|SNC
+#36|Disciplined Duelist|U|SNC
 #37|Queza, Augur of Agonies|U|SNC
-#38|Nimble Larcenist|U|SNC
-#39|Lagrella, the Magpie|U|SNC
-#40|Inspiring Overseer|C|SNC
-#41|Psychic Pickpocket|U|SNC
-#42|Night Clubber|U|SNC
-#43|Black Market Tycoon|R|SNC
-#44|Brazen Upstart|U|SNC
-#45|Cormela, Glamour Thief|U|SNC
-#46|Disciplined Duelist|U|SNC
-#47|Rocco, Cabaretti Caterer|U|SNC
-#48|Void Rend|R|SNC
-#49|Giada, Font of Hope|R|SNC
-#50|Halo Fountain|M|SNC
-#51|Faerie Vandal|U|SNC
-#52|Sleep with the Fishes|U|SNC
-#53|Undercover Operative|R|SNC
-#54|Dusk Mangler|U|SNC
-#55|Murder|C|SNC
-#56|Topiary Stomper|R|SNC
-#57|Brokers Charm|U|SNC
-#58|Corpse Explosion|R|SNC
-#59|Obscura Interceptor|R|SNC
-#60|Rigo, Streetwise Mentor|R|SNC
-#61|Riveteers Charm|U|SNC
-#62|Getaway Car|R|SNC
-#63|Grisly Sigil|U|SNC
-#64|Rogues' Gallery|U|SNC
+#38|Lagrella, the Magpie|U|SNC
+#39|Inspiring Overseer|C|SNC
+#40|Psychic Pickpocket|U|SNC
+#41|Night Clubber|U|SNC
+#42|Brokers Charm|U|SNC
+#43|Nimble Larcenist|U|SNC
+#44|Obscura Interceptor|R|SNC
+#45|Void Rend|R|SNC
+#46|Extraction Specialist|R|SNC
+#47|Faerie Vandal|U|SNC
+#48|Ledger Shredder|R|SNC
+#49|Dusk Mangler|U|SNC
+#50|Murder|C|SNC
+#51|Pugnacious Pugilist|U|SNC
+#52|Jewel Thief|C|SNC
+#53|Topiary Stomper|R|SNC
+#54|Aven Heartstabber|R|SNC
+#55|Black Market Tycoon|R|SNC
+#56|Cormela, Glamour Thief|U|SNC
+#57|Darling of the Masses|U|SNC
+#58|Mr. Orfeo, the Boulder|U|SNC
+#59|Riveteers Charm|U|SNC
+#60|Unleash the Inferno|R|SNC
+#61|Illuminator Virtuoso|U|SNC
+#62|Sleep with the Fishes|U|SNC
+#63|Undercover Operative|R|SNC
+#64|Grisly Sigil|U|SNC
 #65|Call In a Professional|U|SNC
-#66|Pugnacious Pugilist|U|SNC
-#67|Strangle|C|SNC
-#68|Jewel Thief|C|SNC
-#69|Voice of the Vermin|U|SNC
-#70|Darling of the Masses|U|SNC
-#71|Maestros Charm|U|SNC
-#72|Metropolis Angel|U|SNC
-#73|Mr. Orfeo, the Boulder|U|SNC
-#74|Unleash the Inferno|R|SNC
-#75|Unlicensed Hearse|R|SNC
+#66|Strangle|C|SNC
+#67|Gala Greeters|R|SNC
+#68|Brazen Upstart|U|SNC
+#69|Corpse Explosion|R|SNC
+#70|Endless Detour|R|SNC
+#71|Exotic Pets|U|SNC
+#72|Maestros Charm|U|SNC
+#73|Metropolis Angel|U|SNC
+#74|Rigo, Streetwise Mentor|R|SNC
+#75|Syndicate Infiltrator|U|SNC
 #76|Citizen's Crowbar|U|SNC
-#77|Extraction Specialist|R|SNC
-#78|Illuminator Virtuoso|U|SNC
-#79|Knockout Blow|U|SNC
+#77|Halo Fountain|M|SNC
+#78|Echo Inspector|C|SNC
+#79|Out of the Way|U|SNC
 #80|Angel of Suffering|M|SNC
-#81|Whack|U|SNC
-#82|Riveteers Requisitioner|U|SNC
-#83|Cleanup Crew|U|SNC
-#84|Elegant Entourage|U|SNC
-#85|Freelance Muscle|U|SNC
-#86|Aven Heartstabber|R|SNC
-#87|Crew Captain|U|SNC
-#88|Endless Detour|R|SNC
-#89|Exotic Pets|U|SNC
-#90|Park Heights Pegasus|R|SNC
-#91|Syndicate Infiltrator|U|SNC
-#92|Corrupt Court Official|C|SNC
-#93|Bouncer's Beatdown|U|SNC
-#94|Echo Inspector|C|SNC
-#95|A Little Chat|U|SNC
-#96|Out of the Way|U|SNC
-#97|Wingshield Agent|U|SNC
-#98|Girder Goons|C|SNC
-#99|Raffine's Silencer|U|SNC
-#100|Mayhem Patrol|C|SNC
-#101|Torch Breath|U|SNC
-#102|Ognis, the Dragon's Lash|R|SNC
-#103|Tainted Indulgence|U|SNC
-#104|Jetmir's Garden|R|SNC
-#105|Raffine's Tower|R|SNC
-#106|Spara's Headquarters|R|SNC
-#107|Xander's Lounge|R|SNC
-#108|Ziatora's Proving Ground|R|SNC
-#109|Riveteers Decoy|U|SNC
-#110|Mage's Attendant|U|SNC
-#111|Raffine's Informant|C|SNC
-#112|Rumor Gatherer|U|SNC
-#113|Rooftop Nuisance|C|SNC
-#114|Wiretapping|R|SNC
-#115|Witness Protection|C|SNC
-#116|Arcane Bombardment|M|SNC
-#117|Light 'Em Up|C|SNC
-#118|Pyre-Sledge Arsonist|U|SNC
-#119|Unlucky Witness|U|SNC
-#120|Body Dropper|C|SNC
-#121|Celestial Regulator|C|SNC
-#122|Ceremonial Groundbreaker|U|SNC
-#123|Obscura Charm|U|SNC
-#124|Security Rhox|U|SNC
-#125|Snooping Newsie|C|SNC
-#126|Spara's Adjudicators|C|SNC
-#127|Ballroom Brawlers|U|SNC
-#128|Hold for Ransom|C|SNC
-#129|Even the Score|M|SNC
-#130|Hypnotic Grifter|U|SNC
-#131|Obscura Initiate|C|SNC
-#132|Slip Out the Back|U|SNC
-#133|Dig Up the Body|C|SNC
-#134|Maestros Initiate|C|SNC
-#135|Big Score|C|SNC
-#136|Devilish Valet|R|SNC
-#137|Plasma Jockey|C|SNC
-#138|Courier's Briefcase|U|SNC
-#139|Luxurious Libation|U|SNC
-#140|Cabaretti Ascendancy|R|SNC
-#141|Cabaretti Charm|U|SNC
-#142|Civil Servant|C|SNC
-#143|Forge Boss|U|SNC
-#144|Glamorous Outlaw|C|SNC
-#145|Jetmir's Fixer|C|SNC
-#146|Maestros Ascendancy|R|SNC
-#147|Rakish Revelers|C|SNC
-#148|Scheming Fence|R|SNC
-#149|Stimulus Package|U|SNC
-#150|Prizefight|C|SNC
-#151|Exhibition Magician|C|SNC
-#152|Gathering Throng|C|SNC
-#153|Sky Crier|C|SNC
-#154|High-Rise Sawjack|C|SNC
-#155|For the Family|C|SNC
-#156|Majestic Metamorphosis|C|SNC
-#157|Backup Agent|C|SNC
-#158|Kill Shot|C|SNC
-#159|Boon of Safety|C|SNC
-#160|Buy Your Silence|C|SNC
-#161|Disdainful Stroke|C|SNC
-#162|Make Disappear|C|SNC
-#163|Deal Gone Bad|C|SNC
-#164|Involuntary Employment|U|SNC
+#81|Rogues' Gallery|U|SNC
+#82|Whack|U|SNC
+#83|Riveteers Requisitioner|U|SNC
+#84|Torch Breath|U|SNC
+#85|Cleanup Crew|U|SNC
+#86|Elegant Entourage|U|SNC
+#87|Freelance Muscle|U|SNC
+#88|Voice of the Vermin|U|SNC
+#89|Rocco, Cabaretti Caterer|U|SNC
+#90|Unlicensed Hearse|R|SNC
+#91|Corrupt Court Official|C|SNC
+#92|Riveteers Decoy|U|SNC
+#93|Knockout Blow|U|SNC
+#94|Mage's Attendant|U|SNC
+#95|Wingshield Agent|U|SNC
+#96|Girder Goons|C|SNC
+#97|Raffine's Silencer|U|SNC
+#98|Arcane Bombardment|M|SNC
+#99|Ceremonial Groundbreaker|U|SNC
+#100|Crew Captain|U|SNC
+#101|Park Heights Pegasus|R|SNC
+#102|Jetmir's Garden|R|SNC
+#103|Raffine's Tower|R|SNC
+#104|Spara's Headquarters|R|SNC
+#105|Xander's Lounge|R|SNC
+#106|Ziatora's Proving Ground|R|SNC
+#107|Raffine's Informant|C|SNC
+#108|Even the Score|M|SNC
+#109|Hypnotic Grifter|U|SNC
+#110|A Little Chat|U|SNC
+#111|Rooftop Nuisance|C|SNC
+#112|Witness Protection|C|SNC
+#113|Light 'Em Up|C|SNC
+#114|Pyre-Sledge Arsonist|U|SNC
+#115|Unlucky Witness|U|SNC
+#116|Luxurious Libation|U|SNC
+#117|Body Dropper|C|SNC
+#118|Cabaretti Charm|U|SNC
+#119|Ognis, the Dragon's Lash|R|SNC
+#120|Security Rhox|U|SNC
+#121|Tainted Indulgence|U|SNC
+#122|Bouncer's Beatdown|U|SNC
+#123|Gathering Throng|C|SNC
+#124|Ballroom Brawlers|U|SNC
+#125|Hold for Ransom|C|SNC
+#126|Rumor Gatherer|U|SNC
+#127|Make Disappear|C|SNC
+#128|Wiretapping|R|SNC
+#129|Deal Gone Bad|C|SNC
+#130|Maestros Initiate|C|SNC
+#131|Big Score|C|SNC
+#132|Involuntary Employment|U|SNC
+#133|Mayhem Patrol|C|SNC
+#134|Witty Roastmaster|C|SNC
+#135|Celestial Regulator|C|SNC
+#136|Civil Servant|C|SNC
+#137|Glamorous Outlaw|C|SNC
+#138|Jetmir's Fixer|C|SNC
+#139|Maestros Ascendancy|R|SNC
+#140|Obscura Charm|U|SNC
+#141|Rakish Revelers|C|SNC
+#142|Scheming Fence|R|SNC
+#143|Snooping Newsie|C|SNC
+#144|Getaway Car|R|SNC
+#145|Spara's Adjudicators|C|SNC
+#146|Expendable Lackey|C|SNC
+#147|Prizefight|C|SNC
+#148|Exhibition Magician|C|SNC
+#149|Fake Your Own Death|C|SNC
+#150|Warm Welcome|C|SNC
+#151|For the Family|C|SNC
+#152|Midnight Assassin|C|SNC
+#153|Run Out of Town|C|SNC
+#154|Majestic Metamorphosis|C|SNC
+#155|Backup Agent|C|SNC
+#156|Boon of Safety|C|SNC
+#157|Dapper Shieldmate|C|SNC
+#158|Disdainful Stroke|C|SNC
+#159|Obscura Initiate|C|SNC
+#160|Slip Out the Back|U|SNC
+#161|Dig Up the Body|C|SNC
+#162|Revel Ruiner|C|SNC
+#163|Shadow of Mortality|R|SNC
+#164|Plasma Jockey|C|SNC
 #165|Riveteers Initiate|C|SNC
 #166|Sizzling Soloist|U|SNC
-#167|Witty Roastmaster|C|SNC
-#168|Bootleggers' Stash|M|SNC
-#169|Caldaia Strongarm|C|SNC
-#170|Rhox Pummeler|C|SNC
-#171|Venom Connoisseur|U|SNC
-#172|Masked Bandits|C|SNC
-#173|Shattered Seraph|C|SNC
-#174|Scuttling Butler|U|SNC
-#175|Botanical Plaza|C|SNC
-#176|Cabaretti Courtyard|C|SNC
-#177|Maestros Theater|C|SNC
-#178|Obscura Storefront|C|SNC
-#179|Racers' Ring|C|SNC
-#180|Skybridge Towers|C|SNC
-#181|Tramway Station|C|SNC
-#182|Waterfront District|C|SNC
-#183|Swooping Protector|U|SNC
-#184|Brokers Initiate|C|SNC
-#185|Expendable Lackey|C|SNC
-#186|Fake Your Own Death|C|SNC
-#187|Brokers Hideout|C|SNC
-#188|Riveteers Overlook|C|SNC
-#189|Glittermonger|C|SNC
-#190|Warm Welcome|C|SNC
+#167|Caldaia Strongarm|C|SNC
+#168|Courier's Briefcase|U|SNC
+#169|Venom Connoisseur|U|SNC
+#170|Cabaretti Ascendancy|R|SNC
+#171|Fatal Grudge|U|SNC
+#172|Forge Boss|U|SNC
+#173|Incandescent Aria|R|SNC
+#174|Masked Bandits|C|SNC
+#175|Shattered Seraph|C|SNC
+#176|Stimulus Package|U|SNC
+#177|Botanical Plaza|C|SNC
+#178|Cabaretti Courtyard|C|SNC
+#179|Maestros Theater|C|SNC
+#180|Obscura Storefront|C|SNC
+#181|Racers' Ring|C|SNC
+#182|Skybridge Towers|C|SNC
+#183|Tramway Station|C|SNC
+#184|Waterfront District|C|SNC
+#185|Swooping Protector|U|SNC
+#186|Brokers Initiate|C|SNC
+#187|Sky Crier|C|SNC
+#188|Brokers Hideout|C|SNC
+#189|Riveteers Overlook|C|SNC
+#190|High-Rise Sawjack|C|SNC
 #191|Civic Gardener|C|SNC
-#192|Midnight Assassin|C|SNC
-#193|Crooked Custodian|C|SNC
-#194|Run Out of Town|C|SNC
-#195|Celebrity Fencer|C|SNC
-#196|Brokers Veteran|C|SNC
-#197|Incriminate|C|SNC
-#198|Revel Ruiner|C|SNC
-#199|Attended Socialite|C|SNC
-#200|Fatal Grudge|U|SNC
-#201|Suspicious Bookcase|U|SNC
-#202|Goldhound|C|SNC
-#203|Sticky Fingers|C|SNC
-#204|Quick-Draw Dagger|C|SNC
-#205|Capenna Express|C|SNC
-#206|Gilded Pinions|C|SNC
-#207|Ready to Rumble|C|SNC
-#208|Wrecking Crew|C|SNC
-#209|Antagonize|C|SNC
-#210|Sewer Crocodile|C|SNC
+#192|Crooked Custodian|C|SNC
+#193|Sewer Crocodile|C|SNC
+#194|Kill Shot|C|SNC
+#195|Buy Your Silence|C|SNC
+#196|Celebrity Fencer|C|SNC
+#197|Brokers Veteran|C|SNC
+#198|Case the Joint|C|SNC
+#199|Graveyard Shift|U|SNC
+#200|Incriminate|C|SNC
+#201|Devilish Valet|R|SNC
+#202|Attended Socialite|C|SNC
+#203|Rhox Pummeler|C|SNC
+#204|Social Climber|C|SNC
+#205|Scuttling Butler|U|SNC
+#206|Suspicious Bookcase|U|SNC
+#207|Quick-Draw Dagger|C|SNC
+#208|Gilded Pinions|C|SNC
+#209|Ready to Rumble|C|SNC
+#210|Wrecking Crew|C|SNC
 #211|Backstreet Bruiser|C|SNC
 #212|Angelic Observer|U|SNC
-#213|Dapper Shieldmate|C|SNC
-#214|Speakeasy Server|C|SNC
-#215|Case the Joint|C|SNC
-#216|Psionic Snoop|C|SNC
-#217|Security Bypass|C|SNC
-#218|Cut of the Profits|R|SNC
-#219|Graveyard Shift|U|SNC
-#220|Join the Maestros|C|SNC
-#221|Shadow of Mortality|R|SNC
-#222|Vampire Scrivener|U|SNC
-#223|Hoard Hauler|R|SNC
-#224|Rob the Archives|U|SNC
-#225|Structural Assault|R|SNC
-#226|Cabaretti Initiate|C|SNC
-#227|Social Climber|C|SNC
-#228|Take to the Streets|U|SNC
-#229|Incandescent Aria|R|SNC
-#230|Riveteers Ascendancy|R|SNC
-#231|Halo Scarab|C|SNC
-#232|Ominous Parcel|C|SNC
-#233|Extract the Truth|C|SNC
-#234|Cutthroat Contender|C|SNC
-#235|Paragon of Modernity|C|SNC
-#236|Revelation of Power|C|SNC
-#237|Broken Wings|C|SNC
-#238|Daring Escape|C|SNC
-#239|Demon's Due|C|SNC
-#240|Refuse to Yield|U|SNC
-#241|An Offer You Can't Refuse|U|SNC
-#242|Tavern Swindler|U|SNC
-#243|Chrome Cat|C|SNC
-#244|Patch Up|U|SNC
-#245|Raffine's Guidance|C|SNC
-#246|Errant, Street Artist|R|SNC
-#247|Public Enemy|U|SNC
-#248|Cemetery Tampering|R|SNC
-#249|Glittering Stockpile|U|SNC
-#250|Widespread Thieving|R|SNC
-#251|Evolving Door|R|SNC
-#252|Obscura Ascendancy|R|SNC
+#213|Speakeasy Server|C|SNC
+#214|Psionic Snoop|C|SNC
+#215|Security Bypass|C|SNC
+#216|Join the Maestros|C|SNC
+#217|Tavern Swindler|U|SNC
+#218|Hoard Hauler|R|SNC
+#219|Bootleggers' Stash|M|SNC
+#220|Take to the Streets|U|SNC
+#221|Chrome Cat|C|SNC
+#222|Halo Scarab|C|SNC
+#223|Ominous Parcel|C|SNC
+#224|Extract the Truth|C|SNC
+#225|Goldhound|C|SNC
+#226|Sticky Fingers|C|SNC
+#227|Cutthroat Contender|C|SNC
+#228|Capenna Express|C|SNC
+#229|Revelation of Power|C|SNC
+#230|Glittermonger|C|SNC
+#231|Broken Wings|C|SNC
+#232|Antagonize|C|SNC
+#233|Demon's Due|C|SNC
+#234|Patch Up|U|SNC
+#235|Refuse to Yield|U|SNC
+#236|An Offer You Can't Refuse|U|SNC
+#237|Cut of the Profits|R|SNC
+#238|Vampire Scrivener|U|SNC
+#239|Rob the Archives|U|SNC
+#240|Cabaretti Initiate|C|SNC
+#241|Obscura Ascendancy|R|SNC
+#242|Riveteers Ascendancy|R|SNC
+#243|Brass Knuckles|U|SNC
+#244|Paragon of Modernity|C|SNC
+#245|Daring Escape|C|SNC
+#246|Raffine's Guidance|C|SNC
+#247|Errant, Street Artist|R|SNC
+#248|Public Enemy|U|SNC
+#249|Illicit Shipment|U|SNC
+#250|Glittering Stockpile|U|SNC
+#251|Structural Assault|R|SNC
+#252|Evolving Door|R|SNC
 #253|Arc Spitter|U|SNC
-#254|Brass Knuckles|U|SNC
-#255|Cement Shoes|U|SNC
-#256|Luxior, Giada's Gift|M|SNC
-#257|Jackhammer|C|SNC
-#258|Cut Your Losses|R|SNC
-#259|Illicit Shipment|U|SNC
-#260|Most Wanted|C|SNC
-#261|Meeting of the Five|M|SNC
+#254|Cement Shoes|U|SNC
+#255|Luxior, Giada's Gift|M|SNC
+#256|Jackhammer|C|SNC
+#257|Cut Your Losses|R|SNC
+#258|Cemetery Tampering|R|SNC
+#259|Widespread Thieving|R|SNC
+#260|Meeting of the Five|M|SNC
+#261|Most Wanted|C|SNC
 #262|Plains 1|C|SNC
 #263|Plains 2|C|SNC
 #264|Island 1|C|SNC
diff --git a/forge-gui/res/editions/Alchemy New Capenna.txt b/forge-gui/res/editions/Alchemy New Capenna.txt
index e1af11f5928..6126887dbd9 100644
--- a/forge-gui/res/editions/Alchemy New Capenna.txt	
+++ b/forge-gui/res/editions/Alchemy New Capenna.txt	
@@ -29,7 +29,7 @@ ScryfallCode=YSNC
 21 R Cabaretti Revels @Gaboleps
 22 M Diviner of Fates @Randy Vargas
 23 M Effluence Devourer @Gaboleps
-24 R Obscure Polymorphist @Darren Tan
+24 R Obscura Polymorphist @Darren Tan
 25 R Racketeer Boss @Igor Grechanyi
 26 R Riveteers Provocateur @Nestor Ossandon Leal
 27 R Rope Line Attendant @Fariba Khamseh
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 520714dfe3f..83a299fc5fb 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	
@@ -302,7 +302,7 @@ ScryfallCode=CLB
 294 M Tasha, the Witch Queen @Martina Fackova
 295 U Thrakkus the Butcher @Nestor Ossandon Leal
 296 R Zevlor, Elturel Exile @David Rapoza
-297 U Arcane Encyclopedia @Victor Adame Minguez
+297 U Arcane Encyclopedia @Victor Harmatiuk
 298 U Arcane Signet @Sam White
 299 U Bag of Holding @Evyn Fong
 300 R Basilisk Collar @Craig J Spearing
@@ -367,6 +367,28 @@ ScryfallCode=CLB
 359 C Sea Gate @Kamila Szutenberg
 360 R Sea of Clouds @Matt Gaser
 361 R Spire Garden @Alexander Forssberg
+451 L Plains @Bruce Brenneise
+452 L Plains @Leanna Crossan
+453 L Plains @Titus Lunter
+454 L Plains @Emmanuel Shiu
+455 L Island @Bruce Brenneise
+456 L Island @Piotr Dura
+457 L Island @James Paick
+458 L Island @Sam White
+459 L Swamp @Piotr Dura
+460 L Swamp @Logan Feliciano
+461 L Swamp @Grady Frederick
+462 L Swamp @Sam White
+463 L Mountain @Matt Gaser
+464 L Mountain @Lucas Graciano
+465 L Mountain @Muhammad Firdaus
+466 L Mountain @Sam White
+467 L Forest @Bruce Brenneise
+468 L Forest @Muhammad Firdaus
+469 L Forest @Lucas Graciano
+470 L Forest @Julian Kok Joon Wen
+
+[borderless]
 362 M Elminster @Tyler Jacobson
 363 M Minsc & Boo, Timeless Heroes @Bram Sels
 364 M Tasha, the Witch Queen @Brom
@@ -380,11 +402,13 @@ ScryfallCode=CLB
 372 M Bramble Sovereign @Raluca Marinescu
 373 M Nautiloid Ship @Piotr Dura
 374 M Vexing Puzzlebox @Zezhou Chen
+
+[showcase]
 375 U Abdel Adrian, Gorion's Ward @Phil Stone
 376 M Ancient Gold Dragon @Erol Otus
-377 U Ellyn Harbreeze, Busybody
+377 U Ellyn Harbreeze, Busybody @Justine Mara Andersen
 378 R Lae'zel, Vlaakith's Champion @Justine Jones
-379 U Lulu, Loyal Hollyphant
+379 U Lulu, Loyal Hollyphant @Mark A. Nelson
 380 U Rasaad yn Bashir @Phil Stone
 381 U Alora, Merry Thief @Jeff Dee
 382 M Ancient Silver Dragon @Pedro Potier
@@ -456,26 +480,6 @@ ScryfallCode=CLB
 448 C Moss Diamond @Phil Stone
 449 C Sky Diamond @Phil Stone
 450 U Stonespeaker Crystal @Mark A. Nelson
-451 L Plains @Bruce Brenneise
-452 L Plains @Leanna Crossan
-453 L Plains @Titus Lunter
-454 L Plains @Emmanuel Shiu
-455 L Island @Bruce Brenneise
-456 L Island @Piotr Dura
-457 L Island @James Paick
-458 L Island @Sam White
-459 L Swamp @Piotr Dura
-460 L Swamp @Logan Feliciano
-461 L Swamp @Grady Frederick
-462 L Swamp @Sam White
-463 L Mountain @Matt Gaser
-464 L Mountain @Lucas Graciano
-465 L Mountain @Muhammad Firdaus
-466 L Mountain @Sam White
-467 L Forest @Bruce Brenneise
-468 L Forest @Muhammad Firdaus
-469 L Forest @Lucas Graciano
-470 L Forest @Julian Kok Joon Wen
 471 U Abdel Adrian, Gorion's Ward @Karl Kopinski
 472 U Ellyn Harbreeze, Busybody @Dan Scott
 473 U Far Traveler @Alix Branwyn
@@ -529,12 +533,12 @@ ScryfallCode=CLB
 521 U Skanos Dragonheart @Daarken
 522 U Wilson, Refined Grizzly @Ilse Gort
 523 R Alaundo the Seer @Aurore Folny
-524 R Astarion, the Decadent
+524 R Astarion, the Decadent @Ben Hill
 525 R Baba Lysaga, Night Witch @Slawomir Maniak
 526 R Bane, Lord of Darkness @Billy Christian
 527 R Bhaal, Lord of Murder @Peter Polach
 528 U Cadira, Caller of the Small @Alexandr Leskinen
-529 U Commander Liara Portyr
+529 U Commander Liara Portyr @David Rapoza
 530 R The Council of Four @Justine Cruz
 531 R Duke Ulder Ravengard @Eric Deschamps
 532 R Dynaheir, Invoker Adept @Caroline Gariba
@@ -558,6 +562,12 @@ ScryfallCode=CLB
 550 U Rilsa Rael, Kingpin @Micah Epstein
 551 U Thrakkus the Butcher @Nestor Ossandon Leal
 552 R Zevlor, Elturel Exile @David Rapoza
+931 M Captain N'ghathrod @Andrey Kuzinskiy
+932 M Faldorn, Dread Wolf Herald @Jason A. Engle
+933 M Firkraag, Cunning Instigator @Andrew Mar
+934 M Nalia de'Arnise @John Stanko
+
+[extended art]
 553 R Archivist of Oghma @Stella Spente
 554 R Ascend from Avernus @Bruce Brenneise
 555 R Horn of Valhalla @John Severin Brassell
@@ -651,6 +661,8 @@ ScryfallCode=CLB
 643 M Nalia de'Arnise @John Stanko
 644 R Multiclass Baldric @Franz Vohwinkel
 645 R Sarevok's Tome @Titus Lunter
+
+[precon product]
 646 M Captain N'ghathrod @Andrey Kuzinskiy
 647 M Faldorn, Dread Wolf Herald @Jason A. Engle
 648 M Firkraag, Cunning Instigator @Andrew Mar
@@ -826,11 +838,11 @@ ScryfallCode=CLB
 818 M Battle Mammoth @Jesper Ejsing
 819 U Beanstalk Giant @Jason A. Engle
 820 U Beast Within @Jesper Ejsing
-821 C Cultivate @Anthony Palumbo
+821 U Cultivate @Anthony Palumbo
 822 R End-Raze Forerunners @Mathias Kollros
 823 C Explore @John Avon
 824 R Ezuri's Predation @Svetlin Velinov
-825 M Hornet Queen @Jonathan Kuo
+825 R Hornet Queen @Jonathan Kuo
 826 C Kodama's Reach @Sam Burley
 827 R Lovestruck Beast @Kev Walker
 828 R Managorger Hydra @Lucas Graciano
@@ -872,7 +884,7 @@ ScryfallCode=CLB
 864 U Lightning Greaves @Jeremy Jarvis
 865 R Maskwood Nexus @Jason A. Engle
 866 U Mindcrank @Chris Rahn
-867 U Orzhov Signet @Martina Pilcerova
+867 C Orzhov Signet @Martina Pilcerova
 868 R Phyrexian Revoker @Kev Walker
 869 R Psychosis Crawler @Stephan Martiniere
 870 U Skullclamp @Daniel Ljunggren
@@ -936,11 +948,11 @@ ScryfallCode=CLB
 928 R Wandering Fumarole @Florian de Gesincourt
 929 R War Room @Milivoj Ćeran
 930 R Windbrisk Heights @Omar Rayyan
-931 M Captain N'ghathrod @Andrey Kuzinskiy
-932 M Faldorn, Dread Wolf Herald @Jason A. Engle
-933 M Firkraag, Cunning Instigator @Andrew Mar
-934 M Nalia de'Arnise @John Stanko
+
+[promo]
 935 R Wand of Wonder @Lindsey Look
+
+[buy a box]
 936 R Elder Brain @Nino Is
 
 [dungeons]

From 4e67964d17977d0d8847fae9bfce2519130449f1 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 20 Jun 2022 09:58:27 +0100
Subject: [PATCH 010/309] update_2x2

---
 .../res/editions/Double Masters 2022.txt      | 209 +++++++++++++++++-
 1 file changed, 208 insertions(+), 1 deletion(-)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 5ea9500268f..633e5419cd8 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -7,18 +7,225 @@ ScryfallCode=2X2
 
 [cards]
 2 M Kozilek, Butcher of Truth @Michael Komarck
+3 M Ulamog, the Infinite Gyre @Aleksi Briclot
+5 C Ainok Bond-Kin @Chris Rahn
+8 M Divine Visitation @Victor Adame Minguez
+9 C Doomed Traveler @Lars Grant-West
+12 C Gods Willing @Mark Winters
+20 C Momentary Blink @Evan Shipard
+22 U Myth Realized @Jason Rainville
+23 U Path to Exile @Raf Sarmento
+28 C Seeker of the Way @Craig J Spearing
+30 C Settle Beyond Reality @Anthony Palumbo
+32 R Teferi's Protection @Chase Stone
 34 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
+35 C Wingsteed Rider @Cynthia Sheppard
+36 C Advanced Stitchwing @Johann Bodin
+37 C Aethersnipe @Zoltan Boros & Gabor Szikszai
+43 M Consecrated Sphinx @Mark Zug
+44 C Deep Analysis @Jesper Ejsing
+47 U Domestication @Jesper Ejsing
+51 R Gifts Ungiven @Chris Rallis
+52 C Ingenious Skaab @Jesper Ejsing
+55 R Kederekt Leviathan @Mark Hyzer
+60 U Mulldrifter @Eric Fortune
+65 C Thought Scour @Julie Dillon
+66 R Venser, Shaper Savant @Aleksi Briclot
+67 U Wash Out @Steven Belledin
+68 C Balustrade Spy @Jaime Jones
+69 M Bitterblossom @Rebecca Guay
+73 R Damnation @Kev Walker
+75 C Eyeblight's Ending @Ron Spears
+76 U Go for the Throat @David Rapoza
+79 M Imperial Seal @Milivoj Ćeran
+80 U Inquisition of Kozilek @Tomasz Jedruszek
 81 M Liliana, the Last Hope @Jaime Jones
+85 R Oona's Prowler @Wayne Reynolds
+87 C Seekers' Squire @Anthony Palumbo
+96 C Unearth @Jehan Choo
+97 C Vampire Sovereign @Volkan Baǵa
+102 R Anger of the Gods @Yigit Koroglu
+103 R Backdraft Hellkite @Rudy Siswanto
+106 C Dark-Dweller Oracle @Deruchenko Alexander
+107 M Dockside Extortionist @Lie Setiawan
+108 U Dreamshaper Shaman @Steve Prescott
+112 C Hero of the Games @Josh Hass
+117 U Lightning Bolt @Christopher Moeller
+120 C Pirate's Pillage @Wayne Reynolds
+122 C Rift Bolt @Daniel Ljunggren
+123 M Seasoned Pyromancer @Cynthia Sheppard
+126 C Storm Fleet Pyromancer @Kieran Yanner
+132 M Allosaurus Shepherd @Randy Vargas
+134 C Annoyed Altisaur @Lars Grant-West
+138 R Bloom Tender @Chippy
+139 C Brindle Shoat @Steven Belledin
+140 U Centaur Battlemaster @Kev Walker
+144 C Elvish Rejuvenator @Winona Nelson
+146 C Experiment One @Jack Wang
+148 C Gnarlback Rhino @YW Tang
+151 R Hardened Scales @Mark Winters
+155 C Rampant Growth @Scott M. Fischer
+158 U Spider Spawning @Daniel Ljunggren
+159 R Splinterfright @Eric Deschamps
+161 C Thrive @Daren Bader
+163 C Tuskguard Captain @Aaron Miller
+164 C Webweaver Changeling @Nicholas Gregory
+165 R Abzan Ascendancy @Mark Winters
+169 M Aminatou, the Fateshifter @Seb McKinnon
+170 R Anguished Unmaking @Wesley Burt
+174 R Ashenmoor Liege @Mark Zug
+177 R Atla Palani, Nest Tender @Ekaterina Burmak
+185 C Bloodwater Entity @Viktor Titov
+186 R Boartusk Liege @Jesper Ejsing
+187 U Bounty of the Luxa @Jonas De Ro
 188 R Bring to Light @Jonas De Ro
+191 C Cartel Aristocrat @James Ryman
+193 C Chronicler of Heroes @John Stanko
+198 R Dack's Duplicate @Karl Kopinski
+202 M Dragonlord Dromoka @Eric Deschamps
+204 C Dreg Mangler @Svetlin Velinov
+206 R Dromoka's Command @James Ryman
+211 M Ezuri, Claw of Progress @James Ryman
+212 R Fiery Justice @Mathias Kollros
+214 C Fireblade Artist @Steve Argyle
+216 M Ghave, Guru of Spores @James Paick
+217 R Glen Elendra Liege @Kev Walker
+218 R Glimpse the Unthinkable @Brandon Kitkouski
+219 U Gloryscale Viashino @Volkan Baǵa
+221 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
+227 R Hostage Taker @Wayne Reynolds
+236 R Kaervek the Merciless @rk post
+240 R Lavalanche @Steve Argyle
+244 M Lord of Extinction @Izzy
+247 R Magister Sphinx @Steven Belledin
+250 R Master Biomancer @Willian Murai
+254 R The Mimeoplasm @Svetlin Velinov
+257 M Mizzix of the Izmagnus @Cliff Childs
+258 M Muldrotha, the Gravetide @Jason Rainville
+259 R Murkfiend Liege @Carl Critchlow
+260 M Nicol Bolas, God-Pharaoh @Raymond Swanland
+262 R Phyrexian Tyranny @Kev Walker
+278 U Sprouting Thrinax @Jarreau Wimberly
+280 R Supreme Verdict @Sam Burley
+282 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
+285 R Thistledown Liege @Adam Rex
 296 M Wrenn and Six @Chase Stone
+297 R Zur the Enchanter @Josu Hernaiz
+305 U Dragon Arch @Dana Knutson
+308 M Mana Vault @Christine Choi
+311 R Phyrexian Altar @Yigit Koroglu
+312 R Pithing Needle @Anthony Palumbo
+314 R Sensei's Divining Top @Michael Sutfin
+315 R Thrumming Stone @Rob Alexander
+317 R Vedalken Orrery @John Avon
+318 U Azorius Chancery @John Avon
+319 U Boros Garrison @John Avon
+320 M Cavern of Souls @Richard Wright
+322 U Dimir Aqueduct @John Avon
+324 U Golgari Rot Farm @John Avon
+325 U Gruul Turf @John Avon
+326 U Izzet Boilerworks @John Avon
+327 U Orzhov Basilica @John Avon
+329 U Rakdos Carnarium @John Avon
+330 U Selesnya Sanctuary @John Avon
+331 U Simic Growth Chamber @John Avon
+332 C Cryptic Spires @Sam Burley
 333 M Liliana, the Last Hope @Scott M. Fischer
 334 M Wrenn and Six @Donato Giancola
 336 M Kozilek, Butcher of Truth @Ian Miller
+337 M Ulamog, the Infinite Gyre @Thomas M. Baxa
+341 C Seeker of the Way @Douglas Shuler
+343 R Teferi's Protection @Greg Staples
+349 U Mulldrifter @Jeff Miracola
+351 C Thought Scour @Jeff Miracola
+353 R Damnation
+354 M Imperial Seal @Mark Tedin
+355 U Inquisition of Kozilek @rk post
+357 C Unearth
+358 R Anger of the Gods @Dermot Power
+359 R Chaos Warp @Phil Foglio
+360 M Dockside Extortionist @Douglas Shuler
+361 U Lightning Bolt @Chuck Lukacs
+363 M Seasoned Pyromancer
+365 M Allosaurus Shepherd @Douglas Shuler
+366 R Bloom Tender @Scott M. Fischer
+369 R Hardened Scales @Jim Nelson
+371 C Rampant Growth @Jeff Miracola
+376 M Dragonlord Dromoka @Richard Kane Ferguson
+378 R Glimpse the Unthinkable @Drew Tucker
+379 R Grand Arbiter Augustin IV @Greg Hildebrandt
+383 R The Mimeoplasm @Mark Tedin
+384 M Muldrotha, the Gravetide @Eric Velhagen
+388 R Supreme Verdict @Ron Spears
+393 M Crucible of Worlds @Mark Zug
+394 M Mana Vault @Steve Prescott
+396 R Phyrexian Altar @Pete Venters
+398 R Sensei's Divining Top @Greg Staples
+399 R Vedalken Orrery @Scott M. Fischer
+400 U Azorius Chancery @Carl Critchlow
+401 U Boros Garrison @Darrell Riche
+402 M Cavern of Souls @Drew Tucker
+404 U Dimir Aqueduct @Mark Poole
+406 U Golgari Rot Farm @Donato Giancola
+407 U Gruul Turf @Ron Spencer
+408 U Izzet Boilerworks @Keith Garletts
+409 U Orzhov Basilica
+410 U Rakdos Carnarium @Thomas M. Baxa
+411 U Selesnya Sanctuary @Ron Spears
+412 U Simic Growth Chamber
 414 M Kozilek, Butcher of Truth @Michael Komarck
+415 M Ulamog, the Infinite Gyre @Aleksi Briclot
+416 M Divine Visitation @Victor Adame Minguez
+424 R Teferi's Protection @Chase Stone
 425 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
+427 M Consecrated Sphinx @Mark Zug
+430 R Gifts Ungiven @Chris Rallis
+431 R Kederekt Leviathan @Mark Hyzer
+435 R Venser, Shaper Savant @Aleksi Briclot
+439 M Imperial Seal @Milivoj Ćeran
 440 M Liliana, the Last Hope @Jaime Jones
+448 R Anger of the Gods @Yigit Koroglu
+449 R Backdraft Hellkite @Rudy Siswanto
+452 M Dockside Extortionist @Lie Setiawan
+454 M Seasoned Pyromancer @Cynthia Sheppard
+457 M Allosaurus Shepherd @Randy Vargas
+458 R Bloom Tender @Chippy
+461 R Green Sun's Zenith @David Rapoza
+462 R Hardened Scales @Mark Winters
+468 M Aminatou, the Fateshifter @Seb McKinnon
+475 R Atarka's Command @Chris Rahn
+476 R Atla Palani, Nest Tender @Ekaterina Burmak
 480 R Bring to Light @Jonas De Ro
+483 R Dack's Duplicate @Karl Kopinski
+487 M Dragonlord Dromoka @Eric Deschamps
+490 R Dromoka's Command @James Ryman
+494 M Ezuri, Claw of Progress @James Ryman
+495 R Fiery Justice @Mathias Kollros
+498 M Ghave, Guru of Spores @James Paick
+499 R Glen Elendra Liege @Kev Walker
+500 R Glimpse the Unthinkable @Brandon Kitkouski
+501 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
+505 R Hostage Taker @Wayne Reynolds
+512 R Kaervek the Merciless @rk post
+516 R Lavalanche @Steve Argyle
+519 R Magister Sphinx @Steven Belledin
+521 R Master Biomancer @Willian Murai
+525 R The Mimeoplasm @Svetlin Velinov
+528 M Muldrotha, the Gravetide @Jason Rainville
+529 R Murkfiend Liege @Carl Critchlow
+531 R Phyrexian Tyranny @Kev Walker
+541 R Supreme Verdict @Sam Burley
+543 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
+544 R Thistledown Liege @Adam Rex
 553 M Wrenn and Six @Chase Stone
-577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
+554 R Zur the Enchanter @Josu Hernaiz
+560 M Mana Vault @Christine Choi
+563 R Phyrexian Altar @Yigit Koroglu
+566 R Sensei's Divining Top @Michael Sutfin
+568 R Vedalken Orrery @John Avon
+569 M Cavern of Souls @Richard Wright
+573 M Liliana, the Last Hope @Scott M. Fischer
+574 M Wrenn and Six @Donato Giancola
+576 M Kozilek, Butcher of Truth @Ian Miller
 578 R Weathered Wayfarer @Dermot Power
 579 R Bring to Light @Mark Poole

From 75a8bcb693d1a39a9b0e595b9b42988f6da2b30c Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 20 Jun 2022 09:59:58 +0100
Subject: [PATCH 011/309] oops

---
 forge-gui/res/editions/Double Masters 2022.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 633e5419cd8..cb172d8895a 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -227,5 +227,6 @@ ScryfallCode=2X2
 573 M Liliana, the Last Hope @Scott M. Fischer
 574 M Wrenn and Six @Donato Giancola
 576 M Kozilek, Butcher of Truth @Ian Miller
+577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
 578 R Weathered Wayfarer @Dermot Power
 579 R Bring to Light @Mark Poole

From 14904be5e451ec7e0024851db6b93dc0c42113ff Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 20 Jun 2022 18:31:27 +0800
Subject: [PATCH 012/309] fix duplicate deck storage

---
 .../src/forge/deck/FDeckChooser.java          | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 8bf42d727c2..90a7b41ba43 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -439,9 +439,28 @@ public class FDeckChooser extends FScreen {
                 public void run(Boolean result) {
                     if (result) {
                         Deck copiedDeck = (Deck)deck.getDeck().copyTo(deck.getName());
-                        decks.add(copiedDeck);
+                        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;
+                        }
+                        storage.add(copiedDeck);
                         setSelectedDeckType(fallbackType);
-                        editDeck(new DeckProxy(copiedDeck, "Constructed", lstDecks.getGameType(), decks));
+                        editDeck(new DeckProxy(copiedDeck, "Constructed", lstDecks.getGameType(), storage));
                     }
                 }
             });

From f899abd928c6437f5964de5a8b690612cb49baf7 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Mon, 20 Jun 2022 11:41:52 +0100
Subject: [PATCH 013/309] CLB 19/06 (#721)

* Create armor of shadows, arms of hadar, atrocious experiment
---
 forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt   | 5 +++++
 forge-gui/res/cardsfolder/upcoming/arms_of_hadar.txt      | 5 +++++
 .../res/cardsfolder/upcoming/atrocious_experiment.txt     | 8 ++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/arms_of_hadar.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/atrocious_experiment.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt b/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
new file mode 100644
index 00000000000..644f42fb065
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
@@ -0,0 +1,5 @@
+Name:Armor of Shadows
+ManaCost:B
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | AILogic$ Pump | NumAtt$ +1 | KW$ Indestructible | SpellDescription$ Until end of turn, target creature gets +1/+0 and gains indestructible. 
+Oracle:Until end of turn, target creature gets +1/+0 and gains indestructible. (Damage and effects that say "destroy" don’t destroy it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/arms_of_hadar.txt b/forge-gui/res/cardsfolder/upcoming/arms_of_hadar.txt
new file mode 100644
index 00000000000..b869dd57d9e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/arms_of_hadar.txt
@@ -0,0 +1,5 @@
+Name:Arms of Hadar
+ManaCost:3 B
+Types:Sorcery
+A:SP$ PumpAll | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -2 | SpellDescription$ Creatures target player controls get -2/-2 until end of turn.
+Oracle:Creatures target player controls get -2/-2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/atrocious_experiment.txt b/forge-gui/res/cardsfolder/upcoming/atrocious_experiment.txt
new file mode 100644
index 00000000000..4d8526378c4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/atrocious_experiment.txt
@@ -0,0 +1,8 @@
+Name:Atrocious Experiment
+ManaCost:2 B
+Types:Sorcery
+A:SP$ Mill | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ DBDraw | SpellDescription$ Target player mills two cards, draws two cards, and loses 2 life.
+SVar:DBDraw:DB$ Draw | Defined$ Targeted | NumCards$ 2 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 2
+DeckHas:Ability$Mill
+Oracle:Target player mills two cards, draws two cards, and loses 2 life. (To mill a card, a player puts the top card of their library into their graveyard.)

From 9d19d91dadba1538b97f84b52788601b80154487 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Mon, 20 Jun 2022 06:45:25 -0500
Subject: [PATCH 014/309] 5cards

---
 .../upcoming/ambitious_dragonborn.txt           |  8 ++++++++
 .../upcoming/baeloth_barrityl_entertainer.txt   | 14 ++++++++++++++
 .../blessed_hippogriff_tyrs_blesing.txt         | 17 +++++++++++++++++
 .../res/cardsfolder/upcoming/blood_money.txt    |  9 +++++++++
 .../cardsfolder/upcoming/bothersome_quasit.txt  | 11 +++++++++++
 5 files changed, 59 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/blood_money.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bothersome_quasit.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt b/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
new file mode 100644
index 00000000000..e4c697d21f9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
@@ -0,0 +1,8 @@
+Name:Ambitious Dragonborn
+ManaCost:3 G
+Types:Creature Dragon Barbarian
+PT:0/0
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield 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
+Oracle:Ambitious Dragonborn enters the battlefield with X +1/+1 counters on it, where X is the greatest power among creatures you control and creature cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
new file mode 100644
index 00000000000..30d52782f60
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
@@ -0,0 +1,14 @@
+Name:Baeloth Barrityl, Entertainer
+ManaCost:4 R
+Types:Creature Elf Shaman
+PT:2/5
+K:Choose a Background
+S:Mode$ Continuous | Affected$ Creature.powerLTY+OppCtrl | Remember$ True | Description$ Creatures your opponents control with power less than CARDNAME power are goaded. (They attacks each combat if able and attack a player other than you if able.)
+SVar:DBGoad:DB$ Goad | Defined$ Creature.IsRemembered | SubAbility$ TrigChangesZone
+SVar:Y:Count$CardPower
+SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.attacking+IsGoaded,Creature.blocking+IsGoaded | Execute$ TrigToken | TriggerZones$ Battlefield | SubAbility$ TrigToken | TriggerDescription$ Whenever a goaded attacking or blocking creature dies, you create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Token 
+Oracle:Creatures your opponents control with power less than Baeloth Barrityl's power are goaded. (They attacks each combat if able and attack a player other than you if able.)\nWhenever a goaded attacking or blocking creature dies, you create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\nChoose a Background (You can have a Background as a second commander.)
diff --git a/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt b/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
new file mode 100644
index 00000000000..9a6e6754583
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
@@ -0,0 +1,17 @@
+Name:Blessed Hippogriff
+ManaCost:3 W
+Types:Creature Hippogriff
+PT:2/3
+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
+Oracle:Flying\nWhenever Blessed Hippogriff attacks, target attacking creature without flying gains flying until end of turn. 
+
+ALTERNATE
+
+Name:Tyr's Blesing
+ManaCost:W
+Types:Instant Adventure
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target to make indestructable | KW$ Indestructible | SpellDescription$ Target creature gains indestructible until end of turn.
+Oracle:Target creature gains indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/blood_money.txt b/forge-gui/res/cardsfolder/upcoming/blood_money.txt
new file mode 100644
index 00000000000..0e53ff61ad9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blood_money.txt
@@ -0,0 +1,9 @@
+Name:Blood Money
+ManaCost:5 B B
+Types:Sorcery
+A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBTreasure | SpellDescription$ Destroy all creatures.
+SVar:DBTreasure:DB$ Token | TokenAmount$ X | TokenTapped$ True | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SubAbility$ DBCleanupSpellDescription$ For each nontoken creature destroyed this way, create a tapped Treasure token.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Remembered$Valid Card.nonToken
+DeckHas:Ability$Token
+Oracle:Destroy all creatures. For each nontoken creature destroyed this way, create a tapped Treasure token.
diff --git a/forge-gui/res/cardsfolder/upcoming/bothersome_quasit.txt b/forge-gui/res/cardsfolder/upcoming/bothersome_quasit.txt
new file mode 100644
index 00000000000..eb9804e0ba6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bothersome_quasit.txt
@@ -0,0 +1,11 @@
+Name:Bothersome Quasit
+ManaCost:2 R
+Types:Creature Demon
+PT:3/2
+K:Menace
+S:Mode$ Continuous | Affected$ Creature.IsGoaded+OppCtrl | AddHiddenKeyword$ CARDNAME can't block. | Description$ Goaded creatures your opponents control can't block.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBGoad | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, goad target creature an opponent controls.
+SVar:DBGoad:DB$ Goad | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls
+SVar:BuffedBy:Card.nonCreature
+SVar:HasAttackEffect:TRUE
+Oracle:Menace\nGoaded creatures your opponents control can't block.\nWhenever you cast a noncreature spell, goad target creature an opponent controls. (Until your next turn, that creature attacks each combat if able and attacks a player other than you if able.)

From c48de6afe1b10046f305be1a973456f311f38a20 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 21 Jun 2022 02:35:53 +0800
Subject: [PATCH 015/309] [Mobile] Update LobbyScreen variants - apply last
 used variants on LobbyScreen on startup

---
 .../src/main/java/forge/util/Localizer.java   | 45 ++++++++++++++++
 .../src/main/java/forge/game/GameRules.java   |  3 +-
 .../src/main/java/forge/game/GameType.java    |  6 ++-
 .../screens/constructed/LobbyScreen.java      | 26 ++++++++++
 .../properties/ForgePreferences.java          |  1 +
 .../properties/PreferencesStore.java          | 51 +++++++++++++++++++
 6 files changed, 130 insertions(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/util/Localizer.java b/forge-core/src/main/java/forge/util/Localizer.java
index 36acde1432a..936dcf6108f 100644
--- a/forge-core/src/main/java/forge/util/Localizer.java
+++ b/forge-core/src/main/java/forge/util/Localizer.java
@@ -76,6 +76,51 @@ public class Localizer {
             return defaultValue;
         }
     }
+    public String getEnglishMessage(final String key, final Object... messageArguments) {
+        MessageFormat formatter = null;
+
+        try {
+            //formatter = new MessageFormat(resourceBundle.getString(key.toLowerCase()), locale);
+            formatter = new MessageFormat(englishBundle.getString(key), Locale.ENGLISH);
+        } catch (final IllegalArgumentException | MissingResourceException e) {
+            if (!silent)
+                e.printStackTrace();
+        }
+
+        if (formatter == null && !silent) {
+            System.err.println("INVALID PROPERTY: '" + key + "' -- Translation Needed?");
+            return "INVALID PROPERTY: '" + key + "' -- Translation Needed?";
+        }
+
+        silent = false;
+
+        formatter.setLocale(Locale.ENGLISH);
+
+        String formattedMessage = "CHAR ENCODING ERROR";
+        final String[] charsets = { "ISO-8859-1", "UTF-8" };
+        //Support non-English-standard characters
+        String detectedCharset = charset(englishBundle.getString(key), charsets);
+
+        final int argLength = messageArguments.length;
+        Object[] syncEncodingMessageArguments = new Object[argLength];
+        //when messageArguments encoding not equal resourceBundle.getString(key),convert to equal
+        //avoid convert to a have two encoding content formattedMessage string.
+        for (int i = 0; i < argLength; i++) {
+            String objCharset = charset(messageArguments[i].toString(), charsets);
+            try {
+                syncEncodingMessageArguments[i] = convert(messageArguments[i].toString(), objCharset, detectedCharset);
+            } catch (UnsupportedEncodingException ignored) {
+                System.err.println("Cannot Convert '" + messageArguments[i].toString() + "' from '" + objCharset + "' To '" + detectedCharset + "'");
+                return "encoding '" + key + "' translate string failure";
+            }
+        }
+
+        try {
+            formattedMessage = new String(formatter.format(syncEncodingMessageArguments).getBytes(detectedCharset), StandardCharsets.UTF_8);
+        } catch(UnsupportedEncodingException ignored) {}
+
+        return formattedMessage;
+    }
     //FIXME: localizer should return default value from english locale or it will crash some GUI element like the NewGameMenu->NewGameScreen Popup when returned null...
     public String getMessage(final String key, final Object... messageArguments) {
         MessageFormat formatter = null;
diff --git a/forge-game/src/main/java/forge/game/GameRules.java b/forge-game/src/main/java/forge/game/GameRules.java
index 2ef99fd90ba..16ff8ab2697 100644
--- a/forge-game/src/main/java/forge/game/GameRules.java
+++ b/forge-game/src/main/java/forge/game/GameRules.java
@@ -81,7 +81,8 @@ public class GameRules {
     }
 
     public void setAppliedVariants(final Set<GameType> appliedVariants) {
-        this.appliedVariants.addAll(appliedVariants);
+        if (appliedVariants != null && !appliedVariants.isEmpty())
+            this.appliedVariants.addAll(appliedVariants);
     }
 
     public boolean hasAppliedVariant(final GameType variant) {
diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java
index b1b0c5cf512..4cf55770c9c 100644
--- a/forge-game/src/main/java/forge/game/GameType.java
+++ b/forge-game/src/main/java/forge/game/GameType.java
@@ -76,7 +76,7 @@ public enum GameType {
 
     private final DeckFormat deckFormat;
     private final boolean isCardPoolLimited, canSideboard, addWonCardsMidGame;
-    private final String name, description;
+    private final String name, englishName, description;
     private final Function<RegisteredPlayer, Deck> deckAutoGenerator;
 
     GameType(DeckFormat deckFormat0, boolean isCardPoolLimited0, boolean canSideboard0, boolean addWonCardsMidgame0, String name0, String description0) {
@@ -90,6 +90,7 @@ public enum GameType {
         canSideboard = canSideboard0;
         addWonCardsMidGame = addWonCardsMidgame0;
         name = localizer.getMessage(name0);
+        englishName = localizer.getEnglishMessage(name0);
         if (description0.length()>0) {
             description0 = localizer.getMessage(description0);
         }
@@ -148,6 +149,9 @@ public enum GameType {
     public String toString() {
         return name;
     }
+    public String getEnglishName() {
+        return englishName;
+    }
 
     public String getDescription() {
         return description;
diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index 020a21c3fa1..068e0401352 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -2,7 +2,9 @@ package forge.screens.constructed;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import forge.player.GamePlayerUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -165,6 +167,9 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                 if (cbVariants.getSelectedIndex() <= 0) {
                     lobby.clearVariants();
                     updateLayoutForVariants();
+                    Set<GameType> gameTypes = new HashSet<>();
+                    FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                    FModel.getPreferences().save();
                 }
                 else if (cbVariants.getSelectedIndex() == cbVariants.getItemCount() - 1) {
                     Forge.openScreen(new MultiVariantSelect());
@@ -174,6 +179,12 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                     lobby.clearVariants();
                     lobby.applyVariant((GameType)cbVariants.getSelectedItem());
                     updateLayoutForVariants();
+                    Set<GameType> gameTypes = new HashSet<>();
+                    for (GameType variant: lobby.getAppliedVariants()) {
+                        gameTypes.add(variant);
+                    }
+                    FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                    FModel.getPreferences().save();
                 }
             }
         });
@@ -206,6 +217,15 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                     @Override
                     public void run() {
                         btnStart.setEnabled(lobby.hasControl());
+
+                        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPILIED_VARIANTS);
+                        if (!gameTypes.isEmpty()) {
+                            for (GameType gameType : gameTypes) {
+                                lobby.applyVariant(gameType);
+                            }
+                            updateVariantSelection();
+                            updateLayoutForVariants();
+                        }
                     }
                 });
             }
@@ -493,6 +513,12 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                 }
                 updateVariantSelection();
                 updateLayoutForVariants();
+                Set<GameType> gameTypes = new HashSet<>();
+                for (GameType variant: lobby.getAppliedVariants()) {
+                    gameTypes.add(variant);
+                }
+                FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                FModel.getPreferences().save();
             }
         }
 
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
index ed0384db980..ac2b60202b2 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
@@ -69,6 +69,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
         BRAWL_P8_DECK_STATE(""),
         UI_LANDSCAPE_MODE ("false"),
         UI_MATCHES_PER_GAME("3"),
+        UI_APPILIED_VARIANTS(""),
         UI_COMPACT_MAIN_MENU ("false"),
         UI_USE_OLD ("false"),
         UI_RANDOM_FOIL ("false"),
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java b/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java
index c86b94da9af..8fc414e91d6 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/PreferencesStore.java
@@ -21,10 +21,14 @@ import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.EnumMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import forge.game.GameType;
 import forge.util.FileUtil;
+import forge.util.TextUtil;
 
 /**
  * Holds default preference values in an enum.
@@ -123,4 +127,51 @@ public abstract class PreferencesStore<T extends Enum<T>> {
     public final double getPrefDouble(final T fp0) {
         return Double.parseDouble(getPref(fp0));        
     }
+    public void setGameType(final T q0, final Set<GameType> gameTypes) {
+        String s0 = "";
+        Set<String> e = new HashSet<>();
+        for (GameType g : gameTypes)
+            e.add(g.getEnglishName());
+        if (!e.isEmpty())
+            s0 += String.join(",", e);
+        setPref(q0, s0);
+    }
+    public final Set<GameType> getGameType(final T fp0) {
+        Set<GameType> gameTypes = new HashSet<>();
+        String value;
+        value = preferenceValues.get(fp0);
+        if (value != null) {
+            if (value.contains(",")) {
+                String[] values = TextUtil.split(value, ',');
+                for (String gameType : values) {
+                    addGameType(gameTypes, gameType);
+                }
+            } else {
+                addGameType(gameTypes, value);
+            }
+        }
+        return gameTypes;
+    }
+    void addGameType(Set<GameType> result, String gameType) {
+        if (gameType.equals("Vanguard"))
+            result.add(GameType.Vanguard);
+        else if (gameType.equals("Momir Basic"))
+            result.add(GameType.MomirBasic);
+        else if (gameType.equals("MoJhoSto"))
+            result.add(GameType.MoJhoSto);
+        else if (gameType.equals("Commander"))
+            result.add(GameType.Commander);
+        else if (gameType.equals("Oathbreaker"))
+            result.add(GameType.Oathbreaker);
+        else if (gameType.equals("Tiny Leaders"))
+            result.add(GameType.TinyLeaders);
+        else if (gameType.equals("Brawl"))
+            result.add(GameType.Brawl);
+        else if (gameType.equals("Planechase"))
+            result.add(GameType.Planechase);
+        else if (gameType.equals("Archenemy"))
+            result.add(GameType.Archenemy);
+        else if (gameType.equals("Archenemy Rumble"))
+            result.add(GameType.ArchenemyRumble);
+    }
 }

From 7dfeb79618ca0e3207722dd77bb8bcc7061e58bf Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Wed, 27 Apr 2022 10:42:37 +0100
Subject: [PATCH 016/309] WIP: "Historic" formats re-work - Part 2: Re-name to
 Archive

---
 .../src/main/java/forge/game/GameFormat.java  | 30 +++++++++----------
 .../java/forge/itemmanager/CardManager.java   |  2 +-
 .../java/forge/itemmanager/DeckManager.java   |  2 +-
 .../home/quest/DialogChooseFormats.java       |  8 ++---
 .../home/settings/CSubmenuPreferences.java    |  2 +-
 .../home/settings/VSubmenuPreferences.java    | 10 +++----
 ...atSelect.java => ArchiveFormatSelect.java} | 12 ++++----
 .../itemmanager/filters/FormatFilter.java     |  8 ++---
 .../forge/screens/quest/NewQuestScreen.java   | 22 +++++++-------
 .../forge/screens/settings/SettingsPage.java  |  6 ++--
 .../formats/{Historic => Archive}/.gitkeep    |  0
 .../DCI => Archive}/Alchemy/2021-12-09.txt    |  2 +-
 .../DCI => Archive}/Alchemy/2022-02-10.txt    |  2 +-
 .../DCI => Archive}/Alchemy/2022-03-17.txt    |  2 +-
 .../DCI => Archive}/Alchemy/2022-04-28.txt    |  2 +-
 .../DCI => Archive}/Alchemy/2022-06-02.txt    |  0
 .../Arena Standard/2017-09-07.txt             |  2 +-
 .../Arena Standard/2018-01-18.txt             |  2 +-
 .../Arena Standard/2018-03-22.txt             |  2 +-
 .../Arena Standard/2018-04-26.txt             |  2 +-
 .../Arena Standard/2018-06-07.txt             |  2 +-
 .../Arena Standard/2018-07-12.txt             |  2 +-
 .../Arena Standard/2018-09-27.txt             |  2 +-
 .../Arena Standard/2018-11-15.txt             |  2 +-
 .../Arena Standard/2019-01-17.txt             |  2 +-
 .../Arena Standard/2019-02-14.txt             |  2 +-
 .../Arena Standard/2019-04-25.txt             |  2 +-
 .../Arena Standard/2019-07-02.txt             |  2 +-
 .../Arena Standard/2019-09-26.txt             |  2 +-
 .../Arena Standard/2019-10-24.txt             |  2 +-
 .../Arena Standard/2019-11-18.txt             |  2 +-
 .../Arena Standard/2020-01-16.txt             |  2 +-
 .../Arena Standard/2020-04-16.txt             |  2 +-
 .../Arena Standard/2020-06-04.txt             |  2 +-
 .../Arena Standard/2020-06-25.txt             |  2 +-
 .../Arena Standard/2020-08-03.txt             |  2 +-
 .../Arena Standard/2020-08-12.txt             |  2 +-
 .../Arena Standard/2020-09-17.txt             |  2 +-
 .../Arena Standard/2020-09-28.txt             |  2 +-
 .../Arena Standard/2020-10-12.txt             |  2 +-
 .../Arena Standard/2021-01-28.txt             |  2 +-
 .../Arena Standard/2021-04-15.txt             |  2 +-
 .../Arena Standard/2021-07-08.txt             |  2 +-
 .../Arena Standard/2021-09-16.txt             |  2 +-
 .../Arena Standard/2021-11-17.txt             |  2 +-
 .../Arena Standard/2022-01-27.txt             |  2 +-
 .../Arena Standard/2022-02-10.txt             |  2 +-
 .../Arena Standard/2022-03-17.txt             |  2 +-
 .../Arena Standard/2022-04-28.txt             |  2 +-
 .../Block/Amonkhet/2017-04-28.txt             |  2 +-
 .../Block/Amonkhet/2017-07-14.txt             |  2 +-
 .../Block/Battle for Zendikar/2015-10-02.txt  |  2 +-
 .../Block/Battle for Zendikar/2016-01-22.txt  |  2 +-
 .../Block/Ice Age/1996-10-01.txt              |  2 +-
 .../Block/Ice Age/1997-05-01.txt              |  2 +-
 .../Block/Ice Age/1997-07-01.txt              |  2 +-
 .../Block/Ice Age/2006-08-20.txt              |  2 +-
 .../Block/Innistrad/2011-09-30.txt            |  2 +-
 .../Block/Innistrad/2012-02-03.txt            |  2 +-
 .../Block/Innistrad/2012-04-02.txt            |  2 +-
 .../Block/Innistrad/2012-05-04.txt            |  2 +-
 .../Block/Invasion/2000-11-01.txt             |  2 +-
 .../Block/Invasion/2001-03-01.txt             |  2 +-
 .../Block/Invasion/2001-07-01.txt             |  2 +-
 .../Block/Ixalan/2017-09-29.txt               |  2 +-
 .../Block/Ixalan/2018-01-19.txt               |  2 +-
 .../Block/Kaladesh/2016-09-30.txt             |  2 +-
 .../Block/Kaladesh/2017-01-20.txt             |  2 +-
 .../Block/Kamigawa/2004-10-20.txt             |  2 +-
 .../Block/Kamigawa/2005-02-20.txt             |  2 +-
 .../Block/Kamigawa/2005-06-20.txt             |  2 +-
 .../Block/Khans of Tarkir/2014-09-26.txt      |  2 +-
 .../Block/Khans of Tarkir/2015-01-23.txt      |  2 +-
 .../Block/Khans of Tarkir/2015-03-27.txt      |  2 +-
 .../Block/Lorwyn-Shadowmoor/2007-10-20.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-02-01.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-05-02.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-07-25.txt    |  2 +-
 .../Block/Masques/1999-11-01.txt              |  2 +-
 .../Block/Masques/2000-03-01.txt              |  2 +-
 .../Block/Masques/2000-07-01.txt              |  2 +-
 .../1997-07-01.txt                            |  2 +-
 .../Block/Mirrodin/2003-10-20.txt             |  2 +-
 .../Block/Mirrodin/2004-02-20.txt             |  2 +-
 .../Block/Mirrodin/2004-06-20.txt             |  2 +-
 .../Block/Mirrodin/2006-02-20.txt             |  2 +-
 .../Block/Odyssey/2001-11-01.txt              |  2 +-
 .../Block/Odyssey/2002-03-01.txt              |  2 +-
 .../Block/Odyssey/2002-07-01.txt              |  2 +-
 .../Block/Onslaught/2002-11-01.txt            |  2 +-
 .../Block/Onslaught/2003-03-01.txt            |  2 +-
 .../Block/Onslaught/2003-07-01.txt            |  2 +-
 .../Block/Rath Cycle/1997-11-01.txt           |  2 +-
 .../Block/Rath Cycle/1998-04-01.txt           |  2 +-
 .../Block/Rath Cycle/1998-07-01.txt           |  2 +-
 .../Block/Ravnica/2005-10-20.txt              |  2 +-
 .../Block/Ravnica/2006-02-20.txt              |  2 +-
 .../Block/Ravnica/2006-05-20.txt              |  2 +-
 .../Block/Return to Ravnica/2012-10-05.txt    |  2 +-
 .../Block/Return to Ravnica/2013-02-01.txt    |  2 +-
 .../Block/Return to Ravnica/2013-05-03.txt    |  2 +-
 .../Block/Scars of Mirrodin/2010-10-01.txt    |  2 +-
 .../Block/Scars of Mirrodin/2011-02-04.txt    |  2 +-
 .../Block/Scars of Mirrodin/2011-05-13.txt    |  2 +-
 .../Shadows over Innistrad/2016-04-08.txt     |  2 +-
 .../Shadows over Innistrad/2016-07-22.txt     |  2 +-
 .../Block/Shards of Alara/2008-10-03.txt      |  2 +-
 .../Block/Shards of Alara/2009-02-06.txt      |  2 +-
 .../Block/Shards of Alara/2009-04-30.txt      |  2 +-
 .../Block/Theros/2013-09-27.txt               |  2 +-
 .../Block/Theros/2014-02-07.txt               |  2 +-
 .../Block/Theros/2014-05-02.txt               |  2 +-
 .../Block/Time Spiral/2006-10-20.txt          |  2 +-
 .../Block/Time Spiral/2007-02-20.txt          |  2 +-
 .../Block/Time Spiral/2007-05-20.txt          |  2 +-
 .../DCI => Archive}/Block/Urza/1999-01-01.txt |  2 +-
 .../DCI => Archive}/Block/Urza/1999-03-01.txt |  2 +-
 .../DCI => Archive}/Block/Urza/1999-04-01.txt |  2 +-
 .../DCI => Archive}/Block/Urza/1999-07-01.txt |  2 +-
 .../Block/Zendikar/2009-10-02.txt             |  2 +-
 .../Block/Zendikar/2010-02-05.txt             |  2 +-
 .../Block/Zendikar/2010-04-23.txt             |  2 +-
 .../DCI => Archive}/Explorer/2022-04-21.txt   |  2 +-
 .../DCI => Archive}/Explorer/2022-04-28.txt   |  2 +-
 .../DCI => Archive}/Extended/1997-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1997-10-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1997-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1998-04-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1998-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1998-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-01-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-03-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-04-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-06-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-09-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-10-01.txt   |  2 +-
 .../DCI => Archive}/Extended/1999-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2000-03-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2000-04-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2000-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2000-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2001-03-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2001-04-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2001-05-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2001-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2001-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2002-03-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2002-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2002-11-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2003-03-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2003-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2003-09-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2003-10-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2003-10-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2004-01-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2004-02-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2004-06-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2004-09-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2004-10-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2005-02-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2005-06-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2005-08-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2005-09-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2005-10-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2006-02-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2006-05-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2006-08-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2006-10-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2007-02-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2007-05-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2007-07-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2007-10-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2008-02-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2008-05-02.txt   |  2 +-
 .../DCI => Archive}/Extended/2008-07-25.txt   |  2 +-
 .../DCI => Archive}/Extended/2008-09-20.txt   |  2 +-
 .../DCI => Archive}/Extended/2008-10-03.txt   |  2 +-
 .../DCI => Archive}/Extended/2009-02-06.txt   |  2 +-
 .../DCI => Archive}/Extended/2009-04-30.txt   |  2 +-
 .../DCI => Archive}/Extended/2009-07-17.txt   |  2 +-
 .../DCI => Archive}/Extended/2009-10-02.txt   |  2 +-
 .../DCI => Archive}/Extended/2010-02-05.txt   |  2 +-
 .../DCI => Archive}/Extended/2010-04-23.txt   |  2 +-
 .../DCI => Archive}/Extended/2010-07-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2010-07-16.txt   |  2 +-
 .../DCI => Archive}/Extended/2010-10-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2011-02-04.txt   |  2 +-
 .../DCI => Archive}/Extended/2011-05-13.txt   |  2 +-
 .../DCI => Archive}/Extended/2011-07-15.txt   |  2 +-
 .../DCI => Archive}/Extended/2011-09-30.txt   |  2 +-
 .../DCI => Archive}/Extended/2011-10-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2012-02-03.txt   |  2 +-
 .../DCI => Archive}/Extended/2012-05-04.txt   |  2 +-
 .../DCI => Archive}/Extended/2012-07-13.txt   |  2 +-
 .../DCI => Archive}/Extended/2012-10-05.txt   |  2 +-
 .../DCI => Archive}/Extended/2013-02-01.txt   |  2 +-
 .../DCI => Archive}/Extended/2013-05-03.txt   |  2 +-
 .../DCI => Archive}/Extended/2013-07-19.txt   |  2 +-
 .../DCI => Archive}/Extended/2013-09-27.txt   |  2 +-
 .../DCI => Archive}/Historic/2019-11-21.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-01-16.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-03-09.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-03-12.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-04-16.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-05-21.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-06-25.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-07-13.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-07-17.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-08-13.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-08-24.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-09-17.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-10-12.txt   |  2 +-
 .../DCI => Archive}/Historic/2020-11-12.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-01-28.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-02-15.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-03-11.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-04-15.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-05-19.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-05-27.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-06-09.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-07-08.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-08-26.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-09-16.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-10-13.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-11-17.txt   |  2 +-
 .../DCI => Archive}/Historic/2021-12-09.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-01-25.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-02-10.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-02-24.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-03-17.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-04-28.txt   |  2 +-
 .../DCI => Archive}/Historic/2022-06-02.txt   |  0
 .../DCI => Archive}/Legacy/1996-05-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1996-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1996-07-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/1996-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1996-11-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/1997-01-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1997-03-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/1997-04-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/1997-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1997-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1998-04-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1998-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1998-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-01-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-03-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-04-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-06-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/1999-11-12.txt     |  2 +-
 .../DCI => Archive}/Legacy/2000-03-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2000-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2000-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2000-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2001-03-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2001-05-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2001-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2001-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2001-12-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2002-01-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2002-03-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2002-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2002-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2003-03-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2003-04-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2003-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2003-09-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2003-10-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2004-01-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2004-02-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2004-06-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2004-09-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2004-10-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2005-02-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2005-06-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2005-08-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2005-09-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2005-10-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2006-02-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2006-05-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2006-08-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2006-10-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-02-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-05-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-06-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-07-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-09-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-09-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-10-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2007-11-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-02-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-05-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-07-25.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-08-29.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-09-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-09-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-10-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2008-11-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-02-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-04-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-04-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-07-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-08-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-08-28.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-09-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-10-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-10-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2009-11-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-02-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-03-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-04-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-06-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-07-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-07-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-08-27.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-09-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-11-08.txt     |  2 +-
 .../DCI => Archive}/Legacy/2010-11-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-01-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-01-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-02-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-04-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-05-13.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-05-14.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-06-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-07-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-08-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-09-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-09-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-10-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2011-11-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-02-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-03-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-05-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-06-29.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-07-13.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-08-31.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-09-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-10-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2012-11-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-02-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-03-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-05-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-06-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-07-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-08-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-09-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-09-27.txt     |  2 +-
 .../DCI => Archive}/Legacy/2013-11-01.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-02-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-03-14.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-05-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-05-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-06-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-06-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-07-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-08-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-09-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-09-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-11-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2014-12-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-01-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-02-27.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-03-27.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-05-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-05-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-07-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-08-21.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-08-28.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-10-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-11-13.txt     |  2 +-
 .../DCI => Archive}/Legacy/2015-11-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-01-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-02-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-04-08.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-06-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-07-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-08-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-08-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-09-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-09-30.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-11-11.txt     |  2 +-
 .../DCI => Archive}/Legacy/2016-11-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-01-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-03-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-03-31.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-04-24.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-04-28.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-06-09.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-07-14.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-08-25.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-09-29.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-11-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-11-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2017-11-24.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-01-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-03-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-04-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-04-27.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-06-08.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-06-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-06-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-07-06.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-07-13.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-08-09.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-10-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-11-02.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-11-16.txt     |  2 +-
 .../DCI => Archive}/Legacy/2018-12-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-01-25.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-02-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-05-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-06-14.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-06-28.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-07-12.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-08-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-10-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-11-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-11-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2019-11-22.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-01-24.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-03-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-04-24.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-05-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-06-10.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-06-26.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-07-03.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-07-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-08-07.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-09-25.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-10-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-11-20.txt     |  2 +-
 .../DCI => Archive}/Legacy/2020-12-04.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-02-05.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-02-15.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-03-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-04-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-06-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-07-23.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-09-24.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-10-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2021-11-19.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-01-25.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-01-28.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-02-17.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-02-18.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-04-29.txt     |  2 +-
 .../DCI => Archive}/Legacy/2022-06-10.txt     |  0
 .../DCI => Archive}/Modern/2011-05-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2011-07-15.txt     |  2 +-
 .../DCI => Archive}/Modern/2011-08-12.txt     |  2 +-
 .../DCI => Archive}/Modern/2011-09-30.txt     |  2 +-
 .../DCI => Archive}/Modern/2011-10-01.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-01-01.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-02-03.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-05-04.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-07-13.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-10-01.txt     |  2 +-
 .../DCI => Archive}/Modern/2012-10-05.txt     |  2 +-
 .../DCI => Archive}/Modern/2013-02-01.txt     |  2 +-
 .../DCI => Archive}/Modern/2013-05-03.txt     |  2 +-
 .../DCI => Archive}/Modern/2013-06-07.txt     |  2 +-
 .../DCI => Archive}/Modern/2013-07-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2013-09-27.txt     |  2 +-
 .../DCI => Archive}/Modern/2014-02-07.txt     |  2 +-
 .../DCI => Archive}/Modern/2014-05-02.txt     |  2 +-
 .../DCI => Archive}/Modern/2014-05-30.txt     |  2 +-
 .../DCI => Archive}/Modern/2014-07-18.txt     |  2 +-
 .../DCI => Archive}/Modern/2014-09-26.txt     |  2 +-
 .../DCI => Archive}/Modern/2015-01-23.txt     |  2 +-
 .../DCI => Archive}/Modern/2015-03-27.txt     |  2 +-
 .../DCI => Archive}/Modern/2015-05-22.txt     |  2 +-
 .../DCI => Archive}/Modern/2015-07-17.txt     |  2 +-
 .../DCI => Archive}/Modern/2015-10-02.txt     |  2 +-
 .../DCI => Archive}/Modern/2016-01-22.txt     |  2 +-
 .../DCI => Archive}/Modern/2016-04-08.txt     |  2 +-
 .../DCI => Archive}/Modern/2016-07-22.txt     |  2 +-
 .../DCI => Archive}/Modern/2016-09-30.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-01-20.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-03-17.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-04-15.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-04-28.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-07-14.txt     |  2 +-
 .../DCI => Archive}/Modern/2017-09-29.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-01-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-02-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-04-27.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-07-13.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-10-05.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-11-02.txt     |  2 +-
 .../DCI => Archive}/Modern/2018-11-16.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-01-25.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-02-15.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-05-03.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-06-14.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-07-12.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-08-30.txt     |  2 +-
 .../DCI => Archive}/Modern/2019-10-04.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-01-14.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-01-24.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-03-10.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-04-24.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-07-03.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-07-13.txt     |  2 +-
 .../DCI => Archive}/Modern/2020-09-25.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-02-05.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-02-15.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-03-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-04-23.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-06-18.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-07-23.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-09-24.txt     |  2 +-
 .../DCI => Archive}/Modern/2021-11-19.txt     |  2 +-
 .../DCI => Archive}/Modern/2022-01-28.txt     |  2 +-
 .../DCI => Archive}/Modern/2022-02-18.txt     |  2 +-
 .../DCI => Archive}/Modern/2022-03-07.txt     |  2 +-
 .../DCI => Archive}/Modern/2022-04-29.txt     |  2 +-
 .../DCI => Archive}/Pauper/2019-05-24.txt     |  2 +-
 .../DCI => Archive}/Pauper/2019-10-25.txt     |  2 +-
 .../DCI => Archive}/Pauper/2020-01-14.txt     |  2 +-
 .../DCI => Archive}/Pauper/2020-07-13.txt     |  2 +-
 .../DCI => Archive}/Pioneer/2019-10-21.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2019-11-08.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2019-11-12.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2019-12-03.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2019-12-17.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-01-24.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-04-24.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-07-03.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-07-13.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-08-03.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2020-09-25.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-02-05.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-02-15.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-04-23.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-07-23.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-09-24.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2021-11-19.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2022-01-28.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2022-02-18.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2022-03-07.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2022-04-29.txt    |  2 +-
 .../DCI => Archive}/Pioneer/2022-06-07.txt    |  0
 .../DCI => Archive}/Standard/1995-01-10.txt   |  2 +-
 .../DCI => Archive}/Standard/1995-04-19.txt   |  2 +-
 .../DCI => Archive}/Standard/1995-06-03.txt   |  2 +-
 .../DCI => Archive}/Standard/1995-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1995-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1995-11-13.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-02-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-04-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-07-10.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-10-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1996-11-07.txt   |  2 +-
 .../DCI => Archive}/Standard/1997-01-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1997-03-05.txt   |  2 +-
 .../DCI => Archive}/Standard/1997-04-23.txt   |  2 +-
 .../DCI => Archive}/Standard/1997-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1997-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1998-04-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1998-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1998-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-01-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-03-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-04-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-06-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/1999-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2000-03-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2000-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2000-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2001-03-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2001-05-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2001-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2001-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2002-03-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2002-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2002-11-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2003-03-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2003-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2003-09-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2003-10-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2004-02-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2004-06-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2004-10-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2005-02-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2005-03-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2005-06-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2005-08-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2005-10-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2006-02-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2006-05-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2006-08-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2006-10-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2007-02-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2007-05-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2007-07-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2007-10-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2008-02-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2008-05-02.txt   |  2 +-
 .../DCI => Archive}/Standard/2008-07-25.txt   |  2 +-
 .../DCI => Archive}/Standard/2008-10-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2009-02-06.txt   |  2 +-
 .../DCI => Archive}/Standard/2009-04-30.txt   |  2 +-
 .../DCI => Archive}/Standard/2009-07-17.txt   |  2 +-
 .../DCI => Archive}/Standard/2009-10-02.txt   |  2 +-
 .../DCI => Archive}/Standard/2010-02-05.txt   |  2 +-
 .../DCI => Archive}/Standard/2010-04-23.txt   |  2 +-
 .../DCI => Archive}/Standard/2010-07-16.txt   |  2 +-
 .../DCI => Archive}/Standard/2010-10-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2011-02-04.txt   |  2 +-
 .../DCI => Archive}/Standard/2011-05-13.txt   |  2 +-
 .../DCI => Archive}/Standard/2011-07-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2011-07-15.txt   |  2 +-
 .../DCI => Archive}/Standard/2011-09-30.txt   |  2 +-
 .../DCI => Archive}/Standard/2012-02-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2012-05-04.txt   |  2 +-
 .../DCI => Archive}/Standard/2012-07-13.txt   |  2 +-
 .../DCI => Archive}/Standard/2012-10-05.txt   |  2 +-
 .../DCI => Archive}/Standard/2013-02-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2013-05-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2013-07-19.txt   |  2 +-
 .../DCI => Archive}/Standard/2013-09-27.txt   |  2 +-
 .../DCI => Archive}/Standard/2014-02-07.txt   |  2 +-
 .../DCI => Archive}/Standard/2014-05-02.txt   |  2 +-
 .../DCI => Archive}/Standard/2014-07-18.txt   |  2 +-
 .../DCI => Archive}/Standard/2014-09-26.txt   |  2 +-
 .../DCI => Archive}/Standard/2015-01-23.txt   |  2 +-
 .../DCI => Archive}/Standard/2015-03-27.txt   |  2 +-
 .../DCI => Archive}/Standard/2015-07-17.txt   |  2 +-
 .../DCI => Archive}/Standard/2015-10-02.txt   |  2 +-
 .../DCI => Archive}/Standard/2016-01-22.txt   |  2 +-
 .../DCI => Archive}/Standard/2016-04-08.txt   |  2 +-
 .../DCI => Archive}/Standard/2016-07-22.txt   |  2 +-
 .../DCI => Archive}/Standard/2016-09-30.txt   |  2 +-
 .../DCI => Archive}/Standard/2017-01-20.txt   |  2 +-
 .../DCI => Archive}/Standard/2017-04-28.txt   |  2 +-
 .../DCI => Archive}/Standard/2017-06-19.txt   |  2 +-
 .../DCI => Archive}/Standard/2017-07-14.txt   |  2 +-
 .../DCI => Archive}/Standard/2017-09-29.txt   |  2 +-
 .../DCI => Archive}/Standard/2018-01-19.txt   |  2 +-
 .../DCI => Archive}/Standard/2018-04-27.txt   |  2 +-
 .../DCI => Archive}/Standard/2018-07-13.txt   |  2 +-
 .../DCI => Archive}/Standard/2018-10-05.txt   |  2 +-
 .../DCI => Archive}/Standard/2018-11-16.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-01-25.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-05-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-07-12.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-08-30.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-10-04.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-10-25.txt   |  2 +-
 .../DCI => Archive}/Standard/2019-11-22.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-01-24.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-04-24.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-06-01.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-07-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-08-03.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-09-25.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-09-28.txt   |  2 +-
 .../DCI => Archive}/Standard/2020-10-12.txt   |  2 +-
 .../DCI => Archive}/Standard/2021-02-05.txt   |  2 +-
 .../DCI => Archive}/Standard/2021-04-23.txt   |  2 +-
 .../DCI => Archive}/Standard/2021-07-23.txt   |  2 +-
 .../DCI => Archive}/Standard/2021-09-24.txt   |  2 +-
 .../DCI => Archive}/Standard/2021-11-19.txt   |  2 +-
 .../DCI => Archive}/Standard/2022-01-25.txt   |  2 +-
 .../DCI => Archive}/Standard/2022-02-18.txt   |  2 +-
 .../DCI => Archive}/Standard/2022-04-29.txt   |  2 +-
 .../Standard/China/2018-06-22.txt             |  2 +-
 .../Standard/China/2018-07-13.txt             |  2 +-
 .../Standard/China/2018-10-05.txt             |  2 +-
 .../Standard/China/2018-11-16.txt             |  2 +-
 .../Standard/China/2019-01-25.txt             |  2 +-
 .../Standard/China/2019-05-03.txt             |  2 +-
 .../Standard/China/2019-07-12.txt             |  2 +-
 .../Standard/China/2019-08-30.txt             |  2 +-
 .../DCI => Archive}/Vintage/1993-08-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/1993-10-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/1993-12-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1993-12-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-01-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-02-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-03-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-03-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-05-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-06-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-06-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-07-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-08-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-08-08.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-10-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/1994-11-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-01-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-04-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-06-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1995-11-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/1996-02-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1996-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1996-07-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/1996-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1996-11-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/1997-03-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/1997-04-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/1997-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1997-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1997-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1998-01-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1998-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1998-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1998-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-01-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-06-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/1999-11-12.txt    |  2 +-
 .../DCI => Archive}/Vintage/2000-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2000-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2000-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2000-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2001-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2001-05-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2001-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2001-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2001-12-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2002-01-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2002-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2002-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2002-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2003-03-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2003-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2003-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2003-09-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2003-10-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-01-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-02-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-06-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-09-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-10-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2004-12-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-02-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-03-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-06-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-08-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-09-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2005-10-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2006-02-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2006-05-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2006-08-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2006-10-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-02-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-05-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-06-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-07-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-09-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-09-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-10-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2007-11-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-02-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-05-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-06-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-07-25.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-08-29.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-09-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-09-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-10-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2008-11-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-02-06.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-04-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-04-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-07-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-07-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-08-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-08-28.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-09-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-10-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-10-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2009-11-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-02-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-03-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-04-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-06-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-07-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-08-27.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-09-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-11-08.txt    |  2 +-
 .../DCI => Archive}/Vintage/2010-11-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-01-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-02-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-04-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-05-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-05-14.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-06-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-07-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-08-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-09-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-09-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2011-11-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-02-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-03-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-05-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-07-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-08-31.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-09-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-10-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-10-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2012-11-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-02-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-03-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-05-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-06-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-07-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-08-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-09-06.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-09-27.txt    |  2 +-
 .../DCI => Archive}/Vintage/2013-11-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-02-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-03-14.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-05-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-05-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-06-06.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-06-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-07-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-08-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-09-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-09-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-11-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2014-12-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-01-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-02-27.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-03-27.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-05-06.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-05-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-07-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-08-21.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-08-28.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-10-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-11-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/2015-11-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-01-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-02-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-04-08.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-06-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-07-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-08-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-08-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-09-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-09-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-11-11.txt    |  2 +-
 .../DCI => Archive}/Vintage/2016-11-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-01-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-03-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-03-31.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-04-24.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-04-28.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-06-09.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-07-14.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-08-25.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-09-01.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-09-29.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-11-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-11-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2017-11-24.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-01-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-03-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-04-06.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-04-27.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-06-08.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-06-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-06-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-07-13.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-08-09.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-10-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-11-02.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-11-16.txt    |  2 +-
 .../DCI => Archive}/Vintage/2018-12-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-01-25.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-02-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-05-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-06-14.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-06-28.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-07-12.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-08-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-08-30.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-10-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-11-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-11-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2019-11-22.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-01-24.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-04-24.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-05-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-06-10.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-06-26.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-07-03.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-07-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-08-07.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-09-25.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-10-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-11-20.txt    |  2 +-
 .../DCI => Archive}/Vintage/2020-12-04.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-02-05.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-02-15.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-03-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-04-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-06-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-07-23.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-09-24.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-10-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2021-11-19.txt    |  2 +-
 .../DCI => Archive}/Vintage/2022-01-28.txt    |  2 +-
 .../DCI => Archive}/Vintage/2022-02-17.txt    |  2 +-
 .../DCI => Archive}/Vintage/2022-02-18.txt    |  2 +-
 .../DCI => Archive}/Vintage/2022-04-29.txt    |  2 +-
 .../DCI => Archive}/Vintage/2022-06-10.txt    |  0
 .../res/formats/Block/Amonkhet Block.txt      |  2 +-
 .../Block/Battle for Zendikar Block.txt       |  2 +-
 forge-gui/res/formats/Block/Ice Age Block.txt |  2 +-
 .../Block/Innistrad-Avacyn Restored Block.txt |  2 +-
 .../res/formats/Block/Invasion Block.txt      |  2 +-
 forge-gui/res/formats/Block/Ixalan Block.txt  |  2 +-
 .../res/formats/Block/Kaladesh Block.txt      |  2 +-
 .../res/formats/Block/Kamigawa Block.txt      |  2 +-
 .../formats/Block/Khans of Tarkir Block.txt   |  2 +-
 .../formats/Block/Lorwyn-Shadowmoor Block.txt |  2 +-
 forge-gui/res/formats/Block/Masques Block.txt |  2 +-
 forge-gui/res/formats/Block/Mirage Block.txt  |  2 +-
 .../res/formats/Block/Mirrodin Block.txt      |  2 +-
 forge-gui/res/formats/Block/Odyssey Block.txt |  2 +-
 .../res/formats/Block/Onslaught Block.txt     |  2 +-
 forge-gui/res/formats/Block/Ravnica Block.txt |  2 +-
 .../formats/Block/Return to Ravnica Block.txt |  2 +-
 .../formats/Block/Scars of Mirrodin Block.txt |  2 +-
 .../Block/Shadows over Innistrad Block.txt    |  2 +-
 .../formats/Block/Shards of Alara Block.txt   |  2 +-
 forge-gui/res/formats/Block/Tempest Block.txt |  2 +-
 forge-gui/res/formats/Block/Theros Block.txt  |  2 +-
 .../res/formats/Block/Time Spiral Block.txt   |  2 +-
 forge-gui/res/formats/Block/Urza Block.txt    |  2 +-
 .../res/formats/Block/Zendikar Block.txt      |  2 +-
 forge-gui/res/formats/Casual/Conspiracy.txt   |  2 +-
 forge-gui/res/formats/Casual/Un-Sets.txt      |  2 +-
 forge-gui/res/formats/Sanctioned/Extended.txt |  2 +-
 forge-gui/res/languages/en-US.properties      | 10 +++----
 .../java/forge/deck/DeckImportController.java |  2 +-
 .../gamemodes/quest/StartingPoolType.java     |  2 +-
 .../properties/ForgePreferences.java          |  2 +-
 .../src/main/java/forge/model/FModel.java     |  2 +-
 962 files changed, 1001 insertions(+), 1001 deletions(-)
 rename forge-gui-mobile/src/forge/itemmanager/filters/{HistoricFormatSelect.java => ArchiveFormatSelect.java} (92%)
 rename forge-gui/res/formats/{Historic => Archive}/.gitkeep (100%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Alchemy/2021-12-09.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Alchemy/2022-02-10.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Alchemy/2022-03-17.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Alchemy/2022-04-28.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Alchemy/2022-06-02.txt (100%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2017-09-07.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-01-18.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-03-22.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-04-26.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-06-07.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-07-12.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-09-27.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2018-11-15.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-01-17.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-02-14.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-04-25.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-07-02.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-09-26.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-10-24.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2019-11-18.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-01-16.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-04-16.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-06-04.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-06-25.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-08-03.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-08-12.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-09-17.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-09-28.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2020-10-12.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2021-01-28.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2021-04-15.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2021-07-08.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2021-09-16.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2021-11-17.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2022-01-27.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2022-02-10.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2022-03-17.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Arena Standard/2022-04-28.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Amonkhet/2017-04-28.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Amonkhet/2017-07-14.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Battle for Zendikar/2015-10-02.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Battle for Zendikar/2016-01-22.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ice Age/1996-10-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ice Age/1997-05-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ice Age/1997-07-01.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ice Age/2006-08-20.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Innistrad/2011-09-30.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Innistrad/2012-02-03.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Innistrad/2012-04-02.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Innistrad/2012-05-04.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Invasion/2000-11-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Invasion/2001-03-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Invasion/2001-07-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ixalan/2017-09-29.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ixalan/2018-01-19.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Kaladesh/2016-09-30.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Kaladesh/2017-01-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Kamigawa/2004-10-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Kamigawa/2005-02-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Kamigawa/2005-06-20.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Khans of Tarkir/2014-09-26.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Khans of Tarkir/2015-01-23.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Khans of Tarkir/2015-03-27.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Lorwyn-Shadowmoor/2007-10-20.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Lorwyn-Shadowmoor/2008-02-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Lorwyn-Shadowmoor/2008-05-02.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Lorwyn-Shadowmoor/2008-07-25.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Masques/1999-11-01.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Masques/2000-03-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Masques/2000-07-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Mirage-Visions-Weatherlight/1997-07-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Mirrodin/2003-10-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Mirrodin/2004-02-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Mirrodin/2004-06-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Mirrodin/2006-02-20.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Odyssey/2001-11-01.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Odyssey/2002-03-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Odyssey/2002-07-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Onslaught/2002-11-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Onslaught/2003-03-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Onslaught/2003-07-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Rath Cycle/1997-11-01.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Rath Cycle/1998-04-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Rath Cycle/1998-07-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ravnica/2005-10-20.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ravnica/2006-02-20.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Ravnica/2006-05-20.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Return to Ravnica/2012-10-05.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Return to Ravnica/2013-02-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Return to Ravnica/2013-05-03.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Scars of Mirrodin/2010-10-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Scars of Mirrodin/2011-02-04.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Scars of Mirrodin/2011-05-13.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Shadows over Innistrad/2016-04-08.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Shadows over Innistrad/2016-07-22.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Shards of Alara/2008-10-03.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Shards of Alara/2009-02-06.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Shards of Alara/2009-04-30.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Theros/2013-09-27.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Theros/2014-02-07.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Theros/2014-05-02.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Time Spiral/2006-10-20.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Time Spiral/2007-02-20.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Time Spiral/2007-05-20.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Urza/1999-01-01.txt (84%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Urza/1999-03-01.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Urza/1999-04-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Urza/1999-07-01.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Zendikar/2009-10-02.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Zendikar/2010-02-05.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Block/Zendikar/2010-04-23.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Explorer/2022-04-21.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Explorer/2022-04-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1997-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1997-10-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1997-11-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1998-04-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1998-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1998-11-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-01-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-03-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-04-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-06-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-09-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-10-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/1999-11-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2000-03-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2000-04-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2000-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2000-11-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2001-03-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2001-04-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2001-05-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2001-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2001-11-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2002-03-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2002-07-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2002-11-01.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2003-03-01.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2003-07-01.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2003-09-01.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2003-10-01.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2003-10-20.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2004-01-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2004-02-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2004-06-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2004-09-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2004-10-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2005-02-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2005-06-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2005-08-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2005-09-20.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2005-10-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2006-02-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2006-05-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2006-08-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2006-10-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2007-02-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2007-05-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2007-07-20.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2007-10-20.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2008-02-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2008-05-02.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2008-07-25.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2008-09-20.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2008-10-03.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2009-02-06.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2009-04-30.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2009-07-17.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2009-10-02.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2010-02-05.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2010-04-23.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2010-07-01.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2010-07-16.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2010-10-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2011-02-04.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2011-05-13.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2011-07-15.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2011-09-30.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2011-10-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2012-02-03.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2012-05-04.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2012-07-13.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2012-10-05.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2013-02-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2013-05-03.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2013-07-19.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Extended/2013-09-27.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2019-11-21.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-01-16.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-03-09.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-03-12.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-04-16.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-05-21.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-06-25.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-07-13.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-07-17.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-08-13.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-08-24.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-09-17.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-10-12.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2020-11-12.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-01-28.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-02-15.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-03-11.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-04-15.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-05-19.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-05-27.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-06-09.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-07-08.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-08-26.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-09-16.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-10-13.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-11-17.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2021-12-09.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-01-25.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-02-10.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-02-24.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-03-17.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-04-28.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Historic/2022-06-02.txt (100%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1996-05-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1996-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1996-07-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1996-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1996-11-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1997-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1997-03-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1997-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1997-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1997-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1998-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1998-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1998-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-06-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/1999-11-12.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2000-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2000-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2000-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2000-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2001-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2001-05-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2001-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2001-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2001-12-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2002-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2002-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2002-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2002-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2003-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2003-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2003-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2003-09-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2003-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2004-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2004-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2004-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2004-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2004-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2005-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2005-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2005-08-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2005-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2005-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2006-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2006-05-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2006-08-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2006-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-05-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-07-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-09-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2007-11-16.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-02-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-05-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-07-25.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-08-29.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-09-22.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-10-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2008-11-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-02-06.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-04-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-04-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-07-17.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-08-26.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-08-28.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-09-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-10-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-10-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2009-11-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-02-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-03-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-06-04.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-07-16.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-08-27.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-09-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-10-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-11-08.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2010-11-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-01-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-01-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-02-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-04-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-05-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-05-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-06-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-07-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-08-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-09-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-09-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-10-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2011-11-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-02-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-03-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-05-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-06-29.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-07-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-08-31.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-09-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-10-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2012-11-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-02-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-03-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-05-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-06-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-07-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-08-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-09-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-09-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2013-11-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-02-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-03-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-05-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-05-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-06-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-06-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-07-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-08-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-09-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-09-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-11-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2014-12-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-01-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-02-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-03-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-05-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-05-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-07-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-08-21.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-08-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-10-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-11-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2015-11-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-01-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-02-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-04-08.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-06-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-07-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-08-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-08-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-09-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-09-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-11-11.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2016-11-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-01-20.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-03-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-03-31.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-04-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-04-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-06-09.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-07-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-08-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-09-29.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-11-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-11-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2017-11-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-01-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-03-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-04-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-04-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-06-08.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-06-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-06-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-07-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-07-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-08-09.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-10-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-11-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-11-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2018-12-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-01-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-02-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-05-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-06-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-06-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-07-12.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-08-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-10-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-11-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-11-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2019-11-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-01-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-03-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-04-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-05-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-06-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-06-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-07-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-07-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-08-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-09-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-10-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-11-20.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2020-12-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-02-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-02-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-03-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-04-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-06-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-07-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-09-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-10-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2021-11-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-01-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-01-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-02-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-02-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-04-29.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Legacy/2022-06-10.txt (100%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2011-05-19.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2011-07-15.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2011-08-12.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2011-09-30.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2011-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-02-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-05-04.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-07-13.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2012-10-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2013-02-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2013-05-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2013-06-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2013-07-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2013-09-27.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2014-02-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2014-05-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2014-05-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2014-07-18.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2014-09-26.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2015-01-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2015-03-27.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2015-05-22.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2015-07-17.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2015-10-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2016-01-22.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2016-04-08.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2016-07-22.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2016-09-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-01-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-03-17.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-04-15.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-04-28.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-07-14.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2017-09-29.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-01-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-02-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-04-27.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-07-13.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-10-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-11-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2018-11-16.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-01-25.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-02-15.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-05-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-06-14.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-07-12.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-08-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2019-10-04.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-01-14.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-01-24.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-03-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-04-24.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-07-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-07-13.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2020-09-25.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-02-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-02-15.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-03-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-06-18.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-07-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-09-24.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2021-11-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2022-01-28.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2022-02-18.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2022-03-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Modern/2022-04-29.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pauper/2019-05-24.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pauper/2019-10-25.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pauper/2020-01-14.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pauper/2020-07-13.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2019-10-21.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2019-11-08.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2019-11-12.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2019-12-03.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2019-12-17.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-01-24.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-04-24.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-07-03.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-07-13.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-08-03.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2020-09-25.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-02-05.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-02-15.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-07-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-09-24.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2021-11-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2022-01-28.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2022-02-18.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2022-03-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2022-04-29.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Pioneer/2022-06-07.txt (100%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-01-10.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-04-19.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-06-03.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-07-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-11-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1995-11-13.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-02-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-04-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-07-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-07-10.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-10-01.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1996-11-07.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1997-01-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1997-03-05.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1997-04-23.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1997-07-01.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1997-11-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1998-04-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1998-07-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1998-11-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-01-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-03-01.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-04-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-06-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-07-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/1999-11-01.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2000-03-01.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2000-07-01.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2000-11-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2001-03-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2001-05-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2001-07-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2001-11-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2002-03-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2002-07-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2002-11-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2003-03-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2003-07-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2003-09-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2003-10-20.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2004-02-20.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2004-06-20.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2004-10-20.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2005-02-20.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2005-03-20.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2005-06-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2005-08-20.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2005-10-20.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2006-02-20.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2006-05-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2006-08-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2006-10-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2007-02-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2007-05-20.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2007-07-20.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2007-10-20.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2008-02-01.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2008-05-02.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2008-07-25.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2008-10-03.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2009-02-06.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2009-04-30.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2009-07-17.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2009-10-02.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2010-02-05.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2010-04-23.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2010-07-16.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2010-10-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2011-02-04.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2011-05-13.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2011-07-01.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2011-07-15.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2011-09-30.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2012-02-03.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2012-05-04.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2012-07-13.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2012-10-05.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2013-02-01.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2013-05-03.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2013-07-19.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2013-09-27.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2014-02-07.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2014-05-02.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2014-07-18.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2014-09-26.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2015-01-23.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2015-03-27.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2015-07-17.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2015-10-02.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2016-01-22.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2016-04-08.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2016-07-22.txt (88%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2016-09-30.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2017-01-20.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2017-04-28.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2017-06-19.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2017-07-14.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2017-09-29.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2018-01-19.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2018-04-27.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2018-07-13.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2018-10-05.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2018-11-16.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-01-25.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-05-03.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-07-12.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-08-30.txt (89%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-10-04.txt (87%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-10-25.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2019-11-22.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-01-24.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-04-24.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-06-01.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-07-03.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-08-03.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-09-25.txt (92%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-09-28.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2020-10-12.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2021-02-05.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2021-04-23.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2021-07-23.txt (95%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2021-09-24.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2021-11-19.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2022-01-25.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2022-02-18.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/2022-04-29.txt (93%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2018-06-22.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2018-07-13.txt (94%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2018-10-05.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2018-11-16.txt (90%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2019-01-25.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2019-05-03.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2019-07-12.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Standard/China/2019-08-30.txt (91%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1993-08-05.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1993-10-04.txt (85%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1993-12-01.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1993-12-17.txt (86%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-01-26.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-02-23.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-03-04.txt (96%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-03-23.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-04-01.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-05-02.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-06-10.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-06-13.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-07-15.txt (97%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-08-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-08-08.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-10-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1994-11-15.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-01-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-04-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-06-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1995-11-13.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1996-02-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1996-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1996-07-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1996-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1996-11-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1997-03-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1997-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1997-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1997-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1997-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1998-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1998-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1998-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1998-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-06-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/1999-11-12.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2000-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2000-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2000-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2000-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2001-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2001-05-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2001-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2001-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2001-12-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2002-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2002-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2002-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2002-11-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2003-03-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2003-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2003-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2003-09-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2003-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-01-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2004-12-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-03-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-08-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2005-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2006-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2006-05-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2006-08-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2006-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-02-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-05-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-07-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-09-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-10-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2007-11-16.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-02-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-05-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-06-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-07-25.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-08-29.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-09-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-09-22.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-10-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2008-11-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-02-06.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-04-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-04-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-07-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-07-17.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-08-26.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-08-28.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-09-07.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-10-02.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-10-30.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2009-11-20.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-02-05.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-03-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-04-23.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-06-04.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-07-16.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-08-27.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-09-03.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-10-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-11-08.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2010-11-19.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-01-10.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-02-04.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-04-01.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-05-13.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-05-14.txt (98%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-06-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-07-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-08-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-09-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-09-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-10-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2011-11-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-02-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-03-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-05-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-07-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-08-31.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-09-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-10-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-10-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2012-11-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-02-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-03-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-05-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-06-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-07-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-08-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-09-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-09-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2013-11-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-02-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-03-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-05-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-05-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-06-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-06-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-07-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-08-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-09-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-09-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-11-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2014-12-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-01-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-02-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-03-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-05-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-05-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-07-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-08-21.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-08-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-10-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-11-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2015-11-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-01-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-02-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-04-08.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-06-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-07-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-08-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-08-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-09-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-09-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-11-11.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2016-11-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-01-20.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-03-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-03-31.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-04-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-04-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-06-09.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-07-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-08-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-09-01.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-09-29.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-11-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-11-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2017-11-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-01-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-03-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-04-06.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-04-27.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-06-08.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-06-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-06-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-07-13.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-08-09.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-10-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-11-02.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-11-16.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2018-12-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-01-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-02-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-05-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-06-14.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-06-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-07-12.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-08-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-08-30.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-10-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-11-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-11-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2019-11-22.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-01-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-04-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-05-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-06-10.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-06-26.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-07-03.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-07-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-08-07.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-09-25.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-10-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-11-20.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2020-12-04.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-02-05.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-02-15.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-03-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-04-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-06-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-07-23.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-09-24.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-10-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2021-11-19.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2022-01-28.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2022-02-17.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2022-02-18.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2022-04-29.txt (99%)
 rename forge-gui/res/formats/{Historic/DCI => Archive}/Vintage/2022-06-10.txt (100%)

diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index b1749dfe8c1..6c6a0b03ad0 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -48,7 +48,7 @@ public class GameFormat implements Comparable<GameFormat> {
     public enum FormatType {
         SANCTIONED,
         CASUAL,
-        HISTORIC,
+        ARCHIVE,
         DIGITAL,
         CUSTOM
     }
@@ -290,7 +290,7 @@ public class GameFormat implements Comparable<GameFormat> {
         if (other.formatSubType != formatSubType){
             return formatSubType.compareTo(other.formatSubType);
         }
-        if (formatType.equals(FormatType.HISTORIC)){
+        if (formatType.equals(FormatType.ARCHIVE)){
             int compareDates = this.effectiveDate.compareTo(other.effectiveDate);
             if (compareDates != 0)
                 return compareDates;
@@ -306,7 +306,7 @@ public class GameFormat implements Comparable<GameFormat> {
 
     public static class Reader extends StorageReaderRecursiveFolderWithUserFolder<GameFormat> {
         List<GameFormat> naturallyOrdered = new ArrayList<>();
-        boolean includeHistoric;
+        boolean includeArchive;
         private List<String> coreFormats = new ArrayList<>();
         {
             coreFormats.add("Standard.txt");
@@ -321,14 +321,14 @@ public class GameFormat implements Comparable<GameFormat> {
             coreFormats.add("Oathbreaker.txt");
         }
         
-        public Reader(File forgeFormats, File customFormats, boolean includeHistoric) {
+        public Reader(File forgeFormats, File customFormats, boolean includeArchive) {
             super(forgeFormats, customFormats, GameFormat.FN_GET_NAME);
-            this.includeHistoric=includeHistoric;
+            this.includeArchive=includeArchive;
         }
 
         @Override
         protected GameFormat read(File file) {
-            if (!includeHistoric && !coreFormats.contains(file.getName())) {
+            if (!includeArchive && !coreFormats.contains(file.getName())) {
                 return null;
             }
             final Map<String, List<String>> contents = FileSection.parseSections(FileUtil.readFile(file));
@@ -450,7 +450,7 @@ public class GameFormat implements Comparable<GameFormat> {
         public Iterable<GameFormat> getFilterList() {
             List<GameFormat> coreList = new ArrayList<>();
             for (GameFormat format: naturallyOrdered) {
-                if (!format.getFormatType().equals(FormatType.HISTORIC)
+                if (!format.getFormatType().equals(FormatType.ARCHIVE)
                         &&!format.getFormatType().equals(FormatType.DIGITAL)){
                     coreList.add(format);
                 }
@@ -458,10 +458,10 @@ public class GameFormat implements Comparable<GameFormat> {
             return coreList;
         }
 
-        public Iterable<GameFormat> getHistoricList() {
+        public Iterable<GameFormat> getArchiveList() {
             List<GameFormat> coreList = new ArrayList<>();
             for (GameFormat format: naturallyOrdered) {
-                if (format.getFormatType().equals(FormatType.HISTORIC)){
+                if (format.getFormatType().equals(FormatType.ARCHIVE)){
                     coreList.add(format);
                 }
             }
@@ -470,7 +470,7 @@ public class GameFormat implements Comparable<GameFormat> {
 
         public Iterable<GameFormat> getBlockList() {
             List<GameFormat> blockFormats = new ArrayList<>();
-            for (GameFormat format : this.getHistoricList()){
+            for (GameFormat format : this.getArchiveList()){
                 if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK)
                     continue;
                 if (!format.getName().endsWith("Block"))
@@ -481,10 +481,10 @@ public class GameFormat implements Comparable<GameFormat> {
             return blockFormats;
         }
 
-        public Map<String, List<GameFormat>> getHistoricMap() {
+        public Map<String, List<GameFormat>> getArchiveMap() {
             Map<String, List<GameFormat>> coreList = new HashMap<>();
             for (GameFormat format: naturallyOrdered){
-                if (format.getFormatType().equals(FormatType.HISTORIC)){
+                if (format.getFormatType().equals(FormatType.ARCHIVE)){
                     String alpha = format.getName().substring(0,1);
                     if (!coreList.containsKey(alpha)) {
                         coreList.put(alpha,new ArrayList<>());
@@ -557,9 +557,9 @@ public class GameFormat implements Comparable<GameFormat> {
                     //exclude Commander format as other deck checks are not performed here
                     continue;
                 }
-                if (gf.getFormatType().equals(FormatType.HISTORIC) && coveredTypes.contains(gf.getFormatSubType())
+                if (gf.getFormatType().equals(FormatType.ARCHIVE) && coveredTypes.contains(gf.getFormatSubType())
                         && !exhaustive){
-                    //exclude duplicate formats - only keep first of e.g. Standard historical
+                    //exclude duplicate formats - only keep first of e.g. Standard archived
                     continue;
                 }
                 if (gf.isPoolLegal(allCards)) {
@@ -590,7 +590,7 @@ public class GameFormat implements Comparable<GameFormat> {
             if (gf2.formatSubType != gf1.formatSubType){
                 return gf1.formatSubType.compareTo(gf2.formatSubType);
             }
-            if (gf1.formatType.equals(FormatType.HISTORIC)){
+            if (gf1.formatType.equals(FormatType.ARCHIVE)){
                 if (gf1.effectiveDate!=gf2.effectiveDate) {//for matching dates or default dates default to name sorting
                     return gf1.effectiveDate.compareTo(gf2.effectiveDate);
                 }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
index b381c6eda0a..86b96750530 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
@@ -216,7 +216,7 @@ public class CardManager extends ItemManager<PaperCard> {
         }
         menu.add(world);
 
-        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) {
+        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
             final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
index eeb80e19a3e..6edc7a238aa 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
@@ -279,7 +279,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
         }
         menu.add(world);
 
-        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) {
+        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
             final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
index 68f3454effe..1e61796d36c 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
@@ -42,7 +42,7 @@ public class DialogChooseFormats {
 
 		List<FCheckBox> sanctioned = new ArrayList<>();
 		List<FCheckBox> casual = new ArrayList<>();
-		List<FCheckBox> historic = new ArrayList<>();
+		List<FCheckBox> archive = new ArrayList<>();
 
 		for (GameFormat format : FModel.getFormats().getOrderedList()){
 			FCheckBox box = new FCheckBox(format.getName());
@@ -51,8 +51,8 @@ public class DialogChooseFormats {
 				case SANCTIONED:
 					sanctioned.add(box);
 					break;
-				case HISTORIC:
-					historic.add(box);
+				case ARCHIVE:
+					archive.add(box);
 					break;
 				case CUSTOM:
 				case CASUAL:
@@ -74,7 +74,7 @@ public class DialogChooseFormats {
 		String constraints = "aligny top";
 		panel.add(makeCheckBoxList(sanctioned, localizer.getMessage("lblSanctioned"), true), constraints);
 		panel.add(makeCheckBoxList(casual, localizer.getMessage("lblOther"), false), constraints);
-		panel.add(makeCheckBoxList(historic, localizer.getMessage("lblHistoric"), false), constraints);
+		panel.add(makeCheckBoxList(archive, localizer.getMessage("lblArchive"), false), constraints);
 
 		final JPanel overlay = FOverlay.SINGLETON_INSTANCE.getPanel();
 		overlay.setLayout(new MigLayout("insets 0, gap 0, wrap, ax center, ay center"));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
index e476eb3668e..4f90a2fe0bc 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
@@ -167,7 +167,7 @@ public enum CSubmenuPreferences implements ICDoc {
 
         lstControls.add(Pair.of(view.getCbFilterLandsByColorId(), FPref.UI_FILTER_LANDS_BY_COLOR_IDENTITY));
         lstControls.add(Pair.of(view.getCbLoadCardsLazily(), FPref.LOAD_CARD_SCRIPTS_LAZILY));
-        lstControls.add(Pair.of(view.getCbLoadHistoricFormats(), FPref.LOAD_HISTORIC_FORMATS));
+        lstControls.add(Pair.of(view.getCbLoadArchiveFormats(), FPref.LOAD_ARCHIVE_FORMATS));
         lstControls.add(Pair.of(view.getCbSmartCardArtSelectionOpt(), FPref.UI_SMART_CARD_ART));
         lstControls.add(Pair.of(view.getCbShowDraftRanking(), FPref.UI_OVERLAY_DRAFT_RANKING));
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
index 3e163d79219..c6f2e929103 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
@@ -72,7 +72,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     private final JCheckBox cbManaLostPrompt = new OptionsCheckBox(localizer.getMessage("cbManaLostPrompt"));
     private final JCheckBox cbDevMode = new OptionsCheckBox(localizer.getMessage("cbDevMode"));
     private final JCheckBox cbLoadCardsLazily = new OptionsCheckBox(localizer.getMessage("cbLoadCardsLazily"));
-    private final JCheckBox cbLoadHistoricFormats = new OptionsCheckBox(localizer.getMessage("cbLoadHistoricFormats"));
+    private final JCheckBox cbLoadArchiveFormats = new OptionsCheckBox(localizer.getMessage("cbLoadArchiveFormats"));
     private final JCheckBox cbWorkshopSyntax = new OptionsCheckBox(localizer.getMessage("cbWorkshopSyntax"));
     private final JCheckBox cbEnforceDeckLegality = new OptionsCheckBox(localizer.getMessage("cbEnforceDeckLegality"));
     private final JCheckBox cbSideboardForAI = new OptionsCheckBox(localizer.getMessage("cbSideboardForAI"));
@@ -322,8 +322,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
         pnlPrefs.add(cbLoadCardsLazily, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadCardsLazily")), descriptionConstraints);
 
-        pnlPrefs.add(cbLoadHistoricFormats, titleConstraints);
-        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadHistoricFormats")), descriptionConstraints);
+        pnlPrefs.add(cbLoadArchiveFormats, titleConstraints);
+        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadArchiveFormats")), descriptionConstraints);
 
         pnlPrefs.add(cbEnableUnknownCards, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlEnableUnknownCards")), descriptionConstraints);
@@ -741,8 +741,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     }
 
     /** @return {@link javax.swing.JCheckBox} */
-    public JCheckBox getCbLoadHistoricFormats() {
-        return cbLoadHistoricFormats;
+    public JCheckBox getCbLoadArchiveFormats() {
+        return cbLoadArchiveFormats;
     }
 
     public JCheckBox getCbWorkshopSyntax() {
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java b/forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java
similarity index 92%
rename from forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java
index 7ce22f40a11..0d30797779b 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java
@@ -22,22 +22,22 @@ import forge.util.Utils;
 /**
  * Created by maustin on 16/04/2018.
  */
-public class HistoricFormatSelect extends FScreen {
+public class ArchiveFormatSelect extends FScreen {
 
     private GameFormat selectedFormat;
     private final FGroupList<GameFormat> lstFormats = add(new FGroupList<>());
-    private final Set<GameFormat.FormatSubType> historicSubTypes = new HashSet<>(Arrays.asList(GameFormat.FormatSubType.BLOCK,
+    private final Set<GameFormat.FormatSubType> archiveSubTypes = new HashSet<>(Arrays.asList(GameFormat.FormatSubType.BLOCK,
             GameFormat.FormatSubType.STANDARD,GameFormat.FormatSubType.EXTENDED,GameFormat.FormatSubType.MODERN,
             GameFormat.FormatSubType.LEGACY, GameFormat.FormatSubType.VINTAGE));
 
     private Runnable onCloseCallBack;
 
-    public HistoricFormatSelect() {
+    public ArchiveFormatSelect() {
         super(Forge.getLocalizer().getMessage("lblChooseFormat"));
         for (GameFormat.FormatType group:GameFormat.FormatType.values()){
-            if (group == GameFormat.FormatType.HISTORIC){
+            if (group == GameFormat.FormatType.ARCHIVE){
                 for (GameFormat.FormatSubType subgroup:GameFormat.FormatSubType.values()){
-                    if (historicSubTypes.contains(subgroup)){
+                    if (archiveSubTypes.contains(subgroup)){
                         lstFormats.addGroup(group.name() + "-" + subgroup.name());
                     }
                 }
@@ -53,7 +53,7 @@ public class HistoricFormatSelect extends FScreen {
                 case CASUAL:
                     lstFormats.addItem(format, 1);
                     break;
-                case HISTORIC:
+                case ARCHIVE:
                     switch (format.getFormatSubType()){
                         case BLOCK:
                             lstFormats.addItem(format, 2);
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
index 438882dd98f..564a6120584 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
@@ -66,16 +66,16 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
                     preventHandling = true;
                     cbxFormats.setText(selectedFormat); //restore previous selection by default
                     preventHandling = false;
-                    HistoricFormatSelect historicFormatSelect = new HistoricFormatSelect();
-                    historicFormatSelect.setOnCloseCallBack(new Runnable(){
+                    ArchiveFormatSelect archiveFormatSelect = new ArchiveFormatSelect();
+                    archiveFormatSelect.setOnCloseCallBack(new Runnable(){
                         @Override
                         public void run() {
-                            format = historicFormatSelect.getSelectedFormat();
+                            format = archiveFormatSelect.getSelectedFormat();
                             cbxFormats.setText(format.getName());
                             applyChange();
                         }
                     });
-                    Forge.openScreen(historicFormatSelect);
+                    Forge.openScreen(archiveFormatSelect);
                 }
                 else if (index == cbxFormats.getItemCount() - 1) {
                     preventHandling = true;
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index 42bd3e91719..834f29159a8 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -31,7 +31,7 @@ import forge.gui.UiCommand;
 import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.item.PreconDeck;
-import forge.itemmanager.filters.HistoricFormatSelect;
+import forge.itemmanager.filters.ArchiveFormatSelect;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.CardCollections;
 import forge.model.FModel;
@@ -301,13 +301,13 @@ public class NewQuestScreen extends FScreen {
         btnSelectFormat.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                HistoricFormatSelect historicFormatSelect = new HistoricFormatSelect();
-                historicFormatSelect.setOnCloseCallBack(new Runnable() {
+                ArchiveFormatSelect archiveFormatSelect = new ArchiveFormatSelect();
+                archiveFormatSelect.setOnCloseCallBack(new Runnable() {
                     @Override
                     public void run() {
                         customFormatCodes.clear();
-                        btnSelectFormat.setText(historicFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = historicFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                        btnSelectFormat.setText(archiveFormatSelect.getSelectedFormat().getName());
+                        List<String> setsToAdd = archiveFormatSelect.getSelectedFormat().getAllowedSetCodes();
                         for (String setName:setsToAdd){
                             if(!unselectableSets.contains(setName)){
                                 customFormatCodes.add(setName);
@@ -315,20 +315,20 @@ public class NewQuestScreen extends FScreen {
                         }
                     }
                 });
-                Forge.openScreen(historicFormatSelect);
+                Forge.openScreen(archiveFormatSelect);
             }
         });
 
         btnPrizeSelectFormat.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                HistoricFormatSelect historicFormatSelect = new HistoricFormatSelect();
-                historicFormatSelect.setOnCloseCallBack(new Runnable() {
+                ArchiveFormatSelect  archiveFormatSelect = new ArchiveFormatSelect();
+                archiveFormatSelect.setOnCloseCallBack(new Runnable() {
                     @Override
                     public void run() {
                         customPrizeFormatCodes.clear();
-                        btnPrizeSelectFormat.setText(historicFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = historicFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                        btnPrizeSelectFormat.setText(archiveFormatSelect.getSelectedFormat().getName());
+                        List<String> setsToAdd = archiveFormatSelect.getSelectedFormat().getAllowedSetCodes();
                         for (String setName:setsToAdd){
                             if(!unselectableSets.contains(setName)){
                                 customPrizeFormatCodes.add(setName);
@@ -336,7 +336,7 @@ public class NewQuestScreen extends FScreen {
                         }
                     }
                 });
-                Forge.openScreen(historicFormatSelect);
+                Forge.openScreen(archiveFormatSelect);
             }
         });
 
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index 6ebff9bf349..02bac950ecd 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -362,9 +362,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                 Forge.getLocalizer().getMessage("cbLoadCardsLazily"),
                 Forge.getLocalizer().getMessage("nlLoadCardsLazily")),
                 3);
-        lstSettings.addItem(new BooleanSetting(FPref.LOAD_HISTORIC_FORMATS,
-                Forge.getLocalizer().getMessage("cbLoadHistoricFormats"),
-                Forge.getLocalizer().getMessage("nlLoadHistoricFormats")),
+        lstSettings.addItem(new BooleanSetting(FPref.LOAD_ARCHIVE_FORMATS,
+                Forge.getLocalizer().getMessage("cbLoadArchiveFormats"),
+                Forge.getLocalizer().getMessage("nlLoadArchiveFormats")),
                 3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS,
                 Forge.getLocalizer().getMessage("lblEnableUnknownCards"),
diff --git a/forge-gui/res/formats/Historic/.gitkeep b/forge-gui/res/formats/Archive/.gitkeep
similarity index 100%
rename from forge-gui/res/formats/Historic/.gitkeep
rename to forge-gui/res/formats/Archive/.gitkeep
diff --git a/forge-gui/res/formats/Historic/DCI/Alchemy/2021-12-09.txt b/forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Alchemy/2021-12-09.txt
rename to forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt
index 4e1f99ee6d9..adae6129bad 100644
--- a/forge-gui/res/formats/Historic/DCI/Alchemy/2021-12-09.txt
+++ b/forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (2021-12-09)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-12-09
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID
diff --git a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-02-10.txt b/forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Alchemy/2022-02-10.txt
rename to forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt
index 32923f1d6e7..4997978d9c3 100644
--- a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-02-10.txt
+++ b/forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (NEO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-02-10
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-03-17.txt b/forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Alchemy/2022-03-17.txt
rename to forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt
index 7eae9b0d74a..44cd656164a 100644
--- a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-03-17.txt
+++ b/forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (YNEO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-03-17
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO
diff --git a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-04-28.txt b/forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Alchemy/2022-04-28.txt
rename to forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt
index 901e822dd91..e4b8a4a2e44 100644
--- a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-04-28.txt
+++ b/forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (SNC)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-04-28
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Alchemy/2022-06-02.txt b/forge-gui/res/formats/Archive/Alchemy/2022-06-02.txt
similarity index 100%
rename from forge-gui/res/formats/Historic/DCI/Alchemy/2022-06-02.txt
rename to forge-gui/res/formats/Archive/Alchemy/2022-06-02.txt
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2017-09-07.txt b/forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2017-09-07.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt
index 699f8a2ce88..e5e7c60cc43 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2017-09-07.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2017-09-07)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2017-09-07
 Sets:XLN
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-01-18.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-01-18.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt
index a74bf0f1262..41646a03bd6 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-01-18.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (RIX)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-01-18
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-03-22.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-03-22.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt
index cfcfcdfb971..a182c6a453d 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-03-22.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (AKH/HOU)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-03-22
 Sets:XLN, RIX, AKH, HOU
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-04-26.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-04-26.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt
index c160b2282b7..ac06f25ec2c 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-04-26.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (DOM)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-04-26
 Sets:XLN, RIX, AKH, HOU, DOM
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-06-07.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-06-07.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt
index 33dedadd133..fb1b09a1d2a 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-06-07.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (KLD/AER)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-06-07
 Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-07-12.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-07-12.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt
index ea479574bb0..8fe6958013c 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-07-12.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M19)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-07-12
 Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17, M19, ANA, PANA
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-09-27.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-09-27.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt
index 3c3cc212159..819dc16bbb2 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-09-27.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (GRN)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-09-27
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-11-15.txt b/forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2018-11-15.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt
index 73459a7a989..f0d911facb0 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2018-11-15.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (G18)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2018-11-15
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-01-17.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-01-17.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt
index 0ba25bf3c87..455764bfb24 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-01-17.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (RNA)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-01-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-02-14.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-02-14.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt
index cbae7276e0b..6470cd52165 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-02-14.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-02-14)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-02-14
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-04-25.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-04-25.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt
index 7038b84bc45..ec249a99bb2 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-04-25.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (WAR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-04-25
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-07-02.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-07-02.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt
index 8650000cb26..ac07c0e028c 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-07-02.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M20)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-07-02
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-09-26.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-09-26.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt
index ede8c516143..a4cd2d9ab13 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-09-26.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ELD)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-09-26
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-10-24.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-10-24.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt
index 96c08710618..b2b6fed0267 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-10-24.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-10-24)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-10-24
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-11-18.txt b/forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2019-11-18.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt
index 56380edd053..1658128ce4a 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2019-11-18.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-11-18)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-11-18
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-01-16.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-01-16.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt
index 1593132b7fc..7c58403ac64 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-01-16.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (THB)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-01-16
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-04-16.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-04-16.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt
index 4d75dbd6ba3..eb416bc9d03 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-04-16.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (IKO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-04-16
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-04.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-04.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt
index cdcd66c3674..17c7be45582 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-04.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-06-04)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-06-04
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-25.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-25.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt
index 5f86703dbf6..0ae58ee9a6a 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-06-25.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M21)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-06-25
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-03.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-03.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt
index abdef5d1b93..3207e1566ed 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-03.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-08-03)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-08-03
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-12.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-12.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt
index 101765aa385..80fe06232e3 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-08-12.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ANB)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-08-12
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21, ANB
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-17.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-17.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt
index c9214338014..4ac0ac0fc8c 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-17.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-09-17
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-28.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-28.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt
index f9c807cf089..a69d8b28086 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-09-28.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-09-28)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-09-28
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-10-12.txt b/forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2020-10-12.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt
index c39406a9a84..4317233df69 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2020-10-12.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-10-12)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-10-12
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-01-28.txt b/forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2021-01-28.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt
index 289c9574517..d589e4305dc 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-01-28.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (KHM)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-01-28
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-04-15.txt b/forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2021-04-15.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt
index 43f5c934b11..6b0629d794a 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-04-15.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (STX)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-04-15
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-07-08.txt b/forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2021-07-08.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt
index 0edc7eec9d6..d74273acd6b 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-07-08.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (AFR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-07-08
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX, AFR
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-09-16.txt b/forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2021-09-16.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt
index 54d2adf4799..998a3863b53 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-09-16.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (MID)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-09-16
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-11-17.txt b/forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2021-11-17.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt
index aec906ed406..bbab0eaf3c5 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2021-11-17.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (VOW)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-11-17
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-01-27.txt b/forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2022-01-27.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt
index 98954c64502..bc6c9747365 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-01-27.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2022-01-27)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-01-27
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-02-10.txt b/forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2022-02-10.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt
index d6e5e4f9a9c..ea30a56ebba 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-02-10.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (NEO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-02-10
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-03-17.txt b/forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2022-03-17.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt
index a70c480e17d..e19e8236863 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-03-17.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2022-03-17)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-03-17
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-04-28.txt b/forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Arena Standard/2022-04-28.txt
rename to forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt
index c2e2c728ab3..057c1ef2238 100644
--- a/forge-gui/res/formats/Historic/DCI/Arena Standard/2022-04-28.txt	
+++ b/forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (SNC)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-04-28
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-04-28.txt b/forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-04-28.txt
rename to forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt
index 19dccfc40c9..b92fc37c90c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-04-28.txt
+++ b/forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Amonkhet (AKH)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2017-04-28
 Sets:AKH
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-07-14.txt b/forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-07-14.txt
rename to forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt
index e758a8f8767..95023b45ac9 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Amonkhet/2017-07-14.txt
+++ b/forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Amonkhet (HOU)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2017-07-14
 Sets:AKH, HOU
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2015-10-02.txt b/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2015-10-02.txt
rename to forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt
index 35790eb0f59..2edae77fac6 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2015-10-02.txt	
+++ b/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Battle for Zendikar (BFZ)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2015-10-02
 Sets:BFZ
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2016-01-22.txt b/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2016-01-22.txt
rename to forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt
index f6274f10cd1..797a8f219c9 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Battle for Zendikar/2016-01-22.txt	
+++ b/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Battle for Zendikar (OGW)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2016-01-22
 Sets:BFZ, OGW
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1996-10-01.txt b/forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Ice Age/1996-10-01.txt
rename to forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt
index 22ee3feaebc..b48890b1727 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1996-10-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (ALL)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1996-10-01
 Sets:ICE, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-05-01.txt b/forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-05-01.txt
rename to forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt
index 79010648f6c..064dd4d5382 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-05-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (ICE)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1997-05-01
 Sets:ICE
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-07-01.txt b/forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt
index 0c919f71bf5..007e911345c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/1997-07-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (HML)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1997-07-01
 Sets:ICE, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/2006-08-20.txt b/forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Ice Age/2006-08-20.txt
rename to forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt
index 6ca447718d2..512935eb736 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ice Age/2006-08-20.txt	
+++ b/forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (CSP)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2006-08-20
 Sets:ICE, ALL, CSP
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2011-09-30.txt b/forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Innistrad/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt
index deea83cedc1..49879e3634e 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (ISD)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2011-09-30
 Sets:ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-02-03.txt b/forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt
index d05df6003ad..b218a6acd86 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (DKA)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2012-02-03
 Sets:ISD, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-04-02.txt b/forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-04-02.txt
rename to forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt
index 032d8bcc487..4270e1d1607 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-04-02.txt
+++ b/forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (2012-04-02)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2012-04-02
 Sets:ISD, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-05-04.txt b/forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt
index 681644290ff..167fb5b2db9 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Innistrad/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (AVR)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2012-05-04
 Sets:ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2000-11-01.txt b/forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Invasion/2000-11-01.txt
rename to forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt
index 9a0a6c72663..f49a5b419d7 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2000-11-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (INV)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2000-11-01
 Sets:INV
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-03-01.txt b/forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-03-01.txt
rename to forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt
index dd037f41e2a..33b5b63175c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-03-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (PLS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2001-03-01
 Sets:INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-07-01.txt b/forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt
index 0d4e736c911..8ef00262b8f 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Invasion/2001-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (APC)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2001-07-01
 Sets:INV, PLS, APC
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2017-09-29.txt b/forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Ixalan/2017-09-29.txt
rename to forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt
index e8f941deb92..66ccbb6cd98 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2017-09-29.txt
+++ b/forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ixalan (XLN)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2017-09-29
 Sets:XLN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2018-01-19.txt b/forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Ixalan/2018-01-19.txt
rename to forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt
index a6cc3d9682d..6f0ef9e6514 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ixalan/2018-01-19.txt
+++ b/forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ixalan (RIX)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2018-01-19
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2016-09-30.txt b/forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2016-09-30.txt
rename to forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt
index 47ddf3b4338..449956c4b02 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2016-09-30.txt
+++ b/forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kaladesh (KLD)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2016-09-30
 Sets:KLD
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2017-01-20.txt b/forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2017-01-20.txt
rename to forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt
index b617561a7c5..6d3392b3362 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Kaladesh/2017-01-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kaladesh (AER)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2017-01-20
 Sets:KLD, AER
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2004-10-20.txt b/forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2004-10-20.txt
rename to forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt
index 09ca83ecfa8..71ab58b2d9c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2004-10-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (CHK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2004-10-20
 Sets:CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-02-20.txt b/forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-02-20.txt
rename to forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt
index 2c15e5e61d1..04a5bde634c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-02-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (BOK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2005-02-20
 Sets:CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-06-20.txt b/forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-06-20.txt
rename to forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt
index 3d0aa92e760..4f6cab097d6 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Kamigawa/2005-06-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (SOK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2005-06-20
 Sets:CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2014-09-26.txt b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2014-09-26.txt
rename to forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt
index ded36acea1f..1f8b2d42561 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2014-09-26.txt	
+++ b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (KTK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2014-09-26
 Sets:KTK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-01-23.txt b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-01-23.txt
rename to forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt
index 42160df06e2..cb22d4a6954 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-01-23.txt	
+++ b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (FRF)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2015-01-23
 Sets:KTK, FRF
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-03-27.txt b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-03-27.txt
rename to forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt
index 90c0f3bbfbc..eb25dd9d848 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Khans of Tarkir/2015-03-27.txt	
+++ b/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (DTK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2015-03-27
 Sets:KTK, FRF, DTK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2007-10-20.txt b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2007-10-20.txt
rename to forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt
index 5625f9dbcf8..d95bdc85395 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2007-10-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn (LRW)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2007-10-20
 Sets:LRW
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-02-01.txt b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-02-01.txt
rename to forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt
index f0348ff0487..40dbf6b7023 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-02-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn (MOR)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2008-02-01
 Sets:LRW, MOR
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-05-02.txt b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-05-02.txt
rename to forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt
index 19d24f4d796..47d5b03ef02 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-05-02.txt
+++ b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn;Shadowmoor (SHM)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2008-05-02
 Sets:LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-07-25.txt b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-07-25.txt
rename to forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt
index 6e75b8479a4..b9a96e510b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Lorwyn-Shadowmoor/2008-07-25.txt
+++ b/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn;Shadowmoor (EVE)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2008-07-25
 Sets:LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Masques/1999-11-01.txt b/forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Masques/1999-11-01.txt
rename to forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt
index 55a5a3a3f86..75af0db654a 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/1999-11-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (MMQ)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1999-11-01
 Sets:MMQ
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-03-01.txt b/forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Masques/2000-03-01.txt
rename to forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt
index 1d68016aebf..591f7a0d8ea 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-03-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (NMS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2000-03-01
 Sets:MMQ, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-07-01.txt b/forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Masques/2000-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt
index 03f4e3561aa..7766e412999 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Masques/2000-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (PCY)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2000-07-01
 Sets:MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Mirage-Visions-Weatherlight/1997-07-01.txt b/forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
index 3efbdbbc3a1..cef5984d2c0 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirage;Visions;Weatherlight (WTH)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1997-07-01
 Sets:MIR, VIS, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2003-10-20.txt b/forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2003-10-20.txt
rename to forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt
index 7128399d5a2..b5fa9f05aff 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2003-10-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (MRD)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2003-10-20
 Sets:MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-02-20.txt b/forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-02-20.txt
rename to forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt
index ffe42c4da12..8d13f63ef46 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-02-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (DST)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2004-02-20
 Sets:MRD, DST
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-06-20.txt b/forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-06-20.txt
rename to forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt
index 6dcf83b9d72..32caa576c8b 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2004-06-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (5DN)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2004-06-20
 Sets:MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2006-02-20.txt b/forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt
index 5ff8dfe1deb..e81131e46c8 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Mirrodin/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (2006-03-20)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2006-03-20
 Sets:MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2001-11-01.txt b/forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Odyssey/2001-11-01.txt
rename to forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt
index cd8bb8633d0..60d98cfef23 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2001-11-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (ODY)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2001-11-01
 Sets:ODY
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-03-01.txt b/forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-03-01.txt
rename to forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt
index 8f8a40be78e..9c109704820 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-03-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (TOR)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2002-03-01
 Sets:ODY, TOR
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-07-01.txt b/forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt
index add1fb364ab..021150382c4 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Odyssey/2002-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (JUD)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2002-07-01
 Sets:ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2002-11-01.txt b/forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Onslaught/2002-11-01.txt
rename to forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt
index 733c5c42356..7f49ff35dfe 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2002-11-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (ONS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2002-11-01
 Sets:ONS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-03-01.txt b/forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-03-01.txt
rename to forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt
index 47b46bdf39a..123070b445b 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-03-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (LGN)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2003-03-01
 Sets:ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-07-01.txt b/forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt
index 847ece6069b..b31ca636580 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Onslaught/2003-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (SCG)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2003-07-01
 Sets:ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1997-11-01.txt b/forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1997-11-01.txt
rename to forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt
index ab0ea4c09a8..f28a9a56609 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1997-11-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest (TMP)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1997-11-01
 Sets:TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-04-01.txt b/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-04-01.txt
rename to forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt
index f6927df88d1..534dc3d695f 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-04-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest;Stronghold (TMP)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1998-04-01
 Sets:TMP, STH
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-07-01.txt b/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt
index 8ebb724af15..af1a6cd4f08 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Rath Cycle/1998-07-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest;Stronghold;Exodus (EXO)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1998-07-01
 Sets:TMP, STH, EXO
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2005-10-20.txt b/forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Ravnica/2005-10-20.txt
rename to forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt
index 1ef02b54e1f..fdaa4ae60e3 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2005-10-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (RAV)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2005-10-20
 Sets:RAV
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-02-20.txt b/forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt
index 47455ba27c9..6be64dabd66 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (GPT)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2006-02-20
 Sets:RAV, GPT
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-05-20.txt b/forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-05-20.txt
rename to forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt
index b5c661eebdc..7a85223418d 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Ravnica/2006-05-20.txt
+++ b/forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (DIS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2006-05-20
 Sets:RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2012-10-05.txt b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt
index d68b19679a0..f590fd4abf8 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2012-10-05.txt	
+++ b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (RTR)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2012-10-05
 Sets:RTR
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-02-01.txt b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt
index cde1286d255..0007243518f 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-02-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (GTC)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2013-02-01
 Sets:RTR, GTC
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-05-03.txt b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt
index a6dc141a336..ed15d5f3c7c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Return to Ravnica/2013-05-03.txt	
+++ b/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (DGM)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2013-05-03
 Sets:RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2010-10-01.txt b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2010-10-01.txt
rename to forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt
index 230a3461c70..3570bee99be 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2010-10-01.txt	
+++ b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (SOM)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2010-10-01
 Sets:SOM
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-02-04.txt b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-02-04.txt
rename to forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt
index 406ea8a3cde..dbe5fef732c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-02-04.txt	
+++ b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (MBS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2011-02-04
 Sets:SOM, MBS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-05-13.txt b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-05-13.txt
rename to forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt
index 1675321df2a..4b1d424136f 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Scars of Mirrodin/2011-05-13.txt	
+++ b/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (NPH)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2011-05-13
 Sets:SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-04-08.txt b/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-04-08.txt
rename to forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt
index 3fab38289bb..e40760cc602 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-04-08.txt	
+++ b/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shadows over Innistrad (SOI)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2016-04-08
 Sets:SOI
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-07-22.txt b/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-07-22.txt
rename to forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt
index 6c608cc8a42..32e5451959c 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Shadows over Innistrad/2016-07-22.txt	
+++ b/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shadows over Innistrad (EMN)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2016-07-22
 Sets:SOI, EMN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2008-10-03.txt b/forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2008-10-03.txt
rename to forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt
index a0005726ef2..6b8d52cfd91 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2008-10-03.txt	
+++ b/forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (ALA)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2008-10-03
 Sets:ALA
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-02-06.txt b/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-02-06.txt
rename to forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt
index a2cbbc000f9..44fae88e0c7 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-02-06.txt	
+++ b/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (CFX)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2009-02-06
 Sets:ALA, CFX
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-04-30.txt b/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-04-30.txt
rename to forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt
index 96c480d6101..967d7b4dcde 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Shards of Alara/2009-04-30.txt	
+++ b/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (ARB)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2009-04-30
 Sets:ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Theros/2013-09-27.txt b/forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Theros/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt
index 1ae81518186..60b28c90d63 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (THS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2013-09-23
 Sets:THS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-02-07.txt b/forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Theros/2014-02-07.txt
rename to forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt
index 04a146c169a..10f3ee87f68 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-02-07.txt
+++ b/forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (BNG)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2014-02-07
 Sets:THS, BNG
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-05-02.txt b/forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Theros/2014-05-02.txt
rename to forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt
index 6378e056f8e..7ddb1172785 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Theros/2014-05-02.txt
+++ b/forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (JOU)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2014-05-02
 Sets:THS, BNG, JOU
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2006-10-20.txt b/forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2006-10-20.txt
rename to forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt
index 3126e2af19c..67613a235cb 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2006-10-20.txt	
+++ b/forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (TSP)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2006-10-20
 Sets:TSP, TSB
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-02-20.txt b/forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-02-20.txt
rename to forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt
index 400b2811634..4db40d4ef53 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-02-20.txt	
+++ b/forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (PLC)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2007-02-20
 Sets:TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-05-20.txt b/forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-05-20.txt
rename to forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt
index 75662c7fa81..c7a99bdea9f 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Time Spiral/2007-05-20.txt	
+++ b/forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (FUT)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2007-05-20
 Sets:TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-01-01.txt b/forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt
similarity index 84%
rename from forge-gui/res/formats/Historic/DCI/Block/Urza/1999-01-01.txt
rename to forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt
index 9e0677d235d..51aa83e9bbd 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-01-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (USG)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1999-01-01
 Sets:USG
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-03-01.txt b/forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Urza/1999-03-01.txt
rename to forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt
index 3515ad25199..0f691138c4a 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-03-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (ULG)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1999-03-01
 Sets:USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-04-01.txt b/forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Block/Urza/1999-04-01.txt
rename to forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt
index 347f31e3d1b..9d6a4cbe541 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-04-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (1999-04-01)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1999-04-01
 Sets:USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-07-01.txt b/forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Block/Urza/1999-07-01.txt
rename to forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt
index e90418b7685..d8a2dc8cc1b 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Urza/1999-07-01.txt
+++ b/forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (UDS)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:1999-07-01
 Sets:USG, ULG, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2009-10-02.txt b/forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Zendikar/2009-10-02.txt
rename to forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt
index c434a5292bc..9ec0327c544 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2009-10-02.txt
+++ b/forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (ZEN)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2009-10-02
 Sets:ZEN
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-02-05.txt b/forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-02-05.txt
rename to forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt
index c12313b83d0..912b52761d8 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-02-05.txt
+++ b/forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (WWK)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2010-02-05
 Sets:ZEN, WWK
diff --git a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-04-23.txt b/forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-04-23.txt
rename to forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt
index 461b35989cf..fca30ad8db7 100644
--- a/forge-gui/res/formats/Historic/DCI/Block/Zendikar/2010-04-23.txt
+++ b/forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (ROE)
-Type:Historic
+Type:Archive
 Subtype:Block
 Effective:2010-04-23
 Sets:ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Historic/DCI/Explorer/2022-04-21.txt b/forge-gui/res/formats/Archive/Explorer/2022-04-21.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Explorer/2022-04-21.txt
rename to forge-gui/res/formats/Archive/Explorer/2022-04-21.txt
index 3bd98385dd5..8e529852c5c 100644
--- a/forge-gui/res/formats/Historic/DCI/Explorer/2022-04-21.txt
+++ b/forge-gui/res/formats/Archive/Explorer/2022-04-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Explorer (2022-04-21)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-04-21
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Explorer/2022-04-28.txt b/forge-gui/res/formats/Archive/Explorer/2022-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Explorer/2022-04-28.txt
rename to forge-gui/res/formats/Archive/Explorer/2022-04-28.txt
index 733c38c7d7b..f5bf7f76993 100644
--- a/forge-gui/res/formats/Historic/DCI/Explorer/2022-04-28.txt
+++ b/forge-gui/res/formats/Archive/Explorer/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Explorer (SNC)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-04-28
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1997-07-01.txt b/forge-gui/res/formats/Archive/Extended/1997-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/1997-07-01.txt
index a282d3da38f..45895e902c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1997-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1997-07-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1997-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1997-10-01.txt b/forge-gui/res/formats/Archive/Extended/1997-10-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1997-10-01.txt
rename to forge-gui/res/formats/Archive/Extended/1997-10-01.txt
index b27653cbbee..d469b66b0c0 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1997-10-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1997-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1997-10-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1997-10-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1997-11-01.txt b/forge-gui/res/formats/Archive/Extended/1997-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1997-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/1997-11-01.txt
index e56f6677711..19ab52577e4 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1997-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TMP)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1997-11-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1998-04-01.txt b/forge-gui/res/formats/Archive/Extended/1998-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1998-04-01.txt
rename to forge-gui/res/formats/Archive/Extended/1998-04-01.txt
index 42f812a7e21..d024f51ebc2 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1998-04-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (STH)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1998-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1998-07-01.txt b/forge-gui/res/formats/Archive/Extended/1998-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1998-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/1998-07-01.txt
index eb95bf1ef37..80519ea6dd5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1998-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (EXO)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1998-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1998-11-01.txt b/forge-gui/res/formats/Archive/Extended/1998-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1998-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/1998-11-01.txt
index b09cb04c731..19e062f5e84 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1998-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (USG)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1998-11-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-01-01.txt b/forge-gui/res/formats/Archive/Extended/1999-01-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-01-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-01-01.txt
index 7764e980d65..0532b3d3e20 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-01-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-01-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-01-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-03-01.txt b/forge-gui/res/formats/Archive/Extended/1999-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-03-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-03-01.txt
index 7b8d4c2b83c..10846086de8 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-03-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ULG)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-04-01.txt b/forge-gui/res/formats/Archive/Extended/1999-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-04-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-04-01.txt
index 07e23efc4d9..035c66384a6 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-04-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-04-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-06-01.txt b/forge-gui/res/formats/Archive/Extended/1999-06-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-06-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-06-01.txt
index b28f729a845..38419ed4ef3 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-06-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (6ED)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-06-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-07-01.txt b/forge-gui/res/formats/Archive/Extended/1999-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-07-01.txt
index a3f41a13684..39858031487 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (UDS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-09-01.txt b/forge-gui/res/formats/Archive/Extended/1999-09-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-09-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-09-01.txt
index d3d05967f9a..938cf514354 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-09-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-09-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-09-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-10-01.txt b/forge-gui/res/formats/Archive/Extended/1999-10-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-10-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-10-01.txt
index b45d3ed39d5..54cfe891b2a 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-10-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-10-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-10-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/1999-11-01.txt b/forge-gui/res/formats/Archive/Extended/1999-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/1999-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/1999-11-01.txt
index 8b122bcb149..485f5ba953f 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/1999-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MMQ)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:1999-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2000-03-01.txt b/forge-gui/res/formats/Archive/Extended/2000-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2000-03-01.txt
rename to forge-gui/res/formats/Archive/Extended/2000-03-01.txt
index da6ffa54bde..c8e6974f19e 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2000-03-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (NMS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2000-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2000-04-01.txt b/forge-gui/res/formats/Archive/Extended/2000-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2000-04-01.txt
rename to forge-gui/res/formats/Archive/Extended/2000-04-01.txt
index dbf3254783f..10593c45349 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2000-04-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2000-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2000-04-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2000-04-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2000-07-01.txt b/forge-gui/res/formats/Archive/Extended/2000-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2000-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/2000-07-01.txt
index 5a1ef02428b..2c52611a834 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2000-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PCY)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2000-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2000-11-01.txt b/forge-gui/res/formats/Archive/Extended/2000-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2000-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/2000-11-01.txt
index 069667f3a38..d1f5a57de05 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2000-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (INV)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2000-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2001-03-01.txt b/forge-gui/res/formats/Archive/Extended/2001-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2001-03-01.txt
rename to forge-gui/res/formats/Archive/Extended/2001-03-01.txt
index 3bbd2163ecf..7314b797bee 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2001-03-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PLS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2001-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2001-04-01.txt b/forge-gui/res/formats/Archive/Extended/2001-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2001-04-01.txt
rename to forge-gui/res/formats/Archive/Extended/2001-04-01.txt
index 3ac9b4e9b99..02229f05657 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2001-04-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2001-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2001-04-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2001-04-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2001-05-01.txt b/forge-gui/res/formats/Archive/Extended/2001-05-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2001-05-01.txt
rename to forge-gui/res/formats/Archive/Extended/2001-05-01.txt
index 57dcebc91ff..b7453e41210 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2001-05-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (7ED)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2001-05-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2001-07-01.txt b/forge-gui/res/formats/Archive/Extended/2001-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2001-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/2001-07-01.txt
index c6c6f492310..45f0c051af6 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2001-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (APC)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2001-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2001-11-01.txt b/forge-gui/res/formats/Archive/Extended/2001-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2001-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/2001-11-01.txt
index 19d926ce52a..8e2d2e45857 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2001-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ODY)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2001-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2002-03-01.txt b/forge-gui/res/formats/Archive/Extended/2002-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2002-03-01.txt
rename to forge-gui/res/formats/Archive/Extended/2002-03-01.txt
index 148558eb751..2cdb6099b82 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2002-03-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TOR)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2002-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2002-07-01.txt b/forge-gui/res/formats/Archive/Extended/2002-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2002-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/2002-07-01.txt
index e9f458538f3..1fc7b6a0dc2 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2002-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (JUD)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2002-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2002-11-01.txt b/forge-gui/res/formats/Archive/Extended/2002-11-01.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2002-11-01.txt
rename to forge-gui/res/formats/Archive/Extended/2002-11-01.txt
index 45fa65d053d..973aaa8d111 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2002-11-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ONS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2002-11-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2003-03-01.txt b/forge-gui/res/formats/Archive/Extended/2003-03-01.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2003-03-01.txt
rename to forge-gui/res/formats/Archive/Extended/2003-03-01.txt
index 84f0a7a9132..57d03d9d909 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2003-03-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (LGN)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2003-03-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2003-07-01.txt b/forge-gui/res/formats/Archive/Extended/2003-07-01.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2003-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/2003-07-01.txt
index c84e2910757..b08bb75cbb5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2003-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SCG)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2003-07-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2003-09-01.txt b/forge-gui/res/formats/Archive/Extended/2003-09-01.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2003-09-01.txt
rename to forge-gui/res/formats/Archive/Extended/2003-09-01.txt
index c9450f65f7a..a9baf9ec3d5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2003-09-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (8ED)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2003-09-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2003-10-01.txt b/forge-gui/res/formats/Archive/Extended/2003-10-01.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2003-10-01.txt
rename to forge-gui/res/formats/Archive/Extended/2003-10-01.txt
index 00fc9b34a7a..f98318217f0 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2003-10-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2003-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2003-10-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2003-10-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2003-10-20.txt b/forge-gui/res/formats/Archive/Extended/2003-10-20.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Extended/2003-10-20.txt
rename to forge-gui/res/formats/Archive/Extended/2003-10-20.txt
index b89daef2937..40755c78852 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2003-10-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MRD)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2003-10-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2004-01-01.txt b/forge-gui/res/formats/Archive/Extended/2004-01-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2004-01-01.txt
rename to forge-gui/res/formats/Archive/Extended/2004-01-01.txt
index 9aac8edb14e..f39c7b57641 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2004-01-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2004-01-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2004-01-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2004-02-20.txt b/forge-gui/res/formats/Archive/Extended/2004-02-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2004-02-20.txt
rename to forge-gui/res/formats/Archive/Extended/2004-02-20.txt
index d5b05a1236b..8f955aa9b4b 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2004-02-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DST)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2004-02-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2004-06-20.txt b/forge-gui/res/formats/Archive/Extended/2004-06-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2004-06-20.txt
rename to forge-gui/res/formats/Archive/Extended/2004-06-20.txt
index b90a7295d32..f748a443c7a 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2004-06-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (5DN)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2004-06-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2004-09-20.txt b/forge-gui/res/formats/Archive/Extended/2004-09-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2004-09-20.txt
rename to forge-gui/res/formats/Archive/Extended/2004-09-20.txt
index 58d9c5fddc9..a80880aaa4c 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2004-09-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2004-09-20)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2004-09-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2004-10-20.txt b/forge-gui/res/formats/Archive/Extended/2004-10-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2004-10-20.txt
rename to forge-gui/res/formats/Archive/Extended/2004-10-20.txt
index 13add59290d..921e2156e63 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2004-10-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CHK)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2004-10-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2005-02-20.txt b/forge-gui/res/formats/Archive/Extended/2005-02-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2005-02-20.txt
rename to forge-gui/res/formats/Archive/Extended/2005-02-20.txt
index 1b4aad64b93..d3ac4d7531d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2005-02-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (BOK)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2005-02-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2005-06-20.txt b/forge-gui/res/formats/Archive/Extended/2005-06-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2005-06-20.txt
rename to forge-gui/res/formats/Archive/Extended/2005-06-20.txt
index 441996524b3..e5dc42c981d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2005-06-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SOK)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2005-06-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2005-08-20.txt b/forge-gui/res/formats/Archive/Extended/2005-08-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2005-08-20.txt
rename to forge-gui/res/formats/Archive/Extended/2005-08-20.txt
index 344d244d339..e75705d12a9 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2005-08-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (9ED)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2005-08-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2005-09-20.txt b/forge-gui/res/formats/Archive/Extended/2005-09-20.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Extended/2005-09-20.txt
rename to forge-gui/res/formats/Archive/Extended/2005-09-20.txt
index 5e434f22b07..58254fadd3f 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2005-09-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2005-09-20)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2005-09-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2005-10-20.txt b/forge-gui/res/formats/Archive/Extended/2005-10-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2005-10-20.txt
rename to forge-gui/res/formats/Archive/Extended/2005-10-20.txt
index 062abc91750..6eef11f8b89 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2005-10-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (RAV)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2005-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2006-02-20.txt b/forge-gui/res/formats/Archive/Extended/2006-02-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Extended/2006-02-20.txt
index d2477234c58..a6095d2f62f 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (GPT)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2006-02-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2006-05-20.txt b/forge-gui/res/formats/Archive/Extended/2006-05-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2006-05-20.txt
rename to forge-gui/res/formats/Archive/Extended/2006-05-20.txt
index 096f0dc0ed4..5fd2a615f70 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2006-05-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DIS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2006-05-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2006-08-20.txt b/forge-gui/res/formats/Archive/Extended/2006-08-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2006-08-20.txt
rename to forge-gui/res/formats/Archive/Extended/2006-08-20.txt
index 9640f01f9e4..c2612751e62 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2006-08-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CSP)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2006-08-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2006-10-20.txt b/forge-gui/res/formats/Archive/Extended/2006-10-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2006-10-20.txt
rename to forge-gui/res/formats/Archive/Extended/2006-10-20.txt
index e0682f846f6..f6f4db9a4be 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2006-10-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TSP)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2006-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2007-02-20.txt b/forge-gui/res/formats/Archive/Extended/2007-02-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2007-02-20.txt
rename to forge-gui/res/formats/Archive/Extended/2007-02-20.txt
index c5ea32fed05..45c344bd78d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2007-02-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PLC)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2007-02-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2007-05-20.txt b/forge-gui/res/formats/Archive/Extended/2007-05-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2007-05-20.txt
rename to forge-gui/res/formats/Archive/Extended/2007-05-20.txt
index fe1f159c7ba..27787c551ae 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2007-05-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (FUT)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2007-05-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2007-07-20.txt b/forge-gui/res/formats/Archive/Extended/2007-07-20.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2007-07-20.txt
rename to forge-gui/res/formats/Archive/Extended/2007-07-20.txt
index 1b8f150d7b7..2a2ebc617a0 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2007-07-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (10E)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2007-07-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2007-10-20.txt b/forge-gui/res/formats/Archive/Extended/2007-10-20.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2007-10-20.txt
rename to forge-gui/res/formats/Archive/Extended/2007-10-20.txt
index 6c197b8e281..6885193b062 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2007-10-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (LRW)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2007-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2008-02-01.txt b/forge-gui/res/formats/Archive/Extended/2008-02-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2008-02-01.txt
rename to forge-gui/res/formats/Archive/Extended/2008-02-01.txt
index 2ddf84bc247..95f7ed8788d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2008-02-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MOR)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2008-02-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2008-05-02.txt b/forge-gui/res/formats/Archive/Extended/2008-05-02.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2008-05-02.txt
rename to forge-gui/res/formats/Archive/Extended/2008-05-02.txt
index 26dfcb713b8..f88e4444a17 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2008-05-02.txt
+++ b/forge-gui/res/formats/Archive/Extended/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SHM)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2008-05-02
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2008-07-25.txt b/forge-gui/res/formats/Archive/Extended/2008-07-25.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2008-07-25.txt
rename to forge-gui/res/formats/Archive/Extended/2008-07-25.txt
index 4f1671376d4..ac86989cd93 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2008-07-25.txt
+++ b/forge-gui/res/formats/Archive/Extended/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (EVE)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2008-07-25
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2008-09-20.txt b/forge-gui/res/formats/Archive/Extended/2008-09-20.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2008-09-20.txt
rename to forge-gui/res/formats/Archive/Extended/2008-09-20.txt
index 34f3bc1d493..4f4faf505eb 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2008-09-20.txt
+++ b/forge-gui/res/formats/Archive/Extended/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2008-09-20)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2008-09-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2008-10-03.txt b/forge-gui/res/formats/Archive/Extended/2008-10-03.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2008-10-03.txt
rename to forge-gui/res/formats/Archive/Extended/2008-10-03.txt
index 393b29188a4..e7813a2f15f 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2008-10-03.txt
+++ b/forge-gui/res/formats/Archive/Extended/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ALA)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2008-10-03
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2009-02-06.txt b/forge-gui/res/formats/Archive/Extended/2009-02-06.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2009-02-06.txt
rename to forge-gui/res/formats/Archive/Extended/2009-02-06.txt
index e5bea006d24..62da189ae3c 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2009-02-06.txt
+++ b/forge-gui/res/formats/Archive/Extended/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CFX)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2009-02-06
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2009-04-30.txt b/forge-gui/res/formats/Archive/Extended/2009-04-30.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2009-04-30.txt
rename to forge-gui/res/formats/Archive/Extended/2009-04-30.txt
index 36d54918919..93f241ea668 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2009-04-30.txt
+++ b/forge-gui/res/formats/Archive/Extended/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ARB)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2009-04-30
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2009-07-17.txt b/forge-gui/res/formats/Archive/Extended/2009-07-17.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2009-07-17.txt
rename to forge-gui/res/formats/Archive/Extended/2009-07-17.txt
index 58b0c7e853b..ecca4a424ae 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2009-07-17.txt
+++ b/forge-gui/res/formats/Archive/Extended/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M10)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2009-07-17
 Sets:ONS, LGN, SCG, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2009-10-02.txt b/forge-gui/res/formats/Archive/Extended/2009-10-02.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2009-10-02.txt
rename to forge-gui/res/formats/Archive/Extended/2009-10-02.txt
index d1385e995fb..69a6ab83952 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2009-10-02.txt
+++ b/forge-gui/res/formats/Archive/Extended/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ZEN)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2009-10-02
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2010-02-05.txt b/forge-gui/res/formats/Archive/Extended/2010-02-05.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2010-02-05.txt
rename to forge-gui/res/formats/Archive/Extended/2010-02-05.txt
index 140f039ba06..8506984842e 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2010-02-05.txt
+++ b/forge-gui/res/formats/Archive/Extended/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (WWK)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2010-02-05
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2010-04-23.txt b/forge-gui/res/formats/Archive/Extended/2010-04-23.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Extended/2010-04-23.txt
rename to forge-gui/res/formats/Archive/Extended/2010-04-23.txt
index 58141c47ce3..ed922a846b5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2010-04-23.txt
+++ b/forge-gui/res/formats/Archive/Extended/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ROE)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2010-04-23
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2010-07-01.txt b/forge-gui/res/formats/Archive/Extended/2010-07-01.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Extended/2010-07-01.txt
rename to forge-gui/res/formats/Archive/Extended/2010-07-01.txt
index 67ffc0770a8..e43166fdfac 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2010-07-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2010-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2010-07-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2010-07-01
 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2010-07-16.txt b/forge-gui/res/formats/Archive/Extended/2010-07-16.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Extended/2010-07-16.txt
rename to forge-gui/res/formats/Archive/Extended/2010-07-16.txt
index 907a6358209..5de28873182 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2010-07-16.txt
+++ b/forge-gui/res/formats/Archive/Extended/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M11)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2010-07-16
 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2010-10-01.txt b/forge-gui/res/formats/Archive/Extended/2010-10-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Extended/2010-10-01.txt
rename to forge-gui/res/formats/Archive/Extended/2010-10-01.txt
index 34c352b8e4e..2ad181061bf 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2010-10-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SOM)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2010-10-01
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2011-02-04.txt b/forge-gui/res/formats/Archive/Extended/2011-02-04.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Extended/2011-02-04.txt
rename to forge-gui/res/formats/Archive/Extended/2011-02-04.txt
index 7dedfeacb01..e919752f092 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2011-02-04.txt
+++ b/forge-gui/res/formats/Archive/Extended/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MBS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2011-02-04
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2011-05-13.txt b/forge-gui/res/formats/Archive/Extended/2011-05-13.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Extended/2011-05-13.txt
rename to forge-gui/res/formats/Archive/Extended/2011-05-13.txt
index 07c874a40ba..df6f33818b5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2011-05-13.txt
+++ b/forge-gui/res/formats/Archive/Extended/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (NPH)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2011-05-13
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2011-07-15.txt b/forge-gui/res/formats/Archive/Extended/2011-07-15.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Extended/2011-07-15.txt
rename to forge-gui/res/formats/Archive/Extended/2011-07-15.txt
index 4cd4f9fcf3a..4c692a521d5 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2011-07-15.txt
+++ b/forge-gui/res/formats/Archive/Extended/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M12)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2011-07-15
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2011-09-30.txt b/forge-gui/res/formats/Archive/Extended/2011-09-30.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Extended/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Extended/2011-09-30.txt
index 63a66dcee6a..8df69be5fa7 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Extended/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ISD)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2011-09-30
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2011-10-01.txt b/forge-gui/res/formats/Archive/Extended/2011-10-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2011-10-01.txt
rename to forge-gui/res/formats/Archive/Extended/2011-10-01.txt
index b48f6616c4f..1b5ea203b19 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2011-10-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2011-10-01)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2011-10-01
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2012-02-03.txt b/forge-gui/res/formats/Archive/Extended/2012-02-03.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Extended/2012-02-03.txt
index eb88027b534..e65a8395a01 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Extended/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DKA)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2012-02-03
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2012-05-04.txt b/forge-gui/res/formats/Archive/Extended/2012-05-04.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Extended/2012-05-04.txt
index 290b8a011ab..a6210d99583 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Extended/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (AVR)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2012-05-04
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2012-07-13.txt b/forge-gui/res/formats/Archive/Extended/2012-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2012-07-13.txt
rename to forge-gui/res/formats/Archive/Extended/2012-07-13.txt
index 5f675a19fee..72ea93e871e 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2012-07-13.txt
+++ b/forge-gui/res/formats/Archive/Extended/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M13)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2012-07-13
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2012-10-05.txt b/forge-gui/res/formats/Archive/Extended/2012-10-05.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Extended/2012-10-05.txt
index 8ed7ee67b4b..30c2992396a 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2012-10-05.txt
+++ b/forge-gui/res/formats/Archive/Extended/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (RTR)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2012-10-05
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2013-02-01.txt b/forge-gui/res/formats/Archive/Extended/2013-02-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Extended/2013-02-01.txt
index 9969f63bbe3..17021cb192d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2013-02-01.txt
+++ b/forge-gui/res/formats/Archive/Extended/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (GTC)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2013-02-01
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2013-05-03.txt b/forge-gui/res/formats/Archive/Extended/2013-05-03.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Extended/2013-05-03.txt
index 0d475c940c4..cec1aacf0ca 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2013-05-03.txt
+++ b/forge-gui/res/formats/Archive/Extended/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DGM)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2013-05-03
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2013-07-19.txt b/forge-gui/res/formats/Archive/Extended/2013-07-19.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Extended/2013-07-19.txt
rename to forge-gui/res/formats/Archive/Extended/2013-07-19.txt
index cde4ba838d2..2f28c6c7c65 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2013-07-19.txt
+++ b/forge-gui/res/formats/Archive/Extended/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M14)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2013-07-19
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
diff --git a/forge-gui/res/formats/Historic/DCI/Extended/2013-09-27.txt b/forge-gui/res/formats/Archive/Extended/2013-09-27.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Extended/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Extended/2013-09-27.txt
index 0350f3a68c1..77032c0ea6d 100644
--- a/forge-gui/res/formats/Historic/DCI/Extended/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Extended/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (THS)
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2013-09-27
 Retired:2013-10-08
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2019-11-21.txt b/forge-gui/res/formats/Archive/Historic/2019-11-21.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Historic/2019-11-21.txt
rename to forge-gui/res/formats/Archive/Historic/2019-11-21.txt
index ee3bdad5d23..541e3c82bd6 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2019-11-21.txt
+++ b/forge-gui/res/formats/Archive/Historic/2019-11-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2019-11-21)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2019-11-21
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-01-16.txt b/forge-gui/res/formats/Archive/Historic/2020-01-16.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-01-16.txt
rename to forge-gui/res/formats/Archive/Historic/2020-01-16.txt
index c65465f0aa6..2f31d69b484 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-01-16.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-01-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (THB)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-01-16
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-03-09.txt b/forge-gui/res/formats/Archive/Historic/2020-03-09.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-03-09.txt
rename to forge-gui/res/formats/Archive/Historic/2020-03-09.txt
index 8c7daa6f9a7..d7cee71a46d 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-03-09.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-03-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-03-09)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-03-09
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-03-12.txt b/forge-gui/res/formats/Archive/Historic/2020-03-12.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-03-12.txt
rename to forge-gui/res/formats/Archive/Historic/2020-03-12.txt
index 3017b34f954..2d761326051 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-03-12.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-03-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA2)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-03-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-04-16.txt b/forge-gui/res/formats/Archive/Historic/2020-04-16.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-04-16.txt
rename to forge-gui/res/formats/Archive/Historic/2020-04-16.txt
index 0bcbcc007f4..75d9474d852 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-04-16.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-04-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (IKO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-04-16
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-05-21.txt b/forge-gui/res/formats/Archive/Historic/2020-05-21.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-05-21.txt
rename to forge-gui/res/formats/Archive/Historic/2020-05-21.txt
index fc7bcb3c475..e2a0a13af2a 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-05-21.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-05-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA3)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-05-21
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-06-25.txt b/forge-gui/res/formats/Archive/Historic/2020-06-25.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-06-25.txt
rename to forge-gui/res/formats/Archive/Historic/2020-06-25.txt
index e164c731568..9795a1a1c4a 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-06-25.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-06-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (M21)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-06-25
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-07-13.txt b/forge-gui/res/formats/Archive/Historic/2020-07-13.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-07-13.txt
rename to forge-gui/res/formats/Archive/Historic/2020-07-13.txt
index 890938b423a..1361c8d16d9 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-07-13.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-07-13)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-07-13
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-07-17.txt b/forge-gui/res/formats/Archive/Historic/2020-07-17.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-07-17.txt
rename to forge-gui/res/formats/Archive/Historic/2020-07-17.txt
index a61b456c52b..aedd614f3be 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-07-17.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (JMP)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-07-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-08-13.txt b/forge-gui/res/formats/Archive/Historic/2020-08-13.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-08-13.txt
rename to forge-gui/res/formats/Archive/Historic/2020-08-13.txt
index 98c76d9430a..f9188900797 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-08-13.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-08-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (AKR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-08-13
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-08-24.txt b/forge-gui/res/formats/Archive/Historic/2020-08-24.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-08-24.txt
rename to forge-gui/res/formats/Archive/Historic/2020-08-24.txt
index b343c265496..52cbaaca6c6 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-08-24.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-08-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-08-24)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-08-24
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-09-17.txt b/forge-gui/res/formats/Archive/Historic/2020-09-17.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-09-17.txt
rename to forge-gui/res/formats/Archive/Historic/2020-09-17.txt
index 7ebb4412b31..f4c219912f6 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-09-17.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-09-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-09-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-10-12.txt b/forge-gui/res/formats/Archive/Historic/2020-10-12.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-10-12.txt
rename to forge-gui/res/formats/Archive/Historic/2020-10-12.txt
index 54a0a29a266..132f4c822d5 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-10-12.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-10-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-10-12)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-10-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2020-11-12.txt b/forge-gui/res/formats/Archive/Historic/2020-11-12.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Historic/2020-11-12.txt
rename to forge-gui/res/formats/Archive/Historic/2020-11-12.txt
index f51593fa172..88c1933a9bc 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2020-11-12.txt
+++ b/forge-gui/res/formats/Archive/Historic/2020-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (KLR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2020-11-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-01-28.txt b/forge-gui/res/formats/Archive/Historic/2021-01-28.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-01-28.txt
rename to forge-gui/res/formats/Archive/Historic/2021-01-28.txt
index 40b4f62adbc..2ad10d4fd3f 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-01-28.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (KHM)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-01-28
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-02-15.txt b/forge-gui/res/formats/Archive/Historic/2021-02-15.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-02-15.txt
rename to forge-gui/res/formats/Archive/Historic/2021-02-15.txt
index 0844b20a86b..72fc1819065 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-02-15.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-02-15)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-02-15
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-03-11.txt b/forge-gui/res/formats/Archive/Historic/2021-03-11.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-03-11.txt
rename to forge-gui/res/formats/Archive/Historic/2021-03-11.txt
index 7df6d0892d2..e122232f266 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-03-11.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-03-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA4)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-03-11
 Sets:XLN, RIX, DOM, M19, ANA, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-04-15.txt b/forge-gui/res/formats/Archive/Historic/2021-04-15.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-04-15.txt
rename to forge-gui/res/formats/Archive/Historic/2021-04-15.txt
index 4011931e6f8..7b164b2591c 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-04-15.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-04-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (STX)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-04-15
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-05-19.txt b/forge-gui/res/formats/Archive/Historic/2021-05-19.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-05-19.txt
rename to forge-gui/res/formats/Archive/Historic/2021-05-19.txt
index ee3d42171b3..75bff3efcc2 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-05-19.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-05-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-05-19)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-05-19
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-05-27.txt b/forge-gui/res/formats/Archive/Historic/2021-05-27.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-05-27.txt
rename to forge-gui/res/formats/Archive/Historic/2021-05-27.txt
index 4c47d62fcaf..0b5841e4bc4 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-05-27.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-05-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA5)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-05-27
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-06-09.txt b/forge-gui/res/formats/Archive/Historic/2021-06-09.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-06-09.txt
rename to forge-gui/res/formats/Archive/Historic/2021-06-09.txt
index 5ebc79540af..7395c80fb45 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-06-09.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-06-09)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-06-09
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-07-08.txt b/forge-gui/res/formats/Archive/Historic/2021-07-08.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-07-08.txt
rename to forge-gui/res/formats/Archive/Historic/2021-07-08.txt
index 235a37fe5d2..d18c8e3ba7e 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-07-08.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-07-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (AFR)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-07-08
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-08-26.txt b/forge-gui/res/formats/Archive/Historic/2021-08-26.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-08-26.txt
rename to forge-gui/res/formats/Archive/Historic/2021-08-26.txt
index a77eaa86d99..7276ea310aa 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-08-26.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (J21)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-08-26
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-09-16.txt b/forge-gui/res/formats/Archive/Historic/2021-09-16.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-09-16.txt
rename to forge-gui/res/formats/Archive/Historic/2021-09-16.txt
index e092b0fc012..24a174b6fc5 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-09-16.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-09-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (MID)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-09-16
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-10-13.txt b/forge-gui/res/formats/Archive/Historic/2021-10-13.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-10-13.txt
rename to forge-gui/res/formats/Archive/Historic/2021-10-13.txt
index 3017b1e897c..b035380b660 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-10-13.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-10-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-10-13)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-10-13
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-11-17.txt b/forge-gui/res/formats/Archive/Historic/2021-11-17.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-11-17.txt
rename to forge-gui/res/formats/Archive/Historic/2021-11-17.txt
index 69608baaad4..8b765e98f59 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-11-17.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (VOW)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-11-17
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2021-12-09.txt b/forge-gui/res/formats/Archive/Historic/2021-12-09.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2021-12-09.txt
rename to forge-gui/res/formats/Archive/Historic/2021-12-09.txt
index 0535672968c..736297e7eef 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2021-12-09.txt
+++ b/forge-gui/res/formats/Archive/Historic/2021-12-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (YMID)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2021-12-09
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-01-25.txt b/forge-gui/res/formats/Archive/Historic/2022-01-25.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-01-25.txt
rename to forge-gui/res/formats/Archive/Historic/2022-01-25.txt
index ae0204b3b29..c350f89b5ca 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2022-01-25.txt
+++ b/forge-gui/res/formats/Archive/Historic/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2022-01-25)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-01-25
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-02-10.txt b/forge-gui/res/formats/Archive/Historic/2022-02-10.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-02-10.txt
rename to forge-gui/res/formats/Archive/Historic/2022-02-10.txt
index eed85228b7d..3f8e6c05eae 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2022-02-10.txt
+++ b/forge-gui/res/formats/Archive/Historic/2022-02-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (NEO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-02-10
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-02-24.txt b/forge-gui/res/formats/Archive/Historic/2022-02-24.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-02-24.txt
rename to forge-gui/res/formats/Archive/Historic/2022-02-24.txt
index 460b6bbb89a..e2ea1feb550 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2022-02-24.txt
+++ b/forge-gui/res/formats/Archive/Historic/2022-02-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2022-02-24)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-02-24
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-03-17.txt b/forge-gui/res/formats/Archive/Historic/2022-03-17.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-03-17.txt
rename to forge-gui/res/formats/Archive/Historic/2022-03-17.txt
index 8f3b15a36b6..f49ef6a6120 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2022-03-17.txt
+++ b/forge-gui/res/formats/Archive/Historic/2022-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (YNEO)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-03-17
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-04-28.txt b/forge-gui/res/formats/Archive/Historic/2022-04-28.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-04-28.txt
rename to forge-gui/res/formats/Archive/Historic/2022-04-28.txt
index ce43dd1b9ea..58f31e3750e 100644
--- a/forge-gui/res/formats/Historic/DCI/Historic/2022-04-28.txt
+++ b/forge-gui/res/formats/Archive/Historic/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (SNC)
-Type:Historic
+Type:Archive
 Subtype:Arena
 Effective:2022-04-28
 Sets: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
diff --git a/forge-gui/res/formats/Historic/DCI/Historic/2022-06-02.txt b/forge-gui/res/formats/Archive/Historic/2022-06-02.txt
similarity index 100%
rename from forge-gui/res/formats/Historic/DCI/Historic/2022-06-02.txt
rename to forge-gui/res/formats/Archive/Historic/2022-06-02.txt
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1996-05-01.txt b/forge-gui/res/formats/Archive/Legacy/1996-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1996-05-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1996-05-01.txt
index 8261c12b71a..eed55c80069 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1996-05-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1996-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-05-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1996-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1996-07-01.txt b/forge-gui/res/formats/Archive/Legacy/1996-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1996-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1996-07-01.txt
index a4ed9fc0fa8..3f95d9224f5 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1996-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1996-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-07-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1996-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1996-07-10.txt b/forge-gui/res/formats/Archive/Legacy/1996-07-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1996-07-10.txt
rename to forge-gui/res/formats/Archive/Legacy/1996-07-10.txt
index bb5a34bc799..b805561f580 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1996-07-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ALL)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1996-07-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1996-10-01.txt b/forge-gui/res/formats/Archive/Legacy/1996-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1996-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1996-10-01.txt
index 4c433ebef7c..b7ecca93a57 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1996-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-10-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1996-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1996-11-07.txt b/forge-gui/res/formats/Archive/Legacy/1996-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1996-11-07.txt
rename to forge-gui/res/formats/Archive/Legacy/1996-11-07.txt
index fbf66362069..03a47878bf3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1996-11-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MIR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1996-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1997-01-01.txt b/forge-gui/res/formats/Archive/Legacy/1997-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1997-01-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1997-01-01.txt
index b25865db67c..6831fb5390d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1997-01-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1997-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1997-01-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1997-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1997-03-05.txt b/forge-gui/res/formats/Archive/Legacy/1997-03-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1997-03-05.txt
rename to forge-gui/res/formats/Archive/Legacy/1997-03-05.txt
index f584f8ed9c5..312161302c6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1997-03-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (VIS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1997-03-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1997-04-23.txt b/forge-gui/res/formats/Archive/Legacy/1997-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1997-04-23.txt
rename to forge-gui/res/formats/Archive/Legacy/1997-04-23.txt
index e97aaa1319d..22e89651812 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1997-04-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (5ED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1997-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1997-07-01.txt b/forge-gui/res/formats/Archive/Legacy/1997-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1997-07-01.txt
index 8b8b2b1d6a6..97186fc614e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1997-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (WTH)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1997-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1997-11-01.txt b/forge-gui/res/formats/Archive/Legacy/1997-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1997-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1997-11-01.txt
index 424a9d45cda..07bef3554aa 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1997-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (TMP)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1997-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1998-04-01.txt b/forge-gui/res/formats/Archive/Legacy/1998-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1998-04-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1998-04-01.txt
index 61c5ae4db13..57293cb836e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1998-04-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (STH)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1998-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1998-07-01.txt b/forge-gui/res/formats/Archive/Legacy/1998-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1998-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1998-07-01.txt
index e2d01705c4d..1899a19b328 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1998-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (EXO)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1998-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1998-11-01.txt b/forge-gui/res/formats/Archive/Legacy/1998-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1998-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1998-11-01.txt
index 8bc7420a879..e52959a95e8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1998-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (USG)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1998-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-01-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-01-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-01-01.txt
index 49ff716ac73..2b08c5c23c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-01-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-01-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-03-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-03-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-03-01.txt
index fc7b2b8a856..bc35b915486 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-03-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ULG)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-04-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-04-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-04-01.txt
index 63a2fa5914c..079bf2d03a3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-04-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-04-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-06-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-06-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-06-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-06-01.txt
index afdc6856f47..e9afc596b64 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-06-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (6ED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-06-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-07-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-07-01.txt
index 27ba9441b21..e032e7be05f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (UDS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-10-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-10-01.txt
index 7c5ef58fa41..3f0a3a72cd1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-10-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-11-01.txt b/forge-gui/res/formats/Archive/Legacy/1999-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-11-01.txt
index b950333e1b2..76166903f3b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MMQ)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/1999-11-12.txt b/forge-gui/res/formats/Archive/Legacy/1999-11-12.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/1999-11-12.txt
rename to forge-gui/res/formats/Archive/Legacy/1999-11-12.txt
index b15d9f8f726..9854ecde516 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/1999-11-12.txt
+++ b/forge-gui/res/formats/Archive/Legacy/1999-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (BRB)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:1999-11-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2000-03-01.txt b/forge-gui/res/formats/Archive/Legacy/2000-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2000-03-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2000-03-01.txt
index babffc758de..7402fd4110e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2000-03-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (NMS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2000-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2000-07-01.txt b/forge-gui/res/formats/Archive/Legacy/2000-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2000-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2000-07-01.txt
index 69d26aa3dc6..a56baee5e82 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2000-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (PCY)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2000-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2000-10-01.txt b/forge-gui/res/formats/Archive/Legacy/2000-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2000-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2000-10-01.txt
index 7677020191a..92c9a40e65c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2000-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2000-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (BTD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2000-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2000-11-01.txt b/forge-gui/res/formats/Archive/Legacy/2000-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2000-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2000-11-01.txt
index ab96416f745..d2da79ada2c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2000-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (INV)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2000-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2001-03-01.txt b/forge-gui/res/formats/Archive/Legacy/2001-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2001-03-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2001-03-01.txt
index e54ec2c22a3..8d4b9ddd7dc 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2001-03-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (PLS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2001-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2001-05-01.txt b/forge-gui/res/formats/Archive/Legacy/2001-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2001-05-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2001-05-01.txt
index 332f97f7541..5ad9cf070d2 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2001-05-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (7ED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2001-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2001-07-01.txt b/forge-gui/res/formats/Archive/Legacy/2001-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2001-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2001-07-01.txt
index 1c3ac23013b..8f310fe867d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2001-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (APC)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2001-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2001-11-01.txt b/forge-gui/res/formats/Archive/Legacy/2001-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2001-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2001-11-01.txt
index 7adaf220810..51986f01814 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2001-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ODY)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2001-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2001-12-01.txt b/forge-gui/res/formats/Archive/Legacy/2001-12-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2001-12-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2001-12-01.txt
index a192c8f45a5..201cc6e9e34 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2001-12-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2001-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (DKM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2001-12-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2002-01-01.txt b/forge-gui/res/formats/Archive/Legacy/2002-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2002-01-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2002-01-01.txt
index 5404211df80..92425e81923 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2002-01-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2002-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2002-01-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2002-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2002-03-01.txt b/forge-gui/res/formats/Archive/Legacy/2002-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2002-03-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2002-03-01.txt
index 5f74f2a810f..0111859bdfd 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2002-03-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (TOR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2002-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2002-07-01.txt b/forge-gui/res/formats/Archive/Legacy/2002-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2002-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2002-07-01.txt
index a57d5b2b7c2..8aae80a1ca2 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2002-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (JUD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2002-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2002-11-01.txt b/forge-gui/res/formats/Archive/Legacy/2002-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2002-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2002-11-01.txt
index 8d307cdcf3f..938affe74f4 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2002-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ONS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2002-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2003-03-01.txt b/forge-gui/res/formats/Archive/Legacy/2003-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2003-03-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2003-03-01.txt
index 16f5c0ec149..2f7c5dbfec9 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2003-03-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (LGN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2003-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2003-04-01.txt b/forge-gui/res/formats/Archive/Legacy/2003-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2003-04-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2003-04-01.txt
index 8e402c1035c..6755f9e731a 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2003-04-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2003-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2003-04-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2003-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2003-07-01.txt b/forge-gui/res/formats/Archive/Legacy/2003-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2003-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2003-07-01.txt
index c1d6f23a83d..6deb5ca0fa8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2003-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (SCG)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2003-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2003-09-01.txt b/forge-gui/res/formats/Archive/Legacy/2003-09-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2003-09-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2003-09-01.txt
index 85dc1fd50cc..4adbffb31c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2003-09-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (8ED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2003-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2003-10-20.txt b/forge-gui/res/formats/Archive/Legacy/2003-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2003-10-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2003-10-20.txt
index b89412388dd..0365de4a591 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2003-10-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MRD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2003-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2004-01-01.txt b/forge-gui/res/formats/Archive/Legacy/2004-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2004-01-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2004-01-01.txt
index d529a4a920e..308ae9a48ac 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2004-01-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2004-01-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2004-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2004-02-20.txt b/forge-gui/res/formats/Archive/Legacy/2004-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2004-02-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2004-02-20.txt
index ea89d85ef21..068f6dc50a8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2004-02-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (DST)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2004-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2004-06-20.txt b/forge-gui/res/formats/Archive/Legacy/2004-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2004-06-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2004-06-20.txt
index a4a80371189..424f5d430c3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2004-06-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (5DN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2004-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2004-09-20.txt b/forge-gui/res/formats/Archive/Legacy/2004-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2004-09-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2004-09-20.txt
index ee25fa73023..3624a8817f8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2004-09-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2004-09-20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2004-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2004-10-20.txt b/forge-gui/res/formats/Archive/Legacy/2004-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2004-10-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2004-10-20.txt
index 3d7cc4bfab3..63fe0df3bef 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2004-10-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (CHK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2004-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2005-02-20.txt b/forge-gui/res/formats/Archive/Legacy/2005-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2005-02-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2005-02-20.txt
index 62f94c367ce..3f283cb2be3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2005-02-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BOK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2005-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2005-06-20.txt b/forge-gui/res/formats/Archive/Legacy/2005-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2005-06-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2005-06-20.txt
index c8d13626c98..c3ccbff51ae 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2005-06-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2005-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2005-08-20.txt b/forge-gui/res/formats/Archive/Legacy/2005-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2005-08-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2005-08-20.txt
index 343ead73470..64f7e8036a4 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2005-08-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (9ED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2005-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2005-09-20.txt b/forge-gui/res/formats/Archive/Legacy/2005-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2005-09-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2005-09-20.txt
index 41210f48ae2..2d64d8c9a46 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2005-09-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2005-09-20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2005-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2005-10-20.txt b/forge-gui/res/formats/Archive/Legacy/2005-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2005-10-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2005-10-20.txt
index cce9fb7f3ad..2b53b968bbc 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2005-10-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RAV)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2005-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2006-02-20.txt b/forge-gui/res/formats/Archive/Legacy/2006-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2006-02-20.txt
index cd2c47ebb48..3bb01e630e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GPT)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2006-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2006-05-20.txt b/forge-gui/res/formats/Archive/Legacy/2006-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2006-05-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2006-05-20.txt
index 8c9cd7ed342..3589b9dc86c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2006-05-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DIS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2006-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2006-08-20.txt b/forge-gui/res/formats/Archive/Legacy/2006-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2006-08-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2006-08-20.txt
index 247c9773bfd..6df28370d9d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2006-08-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CSP)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2006-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2006-10-20.txt b/forge-gui/res/formats/Archive/Legacy/2006-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2006-10-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2006-10-20.txt
index 5b71f735ce7..83997141dd8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2006-10-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TSP)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2006-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-02-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-02-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-02-20.txt
index d2a13d8518a..93908b9149c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-02-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PLC)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-05-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-05-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-05-20.txt
index 8204fd3f3c0..827c0ac49c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-05-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (FUT)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-06-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-06-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-06-20.txt
index 042c8ed90c9..84d1366630a 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-06-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2007-06-20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-07-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-07-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-07-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-07-20.txt
index 4e3877b4373..8f35e28c0c6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-07-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (10E)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-07-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-09-10.txt b/forge-gui/res/formats/Archive/Legacy/2007-09-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-09-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-09-10.txt
index c774283d587..3ed94feab1a 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-09-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-09-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MED)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-09-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-09-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-09-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-09-20.txt
index 744beb062ee..13c8de33189 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-09-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2007-09-20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-10-20.txt b/forge-gui/res/formats/Archive/Legacy/2007-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-10-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-10-20.txt
index 14184db7db4..e6054a51d75 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-10-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (LRW)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2007-11-16.txt b/forge-gui/res/formats/Archive/Legacy/2007-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2007-11-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2007-11-16.txt
index 8b5078fcb3b..c602728aeaf 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2007-11-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2007-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2007-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-02-01.txt b/forge-gui/res/formats/Archive/Legacy/2008-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-02-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-02-01.txt
index 943d54ca610..d42f05b3e2c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-02-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MOR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-05-02.txt b/forge-gui/res/formats/Archive/Legacy/2008-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-05-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-05-02.txt
index 9b29d4e42ab..a1ff40da0ff 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-05-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SHM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-07-25.txt b/forge-gui/res/formats/Archive/Legacy/2008-07-25.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-07-25.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-07-25.txt
index 1fb4141a3f2..64874b274f6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-07-25.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EVE)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-07-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-08-29.txt b/forge-gui/res/formats/Archive/Legacy/2008-08-29.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-08-29.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-08-29.txt
index 4a1801af657..a7cf67532ce 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-08-29.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-08-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DRB)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-08-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-09-20.txt b/forge-gui/res/formats/Archive/Legacy/2008-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-09-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-09-20.txt
index 92108e0d16c..800d12164c3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-09-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2008-09-20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-09-22.txt b/forge-gui/res/formats/Archive/Legacy/2008-09-22.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-09-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-09-22.txt
index 2202a92eaae..12c1d8c4369 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-09-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-09-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-09-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-10-03.txt b/forge-gui/res/formats/Archive/Legacy/2008-10-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-10-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-10-03.txt
index 14f175dcc76..797a232d22b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-10-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ALA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-10-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2008-11-07.txt b/forge-gui/res/formats/Archive/Legacy/2008-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2008-11-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2008-11-07.txt
index 866140aa62e..f697c96615b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2008-11-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2008-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2008-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-02-06.txt b/forge-gui/res/formats/Archive/Legacy/2009-02-06.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-02-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-02-06.txt
index 82b0bfaae7a..2ba0d9febd5 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-02-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CFX)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-02-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-04-10.txt b/forge-gui/res/formats/Archive/Legacy/2009-04-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-04-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-04-10.txt
index c7d52138cb8..0d09b396cef 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-04-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-04-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDC)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-04-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-04-30.txt b/forge-gui/res/formats/Archive/Legacy/2009-04-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-04-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-04-30.txt
index ffe80c94090..23af7343124 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-04-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ARB)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-04-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-07-17.txt b/forge-gui/res/formats/Archive/Legacy/2009-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-07-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-07-17.txt
index 38c5476b4a8..ec36e5397f4 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-07-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M10)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-08-26.txt b/forge-gui/res/formats/Archive/Legacy/2009-08-26.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-08-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-08-26.txt
index a11f1a84abe..da89a99e128 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-08-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD0)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-08-28.txt b/forge-gui/res/formats/Archive/Legacy/2009-08-28.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-08-28.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-08-28.txt
index a667205f82c..ce43cd188b8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-08-28.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V09)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-09-07.txt b/forge-gui/res/formats/Archive/Legacy/2009-09-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-09-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-09-07.txt
index bd958a8f69a..71c1a4a1486 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-09-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME3)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-01.txt b/forge-gui/res/formats/Archive/Legacy/2009-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-10-01.txt
index bfecc26c730..b2c7237a318 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2009-10-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-02.txt b/forge-gui/res/formats/Archive/Legacy/2009-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-10-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-10-02.txt
index 9af3dae249c..f6450b7bcaf 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ZEN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-30.txt b/forge-gui/res/formats/Archive/Legacy/2009-10-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-10-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-10-30.txt
index b8bf22d4e58..8d52ffdefad 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-10-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-10-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-10-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2009-11-20.txt b/forge-gui/res/formats/Archive/Legacy/2009-11-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2009-11-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2009-11-20.txt
index 28465a4a790..7186225b22e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2009-11-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2009-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (H09)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2009-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-02-05.txt b/forge-gui/res/formats/Archive/Legacy/2010-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-02-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-02-05.txt
index 91af59755d2..ba19bf2b435 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-02-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (WWK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-03-19.txt b/forge-gui/res/formats/Archive/Legacy/2010-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-03-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-03-19.txt
index 57c592002e9..6e2089f487d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-03-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDE)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-04-23.txt b/forge-gui/res/formats/Archive/Legacy/2010-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-04-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-04-23.txt
index ea79f19de46..52514ac20ae 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-04-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ROE)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-06-04.txt b/forge-gui/res/formats/Archive/Legacy/2010-06-04.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-06-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-06-04.txt
index a0c45cf8d57..7023a7349a8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-06-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-06-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DPA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-06-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-07-01.txt b/forge-gui/res/formats/Archive/Legacy/2010-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-07-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-07-01.txt
index bd7a7e98898..a53aeaa21bf 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-07-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2010-07-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-07-16.txt b/forge-gui/res/formats/Archive/Legacy/2010-07-16.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-07-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-07-16.txt
index 9547f05ea0f..e6163679762 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-07-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M11)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-07-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-08-27.txt b/forge-gui/res/formats/Archive/Legacy/2010-08-27.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-08-27.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-08-27.txt
index 0457a94592d..84b72ccea19 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-08-27.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-08-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V10)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-08-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-09-03.txt b/forge-gui/res/formats/Archive/Legacy/2010-09-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-09-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-09-03.txt
index 1333701dda9..d7803d30486 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-09-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-09-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDF)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-09-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-10-01.txt b/forge-gui/res/formats/Archive/Legacy/2010-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-10-01.txt
index 08727592134..fc925fd237b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-11-08.txt b/forge-gui/res/formats/Archive/Legacy/2010-11-08.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-11-08.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-11-08.txt
index da3842f8f9e..9857181105e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-11-08.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-11-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2010-11-19.txt b/forge-gui/res/formats/Archive/Legacy/2010-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2010-11-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2010-11-19.txt
index 006e65679d6..cb605e68578 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2010-11-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2010-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PD2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2010-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-01-01.txt b/forge-gui/res/formats/Archive/Legacy/2011-01-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-01-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-01-01.txt
index 33d55b5b32b..2bc4478e34b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-01-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2011-01-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-01-10.txt b/forge-gui/res/formats/Archive/Legacy/2011-01-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-01-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-01-10.txt
index 254ab39e1aa..23332717ffb 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-01-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME4)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-02-04.txt b/forge-gui/res/formats/Archive/Legacy/2011-02-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-02-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-02-04.txt
index c1651c6941e..4a571b4a268 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-02-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MBS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-02-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-04-01.txt b/forge-gui/res/formats/Archive/Legacy/2011-04-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-04-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-04-01.txt
index 7e028c9115a..1e54f6b78b9 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-04-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDG)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-05-13.txt b/forge-gui/res/formats/Archive/Legacy/2011-05-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-05-13.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-05-13.txt
index 15b95406024..1b0b31bc33b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-05-13.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (NPH)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-05-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-05-14.txt b/forge-gui/res/formats/Archive/Legacy/2011-05-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-05-14.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-05-14.txt
index 4c91af77958..18b38c98888 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-05-14.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-05-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-05-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-06-17.txt b/forge-gui/res/formats/Archive/Legacy/2011-06-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-06-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-06-17.txt
index 547a2876012..ec56e888dee 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-06-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-06-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (COM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-06-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-07-15.txt b/forge-gui/res/formats/Archive/Legacy/2011-07-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-07-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-07-15.txt
index 49616bba429..465e2167dcf 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-07-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M12)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-08-26.txt b/forge-gui/res/formats/Archive/Legacy/2011-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-08-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-08-26.txt
index 9d82b06d3eb..46a3db99322 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-08-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V11)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-09-02.txt b/forge-gui/res/formats/Archive/Legacy/2011-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-09-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-09-02.txt
index a3b7f64ecd0..e4c2685bdc4 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-09-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDH)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-09-30.txt b/forge-gui/res/formats/Archive/Legacy/2011-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-09-30.txt
index 50d7ea86bc7..b3309f1b8fe 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ISD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-10-01.txt b/forge-gui/res/formats/Archive/Legacy/2011-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-10-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-10-01.txt
index a82943c00ae..8a4da48ab19 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-10-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2011-10-01)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2011-11-18.txt b/forge-gui/res/formats/Archive/Legacy/2011-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2011-11-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2011-11-18.txt
index 18e1723daf4..c31dd038730 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2011-11-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2011-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PD3)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2011-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-02-03.txt b/forge-gui/res/formats/Archive/Legacy/2012-02-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-02-03.txt
index 4764577e40b..f397798032d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DKA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-02-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-03-30.txt b/forge-gui/res/formats/Archive/Legacy/2012-03-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-03-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-03-30.txt
index 75efabd0e0b..5f44ef53693 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-03-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-03-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDI)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-03-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-05-04.txt b/forge-gui/res/formats/Archive/Legacy/2012-05-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-05-04.txt
index f3404eab842..1ee2f7dde7e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AVR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-05-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-06-29.txt b/forge-gui/res/formats/Archive/Legacy/2012-06-29.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-06-29.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-06-29.txt
index 9ad11942ee2..07cd1b14289 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-06-29.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-06-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2012-06-29)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-06-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-07-13.txt b/forge-gui/res/formats/Archive/Legacy/2012-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-07-13.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-07-13.txt
index 35cd965df2d..63e8296cb01 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-07-13.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M13)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-08-31.txt b/forge-gui/res/formats/Archive/Legacy/2012-08-31.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-08-31.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-08-31.txt
index f6dbe11686a..b6d4dcad020 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-08-31.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-08-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V12)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-08-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-09-07.txt b/forge-gui/res/formats/Archive/Legacy/2012-09-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-09-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-09-07.txt
index 4e58046c8c8..27f7ec3affd 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-09-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDJ)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-10-05.txt b/forge-gui/res/formats/Archive/Legacy/2012-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-10-05.txt
index bf9857a5a08..a0bcc4cd2ef 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-10-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RTR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2012-11-02.txt b/forge-gui/res/formats/Archive/Legacy/2012-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2012-11-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2012-11-02.txt
index 5f8793cbd93..9f416968f4d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2012-11-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2012-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CM1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2012-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-02-01.txt b/forge-gui/res/formats/Archive/Legacy/2013-02-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-02-01.txt
index b1a5fb487dc..ccd2da504d8 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-02-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GTC)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-03-15.txt b/forge-gui/res/formats/Archive/Legacy/2013-03-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-03-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-03-15.txt
index 7882fa82b39..c17bf765e65 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-03-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-03-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-03-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-05-03.txt b/forge-gui/res/formats/Archive/Legacy/2013-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-05-03.txt
index 69168498d49..857d5c9f6b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-05-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DGM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-06-07.txt b/forge-gui/res/formats/Archive/Legacy/2013-06-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-06-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-06-07.txt
index a8c5d378b45..db204cc4b4f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-06-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-06-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-07-19.txt b/forge-gui/res/formats/Archive/Legacy/2013-07-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-07-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-07-19.txt
index ef0972445f3..1158004c21f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-07-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M14)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-07-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-08-23.txt b/forge-gui/res/formats/Archive/Legacy/2013-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-08-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-08-23.txt
index 1198e46ea84..80fe356c463 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-08-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V13)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-09-06.txt b/forge-gui/res/formats/Archive/Legacy/2013-09-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-09-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-09-06.txt
index 6fc53c58fa2..fd1e8f2bdfc 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-09-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-09-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDL)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-09-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-09-27.txt b/forge-gui/res/formats/Archive/Legacy/2013-09-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-09-27.txt
index 22a27a09b00..ee3a6bf4684 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (THS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-09-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2013-11-01.txt b/forge-gui/res/formats/Archive/Legacy/2013-11-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2013-11-01.txt
rename to forge-gui/res/formats/Archive/Legacy/2013-11-01.txt
index edbd542d697..dd649ed007b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2013-11-01.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2013-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C13)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2013-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-02-07.txt b/forge-gui/res/formats/Archive/Legacy/2014-02-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-02-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-02-07.txt
index 52964c23f3f..d45278363d0 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-02-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BNG)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-02-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-03-14.txt b/forge-gui/res/formats/Archive/Legacy/2014-03-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-03-14.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-03-14.txt
index 14e6de64425..b8e538cc9cf 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-03-14.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-03-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-03-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-05-02.txt b/forge-gui/res/formats/Archive/Legacy/2014-05-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-05-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-05-02.txt
index 3eec0c0ac71..5584bae1eb3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-05-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (JOU)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-05-30.txt b/forge-gui/res/formats/Archive/Legacy/2014-05-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-05-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-05-30.txt
index a12fbbfa36d..a12e9f64682 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-05-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MD1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-05-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-06-06.txt b/forge-gui/res/formats/Archive/Legacy/2014-06-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-06-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-06-06.txt
index 33b7ca21961..d75018f9af7 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-06-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-06-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CNS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-06-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-06-16.txt b/forge-gui/res/formats/Archive/Legacy/2014-06-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-06-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-06-16.txt
index 2eda157cfb4..93f5283cc63 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-06-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-06-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (VMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-06-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-07-18.txt b/forge-gui/res/formats/Archive/Legacy/2014-07-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-07-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-07-18.txt
index debc89a533c..e52aaec06f9 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-07-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M15)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-07-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-08-22.txt b/forge-gui/res/formats/Archive/Legacy/2014-08-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-08-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-08-22.txt
index 7b9efe6a2bf..c0bc1ccb657 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-08-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-08-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V14)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-08-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-09-05.txt b/forge-gui/res/formats/Archive/Legacy/2014-09-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-09-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-09-05.txt
index 96d29a209aa..e01b277ab49 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-09-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-09-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-09-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-09-26.txt b/forge-gui/res/formats/Archive/Legacy/2014-09-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-09-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-09-26.txt
index c36344ba175..21f4c8b80dd 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-09-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KTK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-09-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-11-07.txt b/forge-gui/res/formats/Archive/Legacy/2014-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-11-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-11-07.txt
index e40ca62b051..84acc913f27 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-11-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C14)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2014-12-05.txt b/forge-gui/res/formats/Archive/Legacy/2014-12-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2014-12-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2014-12-05.txt
index a5898e21600..71aee33663d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2014-12-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2014-12-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD3)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2014-12-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-01-23.txt b/forge-gui/res/formats/Archive/Legacy/2015-01-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-01-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-01-23.txt
index b19efd476c0..fbe9470aab6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-01-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (FRF)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-01-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-02-27.txt b/forge-gui/res/formats/Archive/Legacy/2015-02-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-02-27.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-02-27.txt
index be60112cdaa..19bb6950795 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-02-27.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-02-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDO)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-02-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-03-27.txt b/forge-gui/res/formats/Archive/Legacy/2015-03-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-03-27.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-03-27.txt
index 159aee1c2b4..3ffd35d2b74 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-03-27.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DTK)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-03-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-05-06.txt b/forge-gui/res/formats/Archive/Legacy/2015-05-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-05-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-05-06.txt
index aa55a7d25ad..7c2ca36dd90 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-05-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-05-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TPR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-05-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-05-22.txt b/forge-gui/res/formats/Archive/Legacy/2015-05-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-05-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-05-22.txt
index 15e27def298..e247a698d40 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-05-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MM2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-05-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-07-17.txt b/forge-gui/res/formats/Archive/Legacy/2015-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-07-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-07-17.txt
index 037966ef494..66bfb6e56b5 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-07-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ORI)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-08-21.txt b/forge-gui/res/formats/Archive/Legacy/2015-08-21.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-08-21.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-08-21.txt
index ce7a875c58f..02ccc448d9d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-08-21.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-08-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V15)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-08-21
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-08-28.txt b/forge-gui/res/formats/Archive/Legacy/2015-08-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-08-28.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-08-28.txt
index 28fb9ed35f7..47ca21fc163 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-08-28.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDP)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-10-02.txt b/forge-gui/res/formats/Archive/Legacy/2015-10-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-10-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-10-02.txt
index 98084bff531..8971a0d3a93 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-10-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BFZ)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-11-13.txt b/forge-gui/res/formats/Archive/Legacy/2015-11-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-11-13.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-11-13.txt
index d262017e3c1..b4cb7f0f73f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-11-13.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C15)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2015-11-18.txt b/forge-gui/res/formats/Archive/Legacy/2015-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2015-11-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2015-11-18.txt
index ce01037da1f..da9c451d313 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2015-11-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2015-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PZ1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2015-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-01-22.txt b/forge-gui/res/formats/Archive/Legacy/2016-01-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-01-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-01-22.txt
index df3356def61..b29e3937885 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-01-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (OGW)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-01-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-02-26.txt b/forge-gui/res/formats/Archive/Legacy/2016-02-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-02-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-02-26.txt
index 8b7c1fa6c10..7bfb177a2f0 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-02-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-02-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDQ)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-02-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-04-08.txt b/forge-gui/res/formats/Archive/Legacy/2016-04-08.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-04-08.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-04-08.txt
index da059f5042f..c56c318ce21 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-04-08.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOI)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-04-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-06-10.txt b/forge-gui/res/formats/Archive/Legacy/2016-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-06-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-06-10.txt
index 40e374b31b3..6b0af13ab9f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-06-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-07-22.txt b/forge-gui/res/formats/Archive/Legacy/2016-07-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-07-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-07-22.txt
index 8a815338de8..a7f88626c37 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-07-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EMN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-07-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-08-19.txt b/forge-gui/res/formats/Archive/Legacy/2016-08-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-08-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-08-19.txt
index b265f26b06b..0abe963e04c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-08-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-08-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V16)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-08-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-08-26.txt b/forge-gui/res/formats/Archive/Legacy/2016-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-08-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-08-26.txt
index 073f2cc1b55..eb7953ccb51 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-08-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CN2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-09-02.txt b/forge-gui/res/formats/Archive/Legacy/2016-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-09-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-09-02.txt
index 154381f934e..3076a01d727 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-09-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-09-30.txt b/forge-gui/res/formats/Archive/Legacy/2016-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-09-30.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-09-30.txt
index 1f02f464824..f44985aa061 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-09-30.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KLD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-11-11.txt b/forge-gui/res/formats/Archive/Legacy/2016-11-11.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-11-11.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-11-11.txt
index e65b1bc478f..91eeb3a4c92 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-11-11.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-11-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C16)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-11-11
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2016-11-16.txt b/forge-gui/res/formats/Archive/Legacy/2016-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2016-11-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2016-11-16.txt
index 9e41899a7c4..f4ab796634e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2016-11-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2016-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PZ2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2016-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-01-20.txt b/forge-gui/res/formats/Archive/Legacy/2017-01-20.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-01-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-01-20.txt
index 76feed3c0e6..e0d9f5ee0f2 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-01-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AER)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-01-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-03-17.txt b/forge-gui/res/formats/Archive/Legacy/2017-03-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-03-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-03-17.txt
index 68dc3733f9a..e348dd7a538 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-03-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MM3)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-03-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-03-31.txt b/forge-gui/res/formats/Archive/Legacy/2017-03-31.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-03-31.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-03-31.txt
index e40f8b39907..bb37101dfa0 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-03-31.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-03-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDS)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-03-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-04-24.txt b/forge-gui/res/formats/Archive/Legacy/2017-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-04-24.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-04-24.txt
index 0df2392ce78..51aa7af5930 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-04-24.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2017-04-24)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-04-28.txt b/forge-gui/res/formats/Archive/Legacy/2017-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-04-28.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-04-28.txt
index a35be538894..f8716113c02 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-04-28.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AKH)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-04-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-06-09.txt b/forge-gui/res/formats/Archive/Legacy/2017-06-09.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-06-09.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-06-09.txt
index db61b48c6e9..477f87eaa60 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-06-09.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-06-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-07-14.txt b/forge-gui/res/formats/Archive/Legacy/2017-07-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-07-14.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-07-14.txt
index aba4884e70e..c89134bb2e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-07-14.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (HOU)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-07-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-08-25.txt b/forge-gui/res/formats/Archive/Legacy/2017-08-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-08-25.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-08-25.txt
index 2084b16f947..99072f75d51 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-08-25.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-08-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C17)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-08-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-09-29.txt b/forge-gui/res/formats/Archive/Legacy/2017-09-29.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-09-29.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-09-29.txt
index b778a3d68fe..2e41d905cc5 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-09-29.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (XLN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-09-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-10.txt b/forge-gui/res/formats/Archive/Legacy/2017-11-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-11-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-11-10.txt
index 1e2e8c2b6ac..f2fba1680b1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-11-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDT)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-11-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-17.txt b/forge-gui/res/formats/Archive/Legacy/2017-11-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-11-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-11-17.txt
index 07e688237f8..6260aa47605 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (IMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-11-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-24.txt b/forge-gui/res/formats/Archive/Legacy/2017-11-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2017-11-24.txt
rename to forge-gui/res/formats/Archive/Legacy/2017-11-24.txt
index 7b3fa2be158..e4ddfaadd41 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2017-11-24.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2017-11-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V17)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2017-11-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-01-19.txt b/forge-gui/res/formats/Archive/Legacy/2018-01-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-01-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-01-19.txt
index d9bf4b27d33..c0843cc044b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-01-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RIX)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-01-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-03-16.txt b/forge-gui/res/formats/Archive/Legacy/2018-03-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-03-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-03-16.txt
index 54162afba02..d66f335bd61 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-03-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-03-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (A25)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-03-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-04-06.txt b/forge-gui/res/formats/Archive/Legacy/2018-04-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-04-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-04-06.txt
index b40354fa5b6..1e768f8218d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-04-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-04-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDU)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-04-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-04-27.txt b/forge-gui/res/formats/Archive/Legacy/2018-04-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-04-27.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-04-27.txt
index 7c386470650..5b497e9fc2b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-04-27.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DOM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-04-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-08.txt b/forge-gui/res/formats/Archive/Legacy/2018-06-08.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-06-08.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-06-08.txt
index d38b6388ceb..80797466471 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-08.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-06-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CM2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-06-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-15.txt b/forge-gui/res/formats/Archive/Legacy/2018-06-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-06-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-06-15.txt
index 8ad8d3532f2..09d056c9e27 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-06-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-06-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-22.txt b/forge-gui/res/formats/Archive/Legacy/2018-06-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-06-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-06-22.txt
index 645aecf94ec..91133d0d544 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-06-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GS1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-06-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-07-06.txt b/forge-gui/res/formats/Archive/Legacy/2018-07-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-07-06.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-07-06.txt
index 0074bdb6d20..d9055a26b8e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-07-06.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-07-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2018-07-06)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-07-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-07-13.txt b/forge-gui/res/formats/Archive/Legacy/2018-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-07-13.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-07-13.txt
index 1b3ec6dd86e..4d15e9c8bf3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-07-13.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M19)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-08-09.txt b/forge-gui/res/formats/Archive/Legacy/2018-08-09.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-08-09.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-08-09.txt
index dd42ecef6a8..a6c93c57ca4 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-08-09.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-08-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C18)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-08-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-10-05.txt b/forge-gui/res/formats/Archive/Legacy/2018-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-10-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-10-05.txt
index 210faa7f378..02f58a5ab7b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-10-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GRN)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-11-02.txt b/forge-gui/res/formats/Archive/Legacy/2018-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-11-02.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-11-02.txt
index 7a72b43748a..6fe3c5abd7c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-11-02.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GK1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-11-16.txt b/forge-gui/res/formats/Archive/Legacy/2018-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-11-16.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-11-16.txt
index bd71fba1b8d..d9c23581b52 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-11-16.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (G18)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2018-12-07.txt b/forge-gui/res/formats/Archive/Legacy/2018-12-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2018-12-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2018-12-07.txt
index b79faf4ae6a..743c8ecd69d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2018-12-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2018-12-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (UMA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2018-12-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-01-25.txt b/forge-gui/res/formats/Archive/Legacy/2019-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-01-25.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-01-25.txt
index 4ea75e6f04e..a64e10aa457 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-01-25.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RNA)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-02-15.txt b/forge-gui/res/formats/Archive/Legacy/2019-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-02-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-02-15.txt
index 11415960ef8..08c749e7044 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-02-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GK2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-05-03.txt b/forge-gui/res/formats/Archive/Legacy/2019-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-05-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-05-03.txt
index 334f43f6fe0..4437ab947dd 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-05-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (WAR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-06-14.txt b/forge-gui/res/formats/Archive/Legacy/2019-06-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-06-14.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-06-14.txt
index 8e0c7f8d071..5dbd43bd3bd 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-06-14.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MH1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-06-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-06-28.txt b/forge-gui/res/formats/Archive/Legacy/2019-06-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-06-28.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-06-28.txt
index 6812f042141..ecc89f70110 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-06-28.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-06-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-06-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-07-12.txt b/forge-gui/res/formats/Archive/Legacy/2019-07-12.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-07-12.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-07-12.txt
index 2c27d5f2ac1..b67da30306d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-07-12.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M20)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-07-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-08-23.txt b/forge-gui/res/formats/Archive/Legacy/2019-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-08-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-08-23.txt
index 27fa3fc3c08..c64bb3b22bc 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-08-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C19)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-10-04.txt b/forge-gui/res/formats/Archive/Legacy/2019-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-10-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-10-04.txt
index 90e2bf61748..a66beb49db7 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-10-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ELD)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-07.txt b/forge-gui/res/formats/Archive/Legacy/2019-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-11-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-11-07.txt
index 80dd94f29f1..52aaf74c7ac 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MB1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-15.txt b/forge-gui/res/formats/Archive/Legacy/2019-11-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-11-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-11-15.txt
index ee14e5eaf65..03eff931861 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GN2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-22.txt b/forge-gui/res/formats/Archive/Legacy/2019-11-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2019-11-22.txt
rename to forge-gui/res/formats/Archive/Legacy/2019-11-22.txt
index 1871ea30638..077027b293b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2019-11-22.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2019-11-22)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2019-11-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-01-24.txt b/forge-gui/res/formats/Archive/Legacy/2020-01-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-01-24.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-01-24.txt
index 8ec3ce52c5d..149ffb372e0 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-01-24.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (THB)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-01-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-03-10.txt b/forge-gui/res/formats/Archive/Legacy/2020-03-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-03-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-03-10.txt
index a53bea8085f..dcd197237fa 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-03-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-03-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-03-10)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-03-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-04-24.txt b/forge-gui/res/formats/Archive/Legacy/2020-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-04-24.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-04-24.txt
index b404f751fa3..4845eb16136 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-04-24.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (IKO)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-05-18.txt b/forge-gui/res/formats/Archive/Legacy/2020-05-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-05-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-05-18.txt
index 7b3de647310..e9ba054e6af 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-05-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-05-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-05-18)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-05-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-06-10.txt b/forge-gui/res/formats/Archive/Legacy/2020-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-06-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-06-10.txt
index 2bd836c7852..996760371e3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-06-10.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-06-10)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-06-26.txt b/forge-gui/res/formats/Archive/Legacy/2020-06-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-06-26.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-06-26.txt
index 167c9382034..ccadfa70933 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-06-26.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-06-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS3)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-06-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-07-03.txt b/forge-gui/res/formats/Archive/Legacy/2020-07-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-07-03.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-07-03.txt
index ee5af0afb97..81c73fad05e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-07-03.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M21)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-07-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-07-17.txt b/forge-gui/res/formats/Archive/Legacy/2020-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-07-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-07-17.txt
index 94ceb5e0c93..1dd1a3b950f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-07-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (JMP)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-08-07.txt b/forge-gui/res/formats/Archive/Legacy/2020-08-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-08-07.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-08-07.txt
index 0162e301883..9ca8716898f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-08-07.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-08-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2XM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-08-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-09-25.txt b/forge-gui/res/formats/Archive/Legacy/2020-09-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-09-25.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-09-25.txt
index 027fd632e84..2c698b10620 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-09-25.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-09-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-10-04.txt b/forge-gui/res/formats/Archive/Legacy/2020-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-10-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-10-04.txt
index a07f1d01da8..e6764d88850 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-10-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-10-04)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-11-20.txt b/forge-gui/res/formats/Archive/Legacy/2020-11-20.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-11-20.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-11-20.txt
index 5a618d7cb5c..3df00e34f9f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-11-20.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CMR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2020-12-04.txt b/forge-gui/res/formats/Archive/Legacy/2020-12-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2020-12-04.txt
rename to forge-gui/res/formats/Archive/Legacy/2020-12-04.txt
index df6db192f2f..aaa6ff3bcda 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2020-12-04.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2020-12-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CC1)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2020-12-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-02-05.txt b/forge-gui/res/formats/Archive/Legacy/2021-02-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-02-05.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-02-05.txt
index 2cfc52412c4..ec0ad1fe85c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-02-05.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KHM)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-02-15.txt b/forge-gui/res/formats/Archive/Legacy/2021-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-02-15.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-02-15.txt
index 076029dfd8d..928b35d5113 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-02-15.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2021-02-15)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-03-19.txt b/forge-gui/res/formats/Archive/Legacy/2021-03-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-03-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-03-19.txt
index 63bfe180d52..cdf8815842f 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-03-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TSR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-04-23.txt b/forge-gui/res/formats/Archive/Legacy/2021-04-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-04-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-04-23.txt
index 8e789cb158c..35db47a91a3 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-04-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (STX)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-06-18.txt b/forge-gui/res/formats/Archive/Legacy/2021-06-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-06-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-06-18.txt
index 8e970c6c8de..dd5d61584b7 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-06-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MH2)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-06-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-07-23.txt b/forge-gui/res/formats/Archive/Legacy/2021-07-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-07-23.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-07-23.txt
index 67be5c3bda3..d7d6a96cb7c 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-07-23.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AFR)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-07-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-09-24.txt b/forge-gui/res/formats/Archive/Legacy/2021-09-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-09-24.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-09-24.txt
index cb836c1bfbd..ff98a4c172b 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-09-24.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MID)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-09-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-10-18.txt b/forge-gui/res/formats/Archive/Legacy/2021-10-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-10-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-10-18.txt
index cc7c8e0dd07..2b13d269000 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-10-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-10-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2021-10-18)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-10-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2021-11-19.txt b/forge-gui/res/formats/Archive/Legacy/2021-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2021-11-19.txt
rename to forge-gui/res/formats/Archive/Legacy/2021-11-19.txt
index 093658f89c7..717764455c7 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2021-11-19.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (VOW)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2021-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-01-25.txt b/forge-gui/res/formats/Archive/Legacy/2022-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-01-25.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-01-25.txt
index 241bb4c5730..70368b5bec7 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2022-01-25.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2022-01-25)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2022-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-01-28.txt b/forge-gui/res/formats/Archive/Legacy/2022-01-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-01-28.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-01-28.txt
index da24dcc459d..44c3618ea5e 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2022-01-28.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DBL)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2022-01-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-02-17.txt b/forge-gui/res/formats/Archive/Legacy/2022-02-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-02-17.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-02-17.txt
index fb7fcd4c237..594f141b97d 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2022-02-17.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2022-02-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2022-02-17)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2022-02-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-02-18.txt b/forge-gui/res/formats/Archive/Legacy/2022-02-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-02-18.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-02-18.txt
index 3a77acee1ba..c7ff6892360 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2022-02-18.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (NEO)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2022-02-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-04-29.txt b/forge-gui/res/formats/Archive/Legacy/2022-04-29.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-04-29.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-04-29.txt
index d11d14c3bad..97b22ab4db1 100644
--- a/forge-gui/res/formats/Historic/DCI/Legacy/2022-04-29.txt
+++ b/forge-gui/res/formats/Archive/Legacy/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SNC)
-Type:Historic
+Type:Archive
 Subtype:Legacy
 Effective:2022-04-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC
diff --git a/forge-gui/res/formats/Historic/DCI/Legacy/2022-06-10.txt b/forge-gui/res/formats/Archive/Legacy/2022-06-10.txt
similarity index 100%
rename from forge-gui/res/formats/Historic/DCI/Legacy/2022-06-10.txt
rename to forge-gui/res/formats/Archive/Legacy/2022-06-10.txt
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2011-05-19.txt b/forge-gui/res/formats/Archive/Modern/2011-05-19.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Modern/2011-05-19.txt
rename to forge-gui/res/formats/Archive/Modern/2011-05-19.txt
index 43b5d0a0615..f52d8805f40 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2011-05-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2011-05-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-05-19)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2011-05-19
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2011-07-15.txt b/forge-gui/res/formats/Archive/Modern/2011-07-15.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Modern/2011-07-15.txt
rename to forge-gui/res/formats/Archive/Modern/2011-07-15.txt
index 5fa7de06a10..1c2bcc6a50e 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2011-07-15.txt
+++ b/forge-gui/res/formats/Archive/Modern/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M12)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2011-07-15
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2011-08-12.txt b/forge-gui/res/formats/Archive/Modern/2011-08-12.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Modern/2011-08-12.txt
rename to forge-gui/res/formats/Archive/Modern/2011-08-12.txt
index 749ad8519a3..6865473dba5 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2011-08-12.txt
+++ b/forge-gui/res/formats/Archive/Modern/2011-08-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-08-12)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2011-08-12
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2011-09-30.txt b/forge-gui/res/formats/Archive/Modern/2011-09-30.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Modern/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Modern/2011-09-30.txt
index d58c31c502c..83b9673f3a3 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Modern/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ISD)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2011-09-30
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2011-10-01.txt b/forge-gui/res/formats/Archive/Modern/2011-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2011-10-01.txt
rename to forge-gui/res/formats/Archive/Modern/2011-10-01.txt
index cd6f2d88237..366d0274498 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2011-10-01.txt
+++ b/forge-gui/res/formats/Archive/Modern/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-10-01)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2011-10-01
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-01-01.txt b/forge-gui/res/formats/Archive/Modern/2012-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-01-01.txt
rename to forge-gui/res/formats/Archive/Modern/2012-01-01.txt
index e636c8fc8d6..84d88bb5d65 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-01-01.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2012-01-01)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-01-01
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-02-03.txt b/forge-gui/res/formats/Archive/Modern/2012-02-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Modern/2012-02-03.txt
index e8f2e180c98..e65667ba750 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DKA)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-02-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-05-04.txt b/forge-gui/res/formats/Archive/Modern/2012-05-04.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Modern/2012-05-04.txt
index 94931243f6e..fd4db347319 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AVR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-05-04
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-07-13.txt b/forge-gui/res/formats/Archive/Modern/2012-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-07-13.txt
rename to forge-gui/res/formats/Archive/Modern/2012-07-13.txt
index 30b89419b1d..cc56349f8b1 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-07-13.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M13)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-07-13
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-10-01.txt b/forge-gui/res/formats/Archive/Modern/2012-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-10-01.txt
rename to forge-gui/res/formats/Archive/Modern/2012-10-01.txt
index e044b62054a..ca6ba0879e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-10-01.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2012-10-01)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-10-01
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2012-10-05.txt b/forge-gui/res/formats/Archive/Modern/2012-10-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Modern/2012-10-05.txt
index 5f22f5a1c9d..70f98aca81f 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2012-10-05.txt
+++ b/forge-gui/res/formats/Archive/Modern/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RTR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2012-10-05
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2013-02-01.txt b/forge-gui/res/formats/Archive/Modern/2013-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Modern/2013-02-01.txt
index 75d7129e1d2..2282894381b 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2013-02-01.txt
+++ b/forge-gui/res/formats/Archive/Modern/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GTC)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2013-02-01
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2013-05-03.txt b/forge-gui/res/formats/Archive/Modern/2013-05-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Modern/2013-05-03.txt
index 9d3da5a6f62..fb537fa464e 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2013-05-03.txt
+++ b/forge-gui/res/formats/Archive/Modern/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DGM)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2013-05-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2013-06-07.txt b/forge-gui/res/formats/Archive/Modern/2013-06-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2013-06-07.txt
rename to forge-gui/res/formats/Archive/Modern/2013-06-07.txt
index f8e9ae66c28..7a9f5dd6274 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2013-06-07.txt
+++ b/forge-gui/res/formats/Archive/Modern/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MMA)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2013-06-07
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2013-07-19.txt b/forge-gui/res/formats/Archive/Modern/2013-07-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2013-07-19.txt
rename to forge-gui/res/formats/Archive/Modern/2013-07-19.txt
index 6d2b7c59877..d48ba43916a 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2013-07-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M14)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2013-07-19
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2013-09-27.txt b/forge-gui/res/formats/Archive/Modern/2013-09-27.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Modern/2013-09-27.txt
index cdb117dc0e5..5da70cac3f7 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Modern/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (THS)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2013-09-27
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2014-02-07.txt b/forge-gui/res/formats/Archive/Modern/2014-02-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2014-02-07.txt
rename to forge-gui/res/formats/Archive/Modern/2014-02-07.txt
index 5d6a638045b..0a7bfb0b2b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2014-02-07.txt
+++ b/forge-gui/res/formats/Archive/Modern/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (BNG)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2014-02-07
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2014-05-02.txt b/forge-gui/res/formats/Archive/Modern/2014-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2014-05-02.txt
rename to forge-gui/res/formats/Archive/Modern/2014-05-02.txt
index 2a0dba8a7f4..1ef2eebc5dc 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2014-05-02.txt
+++ b/forge-gui/res/formats/Archive/Modern/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (JOU)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2014-05-02
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2014-05-30.txt b/forge-gui/res/formats/Archive/Modern/2014-05-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2014-05-30.txt
rename to forge-gui/res/formats/Archive/Modern/2014-05-30.txt
index 30fe5958561..d86d70c1805 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2014-05-30.txt
+++ b/forge-gui/res/formats/Archive/Modern/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MD1)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2014-05-30
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2014-07-18.txt b/forge-gui/res/formats/Archive/Modern/2014-07-18.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2014-07-18.txt
rename to forge-gui/res/formats/Archive/Modern/2014-07-18.txt
index ec892a81868..9e2579a62b9 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2014-07-18.txt
+++ b/forge-gui/res/formats/Archive/Modern/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M15)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2014-07-18
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2014-09-26.txt b/forge-gui/res/formats/Archive/Modern/2014-09-26.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2014-09-26.txt
rename to forge-gui/res/formats/Archive/Modern/2014-09-26.txt
index 60dc346c16e..b25f176f379 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2014-09-26.txt
+++ b/forge-gui/res/formats/Archive/Modern/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KTK)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2014-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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2015-01-23.txt b/forge-gui/res/formats/Archive/Modern/2015-01-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2015-01-23.txt
rename to forge-gui/res/formats/Archive/Modern/2015-01-23.txt
index b83e78e785a..7670f0ea926 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2015-01-23.txt
+++ b/forge-gui/res/formats/Archive/Modern/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (FRF)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2015-01-23
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2015-03-27.txt b/forge-gui/res/formats/Archive/Modern/2015-03-27.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2015-03-27.txt
rename to forge-gui/res/formats/Archive/Modern/2015-03-27.txt
index bb2a7308856..e72e969967f 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2015-03-27.txt
+++ b/forge-gui/res/formats/Archive/Modern/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DTK)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2015-03-27
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2015-05-22.txt b/forge-gui/res/formats/Archive/Modern/2015-05-22.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2015-05-22.txt
rename to forge-gui/res/formats/Archive/Modern/2015-05-22.txt
index 9271d4e8c17..5e012f6f57c 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2015-05-22.txt
+++ b/forge-gui/res/formats/Archive/Modern/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MM2)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2015-05-22
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2015-07-17.txt b/forge-gui/res/formats/Archive/Modern/2015-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2015-07-17.txt
rename to forge-gui/res/formats/Archive/Modern/2015-07-17.txt
index e6f225ae9a3..e8318524d23 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2015-07-17.txt
+++ b/forge-gui/res/formats/Archive/Modern/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ORI)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2015-07-17
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2015-10-02.txt b/forge-gui/res/formats/Archive/Modern/2015-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2015-10-02.txt
rename to forge-gui/res/formats/Archive/Modern/2015-10-02.txt
index c9317e633c0..44cc73b4914 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2015-10-02.txt
+++ b/forge-gui/res/formats/Archive/Modern/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (BFZ)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2015-10-02
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2016-01-22.txt b/forge-gui/res/formats/Archive/Modern/2016-01-22.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2016-01-22.txt
rename to forge-gui/res/formats/Archive/Modern/2016-01-22.txt
index 2bf2bde641a..a8d4a7865d0 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2016-01-22.txt
+++ b/forge-gui/res/formats/Archive/Modern/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (OGW)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2016-01-22
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2016-04-08.txt b/forge-gui/res/formats/Archive/Modern/2016-04-08.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2016-04-08.txt
rename to forge-gui/res/formats/Archive/Modern/2016-04-08.txt
index 80f2652f95a..504004176a9 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2016-04-08.txt
+++ b/forge-gui/res/formats/Archive/Modern/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (SOI)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2016-04-08
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2016-07-22.txt b/forge-gui/res/formats/Archive/Modern/2016-07-22.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2016-07-22.txt
rename to forge-gui/res/formats/Archive/Modern/2016-07-22.txt
index 1e882ce35cc..2169b82b0f5 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2016-07-22.txt
+++ b/forge-gui/res/formats/Archive/Modern/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (EMN)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2016-07-22
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2016-09-30.txt b/forge-gui/res/formats/Archive/Modern/2016-09-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2016-09-30.txt
rename to forge-gui/res/formats/Archive/Modern/2016-09-30.txt
index 33b289ed3e3..aa9a970c3cc 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2016-09-30.txt
+++ b/forge-gui/res/formats/Archive/Modern/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KLD)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2016-09-30
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-01-20.txt b/forge-gui/res/formats/Archive/Modern/2017-01-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-01-20.txt
rename to forge-gui/res/formats/Archive/Modern/2017-01-20.txt
index e83c1f91058..7e192d878dc 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-01-20.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AER)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-01-20
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-03-17.txt b/forge-gui/res/formats/Archive/Modern/2017-03-17.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-03-17.txt
rename to forge-gui/res/formats/Archive/Modern/2017-03-17.txt
index 2a4c1ad1cc8..a736252bc5f 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-03-17.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MM3)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-03-17
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-04-15.txt b/forge-gui/res/formats/Archive/Modern/2017-04-15.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-04-15.txt
rename to forge-gui/res/formats/Archive/Modern/2017-04-15.txt
index 7ad635db1d3..e6eb6efd399 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-04-15.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-04-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (W17)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-04-15
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-04-28.txt b/forge-gui/res/formats/Archive/Modern/2017-04-28.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-04-28.txt
rename to forge-gui/res/formats/Archive/Modern/2017-04-28.txt
index 563c76dba1d..c7980430ac8 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-04-28.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AKH)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-04-28
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-07-14.txt b/forge-gui/res/formats/Archive/Modern/2017-07-14.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-07-14.txt
rename to forge-gui/res/formats/Archive/Modern/2017-07-14.txt
index b6e4d0aff90..294dcdfd55f 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-07-14.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (HOU)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-07-14
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2017-09-29.txt b/forge-gui/res/formats/Archive/Modern/2017-09-29.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2017-09-29.txt
rename to forge-gui/res/formats/Archive/Modern/2017-09-29.txt
index d31de1783cc..a7a6d88cbdc 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2017-09-29.txt
+++ b/forge-gui/res/formats/Archive/Modern/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (XLN)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2017-09-29
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-01-19.txt b/forge-gui/res/formats/Archive/Modern/2018-01-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-01-19.txt
rename to forge-gui/res/formats/Archive/Modern/2018-01-19.txt
index 660eaf82213..41662d689e9 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-01-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RIX)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-01-19
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-02-19.txt b/forge-gui/res/formats/Archive/Modern/2018-02-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-02-19.txt
rename to forge-gui/res/formats/Archive/Modern/2018-02-19.txt
index f93977229cf..b1f9c5945b7 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-02-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-02-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2018-02-12)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-02-12
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-04-27.txt b/forge-gui/res/formats/Archive/Modern/2018-04-27.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-04-27.txt
rename to forge-gui/res/formats/Archive/Modern/2018-04-27.txt
index 4c22e621a9f..c7df18491c2 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-04-27.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DOM)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-04-27
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-07-13.txt b/forge-gui/res/formats/Archive/Modern/2018-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-07-13.txt
rename to forge-gui/res/formats/Archive/Modern/2018-07-13.txt
index b6eed3c475d..b2db301a0b3 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-07-13.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M19)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-07-13
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-10-05.txt b/forge-gui/res/formats/Archive/Modern/2018-10-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-10-05.txt
rename to forge-gui/res/formats/Archive/Modern/2018-10-05.txt
index d9cd7b07d9d..749d1594de8 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-10-05.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GRN)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-10-05
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-11-02.txt b/forge-gui/res/formats/Archive/Modern/2018-11-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-11-02.txt
rename to forge-gui/res/formats/Archive/Modern/2018-11-02.txt
index 96813436abb..ad8c557f6be 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-11-02.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GK1)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-11-02
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2018-11-16.txt b/forge-gui/res/formats/Archive/Modern/2018-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2018-11-16.txt
rename to forge-gui/res/formats/Archive/Modern/2018-11-16.txt
index 40d94ff3831..8fd0aee0e40 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2018-11-16.txt
+++ b/forge-gui/res/formats/Archive/Modern/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (G18)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2018-11-16
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-01-25.txt b/forge-gui/res/formats/Archive/Modern/2019-01-25.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-01-25.txt
rename to forge-gui/res/formats/Archive/Modern/2019-01-25.txt
index db580316807..594d02a9aa5 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-01-25.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RNA)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-01-25
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-02-15.txt b/forge-gui/res/formats/Archive/Modern/2019-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-02-15.txt
rename to forge-gui/res/formats/Archive/Modern/2019-02-15.txt
index 80d1baafe3e..4b97add7871 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-02-15.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GK2)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-02-15
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-05-03.txt b/forge-gui/res/formats/Archive/Modern/2019-05-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-05-03.txt
rename to forge-gui/res/formats/Archive/Modern/2019-05-03.txt
index 8a47f082d17..df4f717d648 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-05-03.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (WAR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-05-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-06-14.txt b/forge-gui/res/formats/Archive/Modern/2019-06-14.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-06-14.txt
rename to forge-gui/res/formats/Archive/Modern/2019-06-14.txt
index f5523fd807c..16d49715246 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-06-14.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MH1)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-06-14
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-07-12.txt b/forge-gui/res/formats/Archive/Modern/2019-07-12.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-07-12.txt
rename to forge-gui/res/formats/Archive/Modern/2019-07-12.txt
index 34eebe12db9..3008847a938 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-07-12.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M20)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-07-12
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-08-30.txt b/forge-gui/res/formats/Archive/Modern/2019-08-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-08-30.txt
rename to forge-gui/res/formats/Archive/Modern/2019-08-30.txt
index fcf81863404..8a0eeab97b6 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-08-30.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2019-08-30)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-08-30
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2019-10-04.txt b/forge-gui/res/formats/Archive/Modern/2019-10-04.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2019-10-04.txt
rename to forge-gui/res/formats/Archive/Modern/2019-10-04.txt
index 31a647d344b..a4b79a41862 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2019-10-04.txt
+++ b/forge-gui/res/formats/Archive/Modern/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ELD)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2019-10-04
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-01-14.txt b/forge-gui/res/formats/Archive/Modern/2020-01-14.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-01-14.txt
rename to forge-gui/res/formats/Archive/Modern/2020-01-14.txt
index ea02d1548e5..4f113b26497 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-01-14.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-01-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-01-14)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-01-14
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-01-24.txt b/forge-gui/res/formats/Archive/Modern/2020-01-24.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-01-24.txt
rename to forge-gui/res/formats/Archive/Modern/2020-01-24.txt
index 52627f93a31..1878a53909b 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-01-24.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (THB)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-01-24
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-03-10.txt b/forge-gui/res/formats/Archive/Modern/2020-03-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-03-10.txt
rename to forge-gui/res/formats/Archive/Modern/2020-03-10.txt
index cd416250266..8bd857106a8 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-03-10.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-03-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-03-10)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-03-10
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-04-24.txt b/forge-gui/res/formats/Archive/Modern/2020-04-24.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-04-24.txt
rename to forge-gui/res/formats/Archive/Modern/2020-04-24.txt
index afb100763e9..8618221faf0 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-04-24.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (IKO)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-04-24
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-07-03.txt b/forge-gui/res/formats/Archive/Modern/2020-07-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-07-03.txt
rename to forge-gui/res/formats/Archive/Modern/2020-07-03.txt
index 1faa2f96e71..87288cdfde3 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-07-03.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M21)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-07-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-07-13.txt b/forge-gui/res/formats/Archive/Modern/2020-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-07-13.txt
rename to forge-gui/res/formats/Archive/Modern/2020-07-13.txt
index 84636ea502d..6c91ed37a32 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-07-13.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-07-13)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-07-13
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2020-09-25.txt b/forge-gui/res/formats/Archive/Modern/2020-09-25.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2020-09-25.txt
rename to forge-gui/res/formats/Archive/Modern/2020-09-25.txt
index bec87e72e2a..3500c518a7c 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2020-09-25.txt
+++ b/forge-gui/res/formats/Archive/Modern/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2020-09-25
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-02-05.txt b/forge-gui/res/formats/Archive/Modern/2021-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-02-05.txt
rename to forge-gui/res/formats/Archive/Modern/2021-02-05.txt
index 2f7bcafbd28..85676c34908 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-02-05.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KHM)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-02-05
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-02-15.txt b/forge-gui/res/formats/Archive/Modern/2021-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-02-15.txt
rename to forge-gui/res/formats/Archive/Modern/2021-02-15.txt
index d7c8a4e22e2..6378957b014 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-02-15.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2021-02-15)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-02-15
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-03-19.txt b/forge-gui/res/formats/Archive/Modern/2021-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-03-19.txt
rename to forge-gui/res/formats/Archive/Modern/2021-03-19.txt
index 2af422f84b3..6d87a50bf26 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-03-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (TSR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-03-19
 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, TSR
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-04-23.txt b/forge-gui/res/formats/Archive/Modern/2021-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-04-23.txt
rename to forge-gui/res/formats/Archive/Modern/2021-04-23.txt
index 7cb68154c2e..07a541812df 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-04-23.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (STX)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-04-23
 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, TSR, STX
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-06-18.txt b/forge-gui/res/formats/Archive/Modern/2021-06-18.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-06-18.txt
rename to forge-gui/res/formats/Archive/Modern/2021-06-18.txt
index 79d89edd62c..842e45ba18a 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-06-18.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MH2)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-06-18
 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, TSR, STX, MH2
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-07-23.txt b/forge-gui/res/formats/Archive/Modern/2021-07-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-07-23.txt
rename to forge-gui/res/formats/Archive/Modern/2021-07-23.txt
index 95b4f881d1d..4d6fc2f8f9e 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-07-23.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AFR)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-07-23
 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, TSR, STX, MH2, AFR
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-09-24.txt b/forge-gui/res/formats/Archive/Modern/2021-09-24.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-09-24.txt
rename to forge-gui/res/formats/Archive/Modern/2021-09-24.txt
index b17c33a0b4d..82a4e1a7990 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-09-24.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MID)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-09-24
 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, TSR, STX, MH2, AFR, MID
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2021-11-19.txt b/forge-gui/res/formats/Archive/Modern/2021-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2021-11-19.txt
rename to forge-gui/res/formats/Archive/Modern/2021-11-19.txt
index 3f0a9487ed5..8296c57fca4 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2021-11-19.txt
+++ b/forge-gui/res/formats/Archive/Modern/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (VOW)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2021-11-19
 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, TSR, STX, MH2, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2022-01-28.txt b/forge-gui/res/formats/Archive/Modern/2022-01-28.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2022-01-28.txt
rename to forge-gui/res/formats/Archive/Modern/2022-01-28.txt
index 07ea623224e..4cbb370dc18 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2022-01-28.txt
+++ b/forge-gui/res/formats/Archive/Modern/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DBL)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2022-01-28
 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, TSR, STX, MH2, AFR, MID, VOW, DBL
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2022-02-18.txt b/forge-gui/res/formats/Archive/Modern/2022-02-18.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2022-02-18.txt
rename to forge-gui/res/formats/Archive/Modern/2022-02-18.txt
index 02e62aab756..e29d4c29a27 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2022-02-18.txt
+++ b/forge-gui/res/formats/Archive/Modern/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (NEO)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2022-02-18
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2022-03-07.txt b/forge-gui/res/formats/Archive/Modern/2022-03-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2022-03-07.txt
rename to forge-gui/res/formats/Archive/Modern/2022-03-07.txt
index e030cd4f6f3..cfb62b09e3c 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2022-03-07.txt
+++ b/forge-gui/res/formats/Archive/Modern/2022-03-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2022-03-07)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2022-03-07
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Modern/2022-04-29.txt b/forge-gui/res/formats/Archive/Modern/2022-04-29.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Modern/2022-04-29.txt
rename to forge-gui/res/formats/Archive/Modern/2022-04-29.txt
index 049ca5efb9d..9616aaa7bc0 100644
--- a/forge-gui/res/formats/Historic/DCI/Modern/2022-04-29.txt
+++ b/forge-gui/res/formats/Archive/Modern/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (SNC)
-Type:Historic
+Type:Archive
 Subtype:Modern
 Effective:2022-04-29
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Pauper/2019-05-24.txt b/forge-gui/res/formats/Archive/Pauper/2019-05-24.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Pauper/2019-05-24.txt
rename to forge-gui/res/formats/Archive/Pauper/2019-05-24.txt
index b0d3d4d8c0c..c3d914ab95c 100644
--- a/forge-gui/res/formats/Historic/DCI/Pauper/2019-05-24.txt
+++ b/forge-gui/res/formats/Archive/Pauper/2019-05-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2019-05-24)
-Type:Historic
+Type:Archive
 Subtype:Custom
 Effective:2019-05-24
 Rarities:L, C
diff --git a/forge-gui/res/formats/Historic/DCI/Pauper/2019-10-25.txt b/forge-gui/res/formats/Archive/Pauper/2019-10-25.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Pauper/2019-10-25.txt
rename to forge-gui/res/formats/Archive/Pauper/2019-10-25.txt
index 4cefeef6f62..ca6155ba78a 100644
--- a/forge-gui/res/formats/Historic/DCI/Pauper/2019-10-25.txt
+++ b/forge-gui/res/formats/Archive/Pauper/2019-10-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2019-10-25)
-Type:Historic
+Type:Archive
 Subtype:Custom
 Effective:2019-10-25
 Rarities:L, C
diff --git a/forge-gui/res/formats/Historic/DCI/Pauper/2020-01-14.txt b/forge-gui/res/formats/Archive/Pauper/2020-01-14.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Pauper/2020-01-14.txt
rename to forge-gui/res/formats/Archive/Pauper/2020-01-14.txt
index 527bd961132..9fa2d5e1716 100644
--- a/forge-gui/res/formats/Historic/DCI/Pauper/2020-01-14.txt
+++ b/forge-gui/res/formats/Archive/Pauper/2020-01-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2020-01-14)
-Type:Historic
+Type:Archive
 Subtype:Custom
 Effective:2020-01-14
 Rarities:L, C
diff --git a/forge-gui/res/formats/Historic/DCI/Pauper/2020-07-13.txt b/forge-gui/res/formats/Archive/Pauper/2020-07-13.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Pauper/2020-07-13.txt
rename to forge-gui/res/formats/Archive/Pauper/2020-07-13.txt
index 619c6f9b4af..1573efb1ece 100644
--- a/forge-gui/res/formats/Historic/DCI/Pauper/2020-07-13.txt
+++ b/forge-gui/res/formats/Archive/Pauper/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2020-07-13)
-Type:Historic
+Type:Archive
 Subtype:Custom
 Effective:2020-07-13
 Rarities:L, C
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-10-21.txt b/forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2019-10-21.txt
rename to forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt
index d72eb607602..df8b964da9c 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-10-21.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-10-21)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2019-10-21
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-08.txt b/forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-08.txt
rename to forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt
index b9c17a7fe75..9a73245e4f1 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-08.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-11-08)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2019-11-08
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-12.txt b/forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-12.txt
rename to forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt
index ada725ce2a9..7115aee827d 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-11-12.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-11-12)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2019-11-12
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-03.txt b/forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-03.txt
rename to forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt
index 0bd528a64f6..d0e8e7f339f 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-03.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-12-03)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2019-12-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-17.txt b/forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-17.txt
rename to forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt
index 13de6968666..a4f9a3e26bd 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2019-12-17.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-12-17)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2019-12-17
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-01-24.txt b/forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-01-24.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt
index f1d234c1fb7..6af22744d2b 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-01-24.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (THB)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-01-24
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-04-24.txt b/forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-04-24.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt
index 18636326e0e..4845b8ff76a 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-04-24.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (IKO)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-04-24
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-03.txt b/forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-03.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt
index fec3ace94a7..d2025dc4e8a 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-03.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (M21)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-07-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-13.txt b/forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-13.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt
index b7520454d79..1781dc78b95 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-07-13.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2020-07-13)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-07-13
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-08-03.txt b/forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-08-03.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt
index 9cdc5dbebae..00509918999 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-08-03.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2020-08-03)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-08-03
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-09-25.txt b/forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2020-09-25.txt
rename to forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt
index e495183cd5b..3371344b3a3 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2020-09-25.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2020-09-25
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-05.txt b/forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-05.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt
index bedee8f7102..c1f5f79c2a9 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-05.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (KHM)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-02-05
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-15.txt b/forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-15.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt
index 28c3ffa6a01..e5d34bed892 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-02-15.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2021-02-15)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-02-15
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-04-23.txt b/forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-04-23.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt
index cd979cf7a85..df249016b7e 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-04-23.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (STX)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-04-23
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-07-23.txt b/forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-07-23.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt
index 484dcc1962d..c5bc51924c8 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-07-23.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (AFR)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-07-23
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-09-24.txt b/forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-09-24.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt
index 92726a3c19b..5f04ebc6526 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-09-24.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (MID)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-09-24
 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
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-11-19.txt b/forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2021-11-19.txt
rename to forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt
index 4704aeb5c66..cb23e88974a 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2021-11-19.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (VOW)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2021-11-19
 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, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-01-28.txt b/forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2022-01-28.txt
rename to forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt
index 28faf2987c7..99aca4a7198 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-01-28.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (DBL)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2022-01-28
 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, VOW, DBL
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-02-18.txt b/forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2022-02-18.txt
rename to forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt
index 96cf26eb1fb..29b98f730d7 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-02-18.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (NEO)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2022-02-18
 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, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-03-07.txt b/forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2022-03-07.txt
rename to forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt
index 04a2a639e90..76f55229b4d 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-03-07.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2022-03-07)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2022-03-07
 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, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-04-29.txt b/forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2022-04-29.txt
rename to forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt
index 920f9778302..ddbdf700828 100644
--- a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-04-29.txt
+++ b/forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (SNC)
-Type:Historic
+Type:Archive
 Subtype:Pioneer
 Effective:2022-04-29
 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, VOW, DBL, NEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Pioneer/2022-06-07.txt b/forge-gui/res/formats/Archive/Pioneer/2022-06-07.txt
similarity index 100%
rename from forge-gui/res/formats/Historic/DCI/Pioneer/2022-06-07.txt
rename to forge-gui/res/formats/Archive/Pioneer/2022-06-07.txt
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-01-10.txt b/forge-gui/res/formats/Archive/Standard/1995-01-10.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-01-10.txt
rename to forge-gui/res/formats/Archive/Standard/1995-01-10.txt
index 50476f9f241..5bea679d336 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-01-10.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1995-01-10)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-01-10
 Sets:3ED, DRK, FEM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-04-19.txt b/forge-gui/res/formats/Archive/Standard/1995-04-19.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-04-19.txt
rename to forge-gui/res/formats/Archive/Standard/1995-04-19.txt
index 8b2c08ffcf6..fe52b1c9bf3 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-04-19.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-04-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (4ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-04-19
 Sets:DRK, FEM, 4ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-06-03.txt b/forge-gui/res/formats/Archive/Standard/1995-06-03.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-06-03.txt
rename to forge-gui/res/formats/Archive/Standard/1995-06-03.txt
index afb9d4e1beb..9c551e24ffe 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-06-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-06-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (ICE)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-06-03
 Sets:FEM, 4ED, ICE
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-07-01.txt b/forge-gui/res/formats/Archive/Standard/1995-07-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/1995-07-01.txt
index 95423b41741..1976aa6815c 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (CHR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-07-01
 Sets:FEM, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-11-01.txt b/forge-gui/res/formats/Archive/Standard/1995-11-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/1995-11-01.txt
index d7683d12dc3..3d4cf16ecf4 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1995-11-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-11-01
 Sets:FEM, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1995-11-13.txt b/forge-gui/res/formats/Archive/Standard/1995-11-13.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1995-11-13.txt
rename to forge-gui/res/formats/Archive/Standard/1995-11-13.txt
index cec84f699cd..262c8e0bbce 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1995-11-13.txt
+++ b/forge-gui/res/formats/Archive/Standard/1995-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (HML)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1995-11-13
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-02-01.txt b/forge-gui/res/formats/Archive/Standard/1996-02-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-02-01.txt
rename to forge-gui/res/formats/Archive/Standard/1996-02-01.txt
index 6d2c2f54cf8..8fe1d061c6d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-02-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-02-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-02-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-04-01.txt b/forge-gui/res/formats/Archive/Standard/1996-04-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-04-01.txt
rename to forge-gui/res/formats/Archive/Standard/1996-04-01.txt
index ab2a3e30818..c460316613b 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-04-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-04-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-04-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-07-01.txt b/forge-gui/res/formats/Archive/Standard/1996-07-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/1996-07-01.txt
index 76744d35e00..0ae22c7094d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-07-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-07-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-07-10.txt b/forge-gui/res/formats/Archive/Standard/1996-07-10.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-07-10.txt
rename to forge-gui/res/formats/Archive/Standard/1996-07-10.txt
index fe86c14c45c..d6641fd1fef 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-07-10.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (ALL)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-07-10
 Sets:FEM, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-10-01.txt b/forge-gui/res/formats/Archive/Standard/1996-10-01.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-10-01.txt
rename to forge-gui/res/formats/Archive/Standard/1996-10-01.txt
index a1c3b955007..4521b6de6c2 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-10-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-10-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-10-01
 Sets:FEM, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1996-11-07.txt b/forge-gui/res/formats/Archive/Standard/1996-11-07.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/1996-11-07.txt
rename to forge-gui/res/formats/Archive/Standard/1996-11-07.txt
index 87038992c85..8055ddc8985 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1996-11-07.txt
+++ b/forge-gui/res/formats/Archive/Standard/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (MIR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1996-11-07
 Sets:FEM, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1997-01-01.txt b/forge-gui/res/formats/Archive/Standard/1997-01-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1997-01-01.txt
rename to forge-gui/res/formats/Archive/Standard/1997-01-01.txt
index 043941e72c4..865277a80e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1997-01-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1997-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1997-01-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1997-01-01
 Sets:4ED, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1997-03-05.txt b/forge-gui/res/formats/Archive/Standard/1997-03-05.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1997-03-05.txt
rename to forge-gui/res/formats/Archive/Standard/1997-03-05.txt
index 23bd51ae041..6eda8e6b1d0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1997-03-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (VIS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1997-03-05
 Sets:4ED, CHR, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1997-04-23.txt b/forge-gui/res/formats/Archive/Standard/1997-04-23.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Standard/1997-04-23.txt
rename to forge-gui/res/formats/Archive/Standard/1997-04-23.txt
index 4b985313b50..89f34fb0d8f 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1997-04-23.txt
+++ b/forge-gui/res/formats/Archive/Standard/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (5ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1997-04-23
 Sets:ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1997-07-01.txt b/forge-gui/res/formats/Archive/Standard/1997-07-01.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/1997-07-01.txt
index 301e3522712..7af584ee98d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1997-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WTH)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1997-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1997-11-01.txt b/forge-gui/res/formats/Archive/Standard/1997-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/1997-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/1997-11-01.txt
index b0da1d57d16..144c5d1a607 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1997-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TMP)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1997-11-01
 Sets:MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1998-04-01.txt b/forge-gui/res/formats/Archive/Standard/1998-04-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/1998-04-01.txt
rename to forge-gui/res/formats/Archive/Standard/1998-04-01.txt
index d94d057530c..fcf06f472ea 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1998-04-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (STH)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1998-04-01
 Sets:MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1998-07-01.txt b/forge-gui/res/formats/Archive/Standard/1998-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/1998-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/1998-07-01.txt
index 0bccdc5227e..24cd880dd24 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1998-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EXO)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1998-07-01
 Sets:MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1998-11-01.txt b/forge-gui/res/formats/Archive/Standard/1998-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/1998-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/1998-11-01.txt
index e65ff83034c..b745f85829d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1998-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (USG)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1998-11-01
 Sets:5ED, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-01-01.txt b/forge-gui/res/formats/Archive/Standard/1999-01-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-01-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-01-01.txt
index ca97dcc20a6..2194ccaae57 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-01-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1999-01-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-01-01
 Sets:5ED, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-03-01.txt b/forge-gui/res/formats/Archive/Standard/1999-03-01.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-03-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-03-01.txt
index 5b16d700578..fb31ade8459 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-03-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ULG)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-03-01
 Sets:5ED, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-04-01.txt b/forge-gui/res/formats/Archive/Standard/1999-04-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-04-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-04-01.txt
index fe9f8f3fc9c..231d23496c7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-04-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1999-04-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-04-01
 Sets:5ED, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-06-01.txt b/forge-gui/res/formats/Archive/Standard/1999-06-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-06-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-06-01.txt
index cb5d2e48a42..e3780d6e5b7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-06-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (6ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-06-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-07-01.txt b/forge-gui/res/formats/Archive/Standard/1999-07-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-07-01.txt
index a07ae18092d..e03ea7ecdb8 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (UDS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-07-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/1999-11-01.txt b/forge-gui/res/formats/Archive/Standard/1999-11-01.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/1999-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/1999-11-01.txt
index 1aec79054a8..309f250426d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/1999-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MMQ)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:1999-11-01
 Sets:USG, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2000-03-01.txt b/forge-gui/res/formats/Archive/Standard/2000-03-01.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2000-03-01.txt
rename to forge-gui/res/formats/Archive/Standard/2000-03-01.txt
index db68a057841..fb0651f6547 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2000-03-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NMS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2000-03-01
 Sets:USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2000-07-01.txt b/forge-gui/res/formats/Archive/Standard/2000-07-01.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2000-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/2000-07-01.txt
index 53241304b7a..1963c13c16e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2000-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PCY)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2000-07-01
 Sets:USG, ULG, 6ED, UDS, MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2000-11-01.txt b/forge-gui/res/formats/Archive/Standard/2000-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2000-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/2000-11-01.txt
index 381898ce8ad..310fd6ba665 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2000-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (INV)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2000-11-01
 Sets:6ED, MMQ, NMS, PCY, INV
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2001-03-01.txt b/forge-gui/res/formats/Archive/Standard/2001-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2001-03-01.txt
rename to forge-gui/res/formats/Archive/Standard/2001-03-01.txt
index dbe486300d4..637f37bb42b 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2001-03-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PLS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2001-03-01
 Sets:6ED, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2001-05-01.txt b/forge-gui/res/formats/Archive/Standard/2001-05-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2001-05-01.txt
rename to forge-gui/res/formats/Archive/Standard/2001-05-01.txt
index e396b6b1324..e3211e32e8c 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2001-05-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (7ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2001-05-01
 Sets:MMQ, NMS, PCY, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2001-07-01.txt b/forge-gui/res/formats/Archive/Standard/2001-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2001-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/2001-07-01.txt
index ff6065ee20b..1dc694c225e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2001-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (APC)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2001-07-01
 Sets:MMQ, NMS, PCY, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2001-11-01.txt b/forge-gui/res/formats/Archive/Standard/2001-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2001-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/2001-11-01.txt
index cfcd33c62cc..678f0874c81 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2001-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ODY)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2001-11-01
 Sets:INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2002-03-01.txt b/forge-gui/res/formats/Archive/Standard/2002-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2002-03-01.txt
rename to forge-gui/res/formats/Archive/Standard/2002-03-01.txt
index 593bb994e4e..a378a8baa13 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2002-03-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TOR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2002-03-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2002-07-01.txt b/forge-gui/res/formats/Archive/Standard/2002-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2002-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/2002-07-01.txt
index c93f1e573c3..ffc5899b205 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2002-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (JUD)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2002-07-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2002-11-01.txt b/forge-gui/res/formats/Archive/Standard/2002-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2002-11-01.txt
rename to forge-gui/res/formats/Archive/Standard/2002-11-01.txt
index eb2fa96eb5e..983accbcdaf 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2002-11-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ONS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2002-11-01
 Sets:7ED, ODY, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2003-03-01.txt b/forge-gui/res/formats/Archive/Standard/2003-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2003-03-01.txt
rename to forge-gui/res/formats/Archive/Standard/2003-03-01.txt
index 13588d8ad77..14843927b0a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2003-03-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (LGN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2003-03-01
 Sets:7ED, ODY, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2003-07-01.txt b/forge-gui/res/formats/Archive/Standard/2003-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2003-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/2003-07-01.txt
index 348669d4a7b..08346f217c6 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2003-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SCG)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2003-07-01
 Sets:7ED, ODY, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2003-09-01.txt b/forge-gui/res/formats/Archive/Standard/2003-09-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2003-09-01.txt
rename to forge-gui/res/formats/Archive/Standard/2003-09-01.txt
index c78e867a83c..0283c1c2dd6 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2003-09-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (8ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2003-09-01
 Sets:ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2003-10-20.txt b/forge-gui/res/formats/Archive/Standard/2003-10-20.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2003-10-20.txt
rename to forge-gui/res/formats/Archive/Standard/2003-10-20.txt
index e59e7018915..2da56774bef 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2003-10-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MRD)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2003-10-20
 Sets:ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2004-02-20.txt b/forge-gui/res/formats/Archive/Standard/2004-02-20.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2004-02-20.txt
rename to forge-gui/res/formats/Archive/Standard/2004-02-20.txt
index 898067b8b33..60eed367351 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2004-02-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DST)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2004-02-20
 Sets:ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2004-06-20.txt b/forge-gui/res/formats/Archive/Standard/2004-06-20.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2004-06-20.txt
rename to forge-gui/res/formats/Archive/Standard/2004-06-20.txt
index a7f80c56dbd..41dcf61b162 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2004-06-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (5DN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2004-06-20
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2004-10-20.txt b/forge-gui/res/formats/Archive/Standard/2004-10-20.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2004-10-20.txt
rename to forge-gui/res/formats/Archive/Standard/2004-10-20.txt
index 8b70927eac0..79b3434d097 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2004-10-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CHK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2004-10-20
 Sets:8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2005-02-20.txt b/forge-gui/res/formats/Archive/Standard/2005-02-20.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2005-02-20.txt
rename to forge-gui/res/formats/Archive/Standard/2005-02-20.txt
index 43c081d3d77..87ac9e7ac16 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2005-02-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BOK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2005-02-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2005-03-20.txt b/forge-gui/res/formats/Archive/Standard/2005-03-20.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2005-03-20.txt
rename to forge-gui/res/formats/Archive/Standard/2005-03-20.txt
index 910fe0346ae..534d5915e29 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2005-03-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2005-03-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2005-03-20)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2005-03-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2005-06-20.txt b/forge-gui/res/formats/Archive/Standard/2005-06-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2005-06-20.txt
rename to forge-gui/res/formats/Archive/Standard/2005-06-20.txt
index b09f3007b0f..947276842f9 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2005-06-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2005-06-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2005-08-20.txt b/forge-gui/res/formats/Archive/Standard/2005-08-20.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2005-08-20.txt
rename to forge-gui/res/formats/Archive/Standard/2005-08-20.txt
index d21bda50187..5d1fc83a90b 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2005-08-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (9ED)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2005-08-20
 Sets:MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2005-10-20.txt b/forge-gui/res/formats/Archive/Standard/2005-10-20.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2005-10-20.txt
rename to forge-gui/res/formats/Archive/Standard/2005-10-20.txt
index e538ad15307..997740e4c37 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2005-10-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RAV)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2005-10-20
 Sets:CHK, BOK, SOK, 9ED, RAV
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2006-02-20.txt b/forge-gui/res/formats/Archive/Standard/2006-02-20.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Standard/2006-02-20.txt
index 33677d6f418..06f083d1275 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GPT)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2006-02-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2006-05-20.txt b/forge-gui/res/formats/Archive/Standard/2006-05-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2006-05-20.txt
rename to forge-gui/res/formats/Archive/Standard/2006-05-20.txt
index cf43c0eb55d..3d80018c936 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2006-05-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DIS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2006-05-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2006-08-20.txt b/forge-gui/res/formats/Archive/Standard/2006-08-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2006-08-20.txt
rename to forge-gui/res/formats/Archive/Standard/2006-08-20.txt
index f317ffb3b6a..8dcf191351e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2006-08-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CSP)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2006-08-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2006-10-20.txt b/forge-gui/res/formats/Archive/Standard/2006-10-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2006-10-20.txt
rename to forge-gui/res/formats/Archive/Standard/2006-10-20.txt
index 6c31f68be81..dea87303ef0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2006-10-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TSP)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2006-10-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2007-02-20.txt b/forge-gui/res/formats/Archive/Standard/2007-02-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2007-02-20.txt
rename to forge-gui/res/formats/Archive/Standard/2007-02-20.txt
index d8d8f41df32..c5425265ee0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2007-02-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PLC)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2007-02-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2007-05-20.txt b/forge-gui/res/formats/Archive/Standard/2007-05-20.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2007-05-20.txt
rename to forge-gui/res/formats/Archive/Standard/2007-05-20.txt
index 8e5c45d3454..c16bcc364f4 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2007-05-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (FUT)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2007-05-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2007-07-20.txt b/forge-gui/res/formats/Archive/Standard/2007-07-20.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2007-07-20.txt
rename to forge-gui/res/formats/Archive/Standard/2007-07-20.txt
index e0de26e5fa9..7ca59b723b7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2007-07-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (10E)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2007-07-20
 Sets:RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2007-10-20.txt b/forge-gui/res/formats/Archive/Standard/2007-10-20.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2007-10-20.txt
rename to forge-gui/res/formats/Archive/Standard/2007-10-20.txt
index a48560e251d..0c6d6ed33b5 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2007-10-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (LRW)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2007-10-20
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2008-02-01.txt b/forge-gui/res/formats/Archive/Standard/2008-02-01.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2008-02-01.txt
rename to forge-gui/res/formats/Archive/Standard/2008-02-01.txt
index 4783fe89dcd..9b34fd1bb0e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2008-02-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MOR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2008-02-01
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2008-05-02.txt b/forge-gui/res/formats/Archive/Standard/2008-05-02.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2008-05-02.txt
rename to forge-gui/res/formats/Archive/Standard/2008-05-02.txt
index 11a590424cc..cefcd1af642 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2008-05-02.txt
+++ b/forge-gui/res/formats/Archive/Standard/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SHM)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2008-05-02
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2008-07-25.txt b/forge-gui/res/formats/Archive/Standard/2008-07-25.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2008-07-25.txt
rename to forge-gui/res/formats/Archive/Standard/2008-07-25.txt
index 96531c359d8..b372df4b089 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2008-07-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EVE)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2008-07-25
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2008-10-03.txt b/forge-gui/res/formats/Archive/Standard/2008-10-03.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2008-10-03.txt
rename to forge-gui/res/formats/Archive/Standard/2008-10-03.txt
index ea984964434..bb28c03cba9 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2008-10-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ALA)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2008-10-03
 Sets:10E, LRW, MOR, SHM, EVE, ALA
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2009-02-06.txt b/forge-gui/res/formats/Archive/Standard/2009-02-06.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2009-02-06.txt
rename to forge-gui/res/formats/Archive/Standard/2009-02-06.txt
index 35ebc829cca..0eea98cf7e0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2009-02-06.txt
+++ b/forge-gui/res/formats/Archive/Standard/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CFX)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2009-02-06
 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2009-04-30.txt b/forge-gui/res/formats/Archive/Standard/2009-04-30.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2009-04-30.txt
rename to forge-gui/res/formats/Archive/Standard/2009-04-30.txt
index 845d5e42f04..74cb964e0d7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2009-04-30.txt
+++ b/forge-gui/res/formats/Archive/Standard/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ARB)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2009-04-30
 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2009-07-17.txt b/forge-gui/res/formats/Archive/Standard/2009-07-17.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2009-07-17.txt
rename to forge-gui/res/formats/Archive/Standard/2009-07-17.txt
index 7f15d27c202..fadf95c0728 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2009-07-17.txt
+++ b/forge-gui/res/formats/Archive/Standard/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M10)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2009-07-17
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2009-10-02.txt b/forge-gui/res/formats/Archive/Standard/2009-10-02.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2009-10-02.txt
rename to forge-gui/res/formats/Archive/Standard/2009-10-02.txt
index b7b67b8eb33..eaa6cfb51f9 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2009-10-02.txt
+++ b/forge-gui/res/formats/Archive/Standard/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ZEN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2009-10-02
 Sets:ALA, CFX, ARB, M10, ZEN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2010-02-05.txt b/forge-gui/res/formats/Archive/Standard/2010-02-05.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2010-02-05.txt
rename to forge-gui/res/formats/Archive/Standard/2010-02-05.txt
index 8a75d719bf9..04a4da3cb15 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2010-02-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WWK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2010-02-05
 Sets:ALA, CFX, ARB, M10, ZEN, WWK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2010-04-23.txt b/forge-gui/res/formats/Archive/Standard/2010-04-23.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2010-04-23.txt
rename to forge-gui/res/formats/Archive/Standard/2010-04-23.txt
index 712116a86d1..1021b2ae437 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2010-04-23.txt
+++ b/forge-gui/res/formats/Archive/Standard/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ROE)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2010-04-23
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2010-07-16.txt b/forge-gui/res/formats/Archive/Standard/2010-07-16.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2010-07-16.txt
rename to forge-gui/res/formats/Archive/Standard/2010-07-16.txt
index 3f89f6c05c8..465d9c7f0c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2010-07-16.txt
+++ b/forge-gui/res/formats/Archive/Standard/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M11)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2010-07-16
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2010-10-01.txt b/forge-gui/res/formats/Archive/Standard/2010-10-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2010-10-01.txt
rename to forge-gui/res/formats/Archive/Standard/2010-10-01.txt
index 38d64984c31..f1e1f036b49 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2010-10-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOM)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2010-10-01
 Sets:ZEN, WWK, ROE, M11, SOM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2011-02-04.txt b/forge-gui/res/formats/Archive/Standard/2011-02-04.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2011-02-04.txt
rename to forge-gui/res/formats/Archive/Standard/2011-02-04.txt
index 0ee407af1f6..d8d40cb42ef 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2011-02-04.txt
+++ b/forge-gui/res/formats/Archive/Standard/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MBS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2011-02-04
 Sets:ZEN, WWK, ROE, M11, SOM, MBS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2011-05-13.txt b/forge-gui/res/formats/Archive/Standard/2011-05-13.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2011-05-13.txt
rename to forge-gui/res/formats/Archive/Standard/2011-05-13.txt
index 3bea77614d1..8cb6dc77ba9 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2011-05-13.txt
+++ b/forge-gui/res/formats/Archive/Standard/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NPH)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2011-05-13
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2011-07-01.txt b/forge-gui/res/formats/Archive/Standard/2011-07-01.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2011-07-01.txt
rename to forge-gui/res/formats/Archive/Standard/2011-07-01.txt
index f13bd57a3ff..447103877cd 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2011-07-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2011-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2011-07-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2011-07-01
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2011-07-15.txt b/forge-gui/res/formats/Archive/Standard/2011-07-15.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2011-07-15.txt
rename to forge-gui/res/formats/Archive/Standard/2011-07-15.txt
index 1df95c63ded..6afb52ae956 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2011-07-15.txt
+++ b/forge-gui/res/formats/Archive/Standard/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M12)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2011-07-15
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2011-09-30.txt b/forge-gui/res/formats/Archive/Standard/2011-09-30.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Standard/2011-09-30.txt
index 600c390510d..56e7f60c861 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Standard/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ISD)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2011-09-30
 Sets:SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2012-02-03.txt b/forge-gui/res/formats/Archive/Standard/2012-02-03.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Standard/2012-02-03.txt
index 4b2f808aaad..2a201ab3ba2 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DKA)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2012-02-03
 Sets:SOM, MBS, NPH, M12, ISD, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2012-05-04.txt b/forge-gui/res/formats/Archive/Standard/2012-05-04.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Standard/2012-05-04.txt
index 339b75ba86b..af6c3bb885f 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Standard/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AVR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2012-05-04
 Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2012-07-13.txt b/forge-gui/res/formats/Archive/Standard/2012-07-13.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2012-07-13.txt
rename to forge-gui/res/formats/Archive/Standard/2012-07-13.txt
index 4555feb0258..bc55fcf3cab 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2012-07-13.txt
+++ b/forge-gui/res/formats/Archive/Standard/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M13)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2012-07-13
 Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR, M13
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2012-10-05.txt b/forge-gui/res/formats/Archive/Standard/2012-10-05.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Standard/2012-10-05.txt
index 453a53314f7..525421eff5e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2012-10-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RTR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2012-10-05
 Sets:ISD, DKA, AVR, M13, RTR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2013-02-01.txt b/forge-gui/res/formats/Archive/Standard/2013-02-01.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Standard/2013-02-01.txt
index 1b2bf5f9789..be3468d3b04 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2013-02-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GTC)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2013-02-01
 Sets:ISD, DKA, AVR, M13, RTR, GTC
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2013-05-03.txt b/forge-gui/res/formats/Archive/Standard/2013-05-03.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Standard/2013-05-03.txt
index ab84d5a99f5..d0ab7e8ff1b 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2013-05-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DGM)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2013-05-03
 Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2013-07-19.txt b/forge-gui/res/formats/Archive/Standard/2013-07-19.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2013-07-19.txt
rename to forge-gui/res/formats/Archive/Standard/2013-07-19.txt
index 9f2682b5309..f0db383498d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2013-07-19.txt
+++ b/forge-gui/res/formats/Archive/Standard/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M14)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2013-07-19
 Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2013-09-27.txt b/forge-gui/res/formats/Archive/Standard/2013-09-27.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Standard/2013-09-27.txt
index dcd9422a614..58f6990c92a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Standard/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (THS)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2013-09-27
 Sets:RTR, GTC, DGM, M14, THS
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2014-02-07.txt b/forge-gui/res/formats/Archive/Standard/2014-02-07.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2014-02-07.txt
rename to forge-gui/res/formats/Archive/Standard/2014-02-07.txt
index da4843febfb..e83787b6316 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2014-02-07.txt
+++ b/forge-gui/res/formats/Archive/Standard/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BNG)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2014-02-07
 Sets:RTR, GTC, DGM, M14, THS, BNG
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2014-05-02.txt b/forge-gui/res/formats/Archive/Standard/2014-05-02.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2014-05-02.txt
rename to forge-gui/res/formats/Archive/Standard/2014-05-02.txt
index e5c2308f1fa..8731635dccc 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2014-05-02.txt
+++ b/forge-gui/res/formats/Archive/Standard/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (JOU)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2014-05-02
 Sets:RTR, GTC, DGM, M14, THS, BNG, JOU
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2014-07-18.txt b/forge-gui/res/formats/Archive/Standard/2014-07-18.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2014-07-18.txt
rename to forge-gui/res/formats/Archive/Standard/2014-07-18.txt
index 9cf01f0f7af..0b50bbd0c2c 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2014-07-18.txt
+++ b/forge-gui/res/formats/Archive/Standard/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M15)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2014-07-18
 Sets:RTR, GTC, DGM, M14, THS, BNG, JOU, M15
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2014-09-26.txt b/forge-gui/res/formats/Archive/Standard/2014-09-26.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2014-09-26.txt
rename to forge-gui/res/formats/Archive/Standard/2014-09-26.txt
index 1164965b1f0..a77b8587805 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2014-09-26.txt
+++ b/forge-gui/res/formats/Archive/Standard/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KTK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2014-09-26
 Sets:THS, BNG, JOU, M15, KTK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2015-01-23.txt b/forge-gui/res/formats/Archive/Standard/2015-01-23.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2015-01-23.txt
rename to forge-gui/res/formats/Archive/Standard/2015-01-23.txt
index 62bd84e9170..5473f151df7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2015-01-23.txt
+++ b/forge-gui/res/formats/Archive/Standard/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (FRF)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2015-01-23
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2015-03-27.txt b/forge-gui/res/formats/Archive/Standard/2015-03-27.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2015-03-27.txt
rename to forge-gui/res/formats/Archive/Standard/2015-03-27.txt
index a57ec9b8fd1..13619169319 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2015-03-27.txt
+++ b/forge-gui/res/formats/Archive/Standard/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DTK)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2015-03-27
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF, DTK
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2015-07-17.txt b/forge-gui/res/formats/Archive/Standard/2015-07-17.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2015-07-17.txt
rename to forge-gui/res/formats/Archive/Standard/2015-07-17.txt
index 185a93d44fd..158ce40e796 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2015-07-17.txt
+++ b/forge-gui/res/formats/Archive/Standard/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ORI)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2015-07-17
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF, DTK, ORI
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2015-10-02.txt b/forge-gui/res/formats/Archive/Standard/2015-10-02.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2015-10-02.txt
rename to forge-gui/res/formats/Archive/Standard/2015-10-02.txt
index 8597d1fb0c4..652b8226bd6 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2015-10-02.txt
+++ b/forge-gui/res/formats/Archive/Standard/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BFZ)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2015-10-02
 Sets:KTK, FRF, UGF, DTK, ORI, BFZ
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2016-01-22.txt b/forge-gui/res/formats/Archive/Standard/2016-01-22.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2016-01-22.txt
rename to forge-gui/res/formats/Archive/Standard/2016-01-22.txt
index 3407019f7ed..8983f805744 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2016-01-22.txt
+++ b/forge-gui/res/formats/Archive/Standard/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (OGW)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2016-01-22
 Sets:KTK, FRF, UGF, DTK, ORI, BFZ, OGW
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2016-04-08.txt b/forge-gui/res/formats/Archive/Standard/2016-04-08.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2016-04-08.txt
rename to forge-gui/res/formats/Archive/Standard/2016-04-08.txt
index a4e7b39cebe..d1bc2e9d54c 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2016-04-08.txt
+++ b/forge-gui/res/formats/Archive/Standard/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOI)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2016-04-08
 Sets:DTK, ORI, BFZ, OGW, SOI, W16
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2016-07-22.txt b/forge-gui/res/formats/Archive/Standard/2016-07-22.txt
similarity index 88%
rename from forge-gui/res/formats/Historic/DCI/Standard/2016-07-22.txt
rename to forge-gui/res/formats/Archive/Standard/2016-07-22.txt
index ab3d33e269c..d3ab77c98e0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2016-07-22.txt
+++ b/forge-gui/res/formats/Archive/Standard/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EMN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2016-07-22
 Sets:DTK, ORI, BFZ, OGW, SOI, W16, EMN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2016-09-30.txt b/forge-gui/res/formats/Archive/Standard/2016-09-30.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2016-09-30.txt
rename to forge-gui/res/formats/Archive/Standard/2016-09-30.txt
index fbbb27029a2..8c2b6b4cd58 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2016-09-30.txt
+++ b/forge-gui/res/formats/Archive/Standard/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KLD)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2016-09-30
 Sets:BFZ, OGW, SOI, W16, EMN, KLD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2017-01-20.txt b/forge-gui/res/formats/Archive/Standard/2017-01-20.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2017-01-20.txt
rename to forge-gui/res/formats/Archive/Standard/2017-01-20.txt
index 8158dc094d2..3743148e98f 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2017-01-20.txt
+++ b/forge-gui/res/formats/Archive/Standard/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AER)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2017-01-20
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2017-04-28.txt b/forge-gui/res/formats/Archive/Standard/2017-04-28.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2017-04-28.txt
rename to forge-gui/res/formats/Archive/Standard/2017-04-28.txt
index 65f4e4d37e5..0f8b844202d 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2017-04-28.txt
+++ b/forge-gui/res/formats/Archive/Standard/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AKH)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2017-04-28
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2017-06-19.txt b/forge-gui/res/formats/Archive/Standard/2017-06-19.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2017-06-19.txt
rename to forge-gui/res/formats/Archive/Standard/2017-06-19.txt
index e6e0e22698b..0027719aab6 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2017-06-19.txt
+++ b/forge-gui/res/formats/Archive/Standard/2017-06-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2017-06-19)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2017-06-19
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2017-07-14.txt b/forge-gui/res/formats/Archive/Standard/2017-07-14.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2017-07-14.txt
rename to forge-gui/res/formats/Archive/Standard/2017-07-14.txt
index f73b104f71b..3e5ca8fcb3a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2017-07-14.txt
+++ b/forge-gui/res/formats/Archive/Standard/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (HOU)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2017-07-14
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17, HOU
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2017-09-29.txt b/forge-gui/res/formats/Archive/Standard/2017-09-29.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2017-09-29.txt
rename to forge-gui/res/formats/Archive/Standard/2017-09-29.txt
index b9c40967f1c..f8216b19784 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2017-09-29.txt
+++ b/forge-gui/res/formats/Archive/Standard/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (XLN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2017-09-29
 Sets:KLD, AER, AKH, W17, HOU, XLN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2018-01-19.txt b/forge-gui/res/formats/Archive/Standard/2018-01-19.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2018-01-19.txt
rename to forge-gui/res/formats/Archive/Standard/2018-01-19.txt
index 948a3887a90..956d87dd046 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-01-19.txt
+++ b/forge-gui/res/formats/Archive/Standard/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RIX)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-01-19
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2018-04-27.txt b/forge-gui/res/formats/Archive/Standard/2018-04-27.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2018-04-27.txt
rename to forge-gui/res/formats/Archive/Standard/2018-04-27.txt
index dd371629960..b5a78397bce 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-04-27.txt
+++ b/forge-gui/res/formats/Archive/Standard/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DOM)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-04-27
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2018-07-13.txt b/forge-gui/res/formats/Archive/Standard/2018-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2018-07-13.txt
rename to forge-gui/res/formats/Archive/Standard/2018-07-13.txt
index 279e9dfba94..437dc4ed3b7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-07-13.txt
+++ b/forge-gui/res/formats/Archive/Standard/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M19)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-07-13
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2018-10-05.txt b/forge-gui/res/formats/Archive/Standard/2018-10-05.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2018-10-05.txt
rename to forge-gui/res/formats/Archive/Standard/2018-10-05.txt
index 3966dfec25b..83b1e8e0a14 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-10-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GRN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-10-05
 Sets:XLN, RIX, DOM, M19, GRN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2018-11-16.txt b/forge-gui/res/formats/Archive/Standard/2018-11-16.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2018-11-16.txt
rename to forge-gui/res/formats/Archive/Standard/2018-11-16.txt
index 76e716388fb..683bcfaf54c 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2018-11-16.txt
+++ b/forge-gui/res/formats/Archive/Standard/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (G18)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-11-16
 Sets:XLN, RIX, DOM, M19, GRN, G18
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-01-25.txt b/forge-gui/res/formats/Archive/Standard/2019-01-25.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-01-25.txt
rename to forge-gui/res/formats/Archive/Standard/2019-01-25.txt
index d49994e00e7..80ab900e7e5 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-01-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RNA)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-01-25
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-05-03.txt b/forge-gui/res/formats/Archive/Standard/2019-05-03.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-05-03.txt
rename to forge-gui/res/formats/Archive/Standard/2019-05-03.txt
index 98659c62d15..47173e3c1a4 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-05-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WAR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-05-03
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-07-12.txt b/forge-gui/res/formats/Archive/Standard/2019-07-12.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-07-12.txt
rename to forge-gui/res/formats/Archive/Standard/2019-07-12.txt
index b1224eb1516..82720254d33 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-07-12.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M20)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-07-12
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-08-30.txt b/forge-gui/res/formats/Archive/Standard/2019-08-30.txt
similarity index 89%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-08-30.txt
rename to forge-gui/res/formats/Archive/Standard/2019-08-30.txt
index 7932c500cbf..103431157c7 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-08-30.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-08-30)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-08-30
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-10-04.txt b/forge-gui/res/formats/Archive/Standard/2019-10-04.txt
similarity index 87%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-10-04.txt
rename to forge-gui/res/formats/Archive/Standard/2019-10-04.txt
index 1fff662ddc7..0834b69cdfe 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-10-04.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ELD)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-10-04
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-10-25.txt b/forge-gui/res/formats/Archive/Standard/2019-10-25.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-10-25.txt
rename to forge-gui/res/formats/Archive/Standard/2019-10-25.txt
index fa610c69aac..cb8790ee547 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-10-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-10-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-10-25)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-10-25
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2019-11-22.txt b/forge-gui/res/formats/Archive/Standard/2019-11-22.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2019-11-22.txt
rename to forge-gui/res/formats/Archive/Standard/2019-11-22.txt
index 54d4abaf2bd..ff8a4633e1a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2019-11-22.txt
+++ b/forge-gui/res/formats/Archive/Standard/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-11-22)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-11-22
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-01-24.txt b/forge-gui/res/formats/Archive/Standard/2020-01-24.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-01-24.txt
rename to forge-gui/res/formats/Archive/Standard/2020-01-24.txt
index 79077ebeea0..58791b73502 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-01-24.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (THB)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-01-24
 Sets:GRN, RNA, WAR, M20, ELD, THB
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-04-24.txt b/forge-gui/res/formats/Archive/Standard/2020-04-24.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-04-24.txt
rename to forge-gui/res/formats/Archive/Standard/2020-04-24.txt
index 282ac5317c3..58ec74432aa 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-04-24.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (IKO)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-04-24
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-06-01.txt b/forge-gui/res/formats/Archive/Standard/2020-06-01.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-06-01.txt
rename to forge-gui/res/formats/Archive/Standard/2020-06-01.txt
index df026df1e6b..c5a2f3fa30a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-06-01.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-06-01)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-06-01
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-07-03.txt b/forge-gui/res/formats/Archive/Standard/2020-07-03.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-07-03.txt
rename to forge-gui/res/formats/Archive/Standard/2020-07-03.txt
index c23fd40c82f..5f72035ab5e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-07-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M21)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-07-03
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-08-03.txt b/forge-gui/res/formats/Archive/Standard/2020-08-03.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-08-03.txt
rename to forge-gui/res/formats/Archive/Standard/2020-08-03.txt
index 5294ef151ed..62f4f7996fa 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-08-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-08-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-08-03)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-08-03
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-09-25.txt b/forge-gui/res/formats/Archive/Standard/2020-09-25.txt
similarity index 92%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-09-25.txt
rename to forge-gui/res/formats/Archive/Standard/2020-09-25.txt
index 1b054944bdc..3b2f5ef94e0 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-09-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-09-25
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-09-28.txt b/forge-gui/res/formats/Archive/Standard/2020-09-28.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-09-28.txt
rename to forge-gui/res/formats/Archive/Standard/2020-09-28.txt
index 889ec3c9dad..fb4d8baf036 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-09-28.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-09-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-09-28)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-09-28
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2020-10-12.txt b/forge-gui/res/formats/Archive/Standard/2020-10-12.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2020-10-12.txt
rename to forge-gui/res/formats/Archive/Standard/2020-10-12.txt
index 424ac3bb084..dabd0191419 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2020-10-12.txt
+++ b/forge-gui/res/formats/Archive/Standard/2020-10-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-10-12)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2020-10-12
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2021-02-05.txt b/forge-gui/res/formats/Archive/Standard/2021-02-05.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2021-02-05.txt
rename to forge-gui/res/formats/Archive/Standard/2021-02-05.txt
index 29ae0ab77b7..2db8c8b1d4b 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-02-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KHM)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2021-02-05
 Sets:ELD, THB, IKO, M21, ZNR, KHM
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2021-04-23.txt b/forge-gui/res/formats/Archive/Standard/2021-04-23.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2021-04-23.txt
rename to forge-gui/res/formats/Archive/Standard/2021-04-23.txt
index 5ebc1f4291a..81468e616a8 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-04-23.txt
+++ b/forge-gui/res/formats/Archive/Standard/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (STX)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2021-04-23
 Sets:ELD, THB, IKO, M21, ZNR, KHM, STX
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2021-07-23.txt b/forge-gui/res/formats/Archive/Standard/2021-07-23.txt
similarity index 95%
rename from forge-gui/res/formats/Historic/DCI/Standard/2021-07-23.txt
rename to forge-gui/res/formats/Archive/Standard/2021-07-23.txt
index c22741bd945..45d94d5b66a 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-07-23.txt
+++ b/forge-gui/res/formats/Archive/Standard/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AFR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2021-07-23
 Sets:ELD, THB, IKO, M21, ZNR, KHM, STX, AFR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2021-09-24.txt b/forge-gui/res/formats/Archive/Standard/2021-09-24.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2021-09-24.txt
rename to forge-gui/res/formats/Archive/Standard/2021-09-24.txt
index 4628ec9d85c..8b814e82533 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-09-24.txt
+++ b/forge-gui/res/formats/Archive/Standard/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MID)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2021-09-24
 Sets:ZNR, KHM, STX, AFR, MID
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2021-11-19.txt b/forge-gui/res/formats/Archive/Standard/2021-11-19.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/2021-11-19.txt
rename to forge-gui/res/formats/Archive/Standard/2021-11-19.txt
index 0dfa7295fa9..d438695e9da 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2021-11-19.txt
+++ b/forge-gui/res/formats/Archive/Standard/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (VOW)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2021-11-19
 Sets:ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2022-01-25.txt b/forge-gui/res/formats/Archive/Standard/2022-01-25.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2022-01-25.txt
rename to forge-gui/res/formats/Archive/Standard/2022-01-25.txt
index 6e9f096a720..9680f5a2998 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2022-01-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2022-01-25)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2022-01-25
 Sets:ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2022-02-18.txt b/forge-gui/res/formats/Archive/Standard/2022-02-18.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2022-02-18.txt
rename to forge-gui/res/formats/Archive/Standard/2022-02-18.txt
index 1e0741067de..4e8f12d13fc 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2022-02-18.txt
+++ b/forge-gui/res/formats/Archive/Standard/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NEO)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2022-02-18
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/2022-04-29.txt b/forge-gui/res/formats/Archive/Standard/2022-04-29.txt
similarity index 93%
rename from forge-gui/res/formats/Historic/DCI/Standard/2022-04-29.txt
rename to forge-gui/res/formats/Archive/Standard/2022-04-29.txt
index 71e2c2ea38a..f0e2c2e44ee 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/2022-04-29.txt
+++ b/forge-gui/res/formats/Archive/Standard/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SNC)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2022-04-29
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-06-22.txt b/forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2018-06-22.txt
rename to forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt
index c45e990d695..b4fc3fee165 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-06-22.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (GS1)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-06-22
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, GS1
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-07-13.txt b/forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2018-07-13.txt
rename to forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt
index 90a70f06c53..f7c39611998 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-07-13.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (M19)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-07-13
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, GS1, M19
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-05.txt b/forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-05.txt
rename to forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt
index f2bcfd5b7db..a3823cf6aab 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-10-05.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (GRN)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-10-05
 Sets:XLN, RIX, DOM, GS1, M19, GRN
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-11-16.txt b/forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt
similarity index 90%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2018-11-16.txt
rename to forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt
index 79e215f548f..6dbe528a68f 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2018-11-16.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (G18)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2018-11-16
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-01-25.txt b/forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2019-01-25.txt
rename to forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt
index e632743ee32..06464f4813e 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-01-25.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (RNA)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-01-25
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-05-03.txt b/forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2019-05-03.txt
rename to forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt
index 429c24bb522..0568b889bad 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-05-03.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (WAR)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-05-03
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-07-12.txt b/forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2019-07-12.txt
rename to forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt
index b4eddee1058..1edac193a4f 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-07-12.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (M20)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-07-12
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-08-30.txt b/forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt
similarity index 91%
rename from forge-gui/res/formats/Historic/DCI/Standard/China/2019-08-30.txt
rename to forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt
index 0b384a8011d..d9bd58ecb00 100644
--- a/forge-gui/res/formats/Historic/DCI/Standard/China/2019-08-30.txt
+++ b/forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (2019-08-30)
-Type:Historic
+Type:Archive
 Subtype:Standard
 Effective:2019-08-30
 Retired:2019-10-03
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1993-08-05.txt b/forge-gui/res/formats/Archive/Vintage/1993-08-05.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1993-08-05.txt
rename to forge-gui/res/formats/Archive/Vintage/1993-08-05.txt
index 666da7b6f76..04a7ee46171 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1993-08-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1993-08-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (1993-08-05)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1993-08-05
 Sets:LEA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1993-10-04.txt b/forge-gui/res/formats/Archive/Vintage/1993-10-04.txt
similarity index 85%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1993-10-04.txt
rename to forge-gui/res/formats/Archive/Vintage/1993-10-04.txt
index 8890d9f4304..9f522cb2a66 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1993-10-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1993-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (LEB)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1993-10-04
 Sets:LEA, LEB
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1993-12-01.txt b/forge-gui/res/formats/Archive/Vintage/1993-12-01.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1993-12-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1993-12-01.txt
index 92e147b7d83..6c9e3ca9a1b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1993-12-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1993-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (2ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1993-12-01
 Sets:LEA, LEB, 2ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1993-12-17.txt b/forge-gui/res/formats/Archive/Vintage/1993-12-17.txt
similarity index 86%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1993-12-17.txt
rename to forge-gui/res/formats/Archive/Vintage/1993-12-17.txt
index 5c32f92c638..4dd3bc4976f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1993-12-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1993-12-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (ARN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1993-12-17
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-01-26.txt b/forge-gui/res/formats/Archive/Vintage/1994-01-26.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-01-26.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-01-26.txt
index 6891ecc3e0b..9af41ababc5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-01-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-01-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-01-26)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-01-26
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-02-23.txt b/forge-gui/res/formats/Archive/Vintage/1994-02-23.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-02-23.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-02-23.txt
index fccfa4c9e24..72fd9be6a95 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-02-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-02-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-02-23)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-02-23
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-03-04.txt b/forge-gui/res/formats/Archive/Vintage/1994-03-04.txt
similarity index 96%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-03-04.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-03-04.txt
index a4e1b10f56c..3a8e987e832 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-03-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-03-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (ATQ)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-03-04
 Sets:LEA, LEB, 2ED, ARN, ATQ
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-03-23.txt b/forge-gui/res/formats/Archive/Vintage/1994-03-23.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-03-23.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-03-23.txt
index 2b95907da79..1fd86d3705c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-03-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-03-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-03-23)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-03-23
 Sets:LEA, LEB, 2ED, ARN, ATQ
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-04-01.txt b/forge-gui/res/formats/Archive/Vintage/1994-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-04-01.txt
index 41b05d9beff..86d235d17f3 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (3ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-05-02.txt b/forge-gui/res/formats/Archive/Vintage/1994-05-02.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-05-02.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-05-02.txt
index 0bf152b84fd..a9e10a73f4d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-05-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-05-02)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-06-10.txt b/forge-gui/res/formats/Archive/Vintage/1994-06-10.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-06-10.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-06-10.txt
index 96e66f048c4..f57d9134a2a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-06-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (LEG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-06-13.txt b/forge-gui/res/formats/Archive/Vintage/1994-06-13.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-06-13.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-06-13.txt
index 9bc66b0db36..5a2f9cda29b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-06-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-06-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-06-13)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-06-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-07-15.txt b/forge-gui/res/formats/Archive/Vintage/1994-07-15.txt
similarity index 97%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-07-15.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-07-15.txt
index 1a41a25e5e5..04bc1c90fad 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-07-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-07-15)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-08-02.txt b/forge-gui/res/formats/Archive/Vintage/1994-08-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-08-02.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-08-02.txt
index a32341b6e20..59a9ae9f5f2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-08-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-08-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-08-02)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-08-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-08-08.txt b/forge-gui/res/formats/Archive/Vintage/1994-08-08.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-08-08.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-08-08.txt
index 82eab991a7e..1853a596b0d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-08-08.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-08-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (DRK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-08-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-10-10.txt b/forge-gui/res/formats/Archive/Vintage/1994-10-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-10-10.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-10-10.txt
index 3563e4f55d9..4bd42a2140a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-10-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-10-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-10-10)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-10-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1994-11-15.txt b/forge-gui/res/formats/Archive/Vintage/1994-11-15.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1994-11-15.txt
rename to forge-gui/res/formats/Archive/Vintage/1994-11-15.txt
index 6afdced6249..a3540523719 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1994-11-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1994-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (FEM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1994-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-01-10.txt b/forge-gui/res/formats/Archive/Vintage/1995-01-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-01-10.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-01-10.txt
index b8e404f844a..6ee5d83b91e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-01-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-01-10)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-03-01.txt b/forge-gui/res/formats/Archive/Vintage/1995-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-03-01.txt
index 417a711c882..3bfd653a41a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-03-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-04-19.txt b/forge-gui/res/formats/Archive/Vintage/1995-04-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-04-19.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-04-19.txt
index a96da973fab..56df9ddc9ec 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-04-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-04-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (4ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-04-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-06-03.txt b/forge-gui/res/formats/Archive/Vintage/1995-06-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-06-03.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-06-03.txt
index 25a584bcef5..194c915b169 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-06-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-06-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ICE)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-06-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-07-01.txt b/forge-gui/res/formats/Archive/Vintage/1995-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-07-01.txt
index c7f08f00df1..4d8c8843997 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (CHR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-11-01.txt b/forge-gui/res/formats/Archive/Vintage/1995-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-11-01.txt
index e4768a240cc..2aa842a98e0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-11-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1995-11-13.txt b/forge-gui/res/formats/Archive/Vintage/1995-11-13.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1995-11-13.txt
rename to forge-gui/res/formats/Archive/Vintage/1995-11-13.txt
index 4f55dbaa8c0..94c8f0d15cc 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1995-11-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1995-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (HML)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1995-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1996-02-01.txt b/forge-gui/res/formats/Archive/Vintage/1996-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1996-02-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1996-02-01.txt
index bc0ba1b5266..90bccf40341 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1996-02-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1996-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-02-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1996-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1996-04-01.txt b/forge-gui/res/formats/Archive/Vintage/1996-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1996-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1996-04-01.txt
index 665851ba36a..851e3a27751 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1996-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1996-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-04-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1996-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1996-07-10.txt b/forge-gui/res/formats/Archive/Vintage/1996-07-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1996-07-10.txt
rename to forge-gui/res/formats/Archive/Vintage/1996-07-10.txt
index d0c76fe86ae..6fc8b1103bc 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1996-07-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ALL)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1996-07-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1996-10-01.txt b/forge-gui/res/formats/Archive/Vintage/1996-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1996-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1996-10-01.txt
index 006d869bb03..a80b9be6496 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1996-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-10-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1996-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1996-11-07.txt b/forge-gui/res/formats/Archive/Vintage/1996-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1996-11-07.txt
rename to forge-gui/res/formats/Archive/Vintage/1996-11-07.txt
index 8b04972d652..34cb5f10be4 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1996-11-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MIR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1996-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1997-03-05.txt b/forge-gui/res/formats/Archive/Vintage/1997-03-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1997-03-05.txt
rename to forge-gui/res/formats/Archive/Vintage/1997-03-05.txt
index ae98787add3..f0c1e5bde50 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1997-03-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (VIS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1997-03-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1997-04-23.txt b/forge-gui/res/formats/Archive/Vintage/1997-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1997-04-23.txt
rename to forge-gui/res/formats/Archive/Vintage/1997-04-23.txt
index 39bf0999578..8d1e3e5c6e5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1997-04-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (5ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1997-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1997-07-01.txt b/forge-gui/res/formats/Archive/Vintage/1997-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1997-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1997-07-01.txt
index 2712221821e..8511b46a91a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1997-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (WTH)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1997-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1997-10-01.txt b/forge-gui/res/formats/Archive/Vintage/1997-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1997-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1997-10-01.txt
index 5cf0a7c1871..a06fe4676ff 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1997-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1997-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1997-10-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1997-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1997-11-01.txt b/forge-gui/res/formats/Archive/Vintage/1997-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1997-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1997-11-01.txt
index 7f03b92a522..63d94692578 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1997-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (TMP)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1997-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1998-01-01.txt b/forge-gui/res/formats/Archive/Vintage/1998-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1998-01-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1998-01-01.txt
index 19328d1e589..fd65df8ea67 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1998-01-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1998-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1998-01-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1998-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1998-04-01.txt b/forge-gui/res/formats/Archive/Vintage/1998-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1998-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1998-04-01.txt
index fb777dcd8ea..470ef60ff29 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1998-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (STH)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1998-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1998-07-01.txt b/forge-gui/res/formats/Archive/Vintage/1998-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1998-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1998-07-01.txt
index da86bd69bfc..a17f234e506 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1998-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (EXO)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1998-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1998-11-01.txt b/forge-gui/res/formats/Archive/Vintage/1998-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1998-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1998-11-01.txt
index 3748645a723..3d1f6ee4030 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1998-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (USG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1998-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-01-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-01-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-01-01.txt
index d88e4e652a8..620e10cc6f0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-01-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-01-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-03-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-03-01.txt
index bf89ce2bfcf..bb6aea6a0d3 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ULG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-04-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-04-01.txt
index d2d56864f01..4f5da49e3d7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-04-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-06-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-06-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-06-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-06-01.txt
index 9c32dd99288..edf95929f35 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-06-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (6ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-06-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-07-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-07-01.txt
index 29a4c418e5d..923d7b2f382 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (UDS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-10-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-10-01.txt
index e059b03379d..ad427701a13 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-10-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-11-01.txt b/forge-gui/res/formats/Archive/Vintage/1999-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-11-01.txt
index 100ecfe581f..c4d9ef943e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MMQ)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/1999-11-12.txt b/forge-gui/res/formats/Archive/Vintage/1999-11-12.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/1999-11-12.txt
rename to forge-gui/res/formats/Archive/Vintage/1999-11-12.txt
index 4d48bcea72a..9766fa36607 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/1999-11-12.txt
+++ b/forge-gui/res/formats/Archive/Vintage/1999-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (BRB)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:1999-11-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2000-03-01.txt b/forge-gui/res/formats/Archive/Vintage/2000-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2000-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2000-03-01.txt
index 5f4b6344582..adbd22b231e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2000-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (NMS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2000-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2000-07-01.txt b/forge-gui/res/formats/Archive/Vintage/2000-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2000-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2000-07-01.txt
index c613d2b7087..cd695136b06 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2000-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (PCY)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2000-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2000-10-01.txt b/forge-gui/res/formats/Archive/Vintage/2000-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2000-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2000-10-01.txt
index 76ca96e304c..eb84d64046b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2000-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2000-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (BTD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2000-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2000-11-01.txt b/forge-gui/res/formats/Archive/Vintage/2000-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2000-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2000-11-01.txt
index f022bc6f34d..c9c2e12835a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2000-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (INV)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2000-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2001-03-01.txt b/forge-gui/res/formats/Archive/Vintage/2001-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2001-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2001-03-01.txt
index 9a5a0fa5911..4fe319cee44 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2001-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (PLS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2001-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2001-05-01.txt b/forge-gui/res/formats/Archive/Vintage/2001-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2001-05-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2001-05-01.txt
index f5d94051caa..80ea686ed4f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2001-05-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (7ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2001-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2001-07-01.txt b/forge-gui/res/formats/Archive/Vintage/2001-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2001-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2001-07-01.txt
index d2ddcae6e96..fa5f93fcf43 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2001-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (APC)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2001-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2001-11-01.txt b/forge-gui/res/formats/Archive/Vintage/2001-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2001-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2001-11-01.txt
index f4995bf038f..d2a7d128d36 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2001-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ODY)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2001-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2001-12-01.txt b/forge-gui/res/formats/Archive/Vintage/2001-12-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2001-12-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2001-12-01.txt
index d3852fd88d6..32057ba9c30 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2001-12-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2001-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (DKM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2001-12-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2002-01-01.txt b/forge-gui/res/formats/Archive/Vintage/2002-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2002-01-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2002-01-01.txt
index 8e0e6ba637d..df5f28265ff 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2002-01-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2002-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2002-01-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2002-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2002-03-01.txt b/forge-gui/res/formats/Archive/Vintage/2002-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2002-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2002-03-01.txt
index d0b803bde0f..7ab7ad19000 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2002-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (TOR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2002-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2002-07-01.txt b/forge-gui/res/formats/Archive/Vintage/2002-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2002-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2002-07-01.txt
index 5ac25e07a47..5fd0d18be19 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2002-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (JUD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2002-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2002-11-01.txt b/forge-gui/res/formats/Archive/Vintage/2002-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2002-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2002-11-01.txt
index 2062a7d09b1..bbdf3acd203 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2002-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ONS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2002-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2003-03-01.txt b/forge-gui/res/formats/Archive/Vintage/2003-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2003-03-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2003-03-01.txt
index 796717f99a3..bce06f6f84f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2003-03-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (LGN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2003-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2003-04-01.txt b/forge-gui/res/formats/Archive/Vintage/2003-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2003-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2003-04-01.txt
index 3bcd48f8060..66d32818015 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2003-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2003-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2003-04-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2003-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2003-07-01.txt b/forge-gui/res/formats/Archive/Vintage/2003-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2003-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2003-07-01.txt
index eb567aa36a5..8f5c3a2c0e2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2003-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (SCG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2003-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2003-09-01.txt b/forge-gui/res/formats/Archive/Vintage/2003-09-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2003-09-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2003-09-01.txt
index daaa2f36eb2..04b40261a79 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2003-09-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (8ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2003-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2003-10-20.txt b/forge-gui/res/formats/Archive/Vintage/2003-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2003-10-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2003-10-20.txt
index 27056915d0c..76eaaf09ceb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2003-10-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MRD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2003-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-01-01.txt b/forge-gui/res/formats/Archive/Vintage/2004-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-01-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-01-01.txt
index 5fe7ee2f83f..b9b6efee4dc 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-01-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2004-01-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-02-20.txt b/forge-gui/res/formats/Archive/Vintage/2004-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-02-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-02-20.txt
index f35474e5455..6cd895388b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-02-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (DST)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-06-20.txt b/forge-gui/res/formats/Archive/Vintage/2004-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-06-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-06-20.txt
index 0b64edf33c6..2ed2fe46985 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-06-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (5DN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-09-20.txt b/forge-gui/res/formats/Archive/Vintage/2004-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-09-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-09-20.txt
index d67be6e5c1e..86adf19170a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-09-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2004-09-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-10-20.txt b/forge-gui/res/formats/Archive/Vintage/2004-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-10-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-10-20.txt
index 19cb2afbc4a..fa544c490c3 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-10-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CHK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2004-12-20.txt b/forge-gui/res/formats/Archive/Vintage/2004-12-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2004-12-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2004-12-20.txt
index ae7175433d5..de9068f65ed 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2004-12-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2004-12-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2004-12-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2004-12-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-02-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-02-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-02-20.txt
index 2fa87f32243..4009ce35b90 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-02-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BOK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-03-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-03-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-03-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-03-20.txt
index 9ab06dd3977..6033b95ef5b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-03-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-03-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2005-03-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-03-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-06-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-06-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-06-20.txt
index 41af6266b5b..2e2c41e7a16 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-06-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-08-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-08-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-08-20.txt
index 3a8e356b0b0..ba45b7434ba 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-08-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (9ED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-09-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-09-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-09-20.txt
index 08d077be3da..f3cce07d4a1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-09-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2005-09-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2005-10-20.txt b/forge-gui/res/formats/Archive/Vintage/2005-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2005-10-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2005-10-20.txt
index 6cb00692377..3f92f962fa1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2005-10-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RAV)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2005-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2006-02-20.txt b/forge-gui/res/formats/Archive/Vintage/2006-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2006-02-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2006-02-20.txt
index b19650d117c..fe056ddb0b0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2006-02-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GPT)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2006-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2006-05-20.txt b/forge-gui/res/formats/Archive/Vintage/2006-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2006-05-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2006-05-20.txt
index f7612528cb8..04da71688cb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2006-05-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DIS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2006-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2006-08-20.txt b/forge-gui/res/formats/Archive/Vintage/2006-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2006-08-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2006-08-20.txt
index c20346eb0ee..d08d474f311 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2006-08-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CSP)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2006-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2006-10-20.txt b/forge-gui/res/formats/Archive/Vintage/2006-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2006-10-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2006-10-20.txt
index 983dacaec11..a6f807ce56e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2006-10-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TSP)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2006-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-02-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-02-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-02-20.txt
index 78be54f0a43..4554bfd74d8 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-02-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PLC)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-05-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-05-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-05-20.txt
index dd371ccf40d..70278b9444c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-05-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (FUT)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-06-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-06-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-06-20.txt
index 9bb652a77e2..3bfbfce0771 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-06-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2007-06-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-07-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-07-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-07-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-07-20.txt
index a9e3d8600c3..50ffaf0b9da 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-07-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (10E)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-07-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-09-10.txt b/forge-gui/res/formats/Archive/Vintage/2007-09-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-09-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-09-10.txt
index 6b74f3fae1a..a4379366d58 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-09-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-09-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MED)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-09-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-09-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-09-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-09-20.txt
index de8cca791b4..75cdc0b3c7a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-09-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2007-09-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-10-20.txt b/forge-gui/res/formats/Archive/Vintage/2007-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-10-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-10-20.txt
index 4bad6518e72..c388adb9dad 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-10-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (LRW)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2007-11-16.txt b/forge-gui/res/formats/Archive/Vintage/2007-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2007-11-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2007-11-16.txt
index 78fc1241ab8..645c9300503 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2007-11-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2007-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2007-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-02-01.txt b/forge-gui/res/formats/Archive/Vintage/2008-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-02-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-02-01.txt
index 783c001b684..aba63536222 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-02-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MOR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-05-02.txt b/forge-gui/res/formats/Archive/Vintage/2008-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-05-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-05-02.txt
index 5a197dbb07e..fcc7c785241 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-05-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SHM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-06-20.txt b/forge-gui/res/formats/Archive/Vintage/2008-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-06-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-06-20.txt
index 8a9618ad246..84b0455d6f6 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-06-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2008-06-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-07-25.txt b/forge-gui/res/formats/Archive/Vintage/2008-07-25.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-07-25.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-07-25.txt
index 7fb723ffe82..1c5d35fb60e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-07-25.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EVE)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-07-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-08-29.txt b/forge-gui/res/formats/Archive/Vintage/2008-08-29.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-08-29.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-08-29.txt
index fd155eaf7fa..ea1c44177ca 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-08-29.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-08-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DRB)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-08-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-09-20.txt b/forge-gui/res/formats/Archive/Vintage/2008-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-09-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-09-20.txt
index fe0c0aeb3c2..ee49c0b10fa 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-09-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2008-09-20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-09-22.txt b/forge-gui/res/formats/Archive/Vintage/2008-09-22.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-09-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-09-22.txt
index f5a2a45488c..e161f8d8062 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-09-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-09-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-09-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-10-03.txt b/forge-gui/res/formats/Archive/Vintage/2008-10-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-10-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-10-03.txt
index 025b7a133fb..c4d68a6547c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-10-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ALA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-10-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2008-11-07.txt b/forge-gui/res/formats/Archive/Vintage/2008-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2008-11-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2008-11-07.txt
index 7e96133bdbe..ad5a696a919 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2008-11-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2008-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2008-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-02-06.txt b/forge-gui/res/formats/Archive/Vintage/2009-02-06.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-02-06.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-02-06.txt
index 4a58f5a2785..85ce3abf4cc 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-02-06.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CFX)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-02-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-04-10.txt b/forge-gui/res/formats/Archive/Vintage/2009-04-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-04-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-04-10.txt
index 88fbc3d9bc8..a53e26ad423 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-04-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-04-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDC)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-04-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-04-30.txt b/forge-gui/res/formats/Archive/Vintage/2009-04-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-04-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-04-30.txt
index 647e6e47d72..8f72acfcf39 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-04-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ARB)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-04-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-07-01.txt b/forge-gui/res/formats/Archive/Vintage/2009-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-07-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-07-01.txt
index e78e279a44a..742d9769d7c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-07-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2009-07-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-07-17.txt b/forge-gui/res/formats/Archive/Vintage/2009-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-07-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-07-17.txt
index 501cba7b00b..d9227881eb0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-07-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M10)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-08-26.txt b/forge-gui/res/formats/Archive/Vintage/2009-08-26.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-08-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-08-26.txt
index 0a2265eef58..3b67d1cc665 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-08-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD0)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-08-28.txt b/forge-gui/res/formats/Archive/Vintage/2009-08-28.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-08-28.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-08-28.txt
index 232071761aa..4382ec48617 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-08-28.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V09)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-09-07.txt b/forge-gui/res/formats/Archive/Vintage/2009-09-07.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-09-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-09-07.txt
index 2326797f0fc..9aff88ed907 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-09-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME3)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-10-02.txt b/forge-gui/res/formats/Archive/Vintage/2009-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-10-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-10-02.txt
index 40da3286519..dd21f81d924 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-10-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ZEN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-10-30.txt b/forge-gui/res/formats/Archive/Vintage/2009-10-30.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-10-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-10-30.txt
index 841740f47b8..0f84b1259e6 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-10-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-10-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-10-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2009-11-20.txt b/forge-gui/res/formats/Archive/Vintage/2009-11-20.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2009-11-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2009-11-20.txt
index efb61f27912..6ffa1d0a7fb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2009-11-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2009-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (H09)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2009-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-02-05.txt b/forge-gui/res/formats/Archive/Vintage/2010-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-02-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-02-05.txt
index 8732e4246fe..8389f710b7d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-02-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (WWK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-03-19.txt b/forge-gui/res/formats/Archive/Vintage/2010-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-03-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-03-19.txt
index c76dac57042..b149e0ec5f1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-03-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDE)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-04-23.txt b/forge-gui/res/formats/Archive/Vintage/2010-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-04-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-04-23.txt
index 240da092718..f654871deda 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-04-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ROE)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-06-04.txt b/forge-gui/res/formats/Archive/Vintage/2010-06-04.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-06-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-06-04.txt
index 10f51aaf8ab..144b06c2a45 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-06-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-06-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DPA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-06-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-07-16.txt b/forge-gui/res/formats/Archive/Vintage/2010-07-16.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-07-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-07-16.txt
index 91feee55f87..3f48d625a64 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-07-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M11)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-07-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-08-27.txt b/forge-gui/res/formats/Archive/Vintage/2010-08-27.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-08-27.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-08-27.txt
index ceb70848856..86ef161a377 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-08-27.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-08-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V10)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-08-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-09-03.txt b/forge-gui/res/formats/Archive/Vintage/2010-09-03.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-09-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-09-03.txt
index be5e434de43..5296ce4d44d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-09-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-09-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDF)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-09-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-10-01.txt b/forge-gui/res/formats/Archive/Vintage/2010-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-10-01.txt
index 755073f8038..440a3ac2802 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-11-08.txt b/forge-gui/res/formats/Archive/Vintage/2010-11-08.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-11-08.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-11-08.txt
index b0e994b2627..938b13c2ada 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-11-08.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-11-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2010-11-19.txt b/forge-gui/res/formats/Archive/Vintage/2010-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2010-11-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2010-11-19.txt
index 00ff7c9c4a3..d0715246028 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2010-11-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2010-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PD2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2010-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-01-10.txt b/forge-gui/res/formats/Archive/Vintage/2011-01-10.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-01-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-01-10.txt
index 546c5506dc5..23b924e6f11 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-01-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME4)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-02-04.txt b/forge-gui/res/formats/Archive/Vintage/2011-02-04.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-02-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-02-04.txt
index 560bae1a9ea..2b41f3f58ee 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-02-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MBS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-02-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-04-01.txt b/forge-gui/res/formats/Archive/Vintage/2011-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-04-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-04-01.txt
index 60bd7d4e6ca..907ebc1bf90 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-04-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-05-13.txt b/forge-gui/res/formats/Archive/Vintage/2011-05-13.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-05-13.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-05-13.txt
index 2af0893aba8..3b5ce9cbd4c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-05-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (NPH)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-05-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-05-14.txt b/forge-gui/res/formats/Archive/Vintage/2011-05-14.txt
similarity index 98%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-05-14.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-05-14.txt
index 3ff33456e62..a63e593b1d1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-05-14.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-05-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-05-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-06-17.txt b/forge-gui/res/formats/Archive/Vintage/2011-06-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-06-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-06-17.txt
index 96376ebc12c..09388a6e692 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-06-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-06-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (COM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-06-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-07-15.txt b/forge-gui/res/formats/Archive/Vintage/2011-07-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-07-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-07-15.txt
index 83d3dc8e73d..ef1f754a9c5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-07-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M12)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-08-26.txt b/forge-gui/res/formats/Archive/Vintage/2011-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-08-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-08-26.txt
index 0cb402f80d5..5b96e785268 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-08-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V11)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-09-02.txt b/forge-gui/res/formats/Archive/Vintage/2011-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-09-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-09-02.txt
index eb8421d2f48..c1bfdbe30db 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-09-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDH)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-09-30.txt b/forge-gui/res/formats/Archive/Vintage/2011-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-09-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-09-30.txt
index aeb90481e58..059cc481868 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-09-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ISD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-10-01.txt b/forge-gui/res/formats/Archive/Vintage/2011-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-10-01.txt
index 2a187a2e8ed..d5ab776ff4b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2011-10-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2011-11-18.txt b/forge-gui/res/formats/Archive/Vintage/2011-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2011-11-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2011-11-18.txt
index 5b965c4bb21..8e5158cb76c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2011-11-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2011-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PD3)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2011-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-02-03.txt b/forge-gui/res/formats/Archive/Vintage/2012-02-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-02-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-02-03.txt
index b230a76eba4..0220b0847d5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-02-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DKA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-02-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-03-30.txt b/forge-gui/res/formats/Archive/Vintage/2012-03-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-03-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-03-30.txt
index 4e4de37b68f..27ac0a53438 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-03-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-03-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDI)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-03-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-05-04.txt b/forge-gui/res/formats/Archive/Vintage/2012-05-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-05-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-05-04.txt
index 735bab9e3e7..34c5231cd87 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-05-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AVR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-05-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-07-13.txt b/forge-gui/res/formats/Archive/Vintage/2012-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-07-13.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-07-13.txt
index b0ce6a2a638..31b8b9784da 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-07-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M13)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-08-31.txt b/forge-gui/res/formats/Archive/Vintage/2012-08-31.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-08-31.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-08-31.txt
index d638acd8893..a341240cb0d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-08-31.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-08-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V12)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-08-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-09-07.txt b/forge-gui/res/formats/Archive/Vintage/2012-09-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-09-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-09-07.txt
index 09890424709..14ed77c61d2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-09-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDJ)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-10-01.txt b/forge-gui/res/formats/Archive/Vintage/2012-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-10-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-10-01.txt
index acb000b6025..71f184d320f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-10-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2012-10-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-10-05.txt b/forge-gui/res/formats/Archive/Vintage/2012-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-10-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-10-05.txt
index d11691cc65b..dc92de2d9d0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-10-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RTR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2012-11-02.txt b/forge-gui/res/formats/Archive/Vintage/2012-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2012-11-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2012-11-02.txt
index a8b6ef8959c..2b630f409fe 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2012-11-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2012-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CM1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2012-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-02-01.txt b/forge-gui/res/formats/Archive/Vintage/2013-02-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-02-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-02-01.txt
index a982c0f6469..59a0194637f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-02-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GTC)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-03-15.txt b/forge-gui/res/formats/Archive/Vintage/2013-03-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-03-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-03-15.txt
index 745147499fa..12af302c537 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-03-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-03-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-03-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-05-03.txt b/forge-gui/res/formats/Archive/Vintage/2013-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-05-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-05-03.txt
index 5b0a8f28eea..904869bf4bb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-05-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DGM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-06-07.txt b/forge-gui/res/formats/Archive/Vintage/2013-06-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-06-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-06-07.txt
index e33c6ea4629..49ce71c9e69 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-06-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-06-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-07-19.txt b/forge-gui/res/formats/Archive/Vintage/2013-07-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-07-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-07-19.txt
index b6b452d451e..d140f8dfe13 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-07-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M14)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-07-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-08-23.txt b/forge-gui/res/formats/Archive/Vintage/2013-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-08-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-08-23.txt
index 45ea2f77da4..123fc5f23b5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-08-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V13)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-09-06.txt b/forge-gui/res/formats/Archive/Vintage/2013-09-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-09-06.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-09-06.txt
index cd1b4d40595..050d47095c1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-09-06.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-09-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDL)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-09-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-09-27.txt b/forge-gui/res/formats/Archive/Vintage/2013-09-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-09-27.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-09-27.txt
index cd2abef9c6e..8023de403af 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-09-27.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (THS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-09-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2013-11-01.txt b/forge-gui/res/formats/Archive/Vintage/2013-11-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2013-11-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2013-11-01.txt
index b716c2da011..e7512ff86eb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2013-11-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2013-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C13)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2013-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-02-07.txt b/forge-gui/res/formats/Archive/Vintage/2014-02-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-02-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-02-07.txt
index 38a76142a3f..253b5108a9d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-02-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BNG)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-02-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-03-14.txt b/forge-gui/res/formats/Archive/Vintage/2014-03-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-03-14.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-03-14.txt
index 6b17bb5ea75..6a302cd3553 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-03-14.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-03-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-03-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-05-02.txt b/forge-gui/res/formats/Archive/Vintage/2014-05-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-05-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-05-02.txt
index 0c02ea48bc3..97a1cbdba4c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-05-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (JOU)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-05-30.txt b/forge-gui/res/formats/Archive/Vintage/2014-05-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-05-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-05-30.txt
index ddc7d281ea1..ffd7b753fdf 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-05-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MD1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-05-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-06-06.txt b/forge-gui/res/formats/Archive/Vintage/2014-06-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-06-06.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-06-06.txt
index c2e1a01079a..ffec6813b94 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-06-06.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-06-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CNS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-06-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-06-16.txt b/forge-gui/res/formats/Archive/Vintage/2014-06-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-06-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-06-16.txt
index 74ec40e948b..24f827a064d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-06-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-06-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (VMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-06-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-07-18.txt b/forge-gui/res/formats/Archive/Vintage/2014-07-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-07-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-07-18.txt
index a0e59021e3a..753b25286b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-07-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M15)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-07-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-08-22.txt b/forge-gui/res/formats/Archive/Vintage/2014-08-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-08-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-08-22.txt
index 64f8563290e..997ad848afd 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-08-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-08-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V14)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-08-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-09-05.txt b/forge-gui/res/formats/Archive/Vintage/2014-09-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-09-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-09-05.txt
index 63d2b3473cd..4b2d91dcd4f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-09-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-09-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-09-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-09-26.txt b/forge-gui/res/formats/Archive/Vintage/2014-09-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-09-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-09-26.txt
index b22aea2caf6..56f24622817 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-09-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KTK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-09-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-11-07.txt b/forge-gui/res/formats/Archive/Vintage/2014-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-11-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-11-07.txt
index f453afab52b..0dfce4faf2e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-11-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C14)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2014-12-05.txt b/forge-gui/res/formats/Archive/Vintage/2014-12-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2014-12-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2014-12-05.txt
index d1004955088..7fdaa5eeb8b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2014-12-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2014-12-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD3)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2014-12-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-01-23.txt b/forge-gui/res/formats/Archive/Vintage/2015-01-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-01-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-01-23.txt
index 8f0295ee677..c953d7bcc1a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-01-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (FRF)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-01-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-02-27.txt b/forge-gui/res/formats/Archive/Vintage/2015-02-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-02-27.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-02-27.txt
index 3ff62ffb17f..290fb480fac 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-02-27.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-02-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDO)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-02-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-03-27.txt b/forge-gui/res/formats/Archive/Vintage/2015-03-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-03-27.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-03-27.txt
index 7f18e7e7376..e8a04a38d8c 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-03-27.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DTK)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-03-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-05-06.txt b/forge-gui/res/formats/Archive/Vintage/2015-05-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-05-06.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-05-06.txt
index 3304763e26f..c67557bdbd7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-05-06.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-05-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TPR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-05-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-05-22.txt b/forge-gui/res/formats/Archive/Vintage/2015-05-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-05-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-05-22.txt
index 21aa6171e81..9083240d3de 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-05-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MM2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-05-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-07-17.txt b/forge-gui/res/formats/Archive/Vintage/2015-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-07-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-07-17.txt
index 984c9f4d492..4358a1687ca 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-07-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ORI)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-08-21.txt b/forge-gui/res/formats/Archive/Vintage/2015-08-21.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-08-21.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-08-21.txt
index 16ce0f51e3a..19b8b80b8ab 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-08-21.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-08-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V15)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-08-21
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-08-28.txt b/forge-gui/res/formats/Archive/Vintage/2015-08-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-08-28.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-08-28.txt
index 69a7ca9f08b..2c7ba7a45b8 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-08-28.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDP)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-10-02.txt b/forge-gui/res/formats/Archive/Vintage/2015-10-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-10-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-10-02.txt
index d89064cbb25..4f33db58640 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-10-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BFZ)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-11-13.txt b/forge-gui/res/formats/Archive/Vintage/2015-11-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-11-13.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-11-13.txt
index 69fb1972ece..0ea40f82bfb 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-11-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C15)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2015-11-18.txt b/forge-gui/res/formats/Archive/Vintage/2015-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2015-11-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2015-11-18.txt
index 9aed0cfeb9e..91be05fd6a5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2015-11-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2015-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PZ1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2015-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-01-22.txt b/forge-gui/res/formats/Archive/Vintage/2016-01-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-01-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-01-22.txt
index 037a0c809f0..c61d4e64008 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-01-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (OGW)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-01-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-02-26.txt b/forge-gui/res/formats/Archive/Vintage/2016-02-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-02-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-02-26.txt
index 88ba6fef003..b01020c89ed 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-02-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-02-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDQ)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-02-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-04-08.txt b/forge-gui/res/formats/Archive/Vintage/2016-04-08.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-04-08.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-04-08.txt
index f246d421cb9..aa282f7c675 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-04-08.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOI)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-04-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-06-10.txt b/forge-gui/res/formats/Archive/Vintage/2016-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-06-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-06-10.txt
index 1a11df43961..5d4d4ec9ab1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-06-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-07-22.txt b/forge-gui/res/formats/Archive/Vintage/2016-07-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-07-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-07-22.txt
index 9c02cde4fad..b7874594325 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-07-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EMN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-07-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-08-19.txt b/forge-gui/res/formats/Archive/Vintage/2016-08-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-08-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-08-19.txt
index 2d8df3a29a2..cea58252270 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-08-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-08-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V16)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-08-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-08-26.txt b/forge-gui/res/formats/Archive/Vintage/2016-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-08-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-08-26.txt
index 0138a4d19ca..4fab11651ae 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-08-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CN2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-09-02.txt b/forge-gui/res/formats/Archive/Vintage/2016-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-09-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-09-02.txt
index 09746d72c58..f41d629ef34 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-09-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-09-30.txt b/forge-gui/res/formats/Archive/Vintage/2016-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-09-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-09-30.txt
index a12039d7fbd..a57e970f0fc 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-09-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KLD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-11-11.txt b/forge-gui/res/formats/Archive/Vintage/2016-11-11.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-11-11.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-11-11.txt
index 200d3b0f03d..d590baeae0f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-11-11.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-11-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C16)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-11-11
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2016-11-16.txt b/forge-gui/res/formats/Archive/Vintage/2016-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2016-11-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2016-11-16.txt
index 11ec383dacf..12b065823d8 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2016-11-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2016-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PZ2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2016-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-01-20.txt b/forge-gui/res/formats/Archive/Vintage/2017-01-20.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-01-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-01-20.txt
index ac56e149c9b..73f5830bb00 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-01-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AER)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-01-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-03-17.txt b/forge-gui/res/formats/Archive/Vintage/2017-03-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-03-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-03-17.txt
index 1b3f034da42..0bb1d4c96ad 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-03-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MM3)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-03-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-03-31.txt b/forge-gui/res/formats/Archive/Vintage/2017-03-31.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-03-31.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-03-31.txt
index f4b9f449af8..044442da3a7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-03-31.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-03-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDS)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-03-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-04-24.txt b/forge-gui/res/formats/Archive/Vintage/2017-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-04-24.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-04-24.txt
index a4433cec230..be9a6afd7d1 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-04-24.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2017-04-24)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-04-28.txt b/forge-gui/res/formats/Archive/Vintage/2017-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-04-28.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-04-28.txt
index ffce8db66a7..fbeb136b9f6 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-04-28.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AKH)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-04-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-06-09.txt b/forge-gui/res/formats/Archive/Vintage/2017-06-09.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-06-09.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-06-09.txt
index 15fabe0be86..86054162f97 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-06-09.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-06-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-07-14.txt b/forge-gui/res/formats/Archive/Vintage/2017-07-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-07-14.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-07-14.txt
index e669f9f6228..2ab1c67d2d7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-07-14.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (HOU)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-07-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-08-25.txt b/forge-gui/res/formats/Archive/Vintage/2017-08-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-08-25.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-08-25.txt
index 87449cba566..6e178999075 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-08-25.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-08-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C17)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-08-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-09-01.txt b/forge-gui/res/formats/Archive/Vintage/2017-09-01.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-09-01.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-09-01.txt
index f8cfa12a203..da6f5b6a7e5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-09-01.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2017-09-01)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-09-29.txt b/forge-gui/res/formats/Archive/Vintage/2017-09-29.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-09-29.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-09-29.txt
index 6877e5e4ab3..323f0170c21 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-09-29.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (XLN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-09-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-10.txt b/forge-gui/res/formats/Archive/Vintage/2017-11-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-11-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-11-10.txt
index 36596e22c46..e04a35b260f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-11-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDT)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-11-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-17.txt b/forge-gui/res/formats/Archive/Vintage/2017-11-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-11-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-11-17.txt
index 42a1303980d..635ccaac506 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (IMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-11-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-24.txt b/forge-gui/res/formats/Archive/Vintage/2017-11-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2017-11-24.txt
rename to forge-gui/res/formats/Archive/Vintage/2017-11-24.txt
index 523cfd6e7b2..e87ec929154 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2017-11-24.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2017-11-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V17)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2017-11-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-01-19.txt b/forge-gui/res/formats/Archive/Vintage/2018-01-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-01-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-01-19.txt
index 1f2a59bd53e..c44bdfa242e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-01-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RIX)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-01-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-03-16.txt b/forge-gui/res/formats/Archive/Vintage/2018-03-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-03-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-03-16.txt
index 31431d1ab0d..59beef31e61 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-03-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-03-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (A25)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-03-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-04-06.txt b/forge-gui/res/formats/Archive/Vintage/2018-04-06.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-04-06.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-04-06.txt
index 6a209ca96f9..70245dc8d30 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-04-06.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-04-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDU)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-04-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-04-27.txt b/forge-gui/res/formats/Archive/Vintage/2018-04-27.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-04-27.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-04-27.txt
index c768c796fd6..1b6874d0c80 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-04-27.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DOM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-04-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-08.txt b/forge-gui/res/formats/Archive/Vintage/2018-06-08.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-06-08.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-06-08.txt
index c3e36d98708..4409ac3c57b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-08.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-06-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CM2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-06-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-15.txt b/forge-gui/res/formats/Archive/Vintage/2018-06-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-06-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-06-15.txt
index 08b260e3c4e..d91a1e64c1b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-06-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-06-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-22.txt b/forge-gui/res/formats/Archive/Vintage/2018-06-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-06-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-06-22.txt
index cb683f61862..be35d720817 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-06-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GS1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-06-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-07-13.txt b/forge-gui/res/formats/Archive/Vintage/2018-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-07-13.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-07-13.txt
index 67752de981d..16a36253e06 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-07-13.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M19)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-08-09.txt b/forge-gui/res/formats/Archive/Vintage/2018-08-09.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-08-09.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-08-09.txt
index 7c0a9b36ad2..0ce31c2c7c3 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-08-09.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-08-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C18)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-08-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-10-05.txt b/forge-gui/res/formats/Archive/Vintage/2018-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-10-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-10-05.txt
index e7d515f536d..74daf7bbb8b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-10-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GRN)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-11-02.txt b/forge-gui/res/formats/Archive/Vintage/2018-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-11-02.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-11-02.txt
index 19300f0fd98..4e06e3f830f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-11-02.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GK1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-11-16.txt b/forge-gui/res/formats/Archive/Vintage/2018-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-11-16.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-11-16.txt
index a70b2a34dae..12c3f2d52aa 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-11-16.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (G18)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2018-12-07.txt b/forge-gui/res/formats/Archive/Vintage/2018-12-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2018-12-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2018-12-07.txt
index afcc6038f46..b6df6b63e7b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2018-12-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2018-12-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (UMA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2018-12-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-01-25.txt b/forge-gui/res/formats/Archive/Vintage/2019-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-01-25.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-01-25.txt
index 82ccdb69f47..201ff6f865f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-01-25.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RNA)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-02-15.txt b/forge-gui/res/formats/Archive/Vintage/2019-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-02-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-02-15.txt
index dff43cfeea1..f07ae7c50f7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-02-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GK2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-05-03.txt b/forge-gui/res/formats/Archive/Vintage/2019-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-05-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-05-03.txt
index db24f7b09a8..17af170a92b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-05-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (WAR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-06-14.txt b/forge-gui/res/formats/Archive/Vintage/2019-06-14.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-06-14.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-06-14.txt
index 72a00d5b172..8ca86a1a8a4 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-06-14.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MH1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-06-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-06-28.txt b/forge-gui/res/formats/Archive/Vintage/2019-06-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-06-28.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-06-28.txt
index 7ef91f3e493..4f0231812b2 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-06-28.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-06-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-06-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-07-12.txt b/forge-gui/res/formats/Archive/Vintage/2019-07-12.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-07-12.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-07-12.txt
index efa57e129b6..fcf0d6b44c8 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-07-12.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M20)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-07-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-08-23.txt b/forge-gui/res/formats/Archive/Vintage/2019-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-08-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-08-23.txt
index c0c4378515f..6768a7a1b20 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-08-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C19)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-08-30.txt b/forge-gui/res/formats/Archive/Vintage/2019-08-30.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-08-30.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-08-30.txt
index 877023bd252..5d0d9f48447 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-08-30.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2019-08-30)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-08-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-10-04.txt b/forge-gui/res/formats/Archive/Vintage/2019-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-10-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-10-04.txt
index 26e80bdef04..5258b69ada7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-10-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ELD)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-07.txt b/forge-gui/res/formats/Archive/Vintage/2019-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-11-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-11-07.txt
index ab4037a70ba..0c312a633cf 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MB1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-15.txt b/forge-gui/res/formats/Archive/Vintage/2019-11-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-11-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-11-15.txt
index da72fe469c5..3e69f4a3a26 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GN2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-22.txt b/forge-gui/res/formats/Archive/Vintage/2019-11-22.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2019-11-22.txt
rename to forge-gui/res/formats/Archive/Vintage/2019-11-22.txt
index 071c0d4c92b..caf3e2c70c4 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2019-11-22.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2019-11-22)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2019-11-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-01-24.txt b/forge-gui/res/formats/Archive/Vintage/2020-01-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-01-24.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-01-24.txt
index ad2e3c44050..cfb97732042 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-01-24.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (THB)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-01-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-04-24.txt b/forge-gui/res/formats/Archive/Vintage/2020-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-04-24.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-04-24.txt
index 8d6d0e38df9..cab9998bd92 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-04-24.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (IKO)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-05-18.txt b/forge-gui/res/formats/Archive/Vintage/2020-05-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-05-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-05-18.txt
index 755a5befa04..d4180b646d0 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-05-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-05-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-05-18)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-05-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-06-10.txt b/forge-gui/res/formats/Archive/Vintage/2020-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-06-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-06-10.txt
index f51e6255134..9eafdfc6700 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-06-10.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-06-10)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-06-26.txt b/forge-gui/res/formats/Archive/Vintage/2020-06-26.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-06-26.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-06-26.txt
index c1a2b2f0924..0c041f9c98e 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-06-26.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-06-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS3)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-06-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-07-03.txt b/forge-gui/res/formats/Archive/Vintage/2020-07-03.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-07-03.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-07-03.txt
index fed985752d8..88e38b505bd 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-07-03.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M21)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-07-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-07-17.txt b/forge-gui/res/formats/Archive/Vintage/2020-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-07-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-07-17.txt
index e02f3c4f7ca..f8809336799 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-07-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (JMP)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-08-07.txt b/forge-gui/res/formats/Archive/Vintage/2020-08-07.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-08-07.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-08-07.txt
index aeef182d8d1..710ab9cba9a 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-08-07.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-08-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2XM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-08-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-09-25.txt b/forge-gui/res/formats/Archive/Vintage/2020-09-25.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-09-25.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-09-25.txt
index d91fb3c0e9f..c6a23ec053f 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-09-25.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ZNR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-09-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-10-04.txt b/forge-gui/res/formats/Archive/Vintage/2020-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-10-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-10-04.txt
index 8a0381994eb..dab2373b643 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-10-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-10-04)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-11-20.txt b/forge-gui/res/formats/Archive/Vintage/2020-11-20.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-11-20.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-11-20.txt
index 01f02f55f6e..a053012119d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-11-20.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CMR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2020-12-04.txt b/forge-gui/res/formats/Archive/Vintage/2020-12-04.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2020-12-04.txt
rename to forge-gui/res/formats/Archive/Vintage/2020-12-04.txt
index 173b2f4b804..021083e4bd6 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2020-12-04.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2020-12-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CC1)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2020-12-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-02-05.txt b/forge-gui/res/formats/Archive/Vintage/2021-02-05.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-02-05.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-02-05.txt
index 4404845322a..fd7d175c61b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-02-05.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KHM)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-02-15.txt b/forge-gui/res/formats/Archive/Vintage/2021-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-02-15.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-02-15.txt
index bc17a5f944c..469308908c7 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-02-15.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2021-02-15)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-03-19.txt b/forge-gui/res/formats/Archive/Vintage/2021-03-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-03-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-03-19.txt
index 346f61954f8..51b25fec329 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-03-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TSR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-04-23.txt b/forge-gui/res/formats/Archive/Vintage/2021-04-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-04-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-04-23.txt
index 991b01cedfa..5a0bc7e3c69 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-04-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (STX)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-06-18.txt b/forge-gui/res/formats/Archive/Vintage/2021-06-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-06-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-06-18.txt
index ad109606f02..1c1747b8e31 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-06-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MH2)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-06-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-07-23.txt b/forge-gui/res/formats/Archive/Vintage/2021-07-23.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-07-23.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-07-23.txt
index e72aa8c8695..c30641577d5 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-07-23.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AFR)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-07-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-09-24.txt b/forge-gui/res/formats/Archive/Vintage/2021-09-24.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-09-24.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-09-24.txt
index 7b55445dc8b..979c70f8a8d 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-09-24.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MID)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-09-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-10-18.txt b/forge-gui/res/formats/Archive/Vintage/2021-10-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-10-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-10-18.txt
index 94f23d875ca..9337ed9edf4 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-10-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-10-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2021-10-18)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-10-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2021-11-19.txt b/forge-gui/res/formats/Archive/Vintage/2021-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2021-11-19.txt
rename to forge-gui/res/formats/Archive/Vintage/2021-11-19.txt
index 9caaa7c200e..9bfb6178be3 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2021-11-19.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (VOW)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2021-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2022-01-28.txt b/forge-gui/res/formats/Archive/Vintage/2022-01-28.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2022-01-28.txt
rename to forge-gui/res/formats/Archive/Vintage/2022-01-28.txt
index 87dc653afd7..3416cfd8f8b 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2022-01-28.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DBL)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2022-01-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2022-02-17.txt b/forge-gui/res/formats/Archive/Vintage/2022-02-17.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2022-02-17.txt
rename to forge-gui/res/formats/Archive/Vintage/2022-02-17.txt
index 78a8cbb3a6b..f9e8ef960ac 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2022-02-17.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2022-02-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2022-02-17)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2022-02-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2022-02-18.txt b/forge-gui/res/formats/Archive/Vintage/2022-02-18.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2022-02-18.txt
rename to forge-gui/res/formats/Archive/Vintage/2022-02-18.txt
index 87c120b3f22..06e85af0ba8 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2022-02-18.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (NEO)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2022-02-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2022-04-29.txt b/forge-gui/res/formats/Archive/Vintage/2022-04-29.txt
similarity index 99%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2022-04-29.txt
rename to forge-gui/res/formats/Archive/Vintage/2022-04-29.txt
index b60f171b992..38c8a029633 100644
--- a/forge-gui/res/formats/Historic/DCI/Vintage/2022-04-29.txt
+++ b/forge-gui/res/formats/Archive/Vintage/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SNC)
-Type:Historic
+Type:Archive
 Subtype:Vintage
 Effective:2022-04-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC
diff --git a/forge-gui/res/formats/Historic/DCI/Vintage/2022-06-10.txt b/forge-gui/res/formats/Archive/Vintage/2022-06-10.txt
similarity index 100%
rename from forge-gui/res/formats/Historic/DCI/Vintage/2022-06-10.txt
rename to forge-gui/res/formats/Archive/Vintage/2022-06-10.txt
diff --git a/forge-gui/res/formats/Block/Amonkhet Block.txt b/forge-gui/res/formats/Block/Amonkhet Block.txt
index 61f8b45bf3b..2d6005daec5 100644
--- a/forge-gui/res/formats/Block/Amonkhet Block.txt	
+++ b/forge-gui/res/formats/Block/Amonkhet Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Amonkhet Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:112
 Sets:HOU, AKH
diff --git a/forge-gui/res/formats/Block/Battle for Zendikar Block.txt b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt
index cafe11d2e4b..3d7d7e319d4 100644
--- a/forge-gui/res/formats/Block/Battle for Zendikar Block.txt	
+++ b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Battle for Zendikar Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:115
 Sets:OGW, BFZ
diff --git a/forge-gui/res/formats/Block/Ice Age Block.txt b/forge-gui/res/formats/Block/Ice Age Block.txt
index c01f532dd8b..0ede56a6530 100644
--- a/forge-gui/res/formats/Block/Ice Age Block.txt	
+++ b/forge-gui/res/formats/Block/Ice Age Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ice Age Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:135
 Sets:CSP, ALL, ICE
diff --git a/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt
index d6d46e619ef..855bd7fe8ed 100644
--- a/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt	
+++ b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Innistrad-Avacyn Restored Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:119
 Sets:ISD, AVR, DKA
diff --git a/forge-gui/res/formats/Block/Invasion Block.txt b/forge-gui/res/formats/Block/Invasion Block.txt
index b46581418fc..ec257d0e360 100644
--- a/forge-gui/res/formats/Block/Invasion Block.txt	
+++ b/forge-gui/res/formats/Block/Invasion Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Invasion Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:130
 Sets:APC, PLS, INV
diff --git a/forge-gui/res/formats/Block/Ixalan Block.txt b/forge-gui/res/formats/Block/Ixalan Block.txt
index caaeba30bd6..7de8c0717a4 100644
--- a/forge-gui/res/formats/Block/Ixalan Block.txt	
+++ b/forge-gui/res/formats/Block/Ixalan Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ixalan Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:111
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Block/Kaladesh Block.txt b/forge-gui/res/formats/Block/Kaladesh Block.txt
index 8d4dc5468ca..fe67fc92923 100644
--- a/forge-gui/res/formats/Block/Kaladesh Block.txt	
+++ b/forge-gui/res/formats/Block/Kaladesh Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Kaladesh Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:113
 Sets:AER, KLD
diff --git a/forge-gui/res/formats/Block/Kamigawa Block.txt b/forge-gui/res/formats/Block/Kamigawa Block.txt
index d6403d6f0f7..76e9b03c478 100644
--- a/forge-gui/res/formats/Block/Kamigawa Block.txt	
+++ b/forge-gui/res/formats/Block/Kamigawa Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Kamigawa Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:126
 Sets:SOK, BOK, CHK
diff --git a/forge-gui/res/formats/Block/Khans of Tarkir Block.txt b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt
index a4ea2448a4a..2aa08002f51 100644
--- a/forge-gui/res/formats/Block/Khans of Tarkir Block.txt	
+++ b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Khans of Tarkir Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:116
 Sets:DTK, FRF, KTK
diff --git a/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt
index 35abf4e9483..baa94c32d58 100644
--- a/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt	
+++ b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Lorwyn-Shadowmoor Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:123
 Sets:EVE, SHM, MOR, LRW
diff --git a/forge-gui/res/formats/Block/Masques Block.txt b/forge-gui/res/formats/Block/Masques Block.txt
index b67f2f4cf87..f531b61b2cf 100644
--- a/forge-gui/res/formats/Block/Masques Block.txt	
+++ b/forge-gui/res/formats/Block/Masques Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Masques Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:131
 Sets:MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Block/Mirage Block.txt b/forge-gui/res/formats/Block/Mirage Block.txt
index 10c705f59e5..50b67258bef 100644
--- a/forge-gui/res/formats/Block/Mirage Block.txt	
+++ b/forge-gui/res/formats/Block/Mirage Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Mirage Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:134
 Sets:VIS, WTH, MIR
diff --git a/forge-gui/res/formats/Block/Mirrodin Block.txt b/forge-gui/res/formats/Block/Mirrodin Block.txt
index 6f3722f065d..8b760ef05e4 100644
--- a/forge-gui/res/formats/Block/Mirrodin Block.txt	
+++ b/forge-gui/res/formats/Block/Mirrodin Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Mirrodin Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:127
 Sets:5DN, DST, MRD
diff --git a/forge-gui/res/formats/Block/Odyssey Block.txt b/forge-gui/res/formats/Block/Odyssey Block.txt
index 5a1292ea3e5..95f5f220359 100644
--- a/forge-gui/res/formats/Block/Odyssey Block.txt	
+++ b/forge-gui/res/formats/Block/Odyssey Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Odyssey Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:129
 Sets:JUD, TOR, ODY
diff --git a/forge-gui/res/formats/Block/Onslaught Block.txt b/forge-gui/res/formats/Block/Onslaught Block.txt
index 4437e82f513..19d158c5bd8 100644
--- a/forge-gui/res/formats/Block/Onslaught Block.txt	
+++ b/forge-gui/res/formats/Block/Onslaught Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Onslaught Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:128
 Sets:SCG, LGN, ONS
diff --git a/forge-gui/res/formats/Block/Ravnica Block.txt b/forge-gui/res/formats/Block/Ravnica Block.txt
index a4b9fda820f..db2dfe65e23 100644
--- a/forge-gui/res/formats/Block/Ravnica Block.txt	
+++ b/forge-gui/res/formats/Block/Ravnica Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ravnica Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:125
 Sets:DIS, GPT, RAV
diff --git a/forge-gui/res/formats/Block/Return to Ravnica Block.txt b/forge-gui/res/formats/Block/Return to Ravnica Block.txt
index 679579598da..8e5eedd2a76 100644
--- a/forge-gui/res/formats/Block/Return to Ravnica Block.txt	
+++ b/forge-gui/res/formats/Block/Return to Ravnica Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Return to Ravnica Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:118
 Sets:DGM, GTC, RTR
diff --git a/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt
index cdf17911108..a815c37c528 100644
--- a/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt	
+++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Scars of Mirrodin Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:120
 Sets:NPH, MBS, SOM
diff --git a/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt
index 813dd282227..42122fc4a73 100644
--- a/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt	
+++ b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Shadows over Innistrad Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:114
 Sets:EMN, SOI
diff --git a/forge-gui/res/formats/Block/Shards of Alara Block.txt b/forge-gui/res/formats/Block/Shards of Alara Block.txt
index 53e8ecfa8fe..37c54c609c5 100644
--- a/forge-gui/res/formats/Block/Shards of Alara Block.txt	
+++ b/forge-gui/res/formats/Block/Shards of Alara Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Shards of Alara Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:122
 Sets:ARB, CFX, ALA
diff --git a/forge-gui/res/formats/Block/Tempest Block.txt b/forge-gui/res/formats/Block/Tempest Block.txt
index 3576fbdd8ad..411c6150c46 100644
--- a/forge-gui/res/formats/Block/Tempest Block.txt	
+++ b/forge-gui/res/formats/Block/Tempest Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Tempest Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:133
 Sets:EXO, STH, TMP
diff --git a/forge-gui/res/formats/Block/Theros Block.txt b/forge-gui/res/formats/Block/Theros Block.txt
index 6c293080263..8b96e89e9e8 100644
--- a/forge-gui/res/formats/Block/Theros Block.txt	
+++ b/forge-gui/res/formats/Block/Theros Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Theros Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:117
 Sets:JOU, BNG, THS
diff --git a/forge-gui/res/formats/Block/Time Spiral Block.txt b/forge-gui/res/formats/Block/Time Spiral Block.txt
index 58f5950de7a..42818ad739b 100644
--- a/forge-gui/res/formats/Block/Time Spiral Block.txt	
+++ b/forge-gui/res/formats/Block/Time Spiral Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Time Spiral Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:124
 Sets:FUT, PLC, TSP
diff --git a/forge-gui/res/formats/Block/Urza Block.txt b/forge-gui/res/formats/Block/Urza Block.txt
index 227b8f6a43b..f3e92cb480a 100644
--- a/forge-gui/res/formats/Block/Urza Block.txt	
+++ b/forge-gui/res/formats/Block/Urza Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Urza Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:132
 Sets:UDS, ULG, USG
diff --git a/forge-gui/res/formats/Block/Zendikar Block.txt b/forge-gui/res/formats/Block/Zendikar Block.txt
index e68d8bd9749..a1f06a6c418 100644
--- a/forge-gui/res/formats/Block/Zendikar Block.txt	
+++ b/forge-gui/res/formats/Block/Zendikar Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Zendikar Block
-Type:Historic
+Type:Archive
 Subtype:Block
 Order:121
 Sets:ROE, WWK, ZEN
diff --git a/forge-gui/res/formats/Casual/Conspiracy.txt b/forge-gui/res/formats/Casual/Conspiracy.txt
index 08ba8371dbf..ecd90709889 100644
--- a/forge-gui/res/formats/Casual/Conspiracy.txt
+++ b/forge-gui/res/formats/Casual/Conspiracy.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Conspiracy
-Type:Historic
+Type:Archive
 Subtype:Custom
 Order:138
 Sets:CNS, CN2
diff --git a/forge-gui/res/formats/Casual/Un-Sets.txt b/forge-gui/res/formats/Casual/Un-Sets.txt
index 9aaf64ca169..eff3b864d28 100644
--- a/forge-gui/res/formats/Casual/Un-Sets.txt
+++ b/forge-gui/res/formats/Casual/Un-Sets.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Un-Sets
-Type:Historic
+Type:Archive
 Subtype:Custom
 Order:136
 Sets:UST, UNH, UGL
diff --git a/forge-gui/res/formats/Sanctioned/Extended.txt b/forge-gui/res/formats/Sanctioned/Extended.txt
index 0b996bc5705..fc7b81d1029 100644
--- a/forge-gui/res/formats/Sanctioned/Extended.txt
+++ b/forge-gui/res/formats/Sanctioned/Extended.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended
-Type:Historic
+Type:Archive
 Subtype:Extended
 Effective:2013-09-27
 Retired:2013-10-08
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index 347659b3bee..06c00000520 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -67,7 +67,7 @@ cbManaBurn=Mana Burn
 cbManaLostPrompt=Prompt Mana Pool Emptying
 cbDevMode=Developer Mode
 cbLoadCardsLazily=Load Card Scripts Lazily
-cbLoadHistoricFormats=Load Historic Formats
+cbLoadArchiveFormats=Load Archived Formats
 cbWorkshopSyntax=Workshop Syntax Checker
 cbEnforceDeckLegality=Deck Conformance
 cbSideboardForAI=Human Sideboard for AI
@@ -183,7 +183,7 @@ nlWorkshopSyntax=Enables syntax checking of card scripts in the Workshop. Note:
 nlGameLogEntryType=Changes how much information is displayed in the game log. Sorted by least to most verbose.
 nlCloseAction=Changes what happens when clicking the X button in the upper right.
 nlLoadCardsLazily=If turned on, Forge will load card scripts as they''re needed instead of at start up. (Warning: Experimental)
-nlLoadHistoricFormats=If turned on, Forge will load all historic format definitions, this may take slightly longer to load at startup.
+nlLoadArchiveFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Graphic Options
 nlCardArtFormat=The format of card art images. (Full: image of entire card. Crop: only the art part)
 nlDefaultFontSize=The default font size within the UI. All font elements are scaled relative to this. (REQUIRES RESTART)
@@ -552,7 +552,7 @@ cbWantReprints=Allow compatible reprints from other sets
 lblChooseFormats=Choose formats
 lblSanctioned=Sanctioned
 lblOther=Other
-lblHistoric=Historic
+lblArchive=Archive
 lblCancel=Cancel
 #DialogChoosePoolDistribution.java
 lblBlack=Black
@@ -1493,7 +1493,7 @@ lblPlayerDidntAttackThisTurn=%s didn''t attack this turn.
 #FormatFilter.java
 lblAllSetsFormats=All Sets/Formats
 lblOtherFormats=Other Formats
-#HistoricFormatSelect.java
+#ArchiveFormatSelect.java
 lblChooseFormat=Choose Format
 #Card.java
 lblAdventure=Adventure
@@ -2672,7 +2672,7 @@ lblRenameQuestTo=Rename quest to
 lblQuestRename=Quest Rename
 #StartingPoolType.java
 lblUnrestricted=Unrestricted
-lblCasualOrHistoricFormat=Casual/Historic format
+lblCasualOrArchiveFormat=Casual/Archived format
 lblCustomFormat=Custom format
 lblEventOrStartDeck=Event or starter deck
 lblMySealedDeck=My sealed deck
diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java
index cede55f28de..ca3c7ef2dcf 100644
--- a/forge-gui/src/main/java/forge/deck/DeckImportController.java
+++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java
@@ -138,7 +138,7 @@ public class DeckImportController {
             for (final GameFormat f : sanctionedFormats)
                 formatsDropdown.addItem(f);
 
-            if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) {
+            if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
                 // Add Block Formats
                 formatsDropdown.addItem(SEPARATOR);
                 final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
index 6b6fccb0d86..906c928412b 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
@@ -5,7 +5,7 @@ import forge.util.Localizer;
 public enum StartingPoolType {
     Complete("lblUnrestricted"),
     Sanctioned("lblSanctionedFormat"),
-    Casual("lblCasualOrHistoricFormat"),
+    Casual("lblCasualOrArchiveFormat"),
     CustomFormat("lblCustomFormat"),
     Precon("lblEventOrStartDeck"),
     SealedDeck("lblMySealedDeck"),
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
index ed0384db980..284f771dcd7 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
@@ -216,7 +216,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
         DEV_LOG_ENTRY_TYPE (GameLogEntryType.DAMAGE.toString()),
 
         LOAD_CARD_SCRIPTS_LAZILY ("false"),
-        LOAD_HISTORIC_FORMATS ("false"),
+        LOAD_ARCHIVE_FORMATS ("false"),
 
         DECK_DEFAULT_CARD_LIMIT ("4"),
         DECKGEN_SINGLETONS ("false"),
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index 40fb0da2f96..6e3f49d9a9e 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -208,7 +208,7 @@ public final class FModel {
         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_HISTORIC_FORMATS)));
+                new File(ForgeConstants.USER_FORMATS_DIR), preferences.getPrefBoolean(FPref.LOAD_ARCHIVE_FORMATS)));
 
         magicDb.setStandardPredicate(formats.getStandard().getFilterRules());
         magicDb.setPioneerPredicate(formats.getPioneer().getFilterRules());

From 712372063d81695092f540f7f1e1988509e31a5c Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Wed, 27 Apr 2022 11:54:53 +0100
Subject: [PATCH 017/309] archive to archived

---
 .../src/main/java/forge/game/GameFormat.java  | 28 +++++++++----------
 .../java/forge/itemmanager/CardManager.java   |  2 +-
 .../java/forge/itemmanager/DeckManager.java   |  2 +-
 .../home/quest/DialogChooseFormats.java       |  8 +++---
 .../home/settings/CSubmenuPreferences.java    |  2 +-
 .../home/settings/VSubmenuPreferences.java    | 10 +++----
 ...tSelect.java => ArchivedFormatSelect.java} | 12 ++++----
 .../itemmanager/filters/FormatFilter.java     |  8 +++---
 .../forge/screens/quest/NewQuestScreen.java   | 22 +++++++--------
 .../forge/screens/settings/SettingsPage.java  |  6 ++--
 .../formats/{Archive => Archived}/.gitkeep    |  0
 .../Alchemy/2021-12-09.txt                    |  2 +-
 .../Alchemy/2022-02-10.txt                    |  2 +-
 .../Alchemy/2022-03-17.txt                    |  2 +-
 .../Alchemy/2022-04-28.txt                    |  2 +-
 .../Alchemy/2022-06-02.txt                    |  0
 .../Arena Standard/2017-09-07.txt             |  2 +-
 .../Arena Standard/2018-01-18.txt             |  2 +-
 .../Arena Standard/2018-03-22.txt             |  2 +-
 .../Arena Standard/2018-04-26.txt             |  2 +-
 .../Arena Standard/2018-06-07.txt             |  2 +-
 .../Arena Standard/2018-07-12.txt             |  2 +-
 .../Arena Standard/2018-09-27.txt             |  2 +-
 .../Arena Standard/2018-11-15.txt             |  2 +-
 .../Arena Standard/2019-01-17.txt             |  2 +-
 .../Arena Standard/2019-02-14.txt             |  2 +-
 .../Arena Standard/2019-04-25.txt             |  2 +-
 .../Arena Standard/2019-07-02.txt             |  2 +-
 .../Arena Standard/2019-09-26.txt             |  2 +-
 .../Arena Standard/2019-10-24.txt             |  2 +-
 .../Arena Standard/2019-11-18.txt             |  2 +-
 .../Arena Standard/2020-01-16.txt             |  2 +-
 .../Arena Standard/2020-04-16.txt             |  2 +-
 .../Arena Standard/2020-06-04.txt             |  2 +-
 .../Arena Standard/2020-06-25.txt             |  2 +-
 .../Arena Standard/2020-08-03.txt             |  2 +-
 .../Arena Standard/2020-08-12.txt             |  2 +-
 .../Arena Standard/2020-09-17.txt             |  2 +-
 .../Arena Standard/2020-09-28.txt             |  2 +-
 .../Arena Standard/2020-10-12.txt             |  2 +-
 .../Arena Standard/2021-01-28.txt             |  2 +-
 .../Arena Standard/2021-04-15.txt             |  2 +-
 .../Arena Standard/2021-07-08.txt             |  2 +-
 .../Arena Standard/2021-09-16.txt             |  2 +-
 .../Arena Standard/2021-11-17.txt             |  2 +-
 .../Arena Standard/2022-01-27.txt             |  2 +-
 .../Arena Standard/2022-02-10.txt             |  2 +-
 .../Arena Standard/2022-03-17.txt             |  2 +-
 .../Arena Standard/2022-04-28.txt             |  2 +-
 .../Block/Amonkhet/2017-04-28.txt             |  2 +-
 .../Block/Amonkhet/2017-07-14.txt             |  2 +-
 .../Block/Battle for Zendikar/2015-10-02.txt  |  2 +-
 .../Block/Battle for Zendikar/2016-01-22.txt  |  2 +-
 .../Block/Ice Age/1996-10-01.txt              |  2 +-
 .../Block/Ice Age/1997-05-01.txt              |  2 +-
 .../Block/Ice Age/1997-07-01.txt              |  2 +-
 .../Block/Ice Age/2006-08-20.txt              |  2 +-
 .../Block/Innistrad/2011-09-30.txt            |  2 +-
 .../Block/Innistrad/2012-02-03.txt            |  2 +-
 .../Block/Innistrad/2012-04-02.txt            |  2 +-
 .../Block/Innistrad/2012-05-04.txt            |  2 +-
 .../Block/Invasion/2000-11-01.txt             |  2 +-
 .../Block/Invasion/2001-03-01.txt             |  2 +-
 .../Block/Invasion/2001-07-01.txt             |  2 +-
 .../Block/Ixalan/2017-09-29.txt               |  2 +-
 .../Block/Ixalan/2018-01-19.txt               |  2 +-
 .../Block/Kaladesh/2016-09-30.txt             |  2 +-
 .../Block/Kaladesh/2017-01-20.txt             |  2 +-
 .../Block/Kamigawa/2004-10-20.txt             |  2 +-
 .../Block/Kamigawa/2005-02-20.txt             |  2 +-
 .../Block/Kamigawa/2005-06-20.txt             |  2 +-
 .../Block/Khans of Tarkir/2014-09-26.txt      |  2 +-
 .../Block/Khans of Tarkir/2015-01-23.txt      |  2 +-
 .../Block/Khans of Tarkir/2015-03-27.txt      |  2 +-
 .../Block/Lorwyn-Shadowmoor/2007-10-20.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-02-01.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-05-02.txt    |  2 +-
 .../Block/Lorwyn-Shadowmoor/2008-07-25.txt    |  2 +-
 .../Block/Masques/1999-11-01.txt              |  2 +-
 .../Block/Masques/2000-03-01.txt              |  2 +-
 .../Block/Masques/2000-07-01.txt              |  2 +-
 .../1997-07-01.txt                            |  2 +-
 .../Block/Mirrodin/2003-10-20.txt             |  2 +-
 .../Block/Mirrodin/2004-02-20.txt             |  2 +-
 .../Block/Mirrodin/2004-06-20.txt             |  2 +-
 .../Block/Mirrodin/2006-02-20.txt             |  2 +-
 .../Block/Odyssey/2001-11-01.txt              |  2 +-
 .../Block/Odyssey/2002-03-01.txt              |  2 +-
 .../Block/Odyssey/2002-07-01.txt              |  2 +-
 .../Block/Onslaught/2002-11-01.txt            |  2 +-
 .../Block/Onslaught/2003-03-01.txt            |  2 +-
 .../Block/Onslaught/2003-07-01.txt            |  2 +-
 .../Block/Rath Cycle/1997-11-01.txt           |  2 +-
 .../Block/Rath Cycle/1998-04-01.txt           |  2 +-
 .../Block/Rath Cycle/1998-07-01.txt           |  2 +-
 .../Block/Ravnica/2005-10-20.txt              |  2 +-
 .../Block/Ravnica/2006-02-20.txt              |  2 +-
 .../Block/Ravnica/2006-05-20.txt              |  2 +-
 .../Block/Return to Ravnica/2012-10-05.txt    |  2 +-
 .../Block/Return to Ravnica/2013-02-01.txt    |  2 +-
 .../Block/Return to Ravnica/2013-05-03.txt    |  2 +-
 .../Block/Scars of Mirrodin/2010-10-01.txt    |  2 +-
 .../Block/Scars of Mirrodin/2011-02-04.txt    |  2 +-
 .../Block/Scars of Mirrodin/2011-05-13.txt    |  2 +-
 .../Shadows over Innistrad/2016-04-08.txt     |  2 +-
 .../Shadows over Innistrad/2016-07-22.txt     |  2 +-
 .../Block/Shards of Alara/2008-10-03.txt      |  2 +-
 .../Block/Shards of Alara/2009-02-06.txt      |  2 +-
 .../Block/Shards of Alara/2009-04-30.txt      |  2 +-
 .../Block/Theros/2013-09-27.txt               |  2 +-
 .../Block/Theros/2014-02-07.txt               |  2 +-
 .../Block/Theros/2014-05-02.txt               |  2 +-
 .../Block/Time Spiral/2006-10-20.txt          |  2 +-
 .../Block/Time Spiral/2007-02-20.txt          |  2 +-
 .../Block/Time Spiral/2007-05-20.txt          |  2 +-
 .../Block/Urza/1999-01-01.txt                 |  2 +-
 .../Block/Urza/1999-03-01.txt                 |  2 +-
 .../Block/Urza/1999-04-01.txt                 |  2 +-
 .../Block/Urza/1999-07-01.txt                 |  2 +-
 .../Block/Zendikar/2009-10-02.txt             |  2 +-
 .../Block/Zendikar/2010-02-05.txt             |  2 +-
 .../Block/Zendikar/2010-04-23.txt             |  2 +-
 .../Explorer/2022-04-21.txt                   |  2 +-
 .../Explorer/2022-04-28.txt                   |  2 +-
 .../Extended/1997-07-01.txt                   |  2 +-
 .../Extended/1997-10-01.txt                   |  2 +-
 .../Extended/1997-11-01.txt                   |  2 +-
 .../Extended/1998-04-01.txt                   |  2 +-
 .../Extended/1998-07-01.txt                   |  2 +-
 .../Extended/1998-11-01.txt                   |  2 +-
 .../Extended/1999-01-01.txt                   |  2 +-
 .../Extended/1999-03-01.txt                   |  2 +-
 .../Extended/1999-04-01.txt                   |  2 +-
 .../Extended/1999-06-01.txt                   |  2 +-
 .../Extended/1999-07-01.txt                   |  2 +-
 .../Extended/1999-09-01.txt                   |  2 +-
 .../Extended/1999-10-01.txt                   |  2 +-
 .../Extended/1999-11-01.txt                   |  2 +-
 .../Extended/2000-03-01.txt                   |  2 +-
 .../Extended/2000-04-01.txt                   |  2 +-
 .../Extended/2000-07-01.txt                   |  2 +-
 .../Extended/2000-11-01.txt                   |  2 +-
 .../Extended/2001-03-01.txt                   |  2 +-
 .../Extended/2001-04-01.txt                   |  2 +-
 .../Extended/2001-05-01.txt                   |  2 +-
 .../Extended/2001-07-01.txt                   |  2 +-
 .../Extended/2001-11-01.txt                   |  2 +-
 .../Extended/2002-03-01.txt                   |  2 +-
 .../Extended/2002-07-01.txt                   |  2 +-
 .../Extended/2002-11-01.txt                   |  2 +-
 .../Extended/2003-03-01.txt                   |  2 +-
 .../Extended/2003-07-01.txt                   |  2 +-
 .../Extended/2003-09-01.txt                   |  2 +-
 .../Extended/2003-10-01.txt                   |  2 +-
 .../Extended/2003-10-20.txt                   |  2 +-
 .../Extended/2004-01-01.txt                   |  2 +-
 .../Extended/2004-02-20.txt                   |  2 +-
 .../Extended/2004-06-20.txt                   |  2 +-
 .../Extended/2004-09-20.txt                   |  2 +-
 .../Extended/2004-10-20.txt                   |  2 +-
 .../Extended/2005-02-20.txt                   |  2 +-
 .../Extended/2005-06-20.txt                   |  2 +-
 .../Extended/2005-08-20.txt                   |  2 +-
 .../Extended/2005-09-20.txt                   |  2 +-
 .../Extended/2005-10-20.txt                   |  2 +-
 .../Extended/2006-02-20.txt                   |  2 +-
 .../Extended/2006-05-20.txt                   |  2 +-
 .../Extended/2006-08-20.txt                   |  2 +-
 .../Extended/2006-10-20.txt                   |  2 +-
 .../Extended/2007-02-20.txt                   |  2 +-
 .../Extended/2007-05-20.txt                   |  2 +-
 .../Extended/2007-07-20.txt                   |  2 +-
 .../Extended/2007-10-20.txt                   |  2 +-
 .../Extended/2008-02-01.txt                   |  2 +-
 .../Extended/2008-05-02.txt                   |  2 +-
 .../Extended/2008-07-25.txt                   |  2 +-
 .../Extended/2008-09-20.txt                   |  2 +-
 .../Extended/2008-10-03.txt                   |  2 +-
 .../Extended/2009-02-06.txt                   |  2 +-
 .../Extended/2009-04-30.txt                   |  2 +-
 .../Extended/2009-07-17.txt                   |  2 +-
 .../Extended/2009-10-02.txt                   |  2 +-
 .../Extended/2010-02-05.txt                   |  2 +-
 .../Extended/2010-04-23.txt                   |  2 +-
 .../Extended/2010-07-01.txt                   |  2 +-
 .../Extended/2010-07-16.txt                   |  2 +-
 .../Extended/2010-10-01.txt                   |  2 +-
 .../Extended/2011-02-04.txt                   |  2 +-
 .../Extended/2011-05-13.txt                   |  2 +-
 .../Extended/2011-07-15.txt                   |  2 +-
 .../Extended/2011-09-30.txt                   |  2 +-
 .../Extended/2011-10-01.txt                   |  2 +-
 .../Extended/2012-02-03.txt                   |  2 +-
 .../Extended/2012-05-04.txt                   |  2 +-
 .../Extended/2012-07-13.txt                   |  2 +-
 .../Extended/2012-10-05.txt                   |  2 +-
 .../Extended/2013-02-01.txt                   |  2 +-
 .../Extended/2013-05-03.txt                   |  2 +-
 .../Extended/2013-07-19.txt                   |  2 +-
 .../Extended/2013-09-27.txt                   |  2 +-
 .../Historic/2019-11-21.txt                   |  2 +-
 .../Historic/2020-01-16.txt                   |  2 +-
 .../Historic/2020-03-09.txt                   |  2 +-
 .../Historic/2020-03-12.txt                   |  2 +-
 .../Historic/2020-04-16.txt                   |  2 +-
 .../Historic/2020-05-21.txt                   |  2 +-
 .../Historic/2020-06-25.txt                   |  2 +-
 .../Historic/2020-07-13.txt                   |  2 +-
 .../Historic/2020-07-17.txt                   |  2 +-
 .../Historic/2020-08-13.txt                   |  2 +-
 .../Historic/2020-08-24.txt                   |  2 +-
 .../Historic/2020-09-17.txt                   |  2 +-
 .../Historic/2020-10-12.txt                   |  2 +-
 .../Historic/2020-11-12.txt                   |  2 +-
 .../Historic/2021-01-28.txt                   |  2 +-
 .../Historic/2021-02-15.txt                   |  2 +-
 .../Historic/2021-03-11.txt                   |  2 +-
 .../Historic/2021-04-15.txt                   |  2 +-
 .../Historic/2021-05-19.txt                   |  2 +-
 .../Historic/2021-05-27.txt                   |  2 +-
 .../Historic/2021-06-09.txt                   |  2 +-
 .../Historic/2021-07-08.txt                   |  2 +-
 .../Historic/2021-08-26.txt                   |  2 +-
 .../Historic/2021-09-16.txt                   |  2 +-
 .../Historic/2021-10-13.txt                   |  2 +-
 .../Historic/2021-11-17.txt                   |  2 +-
 .../Historic/2021-12-09.txt                   |  2 +-
 .../Historic/2022-01-25.txt                   |  2 +-
 .../Historic/2022-02-10.txt                   |  2 +-
 .../Historic/2022-02-24.txt                   |  2 +-
 .../Historic/2022-03-17.txt                   |  2 +-
 .../Historic/2022-04-28.txt                   |  2 +-
 .../Historic/2022-06-02.txt                   |  0
 .../Legacy/1996-05-01.txt                     |  2 +-
 .../Legacy/1996-07-01.txt                     |  2 +-
 .../Legacy/1996-07-10.txt                     |  2 +-
 .../Legacy/1996-10-01.txt                     |  2 +-
 .../Legacy/1996-11-07.txt                     |  2 +-
 .../Legacy/1997-01-01.txt                     |  2 +-
 .../Legacy/1997-03-05.txt                     |  2 +-
 .../Legacy/1997-04-23.txt                     |  2 +-
 .../Legacy/1997-07-01.txt                     |  2 +-
 .../Legacy/1997-11-01.txt                     |  2 +-
 .../Legacy/1998-04-01.txt                     |  2 +-
 .../Legacy/1998-07-01.txt                     |  2 +-
 .../Legacy/1998-11-01.txt                     |  2 +-
 .../Legacy/1999-01-01.txt                     |  2 +-
 .../Legacy/1999-03-01.txt                     |  2 +-
 .../Legacy/1999-04-01.txt                     |  2 +-
 .../Legacy/1999-06-01.txt                     |  2 +-
 .../Legacy/1999-07-01.txt                     |  2 +-
 .../Legacy/1999-10-01.txt                     |  2 +-
 .../Legacy/1999-11-01.txt                     |  2 +-
 .../Legacy/1999-11-12.txt                     |  2 +-
 .../Legacy/2000-03-01.txt                     |  2 +-
 .../Legacy/2000-07-01.txt                     |  2 +-
 .../Legacy/2000-10-01.txt                     |  2 +-
 .../Legacy/2000-11-01.txt                     |  2 +-
 .../Legacy/2001-03-01.txt                     |  2 +-
 .../Legacy/2001-05-01.txt                     |  2 +-
 .../Legacy/2001-07-01.txt                     |  2 +-
 .../Legacy/2001-11-01.txt                     |  2 +-
 .../Legacy/2001-12-01.txt                     |  2 +-
 .../Legacy/2002-01-01.txt                     |  2 +-
 .../Legacy/2002-03-01.txt                     |  2 +-
 .../Legacy/2002-07-01.txt                     |  2 +-
 .../Legacy/2002-11-01.txt                     |  2 +-
 .../Legacy/2003-03-01.txt                     |  2 +-
 .../Legacy/2003-04-01.txt                     |  2 +-
 .../Legacy/2003-07-01.txt                     |  2 +-
 .../Legacy/2003-09-01.txt                     |  2 +-
 .../Legacy/2003-10-20.txt                     |  2 +-
 .../Legacy/2004-01-01.txt                     |  2 +-
 .../Legacy/2004-02-20.txt                     |  2 +-
 .../Legacy/2004-06-20.txt                     |  2 +-
 .../Legacy/2004-09-20.txt                     |  2 +-
 .../Legacy/2004-10-20.txt                     |  2 +-
 .../Legacy/2005-02-20.txt                     |  2 +-
 .../Legacy/2005-06-20.txt                     |  2 +-
 .../Legacy/2005-08-20.txt                     |  2 +-
 .../Legacy/2005-09-20.txt                     |  2 +-
 .../Legacy/2005-10-20.txt                     |  2 +-
 .../Legacy/2006-02-20.txt                     |  2 +-
 .../Legacy/2006-05-20.txt                     |  2 +-
 .../Legacy/2006-08-20.txt                     |  2 +-
 .../Legacy/2006-10-20.txt                     |  2 +-
 .../Legacy/2007-02-20.txt                     |  2 +-
 .../Legacy/2007-05-20.txt                     |  2 +-
 .../Legacy/2007-06-20.txt                     |  2 +-
 .../Legacy/2007-07-20.txt                     |  2 +-
 .../Legacy/2007-09-10.txt                     |  2 +-
 .../Legacy/2007-09-20.txt                     |  2 +-
 .../Legacy/2007-10-20.txt                     |  2 +-
 .../Legacy/2007-11-16.txt                     |  2 +-
 .../Legacy/2008-02-01.txt                     |  2 +-
 .../Legacy/2008-05-02.txt                     |  2 +-
 .../Legacy/2008-07-25.txt                     |  2 +-
 .../Legacy/2008-08-29.txt                     |  2 +-
 .../Legacy/2008-09-20.txt                     |  2 +-
 .../Legacy/2008-09-22.txt                     |  2 +-
 .../Legacy/2008-10-03.txt                     |  2 +-
 .../Legacy/2008-11-07.txt                     |  2 +-
 .../Legacy/2009-02-06.txt                     |  2 +-
 .../Legacy/2009-04-10.txt                     |  2 +-
 .../Legacy/2009-04-30.txt                     |  2 +-
 .../Legacy/2009-07-17.txt                     |  2 +-
 .../Legacy/2009-08-26.txt                     |  2 +-
 .../Legacy/2009-08-28.txt                     |  2 +-
 .../Legacy/2009-09-07.txt                     |  2 +-
 .../Legacy/2009-10-01.txt                     |  2 +-
 .../Legacy/2009-10-02.txt                     |  2 +-
 .../Legacy/2009-10-30.txt                     |  2 +-
 .../Legacy/2009-11-20.txt                     |  2 +-
 .../Legacy/2010-02-05.txt                     |  2 +-
 .../Legacy/2010-03-19.txt                     |  2 +-
 .../Legacy/2010-04-23.txt                     |  2 +-
 .../Legacy/2010-06-04.txt                     |  2 +-
 .../Legacy/2010-07-01.txt                     |  2 +-
 .../Legacy/2010-07-16.txt                     |  2 +-
 .../Legacy/2010-08-27.txt                     |  2 +-
 .../Legacy/2010-09-03.txt                     |  2 +-
 .../Legacy/2010-10-01.txt                     |  2 +-
 .../Legacy/2010-11-08.txt                     |  2 +-
 .../Legacy/2010-11-19.txt                     |  2 +-
 .../Legacy/2011-01-01.txt                     |  2 +-
 .../Legacy/2011-01-10.txt                     |  2 +-
 .../Legacy/2011-02-04.txt                     |  2 +-
 .../Legacy/2011-04-01.txt                     |  2 +-
 .../Legacy/2011-05-13.txt                     |  2 +-
 .../Legacy/2011-05-14.txt                     |  2 +-
 .../Legacy/2011-06-17.txt                     |  2 +-
 .../Legacy/2011-07-15.txt                     |  2 +-
 .../Legacy/2011-08-26.txt                     |  2 +-
 .../Legacy/2011-09-02.txt                     |  2 +-
 .../Legacy/2011-09-30.txt                     |  2 +-
 .../Legacy/2011-10-01.txt                     |  2 +-
 .../Legacy/2011-11-18.txt                     |  2 +-
 .../Legacy/2012-02-03.txt                     |  2 +-
 .../Legacy/2012-03-30.txt                     |  2 +-
 .../Legacy/2012-05-04.txt                     |  2 +-
 .../Legacy/2012-06-29.txt                     |  2 +-
 .../Legacy/2012-07-13.txt                     |  2 +-
 .../Legacy/2012-08-31.txt                     |  2 +-
 .../Legacy/2012-09-07.txt                     |  2 +-
 .../Legacy/2012-10-05.txt                     |  2 +-
 .../Legacy/2012-11-02.txt                     |  2 +-
 .../Legacy/2013-02-01.txt                     |  2 +-
 .../Legacy/2013-03-15.txt                     |  2 +-
 .../Legacy/2013-05-03.txt                     |  2 +-
 .../Legacy/2013-06-07.txt                     |  2 +-
 .../Legacy/2013-07-19.txt                     |  2 +-
 .../Legacy/2013-08-23.txt                     |  2 +-
 .../Legacy/2013-09-06.txt                     |  2 +-
 .../Legacy/2013-09-27.txt                     |  2 +-
 .../Legacy/2013-11-01.txt                     |  2 +-
 .../Legacy/2014-02-07.txt                     |  2 +-
 .../Legacy/2014-03-14.txt                     |  2 +-
 .../Legacy/2014-05-02.txt                     |  2 +-
 .../Legacy/2014-05-30.txt                     |  2 +-
 .../Legacy/2014-06-06.txt                     |  2 +-
 .../Legacy/2014-06-16.txt                     |  2 +-
 .../Legacy/2014-07-18.txt                     |  2 +-
 .../Legacy/2014-08-22.txt                     |  2 +-
 .../Legacy/2014-09-05.txt                     |  2 +-
 .../Legacy/2014-09-26.txt                     |  2 +-
 .../Legacy/2014-11-07.txt                     |  2 +-
 .../Legacy/2014-12-05.txt                     |  2 +-
 .../Legacy/2015-01-23.txt                     |  2 +-
 .../Legacy/2015-02-27.txt                     |  2 +-
 .../Legacy/2015-03-27.txt                     |  2 +-
 .../Legacy/2015-05-06.txt                     |  2 +-
 .../Legacy/2015-05-22.txt                     |  2 +-
 .../Legacy/2015-07-17.txt                     |  2 +-
 .../Legacy/2015-08-21.txt                     |  2 +-
 .../Legacy/2015-08-28.txt                     |  2 +-
 .../Legacy/2015-10-02.txt                     |  2 +-
 .../Legacy/2015-11-13.txt                     |  2 +-
 .../Legacy/2015-11-18.txt                     |  2 +-
 .../Legacy/2016-01-22.txt                     |  2 +-
 .../Legacy/2016-02-26.txt                     |  2 +-
 .../Legacy/2016-04-08.txt                     |  2 +-
 .../Legacy/2016-06-10.txt                     |  2 +-
 .../Legacy/2016-07-22.txt                     |  2 +-
 .../Legacy/2016-08-19.txt                     |  2 +-
 .../Legacy/2016-08-26.txt                     |  2 +-
 .../Legacy/2016-09-02.txt                     |  2 +-
 .../Legacy/2016-09-30.txt                     |  2 +-
 .../Legacy/2016-11-11.txt                     |  2 +-
 .../Legacy/2016-11-16.txt                     |  2 +-
 .../Legacy/2017-01-20.txt                     |  2 +-
 .../Legacy/2017-03-17.txt                     |  2 +-
 .../Legacy/2017-03-31.txt                     |  2 +-
 .../Legacy/2017-04-24.txt                     |  2 +-
 .../Legacy/2017-04-28.txt                     |  2 +-
 .../Legacy/2017-06-09.txt                     |  2 +-
 .../Legacy/2017-07-14.txt                     |  2 +-
 .../Legacy/2017-08-25.txt                     |  2 +-
 .../Legacy/2017-09-29.txt                     |  2 +-
 .../Legacy/2017-11-10.txt                     |  2 +-
 .../Legacy/2017-11-17.txt                     |  2 +-
 .../Legacy/2017-11-24.txt                     |  2 +-
 .../Legacy/2018-01-19.txt                     |  2 +-
 .../Legacy/2018-03-16.txt                     |  2 +-
 .../Legacy/2018-04-06.txt                     |  2 +-
 .../Legacy/2018-04-27.txt                     |  2 +-
 .../Legacy/2018-06-08.txt                     |  2 +-
 .../Legacy/2018-06-15.txt                     |  2 +-
 .../Legacy/2018-06-22.txt                     |  2 +-
 .../Legacy/2018-07-06.txt                     |  2 +-
 .../Legacy/2018-07-13.txt                     |  2 +-
 .../Legacy/2018-08-09.txt                     |  2 +-
 .../Legacy/2018-10-05.txt                     |  2 +-
 .../Legacy/2018-11-02.txt                     |  2 +-
 .../Legacy/2018-11-16.txt                     |  2 +-
 .../Legacy/2018-12-07.txt                     |  2 +-
 .../Legacy/2019-01-25.txt                     |  2 +-
 .../Legacy/2019-02-15.txt                     |  2 +-
 .../Legacy/2019-05-03.txt                     |  2 +-
 .../Legacy/2019-06-14.txt                     |  2 +-
 .../Legacy/2019-06-28.txt                     |  2 +-
 .../Legacy/2019-07-12.txt                     |  2 +-
 .../Legacy/2019-08-23.txt                     |  2 +-
 .../Legacy/2019-10-04.txt                     |  2 +-
 .../Legacy/2019-11-07.txt                     |  2 +-
 .../Legacy/2019-11-15.txt                     |  2 +-
 .../Legacy/2019-11-22.txt                     |  2 +-
 .../Legacy/2020-01-24.txt                     |  2 +-
 .../Legacy/2020-03-10.txt                     |  2 +-
 .../Legacy/2020-04-24.txt                     |  2 +-
 .../Legacy/2020-05-18.txt                     |  2 +-
 .../Legacy/2020-06-10.txt                     |  2 +-
 .../Legacy/2020-06-26.txt                     |  2 +-
 .../Legacy/2020-07-03.txt                     |  2 +-
 .../Legacy/2020-07-17.txt                     |  2 +-
 .../Legacy/2020-08-07.txt                     |  2 +-
 .../Legacy/2020-09-25.txt                     |  2 +-
 .../Legacy/2020-10-04.txt                     |  2 +-
 .../Legacy/2020-11-20.txt                     |  2 +-
 .../Legacy/2020-12-04.txt                     |  2 +-
 .../Legacy/2021-02-05.txt                     |  2 +-
 .../Legacy/2021-02-15.txt                     |  2 +-
 .../Legacy/2021-03-19.txt                     |  2 +-
 .../Legacy/2021-04-23.txt                     |  2 +-
 .../Legacy/2021-06-18.txt                     |  2 +-
 .../Legacy/2021-07-23.txt                     |  2 +-
 .../Legacy/2021-09-24.txt                     |  2 +-
 .../Legacy/2021-10-18.txt                     |  2 +-
 .../Legacy/2021-11-19.txt                     |  2 +-
 .../Legacy/2022-01-25.txt                     |  2 +-
 .../Legacy/2022-01-28.txt                     |  2 +-
 .../Legacy/2022-02-17.txt                     |  2 +-
 .../Legacy/2022-02-18.txt                     |  2 +-
 .../Legacy/2022-04-29.txt                     |  2 +-
 .../Legacy/2022-06-10.txt                     |  0
 .../Modern/2011-05-19.txt                     |  2 +-
 .../Modern/2011-07-15.txt                     |  2 +-
 .../Modern/2011-08-12.txt                     |  2 +-
 .../Modern/2011-09-30.txt                     |  2 +-
 .../Modern/2011-10-01.txt                     |  2 +-
 .../Modern/2012-01-01.txt                     |  2 +-
 .../Modern/2012-02-03.txt                     |  2 +-
 .../Modern/2012-05-04.txt                     |  2 +-
 .../Modern/2012-07-13.txt                     |  2 +-
 .../Modern/2012-10-01.txt                     |  2 +-
 .../Modern/2012-10-05.txt                     |  2 +-
 .../Modern/2013-02-01.txt                     |  2 +-
 .../Modern/2013-05-03.txt                     |  2 +-
 .../Modern/2013-06-07.txt                     |  2 +-
 .../Modern/2013-07-19.txt                     |  2 +-
 .../Modern/2013-09-27.txt                     |  2 +-
 .../Modern/2014-02-07.txt                     |  2 +-
 .../Modern/2014-05-02.txt                     |  2 +-
 .../Modern/2014-05-30.txt                     |  2 +-
 .../Modern/2014-07-18.txt                     |  2 +-
 .../Modern/2014-09-26.txt                     |  2 +-
 .../Modern/2015-01-23.txt                     |  2 +-
 .../Modern/2015-03-27.txt                     |  2 +-
 .../Modern/2015-05-22.txt                     |  2 +-
 .../Modern/2015-07-17.txt                     |  2 +-
 .../Modern/2015-10-02.txt                     |  2 +-
 .../Modern/2016-01-22.txt                     |  2 +-
 .../Modern/2016-04-08.txt                     |  2 +-
 .../Modern/2016-07-22.txt                     |  2 +-
 .../Modern/2016-09-30.txt                     |  2 +-
 .../Modern/2017-01-20.txt                     |  2 +-
 .../Modern/2017-03-17.txt                     |  2 +-
 .../Modern/2017-04-15.txt                     |  2 +-
 .../Modern/2017-04-28.txt                     |  2 +-
 .../Modern/2017-07-14.txt                     |  2 +-
 .../Modern/2017-09-29.txt                     |  2 +-
 .../Modern/2018-01-19.txt                     |  2 +-
 .../Modern/2018-02-19.txt                     |  2 +-
 .../Modern/2018-04-27.txt                     |  2 +-
 .../Modern/2018-07-13.txt                     |  2 +-
 .../Modern/2018-10-05.txt                     |  2 +-
 .../Modern/2018-11-02.txt                     |  2 +-
 .../Modern/2018-11-16.txt                     |  2 +-
 .../Modern/2019-01-25.txt                     |  2 +-
 .../Modern/2019-02-15.txt                     |  2 +-
 .../Modern/2019-05-03.txt                     |  2 +-
 .../Modern/2019-06-14.txt                     |  2 +-
 .../Modern/2019-07-12.txt                     |  2 +-
 .../Modern/2019-08-30.txt                     |  2 +-
 .../Modern/2019-10-04.txt                     |  2 +-
 .../Modern/2020-01-14.txt                     |  2 +-
 .../Modern/2020-01-24.txt                     |  2 +-
 .../Modern/2020-03-10.txt                     |  2 +-
 .../Modern/2020-04-24.txt                     |  2 +-
 .../Modern/2020-07-03.txt                     |  2 +-
 .../Modern/2020-07-13.txt                     |  2 +-
 .../Modern/2020-09-25.txt                     |  2 +-
 .../Modern/2021-02-05.txt                     |  2 +-
 .../Modern/2021-02-15.txt                     |  2 +-
 .../Modern/2021-03-19.txt                     |  2 +-
 .../Modern/2021-04-23.txt                     |  2 +-
 .../Modern/2021-06-18.txt                     |  2 +-
 .../Modern/2021-07-23.txt                     |  2 +-
 .../Modern/2021-09-24.txt                     |  2 +-
 .../Modern/2021-11-19.txt                     |  2 +-
 .../Modern/2022-01-28.txt                     |  2 +-
 .../Modern/2022-02-18.txt                     |  2 +-
 .../Modern/2022-03-07.txt                     |  2 +-
 .../Modern/2022-04-29.txt                     |  2 +-
 .../Pauper/2019-05-24.txt                     |  2 +-
 .../Pauper/2019-10-25.txt                     |  2 +-
 .../Pauper/2020-01-14.txt                     |  2 +-
 .../Pauper/2020-07-13.txt                     |  2 +-
 .../Pioneer/2019-10-21.txt                    |  2 +-
 .../Pioneer/2019-11-08.txt                    |  2 +-
 .../Pioneer/2019-11-12.txt                    |  2 +-
 .../Pioneer/2019-12-03.txt                    |  2 +-
 .../Pioneer/2019-12-17.txt                    |  2 +-
 .../Pioneer/2020-01-24.txt                    |  2 +-
 .../Pioneer/2020-04-24.txt                    |  2 +-
 .../Pioneer/2020-07-03.txt                    |  2 +-
 .../Pioneer/2020-07-13.txt                    |  2 +-
 .../Pioneer/2020-08-03.txt                    |  2 +-
 .../Pioneer/2020-09-25.txt                    |  2 +-
 .../Pioneer/2021-02-05.txt                    |  2 +-
 .../Pioneer/2021-02-15.txt                    |  2 +-
 .../Pioneer/2021-04-23.txt                    |  2 +-
 .../Pioneer/2021-07-23.txt                    |  2 +-
 .../Pioneer/2021-09-24.txt                    |  2 +-
 .../Pioneer/2021-11-19.txt                    |  2 +-
 .../Pioneer/2022-01-28.txt                    |  2 +-
 .../Pioneer/2022-02-18.txt                    |  2 +-
 .../Pioneer/2022-03-07.txt                    |  2 +-
 .../Pioneer/2022-04-29.txt                    |  2 +-
 .../Pioneer/2022-06-07.txt                    |  0
 .../Standard/1995-01-10.txt                   |  2 +-
 .../Standard/1995-04-19.txt                   |  2 +-
 .../Standard/1995-06-03.txt                   |  2 +-
 .../Standard/1995-07-01.txt                   |  2 +-
 .../Standard/1995-11-01.txt                   |  2 +-
 .../Standard/1995-11-13.txt                   |  2 +-
 .../Standard/1996-02-01.txt                   |  2 +-
 .../Standard/1996-04-01.txt                   |  2 +-
 .../Standard/1996-07-01.txt                   |  2 +-
 .../Standard/1996-07-10.txt                   |  2 +-
 .../Standard/1996-10-01.txt                   |  2 +-
 .../Standard/1996-11-07.txt                   |  2 +-
 .../Standard/1997-01-01.txt                   |  2 +-
 .../Standard/1997-03-05.txt                   |  2 +-
 .../Standard/1997-04-23.txt                   |  2 +-
 .../Standard/1997-07-01.txt                   |  2 +-
 .../Standard/1997-11-01.txt                   |  2 +-
 .../Standard/1998-04-01.txt                   |  2 +-
 .../Standard/1998-07-01.txt                   |  2 +-
 .../Standard/1998-11-01.txt                   |  2 +-
 .../Standard/1999-01-01.txt                   |  2 +-
 .../Standard/1999-03-01.txt                   |  2 +-
 .../Standard/1999-04-01.txt                   |  2 +-
 .../Standard/1999-06-01.txt                   |  2 +-
 .../Standard/1999-07-01.txt                   |  2 +-
 .../Standard/1999-11-01.txt                   |  2 +-
 .../Standard/2000-03-01.txt                   |  2 +-
 .../Standard/2000-07-01.txt                   |  2 +-
 .../Standard/2000-11-01.txt                   |  2 +-
 .../Standard/2001-03-01.txt                   |  2 +-
 .../Standard/2001-05-01.txt                   |  2 +-
 .../Standard/2001-07-01.txt                   |  2 +-
 .../Standard/2001-11-01.txt                   |  2 +-
 .../Standard/2002-03-01.txt                   |  2 +-
 .../Standard/2002-07-01.txt                   |  2 +-
 .../Standard/2002-11-01.txt                   |  2 +-
 .../Standard/2003-03-01.txt                   |  2 +-
 .../Standard/2003-07-01.txt                   |  2 +-
 .../Standard/2003-09-01.txt                   |  2 +-
 .../Standard/2003-10-20.txt                   |  2 +-
 .../Standard/2004-02-20.txt                   |  2 +-
 .../Standard/2004-06-20.txt                   |  2 +-
 .../Standard/2004-10-20.txt                   |  2 +-
 .../Standard/2005-02-20.txt                   |  2 +-
 .../Standard/2005-03-20.txt                   |  2 +-
 .../Standard/2005-06-20.txt                   |  2 +-
 .../Standard/2005-08-20.txt                   |  2 +-
 .../Standard/2005-10-20.txt                   |  2 +-
 .../Standard/2006-02-20.txt                   |  2 +-
 .../Standard/2006-05-20.txt                   |  2 +-
 .../Standard/2006-08-20.txt                   |  2 +-
 .../Standard/2006-10-20.txt                   |  2 +-
 .../Standard/2007-02-20.txt                   |  2 +-
 .../Standard/2007-05-20.txt                   |  2 +-
 .../Standard/2007-07-20.txt                   |  2 +-
 .../Standard/2007-10-20.txt                   |  2 +-
 .../Standard/2008-02-01.txt                   |  2 +-
 .../Standard/2008-05-02.txt                   |  2 +-
 .../Standard/2008-07-25.txt                   |  2 +-
 .../Standard/2008-10-03.txt                   |  2 +-
 .../Standard/2009-02-06.txt                   |  2 +-
 .../Standard/2009-04-30.txt                   |  2 +-
 .../Standard/2009-07-17.txt                   |  2 +-
 .../Standard/2009-10-02.txt                   |  2 +-
 .../Standard/2010-02-05.txt                   |  2 +-
 .../Standard/2010-04-23.txt                   |  2 +-
 .../Standard/2010-07-16.txt                   |  2 +-
 .../Standard/2010-10-01.txt                   |  2 +-
 .../Standard/2011-02-04.txt                   |  2 +-
 .../Standard/2011-05-13.txt                   |  2 +-
 .../Standard/2011-07-01.txt                   |  2 +-
 .../Standard/2011-07-15.txt                   |  2 +-
 .../Standard/2011-09-30.txt                   |  2 +-
 .../Standard/2012-02-03.txt                   |  2 +-
 .../Standard/2012-05-04.txt                   |  2 +-
 .../Standard/2012-07-13.txt                   |  2 +-
 .../Standard/2012-10-05.txt                   |  2 +-
 .../Standard/2013-02-01.txt                   |  2 +-
 .../Standard/2013-05-03.txt                   |  2 +-
 .../Standard/2013-07-19.txt                   |  2 +-
 .../Standard/2013-09-27.txt                   |  2 +-
 .../Standard/2014-02-07.txt                   |  2 +-
 .../Standard/2014-05-02.txt                   |  2 +-
 .../Standard/2014-07-18.txt                   |  2 +-
 .../Standard/2014-09-26.txt                   |  2 +-
 .../Standard/2015-01-23.txt                   |  2 +-
 .../Standard/2015-03-27.txt                   |  2 +-
 .../Standard/2015-07-17.txt                   |  2 +-
 .../Standard/2015-10-02.txt                   |  2 +-
 .../Standard/2016-01-22.txt                   |  2 +-
 .../Standard/2016-04-08.txt                   |  2 +-
 .../Standard/2016-07-22.txt                   |  2 +-
 .../Standard/2016-09-30.txt                   |  2 +-
 .../Standard/2017-01-20.txt                   |  2 +-
 .../Standard/2017-04-28.txt                   |  2 +-
 .../Standard/2017-06-19.txt                   |  2 +-
 .../Standard/2017-07-14.txt                   |  2 +-
 .../Standard/2017-09-29.txt                   |  2 +-
 .../Standard/2018-01-19.txt                   |  2 +-
 .../Standard/2018-04-27.txt                   |  2 +-
 .../Standard/2018-07-13.txt                   |  2 +-
 .../Standard/2018-10-05.txt                   |  2 +-
 .../Standard/2018-11-16.txt                   |  2 +-
 .../Standard/2019-01-25.txt                   |  2 +-
 .../Standard/2019-05-03.txt                   |  2 +-
 .../Standard/2019-07-12.txt                   |  2 +-
 .../Standard/2019-08-30.txt                   |  2 +-
 .../Standard/2019-10-04.txt                   |  2 +-
 .../Standard/2019-10-25.txt                   |  2 +-
 .../Standard/2019-11-22.txt                   |  2 +-
 .../Standard/2020-01-24.txt                   |  2 +-
 .../Standard/2020-04-24.txt                   |  2 +-
 .../Standard/2020-06-01.txt                   |  2 +-
 .../Standard/2020-07-03.txt                   |  2 +-
 .../Standard/2020-08-03.txt                   |  2 +-
 .../Standard/2020-09-25.txt                   |  2 +-
 .../Standard/2020-09-28.txt                   |  2 +-
 .../Standard/2020-10-12.txt                   |  2 +-
 .../Standard/2021-02-05.txt                   |  2 +-
 .../Standard/2021-04-23.txt                   |  2 +-
 .../Standard/2021-07-23.txt                   |  2 +-
 .../Standard/2021-09-24.txt                   |  2 +-
 .../Standard/2021-11-19.txt                   |  2 +-
 .../Standard/2022-01-25.txt                   |  2 +-
 .../Standard/2022-02-18.txt                   |  2 +-
 .../Standard/2022-04-29.txt                   |  2 +-
 .../Standard/China/2018-06-22.txt             |  2 +-
 .../Standard/China/2018-07-13.txt             |  2 +-
 .../Standard/China/2018-10-05.txt             |  2 +-
 .../Standard/China/2018-11-16.txt             |  2 +-
 .../Standard/China/2019-01-25.txt             |  2 +-
 .../Standard/China/2019-05-03.txt             |  2 +-
 .../Standard/China/2019-07-12.txt             |  2 +-
 .../Standard/China/2019-08-30.txt             |  2 +-
 .../Vintage/1993-08-05.txt                    |  2 +-
 .../Vintage/1993-10-04.txt                    |  2 +-
 .../Vintage/1993-12-01.txt                    |  2 +-
 .../Vintage/1993-12-17.txt                    |  2 +-
 .../Vintage/1994-01-26.txt                    |  2 +-
 .../Vintage/1994-02-23.txt                    |  2 +-
 .../Vintage/1994-03-04.txt                    |  2 +-
 .../Vintage/1994-03-23.txt                    |  2 +-
 .../Vintage/1994-04-01.txt                    |  2 +-
 .../Vintage/1994-05-02.txt                    |  2 +-
 .../Vintage/1994-06-10.txt                    |  2 +-
 .../Vintage/1994-06-13.txt                    |  2 +-
 .../Vintage/1994-07-15.txt                    |  2 +-
 .../Vintage/1994-08-02.txt                    |  2 +-
 .../Vintage/1994-08-08.txt                    |  2 +-
 .../Vintage/1994-10-10.txt                    |  2 +-
 .../Vintage/1994-11-15.txt                    |  2 +-
 .../Vintage/1995-01-10.txt                    |  2 +-
 .../Vintage/1995-03-01.txt                    |  2 +-
 .../Vintage/1995-04-19.txt                    |  2 +-
 .../Vintage/1995-06-03.txt                    |  2 +-
 .../Vintage/1995-07-01.txt                    |  2 +-
 .../Vintage/1995-11-01.txt                    |  2 +-
 .../Vintage/1995-11-13.txt                    |  2 +-
 .../Vintage/1996-02-01.txt                    |  2 +-
 .../Vintage/1996-04-01.txt                    |  2 +-
 .../Vintage/1996-07-10.txt                    |  2 +-
 .../Vintage/1996-10-01.txt                    |  2 +-
 .../Vintage/1996-11-07.txt                    |  2 +-
 .../Vintage/1997-03-05.txt                    |  2 +-
 .../Vintage/1997-04-23.txt                    |  2 +-
 .../Vintage/1997-07-01.txt                    |  2 +-
 .../Vintage/1997-10-01.txt                    |  2 +-
 .../Vintage/1997-11-01.txt                    |  2 +-
 .../Vintage/1998-01-01.txt                    |  2 +-
 .../Vintage/1998-04-01.txt                    |  2 +-
 .../Vintage/1998-07-01.txt                    |  2 +-
 .../Vintage/1998-11-01.txt                    |  2 +-
 .../Vintage/1999-01-01.txt                    |  2 +-
 .../Vintage/1999-03-01.txt                    |  2 +-
 .../Vintage/1999-04-01.txt                    |  2 +-
 .../Vintage/1999-06-01.txt                    |  2 +-
 .../Vintage/1999-07-01.txt                    |  2 +-
 .../Vintage/1999-10-01.txt                    |  2 +-
 .../Vintage/1999-11-01.txt                    |  2 +-
 .../Vintage/1999-11-12.txt                    |  2 +-
 .../Vintage/2000-03-01.txt                    |  2 +-
 .../Vintage/2000-07-01.txt                    |  2 +-
 .../Vintage/2000-10-01.txt                    |  2 +-
 .../Vintage/2000-11-01.txt                    |  2 +-
 .../Vintage/2001-03-01.txt                    |  2 +-
 .../Vintage/2001-05-01.txt                    |  2 +-
 .../Vintage/2001-07-01.txt                    |  2 +-
 .../Vintage/2001-11-01.txt                    |  2 +-
 .../Vintage/2001-12-01.txt                    |  2 +-
 .../Vintage/2002-01-01.txt                    |  2 +-
 .../Vintage/2002-03-01.txt                    |  2 +-
 .../Vintage/2002-07-01.txt                    |  2 +-
 .../Vintage/2002-11-01.txt                    |  2 +-
 .../Vintage/2003-03-01.txt                    |  2 +-
 .../Vintage/2003-04-01.txt                    |  2 +-
 .../Vintage/2003-07-01.txt                    |  2 +-
 .../Vintage/2003-09-01.txt                    |  2 +-
 .../Vintage/2003-10-20.txt                    |  2 +-
 .../Vintage/2004-01-01.txt                    |  2 +-
 .../Vintage/2004-02-20.txt                    |  2 +-
 .../Vintage/2004-06-20.txt                    |  2 +-
 .../Vintage/2004-09-20.txt                    |  2 +-
 .../Vintage/2004-10-20.txt                    |  2 +-
 .../Vintage/2004-12-20.txt                    |  2 +-
 .../Vintage/2005-02-20.txt                    |  2 +-
 .../Vintage/2005-03-20.txt                    |  2 +-
 .../Vintage/2005-06-20.txt                    |  2 +-
 .../Vintage/2005-08-20.txt                    |  2 +-
 .../Vintage/2005-09-20.txt                    |  2 +-
 .../Vintage/2005-10-20.txt                    |  2 +-
 .../Vintage/2006-02-20.txt                    |  2 +-
 .../Vintage/2006-05-20.txt                    |  2 +-
 .../Vintage/2006-08-20.txt                    |  2 +-
 .../Vintage/2006-10-20.txt                    |  2 +-
 .../Vintage/2007-02-20.txt                    |  2 +-
 .../Vintage/2007-05-20.txt                    |  2 +-
 .../Vintage/2007-06-20.txt                    |  2 +-
 .../Vintage/2007-07-20.txt                    |  2 +-
 .../Vintage/2007-09-10.txt                    |  2 +-
 .../Vintage/2007-09-20.txt                    |  2 +-
 .../Vintage/2007-10-20.txt                    |  2 +-
 .../Vintage/2007-11-16.txt                    |  2 +-
 .../Vintage/2008-02-01.txt                    |  2 +-
 .../Vintage/2008-05-02.txt                    |  2 +-
 .../Vintage/2008-06-20.txt                    |  2 +-
 .../Vintage/2008-07-25.txt                    |  2 +-
 .../Vintage/2008-08-29.txt                    |  2 +-
 .../Vintage/2008-09-20.txt                    |  2 +-
 .../Vintage/2008-09-22.txt                    |  2 +-
 .../Vintage/2008-10-03.txt                    |  2 +-
 .../Vintage/2008-11-07.txt                    |  2 +-
 .../Vintage/2009-02-06.txt                    |  2 +-
 .../Vintage/2009-04-10.txt                    |  2 +-
 .../Vintage/2009-04-30.txt                    |  2 +-
 .../Vintage/2009-07-01.txt                    |  2 +-
 .../Vintage/2009-07-17.txt                    |  2 +-
 .../Vintage/2009-08-26.txt                    |  2 +-
 .../Vintage/2009-08-28.txt                    |  2 +-
 .../Vintage/2009-09-07.txt                    |  2 +-
 .../Vintage/2009-10-02.txt                    |  2 +-
 .../Vintage/2009-10-30.txt                    |  2 +-
 .../Vintage/2009-11-20.txt                    |  2 +-
 .../Vintage/2010-02-05.txt                    |  2 +-
 .../Vintage/2010-03-19.txt                    |  2 +-
 .../Vintage/2010-04-23.txt                    |  2 +-
 .../Vintage/2010-06-04.txt                    |  2 +-
 .../Vintage/2010-07-16.txt                    |  2 +-
 .../Vintage/2010-08-27.txt                    |  2 +-
 .../Vintage/2010-09-03.txt                    |  2 +-
 .../Vintage/2010-10-01.txt                    |  2 +-
 .../Vintage/2010-11-08.txt                    |  2 +-
 .../Vintage/2010-11-19.txt                    |  2 +-
 .../Vintage/2011-01-10.txt                    |  2 +-
 .../Vintage/2011-02-04.txt                    |  2 +-
 .../Vintage/2011-04-01.txt                    |  2 +-
 .../Vintage/2011-05-13.txt                    |  2 +-
 .../Vintage/2011-05-14.txt                    |  2 +-
 .../Vintage/2011-06-17.txt                    |  2 +-
 .../Vintage/2011-07-15.txt                    |  2 +-
 .../Vintage/2011-08-26.txt                    |  2 +-
 .../Vintage/2011-09-02.txt                    |  2 +-
 .../Vintage/2011-09-30.txt                    |  2 +-
 .../Vintage/2011-10-01.txt                    |  2 +-
 .../Vintage/2011-11-18.txt                    |  2 +-
 .../Vintage/2012-02-03.txt                    |  2 +-
 .../Vintage/2012-03-30.txt                    |  2 +-
 .../Vintage/2012-05-04.txt                    |  2 +-
 .../Vintage/2012-07-13.txt                    |  2 +-
 .../Vintage/2012-08-31.txt                    |  2 +-
 .../Vintage/2012-09-07.txt                    |  2 +-
 .../Vintage/2012-10-01.txt                    |  2 +-
 .../Vintage/2012-10-05.txt                    |  2 +-
 .../Vintage/2012-11-02.txt                    |  2 +-
 .../Vintage/2013-02-01.txt                    |  2 +-
 .../Vintage/2013-03-15.txt                    |  2 +-
 .../Vintage/2013-05-03.txt                    |  2 +-
 .../Vintage/2013-06-07.txt                    |  2 +-
 .../Vintage/2013-07-19.txt                    |  2 +-
 .../Vintage/2013-08-23.txt                    |  2 +-
 .../Vintage/2013-09-06.txt                    |  2 +-
 .../Vintage/2013-09-27.txt                    |  2 +-
 .../Vintage/2013-11-01.txt                    |  2 +-
 .../Vintage/2014-02-07.txt                    |  2 +-
 .../Vintage/2014-03-14.txt                    |  2 +-
 .../Vintage/2014-05-02.txt                    |  2 +-
 .../Vintage/2014-05-30.txt                    |  2 +-
 .../Vintage/2014-06-06.txt                    |  2 +-
 .../Vintage/2014-06-16.txt                    |  2 +-
 .../Vintage/2014-07-18.txt                    |  2 +-
 .../Vintage/2014-08-22.txt                    |  2 +-
 .../Vintage/2014-09-05.txt                    |  2 +-
 .../Vintage/2014-09-26.txt                    |  2 +-
 .../Vintage/2014-11-07.txt                    |  2 +-
 .../Vintage/2014-12-05.txt                    |  2 +-
 .../Vintage/2015-01-23.txt                    |  2 +-
 .../Vintage/2015-02-27.txt                    |  2 +-
 .../Vintage/2015-03-27.txt                    |  2 +-
 .../Vintage/2015-05-06.txt                    |  2 +-
 .../Vintage/2015-05-22.txt                    |  2 +-
 .../Vintage/2015-07-17.txt                    |  2 +-
 .../Vintage/2015-08-21.txt                    |  2 +-
 .../Vintage/2015-08-28.txt                    |  2 +-
 .../Vintage/2015-10-02.txt                    |  2 +-
 .../Vintage/2015-11-13.txt                    |  2 +-
 .../Vintage/2015-11-18.txt                    |  2 +-
 .../Vintage/2016-01-22.txt                    |  2 +-
 .../Vintage/2016-02-26.txt                    |  2 +-
 .../Vintage/2016-04-08.txt                    |  2 +-
 .../Vintage/2016-06-10.txt                    |  2 +-
 .../Vintage/2016-07-22.txt                    |  2 +-
 .../Vintage/2016-08-19.txt                    |  2 +-
 .../Vintage/2016-08-26.txt                    |  2 +-
 .../Vintage/2016-09-02.txt                    |  2 +-
 .../Vintage/2016-09-30.txt                    |  2 +-
 .../Vintage/2016-11-11.txt                    |  2 +-
 .../Vintage/2016-11-16.txt                    |  2 +-
 .../Vintage/2017-01-20.txt                    |  2 +-
 .../Vintage/2017-03-17.txt                    |  2 +-
 .../Vintage/2017-03-31.txt                    |  2 +-
 .../Vintage/2017-04-24.txt                    |  2 +-
 .../Vintage/2017-04-28.txt                    |  2 +-
 .../Vintage/2017-06-09.txt                    |  2 +-
 .../Vintage/2017-07-14.txt                    |  2 +-
 .../Vintage/2017-08-25.txt                    |  2 +-
 .../Vintage/2017-09-01.txt                    |  2 +-
 .../Vintage/2017-09-29.txt                    |  2 +-
 .../Vintage/2017-11-10.txt                    |  2 +-
 .../Vintage/2017-11-17.txt                    |  2 +-
 .../Vintage/2017-11-24.txt                    |  2 +-
 .../Vintage/2018-01-19.txt                    |  2 +-
 .../Vintage/2018-03-16.txt                    |  2 +-
 .../Vintage/2018-04-06.txt                    |  2 +-
 .../Vintage/2018-04-27.txt                    |  2 +-
 .../Vintage/2018-06-08.txt                    |  2 +-
 .../Vintage/2018-06-15.txt                    |  2 +-
 .../Vintage/2018-06-22.txt                    |  2 +-
 .../Vintage/2018-07-13.txt                    |  2 +-
 .../Vintage/2018-08-09.txt                    |  2 +-
 .../Vintage/2018-10-05.txt                    |  2 +-
 .../Vintage/2018-11-02.txt                    |  2 +-
 .../Vintage/2018-11-16.txt                    |  2 +-
 .../Vintage/2018-12-07.txt                    |  2 +-
 .../Vintage/2019-01-25.txt                    |  2 +-
 .../Vintage/2019-02-15.txt                    |  2 +-
 .../Vintage/2019-05-03.txt                    |  2 +-
 .../Vintage/2019-06-14.txt                    |  2 +-
 .../Vintage/2019-06-28.txt                    |  2 +-
 .../Vintage/2019-07-12.txt                    |  2 +-
 .../Vintage/2019-08-23.txt                    |  2 +-
 .../Vintage/2019-08-30.txt                    |  2 +-
 .../Vintage/2019-10-04.txt                    |  2 +-
 .../Vintage/2019-11-07.txt                    |  2 +-
 .../Vintage/2019-11-15.txt                    |  2 +-
 .../Vintage/2019-11-22.txt                    |  2 +-
 .../Vintage/2020-01-24.txt                    |  2 +-
 .../Vintage/2020-04-24.txt                    |  2 +-
 .../Vintage/2020-05-18.txt                    |  2 +-
 .../Vintage/2020-06-10.txt                    |  2 +-
 .../Vintage/2020-06-26.txt                    |  2 +-
 .../Vintage/2020-07-03.txt                    |  2 +-
 .../Vintage/2020-07-17.txt                    |  2 +-
 .../Vintage/2020-08-07.txt                    |  2 +-
 .../Vintage/2020-09-25.txt                    |  2 +-
 .../Vintage/2020-10-04.txt                    |  2 +-
 .../Vintage/2020-11-20.txt                    |  2 +-
 .../Vintage/2020-12-04.txt                    |  2 +-
 .../Vintage/2021-02-05.txt                    |  2 +-
 .../Vintage/2021-02-15.txt                    |  2 +-
 .../Vintage/2021-03-19.txt                    |  2 +-
 .../Vintage/2021-04-23.txt                    |  2 +-
 .../Vintage/2021-06-18.txt                    |  2 +-
 .../Vintage/2021-07-23.txt                    |  2 +-
 .../Vintage/2021-09-24.txt                    |  2 +-
 .../Vintage/2021-10-18.txt                    |  2 +-
 .../Vintage/2021-11-19.txt                    |  2 +-
 .../Vintage/2022-01-28.txt                    |  2 +-
 .../Vintage/2022-02-17.txt                    |  2 +-
 .../Vintage/2022-02-18.txt                    |  2 +-
 .../Vintage/2022-04-29.txt                    |  2 +-
 .../Vintage/2022-06-10.txt                    |  0
 .../res/formats/Block/Amonkhet Block.txt      |  2 +-
 .../Block/Battle for Zendikar Block.txt       |  2 +-
 forge-gui/res/formats/Block/Ice Age Block.txt |  2 +-
 .../Block/Innistrad-Avacyn Restored Block.txt |  2 +-
 .../res/formats/Block/Invasion Block.txt      |  2 +-
 forge-gui/res/formats/Block/Ixalan Block.txt  |  2 +-
 .../res/formats/Block/Kaladesh Block.txt      |  2 +-
 .../res/formats/Block/Kamigawa Block.txt      |  2 +-
 .../formats/Block/Khans of Tarkir Block.txt   |  2 +-
 .../formats/Block/Lorwyn-Shadowmoor Block.txt |  2 +-
 forge-gui/res/formats/Block/Masques Block.txt |  2 +-
 forge-gui/res/formats/Block/Mirage Block.txt  |  2 +-
 .../res/formats/Block/Mirrodin Block.txt      |  2 +-
 forge-gui/res/formats/Block/Odyssey Block.txt |  2 +-
 .../res/formats/Block/Onslaught Block.txt     |  2 +-
 forge-gui/res/formats/Block/Ravnica Block.txt |  2 +-
 .../formats/Block/Return to Ravnica Block.txt |  2 +-
 .../formats/Block/Scars of Mirrodin Block.txt |  2 +-
 .../Block/Shadows over Innistrad Block.txt    |  2 +-
 .../formats/Block/Shards of Alara Block.txt   |  2 +-
 forge-gui/res/formats/Block/Tempest Block.txt |  2 +-
 forge-gui/res/formats/Block/Theros Block.txt  |  2 +-
 .../res/formats/Block/Time Spiral Block.txt   |  2 +-
 forge-gui/res/formats/Block/Urza Block.txt    |  2 +-
 .../res/formats/Block/Zendikar Block.txt      |  2 +-
 forge-gui/res/formats/Casual/Conspiracy.txt   |  2 +-
 forge-gui/res/formats/Casual/Un-Sets.txt      |  2 +-
 forge-gui/res/formats/Sanctioned/Extended.txt |  2 +-
 forge-gui/res/languages/en-US.properties      | 10 +++----
 .../java/forge/deck/DeckImportController.java |  2 +-
 .../gamemodes/quest/StartingPoolType.java     |  2 +-
 .../properties/ForgePreferences.java          |  2 +-
 .../src/main/java/forge/model/FModel.java     |  2 +-
 962 files changed, 1000 insertions(+), 1000 deletions(-)
 rename forge-gui-mobile/src/forge/itemmanager/filters/{ArchiveFormatSelect.java => ArchivedFormatSelect.java} (92%)
 rename forge-gui/res/formats/{Archive => Archived}/.gitkeep (100%)
 rename forge-gui/res/formats/{Archive => Archived}/Alchemy/2021-12-09.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Alchemy/2022-02-10.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Alchemy/2022-03-17.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Alchemy/2022-04-28.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Alchemy/2022-06-02.txt (100%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2017-09-07.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-01-18.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-03-22.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-04-26.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-06-07.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-07-12.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-09-27.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2018-11-15.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-01-17.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-02-14.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-04-25.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-07-02.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-09-26.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-10-24.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2019-11-18.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-01-16.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-04-16.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-06-04.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-06-25.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-08-03.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-08-12.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-09-17.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-09-28.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2020-10-12.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2021-01-28.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2021-04-15.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2021-07-08.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2021-09-16.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2021-11-17.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2022-01-27.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2022-02-10.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2022-03-17.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Arena Standard/2022-04-28.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Amonkhet/2017-04-28.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Amonkhet/2017-07-14.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Battle for Zendikar/2015-10-02.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Battle for Zendikar/2016-01-22.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ice Age/1996-10-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ice Age/1997-05-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ice Age/1997-07-01.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ice Age/2006-08-20.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Innistrad/2011-09-30.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Innistrad/2012-02-03.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Innistrad/2012-04-02.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Innistrad/2012-05-04.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Invasion/2000-11-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Invasion/2001-03-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Invasion/2001-07-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ixalan/2017-09-29.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ixalan/2018-01-19.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Kaladesh/2016-09-30.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Kaladesh/2017-01-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Kamigawa/2004-10-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Kamigawa/2005-02-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Kamigawa/2005-06-20.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Khans of Tarkir/2014-09-26.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Khans of Tarkir/2015-01-23.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Khans of Tarkir/2015-03-27.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Lorwyn-Shadowmoor/2007-10-20.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Lorwyn-Shadowmoor/2008-02-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Lorwyn-Shadowmoor/2008-05-02.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Lorwyn-Shadowmoor/2008-07-25.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Masques/1999-11-01.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Masques/2000-03-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Masques/2000-07-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Mirage-Visions-Weatherlight/1997-07-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Mirrodin/2003-10-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Mirrodin/2004-02-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Mirrodin/2004-06-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Mirrodin/2006-02-20.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Odyssey/2001-11-01.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Odyssey/2002-03-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Odyssey/2002-07-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Onslaught/2002-11-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Onslaught/2003-03-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Onslaught/2003-07-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Rath Cycle/1997-11-01.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Rath Cycle/1998-04-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Rath Cycle/1998-07-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ravnica/2005-10-20.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ravnica/2006-02-20.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Ravnica/2006-05-20.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Return to Ravnica/2012-10-05.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Return to Ravnica/2013-02-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Return to Ravnica/2013-05-03.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Scars of Mirrodin/2010-10-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Scars of Mirrodin/2011-02-04.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Scars of Mirrodin/2011-05-13.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Shadows over Innistrad/2016-04-08.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Shadows over Innistrad/2016-07-22.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Shards of Alara/2008-10-03.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Shards of Alara/2009-02-06.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Shards of Alara/2009-04-30.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Theros/2013-09-27.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Theros/2014-02-07.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Theros/2014-05-02.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Time Spiral/2006-10-20.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Time Spiral/2007-02-20.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Time Spiral/2007-05-20.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Urza/1999-01-01.txt (84%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Urza/1999-03-01.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Urza/1999-04-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Urza/1999-07-01.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Zendikar/2009-10-02.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Zendikar/2010-02-05.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Block/Zendikar/2010-04-23.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Explorer/2022-04-21.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Explorer/2022-04-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1997-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1997-10-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1997-11-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1998-04-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1998-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1998-11-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-01-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-03-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-04-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-06-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-09-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-10-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/1999-11-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2000-03-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2000-04-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2000-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2000-11-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2001-03-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2001-04-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2001-05-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2001-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2001-11-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2002-03-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2002-07-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2002-11-01.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2003-03-01.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2003-07-01.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2003-09-01.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2003-10-01.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2003-10-20.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2004-01-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2004-02-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2004-06-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2004-09-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2004-10-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2005-02-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2005-06-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2005-08-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2005-09-20.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2005-10-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2006-02-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2006-05-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2006-08-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2006-10-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2007-02-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2007-05-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2007-07-20.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2007-10-20.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2008-02-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2008-05-02.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2008-07-25.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2008-09-20.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2008-10-03.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2009-02-06.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2009-04-30.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2009-07-17.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2009-10-02.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2010-02-05.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2010-04-23.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2010-07-01.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2010-07-16.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2010-10-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2011-02-04.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2011-05-13.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2011-07-15.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2011-09-30.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2011-10-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2012-02-03.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2012-05-04.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2012-07-13.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2012-10-05.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2013-02-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2013-05-03.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2013-07-19.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Extended/2013-09-27.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2019-11-21.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-01-16.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-03-09.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-03-12.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-04-16.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-05-21.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-06-25.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-07-13.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-07-17.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-08-13.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-08-24.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-09-17.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-10-12.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2020-11-12.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-01-28.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-02-15.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-03-11.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-04-15.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-05-19.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-05-27.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-06-09.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-07-08.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-08-26.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-09-16.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-10-13.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-11-17.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2021-12-09.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-01-25.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-02-10.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-02-24.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-03-17.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-04-28.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Historic/2022-06-02.txt (100%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1996-05-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1996-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1996-07-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1996-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1996-11-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1997-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1997-03-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1997-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1997-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1997-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1998-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1998-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1998-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-06-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/1999-11-12.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2000-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2000-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2000-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2000-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2001-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2001-05-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2001-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2001-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2001-12-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2002-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2002-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2002-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2002-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2003-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2003-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2003-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2003-09-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2003-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2004-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2004-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2004-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2004-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2004-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2005-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2005-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2005-08-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2005-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2005-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2006-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2006-05-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2006-08-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2006-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-05-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-07-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-09-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2007-11-16.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-02-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-05-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-07-25.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-08-29.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-09-22.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-10-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2008-11-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-02-06.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-04-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-04-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-07-17.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-08-26.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-08-28.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-09-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-10-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-10-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2009-11-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-02-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-03-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-06-04.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-07-16.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-08-27.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-09-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-10-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-11-08.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2010-11-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-01-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-01-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-02-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-04-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-05-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-05-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-06-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-07-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-08-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-09-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-09-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-10-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2011-11-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-02-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-03-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-05-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-06-29.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-07-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-08-31.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-09-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-10-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2012-11-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-02-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-03-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-05-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-06-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-07-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-08-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-09-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-09-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2013-11-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-02-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-03-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-05-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-05-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-06-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-06-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-07-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-08-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-09-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-09-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-11-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2014-12-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-01-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-02-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-03-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-05-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-05-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-07-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-08-21.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-08-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-10-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-11-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2015-11-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-01-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-02-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-04-08.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-06-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-07-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-08-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-08-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-09-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-09-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-11-11.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2016-11-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-01-20.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-03-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-03-31.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-04-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-04-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-06-09.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-07-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-08-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-09-29.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-11-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-11-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2017-11-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-01-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-03-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-04-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-04-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-06-08.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-06-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-06-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-07-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-07-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-08-09.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-10-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-11-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-11-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2018-12-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-01-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-02-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-05-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-06-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-06-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-07-12.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-08-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-10-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-11-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-11-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2019-11-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-01-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-03-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-04-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-05-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-06-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-06-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-07-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-07-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-08-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-09-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-10-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-11-20.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2020-12-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-02-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-02-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-03-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-04-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-06-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-07-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-09-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-10-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2021-11-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-01-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-01-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-02-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-02-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-04-29.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Legacy/2022-06-10.txt (100%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2011-05-19.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2011-07-15.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2011-08-12.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2011-09-30.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2011-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-02-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-05-04.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-07-13.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2012-10-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2013-02-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2013-05-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2013-06-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2013-07-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2013-09-27.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2014-02-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2014-05-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2014-05-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2014-07-18.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2014-09-26.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2015-01-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2015-03-27.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2015-05-22.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2015-07-17.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2015-10-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2016-01-22.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2016-04-08.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2016-07-22.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2016-09-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-01-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-03-17.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-04-15.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-04-28.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-07-14.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2017-09-29.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-01-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-02-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-04-27.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-07-13.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-10-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-11-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2018-11-16.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-01-25.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-02-15.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-05-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-06-14.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-07-12.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-08-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2019-10-04.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-01-14.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-01-24.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-03-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-04-24.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-07-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-07-13.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2020-09-25.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-02-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-02-15.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-03-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-06-18.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-07-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-09-24.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2021-11-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2022-01-28.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2022-02-18.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2022-03-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Modern/2022-04-29.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pauper/2019-05-24.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Pauper/2019-10-25.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Pauper/2020-01-14.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Pauper/2020-07-13.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2019-10-21.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2019-11-08.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2019-11-12.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2019-12-03.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2019-12-17.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-01-24.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-04-24.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-07-03.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-07-13.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-08-03.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2020-09-25.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-02-05.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-02-15.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-07-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-09-24.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2021-11-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2022-01-28.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2022-02-18.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2022-03-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2022-04-29.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Pioneer/2022-06-07.txt (100%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-01-10.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-04-19.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-06-03.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-07-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-11-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1995-11-13.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-02-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-04-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-07-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-07-10.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-10-01.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1996-11-07.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1997-01-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1997-03-05.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1997-04-23.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1997-07-01.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1997-11-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1998-04-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1998-07-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1998-11-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-01-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-03-01.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-04-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-06-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-07-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/1999-11-01.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2000-03-01.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2000-07-01.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2000-11-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2001-03-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2001-05-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2001-07-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2001-11-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2002-03-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2002-07-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2002-11-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2003-03-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2003-07-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2003-09-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2003-10-20.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2004-02-20.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2004-06-20.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2004-10-20.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2005-02-20.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2005-03-20.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2005-06-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2005-08-20.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2005-10-20.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2006-02-20.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2006-05-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2006-08-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2006-10-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2007-02-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2007-05-20.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2007-07-20.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2007-10-20.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2008-02-01.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2008-05-02.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2008-07-25.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2008-10-03.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2009-02-06.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2009-04-30.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2009-07-17.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2009-10-02.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2010-02-05.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2010-04-23.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2010-07-16.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2010-10-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2011-02-04.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2011-05-13.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2011-07-01.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2011-07-15.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2011-09-30.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2012-02-03.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2012-05-04.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2012-07-13.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2012-10-05.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2013-02-01.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2013-05-03.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2013-07-19.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2013-09-27.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2014-02-07.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2014-05-02.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2014-07-18.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2014-09-26.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2015-01-23.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2015-03-27.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2015-07-17.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2015-10-02.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2016-01-22.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2016-04-08.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2016-07-22.txt (88%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2016-09-30.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2017-01-20.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2017-04-28.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2017-06-19.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2017-07-14.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2017-09-29.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2018-01-19.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2018-04-27.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2018-07-13.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2018-10-05.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2018-11-16.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-01-25.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-05-03.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-07-12.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-08-30.txt (89%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-10-04.txt (87%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-10-25.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2019-11-22.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-01-24.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-04-24.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-06-01.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-07-03.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-08-03.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-09-25.txt (92%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-09-28.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2020-10-12.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2021-02-05.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2021-04-23.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2021-07-23.txt (95%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2021-09-24.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2021-11-19.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2022-01-25.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2022-02-18.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/2022-04-29.txt (93%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2018-06-22.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2018-07-13.txt (94%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2018-10-05.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2018-11-16.txt (90%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2019-01-25.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2019-05-03.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2019-07-12.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Standard/China/2019-08-30.txt (91%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1993-08-05.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1993-10-04.txt (85%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1993-12-01.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1993-12-17.txt (86%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-01-26.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-02-23.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-03-04.txt (96%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-03-23.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-04-01.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-05-02.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-06-10.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-06-13.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-07-15.txt (97%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-08-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-08-08.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-10-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1994-11-15.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-01-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-04-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-06-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1995-11-13.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1996-02-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1996-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1996-07-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1996-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1996-11-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1997-03-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1997-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1997-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1997-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1997-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1998-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1998-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1998-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1998-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-06-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/1999-11-12.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2000-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2000-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2000-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2000-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2001-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2001-05-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2001-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2001-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2001-12-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2002-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2002-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2002-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2002-11-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2003-03-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2003-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2003-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2003-09-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2003-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-01-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2004-12-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-03-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-08-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2005-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2006-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2006-05-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2006-08-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2006-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-02-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-05-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-07-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-09-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-10-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2007-11-16.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-02-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-05-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-06-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-07-25.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-08-29.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-09-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-09-22.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-10-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2008-11-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-02-06.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-04-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-04-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-07-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-07-17.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-08-26.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-08-28.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-09-07.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-10-02.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-10-30.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2009-11-20.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-02-05.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-03-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-04-23.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-06-04.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-07-16.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-08-27.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-09-03.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-10-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-11-08.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2010-11-19.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-01-10.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-02-04.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-04-01.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-05-13.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-05-14.txt (98%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-06-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-07-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-08-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-09-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-09-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-10-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2011-11-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-02-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-03-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-05-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-07-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-08-31.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-09-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-10-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-10-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2012-11-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-02-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-03-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-05-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-06-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-07-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-08-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-09-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-09-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2013-11-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-02-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-03-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-05-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-05-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-06-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-06-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-07-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-08-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-09-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-09-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-11-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2014-12-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-01-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-02-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-03-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-05-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-05-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-07-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-08-21.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-08-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-10-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-11-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2015-11-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-01-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-02-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-04-08.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-06-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-07-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-08-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-08-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-09-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-09-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-11-11.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2016-11-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-01-20.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-03-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-03-31.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-04-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-04-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-06-09.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-07-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-08-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-09-01.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-09-29.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-11-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-11-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2017-11-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-01-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-03-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-04-06.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-04-27.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-06-08.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-06-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-06-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-07-13.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-08-09.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-10-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-11-02.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-11-16.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2018-12-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-01-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-02-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-05-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-06-14.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-06-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-07-12.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-08-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-08-30.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-10-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-11-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-11-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2019-11-22.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-01-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-04-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-05-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-06-10.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-06-26.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-07-03.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-07-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-08-07.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-09-25.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-10-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-11-20.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2020-12-04.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-02-05.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-02-15.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-03-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-04-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-06-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-07-23.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-09-24.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-10-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2021-11-19.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2022-01-28.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2022-02-17.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2022-02-18.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2022-04-29.txt (99%)
 rename forge-gui/res/formats/{Archive => Archived}/Vintage/2022-06-10.txt (100%)

diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index 6c6a0b03ad0..6cbf44598c0 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -48,7 +48,7 @@ public class GameFormat implements Comparable<GameFormat> {
     public enum FormatType {
         SANCTIONED,
         CASUAL,
-        ARCHIVE,
+        ARCHIVED,
         DIGITAL,
         CUSTOM
     }
@@ -290,7 +290,7 @@ public class GameFormat implements Comparable<GameFormat> {
         if (other.formatSubType != formatSubType){
             return formatSubType.compareTo(other.formatSubType);
         }
-        if (formatType.equals(FormatType.ARCHIVE)){
+        if (formatType.equals(FormatType.ARCHIVED)){
             int compareDates = this.effectiveDate.compareTo(other.effectiveDate);
             if (compareDates != 0)
                 return compareDates;
@@ -306,7 +306,7 @@ public class GameFormat implements Comparable<GameFormat> {
 
     public static class Reader extends StorageReaderRecursiveFolderWithUserFolder<GameFormat> {
         List<GameFormat> naturallyOrdered = new ArrayList<>();
-        boolean includeArchive;
+        boolean includeArchived;
         private List<String> coreFormats = new ArrayList<>();
         {
             coreFormats.add("Standard.txt");
@@ -321,14 +321,14 @@ public class GameFormat implements Comparable<GameFormat> {
             coreFormats.add("Oathbreaker.txt");
         }
         
-        public Reader(File forgeFormats, File customFormats, boolean includeArchive) {
+        public Reader(File forgeFormats, File customFormats, boolean includeArchived) {
             super(forgeFormats, customFormats, GameFormat.FN_GET_NAME);
-            this.includeArchive=includeArchive;
+            this.includeArchived=includeArchived;
         }
 
         @Override
         protected GameFormat read(File file) {
-            if (!includeArchive && !coreFormats.contains(file.getName())) {
+            if (!includeArchived && !coreFormats.contains(file.getName())) {
                 return null;
             }
             final Map<String, List<String>> contents = FileSection.parseSections(FileUtil.readFile(file));
@@ -450,7 +450,7 @@ public class GameFormat implements Comparable<GameFormat> {
         public Iterable<GameFormat> getFilterList() {
             List<GameFormat> coreList = new ArrayList<>();
             for (GameFormat format: naturallyOrdered) {
-                if (!format.getFormatType().equals(FormatType.ARCHIVE)
+                if (!format.getFormatType().equals(FormatType.ARCHIVED)
                         &&!format.getFormatType().equals(FormatType.DIGITAL)){
                     coreList.add(format);
                 }
@@ -458,10 +458,10 @@ public class GameFormat implements Comparable<GameFormat> {
             return coreList;
         }
 
-        public Iterable<GameFormat> getArchiveList() {
+        public Iterable<GameFormat> getArchivedList() {
             List<GameFormat> coreList = new ArrayList<>();
             for (GameFormat format: naturallyOrdered) {
-                if (format.getFormatType().equals(FormatType.ARCHIVE)){
+                if (format.getFormatType().equals(FormatType.ARCHIVED)){
                     coreList.add(format);
                 }
             }
@@ -470,7 +470,7 @@ public class GameFormat implements Comparable<GameFormat> {
 
         public Iterable<GameFormat> getBlockList() {
             List<GameFormat> blockFormats = new ArrayList<>();
-            for (GameFormat format : this.getArchiveList()){
+            for (GameFormat format : this.getArchivedList()){
                 if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK)
                     continue;
                 if (!format.getName().endsWith("Block"))
@@ -481,10 +481,10 @@ public class GameFormat implements Comparable<GameFormat> {
             return blockFormats;
         }
 
-        public Map<String, List<GameFormat>> getArchiveMap() {
+        public Map<String, List<GameFormat>> getArchivedMap() {
             Map<String, List<GameFormat>> coreList = new HashMap<>();
             for (GameFormat format: naturallyOrdered){
-                if (format.getFormatType().equals(FormatType.ARCHIVE)){
+                if (format.getFormatType().equals(FormatType.ARCHIVED)){
                     String alpha = format.getName().substring(0,1);
                     if (!coreList.containsKey(alpha)) {
                         coreList.put(alpha,new ArrayList<>());
@@ -557,7 +557,7 @@ public class GameFormat implements Comparable<GameFormat> {
                     //exclude Commander format as other deck checks are not performed here
                     continue;
                 }
-                if (gf.getFormatType().equals(FormatType.ARCHIVE) && coveredTypes.contains(gf.getFormatSubType())
+                if (gf.getFormatType().equals(FormatType.ARCHIVED) && coveredTypes.contains(gf.getFormatSubType())
                         && !exhaustive){
                     //exclude duplicate formats - only keep first of e.g. Standard archived
                     continue;
@@ -590,7 +590,7 @@ public class GameFormat implements Comparable<GameFormat> {
             if (gf2.formatSubType != gf1.formatSubType){
                 return gf1.formatSubType.compareTo(gf2.formatSubType);
             }
-            if (gf1.formatType.equals(FormatType.ARCHIVE)){
+            if (gf1.formatType.equals(FormatType.ARCHIVED)){
                 if (gf1.effectiveDate!=gf2.effectiveDate) {//for matching dates or default dates default to name sorting
                     return gf1.effectiveDate.compareTo(gf2.effectiveDate);
                 }
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
index 86b96750530..f045ea88793 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
@@ -216,7 +216,7 @@ public class CardManager extends ItemManager<PaperCard> {
         }
         menu.add(world);
 
-        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
+        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVED_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
             final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
index 6edc7a238aa..03e156e1c35 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java
@@ -279,7 +279,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
         }
         menu.add(world);
 
-        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
+        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVED_FORMATS)) {
             JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock"));
             final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
             for (final GameFormat f : blockFormats) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
index 1e61796d36c..b277da7d749 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java
@@ -42,7 +42,7 @@ public class DialogChooseFormats {
 
 		List<FCheckBox> sanctioned = new ArrayList<>();
 		List<FCheckBox> casual = new ArrayList<>();
-		List<FCheckBox> archive = new ArrayList<>();
+		List<FCheckBox> archived = new ArrayList<>();
 
 		for (GameFormat format : FModel.getFormats().getOrderedList()){
 			FCheckBox box = new FCheckBox(format.getName());
@@ -51,8 +51,8 @@ public class DialogChooseFormats {
 				case SANCTIONED:
 					sanctioned.add(box);
 					break;
-				case ARCHIVE:
-					archive.add(box);
+				case ARCHIVED:
+					archived.add(box);
 					break;
 				case CUSTOM:
 				case CASUAL:
@@ -74,7 +74,7 @@ public class DialogChooseFormats {
 		String constraints = "aligny top";
 		panel.add(makeCheckBoxList(sanctioned, localizer.getMessage("lblSanctioned"), true), constraints);
 		panel.add(makeCheckBoxList(casual, localizer.getMessage("lblOther"), false), constraints);
-		panel.add(makeCheckBoxList(archive, localizer.getMessage("lblArchive"), false), constraints);
+		panel.add(makeCheckBoxList(archived, localizer.getMessage("lblArchived"), false), constraints);
 
 		final JPanel overlay = FOverlay.SINGLETON_INSTANCE.getPanel();
 		overlay.setLayout(new MigLayout("insets 0, gap 0, wrap, ax center, ay center"));
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
index 4f90a2fe0bc..b9caefe73ef 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/CSubmenuPreferences.java
@@ -167,7 +167,7 @@ public enum CSubmenuPreferences implements ICDoc {
 
         lstControls.add(Pair.of(view.getCbFilterLandsByColorId(), FPref.UI_FILTER_LANDS_BY_COLOR_IDENTITY));
         lstControls.add(Pair.of(view.getCbLoadCardsLazily(), FPref.LOAD_CARD_SCRIPTS_LAZILY));
-        lstControls.add(Pair.of(view.getCbLoadArchiveFormats(), FPref.LOAD_ARCHIVE_FORMATS));
+        lstControls.add(Pair.of(view.getCbLoadArchivedFormats(), FPref.LOAD_ARCHIVED_FORMATS));
         lstControls.add(Pair.of(view.getCbSmartCardArtSelectionOpt(), FPref.UI_SMART_CARD_ART));
         lstControls.add(Pair.of(view.getCbShowDraftRanking(), FPref.UI_OVERLAY_DRAFT_RANKING));
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
index c6f2e929103..0ca149a8395 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java
@@ -72,7 +72,7 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     private final JCheckBox cbManaLostPrompt = new OptionsCheckBox(localizer.getMessage("cbManaLostPrompt"));
     private final JCheckBox cbDevMode = new OptionsCheckBox(localizer.getMessage("cbDevMode"));
     private final JCheckBox cbLoadCardsLazily = new OptionsCheckBox(localizer.getMessage("cbLoadCardsLazily"));
-    private final JCheckBox cbLoadArchiveFormats = new OptionsCheckBox(localizer.getMessage("cbLoadArchiveFormats"));
+    private final JCheckBox cbLoadArchivedFormats = new OptionsCheckBox(localizer.getMessage("cbLoadArchivedFormats"));
     private final JCheckBox cbWorkshopSyntax = new OptionsCheckBox(localizer.getMessage("cbWorkshopSyntax"));
     private final JCheckBox cbEnforceDeckLegality = new OptionsCheckBox(localizer.getMessage("cbEnforceDeckLegality"));
     private final JCheckBox cbSideboardForAI = new OptionsCheckBox(localizer.getMessage("cbSideboardForAI"));
@@ -322,8 +322,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
         pnlPrefs.add(cbLoadCardsLazily, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadCardsLazily")), descriptionConstraints);
 
-        pnlPrefs.add(cbLoadArchiveFormats, titleConstraints);
-        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadArchiveFormats")), descriptionConstraints);
+        pnlPrefs.add(cbLoadArchivedFormats, titleConstraints);
+        pnlPrefs.add(new NoteLabel(localizer.getMessage("nlLoadArchivedFormats")), descriptionConstraints);
 
         pnlPrefs.add(cbEnableUnknownCards, titleConstraints);
         pnlPrefs.add(new NoteLabel(localizer.getMessage("nlEnableUnknownCards")), descriptionConstraints);
@@ -741,8 +741,8 @@ public enum VSubmenuPreferences implements IVSubmenu<CSubmenuPreferences> {
     }
 
     /** @return {@link javax.swing.JCheckBox} */
-    public JCheckBox getCbLoadArchiveFormats() {
-        return cbLoadArchiveFormats;
+    public JCheckBox getCbLoadArchivedFormats() {
+        return cbLoadArchivedFormats;
     }
 
     public JCheckBox getCbWorkshopSyntax() {
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
similarity index 92%
rename from forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java
rename to forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
index 0d30797779b..cb3d1d6ec26 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/ArchiveFormatSelect.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/ArchivedFormatSelect.java
@@ -22,22 +22,22 @@ import forge.util.Utils;
 /**
  * Created by maustin on 16/04/2018.
  */
-public class ArchiveFormatSelect extends FScreen {
+public class ArchivedFormatSelect extends FScreen {
 
     private GameFormat selectedFormat;
     private final FGroupList<GameFormat> lstFormats = add(new FGroupList<>());
-    private final Set<GameFormat.FormatSubType> archiveSubTypes = new HashSet<>(Arrays.asList(GameFormat.FormatSubType.BLOCK,
+    private final Set<GameFormat.FormatSubType> archivedSubTypes = new HashSet<>(Arrays.asList(GameFormat.FormatSubType.BLOCK,
             GameFormat.FormatSubType.STANDARD,GameFormat.FormatSubType.EXTENDED,GameFormat.FormatSubType.MODERN,
             GameFormat.FormatSubType.LEGACY, GameFormat.FormatSubType.VINTAGE));
 
     private Runnable onCloseCallBack;
 
-    public ArchiveFormatSelect() {
+    public ArchivedFormatSelect() {
         super(Forge.getLocalizer().getMessage("lblChooseFormat"));
         for (GameFormat.FormatType group:GameFormat.FormatType.values()){
-            if (group == GameFormat.FormatType.ARCHIVE){
+            if (group == GameFormat.FormatType.ARCHIVED){
                 for (GameFormat.FormatSubType subgroup:GameFormat.FormatSubType.values()){
-                    if (archiveSubTypes.contains(subgroup)){
+                    if (archivedSubTypes.contains(subgroup)){
                         lstFormats.addGroup(group.name() + "-" + subgroup.name());
                     }
                 }
@@ -53,7 +53,7 @@ public class ArchiveFormatSelect extends FScreen {
                 case CASUAL:
                     lstFormats.addItem(format, 1);
                     break;
-                case ARCHIVE:
+                case ARCHIVED:
                     switch (format.getFormatSubType()){
                         case BLOCK:
                             lstFormats.addItem(format, 2);
diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
index 564a6120584..0db437ac335 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
@@ -66,16 +66,16 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
                     preventHandling = true;
                     cbxFormats.setText(selectedFormat); //restore previous selection by default
                     preventHandling = false;
-                    ArchiveFormatSelect archiveFormatSelect = new ArchiveFormatSelect();
-                    archiveFormatSelect.setOnCloseCallBack(new Runnable(){
+                    ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
+                    archivedFormatSelect.setOnCloseCallBack(new Runnable(){
                         @Override
                         public void run() {
-                            format = archiveFormatSelect.getSelectedFormat();
+                            format = archivedFormatSelect.getSelectedFormat();
                             cbxFormats.setText(format.getName());
                             applyChange();
                         }
                     });
-                    Forge.openScreen(archiveFormatSelect);
+                    Forge.openScreen(archivedFormatSelect);
                 }
                 else if (index == cbxFormats.getItemCount() - 1) {
                     preventHandling = true;
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index 834f29159a8..56eeeff4e54 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -31,7 +31,7 @@ import forge.gui.UiCommand;
 import forge.gui.util.SOptionPane;
 import forge.item.PaperCard;
 import forge.item.PreconDeck;
-import forge.itemmanager.filters.ArchiveFormatSelect;
+import forge.itemmanager.filters.ArchivedFormatSelect;
 import forge.localinstance.properties.ForgeConstants;
 import forge.model.CardCollections;
 import forge.model.FModel;
@@ -301,13 +301,13 @@ public class NewQuestScreen extends FScreen {
         btnSelectFormat.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                ArchiveFormatSelect archiveFormatSelect = new ArchiveFormatSelect();
-                archiveFormatSelect.setOnCloseCallBack(new Runnable() {
+                ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
+                archivedFormatSelect.setOnCloseCallBack(new Runnable() {
                     @Override
                     public void run() {
                         customFormatCodes.clear();
-                        btnSelectFormat.setText(archiveFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = archiveFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                        btnSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
+                        List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
                         for (String setName:setsToAdd){
                             if(!unselectableSets.contains(setName)){
                                 customFormatCodes.add(setName);
@@ -315,20 +315,20 @@ public class NewQuestScreen extends FScreen {
                         }
                     }
                 });
-                Forge.openScreen(archiveFormatSelect);
+                Forge.openScreen(archivedFormatSelect);
             }
         });
 
         btnPrizeSelectFormat.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                ArchiveFormatSelect  archiveFormatSelect = new ArchiveFormatSelect();
-                archiveFormatSelect.setOnCloseCallBack(new Runnable() {
+                ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
+                archivedFormatSelect.setOnCloseCallBack(new Runnable() {
                     @Override
                     public void run() {
                         customPrizeFormatCodes.clear();
-                        btnPrizeSelectFormat.setText(archiveFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = archiveFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                        btnPrizeSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
+                        List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
                         for (String setName:setsToAdd){
                             if(!unselectableSets.contains(setName)){
                                 customPrizeFormatCodes.add(setName);
@@ -336,7 +336,7 @@ public class NewQuestScreen extends FScreen {
                         }
                     }
                 });
-                Forge.openScreen(archiveFormatSelect);
+                Forge.openScreen(archivedFormatSelect);
             }
         });
 
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index 02bac950ecd..5a64fe146db 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -362,9 +362,9 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                 Forge.getLocalizer().getMessage("cbLoadCardsLazily"),
                 Forge.getLocalizer().getMessage("nlLoadCardsLazily")),
                 3);
-        lstSettings.addItem(new BooleanSetting(FPref.LOAD_ARCHIVE_FORMATS,
-                Forge.getLocalizer().getMessage("cbLoadArchiveFormats"),
-                Forge.getLocalizer().getMessage("nlLoadArchiveFormats")),
+        lstSettings.addItem(new BooleanSetting(FPref.LOAD_ARCHIVED_FORMATS,
+                Forge.getLocalizer().getMessage("cbLoadArchivedFormats"),
+                Forge.getLocalizer().getMessage("nlLoadArchivedFormats")),
                 3);
         lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS,
                 Forge.getLocalizer().getMessage("lblEnableUnknownCards"),
diff --git a/forge-gui/res/formats/Archive/.gitkeep b/forge-gui/res/formats/Archived/.gitkeep
similarity index 100%
rename from forge-gui/res/formats/Archive/.gitkeep
rename to forge-gui/res/formats/Archived/.gitkeep
diff --git a/forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt b/forge-gui/res/formats/Archived/Alchemy/2021-12-09.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt
rename to forge-gui/res/formats/Archived/Alchemy/2021-12-09.txt
index adae6129bad..7915a13160e 100644
--- a/forge-gui/res/formats/Archive/Alchemy/2021-12-09.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2021-12-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (2021-12-09)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-12-09
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID
diff --git a/forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt b/forge-gui/res/formats/Archived/Alchemy/2022-02-10.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt
rename to forge-gui/res/formats/Archived/Alchemy/2022-02-10.txt
index 4997978d9c3..d923a432094 100644
--- a/forge-gui/res/formats/Archive/Alchemy/2022-02-10.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-02-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (NEO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-02-10
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO
diff --git a/forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt b/forge-gui/res/formats/Archived/Alchemy/2022-03-17.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt
rename to forge-gui/res/formats/Archived/Alchemy/2022-03-17.txt
index 44cd656164a..067c4f357e2 100644
--- a/forge-gui/res/formats/Archive/Alchemy/2022-03-17.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (YNEO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-03-17
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO
diff --git a/forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt b/forge-gui/res/formats/Archived/Alchemy/2022-04-28.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt
rename to forge-gui/res/formats/Archived/Alchemy/2022-04-28.txt
index e4b8a4a2e44..d4d18e77d40 100644
--- a/forge-gui/res/formats/Archive/Alchemy/2022-04-28.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (SNC)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-04-28
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC
diff --git a/forge-gui/res/formats/Archive/Alchemy/2022-06-02.txt b/forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt
similarity index 100%
rename from forge-gui/res/formats/Archive/Alchemy/2022-06-02.txt
rename to forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt b/forge-gui/res/formats/Archived/Arena Standard/2017-09-07.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2017-09-07.txt
index e5e7c60cc43..e5bdd6a3bf8 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2017-09-07.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2017-09-07.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2017-09-07)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2017-09-07
 Sets:XLN
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-01-18.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-01-18.txt
index 41646a03bd6..4e807547192 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-01-18.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-01-18.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (RIX)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-01-18
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-03-22.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-03-22.txt
index a182c6a453d..452542206ef 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-03-22.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-03-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (AKH/HOU)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-03-22
 Sets:XLN, RIX, AKH, HOU
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-04-26.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-04-26.txt
index ac06f25ec2c..eac3d6e70ef 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-04-26.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-04-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (DOM)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-04-26
 Sets:XLN, RIX, AKH, HOU, DOM
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-06-07.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-06-07.txt
index fb1b09a1d2a..5593323a45e 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-06-07.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-06-07.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (KLD/AER)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-06-07
 Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-07-12.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-07-12.txt
index 8fe6958013c..09fa9baf1d1 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-07-12.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-07-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M19)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-07-12
 Sets:XLN, RIX, AKH, HOU, DOM, KLD, AER, W17, M19, ANA, PANA
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-09-27.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-09-27.txt
index 819dc16bbb2..ce8b3035a00 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-09-27.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-09-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (GRN)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-09-27
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt b/forge-gui/res/formats/Archived/Arena Standard/2018-11-15.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2018-11-15.txt
index f0d911facb0..60b2d19a7c6 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2018-11-15.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2018-11-15.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (G18)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2018-11-15
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-01-17.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-01-17.txt
index 455764bfb24..3c042338818 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-01-17.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-01-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (RNA)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-01-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-02-14.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-02-14.txt
index 6470cd52165..bf9f8843a27 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-02-14.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-02-14.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-02-14)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-02-14
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-04-25.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-04-25.txt
index ec249a99bb2..252795c24e5 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-04-25.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-04-25.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (WAR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-04-25
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-07-02.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-07-02.txt
index ac07c0e028c..fcc24947338 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-07-02.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-07-02.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M20)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-07-02
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-09-26.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-09-26.txt
index a4cd2d9ab13..8daadb60888 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-09-26.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-09-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ELD)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-09-26
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-10-24.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-10-24.txt
index b2b6fed0267..cf403272c9b 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-10-24.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-10-24.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-10-24)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-10-24
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt b/forge-gui/res/formats/Archived/Arena Standard/2019-11-18.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2019-11-18.txt
index 1658128ce4a..90a9553c8f3 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2019-11-18.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2019-11-18.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2019-11-18)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-11-18
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-01-16.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-01-16.txt
index 7c58403ac64..086b22828bb 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-01-16.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-01-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (THB)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-01-16
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-04-16.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-04-16.txt
index eb416bc9d03..571a93320c9 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-04-16.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-04-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (IKO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-04-16
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-06-04.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-06-04.txt
index 17c7be45582..831c7c9dcc8 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-06-04.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-06-04.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-06-04)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-06-04
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-06-25.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-06-25.txt
index 0ae58ee9a6a..733e12b9d73 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-06-25.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-06-25.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (M21)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-06-25
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-08-03.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-08-03.txt
index 3207e1566ed..9f24859f630 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-08-03.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-08-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-08-03)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-08-03
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-08-12.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-08-12.txt
index 80fe06232e3..511e90ddb83 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-08-12.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-08-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ANB)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-08-12
 Sets:ANA, PANA, GRN, RNA, WAR, M20, ELD, THB, IKO, M21, ANB
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-09-17.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-09-17.txt
index 4ac0ac0fc8c..4a7dba8ffc1 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-09-17.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-09-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-09-17
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-09-28.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-09-28.txt
index a69d8b28086..5712b9eba40 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-09-28.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-09-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-09-28)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-09-28
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt b/forge-gui/res/formats/Archived/Arena Standard/2020-10-12.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2020-10-12.txt
index 4317233df69..689fa045d45 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2020-10-12.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2020-10-12.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2020-10-12)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-10-12
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt b/forge-gui/res/formats/Archived/Arena Standard/2021-01-28.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2021-01-28.txt
index d589e4305dc..54f77a42012 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2021-01-28.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2021-01-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (KHM)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-01-28
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt b/forge-gui/res/formats/Archived/Arena Standard/2021-04-15.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2021-04-15.txt
index 6b0629d794a..5c247e108f2 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2021-04-15.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2021-04-15.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (STX)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-04-15
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt b/forge-gui/res/formats/Archived/Arena Standard/2021-07-08.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2021-07-08.txt
index d74273acd6b..6ff2c5a789e 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2021-07-08.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2021-07-08.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (AFR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-07-08
 Sets:ANA, PANA, ELD, THB, IKO, M21, ANB, ZNR, KHM, STX, AFR
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt b/forge-gui/res/formats/Archived/Arena Standard/2021-09-16.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2021-09-16.txt
index 998a3863b53..c3b85a22eb3 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2021-09-16.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2021-09-16.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (MID)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-09-16
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt b/forge-gui/res/formats/Archived/Arena Standard/2021-11-17.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2021-11-17.txt
index bbab0eaf3c5..56a81bb97db 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2021-11-17.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2021-11-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (VOW)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-11-17
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt b/forge-gui/res/formats/Archived/Arena Standard/2022-01-27.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2022-01-27.txt
index bc6c9747365..047d94ea57c 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2022-01-27.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2022-01-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2022-01-27)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-01-27
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt b/forge-gui/res/formats/Archived/Arena Standard/2022-02-10.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2022-02-10.txt
index ea30a56ebba..d3718b6dfe4 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2022-02-10.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2022-02-10.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (NEO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-02-10
 Sets:ANA, PANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt b/forge-gui/res/formats/Archived/Arena Standard/2022-03-17.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2022-03-17.txt
index e19e8236863..441c7b7e60b 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2022-03-17.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2022-03-17.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (2022-03-17)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-03-17
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt b/forge-gui/res/formats/Archived/Arena Standard/2022-04-28.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt
rename to forge-gui/res/formats/Archived/Arena Standard/2022-04-28.txt
index 057c1ef2238..8d56366d209 100644
--- a/forge-gui/res/formats/Archive/Arena Standard/2022-04-28.txt	
+++ b/forge-gui/res/formats/Archived/Arena Standard/2022-04-28.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Arena Standard (SNC)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-04-28
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt b/forge-gui/res/formats/Archived/Block/Amonkhet/2017-04-28.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt
rename to forge-gui/res/formats/Archived/Block/Amonkhet/2017-04-28.txt
index b92fc37c90c..6dddae8deeb 100644
--- a/forge-gui/res/formats/Archive/Block/Amonkhet/2017-04-28.txt
+++ b/forge-gui/res/formats/Archived/Block/Amonkhet/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Amonkhet (AKH)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2017-04-28
 Sets:AKH
diff --git a/forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt b/forge-gui/res/formats/Archived/Block/Amonkhet/2017-07-14.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt
rename to forge-gui/res/formats/Archived/Block/Amonkhet/2017-07-14.txt
index 95023b45ac9..246c38e0456 100644
--- a/forge-gui/res/formats/Archive/Block/Amonkhet/2017-07-14.txt
+++ b/forge-gui/res/formats/Archived/Block/Amonkhet/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Amonkhet (HOU)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2017-07-14
 Sets:AKH, HOU
diff --git a/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt b/forge-gui/res/formats/Archived/Block/Battle for Zendikar/2015-10-02.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt
rename to forge-gui/res/formats/Archived/Block/Battle for Zendikar/2015-10-02.txt
index 2edae77fac6..dd130a21a77 100644
--- a/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2015-10-02.txt	
+++ b/forge-gui/res/formats/Archived/Block/Battle for Zendikar/2015-10-02.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Battle for Zendikar (BFZ)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2015-10-02
 Sets:BFZ
diff --git a/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt b/forge-gui/res/formats/Archived/Block/Battle for Zendikar/2016-01-22.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt
rename to forge-gui/res/formats/Archived/Block/Battle for Zendikar/2016-01-22.txt
index 797a8f219c9..f1a304d5066 100644
--- a/forge-gui/res/formats/Archive/Block/Battle for Zendikar/2016-01-22.txt	
+++ b/forge-gui/res/formats/Archived/Block/Battle for Zendikar/2016-01-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Battle for Zendikar (OGW)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2016-01-22
 Sets:BFZ, OGW
diff --git a/forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt b/forge-gui/res/formats/Archived/Block/Ice Age/1996-10-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt
rename to forge-gui/res/formats/Archived/Block/Ice Age/1996-10-01.txt
index b48890b1727..5cb249c07bd 100644
--- a/forge-gui/res/formats/Archive/Block/Ice Age/1996-10-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Ice Age/1996-10-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (ALL)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1996-10-01
 Sets:ICE, ALL
diff --git a/forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt b/forge-gui/res/formats/Archived/Block/Ice Age/1997-05-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt
rename to forge-gui/res/formats/Archived/Block/Ice Age/1997-05-01.txt
index 064dd4d5382..4f16d7300cd 100644
--- a/forge-gui/res/formats/Archive/Block/Ice Age/1997-05-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Ice Age/1997-05-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (ICE)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1997-05-01
 Sets:ICE
diff --git a/forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt b/forge-gui/res/formats/Archived/Block/Ice Age/1997-07-01.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Ice Age/1997-07-01.txt
index 007e911345c..dda31e08ed8 100644
--- a/forge-gui/res/formats/Archive/Block/Ice Age/1997-07-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Ice Age/1997-07-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (HML)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1997-07-01
 Sets:ICE, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt b/forge-gui/res/formats/Archived/Block/Ice Age/2006-08-20.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt
rename to forge-gui/res/formats/Archived/Block/Ice Age/2006-08-20.txt
index 512935eb736..141f5bdca39 100644
--- a/forge-gui/res/formats/Archive/Block/Ice Age/2006-08-20.txt	
+++ b/forge-gui/res/formats/Archived/Block/Ice Age/2006-08-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ice Age (CSP)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2006-08-20
 Sets:ICE, ALL, CSP
diff --git a/forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt b/forge-gui/res/formats/Archived/Block/Innistrad/2011-09-30.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Block/Innistrad/2011-09-30.txt
index 49879e3634e..5f2088508b4 100644
--- a/forge-gui/res/formats/Archive/Block/Innistrad/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Block/Innistrad/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (ISD)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2011-09-30
 Sets:ISD
diff --git a/forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt b/forge-gui/res/formats/Archived/Block/Innistrad/2012-02-03.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Block/Innistrad/2012-02-03.txt
index b218a6acd86..54560443b85 100644
--- a/forge-gui/res/formats/Archive/Block/Innistrad/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Block/Innistrad/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (DKA)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2012-02-03
 Sets:ISD, DKA
diff --git a/forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt b/forge-gui/res/formats/Archived/Block/Innistrad/2012-04-02.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt
rename to forge-gui/res/formats/Archived/Block/Innistrad/2012-04-02.txt
index 4270e1d1607..efd00270e12 100644
--- a/forge-gui/res/formats/Archive/Block/Innistrad/2012-04-02.txt
+++ b/forge-gui/res/formats/Archived/Block/Innistrad/2012-04-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (2012-04-02)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2012-04-02
 Sets:ISD, DKA
diff --git a/forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt b/forge-gui/res/formats/Archived/Block/Innistrad/2012-05-04.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Block/Innistrad/2012-05-04.txt
index 167fb5b2db9..0379ea17d4c 100644
--- a/forge-gui/res/formats/Archive/Block/Innistrad/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Block/Innistrad/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Innistrad (AVR)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2012-05-04
 Sets:ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt b/forge-gui/res/formats/Archived/Block/Invasion/2000-11-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt
rename to forge-gui/res/formats/Archived/Block/Invasion/2000-11-01.txt
index f49a5b419d7..12f0aa59f57 100644
--- a/forge-gui/res/formats/Archive/Block/Invasion/2000-11-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Invasion/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (INV)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2000-11-01
 Sets:INV
diff --git a/forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt b/forge-gui/res/formats/Archived/Block/Invasion/2001-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt
rename to forge-gui/res/formats/Archived/Block/Invasion/2001-03-01.txt
index 33b5b63175c..4cbee84b4c7 100644
--- a/forge-gui/res/formats/Archive/Block/Invasion/2001-03-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Invasion/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (PLS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2001-03-01
 Sets:INV, PLS
diff --git a/forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt b/forge-gui/res/formats/Archived/Block/Invasion/2001-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Invasion/2001-07-01.txt
index 8ef00262b8f..a77c96de647 100644
--- a/forge-gui/res/formats/Archive/Block/Invasion/2001-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Invasion/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Invasion (APC)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2001-07-01
 Sets:INV, PLS, APC
diff --git a/forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt b/forge-gui/res/formats/Archived/Block/Ixalan/2017-09-29.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt
rename to forge-gui/res/formats/Archived/Block/Ixalan/2017-09-29.txt
index 66ccbb6cd98..61086befae8 100644
--- a/forge-gui/res/formats/Archive/Block/Ixalan/2017-09-29.txt
+++ b/forge-gui/res/formats/Archived/Block/Ixalan/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ixalan (XLN)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2017-09-29
 Sets:XLN
diff --git a/forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt b/forge-gui/res/formats/Archived/Block/Ixalan/2018-01-19.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt
rename to forge-gui/res/formats/Archived/Block/Ixalan/2018-01-19.txt
index 6f0ef9e6514..96a0d0bbadc 100644
--- a/forge-gui/res/formats/Archive/Block/Ixalan/2018-01-19.txt
+++ b/forge-gui/res/formats/Archived/Block/Ixalan/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ixalan (RIX)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2018-01-19
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt b/forge-gui/res/formats/Archived/Block/Kaladesh/2016-09-30.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt
rename to forge-gui/res/formats/Archived/Block/Kaladesh/2016-09-30.txt
index 449956c4b02..db40741625f 100644
--- a/forge-gui/res/formats/Archive/Block/Kaladesh/2016-09-30.txt
+++ b/forge-gui/res/formats/Archived/Block/Kaladesh/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kaladesh (KLD)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2016-09-30
 Sets:KLD
diff --git a/forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt b/forge-gui/res/formats/Archived/Block/Kaladesh/2017-01-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt
rename to forge-gui/res/formats/Archived/Block/Kaladesh/2017-01-20.txt
index 6d3392b3362..c2c22da4b61 100644
--- a/forge-gui/res/formats/Archive/Block/Kaladesh/2017-01-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Kaladesh/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kaladesh (AER)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2017-01-20
 Sets:KLD, AER
diff --git a/forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt b/forge-gui/res/formats/Archived/Block/Kamigawa/2004-10-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt
rename to forge-gui/res/formats/Archived/Block/Kamigawa/2004-10-20.txt
index 71ab58b2d9c..688cd497b71 100644
--- a/forge-gui/res/formats/Archive/Block/Kamigawa/2004-10-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Kamigawa/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (CHK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2004-10-20
 Sets:CHK
diff --git a/forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt b/forge-gui/res/formats/Archived/Block/Kamigawa/2005-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt
rename to forge-gui/res/formats/Archived/Block/Kamigawa/2005-02-20.txt
index 04a5bde634c..c15a522c954 100644
--- a/forge-gui/res/formats/Archive/Block/Kamigawa/2005-02-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Kamigawa/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (BOK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2005-02-20
 Sets:CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt b/forge-gui/res/formats/Archived/Block/Kamigawa/2005-06-20.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt
rename to forge-gui/res/formats/Archived/Block/Kamigawa/2005-06-20.txt
index 4f6cab097d6..ce000edaa5b 100644
--- a/forge-gui/res/formats/Archive/Block/Kamigawa/2005-06-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Kamigawa/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Kamigawa (SOK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2005-06-20
 Sets:CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2014-09-26.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt
rename to forge-gui/res/formats/Archived/Block/Khans of Tarkir/2014-09-26.txt
index 1f8b2d42561..905a8d13f73 100644
--- a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2014-09-26.txt	
+++ b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2014-09-26.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (KTK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2014-09-26
 Sets:KTK
diff --git a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-01-23.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt
rename to forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-01-23.txt
index cb22d4a6954..12ecc7b397f 100644
--- a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-01-23.txt	
+++ b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-01-23.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (FRF)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2015-01-23
 Sets:KTK, FRF
diff --git a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-03-27.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt
rename to forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-03-27.txt
index eb25dd9d848..d177da2e6c0 100644
--- a/forge-gui/res/formats/Archive/Block/Khans of Tarkir/2015-03-27.txt	
+++ b/forge-gui/res/formats/Archived/Block/Khans of Tarkir/2015-03-27.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Khans of Tarkir (DTK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2015-03-27
 Sets:KTK, FRF, DTK
diff --git a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2007-10-20.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt
rename to forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2007-10-20.txt
index d95bdc85395..fc355a1643f 100644
--- a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2007-10-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn (LRW)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2007-10-20
 Sets:LRW
diff --git a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-02-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt
rename to forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-02-01.txt
index 40dbf6b7023..b8c042bedc1 100644
--- a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-02-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn (MOR)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2008-02-01
 Sets:LRW, MOR
diff --git a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-05-02.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt
rename to forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-05-02.txt
index 47d5b03ef02..c0e74e6ec2d 100644
--- a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-05-02.txt
+++ b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn;Shadowmoor (SHM)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2008-05-02
 Sets:LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-07-25.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt
rename to forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-07-25.txt
index b9a96e510b2..fd643ec994e 100644
--- a/forge-gui/res/formats/Archive/Block/Lorwyn-Shadowmoor/2008-07-25.txt
+++ b/forge-gui/res/formats/Archived/Block/Lorwyn-Shadowmoor/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Lorwyn;Shadowmoor (EVE)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2008-07-25
 Sets:LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt b/forge-gui/res/formats/Archived/Block/Masques/1999-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt
rename to forge-gui/res/formats/Archived/Block/Masques/1999-11-01.txt
index 75af0db654a..47bed2aa61a 100644
--- a/forge-gui/res/formats/Archive/Block/Masques/1999-11-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Masques/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (MMQ)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1999-11-01
 Sets:MMQ
diff --git a/forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt b/forge-gui/res/formats/Archived/Block/Masques/2000-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt
rename to forge-gui/res/formats/Archived/Block/Masques/2000-03-01.txt
index 591f7a0d8ea..a37e9928835 100644
--- a/forge-gui/res/formats/Archive/Block/Masques/2000-03-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Masques/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (NMS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2000-03-01
 Sets:MMQ, NMS
diff --git a/forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt b/forge-gui/res/formats/Archived/Block/Masques/2000-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Masques/2000-07-01.txt
index 7766e412999..ebcfab0bebb 100644
--- a/forge-gui/res/formats/Archive/Block/Masques/2000-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Masques/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Masques (PCY)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2000-07-01
 Sets:MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt b/forge-gui/res/formats/Archived/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
index cef5984d2c0..e006640823b 100644
--- a/forge-gui/res/formats/Archive/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Mirage-Visions-Weatherlight/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirage;Visions;Weatherlight (WTH)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1997-07-01
 Sets:MIR, VIS, WTH
diff --git a/forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt b/forge-gui/res/formats/Archived/Block/Mirrodin/2003-10-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt
rename to forge-gui/res/formats/Archived/Block/Mirrodin/2003-10-20.txt
index b5fa9f05aff..a4e5097e6a2 100644
--- a/forge-gui/res/formats/Archive/Block/Mirrodin/2003-10-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Mirrodin/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (MRD)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2003-10-20
 Sets:MRD
diff --git a/forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt b/forge-gui/res/formats/Archived/Block/Mirrodin/2004-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt
rename to forge-gui/res/formats/Archived/Block/Mirrodin/2004-02-20.txt
index 8d13f63ef46..05bf8930be6 100644
--- a/forge-gui/res/formats/Archive/Block/Mirrodin/2004-02-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Mirrodin/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (DST)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2004-02-20
 Sets:MRD, DST
diff --git a/forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt b/forge-gui/res/formats/Archived/Block/Mirrodin/2004-06-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt
rename to forge-gui/res/formats/Archived/Block/Mirrodin/2004-06-20.txt
index 32caa576c8b..70b10b32462 100644
--- a/forge-gui/res/formats/Archive/Block/Mirrodin/2004-06-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Mirrodin/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (5DN)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2004-06-20
 Sets:MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt b/forge-gui/res/formats/Archived/Block/Mirrodin/2006-02-20.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Block/Mirrodin/2006-02-20.txt
index e81131e46c8..fa2c6569a10 100644
--- a/forge-gui/res/formats/Archive/Block/Mirrodin/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Mirrodin/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Mirrodin (2006-03-20)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2006-03-20
 Sets:MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt b/forge-gui/res/formats/Archived/Block/Odyssey/2001-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt
rename to forge-gui/res/formats/Archived/Block/Odyssey/2001-11-01.txt
index 60d98cfef23..37f31779d5a 100644
--- a/forge-gui/res/formats/Archive/Block/Odyssey/2001-11-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Odyssey/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (ODY)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2001-11-01
 Sets:ODY
diff --git a/forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt b/forge-gui/res/formats/Archived/Block/Odyssey/2002-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt
rename to forge-gui/res/formats/Archived/Block/Odyssey/2002-03-01.txt
index 9c109704820..8c791facd33 100644
--- a/forge-gui/res/formats/Archive/Block/Odyssey/2002-03-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Odyssey/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (TOR)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2002-03-01
 Sets:ODY, TOR
diff --git a/forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt b/forge-gui/res/formats/Archived/Block/Odyssey/2002-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Odyssey/2002-07-01.txt
index 021150382c4..6dde817230a 100644
--- a/forge-gui/res/formats/Archive/Block/Odyssey/2002-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Odyssey/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Odyssey (JUD)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2002-07-01
 Sets:ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt b/forge-gui/res/formats/Archived/Block/Onslaught/2002-11-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt
rename to forge-gui/res/formats/Archived/Block/Onslaught/2002-11-01.txt
index 7f49ff35dfe..be39499c5b2 100644
--- a/forge-gui/res/formats/Archive/Block/Onslaught/2002-11-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Onslaught/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (ONS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2002-11-01
 Sets:ONS
diff --git a/forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt b/forge-gui/res/formats/Archived/Block/Onslaught/2003-03-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt
rename to forge-gui/res/formats/Archived/Block/Onslaught/2003-03-01.txt
index 123070b445b..88d2f2df9db 100644
--- a/forge-gui/res/formats/Archive/Block/Onslaught/2003-03-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Onslaught/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (LGN)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2003-03-01
 Sets:ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt b/forge-gui/res/formats/Archived/Block/Onslaught/2003-07-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Onslaught/2003-07-01.txt
index b31ca636580..e8643fa62e7 100644
--- a/forge-gui/res/formats/Archive/Block/Onslaught/2003-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Onslaught/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Onslaught (SCG)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2003-07-01
 Sets:ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt b/forge-gui/res/formats/Archived/Block/Rath Cycle/1997-11-01.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt
rename to forge-gui/res/formats/Archived/Block/Rath Cycle/1997-11-01.txt
index f28a9a56609..11f07ea4735 100644
--- a/forge-gui/res/formats/Archive/Block/Rath Cycle/1997-11-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Rath Cycle/1997-11-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest (TMP)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1997-11-01
 Sets:TMP
diff --git a/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt b/forge-gui/res/formats/Archived/Block/Rath Cycle/1998-04-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt
rename to forge-gui/res/formats/Archived/Block/Rath Cycle/1998-04-01.txt
index 534dc3d695f..ed1190d4180 100644
--- a/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-04-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Rath Cycle/1998-04-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest;Stronghold (TMP)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1998-04-01
 Sets:TMP, STH
diff --git a/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt b/forge-gui/res/formats/Archived/Block/Rath Cycle/1998-07-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Rath Cycle/1998-07-01.txt
index af1a6cd4f08..64f939b8352 100644
--- a/forge-gui/res/formats/Archive/Block/Rath Cycle/1998-07-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Rath Cycle/1998-07-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Tempest;Stronghold;Exodus (EXO)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1998-07-01
 Sets:TMP, STH, EXO
diff --git a/forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt b/forge-gui/res/formats/Archived/Block/Ravnica/2005-10-20.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt
rename to forge-gui/res/formats/Archived/Block/Ravnica/2005-10-20.txt
index fdaa4ae60e3..c6ff947b6f7 100644
--- a/forge-gui/res/formats/Archive/Block/Ravnica/2005-10-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Ravnica/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (RAV)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2005-10-20
 Sets:RAV
diff --git a/forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt b/forge-gui/res/formats/Archived/Block/Ravnica/2006-02-20.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Block/Ravnica/2006-02-20.txt
index 6be64dabd66..b3c2b0f731b 100644
--- a/forge-gui/res/formats/Archive/Block/Ravnica/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Ravnica/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (GPT)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2006-02-20
 Sets:RAV, GPT
diff --git a/forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt b/forge-gui/res/formats/Archived/Block/Ravnica/2006-05-20.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt
rename to forge-gui/res/formats/Archived/Block/Ravnica/2006-05-20.txt
index 7a85223418d..20892d0da7a 100644
--- a/forge-gui/res/formats/Archive/Block/Ravnica/2006-05-20.txt
+++ b/forge-gui/res/formats/Archived/Block/Ravnica/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Ravnica (DIS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2006-05-20
 Sets:RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2012-10-05.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Block/Return to Ravnica/2012-10-05.txt
index f590fd4abf8..028f0a0492b 100644
--- a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2012-10-05.txt	
+++ b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2012-10-05.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (RTR)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2012-10-05
 Sets:RTR
diff --git a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-02-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-02-01.txt
index 0007243518f..077452b9b66 100644
--- a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-02-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-02-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (GTC)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2013-02-01
 Sets:RTR, GTC
diff --git a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-05-03.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-05-03.txt
index ed15d5f3c7c..e0c881e736e 100644
--- a/forge-gui/res/formats/Archive/Block/Return to Ravnica/2013-05-03.txt	
+++ b/forge-gui/res/formats/Archived/Block/Return to Ravnica/2013-05-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Return to Ravnica (DGM)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2013-05-03
 Sets:RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2010-10-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt
rename to forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2010-10-01.txt
index 3570bee99be..71fb59ad6f8 100644
--- a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2010-10-01.txt	
+++ b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2010-10-01.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (SOM)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2010-10-01
 Sets:SOM
diff --git a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-02-04.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt
rename to forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-02-04.txt
index dbe5fef732c..f13b762a730 100644
--- a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-02-04.txt	
+++ b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-02-04.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (MBS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2011-02-04
 Sets:SOM, MBS
diff --git a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-05-13.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt
rename to forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-05-13.txt
index 4b1d424136f..42482c36b28 100644
--- a/forge-gui/res/formats/Archive/Block/Scars of Mirrodin/2011-05-13.txt	
+++ b/forge-gui/res/formats/Archived/Block/Scars of Mirrodin/2011-05-13.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Scars of Mirrodin (NPH)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2011-05-13
 Sets:SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt b/forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-04-08.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt
rename to forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-04-08.txt
index e40760cc602..2a907da34bf 100644
--- a/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-04-08.txt	
+++ b/forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-04-08.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shadows over Innistrad (SOI)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2016-04-08
 Sets:SOI
diff --git a/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt b/forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-07-22.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt
rename to forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-07-22.txt
index 32e5451959c..b5028bfd717 100644
--- a/forge-gui/res/formats/Archive/Block/Shadows over Innistrad/2016-07-22.txt	
+++ b/forge-gui/res/formats/Archived/Block/Shadows over Innistrad/2016-07-22.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shadows over Innistrad (EMN)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2016-07-22
 Sets:SOI, EMN
diff --git a/forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt b/forge-gui/res/formats/Archived/Block/Shards of Alara/2008-10-03.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt
rename to forge-gui/res/formats/Archived/Block/Shards of Alara/2008-10-03.txt
index 6b8d52cfd91..95938e8d2cb 100644
--- a/forge-gui/res/formats/Archive/Block/Shards of Alara/2008-10-03.txt	
+++ b/forge-gui/res/formats/Archived/Block/Shards of Alara/2008-10-03.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (ALA)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2008-10-03
 Sets:ALA
diff --git a/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt b/forge-gui/res/formats/Archived/Block/Shards of Alara/2009-02-06.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt
rename to forge-gui/res/formats/Archived/Block/Shards of Alara/2009-02-06.txt
index 44fae88e0c7..296f39e03c2 100644
--- a/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-02-06.txt	
+++ b/forge-gui/res/formats/Archived/Block/Shards of Alara/2009-02-06.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (CFX)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2009-02-06
 Sets:ALA, CFX
diff --git a/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt b/forge-gui/res/formats/Archived/Block/Shards of Alara/2009-04-30.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt
rename to forge-gui/res/formats/Archived/Block/Shards of Alara/2009-04-30.txt
index 967d7b4dcde..3979e080625 100644
--- a/forge-gui/res/formats/Archive/Block/Shards of Alara/2009-04-30.txt	
+++ b/forge-gui/res/formats/Archived/Block/Shards of Alara/2009-04-30.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Shards of Alara (ARB)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2009-04-30
 Sets:ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt b/forge-gui/res/formats/Archived/Block/Theros/2013-09-27.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Block/Theros/2013-09-27.txt
index 60b28c90d63..c9eb35a4560 100644
--- a/forge-gui/res/formats/Archive/Block/Theros/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Block/Theros/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (THS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2013-09-23
 Sets:THS
diff --git a/forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt b/forge-gui/res/formats/Archived/Block/Theros/2014-02-07.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt
rename to forge-gui/res/formats/Archived/Block/Theros/2014-02-07.txt
index 10f3ee87f68..e1771799b77 100644
--- a/forge-gui/res/formats/Archive/Block/Theros/2014-02-07.txt
+++ b/forge-gui/res/formats/Archived/Block/Theros/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (BNG)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2014-02-07
 Sets:THS, BNG
diff --git a/forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt b/forge-gui/res/formats/Archived/Block/Theros/2014-05-02.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt
rename to forge-gui/res/formats/Archived/Block/Theros/2014-05-02.txt
index 7ddb1172785..b1f2d390d3c 100644
--- a/forge-gui/res/formats/Archive/Block/Theros/2014-05-02.txt
+++ b/forge-gui/res/formats/Archived/Block/Theros/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Theros (JOU)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2014-05-02
 Sets:THS, BNG, JOU
diff --git a/forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt b/forge-gui/res/formats/Archived/Block/Time Spiral/2006-10-20.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt
rename to forge-gui/res/formats/Archived/Block/Time Spiral/2006-10-20.txt
index 67613a235cb..69b29d8202f 100644
--- a/forge-gui/res/formats/Archive/Block/Time Spiral/2006-10-20.txt	
+++ b/forge-gui/res/formats/Archived/Block/Time Spiral/2006-10-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (TSP)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2006-10-20
 Sets:TSP, TSB
diff --git a/forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt b/forge-gui/res/formats/Archived/Block/Time Spiral/2007-02-20.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt
rename to forge-gui/res/formats/Archived/Block/Time Spiral/2007-02-20.txt
index 4db40d4ef53..98d9f66e019 100644
--- a/forge-gui/res/formats/Archive/Block/Time Spiral/2007-02-20.txt	
+++ b/forge-gui/res/formats/Archived/Block/Time Spiral/2007-02-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (PLC)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2007-02-20
 Sets:TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt b/forge-gui/res/formats/Archived/Block/Time Spiral/2007-05-20.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt
rename to forge-gui/res/formats/Archived/Block/Time Spiral/2007-05-20.txt
index c7a99bdea9f..44fb20f4bf8 100644
--- a/forge-gui/res/formats/Archive/Block/Time Spiral/2007-05-20.txt	
+++ b/forge-gui/res/formats/Archived/Block/Time Spiral/2007-05-20.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Time Spiral (FUT)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2007-05-20
 Sets:TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt b/forge-gui/res/formats/Archived/Block/Urza/1999-01-01.txt
similarity index 84%
rename from forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt
rename to forge-gui/res/formats/Archived/Block/Urza/1999-01-01.txt
index 51aa83e9bbd..7f39e081d9d 100644
--- a/forge-gui/res/formats/Archive/Block/Urza/1999-01-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Urza/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (USG)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1999-01-01
 Sets:USG
diff --git a/forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt b/forge-gui/res/formats/Archived/Block/Urza/1999-03-01.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt
rename to forge-gui/res/formats/Archived/Block/Urza/1999-03-01.txt
index 0f691138c4a..e1c4614006b 100644
--- a/forge-gui/res/formats/Archive/Block/Urza/1999-03-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Urza/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (ULG)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1999-03-01
 Sets:USG, ULG
diff --git a/forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt b/forge-gui/res/formats/Archived/Block/Urza/1999-04-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt
rename to forge-gui/res/formats/Archived/Block/Urza/1999-04-01.txt
index 9d6a4cbe541..088b1828fe0 100644
--- a/forge-gui/res/formats/Archive/Block/Urza/1999-04-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Urza/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (1999-04-01)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1999-04-01
 Sets:USG, ULG
diff --git a/forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt b/forge-gui/res/formats/Archived/Block/Urza/1999-07-01.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt
rename to forge-gui/res/formats/Archived/Block/Urza/1999-07-01.txt
index d8a2dc8cc1b..4da878a279d 100644
--- a/forge-gui/res/formats/Archive/Block/Urza/1999-07-01.txt
+++ b/forge-gui/res/formats/Archived/Block/Urza/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Urza (UDS)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:1999-07-01
 Sets:USG, ULG, UDS
diff --git a/forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt b/forge-gui/res/formats/Archived/Block/Zendikar/2009-10-02.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt
rename to forge-gui/res/formats/Archived/Block/Zendikar/2009-10-02.txt
index 9ec0327c544..c76e9142370 100644
--- a/forge-gui/res/formats/Archive/Block/Zendikar/2009-10-02.txt
+++ b/forge-gui/res/formats/Archived/Block/Zendikar/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (ZEN)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2009-10-02
 Sets:ZEN
diff --git a/forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt b/forge-gui/res/formats/Archived/Block/Zendikar/2010-02-05.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt
rename to forge-gui/res/formats/Archived/Block/Zendikar/2010-02-05.txt
index 912b52761d8..1d8acc80a54 100644
--- a/forge-gui/res/formats/Archive/Block/Zendikar/2010-02-05.txt
+++ b/forge-gui/res/formats/Archived/Block/Zendikar/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (WWK)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2010-02-05
 Sets:ZEN, WWK
diff --git a/forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt b/forge-gui/res/formats/Archived/Block/Zendikar/2010-04-23.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt
rename to forge-gui/res/formats/Archived/Block/Zendikar/2010-04-23.txt
index fca30ad8db7..bb615e59658 100644
--- a/forge-gui/res/formats/Archive/Block/Zendikar/2010-04-23.txt
+++ b/forge-gui/res/formats/Archived/Block/Zendikar/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Block: Zendikar (ROE)
-Type:Archive
+Type:Archived
 Subtype:Block
 Effective:2010-04-23
 Sets:ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Archive/Explorer/2022-04-21.txt b/forge-gui/res/formats/Archived/Explorer/2022-04-21.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Explorer/2022-04-21.txt
rename to forge-gui/res/formats/Archived/Explorer/2022-04-21.txt
index 8e529852c5c..a9a4289e134 100644
--- a/forge-gui/res/formats/Archive/Explorer/2022-04-21.txt
+++ b/forge-gui/res/formats/Archived/Explorer/2022-04-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Explorer (2022-04-21)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-04-21
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Archive/Explorer/2022-04-28.txt b/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Explorer/2022-04-28.txt
rename to forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
index f5bf7f76993..345dfdcb864 100644
--- a/forge-gui/res/formats/Archive/Explorer/2022-04-28.txt
+++ b/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Explorer (SNC)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-04-28
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Archive/Extended/1997-07-01.txt b/forge-gui/res/formats/Archived/Extended/1997-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/1997-07-01.txt
index 45895e902c1..6c46fc068d6 100644
--- a/forge-gui/res/formats/Archive/Extended/1997-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1997-07-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1997-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Extended/1997-10-01.txt b/forge-gui/res/formats/Archived/Extended/1997-10-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1997-10-01.txt
rename to forge-gui/res/formats/Archived/Extended/1997-10-01.txt
index d469b66b0c0..e917ca3fad5 100644
--- a/forge-gui/res/formats/Archive/Extended/1997-10-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1997-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1997-10-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1997-10-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Extended/1997-11-01.txt b/forge-gui/res/formats/Archived/Extended/1997-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1997-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/1997-11-01.txt
index 19ab52577e4..c213820ee96 100644
--- a/forge-gui/res/formats/Archive/Extended/1997-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TMP)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1997-11-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Archive/Extended/1998-04-01.txt b/forge-gui/res/formats/Archived/Extended/1998-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1998-04-01.txt
rename to forge-gui/res/formats/Archived/Extended/1998-04-01.txt
index d024f51ebc2..89373c8797d 100644
--- a/forge-gui/res/formats/Archive/Extended/1998-04-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (STH)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1998-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Archive/Extended/1998-07-01.txt b/forge-gui/res/formats/Archived/Extended/1998-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1998-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/1998-07-01.txt
index 80519ea6dd5..5a4262a0e27 100644
--- a/forge-gui/res/formats/Archive/Extended/1998-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (EXO)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1998-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Archive/Extended/1998-11-01.txt b/forge-gui/res/formats/Archived/Extended/1998-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1998-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/1998-11-01.txt
index 19e062f5e84..4303255227a 100644
--- a/forge-gui/res/formats/Archive/Extended/1998-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (USG)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1998-11-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Archive/Extended/1999-01-01.txt b/forge-gui/res/formats/Archived/Extended/1999-01-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-01-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-01-01.txt
index 0532b3d3e20..abecc328d4b 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-01-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-01-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-01-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Archive/Extended/1999-03-01.txt b/forge-gui/res/formats/Archived/Extended/1999-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-03-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-03-01.txt
index 10846086de8..0801a177ea2 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-03-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ULG)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Archive/Extended/1999-04-01.txt b/forge-gui/res/formats/Archived/Extended/1999-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-04-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-04-01.txt
index 035c66384a6..f1b0af47c69 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-04-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-04-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-04-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Archive/Extended/1999-06-01.txt b/forge-gui/res/formats/Archived/Extended/1999-06-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-06-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-06-01.txt
index 38419ed4ef3..4b9b184a183 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-06-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (6ED)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-06-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED
diff --git a/forge-gui/res/formats/Archive/Extended/1999-07-01.txt b/forge-gui/res/formats/Archived/Extended/1999-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-07-01.txt
index 39858031487..da88dcb2cdd 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (UDS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-07-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Extended/1999-09-01.txt b/forge-gui/res/formats/Archived/Extended/1999-09-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-09-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-09-01.txt
index 938cf514354..48522e1363d 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-09-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-09-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-09-01
 Sets:3ED, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Extended/1999-10-01.txt b/forge-gui/res/formats/Archived/Extended/1999-10-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-10-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-10-01.txt
index 54cfe891b2a..30c6f900d44 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-10-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (1999-10-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-10-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Extended/1999-11-01.txt b/forge-gui/res/formats/Archived/Extended/1999-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/1999-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/1999-11-01.txt
index 485f5ba953f..347808a2731 100644
--- a/forge-gui/res/formats/Archive/Extended/1999-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MMQ)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:1999-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Archive/Extended/2000-03-01.txt b/forge-gui/res/formats/Archived/Extended/2000-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2000-03-01.txt
rename to forge-gui/res/formats/Archived/Extended/2000-03-01.txt
index c8e6974f19e..748cad4b2b6 100644
--- a/forge-gui/res/formats/Archive/Extended/2000-03-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (NMS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2000-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Archive/Extended/2000-04-01.txt b/forge-gui/res/formats/Archived/Extended/2000-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2000-04-01.txt
rename to forge-gui/res/formats/Archived/Extended/2000-04-01.txt
index 10593c45349..8c20f7ac863 100644
--- a/forge-gui/res/formats/Archive/Extended/2000-04-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2000-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2000-04-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2000-04-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Archive/Extended/2000-07-01.txt b/forge-gui/res/formats/Archived/Extended/2000-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2000-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/2000-07-01.txt
index 2c52611a834..fc6c3f3459a 100644
--- a/forge-gui/res/formats/Archive/Extended/2000-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PCY)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2000-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Archive/Extended/2000-11-01.txt b/forge-gui/res/formats/Archived/Extended/2000-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2000-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/2000-11-01.txt
index d1f5a57de05..edcc08fe468 100644
--- a/forge-gui/res/formats/Archive/Extended/2000-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (INV)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2000-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV
diff --git a/forge-gui/res/formats/Archive/Extended/2001-03-01.txt b/forge-gui/res/formats/Archived/Extended/2001-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2001-03-01.txt
rename to forge-gui/res/formats/Archived/Extended/2001-03-01.txt
index 7314b797bee..ee0e016388e 100644
--- a/forge-gui/res/formats/Archive/Extended/2001-03-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PLS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2001-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Archive/Extended/2001-04-01.txt b/forge-gui/res/formats/Archived/Extended/2001-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2001-04-01.txt
rename to forge-gui/res/formats/Archived/Extended/2001-04-01.txt
index 02229f05657..f07b9d90c9f 100644
--- a/forge-gui/res/formats/Archive/Extended/2001-04-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2001-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2001-04-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2001-04-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Archive/Extended/2001-05-01.txt b/forge-gui/res/formats/Archived/Extended/2001-05-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2001-05-01.txt
rename to forge-gui/res/formats/Archived/Extended/2001-05-01.txt
index b7453e41210..4442227877e 100644
--- a/forge-gui/res/formats/Archive/Extended/2001-05-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (7ED)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2001-05-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Archive/Extended/2001-07-01.txt b/forge-gui/res/formats/Archived/Extended/2001-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2001-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/2001-07-01.txt
index 45f0c051af6..8de8b7d68f4 100644
--- a/forge-gui/res/formats/Archive/Extended/2001-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (APC)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2001-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Archive/Extended/2001-11-01.txt b/forge-gui/res/formats/Archived/Extended/2001-11-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2001-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/2001-11-01.txt
index 8e2d2e45857..d7101b91250 100644
--- a/forge-gui/res/formats/Archive/Extended/2001-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ODY)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2001-11-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Archive/Extended/2002-03-01.txt b/forge-gui/res/formats/Archived/Extended/2002-03-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2002-03-01.txt
rename to forge-gui/res/formats/Archived/Extended/2002-03-01.txt
index 2cdb6099b82..308945d6b5f 100644
--- a/forge-gui/res/formats/Archive/Extended/2002-03-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TOR)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2002-03-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR
diff --git a/forge-gui/res/formats/Archive/Extended/2002-07-01.txt b/forge-gui/res/formats/Archived/Extended/2002-07-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2002-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/2002-07-01.txt
index 1fc7b6a0dc2..b58b28fc4df 100644
--- a/forge-gui/res/formats/Archive/Extended/2002-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (JUD)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2002-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Archive/Extended/2002-11-01.txt b/forge-gui/res/formats/Archived/Extended/2002-11-01.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2002-11-01.txt
rename to forge-gui/res/formats/Archived/Extended/2002-11-01.txt
index 973aaa8d111..988f93e1208 100644
--- a/forge-gui/res/formats/Archive/Extended/2002-11-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ONS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2002-11-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Archive/Extended/2003-03-01.txt b/forge-gui/res/formats/Archived/Extended/2003-03-01.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2003-03-01.txt
rename to forge-gui/res/formats/Archived/Extended/2003-03-01.txt
index 57d03d9d909..9c89cabe8aa 100644
--- a/forge-gui/res/formats/Archive/Extended/2003-03-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (LGN)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2003-03-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Extended/2003-07-01.txt b/forge-gui/res/formats/Archived/Extended/2003-07-01.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2003-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/2003-07-01.txt
index b08bb75cbb5..d7b18c67b47 100644
--- a/forge-gui/res/formats/Archive/Extended/2003-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SCG)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2003-07-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Archive/Extended/2003-09-01.txt b/forge-gui/res/formats/Archived/Extended/2003-09-01.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2003-09-01.txt
rename to forge-gui/res/formats/Archived/Extended/2003-09-01.txt
index a9baf9ec3d5..b6491857231 100644
--- a/forge-gui/res/formats/Archive/Extended/2003-09-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (8ED)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2003-09-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Archive/Extended/2003-10-01.txt b/forge-gui/res/formats/Archived/Extended/2003-10-01.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2003-10-01.txt
rename to forge-gui/res/formats/Archived/Extended/2003-10-01.txt
index f98318217f0..c32fc78044d 100644
--- a/forge-gui/res/formats/Archive/Extended/2003-10-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2003-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2003-10-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2003-10-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Archive/Extended/2003-10-20.txt b/forge-gui/res/formats/Archived/Extended/2003-10-20.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Extended/2003-10-20.txt
rename to forge-gui/res/formats/Archived/Extended/2003-10-20.txt
index 40755c78852..7130decad1f 100644
--- a/forge-gui/res/formats/Archive/Extended/2003-10-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MRD)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2003-10-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Extended/2004-01-01.txt b/forge-gui/res/formats/Archived/Extended/2004-01-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2004-01-01.txt
rename to forge-gui/res/formats/Archived/Extended/2004-01-01.txt
index f39c7b57641..8b3fe210423 100644
--- a/forge-gui/res/formats/Archive/Extended/2004-01-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2004-01-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2004-01-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Extended/2004-02-20.txt b/forge-gui/res/formats/Archived/Extended/2004-02-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2004-02-20.txt
rename to forge-gui/res/formats/Archived/Extended/2004-02-20.txt
index 8f955aa9b4b..7936471c65d 100644
--- a/forge-gui/res/formats/Archive/Extended/2004-02-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DST)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2004-02-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Archive/Extended/2004-06-20.txt b/forge-gui/res/formats/Archived/Extended/2004-06-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2004-06-20.txt
rename to forge-gui/res/formats/Archived/Extended/2004-06-20.txt
index f748a443c7a..dda7a9fcae2 100644
--- a/forge-gui/res/formats/Archive/Extended/2004-06-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (5DN)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2004-06-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Extended/2004-09-20.txt b/forge-gui/res/formats/Archived/Extended/2004-09-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2004-09-20.txt
rename to forge-gui/res/formats/Archived/Extended/2004-09-20.txt
index a80880aaa4c..08edef24288 100644
--- a/forge-gui/res/formats/Archive/Extended/2004-09-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2004-09-20)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2004-09-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Extended/2004-10-20.txt b/forge-gui/res/formats/Archived/Extended/2004-10-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2004-10-20.txt
rename to forge-gui/res/formats/Archived/Extended/2004-10-20.txt
index 921e2156e63..c91b7546607 100644
--- a/forge-gui/res/formats/Archive/Extended/2004-10-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CHK)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2004-10-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Archive/Extended/2005-02-20.txt b/forge-gui/res/formats/Archived/Extended/2005-02-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2005-02-20.txt
rename to forge-gui/res/formats/Archived/Extended/2005-02-20.txt
index d3ac4d7531d..71cb101c2c1 100644
--- a/forge-gui/res/formats/Archive/Extended/2005-02-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (BOK)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2005-02-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Extended/2005-06-20.txt b/forge-gui/res/formats/Archived/Extended/2005-06-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2005-06-20.txt
rename to forge-gui/res/formats/Archived/Extended/2005-06-20.txt
index e5dc42c981d..aaaae3a67b0 100644
--- a/forge-gui/res/formats/Archive/Extended/2005-06-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SOK)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2005-06-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Archive/Extended/2005-08-20.txt b/forge-gui/res/formats/Archived/Extended/2005-08-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2005-08-20.txt
rename to forge-gui/res/formats/Archived/Extended/2005-08-20.txt
index e75705d12a9..ac6673c62a6 100644
--- a/forge-gui/res/formats/Archive/Extended/2005-08-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (9ED)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2005-08-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Extended/2005-09-20.txt b/forge-gui/res/formats/Archived/Extended/2005-09-20.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Extended/2005-09-20.txt
rename to forge-gui/res/formats/Archived/Extended/2005-09-20.txt
index 58254fadd3f..6c54f76f144 100644
--- a/forge-gui/res/formats/Archive/Extended/2005-09-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2005-09-20)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2005-09-20
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS, MMQ, NMS, PCY, INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Extended/2005-10-20.txt b/forge-gui/res/formats/Archived/Extended/2005-10-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2005-10-20.txt
rename to forge-gui/res/formats/Archived/Extended/2005-10-20.txt
index 6eef11f8b89..abf3d72276e 100644
--- a/forge-gui/res/formats/Archive/Extended/2005-10-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (RAV)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2005-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV
diff --git a/forge-gui/res/formats/Archive/Extended/2006-02-20.txt b/forge-gui/res/formats/Archived/Extended/2006-02-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Extended/2006-02-20.txt
index a6095d2f62f..f56c2bcd9e5 100644
--- a/forge-gui/res/formats/Archive/Extended/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (GPT)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2006-02-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT
diff --git a/forge-gui/res/formats/Archive/Extended/2006-05-20.txt b/forge-gui/res/formats/Archived/Extended/2006-05-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2006-05-20.txt
rename to forge-gui/res/formats/Archived/Extended/2006-05-20.txt
index 5fd2a615f70..c1ff38d77ad 100644
--- a/forge-gui/res/formats/Archive/Extended/2006-05-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DIS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2006-05-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Archive/Extended/2006-08-20.txt b/forge-gui/res/formats/Archived/Extended/2006-08-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2006-08-20.txt
rename to forge-gui/res/formats/Archived/Extended/2006-08-20.txt
index c2612751e62..f2a6b975004 100644
--- a/forge-gui/res/formats/Archive/Extended/2006-08-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CSP)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2006-08-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP
diff --git a/forge-gui/res/formats/Archive/Extended/2006-10-20.txt b/forge-gui/res/formats/Archived/Extended/2006-10-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2006-10-20.txt
rename to forge-gui/res/formats/Archived/Extended/2006-10-20.txt
index f6f4db9a4be..24f945e27ad 100644
--- a/forge-gui/res/formats/Archive/Extended/2006-10-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (TSP)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2006-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB
diff --git a/forge-gui/res/formats/Archive/Extended/2007-02-20.txt b/forge-gui/res/formats/Archived/Extended/2007-02-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2007-02-20.txt
rename to forge-gui/res/formats/Archived/Extended/2007-02-20.txt
index 45c344bd78d..4b83d3a6e36 100644
--- a/forge-gui/res/formats/Archive/Extended/2007-02-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (PLC)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2007-02-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Archive/Extended/2007-05-20.txt b/forge-gui/res/formats/Archived/Extended/2007-05-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2007-05-20.txt
rename to forge-gui/res/formats/Archived/Extended/2007-05-20.txt
index 27787c551ae..2b4433a1d1b 100644
--- a/forge-gui/res/formats/Archive/Extended/2007-05-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (FUT)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2007-05-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Archive/Extended/2007-07-20.txt b/forge-gui/res/formats/Archived/Extended/2007-07-20.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2007-07-20.txt
rename to forge-gui/res/formats/Archived/Extended/2007-07-20.txt
index 2a2ebc617a0..e97290f154d 100644
--- a/forge-gui/res/formats/Archive/Extended/2007-07-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (10E)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2007-07-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E
diff --git a/forge-gui/res/formats/Archive/Extended/2007-10-20.txt b/forge-gui/res/formats/Archived/Extended/2007-10-20.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2007-10-20.txt
rename to forge-gui/res/formats/Archived/Extended/2007-10-20.txt
index 6885193b062..8c2fdc74c50 100644
--- a/forge-gui/res/formats/Archive/Extended/2007-10-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (LRW)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2007-10-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW
diff --git a/forge-gui/res/formats/Archive/Extended/2008-02-01.txt b/forge-gui/res/formats/Archived/Extended/2008-02-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2008-02-01.txt
rename to forge-gui/res/formats/Archived/Extended/2008-02-01.txt
index 95f7ed8788d..a1cf51373c4 100644
--- a/forge-gui/res/formats/Archive/Extended/2008-02-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MOR)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2008-02-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR
diff --git a/forge-gui/res/formats/Archive/Extended/2008-05-02.txt b/forge-gui/res/formats/Archived/Extended/2008-05-02.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2008-05-02.txt
rename to forge-gui/res/formats/Archived/Extended/2008-05-02.txt
index f88e4444a17..8f2ce07ed8b 100644
--- a/forge-gui/res/formats/Archive/Extended/2008-05-02.txt
+++ b/forge-gui/res/formats/Archived/Extended/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SHM)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2008-05-02
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Archive/Extended/2008-07-25.txt b/forge-gui/res/formats/Archived/Extended/2008-07-25.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2008-07-25.txt
rename to forge-gui/res/formats/Archived/Extended/2008-07-25.txt
index ac86989cd93..b6273c572ea 100644
--- a/forge-gui/res/formats/Archive/Extended/2008-07-25.txt
+++ b/forge-gui/res/formats/Archived/Extended/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (EVE)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2008-07-25
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Archive/Extended/2008-09-20.txt b/forge-gui/res/formats/Archived/Extended/2008-09-20.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2008-09-20.txt
rename to forge-gui/res/formats/Archived/Extended/2008-09-20.txt
index 4f4faf505eb..7403ef992e8 100644
--- a/forge-gui/res/formats/Archive/Extended/2008-09-20.txt
+++ b/forge-gui/res/formats/Archived/Extended/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2008-09-20)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2008-09-20
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Archive/Extended/2008-10-03.txt b/forge-gui/res/formats/Archived/Extended/2008-10-03.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2008-10-03.txt
rename to forge-gui/res/formats/Archived/Extended/2008-10-03.txt
index e7813a2f15f..9484636b647 100644
--- a/forge-gui/res/formats/Archive/Extended/2008-10-03.txt
+++ b/forge-gui/res/formats/Archived/Extended/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ALA)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2008-10-03
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA
diff --git a/forge-gui/res/formats/Archive/Extended/2009-02-06.txt b/forge-gui/res/formats/Archived/Extended/2009-02-06.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2009-02-06.txt
rename to forge-gui/res/formats/Archived/Extended/2009-02-06.txt
index 62da189ae3c..a2730cc1717 100644
--- a/forge-gui/res/formats/Archive/Extended/2009-02-06.txt
+++ b/forge-gui/res/formats/Archived/Extended/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (CFX)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2009-02-06
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX
diff --git a/forge-gui/res/formats/Archive/Extended/2009-04-30.txt b/forge-gui/res/formats/Archived/Extended/2009-04-30.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2009-04-30.txt
rename to forge-gui/res/formats/Archived/Extended/2009-04-30.txt
index 93f241ea668..92199c9a8c8 100644
--- a/forge-gui/res/formats/Archive/Extended/2009-04-30.txt
+++ b/forge-gui/res/formats/Archived/Extended/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ARB)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2009-04-30
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Archive/Extended/2009-07-17.txt b/forge-gui/res/formats/Archived/Extended/2009-07-17.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2009-07-17.txt
rename to forge-gui/res/formats/Archived/Extended/2009-07-17.txt
index ecca4a424ae..1c4b2f0ba78 100644
--- a/forge-gui/res/formats/Archive/Extended/2009-07-17.txt
+++ b/forge-gui/res/formats/Archived/Extended/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M10)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2009-07-17
 Sets:ONS, LGN, SCG, 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
diff --git a/forge-gui/res/formats/Archive/Extended/2009-10-02.txt b/forge-gui/res/formats/Archived/Extended/2009-10-02.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2009-10-02.txt
rename to forge-gui/res/formats/Archived/Extended/2009-10-02.txt
index 69a6ab83952..bd68d600ea8 100644
--- a/forge-gui/res/formats/Archive/Extended/2009-10-02.txt
+++ b/forge-gui/res/formats/Archived/Extended/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ZEN)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2009-10-02
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Extended/2010-02-05.txt b/forge-gui/res/formats/Archived/Extended/2010-02-05.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2010-02-05.txt
rename to forge-gui/res/formats/Archived/Extended/2010-02-05.txt
index 8506984842e..fd64f6586d3 100644
--- a/forge-gui/res/formats/Archive/Extended/2010-02-05.txt
+++ b/forge-gui/res/formats/Archived/Extended/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (WWK)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2010-02-05
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Extended/2010-04-23.txt b/forge-gui/res/formats/Archived/Extended/2010-04-23.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Extended/2010-04-23.txt
rename to forge-gui/res/formats/Archived/Extended/2010-04-23.txt
index ed922a846b5..d05486ae228 100644
--- a/forge-gui/res/formats/Archive/Extended/2010-04-23.txt
+++ b/forge-gui/res/formats/Archived/Extended/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ROE)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2010-04-23
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Extended/2010-07-01.txt b/forge-gui/res/formats/Archived/Extended/2010-07-01.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Extended/2010-07-01.txt
rename to forge-gui/res/formats/Archived/Extended/2010-07-01.txt
index e43166fdfac..86597187d25 100644
--- a/forge-gui/res/formats/Archive/Extended/2010-07-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2010-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2010-07-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2010-07-01
 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Archive/Extended/2010-07-16.txt b/forge-gui/res/formats/Archived/Extended/2010-07-16.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Extended/2010-07-16.txt
rename to forge-gui/res/formats/Archived/Extended/2010-07-16.txt
index 5de28873182..232a6cba377 100644
--- a/forge-gui/res/formats/Archive/Extended/2010-07-16.txt
+++ b/forge-gui/res/formats/Archived/Extended/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M11)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2010-07-16
 Sets:TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11
diff --git a/forge-gui/res/formats/Archive/Extended/2010-10-01.txt b/forge-gui/res/formats/Archived/Extended/2010-10-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Extended/2010-10-01.txt
rename to forge-gui/res/formats/Archived/Extended/2010-10-01.txt
index 2ad181061bf..1138b680977 100644
--- a/forge-gui/res/formats/Archive/Extended/2010-10-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (SOM)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2010-10-01
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM
diff --git a/forge-gui/res/formats/Archive/Extended/2011-02-04.txt b/forge-gui/res/formats/Archived/Extended/2011-02-04.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Extended/2011-02-04.txt
rename to forge-gui/res/formats/Archived/Extended/2011-02-04.txt
index e919752f092..f58a3c080f5 100644
--- a/forge-gui/res/formats/Archive/Extended/2011-02-04.txt
+++ b/forge-gui/res/formats/Archived/Extended/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (MBS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2011-02-04
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS
diff --git a/forge-gui/res/formats/Archive/Extended/2011-05-13.txt b/forge-gui/res/formats/Archived/Extended/2011-05-13.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Extended/2011-05-13.txt
rename to forge-gui/res/formats/Archived/Extended/2011-05-13.txt
index df6f33818b5..939ec7a422c 100644
--- a/forge-gui/res/formats/Archive/Extended/2011-05-13.txt
+++ b/forge-gui/res/formats/Archived/Extended/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (NPH)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2011-05-13
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Archive/Extended/2011-07-15.txt b/forge-gui/res/formats/Archived/Extended/2011-07-15.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Extended/2011-07-15.txt
rename to forge-gui/res/formats/Archived/Extended/2011-07-15.txt
index 4c692a521d5..560a717fb22 100644
--- a/forge-gui/res/formats/Archive/Extended/2011-07-15.txt
+++ b/forge-gui/res/formats/Archived/Extended/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M12)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2011-07-15
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12
diff --git a/forge-gui/res/formats/Archive/Extended/2011-09-30.txt b/forge-gui/res/formats/Archived/Extended/2011-09-30.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Extended/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Extended/2011-09-30.txt
index 8df69be5fa7..6f71072cb7b 100644
--- a/forge-gui/res/formats/Archive/Extended/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Extended/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (ISD)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2011-09-30
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Archive/Extended/2011-10-01.txt b/forge-gui/res/formats/Archived/Extended/2011-10-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2011-10-01.txt
rename to forge-gui/res/formats/Archived/Extended/2011-10-01.txt
index 1b5ea203b19..31fb4f1a4c5 100644
--- a/forge-gui/res/formats/Archive/Extended/2011-10-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (2011-10-01)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2011-10-01
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Archive/Extended/2012-02-03.txt b/forge-gui/res/formats/Archived/Extended/2012-02-03.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Extended/2012-02-03.txt
index e65a8395a01..4c16b564183 100644
--- a/forge-gui/res/formats/Archive/Extended/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Extended/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DKA)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2012-02-03
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA
diff --git a/forge-gui/res/formats/Archive/Extended/2012-05-04.txt b/forge-gui/res/formats/Archived/Extended/2012-05-04.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Extended/2012-05-04.txt
index a6210d99583..9b373c95482 100644
--- a/forge-gui/res/formats/Archive/Extended/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Extended/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (AVR)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2012-05-04
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Archive/Extended/2012-07-13.txt b/forge-gui/res/formats/Archived/Extended/2012-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2012-07-13.txt
rename to forge-gui/res/formats/Archived/Extended/2012-07-13.txt
index 72ea93e871e..ea4646690ca 100644
--- a/forge-gui/res/formats/Archive/Extended/2012-07-13.txt
+++ b/forge-gui/res/formats/Archived/Extended/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M13)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2012-07-13
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13
diff --git a/forge-gui/res/formats/Archive/Extended/2012-10-05.txt b/forge-gui/res/formats/Archived/Extended/2012-10-05.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Extended/2012-10-05.txt
index 30c2992396a..d1182cb7273 100644
--- a/forge-gui/res/formats/Archive/Extended/2012-10-05.txt
+++ b/forge-gui/res/formats/Archived/Extended/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (RTR)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2012-10-05
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR
diff --git a/forge-gui/res/formats/Archive/Extended/2013-02-01.txt b/forge-gui/res/formats/Archived/Extended/2013-02-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Extended/2013-02-01.txt
index 17021cb192d..68548bf1b1a 100644
--- a/forge-gui/res/formats/Archive/Extended/2013-02-01.txt
+++ b/forge-gui/res/formats/Archived/Extended/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (GTC)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2013-02-01
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC
diff --git a/forge-gui/res/formats/Archive/Extended/2013-05-03.txt b/forge-gui/res/formats/Archived/Extended/2013-05-03.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Extended/2013-05-03.txt
index cec1aacf0ca..b695ba8be7c 100644
--- a/forge-gui/res/formats/Archive/Extended/2013-05-03.txt
+++ b/forge-gui/res/formats/Archived/Extended/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (DGM)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2013-05-03
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Archive/Extended/2013-07-19.txt b/forge-gui/res/formats/Archived/Extended/2013-07-19.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Extended/2013-07-19.txt
rename to forge-gui/res/formats/Archived/Extended/2013-07-19.txt
index 2f28c6c7c65..e32226848fb 100644
--- a/forge-gui/res/formats/Archive/Extended/2013-07-19.txt
+++ b/forge-gui/res/formats/Archived/Extended/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (M14)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2013-07-19
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
diff --git a/forge-gui/res/formats/Archive/Extended/2013-09-27.txt b/forge-gui/res/formats/Archived/Extended/2013-09-27.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Extended/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Extended/2013-09-27.txt
index 77032c0ea6d..454ef54a4b3 100644
--- a/forge-gui/res/formats/Archive/Extended/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Extended/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended (THS)
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2013-09-27
 Retired:2013-10-08
diff --git a/forge-gui/res/formats/Archive/Historic/2019-11-21.txt b/forge-gui/res/formats/Archived/Historic/2019-11-21.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Historic/2019-11-21.txt
rename to forge-gui/res/formats/Archived/Historic/2019-11-21.txt
index 541e3c82bd6..319c80c3639 100644
--- a/forge-gui/res/formats/Archive/Historic/2019-11-21.txt
+++ b/forge-gui/res/formats/Archived/Historic/2019-11-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2019-11-21)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2019-11-21
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1
diff --git a/forge-gui/res/formats/Archive/Historic/2020-01-16.txt b/forge-gui/res/formats/Archived/Historic/2020-01-16.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Historic/2020-01-16.txt
rename to forge-gui/res/formats/Archived/Historic/2020-01-16.txt
index 2f31d69b484..8d74b09642a 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-01-16.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-01-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (THB)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-01-16
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB
diff --git a/forge-gui/res/formats/Archive/Historic/2020-03-09.txt b/forge-gui/res/formats/Archived/Historic/2020-03-09.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Historic/2020-03-09.txt
rename to forge-gui/res/formats/Archived/Historic/2020-03-09.txt
index d7cee71a46d..2071cbd1494 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-03-09.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-03-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-03-09)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-03-09
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB
diff --git a/forge-gui/res/formats/Archive/Historic/2020-03-12.txt b/forge-gui/res/formats/Archived/Historic/2020-03-12.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Historic/2020-03-12.txt
rename to forge-gui/res/formats/Archived/Historic/2020-03-12.txt
index 2d761326051..c63a56186b7 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-03-12.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-03-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA2)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-03-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2
diff --git a/forge-gui/res/formats/Archive/Historic/2020-04-16.txt b/forge-gui/res/formats/Archived/Historic/2020-04-16.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Historic/2020-04-16.txt
rename to forge-gui/res/formats/Archived/Historic/2020-04-16.txt
index 75d9474d852..c5bdc1a7533 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-04-16.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-04-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (IKO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-04-16
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO
diff --git a/forge-gui/res/formats/Archive/Historic/2020-05-21.txt b/forge-gui/res/formats/Archived/Historic/2020-05-21.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Historic/2020-05-21.txt
rename to forge-gui/res/formats/Archived/Historic/2020-05-21.txt
index e2a0a13af2a..0757ba8e687 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-05-21.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-05-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA3)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-05-21
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3
diff --git a/forge-gui/res/formats/Archive/Historic/2020-06-25.txt b/forge-gui/res/formats/Archived/Historic/2020-06-25.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Historic/2020-06-25.txt
rename to forge-gui/res/formats/Archived/Historic/2020-06-25.txt
index 9795a1a1c4a..16acffc6389 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-06-25.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-06-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (M21)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-06-25
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21
diff --git a/forge-gui/res/formats/Archive/Historic/2020-07-13.txt b/forge-gui/res/formats/Archived/Historic/2020-07-13.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Historic/2020-07-13.txt
rename to forge-gui/res/formats/Archived/Historic/2020-07-13.txt
index 1361c8d16d9..14a3b8b16c7 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-07-13.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-07-13)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-07-13
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21
diff --git a/forge-gui/res/formats/Archive/Historic/2020-07-17.txt b/forge-gui/res/formats/Archived/Historic/2020-07-17.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Historic/2020-07-17.txt
rename to forge-gui/res/formats/Archived/Historic/2020-07-17.txt
index aedd614f3be..7c875c6fbae 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-07-17.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (JMP)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-07-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP
diff --git a/forge-gui/res/formats/Archive/Historic/2020-08-13.txt b/forge-gui/res/formats/Archived/Historic/2020-08-13.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Historic/2020-08-13.txt
rename to forge-gui/res/formats/Archived/Historic/2020-08-13.txt
index f9188900797..01e003c4c35 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-08-13.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-08-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (AKR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-08-13
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB
diff --git a/forge-gui/res/formats/Archive/Historic/2020-08-24.txt b/forge-gui/res/formats/Archived/Historic/2020-08-24.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Historic/2020-08-24.txt
rename to forge-gui/res/formats/Archived/Historic/2020-08-24.txt
index 52cbaaca6c6..f0718087784 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-08-24.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-08-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-08-24)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-08-24
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB
diff --git a/forge-gui/res/formats/Archive/Historic/2020-09-17.txt b/forge-gui/res/formats/Archived/Historic/2020-09-17.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Historic/2020-09-17.txt
rename to forge-gui/res/formats/Archived/Historic/2020-09-17.txt
index f4c219912f6..33d641ec032 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-09-17.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-09-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-09-17
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR
diff --git a/forge-gui/res/formats/Archive/Historic/2020-10-12.txt b/forge-gui/res/formats/Archived/Historic/2020-10-12.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Historic/2020-10-12.txt
rename to forge-gui/res/formats/Archived/Historic/2020-10-12.txt
index 132f4c822d5..770a2ad5519 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-10-12.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-10-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2020-10-12)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-10-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR
diff --git a/forge-gui/res/formats/Archive/Historic/2020-11-12.txt b/forge-gui/res/formats/Archived/Historic/2020-11-12.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Historic/2020-11-12.txt
rename to forge-gui/res/formats/Archived/Historic/2020-11-12.txt
index 88c1933a9bc..b1bb9dc78d4 100644
--- a/forge-gui/res/formats/Archive/Historic/2020-11-12.txt
+++ b/forge-gui/res/formats/Archived/Historic/2020-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (KLR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2020-11-12
 Sets:XLN, RIX, DOM, M19, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR
diff --git a/forge-gui/res/formats/Archive/Historic/2021-01-28.txt b/forge-gui/res/formats/Archived/Historic/2021-01-28.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Historic/2021-01-28.txt
rename to forge-gui/res/formats/Archived/Historic/2021-01-28.txt
index 2ad10d4fd3f..f14530f1459 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-01-28.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (KHM)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-01-28
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-02-15.txt b/forge-gui/res/formats/Archived/Historic/2021-02-15.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-02-15.txt
rename to forge-gui/res/formats/Archived/Historic/2021-02-15.txt
index 72fc1819065..274fa7d9801 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-02-15.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-02-15)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-02-15
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-03-11.txt b/forge-gui/res/formats/Archived/Historic/2021-03-11.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-03-11.txt
rename to forge-gui/res/formats/Archived/Historic/2021-03-11.txt
index e122232f266..7f2b1b745db 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-03-11.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-03-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA4)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-03-11
 Sets:XLN, RIX, DOM, M19, ANA, ANA, PANA, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AJMP, AKR, ANB, ZNR, KLR, KHM, HA4
diff --git a/forge-gui/res/formats/Archive/Historic/2021-04-15.txt b/forge-gui/res/formats/Archived/Historic/2021-04-15.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-04-15.txt
rename to forge-gui/res/formats/Archived/Historic/2021-04-15.txt
index 7b164b2591c..07f6fcc3f58 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-04-15.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-04-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (STX)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-04-15
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-05-19.txt b/forge-gui/res/formats/Archived/Historic/2021-05-19.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-05-19.txt
rename to forge-gui/res/formats/Archived/Historic/2021-05-19.txt
index 75bff3efcc2..21562c85b3e 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-05-19.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-05-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-05-19)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-05-19
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-05-27.txt b/forge-gui/res/formats/Archived/Historic/2021-05-27.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-05-27.txt
rename to forge-gui/res/formats/Archived/Historic/2021-05-27.txt
index 0b5841e4bc4..39aaa0b9ff9 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-05-27.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-05-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (HA5)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-05-27
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-06-09.txt b/forge-gui/res/formats/Archived/Historic/2021-06-09.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-06-09.txt
rename to forge-gui/res/formats/Archived/Historic/2021-06-09.txt
index 7395c80fb45..7d45883d564 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-06-09.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-06-09)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-06-09
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-07-08.txt b/forge-gui/res/formats/Archived/Historic/2021-07-08.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-07-08.txt
rename to forge-gui/res/formats/Archived/Historic/2021-07-08.txt
index d18c8e3ba7e..9588a670384 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-07-08.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-07-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (AFR)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-07-08
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-08-26.txt b/forge-gui/res/formats/Archived/Historic/2021-08-26.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-08-26.txt
rename to forge-gui/res/formats/Archived/Historic/2021-08-26.txt
index 7276ea310aa..425524b7d41 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-08-26.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (J21)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-08-26
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-09-16.txt b/forge-gui/res/formats/Archived/Historic/2021-09-16.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-09-16.txt
rename to forge-gui/res/formats/Archived/Historic/2021-09-16.txt
index 24a174b6fc5..ca35e73b08f 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-09-16.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-09-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (MID)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-09-16
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-10-13.txt b/forge-gui/res/formats/Archived/Historic/2021-10-13.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-10-13.txt
rename to forge-gui/res/formats/Archived/Historic/2021-10-13.txt
index b035380b660..255f6c70d9c 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-10-13.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-10-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2021-10-13)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-10-13
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-11-17.txt b/forge-gui/res/formats/Archived/Historic/2021-11-17.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-11-17.txt
rename to forge-gui/res/formats/Archived/Historic/2021-11-17.txt
index 8b765e98f59..b7a753fda7b 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-11-17.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (VOW)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-11-17
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2021-12-09.txt b/forge-gui/res/formats/Archived/Historic/2021-12-09.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2021-12-09.txt
rename to forge-gui/res/formats/Archived/Historic/2021-12-09.txt
index 736297e7eef..31b0f49d7b2 100644
--- a/forge-gui/res/formats/Archive/Historic/2021-12-09.txt
+++ b/forge-gui/res/formats/Archived/Historic/2021-12-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (YMID)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2021-12-09
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-01-25.txt b/forge-gui/res/formats/Archived/Historic/2022-01-25.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2022-01-25.txt
rename to forge-gui/res/formats/Archived/Historic/2022-01-25.txt
index c350f89b5ca..7be47cfc70b 100644
--- a/forge-gui/res/formats/Archive/Historic/2022-01-25.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2022-01-25)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-01-25
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-02-10.txt b/forge-gui/res/formats/Archived/Historic/2022-02-10.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2022-02-10.txt
rename to forge-gui/res/formats/Archived/Historic/2022-02-10.txt
index 3f8e6c05eae..8509dfb1781 100644
--- a/forge-gui/res/formats/Archive/Historic/2022-02-10.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-02-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (NEO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-02-10
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-02-24.txt b/forge-gui/res/formats/Archived/Historic/2022-02-24.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2022-02-24.txt
rename to forge-gui/res/formats/Archived/Historic/2022-02-24.txt
index e2ea1feb550..6a9a13b9d21 100644
--- a/forge-gui/res/formats/Archive/Historic/2022-02-24.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-02-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (2022-02-24)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-02-24
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-03-17.txt b/forge-gui/res/formats/Archived/Historic/2022-03-17.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2022-03-17.txt
rename to forge-gui/res/formats/Archived/Historic/2022-03-17.txt
index f49ef6a6120..6c9b3f160ce 100644
--- a/forge-gui/res/formats/Archive/Historic/2022-03-17.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (YNEO)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-03-17
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-04-28.txt b/forge-gui/res/formats/Archived/Historic/2022-04-28.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Historic/2022-04-28.txt
rename to forge-gui/res/formats/Archived/Historic/2022-04-28.txt
index 58f31e3750e..ddbb5e1c081 100644
--- a/forge-gui/res/formats/Archive/Historic/2022-04-28.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (SNC)
-Type:Archive
+Type:Archived
 Subtype:Arena
 Effective:2022-04-28
 Sets: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
diff --git a/forge-gui/res/formats/Archive/Historic/2022-06-02.txt b/forge-gui/res/formats/Archived/Historic/2022-06-02.txt
similarity index 100%
rename from forge-gui/res/formats/Archive/Historic/2022-06-02.txt
rename to forge-gui/res/formats/Archived/Historic/2022-06-02.txt
diff --git a/forge-gui/res/formats/Archive/Legacy/1996-05-01.txt b/forge-gui/res/formats/Archived/Legacy/1996-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1996-05-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1996-05-01.txt
index eed55c80069..0f0b5dd1abb 100644
--- a/forge-gui/res/formats/Archive/Legacy/1996-05-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1996-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-05-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1996-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Legacy/1996-07-01.txt b/forge-gui/res/formats/Archived/Legacy/1996-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1996-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1996-07-01.txt
index 3f95d9224f5..a3f5b92bdd2 100644
--- a/forge-gui/res/formats/Archive/Legacy/1996-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1996-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-07-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1996-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Legacy/1996-07-10.txt b/forge-gui/res/formats/Archived/Legacy/1996-07-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1996-07-10.txt
rename to forge-gui/res/formats/Archived/Legacy/1996-07-10.txt
index b805561f580..77259700483 100644
--- a/forge-gui/res/formats/Archive/Legacy/1996-07-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ALL)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1996-07-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Legacy/1996-10-01.txt b/forge-gui/res/formats/Archived/Legacy/1996-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1996-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1996-10-01.txt
index b7ecca93a57..3881b8b9528 100644
--- a/forge-gui/res/formats/Archive/Legacy/1996-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1996-10-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1996-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Legacy/1996-11-07.txt b/forge-gui/res/formats/Archived/Legacy/1996-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1996-11-07.txt
rename to forge-gui/res/formats/Archived/Legacy/1996-11-07.txt
index 03a47878bf3..60b3255d68e 100644
--- a/forge-gui/res/formats/Archive/Legacy/1996-11-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MIR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1996-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Archive/Legacy/1997-01-01.txt b/forge-gui/res/formats/Archived/Legacy/1997-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1997-01-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1997-01-01.txt
index 6831fb5390d..b72f1dffdf0 100644
--- a/forge-gui/res/formats/Archive/Legacy/1997-01-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1997-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1997-01-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1997-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Archive/Legacy/1997-03-05.txt b/forge-gui/res/formats/Archived/Legacy/1997-03-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1997-03-05.txt
rename to forge-gui/res/formats/Archived/Legacy/1997-03-05.txt
index 312161302c6..b07d45cc63c 100644
--- a/forge-gui/res/formats/Archive/Legacy/1997-03-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (VIS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1997-03-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Archive/Legacy/1997-04-23.txt b/forge-gui/res/formats/Archived/Legacy/1997-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1997-04-23.txt
rename to forge-gui/res/formats/Archived/Legacy/1997-04-23.txt
index 22e89651812..6d01a6740d0 100644
--- a/forge-gui/res/formats/Archive/Legacy/1997-04-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (5ED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1997-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Archive/Legacy/1997-07-01.txt b/forge-gui/res/formats/Archived/Legacy/1997-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1997-07-01.txt
index 97186fc614e..7ed224bb29f 100644
--- a/forge-gui/res/formats/Archive/Legacy/1997-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (WTH)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1997-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Legacy/1997-11-01.txt b/forge-gui/res/formats/Archived/Legacy/1997-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1997-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1997-11-01.txt
index 07bef3554aa..934ef6fd1c5 100644
--- a/forge-gui/res/formats/Archive/Legacy/1997-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (TMP)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1997-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Archive/Legacy/1998-04-01.txt b/forge-gui/res/formats/Archived/Legacy/1998-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1998-04-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1998-04-01.txt
index 57293cb836e..4d4edd5b4dc 100644
--- a/forge-gui/res/formats/Archive/Legacy/1998-04-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (STH)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1998-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Archive/Legacy/1998-07-01.txt b/forge-gui/res/formats/Archived/Legacy/1998-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1998-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1998-07-01.txt
index 1899a19b328..dbbb5107476 100644
--- a/forge-gui/res/formats/Archive/Legacy/1998-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (EXO)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1998-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Archive/Legacy/1998-11-01.txt b/forge-gui/res/formats/Archived/Legacy/1998-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1998-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1998-11-01.txt
index e52959a95e8..53a48ba3278 100644
--- a/forge-gui/res/formats/Archive/Legacy/1998-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (USG)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1998-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-01-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-01-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-01-01.txt
index 2b08c5c23c1..a0618e8b9ee 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-01-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-01-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-03-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-03-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-03-01.txt
index bc35b915486..eabb5452587 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-03-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ULG)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-04-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-04-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-04-01.txt
index 079bf2d03a3..4cbf037e4c8 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-04-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-04-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-06-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-06-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-06-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-06-01.txt
index e9afc596b64..b7b14270368 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-06-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (6ED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-06-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-07-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-07-01.txt
index e032e7be05f..85005b38deb 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (UDS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-10-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-10-01.txt
index 3f0a3a72cd1..0ec114acb4c 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (1999-10-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-11-01.txt b/forge-gui/res/formats/Archived/Legacy/1999-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-11-01.txt
index 76166903f3b..ae3c1597757 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MMQ)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Archive/Legacy/1999-11-12.txt b/forge-gui/res/formats/Archived/Legacy/1999-11-12.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/1999-11-12.txt
rename to forge-gui/res/formats/Archived/Legacy/1999-11-12.txt
index 9854ecde516..0e1c5f070c7 100644
--- a/forge-gui/res/formats/Archive/Legacy/1999-11-12.txt
+++ b/forge-gui/res/formats/Archived/Legacy/1999-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (BRB)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:1999-11-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB
diff --git a/forge-gui/res/formats/Archive/Legacy/2000-03-01.txt b/forge-gui/res/formats/Archived/Legacy/2000-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2000-03-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2000-03-01.txt
index 7402fd4110e..7abd06476b6 100644
--- a/forge-gui/res/formats/Archive/Legacy/2000-03-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (NMS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2000-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS
diff --git a/forge-gui/res/formats/Archive/Legacy/2000-07-01.txt b/forge-gui/res/formats/Archived/Legacy/2000-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2000-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2000-07-01.txt
index a56baee5e82..ebf79992f5c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2000-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (PCY)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2000-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY
diff --git a/forge-gui/res/formats/Archive/Legacy/2000-10-01.txt b/forge-gui/res/formats/Archived/Legacy/2000-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2000-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2000-10-01.txt
index 92c9a40e65c..2c49636a5af 100644
--- a/forge-gui/res/formats/Archive/Legacy/2000-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2000-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (BTD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2000-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD
diff --git a/forge-gui/res/formats/Archive/Legacy/2000-11-01.txt b/forge-gui/res/formats/Archived/Legacy/2000-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2000-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2000-11-01.txt
index d2da79ada2c..5667835071a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2000-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (INV)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2000-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV
diff --git a/forge-gui/res/formats/Archive/Legacy/2001-03-01.txt b/forge-gui/res/formats/Archived/Legacy/2001-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2001-03-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2001-03-01.txt
index 8d4b9ddd7dc..ccf8be234d0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2001-03-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (PLS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2001-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS
diff --git a/forge-gui/res/formats/Archive/Legacy/2001-05-01.txt b/forge-gui/res/formats/Archived/Legacy/2001-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2001-05-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2001-05-01.txt
index 5ad9cf070d2..1bd390782af 100644
--- a/forge-gui/res/formats/Archive/Legacy/2001-05-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (7ED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2001-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Archive/Legacy/2001-07-01.txt b/forge-gui/res/formats/Archived/Legacy/2001-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2001-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2001-07-01.txt
index 8f310fe867d..6512a26efd6 100644
--- a/forge-gui/res/formats/Archive/Legacy/2001-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (APC)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2001-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Archive/Legacy/2001-11-01.txt b/forge-gui/res/formats/Archived/Legacy/2001-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2001-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2001-11-01.txt
index 51986f01814..442a6bdb55d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2001-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ODY)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2001-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Archive/Legacy/2001-12-01.txt b/forge-gui/res/formats/Archived/Legacy/2001-12-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2001-12-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2001-12-01.txt
index 201cc6e9e34..2dc5f5b2732 100644
--- a/forge-gui/res/formats/Archive/Legacy/2001-12-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2001-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (DKM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2001-12-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Archive/Legacy/2002-01-01.txt b/forge-gui/res/formats/Archived/Legacy/2002-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2002-01-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2002-01-01.txt
index 92425e81923..67de66597de 100644
--- a/forge-gui/res/formats/Archive/Legacy/2002-01-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2002-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2002-01-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2002-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Archive/Legacy/2002-03-01.txt b/forge-gui/res/formats/Archived/Legacy/2002-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2002-03-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2002-03-01.txt
index 0111859bdfd..a0acd0f076b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2002-03-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (TOR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2002-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR
diff --git a/forge-gui/res/formats/Archive/Legacy/2002-07-01.txt b/forge-gui/res/formats/Archived/Legacy/2002-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2002-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2002-07-01.txt
index 8aae80a1ca2..f8f685d5722 100644
--- a/forge-gui/res/formats/Archive/Legacy/2002-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (JUD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2002-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD
diff --git a/forge-gui/res/formats/Archive/Legacy/2002-11-01.txt b/forge-gui/res/formats/Archived/Legacy/2002-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2002-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2002-11-01.txt
index 938affe74f4..eda3a4f97f0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2002-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (ONS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2002-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Archive/Legacy/2003-03-01.txt b/forge-gui/res/formats/Archived/Legacy/2003-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2003-03-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2003-03-01.txt
index 2f7c5dbfec9..0905f256a34 100644
--- a/forge-gui/res/formats/Archive/Legacy/2003-03-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (LGN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2003-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Legacy/2003-04-01.txt b/forge-gui/res/formats/Archived/Legacy/2003-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2003-04-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2003-04-01.txt
index 6755f9e731a..b6ae6ee918c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2003-04-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2003-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2003-04-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2003-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Legacy/2003-07-01.txt b/forge-gui/res/formats/Archived/Legacy/2003-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2003-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2003-07-01.txt
index 6deb5ca0fa8..2cbd8707ff6 100644
--- a/forge-gui/res/formats/Archive/Legacy/2003-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (SCG)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2003-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Archive/Legacy/2003-09-01.txt b/forge-gui/res/formats/Archived/Legacy/2003-09-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2003-09-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2003-09-01.txt
index 4adbffb31c1..03753ea0807 100644
--- a/forge-gui/res/formats/Archive/Legacy/2003-09-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (8ED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2003-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Archive/Legacy/2003-10-20.txt b/forge-gui/res/formats/Archived/Legacy/2003-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2003-10-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2003-10-20.txt
index 0365de4a591..c255df6d980 100644
--- a/forge-gui/res/formats/Archive/Legacy/2003-10-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (MRD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2003-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Legacy/2004-01-01.txt b/forge-gui/res/formats/Archived/Legacy/2004-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2004-01-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2004-01-01.txt
index 308ae9a48ac..2229195b69b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2004-01-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2004-01-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2004-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Legacy/2004-02-20.txt b/forge-gui/res/formats/Archived/Legacy/2004-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2004-02-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2004-02-20.txt
index 068f6dc50a8..50a66938242 100644
--- a/forge-gui/res/formats/Archive/Legacy/2004-02-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (DST)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2004-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Archive/Legacy/2004-06-20.txt b/forge-gui/res/formats/Archived/Legacy/2004-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2004-06-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2004-06-20.txt
index 424f5d430c3..f7de948bc4c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2004-06-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (5DN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2004-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Legacy/2004-09-20.txt b/forge-gui/res/formats/Archived/Legacy/2004-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2004-09-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2004-09-20.txt
index 3624a8817f8..b3da05ed3ac 100644
--- a/forge-gui/res/formats/Archive/Legacy/2004-09-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (2004-09-20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2004-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Legacy/2004-10-20.txt b/forge-gui/res/formats/Archived/Legacy/2004-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2004-10-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2004-10-20.txt
index 63fe0df3bef..108d2e4e57e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2004-10-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1.5 (CHK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2004-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Archive/Legacy/2005-02-20.txt b/forge-gui/res/formats/Archived/Legacy/2005-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2005-02-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2005-02-20.txt
index 3f283cb2be3..299b85240b7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2005-02-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BOK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2005-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Legacy/2005-06-20.txt b/forge-gui/res/formats/Archived/Legacy/2005-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2005-06-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2005-06-20.txt
index c3ccbff51ae..c7cee76b7fe 100644
--- a/forge-gui/res/formats/Archive/Legacy/2005-06-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2005-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Archive/Legacy/2005-08-20.txt b/forge-gui/res/formats/Archived/Legacy/2005-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2005-08-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2005-08-20.txt
index 64f7e8036a4..e152867e68d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2005-08-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (9ED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2005-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Legacy/2005-09-20.txt b/forge-gui/res/formats/Archived/Legacy/2005-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2005-09-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2005-09-20.txt
index 2d64d8c9a46..1bb07072916 100644
--- a/forge-gui/res/formats/Archive/Legacy/2005-09-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2005-09-20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2005-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Legacy/2005-10-20.txt b/forge-gui/res/formats/Archived/Legacy/2005-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2005-10-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2005-10-20.txt
index 2b53b968bbc..c24cd5e9f4f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2005-10-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RAV)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2005-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2006-02-20.txt b/forge-gui/res/formats/Archived/Legacy/2006-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2006-02-20.txt
index 3bb01e630e6..a674c036d96 100644
--- a/forge-gui/res/formats/Archive/Legacy/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GPT)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2006-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2006-05-20.txt b/forge-gui/res/formats/Archived/Legacy/2006-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2006-05-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2006-05-20.txt
index 3589b9dc86c..c066f2ea570 100644
--- a/forge-gui/res/formats/Archive/Legacy/2006-05-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DIS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2006-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2006-08-20.txt b/forge-gui/res/formats/Archived/Legacy/2006-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2006-08-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2006-08-20.txt
index 6df28370d9d..88721261c29 100644
--- a/forge-gui/res/formats/Archive/Legacy/2006-08-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CSP)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2006-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2006-10-20.txt b/forge-gui/res/formats/Archived/Legacy/2006-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2006-10-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2006-10-20.txt
index 83997141dd8..c338ecceef2 100644
--- a/forge-gui/res/formats/Archive/Legacy/2006-10-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TSP)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2006-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-02-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-02-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-02-20.txt
index 93908b9149c..0a2b7e73ef2 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-02-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PLC)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-05-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-05-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-05-20.txt
index 827c0ac49c1..338b3618717 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-05-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (FUT)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-06-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-06-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-06-20.txt
index 84d1366630a..29e9551891e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-06-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2007-06-20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-07-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-07-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-07-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-07-20.txt
index 8f35e28c0c6..7df67f356ad 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-07-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (10E)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-07-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-09-10.txt b/forge-gui/res/formats/Archived/Legacy/2007-09-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-09-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-09-10.txt
index 3ed94feab1a..33ec15e4315 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-09-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-09-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MED)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-09-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-09-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-09-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-09-20.txt
index 13c8de33189..ec9dd59ff58 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-09-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2007-09-20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-10-20.txt b/forge-gui/res/formats/Archived/Legacy/2007-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-10-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-10-20.txt
index e6054a51d75..fe1f3f303df 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-10-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (LRW)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2007-11-16.txt b/forge-gui/res/formats/Archived/Legacy/2007-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2007-11-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2007-11-16.txt
index c602728aeaf..d3dce116e5c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2007-11-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2007-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2007-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-02-01.txt b/forge-gui/res/formats/Archived/Legacy/2008-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-02-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-02-01.txt
index d42f05b3e2c..9f733716146 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-02-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MOR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-05-02.txt b/forge-gui/res/formats/Archived/Legacy/2008-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-05-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-05-02.txt
index a1ff40da0ff..184299a3afb 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-05-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SHM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-07-25.txt b/forge-gui/res/formats/Archived/Legacy/2008-07-25.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-07-25.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-07-25.txt
index 64874b274f6..7b203dab3df 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-07-25.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EVE)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-07-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-08-29.txt b/forge-gui/res/formats/Archived/Legacy/2008-08-29.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-08-29.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-08-29.txt
index a7cf67532ce..2f5eadd66a0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-08-29.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-08-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DRB)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-08-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-09-20.txt b/forge-gui/res/formats/Archived/Legacy/2008-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-09-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-09-20.txt
index 800d12164c3..e79d0bd9ff7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-09-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2008-09-20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-09-22.txt b/forge-gui/res/formats/Archived/Legacy/2008-09-22.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-09-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-09-22.txt
index 12c1d8c4369..47f26c36426 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-09-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-09-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-09-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-10-03.txt b/forge-gui/res/formats/Archived/Legacy/2008-10-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-10-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-10-03.txt
index 797a232d22b..e4c3f2a774f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-10-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ALA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-10-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2008-11-07.txt b/forge-gui/res/formats/Archived/Legacy/2008-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2008-11-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2008-11-07.txt
index f697c96615b..3a5e0482e2a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2008-11-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2008-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2008-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-02-06.txt b/forge-gui/res/formats/Archived/Legacy/2009-02-06.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-02-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-02-06.txt
index 2ba0d9febd5..0016fb7a395 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-02-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CFX)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-02-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-04-10.txt b/forge-gui/res/formats/Archived/Legacy/2009-04-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-04-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-04-10.txt
index 0d09b396cef..24039a0256e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-04-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-04-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDC)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-04-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-04-30.txt b/forge-gui/res/formats/Archived/Legacy/2009-04-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-04-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-04-30.txt
index 23af7343124..036656fc9ed 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-04-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ARB)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-04-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-07-17.txt b/forge-gui/res/formats/Archived/Legacy/2009-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-07-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-07-17.txt
index ec36e5397f4..b3c7ccc59f7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-07-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M10)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-08-26.txt b/forge-gui/res/formats/Archived/Legacy/2009-08-26.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-08-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-08-26.txt
index da89a99e128..c6238aee931 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-08-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD0)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-08-28.txt b/forge-gui/res/formats/Archived/Legacy/2009-08-28.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-08-28.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-08-28.txt
index ce43cd188b8..aac0679eac3 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-08-28.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V09)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-09-07.txt b/forge-gui/res/formats/Archived/Legacy/2009-09-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-09-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-09-07.txt
index 71c1a4a1486..e1a01070a16 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-09-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME3)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-10-01.txt b/forge-gui/res/formats/Archived/Legacy/2009-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-10-01.txt
index b2c7237a318..33f017fc4a2 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2009-10-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-10-02.txt b/forge-gui/res/formats/Archived/Legacy/2009-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-10-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-10-02.txt
index f6450b7bcaf..b441d223994 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-10-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ZEN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-10-30.txt b/forge-gui/res/formats/Archived/Legacy/2009-10-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-10-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-10-30.txt
index 8d52ffdefad..31e8b413fbe 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-10-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-10-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-10-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD
diff --git a/forge-gui/res/formats/Archive/Legacy/2009-11-20.txt b/forge-gui/res/formats/Archived/Legacy/2009-11-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2009-11-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2009-11-20.txt
index 7186225b22e..ed6884076a7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2009-11-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2009-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (H09)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2009-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-02-05.txt b/forge-gui/res/formats/Archived/Legacy/2010-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-02-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-02-05.txt
index ba19bf2b435..856bc9827c5 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-02-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (WWK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-03-19.txt b/forge-gui/res/formats/Archived/Legacy/2010-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-03-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-03-19.txt
index 6e2089f487d..1c13cf54a68 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-03-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDE)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-04-23.txt b/forge-gui/res/formats/Archived/Legacy/2010-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-04-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-04-23.txt
index 52514ac20ae..31a5238d983 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-04-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ROE)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-06-04.txt b/forge-gui/res/formats/Archived/Legacy/2010-06-04.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-06-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-06-04.txt
index 7023a7349a8..aedfeb63faa 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-06-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-06-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DPA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-06-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-07-01.txt b/forge-gui/res/formats/Archived/Legacy/2010-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-07-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-07-01.txt
index a53aeaa21bf..b63de1f4255 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-07-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2010-07-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-07-16.txt b/forge-gui/res/formats/Archived/Legacy/2010-07-16.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-07-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-07-16.txt
index e6163679762..0485bd81a2d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-07-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M11)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-07-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-08-27.txt b/forge-gui/res/formats/Archived/Legacy/2010-08-27.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-08-27.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-08-27.txt
index 84b72ccea19..0978020ed21 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-08-27.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-08-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V10)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-08-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-09-03.txt b/forge-gui/res/formats/Archived/Legacy/2010-09-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Legacy/2010-09-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-09-03.txt
index d7803d30486..93711438ca7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-09-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-09-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDF)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-09-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-10-01.txt b/forge-gui/res/formats/Archived/Legacy/2010-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2010-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-10-01.txt
index fc925fd237b..9f537a85824 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-11-08.txt b/forge-gui/res/formats/Archived/Legacy/2010-11-08.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2010-11-08.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-11-08.txt
index 9857181105e..90ea8c3f6c7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-11-08.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-11-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1
diff --git a/forge-gui/res/formats/Archive/Legacy/2010-11-19.txt b/forge-gui/res/formats/Archived/Legacy/2010-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2010-11-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2010-11-19.txt
index cb605e68578..b0fa0ad4672 100644
--- a/forge-gui/res/formats/Archive/Legacy/2010-11-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2010-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PD2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2010-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-01-01.txt b/forge-gui/res/formats/Archived/Legacy/2011-01-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-01-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-01-01.txt
index 2bc4478e34b..f3cad9b0eb1 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-01-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2011-01-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-01-10.txt b/forge-gui/res/formats/Archived/Legacy/2011-01-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-01-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-01-10.txt
index 23332717ffb..2ef42f8dfd3 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-01-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ME4)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-02-04.txt b/forge-gui/res/formats/Archived/Legacy/2011-02-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-02-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-02-04.txt
index 4a571b4a268..4a087ee41bd 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-02-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MBS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-02-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-04-01.txt b/forge-gui/res/formats/Archived/Legacy/2011-04-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-04-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-04-01.txt
index 1e54f6b78b9..3d00c27619b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-04-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDG)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-05-13.txt b/forge-gui/res/formats/Archived/Legacy/2011-05-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-05-13.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-05-13.txt
index 1b0b31bc33b..bd55cceca08 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-05-13.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (NPH)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-05-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-05-14.txt b/forge-gui/res/formats/Archived/Legacy/2011-05-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-05-14.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-05-14.txt
index 18b38c98888..da9e99a5a6d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-05-14.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-05-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TD2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-05-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-06-17.txt b/forge-gui/res/formats/Archived/Legacy/2011-06-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-06-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-06-17.txt
index ec56e888dee..c492c6da71a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-06-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-06-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (COM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-06-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-07-15.txt b/forge-gui/res/formats/Archived/Legacy/2011-07-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-07-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-07-15.txt
index 465e2167dcf..7883dd7ae2d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-07-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M12)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-08-26.txt b/forge-gui/res/formats/Archived/Legacy/2011-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-08-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-08-26.txt
index 46a3db99322..63931154b9a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-08-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V11)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-09-02.txt b/forge-gui/res/formats/Archived/Legacy/2011-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-09-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-09-02.txt
index e4c2685bdc4..aad46b02873 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-09-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDH)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-09-30.txt b/forge-gui/res/formats/Archived/Legacy/2011-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-09-30.txt
index b3309f1b8fe..25b02057287 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ISD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-10-01.txt b/forge-gui/res/formats/Archived/Legacy/2011-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-10-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-10-01.txt
index 8a4da48ab19..ad67b38c822 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-10-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2011-10-01)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Archive/Legacy/2011-11-18.txt b/forge-gui/res/formats/Archived/Legacy/2011-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2011-11-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2011-11-18.txt
index c31dd038730..c343523c5f0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2011-11-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2011-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PD3)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2011-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-02-03.txt b/forge-gui/res/formats/Archived/Legacy/2012-02-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-02-03.txt
index f397798032d..2ce0ad76177 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DKA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-02-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-03-30.txt b/forge-gui/res/formats/Archived/Legacy/2012-03-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-03-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-03-30.txt
index 5f44ef53693..84616501a01 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-03-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-03-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDI)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-03-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-05-04.txt b/forge-gui/res/formats/Archived/Legacy/2012-05-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-05-04.txt
index 1ee2f7dde7e..a08e41a0f50 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AVR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-05-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-06-29.txt b/forge-gui/res/formats/Archived/Legacy/2012-06-29.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-06-29.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-06-29.txt
index 07cd1b14289..1c40b5b2279 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-06-29.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-06-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2012-06-29)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-06-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-07-13.txt b/forge-gui/res/formats/Archived/Legacy/2012-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-07-13.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-07-13.txt
index 63e8296cb01..d66935fcd86 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-07-13.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M13)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-08-31.txt b/forge-gui/res/formats/Archived/Legacy/2012-08-31.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-08-31.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-08-31.txt
index b6d4dcad020..9f58ed92ce0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-08-31.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-08-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V12)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-08-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-09-07.txt b/forge-gui/res/formats/Archived/Legacy/2012-09-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-09-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-09-07.txt
index 27f7ec3affd..fa7e7723274 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-09-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDJ)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-10-05.txt b/forge-gui/res/formats/Archived/Legacy/2012-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-10-05.txt
index a0bcc4cd2ef..7b4f364c848 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-10-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RTR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR
diff --git a/forge-gui/res/formats/Archive/Legacy/2012-11-02.txt b/forge-gui/res/formats/Archived/Legacy/2012-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2012-11-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2012-11-02.txt
index 9f416968f4d..aff6c6d8c67 100644
--- a/forge-gui/res/formats/Archive/Legacy/2012-11-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2012-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CM1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2012-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-02-01.txt b/forge-gui/res/formats/Archived/Legacy/2013-02-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-02-01.txt
index ccd2da504d8..afab00cb732 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-02-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GTC)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-03-15.txt b/forge-gui/res/formats/Archived/Legacy/2013-03-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-03-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-03-15.txt
index c17bf765e65..e51268c30b0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-03-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-03-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-03-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-05-03.txt b/forge-gui/res/formats/Archived/Legacy/2013-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-05-03.txt
index 857d5c9f6b2..55b905ba336 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-05-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DGM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-06-07.txt b/forge-gui/res/formats/Archived/Legacy/2013-06-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-06-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-06-07.txt
index db204cc4b4f..9cdb71a3eee 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-06-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-06-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-07-19.txt b/forge-gui/res/formats/Archived/Legacy/2013-07-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-07-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-07-19.txt
index 1158004c21f..271a90d2fa8 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-07-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M14)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-07-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-08-23.txt b/forge-gui/res/formats/Archived/Legacy/2013-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-08-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-08-23.txt
index 80fe356c463..6a6e5fff5b9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-08-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V13)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-09-06.txt b/forge-gui/res/formats/Archived/Legacy/2013-09-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-09-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-09-06.txt
index fd1e8f2bdfc..c9c7673dc7a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-09-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-09-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDL)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-09-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-09-27.txt b/forge-gui/res/formats/Archived/Legacy/2013-09-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-09-27.txt
index ee3a6bf4684..79e6d7e296f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (THS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-09-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS
diff --git a/forge-gui/res/formats/Archive/Legacy/2013-11-01.txt b/forge-gui/res/formats/Archived/Legacy/2013-11-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2013-11-01.txt
rename to forge-gui/res/formats/Archived/Legacy/2013-11-01.txt
index dd649ed007b..15d61ec92ed 100644
--- a/forge-gui/res/formats/Archive/Legacy/2013-11-01.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2013-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C13)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2013-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-02-07.txt b/forge-gui/res/formats/Archived/Legacy/2014-02-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-02-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-02-07.txt
index d45278363d0..587c8f31049 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-02-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BNG)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-02-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-03-14.txt b/forge-gui/res/formats/Archived/Legacy/2014-03-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-03-14.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-03-14.txt
index b8e538cc9cf..da3b03a3133 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-03-14.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-03-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-03-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-05-02.txt b/forge-gui/res/formats/Archived/Legacy/2014-05-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-05-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-05-02.txt
index 5584bae1eb3..09059b1dba8 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-05-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (JOU)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-05-30.txt b/forge-gui/res/formats/Archived/Legacy/2014-05-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-05-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-05-30.txt
index a12e9f64682..cb0b55c57ff 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-05-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MD1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-05-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-06-06.txt b/forge-gui/res/formats/Archived/Legacy/2014-06-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-06-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-06-06.txt
index d75018f9af7..4fdbd56db62 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-06-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-06-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CNS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-06-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-06-16.txt b/forge-gui/res/formats/Archived/Legacy/2014-06-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-06-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-06-16.txt
index 93f5283cc63..90c7a435709 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-06-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-06-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (VMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-06-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-07-18.txt b/forge-gui/res/formats/Archived/Legacy/2014-07-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-07-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-07-18.txt
index e52aaec06f9..e47a800ef28 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-07-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M15)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-07-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-08-22.txt b/forge-gui/res/formats/Archived/Legacy/2014-08-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-08-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-08-22.txt
index c0bc1ccb657..b19ad7e0fdc 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-08-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-08-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V14)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-08-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-09-05.txt b/forge-gui/res/formats/Archived/Legacy/2014-09-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-09-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-09-05.txt
index e01b277ab49..f563dbcd349 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-09-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-09-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-09-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-09-26.txt b/forge-gui/res/formats/Archived/Legacy/2014-09-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-09-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-09-26.txt
index 21f4c8b80dd..856f11ebf23 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-09-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KTK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-09-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-11-07.txt b/forge-gui/res/formats/Archived/Legacy/2014-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-11-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-11-07.txt
index 84acc913f27..58420c537e9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-11-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C14)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2014-12-05.txt b/forge-gui/res/formats/Archived/Legacy/2014-12-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2014-12-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2014-12-05.txt
index 71aee33663d..0940fab4e7e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2014-12-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2014-12-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DD3)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2014-12-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-01-23.txt b/forge-gui/res/formats/Archived/Legacy/2015-01-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-01-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-01-23.txt
index fbe9470aab6..4579b372505 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-01-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (FRF)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-01-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-02-27.txt b/forge-gui/res/formats/Archived/Legacy/2015-02-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-02-27.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-02-27.txt
index 19bb6950795..89f62bc9e74 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-02-27.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-02-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDO)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-02-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-03-27.txt b/forge-gui/res/formats/Archived/Legacy/2015-03-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-03-27.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-03-27.txt
index 3ffd35d2b74..d4fab84d8bc 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-03-27.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DTK)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-03-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-05-06.txt b/forge-gui/res/formats/Archived/Legacy/2015-05-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-05-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-05-06.txt
index 7c2ca36dd90..49573aafd73 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-05-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-05-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TPR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-05-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-05-22.txt b/forge-gui/res/formats/Archived/Legacy/2015-05-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-05-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-05-22.txt
index e247a698d40..45990b28a0c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-05-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MM2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-05-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-07-17.txt b/forge-gui/res/formats/Archived/Legacy/2015-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-07-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-07-17.txt
index 66bfb6e56b5..f3d2ced2c53 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-07-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ORI)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-08-21.txt b/forge-gui/res/formats/Archived/Legacy/2015-08-21.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-08-21.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-08-21.txt
index 02ccc448d9d..a8e13b0db15 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-08-21.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-08-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V15)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-08-21
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-08-28.txt b/forge-gui/res/formats/Archived/Legacy/2015-08-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-08-28.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-08-28.txt
index 47ca21fc163..40d1254aae9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-08-28.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDP)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-10-02.txt b/forge-gui/res/formats/Archived/Legacy/2015-10-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-10-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-10-02.txt
index 8971a0d3a93..757c319d361 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-10-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (BFZ)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-11-13.txt b/forge-gui/res/formats/Archived/Legacy/2015-11-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-11-13.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-11-13.txt
index b4cb7f0f73f..f9f1e262f8a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-11-13.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C15)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2015-11-18.txt b/forge-gui/res/formats/Archived/Legacy/2015-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2015-11-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2015-11-18.txt
index da9c451d313..68b83d3f687 100644
--- a/forge-gui/res/formats/Archive/Legacy/2015-11-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2015-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PZ1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2015-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-01-22.txt b/forge-gui/res/formats/Archived/Legacy/2016-01-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-01-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-01-22.txt
index b29e3937885..a331af4d4cb 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-01-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (OGW)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-01-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-02-26.txt b/forge-gui/res/formats/Archived/Legacy/2016-02-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-02-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-02-26.txt
index 7bfb177a2f0..58ee036b5a0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-02-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-02-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDQ)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-02-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-04-08.txt b/forge-gui/res/formats/Archived/Legacy/2016-04-08.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-04-08.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-04-08.txt
index c56c318ce21..d9c19d9320d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-04-08.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SOI)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-04-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-06-10.txt b/forge-gui/res/formats/Archived/Legacy/2016-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-06-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-06-10.txt
index 6b0af13ab9f..78a0733485c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-06-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-07-22.txt b/forge-gui/res/formats/Archived/Legacy/2016-07-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-07-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-07-22.txt
index a7f88626c37..e9ecb6b0e0d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-07-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (EMN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-07-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-08-19.txt b/forge-gui/res/formats/Archived/Legacy/2016-08-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-08-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-08-19.txt
index 0abe963e04c..e35aed3ef2b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-08-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-08-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V16)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-08-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-08-26.txt b/forge-gui/res/formats/Archived/Legacy/2016-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-08-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-08-26.txt
index eb7953ccb51..797d218e2d7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-08-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CN2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-09-02.txt b/forge-gui/res/formats/Archived/Legacy/2016-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-09-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-09-02.txt
index 3076a01d727..a6046be99c9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-09-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-09-30.txt b/forge-gui/res/formats/Archived/Legacy/2016-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-09-30.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-09-30.txt
index f44985aa061..e89bd92cb7c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-09-30.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KLD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-11-11.txt b/forge-gui/res/formats/Archived/Legacy/2016-11-11.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-11-11.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-11-11.txt
index 91eeb3a4c92..dc3d9cf55a9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-11-11.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-11-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C16)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-11-11
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2016-11-16.txt b/forge-gui/res/formats/Archived/Legacy/2016-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2016-11-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2016-11-16.txt
index f4ab796634e..18ad9dccb13 100644
--- a/forge-gui/res/formats/Archive/Legacy/2016-11-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2016-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (PZ2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2016-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-01-20.txt b/forge-gui/res/formats/Archived/Legacy/2017-01-20.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-01-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-01-20.txt
index e0d9f5ee0f2..27b3d46efc5 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-01-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AER)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-01-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-03-17.txt b/forge-gui/res/formats/Archived/Legacy/2017-03-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-03-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-03-17.txt
index e348dd7a538..52721d01a98 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-03-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MM3)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-03-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-03-31.txt b/forge-gui/res/formats/Archived/Legacy/2017-03-31.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-03-31.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-03-31.txt
index bb37101dfa0..0e2b90f18c0 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-03-31.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-03-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDS)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-03-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-04-24.txt b/forge-gui/res/formats/Archived/Legacy/2017-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-04-24.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-04-24.txt
index 51aa7af5930..4ba4cf1c619 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-04-24.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2017-04-24)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-04-28.txt b/forge-gui/res/formats/Archived/Legacy/2017-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-04-28.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-04-28.txt
index f8716113c02..295cd609eb7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-04-28.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AKH)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-04-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-06-09.txt b/forge-gui/res/formats/Archived/Legacy/2017-06-09.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-06-09.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-06-09.txt
index 477f87eaa60..8d7a16f4bd3 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-06-09.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-06-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-07-14.txt b/forge-gui/res/formats/Archived/Legacy/2017-07-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-07-14.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-07-14.txt
index c89134bb2e6..0f8516ce274 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-07-14.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (HOU)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-07-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-08-25.txt b/forge-gui/res/formats/Archived/Legacy/2017-08-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-08-25.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-08-25.txt
index 99072f75d51..ce14afd3693 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-08-25.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-08-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C17)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-08-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-09-29.txt b/forge-gui/res/formats/Archived/Legacy/2017-09-29.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-09-29.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-09-29.txt
index 2e41d905cc5..4188ea17209 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-09-29.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (XLN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-09-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-11-10.txt b/forge-gui/res/formats/Archived/Legacy/2017-11-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-11-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-11-10.txt
index f2fba1680b1..44cd69d1b43 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-11-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-11-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDT)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-11-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-11-17.txt b/forge-gui/res/formats/Archived/Legacy/2017-11-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-11-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-11-17.txt
index 6260aa47605..995a8ed6dd7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-11-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (IMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-11-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA
diff --git a/forge-gui/res/formats/Archive/Legacy/2017-11-24.txt b/forge-gui/res/formats/Archived/Legacy/2017-11-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2017-11-24.txt
rename to forge-gui/res/formats/Archived/Legacy/2017-11-24.txt
index e4ddfaadd41..604c41e350c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2017-11-24.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2017-11-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (V17)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2017-11-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-01-19.txt b/forge-gui/res/formats/Archived/Legacy/2018-01-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-01-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-01-19.txt
index c0843cc044b..44cb300f76e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-01-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RIX)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-01-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-03-16.txt b/forge-gui/res/formats/Archived/Legacy/2018-03-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-03-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-03-16.txt
index d66f335bd61..b47b922f45c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-03-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-03-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (A25)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-03-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-04-06.txt b/forge-gui/res/formats/Archived/Legacy/2018-04-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-04-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-04-06.txt
index 1e768f8218d..b021602b691 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-04-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-04-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DDU)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-04-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-04-27.txt b/forge-gui/res/formats/Archived/Legacy/2018-04-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-04-27.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-04-27.txt
index 5b497e9fc2b..ff0da276193 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-04-27.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DOM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-04-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-06-08.txt b/forge-gui/res/formats/Archived/Legacy/2018-06-08.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-06-08.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-06-08.txt
index 80797466471..d790b8b854c 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-06-08.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-06-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CM2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-06-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-06-15.txt b/forge-gui/res/formats/Archived/Legacy/2018-06-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-06-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-06-15.txt
index 09d056c9e27..6211baf8f2b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-06-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-06-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-06-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-06-22.txt b/forge-gui/res/formats/Archived/Legacy/2018-06-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-06-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-06-22.txt
index 91133d0d544..d5eb3a3466b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-06-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GS1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-06-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-07-06.txt b/forge-gui/res/formats/Archived/Legacy/2018-07-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-07-06.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-07-06.txt
index d9055a26b8e..7327a85978b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-07-06.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-07-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2018-07-06)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-07-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-07-13.txt b/forge-gui/res/formats/Archived/Legacy/2018-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-07-13.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-07-13.txt
index 4d15e9c8bf3..265127cc606 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-07-13.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M19)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-08-09.txt b/forge-gui/res/formats/Archived/Legacy/2018-08-09.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-08-09.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-08-09.txt
index a6c93c57ca4..02269455133 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-08-09.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-08-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C18)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-08-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-10-05.txt b/forge-gui/res/formats/Archived/Legacy/2018-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-10-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-10-05.txt
index 02f58a5ab7b..e17479d123f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-10-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GRN)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-11-02.txt b/forge-gui/res/formats/Archived/Legacy/2018-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-11-02.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-11-02.txt
index 6fe3c5abd7c..36cfa3d86a9 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-11-02.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GK1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-11-16.txt b/forge-gui/res/formats/Archived/Legacy/2018-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-11-16.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-11-16.txt
index d9c23581b52..fb33f0f52a7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-11-16.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (G18)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT
diff --git a/forge-gui/res/formats/Archive/Legacy/2018-12-07.txt b/forge-gui/res/formats/Archived/Legacy/2018-12-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2018-12-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2018-12-07.txt
index 743c8ecd69d..a1468d86f25 100644
--- a/forge-gui/res/formats/Archive/Legacy/2018-12-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2018-12-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (UMA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2018-12-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-01-25.txt b/forge-gui/res/formats/Archived/Legacy/2019-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-01-25.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-01-25.txt
index a64e10aa457..f171e1ecd54 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-01-25.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (RNA)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-02-15.txt b/forge-gui/res/formats/Archived/Legacy/2019-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-02-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-02-15.txt
index 08c749e7044..c117ab13727 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-02-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GK2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-05-03.txt b/forge-gui/res/formats/Archived/Legacy/2019-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-05-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-05-03.txt
index 4437ab947dd..5f317ed52ec 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-05-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (WAR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-06-14.txt b/forge-gui/res/formats/Archived/Legacy/2019-06-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-06-14.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-06-14.txt
index 5dbd43bd3bd..e982b42bf41 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-06-14.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MH1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-06-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-06-28.txt b/forge-gui/res/formats/Archived/Legacy/2019-06-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-06-28.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-06-28.txt
index ecc89f70110..075040c7a20 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-06-28.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-06-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-06-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-07-12.txt b/forge-gui/res/formats/Archived/Legacy/2019-07-12.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-07-12.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-07-12.txt
index b67da30306d..222298e59cc 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-07-12.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M20)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-07-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-08-23.txt b/forge-gui/res/formats/Archived/Legacy/2019-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-08-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-08-23.txt
index c64bb3b22bc..4b276ed1d52 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-08-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (C19)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-10-04.txt b/forge-gui/res/formats/Archived/Legacy/2019-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-10-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-10-04.txt
index a66beb49db7..8f7c307193d 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-10-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ELD)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-11-07.txt b/forge-gui/res/formats/Archived/Legacy/2019-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-11-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-11-07.txt
index 52aaf74c7ac..dc529c25d7e 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-11-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MB1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-11-15.txt b/forge-gui/res/formats/Archived/Legacy/2019-11-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-11-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-11-15.txt
index 03eff931861..773436eb134 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-11-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (GN2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2019-11-22.txt b/forge-gui/res/formats/Archived/Legacy/2019-11-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2019-11-22.txt
rename to forge-gui/res/formats/Archived/Legacy/2019-11-22.txt
index 077027b293b..fa51d1b4b46 100644
--- a/forge-gui/res/formats/Archive/Legacy/2019-11-22.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2019-11-22)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2019-11-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-01-24.txt b/forge-gui/res/formats/Archived/Legacy/2020-01-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-01-24.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-01-24.txt
index 149ffb372e0..377b0bce243 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-01-24.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (THB)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-01-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-03-10.txt b/forge-gui/res/formats/Archived/Legacy/2020-03-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-03-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-03-10.txt
index dcd197237fa..7a4f8f78f34 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-03-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-03-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-03-10)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-03-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-04-24.txt b/forge-gui/res/formats/Archived/Legacy/2020-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-04-24.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-04-24.txt
index 4845eb16136..af095a5f6e3 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-04-24.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (IKO)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-05-18.txt b/forge-gui/res/formats/Archived/Legacy/2020-05-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-05-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-05-18.txt
index e9ba054e6af..0b4324a1973 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-05-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-05-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-05-18)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-05-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-06-10.txt b/forge-gui/res/formats/Archived/Legacy/2020-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-06-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-06-10.txt
index 996760371e3..fd0f99563d5 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-06-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-06-10)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-06-26.txt b/forge-gui/res/formats/Archived/Legacy/2020-06-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-06-26.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-06-26.txt
index ccadfa70933..946ac4cce64 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-06-26.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-06-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SS3)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-06-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-07-03.txt b/forge-gui/res/formats/Archived/Legacy/2020-07-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-07-03.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-07-03.txt
index 81c73fad05e..a272d493113 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-07-03.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (M21)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-07-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-07-17.txt b/forge-gui/res/formats/Archived/Legacy/2020-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-07-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-07-17.txt
index 1dd1a3b950f..9e2e4d5b02b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-07-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (JMP)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-08-07.txt b/forge-gui/res/formats/Archived/Legacy/2020-08-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-08-07.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-08-07.txt
index 9ca8716898f..a485848e748 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-08-07.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-08-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2XM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-08-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-09-25.txt b/forge-gui/res/formats/Archived/Legacy/2020-09-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-09-25.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-09-25.txt
index 2c698b10620..72da3bec1e8 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-09-25.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-09-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-10-04.txt b/forge-gui/res/formats/Archived/Legacy/2020-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-10-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-10-04.txt
index e6764d88850..4e6816a597f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-10-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2020-10-04)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-11-20.txt b/forge-gui/res/formats/Archived/Legacy/2020-11-20.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-11-20.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-11-20.txt
index 3df00e34f9f..147fb52bdb4 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-11-20.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CMR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2020-12-04.txt b/forge-gui/res/formats/Archived/Legacy/2020-12-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2020-12-04.txt
rename to forge-gui/res/formats/Archived/Legacy/2020-12-04.txt
index aaa6ff3bcda..4ed22ef8ce4 100644
--- a/forge-gui/res/formats/Archive/Legacy/2020-12-04.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2020-12-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CC1)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2020-12-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-02-05.txt b/forge-gui/res/formats/Archived/Legacy/2021-02-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-02-05.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-02-05.txt
index ec0ad1fe85c..294af77280b 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-02-05.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (KHM)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-02-15.txt b/forge-gui/res/formats/Archived/Legacy/2021-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-02-15.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-02-15.txt
index 928b35d5113..f09490b81e8 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-02-15.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2021-02-15)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-03-19.txt b/forge-gui/res/formats/Archived/Legacy/2021-03-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-03-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-03-19.txt
index cdf8815842f..1e16b73c916 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-03-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (TSR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-04-23.txt b/forge-gui/res/formats/Archived/Legacy/2021-04-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-04-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-04-23.txt
index 35db47a91a3..a43878057d6 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-04-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (STX)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-06-18.txt b/forge-gui/res/formats/Archived/Legacy/2021-06-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-06-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-06-18.txt
index dd5d61584b7..6e34542d27f 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-06-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MH2)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-06-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-07-23.txt b/forge-gui/res/formats/Archived/Legacy/2021-07-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-07-23.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-07-23.txt
index d7d6a96cb7c..d689f1f4a67 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-07-23.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (AFR)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-07-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-09-24.txt b/forge-gui/res/formats/Archived/Legacy/2021-09-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-09-24.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-09-24.txt
index ff98a4c172b..6e38618e555 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-09-24.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (MID)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-09-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-10-18.txt b/forge-gui/res/formats/Archived/Legacy/2021-10-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-10-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-10-18.txt
index 2b13d269000..3e6d1909165 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-10-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-10-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2021-10-18)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-10-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Legacy/2021-11-19.txt b/forge-gui/res/formats/Archived/Legacy/2021-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2021-11-19.txt
rename to forge-gui/res/formats/Archived/Legacy/2021-11-19.txt
index 717764455c7..62992afc3e6 100644
--- a/forge-gui/res/formats/Archive/Legacy/2021-11-19.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (VOW)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2021-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-01-25.txt b/forge-gui/res/formats/Archived/Legacy/2022-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2022-01-25.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-01-25.txt
index 70368b5bec7..59bfd252313 100644
--- a/forge-gui/res/formats/Archive/Legacy/2022-01-25.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2022-01-25)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2022-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-01-28.txt b/forge-gui/res/formats/Archived/Legacy/2022-01-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2022-01-28.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-01-28.txt
index 44c3618ea5e..5cab495fc3a 100644
--- a/forge-gui/res/formats/Archive/Legacy/2022-01-28.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (DBL)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2022-01-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-02-17.txt b/forge-gui/res/formats/Archived/Legacy/2022-02-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2022-02-17.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-02-17.txt
index 594f141b97d..915649573ce 100644
--- a/forge-gui/res/formats/Archive/Legacy/2022-02-17.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-02-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (2022-02-17)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2022-02-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-02-18.txt b/forge-gui/res/formats/Archived/Legacy/2022-02-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2022-02-18.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-02-18.txt
index c7ff6892360..433ec2ee105 100644
--- a/forge-gui/res/formats/Archive/Legacy/2022-02-18.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (NEO)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2022-02-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-04-29.txt b/forge-gui/res/formats/Archived/Legacy/2022-04-29.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Legacy/2022-04-29.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-04-29.txt
index 97b22ab4db1..629870dd3e7 100644
--- a/forge-gui/res/formats/Archive/Legacy/2022-04-29.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (SNC)
-Type:Archive
+Type:Archived
 Subtype:Legacy
 Effective:2022-04-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC
diff --git a/forge-gui/res/formats/Archive/Legacy/2022-06-10.txt b/forge-gui/res/formats/Archived/Legacy/2022-06-10.txt
similarity index 100%
rename from forge-gui/res/formats/Archive/Legacy/2022-06-10.txt
rename to forge-gui/res/formats/Archived/Legacy/2022-06-10.txt
diff --git a/forge-gui/res/formats/Archive/Modern/2011-05-19.txt b/forge-gui/res/formats/Archived/Modern/2011-05-19.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Modern/2011-05-19.txt
rename to forge-gui/res/formats/Archived/Modern/2011-05-19.txt
index f52d8805f40..68b8cbe6b50 100644
--- a/forge-gui/res/formats/Archive/Modern/2011-05-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2011-05-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-05-19)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2011-05-19
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2011-07-15.txt b/forge-gui/res/formats/Archived/Modern/2011-07-15.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Modern/2011-07-15.txt
rename to forge-gui/res/formats/Archived/Modern/2011-07-15.txt
index 1c2bcc6a50e..9773f441b54 100644
--- a/forge-gui/res/formats/Archive/Modern/2011-07-15.txt
+++ b/forge-gui/res/formats/Archived/Modern/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M12)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2011-07-15
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2011-08-12.txt b/forge-gui/res/formats/Archived/Modern/2011-08-12.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Modern/2011-08-12.txt
rename to forge-gui/res/formats/Archived/Modern/2011-08-12.txt
index 6865473dba5..00cca3e51da 100644
--- a/forge-gui/res/formats/Archive/Modern/2011-08-12.txt
+++ b/forge-gui/res/formats/Archived/Modern/2011-08-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-08-12)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2011-08-12
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2011-09-30.txt b/forge-gui/res/formats/Archived/Modern/2011-09-30.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Modern/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Modern/2011-09-30.txt
index 83b9673f3a3..997abb7a083 100644
--- a/forge-gui/res/formats/Archive/Modern/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Modern/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ISD)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2011-09-30
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2011-10-01.txt b/forge-gui/res/formats/Archived/Modern/2011-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2011-10-01.txt
rename to forge-gui/res/formats/Archived/Modern/2011-10-01.txt
index 366d0274498..065db028d72 100644
--- a/forge-gui/res/formats/Archive/Modern/2011-10-01.txt
+++ b/forge-gui/res/formats/Archived/Modern/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2011-10-01)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2011-10-01
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-01-01.txt b/forge-gui/res/formats/Archived/Modern/2012-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-01-01.txt
rename to forge-gui/res/formats/Archived/Modern/2012-01-01.txt
index 84d88bb5d65..9614900c67e 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-01-01.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2012-01-01)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-01-01
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-02-03.txt b/forge-gui/res/formats/Archived/Modern/2012-02-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Modern/2012-02-03.txt
index e65667ba750..4b5f3a571ba 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DKA)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-02-03
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-05-04.txt b/forge-gui/res/formats/Archived/Modern/2012-05-04.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Modern/2012-05-04.txt
index fd4db347319..a1ec0e2eba8 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AVR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-05-04
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-07-13.txt b/forge-gui/res/formats/Archived/Modern/2012-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-07-13.txt
rename to forge-gui/res/formats/Archived/Modern/2012-07-13.txt
index cc56349f8b1..f65b47cda3f 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-07-13.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M13)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-07-13
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-10-01.txt b/forge-gui/res/formats/Archived/Modern/2012-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-10-01.txt
rename to forge-gui/res/formats/Archived/Modern/2012-10-01.txt
index ca6ba0879e6..2aed2a1972b 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-10-01.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2012-10-01)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-10-01
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2012-10-05.txt b/forge-gui/res/formats/Archived/Modern/2012-10-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Modern/2012-10-05.txt
index 70f98aca81f..f8fd4d22c48 100644
--- a/forge-gui/res/formats/Archive/Modern/2012-10-05.txt
+++ b/forge-gui/res/formats/Archived/Modern/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RTR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2012-10-05
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2013-02-01.txt b/forge-gui/res/formats/Archived/Modern/2013-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Modern/2013-02-01.txt
index 2282894381b..ebe69a9399d 100644
--- a/forge-gui/res/formats/Archive/Modern/2013-02-01.txt
+++ b/forge-gui/res/formats/Archived/Modern/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GTC)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2013-02-01
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2013-05-03.txt b/forge-gui/res/formats/Archived/Modern/2013-05-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Modern/2013-05-03.txt
index fb537fa464e..b60729998c3 100644
--- a/forge-gui/res/formats/Archive/Modern/2013-05-03.txt
+++ b/forge-gui/res/formats/Archived/Modern/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DGM)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2013-05-03
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2013-06-07.txt b/forge-gui/res/formats/Archived/Modern/2013-06-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2013-06-07.txt
rename to forge-gui/res/formats/Archived/Modern/2013-06-07.txt
index 7a9f5dd6274..9f6c738f918 100644
--- a/forge-gui/res/formats/Archive/Modern/2013-06-07.txt
+++ b/forge-gui/res/formats/Archived/Modern/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MMA)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2013-06-07
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2013-07-19.txt b/forge-gui/res/formats/Archived/Modern/2013-07-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2013-07-19.txt
rename to forge-gui/res/formats/Archived/Modern/2013-07-19.txt
index d48ba43916a..01f3c0f63e0 100644
--- a/forge-gui/res/formats/Archive/Modern/2013-07-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M14)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2013-07-19
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2013-09-27.txt b/forge-gui/res/formats/Archived/Modern/2013-09-27.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Modern/2013-09-27.txt
index 5da70cac3f7..a6e915500c6 100644
--- a/forge-gui/res/formats/Archive/Modern/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Modern/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (THS)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2013-09-27
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2014-02-07.txt b/forge-gui/res/formats/Archived/Modern/2014-02-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2014-02-07.txt
rename to forge-gui/res/formats/Archived/Modern/2014-02-07.txt
index 0a7bfb0b2b2..70e51964bd2 100644
--- a/forge-gui/res/formats/Archive/Modern/2014-02-07.txt
+++ b/forge-gui/res/formats/Archived/Modern/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (BNG)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2014-02-07
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2014-05-02.txt b/forge-gui/res/formats/Archived/Modern/2014-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2014-05-02.txt
rename to forge-gui/res/formats/Archived/Modern/2014-05-02.txt
index 1ef2eebc5dc..e3da00214e2 100644
--- a/forge-gui/res/formats/Archive/Modern/2014-05-02.txt
+++ b/forge-gui/res/formats/Archived/Modern/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (JOU)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2014-05-02
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2014-05-30.txt b/forge-gui/res/formats/Archived/Modern/2014-05-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2014-05-30.txt
rename to forge-gui/res/formats/Archived/Modern/2014-05-30.txt
index d86d70c1805..a355bbae376 100644
--- a/forge-gui/res/formats/Archive/Modern/2014-05-30.txt
+++ b/forge-gui/res/formats/Archived/Modern/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MD1)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2014-05-30
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2014-07-18.txt b/forge-gui/res/formats/Archived/Modern/2014-07-18.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2014-07-18.txt
rename to forge-gui/res/formats/Archived/Modern/2014-07-18.txt
index 9e2579a62b9..764eda9412e 100644
--- a/forge-gui/res/formats/Archive/Modern/2014-07-18.txt
+++ b/forge-gui/res/formats/Archived/Modern/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M15)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2014-07-18
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2014-09-26.txt b/forge-gui/res/formats/Archived/Modern/2014-09-26.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2014-09-26.txt
rename to forge-gui/res/formats/Archived/Modern/2014-09-26.txt
index b25f176f379..f912256a9fb 100644
--- a/forge-gui/res/formats/Archive/Modern/2014-09-26.txt
+++ b/forge-gui/res/formats/Archived/Modern/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KTK)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2014-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
diff --git a/forge-gui/res/formats/Archive/Modern/2015-01-23.txt b/forge-gui/res/formats/Archived/Modern/2015-01-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2015-01-23.txt
rename to forge-gui/res/formats/Archived/Modern/2015-01-23.txt
index 7670f0ea926..d356414eb1b 100644
--- a/forge-gui/res/formats/Archive/Modern/2015-01-23.txt
+++ b/forge-gui/res/formats/Archived/Modern/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (FRF)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2015-01-23
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2015-03-27.txt b/forge-gui/res/formats/Archived/Modern/2015-03-27.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2015-03-27.txt
rename to forge-gui/res/formats/Archived/Modern/2015-03-27.txt
index e72e969967f..b4ede003dd7 100644
--- a/forge-gui/res/formats/Archive/Modern/2015-03-27.txt
+++ b/forge-gui/res/formats/Archived/Modern/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DTK)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2015-03-27
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2015-05-22.txt b/forge-gui/res/formats/Archived/Modern/2015-05-22.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2015-05-22.txt
rename to forge-gui/res/formats/Archived/Modern/2015-05-22.txt
index 5e012f6f57c..81ec09dfb43 100644
--- a/forge-gui/res/formats/Archive/Modern/2015-05-22.txt
+++ b/forge-gui/res/formats/Archived/Modern/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MM2)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2015-05-22
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2015-07-17.txt b/forge-gui/res/formats/Archived/Modern/2015-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2015-07-17.txt
rename to forge-gui/res/formats/Archived/Modern/2015-07-17.txt
index e8318524d23..3ad07a2873b 100644
--- a/forge-gui/res/formats/Archive/Modern/2015-07-17.txt
+++ b/forge-gui/res/formats/Archived/Modern/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ORI)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2015-07-17
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2015-10-02.txt b/forge-gui/res/formats/Archived/Modern/2015-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2015-10-02.txt
rename to forge-gui/res/formats/Archived/Modern/2015-10-02.txt
index 44cc73b4914..e65bf9c4c0e 100644
--- a/forge-gui/res/formats/Archive/Modern/2015-10-02.txt
+++ b/forge-gui/res/formats/Archived/Modern/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (BFZ)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2015-10-02
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2016-01-22.txt b/forge-gui/res/formats/Archived/Modern/2016-01-22.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2016-01-22.txt
rename to forge-gui/res/formats/Archived/Modern/2016-01-22.txt
index a8d4a7865d0..47c3f761ffb 100644
--- a/forge-gui/res/formats/Archive/Modern/2016-01-22.txt
+++ b/forge-gui/res/formats/Archived/Modern/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (OGW)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2016-01-22
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2016-04-08.txt b/forge-gui/res/formats/Archived/Modern/2016-04-08.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2016-04-08.txt
rename to forge-gui/res/formats/Archived/Modern/2016-04-08.txt
index 504004176a9..46be325d905 100644
--- a/forge-gui/res/formats/Archive/Modern/2016-04-08.txt
+++ b/forge-gui/res/formats/Archived/Modern/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (SOI)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2016-04-08
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2016-07-22.txt b/forge-gui/res/formats/Archived/Modern/2016-07-22.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2016-07-22.txt
rename to forge-gui/res/formats/Archived/Modern/2016-07-22.txt
index 2169b82b0f5..fe1c4080345 100644
--- a/forge-gui/res/formats/Archive/Modern/2016-07-22.txt
+++ b/forge-gui/res/formats/Archived/Modern/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (EMN)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2016-07-22
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2016-09-30.txt b/forge-gui/res/formats/Archived/Modern/2016-09-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2016-09-30.txt
rename to forge-gui/res/formats/Archived/Modern/2016-09-30.txt
index aa9a970c3cc..61680f6513d 100644
--- a/forge-gui/res/formats/Archive/Modern/2016-09-30.txt
+++ b/forge-gui/res/formats/Archived/Modern/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KLD)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2016-09-30
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-01-20.txt b/forge-gui/res/formats/Archived/Modern/2017-01-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-01-20.txt
rename to forge-gui/res/formats/Archived/Modern/2017-01-20.txt
index 7e192d878dc..19e03aff0ca 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-01-20.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AER)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-01-20
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-03-17.txt b/forge-gui/res/formats/Archived/Modern/2017-03-17.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-03-17.txt
rename to forge-gui/res/formats/Archived/Modern/2017-03-17.txt
index a736252bc5f..eda4c49f1d3 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-03-17.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MM3)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-03-17
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-04-15.txt b/forge-gui/res/formats/Archived/Modern/2017-04-15.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-04-15.txt
rename to forge-gui/res/formats/Archived/Modern/2017-04-15.txt
index e6eb6efd399..1cb47fea9e8 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-04-15.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-04-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (W17)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-04-15
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-04-28.txt b/forge-gui/res/formats/Archived/Modern/2017-04-28.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-04-28.txt
rename to forge-gui/res/formats/Archived/Modern/2017-04-28.txt
index c7980430ac8..a89216fe37a 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-04-28.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AKH)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-04-28
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-07-14.txt b/forge-gui/res/formats/Archived/Modern/2017-07-14.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-07-14.txt
rename to forge-gui/res/formats/Archived/Modern/2017-07-14.txt
index 294dcdfd55f..16d3ab6b938 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-07-14.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (HOU)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-07-14
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2017-09-29.txt b/forge-gui/res/formats/Archived/Modern/2017-09-29.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2017-09-29.txt
rename to forge-gui/res/formats/Archived/Modern/2017-09-29.txt
index a7a6d88cbdc..2f47e90a2b6 100644
--- a/forge-gui/res/formats/Archive/Modern/2017-09-29.txt
+++ b/forge-gui/res/formats/Archived/Modern/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (XLN)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2017-09-29
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-01-19.txt b/forge-gui/res/formats/Archived/Modern/2018-01-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-01-19.txt
rename to forge-gui/res/formats/Archived/Modern/2018-01-19.txt
index 41662d689e9..3811ce7b7ad 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-01-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RIX)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-01-19
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-02-19.txt b/forge-gui/res/formats/Archived/Modern/2018-02-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-02-19.txt
rename to forge-gui/res/formats/Archived/Modern/2018-02-19.txt
index b1f9c5945b7..abfb7b8ad88 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-02-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-02-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2018-02-12)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-02-12
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-04-27.txt b/forge-gui/res/formats/Archived/Modern/2018-04-27.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-04-27.txt
rename to forge-gui/res/formats/Archived/Modern/2018-04-27.txt
index c7df18491c2..0956dc7d217 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-04-27.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DOM)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-04-27
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-07-13.txt b/forge-gui/res/formats/Archived/Modern/2018-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-07-13.txt
rename to forge-gui/res/formats/Archived/Modern/2018-07-13.txt
index b2db301a0b3..dcaa380eaca 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-07-13.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M19)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-07-13
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-10-05.txt b/forge-gui/res/formats/Archived/Modern/2018-10-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-10-05.txt
rename to forge-gui/res/formats/Archived/Modern/2018-10-05.txt
index 749d1594de8..0e3f249bf7b 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-10-05.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GRN)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-10-05
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-11-02.txt b/forge-gui/res/formats/Archived/Modern/2018-11-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-11-02.txt
rename to forge-gui/res/formats/Archived/Modern/2018-11-02.txt
index ad8c557f6be..4781716c5c4 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-11-02.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GK1)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-11-02
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2018-11-16.txt b/forge-gui/res/formats/Archived/Modern/2018-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2018-11-16.txt
rename to forge-gui/res/formats/Archived/Modern/2018-11-16.txt
index 8fd0aee0e40..fcc63cf20a0 100644
--- a/forge-gui/res/formats/Archive/Modern/2018-11-16.txt
+++ b/forge-gui/res/formats/Archived/Modern/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (G18)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2018-11-16
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-01-25.txt b/forge-gui/res/formats/Archived/Modern/2019-01-25.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-01-25.txt
rename to forge-gui/res/formats/Archived/Modern/2019-01-25.txt
index 594d02a9aa5..dd1e046c86b 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-01-25.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (RNA)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-01-25
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-02-15.txt b/forge-gui/res/formats/Archived/Modern/2019-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-02-15.txt
rename to forge-gui/res/formats/Archived/Modern/2019-02-15.txt
index 4b97add7871..4ebe56ce568 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-02-15.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (GK2)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-02-15
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-05-03.txt b/forge-gui/res/formats/Archived/Modern/2019-05-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-05-03.txt
rename to forge-gui/res/formats/Archived/Modern/2019-05-03.txt
index df4f717d648..f725a7d5563 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-05-03.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (WAR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-05-03
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-06-14.txt b/forge-gui/res/formats/Archived/Modern/2019-06-14.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-06-14.txt
rename to forge-gui/res/formats/Archived/Modern/2019-06-14.txt
index 16d49715246..20c81538279 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-06-14.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MH1)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-06-14
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-07-12.txt b/forge-gui/res/formats/Archived/Modern/2019-07-12.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-07-12.txt
rename to forge-gui/res/formats/Archived/Modern/2019-07-12.txt
index 3008847a938..5c7f12513af 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-07-12.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M20)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-07-12
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-08-30.txt b/forge-gui/res/formats/Archived/Modern/2019-08-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-08-30.txt
rename to forge-gui/res/formats/Archived/Modern/2019-08-30.txt
index 8a0eeab97b6..2299147213b 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-08-30.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2019-08-30)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-08-30
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2019-10-04.txt b/forge-gui/res/formats/Archived/Modern/2019-10-04.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2019-10-04.txt
rename to forge-gui/res/formats/Archived/Modern/2019-10-04.txt
index a4b79a41862..4e506593053 100644
--- a/forge-gui/res/formats/Archive/Modern/2019-10-04.txt
+++ b/forge-gui/res/formats/Archived/Modern/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ELD)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2019-10-04
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-01-14.txt b/forge-gui/res/formats/Archived/Modern/2020-01-14.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-01-14.txt
rename to forge-gui/res/formats/Archived/Modern/2020-01-14.txt
index 4f113b26497..8376be52afe 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-01-14.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-01-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-01-14)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-01-14
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-01-24.txt b/forge-gui/res/formats/Archived/Modern/2020-01-24.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-01-24.txt
rename to forge-gui/res/formats/Archived/Modern/2020-01-24.txt
index 1878a53909b..284ef6e0c89 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-01-24.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (THB)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-01-24
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-03-10.txt b/forge-gui/res/formats/Archived/Modern/2020-03-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-03-10.txt
rename to forge-gui/res/formats/Archived/Modern/2020-03-10.txt
index 8bd857106a8..758d101e538 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-03-10.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-03-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-03-10)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-03-10
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-04-24.txt b/forge-gui/res/formats/Archived/Modern/2020-04-24.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-04-24.txt
rename to forge-gui/res/formats/Archived/Modern/2020-04-24.txt
index 8618221faf0..2313e55e94c 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-04-24.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (IKO)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-04-24
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-07-03.txt b/forge-gui/res/formats/Archived/Modern/2020-07-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-07-03.txt
rename to forge-gui/res/formats/Archived/Modern/2020-07-03.txt
index 87288cdfde3..82ed4dd18df 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-07-03.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (M21)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-07-03
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-07-13.txt b/forge-gui/res/formats/Archived/Modern/2020-07-13.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-07-13.txt
rename to forge-gui/res/formats/Archived/Modern/2020-07-13.txt
index 6c91ed37a32..5db9b7fc445 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-07-13.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2020-07-13)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-07-13
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2020-09-25.txt b/forge-gui/res/formats/Archived/Modern/2020-09-25.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2020-09-25.txt
rename to forge-gui/res/formats/Archived/Modern/2020-09-25.txt
index 3500c518a7c..c730bc5f033 100644
--- a/forge-gui/res/formats/Archive/Modern/2020-09-25.txt
+++ b/forge-gui/res/formats/Archived/Modern/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2020-09-25
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2021-02-05.txt b/forge-gui/res/formats/Archived/Modern/2021-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-02-05.txt
rename to forge-gui/res/formats/Archived/Modern/2021-02-05.txt
index 85676c34908..3eace813b60 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-02-05.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (KHM)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-02-05
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2021-02-15.txt b/forge-gui/res/formats/Archived/Modern/2021-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-02-15.txt
rename to forge-gui/res/formats/Archived/Modern/2021-02-15.txt
index 6378957b014..fa2e1ce0478 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-02-15.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2021-02-15)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-02-15
 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
diff --git a/forge-gui/res/formats/Archive/Modern/2021-03-19.txt b/forge-gui/res/formats/Archived/Modern/2021-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-03-19.txt
rename to forge-gui/res/formats/Archived/Modern/2021-03-19.txt
index 6d87a50bf26..4a949f59b88 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-03-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (TSR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-03-19
 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, TSR
diff --git a/forge-gui/res/formats/Archive/Modern/2021-04-23.txt b/forge-gui/res/formats/Archived/Modern/2021-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-04-23.txt
rename to forge-gui/res/formats/Archived/Modern/2021-04-23.txt
index 07a541812df..aa4667cf507 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-04-23.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (STX)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-04-23
 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, TSR, STX
diff --git a/forge-gui/res/formats/Archive/Modern/2021-06-18.txt b/forge-gui/res/formats/Archived/Modern/2021-06-18.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-06-18.txt
rename to forge-gui/res/formats/Archived/Modern/2021-06-18.txt
index 842e45ba18a..8a207fa9906 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-06-18.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MH2)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-06-18
 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, TSR, STX, MH2
diff --git a/forge-gui/res/formats/Archive/Modern/2021-07-23.txt b/forge-gui/res/formats/Archived/Modern/2021-07-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-07-23.txt
rename to forge-gui/res/formats/Archived/Modern/2021-07-23.txt
index 4d6fc2f8f9e..03c5101a647 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-07-23.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (AFR)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-07-23
 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, TSR, STX, MH2, AFR
diff --git a/forge-gui/res/formats/Archive/Modern/2021-09-24.txt b/forge-gui/res/formats/Archived/Modern/2021-09-24.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-09-24.txt
rename to forge-gui/res/formats/Archived/Modern/2021-09-24.txt
index 82a4e1a7990..6438aeaa23c 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-09-24.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (MID)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-09-24
 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, TSR, STX, MH2, AFR, MID
diff --git a/forge-gui/res/formats/Archive/Modern/2021-11-19.txt b/forge-gui/res/formats/Archived/Modern/2021-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2021-11-19.txt
rename to forge-gui/res/formats/Archived/Modern/2021-11-19.txt
index 8296c57fca4..27c3a4d3c70 100644
--- a/forge-gui/res/formats/Archive/Modern/2021-11-19.txt
+++ b/forge-gui/res/formats/Archived/Modern/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (VOW)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2021-11-19
 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, TSR, STX, MH2, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Archive/Modern/2022-01-28.txt b/forge-gui/res/formats/Archived/Modern/2022-01-28.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2022-01-28.txt
rename to forge-gui/res/formats/Archived/Modern/2022-01-28.txt
index 4cbb370dc18..02be61f70ff 100644
--- a/forge-gui/res/formats/Archive/Modern/2022-01-28.txt
+++ b/forge-gui/res/formats/Archived/Modern/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (DBL)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2022-01-28
 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, TSR, STX, MH2, AFR, MID, VOW, DBL
diff --git a/forge-gui/res/formats/Archive/Modern/2022-02-18.txt b/forge-gui/res/formats/Archived/Modern/2022-02-18.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2022-02-18.txt
rename to forge-gui/res/formats/Archived/Modern/2022-02-18.txt
index e29d4c29a27..d5044bfef3c 100644
--- a/forge-gui/res/formats/Archive/Modern/2022-02-18.txt
+++ b/forge-gui/res/formats/Archived/Modern/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (NEO)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2022-02-18
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Archive/Modern/2022-03-07.txt b/forge-gui/res/formats/Archived/Modern/2022-03-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2022-03-07.txt
rename to forge-gui/res/formats/Archived/Modern/2022-03-07.txt
index cfb62b09e3c..e0444027303 100644
--- a/forge-gui/res/formats/Archive/Modern/2022-03-07.txt
+++ b/forge-gui/res/formats/Archived/Modern/2022-03-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (2022-03-07)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2022-03-07
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Archive/Modern/2022-04-29.txt b/forge-gui/res/formats/Archived/Modern/2022-04-29.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Modern/2022-04-29.txt
rename to forge-gui/res/formats/Archived/Modern/2022-04-29.txt
index 9616aaa7bc0..10150be9039 100644
--- a/forge-gui/res/formats/Archive/Modern/2022-04-29.txt
+++ b/forge-gui/res/formats/Archived/Modern/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Modern (SNC)
-Type:Archive
+Type:Archived
 Subtype:Modern
 Effective:2022-04-29
 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, TSR, STX, MH2, AFR, MID, VOW, DBL, NEO, SNC
diff --git a/forge-gui/res/formats/Archive/Pauper/2019-05-24.txt b/forge-gui/res/formats/Archived/Pauper/2019-05-24.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Pauper/2019-05-24.txt
rename to forge-gui/res/formats/Archived/Pauper/2019-05-24.txt
index c3d914ab95c..5756cabff85 100644
--- a/forge-gui/res/formats/Archive/Pauper/2019-05-24.txt
+++ b/forge-gui/res/formats/Archived/Pauper/2019-05-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2019-05-24)
-Type:Archive
+Type:Archived
 Subtype:Custom
 Effective:2019-05-24
 Rarities:L, C
diff --git a/forge-gui/res/formats/Archive/Pauper/2019-10-25.txt b/forge-gui/res/formats/Archived/Pauper/2019-10-25.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Pauper/2019-10-25.txt
rename to forge-gui/res/formats/Archived/Pauper/2019-10-25.txt
index ca6155ba78a..520bdfd691a 100644
--- a/forge-gui/res/formats/Archive/Pauper/2019-10-25.txt
+++ b/forge-gui/res/formats/Archived/Pauper/2019-10-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2019-10-25)
-Type:Archive
+Type:Archived
 Subtype:Custom
 Effective:2019-10-25
 Rarities:L, C
diff --git a/forge-gui/res/formats/Archive/Pauper/2020-01-14.txt b/forge-gui/res/formats/Archived/Pauper/2020-01-14.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Pauper/2020-01-14.txt
rename to forge-gui/res/formats/Archived/Pauper/2020-01-14.txt
index 9fa2d5e1716..3ec54a7a8be 100644
--- a/forge-gui/res/formats/Archive/Pauper/2020-01-14.txt
+++ b/forge-gui/res/formats/Archived/Pauper/2020-01-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2020-01-14)
-Type:Archive
+Type:Archived
 Subtype:Custom
 Effective:2020-01-14
 Rarities:L, C
diff --git a/forge-gui/res/formats/Archive/Pauper/2020-07-13.txt b/forge-gui/res/formats/Archived/Pauper/2020-07-13.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Pauper/2020-07-13.txt
rename to forge-gui/res/formats/Archived/Pauper/2020-07-13.txt
index 1573efb1ece..3444130a234 100644
--- a/forge-gui/res/formats/Archive/Pauper/2020-07-13.txt
+++ b/forge-gui/res/formats/Archived/Pauper/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pauper (2020-07-13)
-Type:Archive
+Type:Archived
 Subtype:Custom
 Effective:2020-07-13
 Rarities:L, C
diff --git a/forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt b/forge-gui/res/formats/Archived/Pioneer/2019-10-21.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt
rename to forge-gui/res/formats/Archived/Pioneer/2019-10-21.txt
index df8b964da9c..73990118485 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2019-10-21.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2019-10-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-10-21)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2019-10-21
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt b/forge-gui/res/formats/Archived/Pioneer/2019-11-08.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt
rename to forge-gui/res/formats/Archived/Pioneer/2019-11-08.txt
index 9a73245e4f1..43d64c35c1e 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2019-11-08.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2019-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-11-08)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2019-11-08
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt b/forge-gui/res/formats/Archived/Pioneer/2019-11-12.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt
rename to forge-gui/res/formats/Archived/Pioneer/2019-11-12.txt
index 7115aee827d..78454edb2a3 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2019-11-12.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2019-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-11-12)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2019-11-12
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt b/forge-gui/res/formats/Archived/Pioneer/2019-12-03.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt
rename to forge-gui/res/formats/Archived/Pioneer/2019-12-03.txt
index d0e8e7f339f..af3a8713b1e 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2019-12-03.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2019-12-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-12-03)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2019-12-03
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt b/forge-gui/res/formats/Archived/Pioneer/2019-12-17.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt
rename to forge-gui/res/formats/Archived/Pioneer/2019-12-17.txt
index a4f9a3e26bd..296e92dbdc0 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2019-12-17.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2019-12-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2019-12-17)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2019-12-17
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt b/forge-gui/res/formats/Archived/Pioneer/2020-01-24.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-01-24.txt
index 6af22744d2b..1985a8ebf81 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-01-24.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (THB)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-01-24
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt b/forge-gui/res/formats/Archived/Pioneer/2020-04-24.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-04-24.txt
index 4845b8ff76a..2a92329aa95 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-04-24.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (IKO)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-04-24
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt b/forge-gui/res/formats/Archived/Pioneer/2020-07-03.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-07-03.txt
index d2025dc4e8a..62157849840 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-07-03.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (M21)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-07-03
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt b/forge-gui/res/formats/Archived/Pioneer/2020-07-13.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-07-13.txt
index 1781dc78b95..da261f8a06f 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-07-13.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2020-07-13)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-07-13
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt b/forge-gui/res/formats/Archived/Pioneer/2020-08-03.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-08-03.txt
index 00509918999..4b58523f1f4 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-08-03.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-08-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2020-08-03)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-08-03
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt b/forge-gui/res/formats/Archived/Pioneer/2020-09-25.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt
rename to forge-gui/res/formats/Archived/Pioneer/2020-09-25.txt
index 3371344b3a3..b6c6384454d 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2020-09-25.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2020-09-25
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt b/forge-gui/res/formats/Archived/Pioneer/2021-02-05.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-02-05.txt
index c1f5f79c2a9..b733eebb0c2 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-02-05.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (KHM)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-02-05
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt b/forge-gui/res/formats/Archived/Pioneer/2021-02-15.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-02-15.txt
index e5d34bed892..7f8354e9c70 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-02-15.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2021-02-15)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-02-15
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt b/forge-gui/res/formats/Archived/Pioneer/2021-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-04-23.txt
index df249016b7e..01a5f9df8b6 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-04-23.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (STX)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-04-23
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt b/forge-gui/res/formats/Archived/Pioneer/2021-07-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-07-23.txt
index c5bc51924c8..b03db707340 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-07-23.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (AFR)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-07-23
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt b/forge-gui/res/formats/Archived/Pioneer/2021-09-24.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-09-24.txt
index 5f04ebc6526..3729418477e 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-09-24.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (MID)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-09-24
 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
diff --git a/forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt b/forge-gui/res/formats/Archived/Pioneer/2021-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt
rename to forge-gui/res/formats/Archived/Pioneer/2021-11-19.txt
index cb23e88974a..60a66ecaece 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2021-11-19.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (VOW)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2021-11-19
 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, VOW
diff --git a/forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt b/forge-gui/res/formats/Archived/Pioneer/2022-01-28.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt
rename to forge-gui/res/formats/Archived/Pioneer/2022-01-28.txt
index 99aca4a7198..8f5ce8cef19 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2022-01-28.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (DBL)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2022-01-28
 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, VOW, DBL
diff --git a/forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt b/forge-gui/res/formats/Archived/Pioneer/2022-02-18.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt
rename to forge-gui/res/formats/Archived/Pioneer/2022-02-18.txt
index 29b98f730d7..f02b6a5c9f2 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2022-02-18.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (NEO)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2022-02-18
 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, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt b/forge-gui/res/formats/Archived/Pioneer/2022-03-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt
rename to forge-gui/res/formats/Archived/Pioneer/2022-03-07.txt
index 76f55229b4d..0d022fdfbff 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2022-03-07.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2022-03-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2022-03-07)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2022-03-07
 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, VOW, DBL, NEO
diff --git a/forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt b/forge-gui/res/formats/Archived/Pioneer/2022-04-29.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt
rename to forge-gui/res/formats/Archived/Pioneer/2022-04-29.txt
index ddbdf700828..615a9e9016f 100644
--- a/forge-gui/res/formats/Archive/Pioneer/2022-04-29.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (SNC)
-Type:Archive
+Type:Archived
 Subtype:Pioneer
 Effective:2022-04-29
 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, VOW, DBL, NEO, SNC
diff --git a/forge-gui/res/formats/Archive/Pioneer/2022-06-07.txt b/forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt
similarity index 100%
rename from forge-gui/res/formats/Archive/Pioneer/2022-06-07.txt
rename to forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt
diff --git a/forge-gui/res/formats/Archive/Standard/1995-01-10.txt b/forge-gui/res/formats/Archived/Standard/1995-01-10.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1995-01-10.txt
rename to forge-gui/res/formats/Archived/Standard/1995-01-10.txt
index 5bea679d336..181751d81fe 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-01-10.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1995-01-10)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-01-10
 Sets:3ED, DRK, FEM
diff --git a/forge-gui/res/formats/Archive/Standard/1995-04-19.txt b/forge-gui/res/formats/Archived/Standard/1995-04-19.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1995-04-19.txt
rename to forge-gui/res/formats/Archived/Standard/1995-04-19.txt
index fe52b1c9bf3..e86dea4a736 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-04-19.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-04-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (4ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-04-19
 Sets:DRK, FEM, 4ED
diff --git a/forge-gui/res/formats/Archive/Standard/1995-06-03.txt b/forge-gui/res/formats/Archived/Standard/1995-06-03.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1995-06-03.txt
rename to forge-gui/res/formats/Archived/Standard/1995-06-03.txt
index 9c551e24ffe..1bebfef5206 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-06-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-06-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (ICE)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-06-03
 Sets:FEM, 4ED, ICE
diff --git a/forge-gui/res/formats/Archive/Standard/1995-07-01.txt b/forge-gui/res/formats/Archived/Standard/1995-07-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1995-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/1995-07-01.txt
index 1976aa6815c..efe085ff34c 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (CHR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-07-01
 Sets:FEM, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Archive/Standard/1995-11-01.txt b/forge-gui/res/formats/Archived/Standard/1995-11-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1995-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/1995-11-01.txt
index 3d4cf16ecf4..257d64ec4ed 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1995-11-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-11-01
 Sets:FEM, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Archive/Standard/1995-11-13.txt b/forge-gui/res/formats/Archived/Standard/1995-11-13.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1995-11-13.txt
rename to forge-gui/res/formats/Archived/Standard/1995-11-13.txt
index 262c8e0bbce..64b1c6604ec 100644
--- a/forge-gui/res/formats/Archive/Standard/1995-11-13.txt
+++ b/forge-gui/res/formats/Archived/Standard/1995-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (HML)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1995-11-13
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Standard/1996-02-01.txt b/forge-gui/res/formats/Archived/Standard/1996-02-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-02-01.txt
rename to forge-gui/res/formats/Archived/Standard/1996-02-01.txt
index 8fe1d061c6d..159dba827c2 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-02-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-02-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-02-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Standard/1996-04-01.txt b/forge-gui/res/formats/Archived/Standard/1996-04-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-04-01.txt
rename to forge-gui/res/formats/Archived/Standard/1996-04-01.txt
index c460316613b..e73604a2dbc 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-04-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-04-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-04-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Standard/1996-07-01.txt b/forge-gui/res/formats/Archived/Standard/1996-07-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/1996-07-01.txt
index 0ae22c7094d..0700aa27657 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-07-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-07-01
 Sets:FEM, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Standard/1996-07-10.txt b/forge-gui/res/formats/Archived/Standard/1996-07-10.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-07-10.txt
rename to forge-gui/res/formats/Archived/Standard/1996-07-10.txt
index d6641fd1fef..5b1c667af2f 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-07-10.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (ALL)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-07-10
 Sets:FEM, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Standard/1996-10-01.txt b/forge-gui/res/formats/Archived/Standard/1996-10-01.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-10-01.txt
rename to forge-gui/res/formats/Archived/Standard/1996-10-01.txt
index 4521b6de6c2..6d1998eb977 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-10-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (1996-10-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-10-01
 Sets:FEM, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Standard/1996-11-07.txt b/forge-gui/res/formats/Archived/Standard/1996-11-07.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/1996-11-07.txt
rename to forge-gui/res/formats/Archived/Standard/1996-11-07.txt
index 8055ddc8985..3fe3e2d2c77 100644
--- a/forge-gui/res/formats/Archive/Standard/1996-11-07.txt
+++ b/forge-gui/res/formats/Archived/Standard/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 2 (MIR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1996-11-07
 Sets:FEM, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Archive/Standard/1997-01-01.txt b/forge-gui/res/formats/Archived/Standard/1997-01-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1997-01-01.txt
rename to forge-gui/res/formats/Archived/Standard/1997-01-01.txt
index 865277a80e6..2a1ba135eea 100644
--- a/forge-gui/res/formats/Archive/Standard/1997-01-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1997-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1997-01-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1997-01-01
 Sets:4ED, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Archive/Standard/1997-03-05.txt b/forge-gui/res/formats/Archived/Standard/1997-03-05.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1997-03-05.txt
rename to forge-gui/res/formats/Archived/Standard/1997-03-05.txt
index 6eda8e6b1d0..0f679e63a22 100644
--- a/forge-gui/res/formats/Archive/Standard/1997-03-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (VIS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1997-03-05
 Sets:4ED, CHR, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Archive/Standard/1997-04-23.txt b/forge-gui/res/formats/Archived/Standard/1997-04-23.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Standard/1997-04-23.txt
rename to forge-gui/res/formats/Archived/Standard/1997-04-23.txt
index 89f34fb0d8f..467256e2b80 100644
--- a/forge-gui/res/formats/Archive/Standard/1997-04-23.txt
+++ b/forge-gui/res/formats/Archived/Standard/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (5ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1997-04-23
 Sets:ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Archive/Standard/1997-07-01.txt b/forge-gui/res/formats/Archived/Standard/1997-07-01.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/1997-07-01.txt
index 7af584ee98d..34b26f3ddd8 100644
--- a/forge-gui/res/formats/Archive/Standard/1997-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WTH)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1997-07-01
 Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Standard/1997-11-01.txt b/forge-gui/res/formats/Archived/Standard/1997-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/1997-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/1997-11-01.txt
index 144c5d1a607..a098bd6dd4f 100644
--- a/forge-gui/res/formats/Archive/Standard/1997-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TMP)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1997-11-01
 Sets:MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Archive/Standard/1998-04-01.txt b/forge-gui/res/formats/Archived/Standard/1998-04-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/1998-04-01.txt
rename to forge-gui/res/formats/Archived/Standard/1998-04-01.txt
index fcf06f472ea..d20ec4c7001 100644
--- a/forge-gui/res/formats/Archive/Standard/1998-04-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (STH)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1998-04-01
 Sets:MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Archive/Standard/1998-07-01.txt b/forge-gui/res/formats/Archived/Standard/1998-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/1998-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/1998-07-01.txt
index 24cd880dd24..4686270ddd7 100644
--- a/forge-gui/res/formats/Archive/Standard/1998-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EXO)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1998-07-01
 Sets:MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Archive/Standard/1998-11-01.txt b/forge-gui/res/formats/Archived/Standard/1998-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/1998-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/1998-11-01.txt
index b745f85829d..fed935d0269 100644
--- a/forge-gui/res/formats/Archive/Standard/1998-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (USG)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1998-11-01
 Sets:5ED, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Archive/Standard/1999-01-01.txt b/forge-gui/res/formats/Archived/Standard/1999-01-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/1999-01-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-01-01.txt
index 2194ccaae57..33d510353c6 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-01-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1999-01-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-01-01
 Sets:5ED, TMP, STH, EXO, USG
diff --git a/forge-gui/res/formats/Archive/Standard/1999-03-01.txt b/forge-gui/res/formats/Archived/Standard/1999-03-01.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/1999-03-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-03-01.txt
index fb31ade8459..748ab6229ff 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-03-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ULG)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-03-01
 Sets:5ED, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Archive/Standard/1999-04-01.txt b/forge-gui/res/formats/Archived/Standard/1999-04-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1999-04-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-04-01.txt
index 231d23496c7..bfce8666f61 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-04-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (1999-04-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-04-01
 Sets:5ED, TMP, STH, EXO, USG, ULG
diff --git a/forge-gui/res/formats/Archive/Standard/1999-06-01.txt b/forge-gui/res/formats/Archived/Standard/1999-06-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1999-06-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-06-01.txt
index e3780d6e5b7..04c39f19655 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-06-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (6ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-06-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED
diff --git a/forge-gui/res/formats/Archive/Standard/1999-07-01.txt b/forge-gui/res/formats/Archived/Standard/1999-07-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/1999-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-07-01.txt
index e03ea7ecdb8..6c5c40e7c5d 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (UDS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-07-01
 Sets:TMP, STH, EXO, USG, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Standard/1999-11-01.txt b/forge-gui/res/formats/Archived/Standard/1999-11-01.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/1999-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/1999-11-01.txt
index 309f250426d..4234bddc7a9 100644
--- a/forge-gui/res/formats/Archive/Standard/1999-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MMQ)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:1999-11-01
 Sets:USG, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Archive/Standard/2000-03-01.txt b/forge-gui/res/formats/Archived/Standard/2000-03-01.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2000-03-01.txt
rename to forge-gui/res/formats/Archived/Standard/2000-03-01.txt
index fb0651f6547..ab83edac9af 100644
--- a/forge-gui/res/formats/Archive/Standard/2000-03-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NMS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2000-03-01
 Sets:USG, ULG, 6ED, UDS, MMQ, NMS
diff --git a/forge-gui/res/formats/Archive/Standard/2000-07-01.txt b/forge-gui/res/formats/Archived/Standard/2000-07-01.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2000-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/2000-07-01.txt
index 1963c13c16e..a51f139686e 100644
--- a/forge-gui/res/formats/Archive/Standard/2000-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PCY)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2000-07-01
 Sets:USG, ULG, 6ED, UDS, MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Archive/Standard/2000-11-01.txt b/forge-gui/res/formats/Archived/Standard/2000-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2000-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/2000-11-01.txt
index 310fd6ba665..00a1b265098 100644
--- a/forge-gui/res/formats/Archive/Standard/2000-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (INV)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2000-11-01
 Sets:6ED, MMQ, NMS, PCY, INV
diff --git a/forge-gui/res/formats/Archive/Standard/2001-03-01.txt b/forge-gui/res/formats/Archived/Standard/2001-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2001-03-01.txt
rename to forge-gui/res/formats/Archived/Standard/2001-03-01.txt
index 637f37bb42b..e7152144c1f 100644
--- a/forge-gui/res/formats/Archive/Standard/2001-03-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PLS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2001-03-01
 Sets:6ED, MMQ, NMS, PCY, INV, PLS
diff --git a/forge-gui/res/formats/Archive/Standard/2001-05-01.txt b/forge-gui/res/formats/Archived/Standard/2001-05-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2001-05-01.txt
rename to forge-gui/res/formats/Archived/Standard/2001-05-01.txt
index e3211e32e8c..71aaca1aa88 100644
--- a/forge-gui/res/formats/Archive/Standard/2001-05-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (7ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2001-05-01
 Sets:MMQ, NMS, PCY, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Archive/Standard/2001-07-01.txt b/forge-gui/res/formats/Archived/Standard/2001-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2001-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/2001-07-01.txt
index 1dc694c225e..0038731b274 100644
--- a/forge-gui/res/formats/Archive/Standard/2001-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (APC)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2001-07-01
 Sets:MMQ, NMS, PCY, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Archive/Standard/2001-11-01.txt b/forge-gui/res/formats/Archived/Standard/2001-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2001-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/2001-11-01.txt
index 678f0874c81..7852d001965 100644
--- a/forge-gui/res/formats/Archive/Standard/2001-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ODY)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2001-11-01
 Sets:INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Archive/Standard/2002-03-01.txt b/forge-gui/res/formats/Archived/Standard/2002-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2002-03-01.txt
rename to forge-gui/res/formats/Archived/Standard/2002-03-01.txt
index a378a8baa13..5df6f5de848 100644
--- a/forge-gui/res/formats/Archive/Standard/2002-03-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TOR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2002-03-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR
diff --git a/forge-gui/res/formats/Archive/Standard/2002-07-01.txt b/forge-gui/res/formats/Archived/Standard/2002-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2002-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/2002-07-01.txt
index ffc5899b205..a055daef573 100644
--- a/forge-gui/res/formats/Archive/Standard/2002-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (JUD)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2002-07-01
 Sets:INV, PLS, 7ED, APC, ODY, TOR, JUD
diff --git a/forge-gui/res/formats/Archive/Standard/2002-11-01.txt b/forge-gui/res/formats/Archived/Standard/2002-11-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2002-11-01.txt
rename to forge-gui/res/formats/Archived/Standard/2002-11-01.txt
index 983accbcdaf..be777116569 100644
--- a/forge-gui/res/formats/Archive/Standard/2002-11-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ONS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2002-11-01
 Sets:7ED, ODY, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Archive/Standard/2003-03-01.txt b/forge-gui/res/formats/Archived/Standard/2003-03-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2003-03-01.txt
rename to forge-gui/res/formats/Archived/Standard/2003-03-01.txt
index 14843927b0a..56f1cd29695 100644
--- a/forge-gui/res/formats/Archive/Standard/2003-03-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (LGN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2003-03-01
 Sets:7ED, ODY, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Standard/2003-07-01.txt b/forge-gui/res/formats/Archived/Standard/2003-07-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2003-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/2003-07-01.txt
index 08346f217c6..18fcf8a6cf5 100644
--- a/forge-gui/res/formats/Archive/Standard/2003-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SCG)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2003-07-01
 Sets:7ED, ODY, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Archive/Standard/2003-09-01.txt b/forge-gui/res/formats/Archived/Standard/2003-09-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2003-09-01.txt
rename to forge-gui/res/formats/Archived/Standard/2003-09-01.txt
index 0283c1c2dd6..ed76524ede7 100644
--- a/forge-gui/res/formats/Archive/Standard/2003-09-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (8ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2003-09-01
 Sets:ODY, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Archive/Standard/2003-10-20.txt b/forge-gui/res/formats/Archived/Standard/2003-10-20.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2003-10-20.txt
rename to forge-gui/res/formats/Archived/Standard/2003-10-20.txt
index 2da56774bef..e876adc3a86 100644
--- a/forge-gui/res/formats/Archive/Standard/2003-10-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MRD)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2003-10-20
 Sets:ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Standard/2004-02-20.txt b/forge-gui/res/formats/Archived/Standard/2004-02-20.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2004-02-20.txt
rename to forge-gui/res/formats/Archived/Standard/2004-02-20.txt
index 60eed367351..bc5fb25494b 100644
--- a/forge-gui/res/formats/Archive/Standard/2004-02-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DST)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2004-02-20
 Sets:ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Archive/Standard/2004-06-20.txt b/forge-gui/res/formats/Archived/Standard/2004-06-20.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2004-06-20.txt
rename to forge-gui/res/formats/Archived/Standard/2004-06-20.txt
index 41dcf61b162..dec71355805 100644
--- a/forge-gui/res/formats/Archive/Standard/2004-06-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (5DN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2004-06-20
 Sets:ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Standard/2004-10-20.txt b/forge-gui/res/formats/Archived/Standard/2004-10-20.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2004-10-20.txt
rename to forge-gui/res/formats/Archived/Standard/2004-10-20.txt
index 79b3434d097..cfca4c6d72e 100644
--- a/forge-gui/res/formats/Archive/Standard/2004-10-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CHK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2004-10-20
 Sets:8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Archive/Standard/2005-02-20.txt b/forge-gui/res/formats/Archived/Standard/2005-02-20.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2005-02-20.txt
rename to forge-gui/res/formats/Archived/Standard/2005-02-20.txt
index 87ac9e7ac16..a42123f86eb 100644
--- a/forge-gui/res/formats/Archive/Standard/2005-02-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BOK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2005-02-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Standard/2005-03-20.txt b/forge-gui/res/formats/Archived/Standard/2005-03-20.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2005-03-20.txt
rename to forge-gui/res/formats/Archived/Standard/2005-03-20.txt
index 534d5915e29..42e000bc837 100644
--- a/forge-gui/res/formats/Archive/Standard/2005-03-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2005-03-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2005-03-20)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2005-03-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Standard/2005-06-20.txt b/forge-gui/res/formats/Archived/Standard/2005-06-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2005-06-20.txt
rename to forge-gui/res/formats/Archived/Standard/2005-06-20.txt
index 947276842f9..84a3563ef50 100644
--- a/forge-gui/res/formats/Archive/Standard/2005-06-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2005-06-20
 Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Archive/Standard/2005-08-20.txt b/forge-gui/res/formats/Archived/Standard/2005-08-20.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2005-08-20.txt
rename to forge-gui/res/formats/Archived/Standard/2005-08-20.txt
index 5d1fc83a90b..0b5aa48d4c0 100644
--- a/forge-gui/res/formats/Archive/Standard/2005-08-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (9ED)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2005-08-20
 Sets:MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Standard/2005-10-20.txt b/forge-gui/res/formats/Archived/Standard/2005-10-20.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2005-10-20.txt
rename to forge-gui/res/formats/Archived/Standard/2005-10-20.txt
index 997740e4c37..aaa98d4d95d 100644
--- a/forge-gui/res/formats/Archive/Standard/2005-10-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RAV)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2005-10-20
 Sets:CHK, BOK, SOK, 9ED, RAV
diff --git a/forge-gui/res/formats/Archive/Standard/2006-02-20.txt b/forge-gui/res/formats/Archived/Standard/2006-02-20.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Standard/2006-02-20.txt
index 06f083d1275..23fe654db3f 100644
--- a/forge-gui/res/formats/Archive/Standard/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GPT)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2006-02-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT
diff --git a/forge-gui/res/formats/Archive/Standard/2006-05-20.txt b/forge-gui/res/formats/Archived/Standard/2006-05-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2006-05-20.txt
rename to forge-gui/res/formats/Archived/Standard/2006-05-20.txt
index 3d80018c936..564df0d379a 100644
--- a/forge-gui/res/formats/Archive/Standard/2006-05-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DIS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2006-05-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT, DIS
diff --git a/forge-gui/res/formats/Archive/Standard/2006-08-20.txt b/forge-gui/res/formats/Archived/Standard/2006-08-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2006-08-20.txt
rename to forge-gui/res/formats/Archived/Standard/2006-08-20.txt
index 8dcf191351e..b99ab830db4 100644
--- a/forge-gui/res/formats/Archive/Standard/2006-08-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CSP)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2006-08-20
 Sets:CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP
diff --git a/forge-gui/res/formats/Archive/Standard/2006-10-20.txt b/forge-gui/res/formats/Archived/Standard/2006-10-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2006-10-20.txt
rename to forge-gui/res/formats/Archived/Standard/2006-10-20.txt
index dea87303ef0..db209c735b7 100644
--- a/forge-gui/res/formats/Archive/Standard/2006-10-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (TSP)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2006-10-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB
diff --git a/forge-gui/res/formats/Archive/Standard/2007-02-20.txt b/forge-gui/res/formats/Archived/Standard/2007-02-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2007-02-20.txt
rename to forge-gui/res/formats/Archived/Standard/2007-02-20.txt
index c5425265ee0..3833649833e 100644
--- a/forge-gui/res/formats/Archive/Standard/2007-02-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (PLC)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2007-02-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC
diff --git a/forge-gui/res/formats/Archive/Standard/2007-05-20.txt b/forge-gui/res/formats/Archived/Standard/2007-05-20.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2007-05-20.txt
rename to forge-gui/res/formats/Archived/Standard/2007-05-20.txt
index c16bcc364f4..c02b041c131 100644
--- a/forge-gui/res/formats/Archive/Standard/2007-05-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (FUT)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2007-05-20
 Sets:9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT
diff --git a/forge-gui/res/formats/Archive/Standard/2007-07-20.txt b/forge-gui/res/formats/Archived/Standard/2007-07-20.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2007-07-20.txt
rename to forge-gui/res/formats/Archived/Standard/2007-07-20.txt
index 7ca59b723b7..45b7e501a2d 100644
--- a/forge-gui/res/formats/Archive/Standard/2007-07-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (10E)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2007-07-20
 Sets:RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E
diff --git a/forge-gui/res/formats/Archive/Standard/2007-10-20.txt b/forge-gui/res/formats/Archived/Standard/2007-10-20.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2007-10-20.txt
rename to forge-gui/res/formats/Archived/Standard/2007-10-20.txt
index 0c6d6ed33b5..886ef196568 100644
--- a/forge-gui/res/formats/Archive/Standard/2007-10-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (LRW)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2007-10-20
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW
diff --git a/forge-gui/res/formats/Archive/Standard/2008-02-01.txt b/forge-gui/res/formats/Archived/Standard/2008-02-01.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2008-02-01.txt
rename to forge-gui/res/formats/Archived/Standard/2008-02-01.txt
index 9b34fd1bb0e..9494c7281bf 100644
--- a/forge-gui/res/formats/Archive/Standard/2008-02-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MOR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2008-02-01
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR
diff --git a/forge-gui/res/formats/Archive/Standard/2008-05-02.txt b/forge-gui/res/formats/Archived/Standard/2008-05-02.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2008-05-02.txt
rename to forge-gui/res/formats/Archived/Standard/2008-05-02.txt
index cefcd1af642..74fecb033b9 100644
--- a/forge-gui/res/formats/Archive/Standard/2008-05-02.txt
+++ b/forge-gui/res/formats/Archived/Standard/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SHM)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2008-05-02
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM
diff --git a/forge-gui/res/formats/Archive/Standard/2008-07-25.txt b/forge-gui/res/formats/Archived/Standard/2008-07-25.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2008-07-25.txt
rename to forge-gui/res/formats/Archived/Standard/2008-07-25.txt
index b372df4b089..30f50e13584 100644
--- a/forge-gui/res/formats/Archive/Standard/2008-07-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EVE)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2008-07-25
 Sets:CSP, TSP, TSB, PLC, FUT, 10E, LRW, MOR, SHM, EVE
diff --git a/forge-gui/res/formats/Archive/Standard/2008-10-03.txt b/forge-gui/res/formats/Archived/Standard/2008-10-03.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2008-10-03.txt
rename to forge-gui/res/formats/Archived/Standard/2008-10-03.txt
index bb28c03cba9..ff3f94c05d6 100644
--- a/forge-gui/res/formats/Archive/Standard/2008-10-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ALA)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2008-10-03
 Sets:10E, LRW, MOR, SHM, EVE, ALA
diff --git a/forge-gui/res/formats/Archive/Standard/2009-02-06.txt b/forge-gui/res/formats/Archived/Standard/2009-02-06.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2009-02-06.txt
rename to forge-gui/res/formats/Archived/Standard/2009-02-06.txt
index 0eea98cf7e0..9c126a4d04d 100644
--- a/forge-gui/res/formats/Archive/Standard/2009-02-06.txt
+++ b/forge-gui/res/formats/Archived/Standard/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (CFX)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2009-02-06
 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX
diff --git a/forge-gui/res/formats/Archive/Standard/2009-04-30.txt b/forge-gui/res/formats/Archived/Standard/2009-04-30.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2009-04-30.txt
rename to forge-gui/res/formats/Archived/Standard/2009-04-30.txt
index 74cb964e0d7..ce92fa44710 100644
--- a/forge-gui/res/formats/Archive/Standard/2009-04-30.txt
+++ b/forge-gui/res/formats/Archived/Standard/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ARB)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2009-04-30
 Sets:10E, LRW, MOR, SHM, EVE, ALA, CFX, ARB
diff --git a/forge-gui/res/formats/Archive/Standard/2009-07-17.txt b/forge-gui/res/formats/Archived/Standard/2009-07-17.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2009-07-17.txt
rename to forge-gui/res/formats/Archived/Standard/2009-07-17.txt
index fadf95c0728..ac7041b08ee 100644
--- a/forge-gui/res/formats/Archive/Standard/2009-07-17.txt
+++ b/forge-gui/res/formats/Archived/Standard/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M10)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2009-07-17
 Sets:LRW, MOR, SHM, EVE, ALA, CFX, ARB, M10
diff --git a/forge-gui/res/formats/Archive/Standard/2009-10-02.txt b/forge-gui/res/formats/Archived/Standard/2009-10-02.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2009-10-02.txt
rename to forge-gui/res/formats/Archived/Standard/2009-10-02.txt
index eaa6cfb51f9..92e3227a4d7 100644
--- a/forge-gui/res/formats/Archive/Standard/2009-10-02.txt
+++ b/forge-gui/res/formats/Archived/Standard/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ZEN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2009-10-02
 Sets:ALA, CFX, ARB, M10, ZEN
diff --git a/forge-gui/res/formats/Archive/Standard/2010-02-05.txt b/forge-gui/res/formats/Archived/Standard/2010-02-05.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2010-02-05.txt
rename to forge-gui/res/formats/Archived/Standard/2010-02-05.txt
index 04a4da3cb15..eb4242736ef 100644
--- a/forge-gui/res/formats/Archive/Standard/2010-02-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WWK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2010-02-05
 Sets:ALA, CFX, ARB, M10, ZEN, WWK
diff --git a/forge-gui/res/formats/Archive/Standard/2010-04-23.txt b/forge-gui/res/formats/Archived/Standard/2010-04-23.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2010-04-23.txt
rename to forge-gui/res/formats/Archived/Standard/2010-04-23.txt
index 1021b2ae437..0dcf65ad46c 100644
--- a/forge-gui/res/formats/Archive/Standard/2010-04-23.txt
+++ b/forge-gui/res/formats/Archived/Standard/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ROE)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2010-04-23
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE
diff --git a/forge-gui/res/formats/Archive/Standard/2010-07-16.txt b/forge-gui/res/formats/Archived/Standard/2010-07-16.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2010-07-16.txt
rename to forge-gui/res/formats/Archived/Standard/2010-07-16.txt
index 465d9c7f0c1..750e1aae5c4 100644
--- a/forge-gui/res/formats/Archive/Standard/2010-07-16.txt
+++ b/forge-gui/res/formats/Archived/Standard/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M11)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2010-07-16
 Sets:ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11
diff --git a/forge-gui/res/formats/Archive/Standard/2010-10-01.txt b/forge-gui/res/formats/Archived/Standard/2010-10-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2010-10-01.txt
rename to forge-gui/res/formats/Archived/Standard/2010-10-01.txt
index f1e1f036b49..f68fff81f9b 100644
--- a/forge-gui/res/formats/Archive/Standard/2010-10-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOM)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2010-10-01
 Sets:ZEN, WWK, ROE, M11, SOM
diff --git a/forge-gui/res/formats/Archive/Standard/2011-02-04.txt b/forge-gui/res/formats/Archived/Standard/2011-02-04.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2011-02-04.txt
rename to forge-gui/res/formats/Archived/Standard/2011-02-04.txt
index d8d40cb42ef..9bcac8df835 100644
--- a/forge-gui/res/formats/Archive/Standard/2011-02-04.txt
+++ b/forge-gui/res/formats/Archived/Standard/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MBS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2011-02-04
 Sets:ZEN, WWK, ROE, M11, SOM, MBS
diff --git a/forge-gui/res/formats/Archive/Standard/2011-05-13.txt b/forge-gui/res/formats/Archived/Standard/2011-05-13.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2011-05-13.txt
rename to forge-gui/res/formats/Archived/Standard/2011-05-13.txt
index 8cb6dc77ba9..730e266ea67 100644
--- a/forge-gui/res/formats/Archive/Standard/2011-05-13.txt
+++ b/forge-gui/res/formats/Archived/Standard/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NPH)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2011-05-13
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Archive/Standard/2011-07-01.txt b/forge-gui/res/formats/Archived/Standard/2011-07-01.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2011-07-01.txt
rename to forge-gui/res/formats/Archived/Standard/2011-07-01.txt
index 447103877cd..c8f49bbc993 100644
--- a/forge-gui/res/formats/Archive/Standard/2011-07-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2011-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2011-07-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2011-07-01
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH
diff --git a/forge-gui/res/formats/Archive/Standard/2011-07-15.txt b/forge-gui/res/formats/Archived/Standard/2011-07-15.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2011-07-15.txt
rename to forge-gui/res/formats/Archived/Standard/2011-07-15.txt
index 6afb52ae956..30e2c0077cd 100644
--- a/forge-gui/res/formats/Archive/Standard/2011-07-15.txt
+++ b/forge-gui/res/formats/Archived/Standard/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M12)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2011-07-15
 Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12
diff --git a/forge-gui/res/formats/Archive/Standard/2011-09-30.txt b/forge-gui/res/formats/Archived/Standard/2011-09-30.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Standard/2011-09-30.txt
index 56e7f60c861..55f4e0351d2 100644
--- a/forge-gui/res/formats/Archive/Standard/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Standard/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ISD)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2011-09-30
 Sets:SOM, MBS, NPH, M12, ISD
diff --git a/forge-gui/res/formats/Archive/Standard/2012-02-03.txt b/forge-gui/res/formats/Archived/Standard/2012-02-03.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Standard/2012-02-03.txt
index 2a201ab3ba2..60e1d107446 100644
--- a/forge-gui/res/formats/Archive/Standard/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DKA)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2012-02-03
 Sets:SOM, MBS, NPH, M12, ISD, DKA
diff --git a/forge-gui/res/formats/Archive/Standard/2012-05-04.txt b/forge-gui/res/formats/Archived/Standard/2012-05-04.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Standard/2012-05-04.txt
index af6c3bb885f..52b2aca111f 100644
--- a/forge-gui/res/formats/Archive/Standard/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Standard/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AVR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2012-05-04
 Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR
diff --git a/forge-gui/res/formats/Archive/Standard/2012-07-13.txt b/forge-gui/res/formats/Archived/Standard/2012-07-13.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2012-07-13.txt
rename to forge-gui/res/formats/Archived/Standard/2012-07-13.txt
index bc55fcf3cab..8eb1e432061 100644
--- a/forge-gui/res/formats/Archive/Standard/2012-07-13.txt
+++ b/forge-gui/res/formats/Archived/Standard/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M13)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2012-07-13
 Sets:SOM, MBS, NPH, M12, ISD, DKA, AVR, M13
diff --git a/forge-gui/res/formats/Archive/Standard/2012-10-05.txt b/forge-gui/res/formats/Archived/Standard/2012-10-05.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Standard/2012-10-05.txt
index 525421eff5e..647cf52ec5e 100644
--- a/forge-gui/res/formats/Archive/Standard/2012-10-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RTR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2012-10-05
 Sets:ISD, DKA, AVR, M13, RTR
diff --git a/forge-gui/res/formats/Archive/Standard/2013-02-01.txt b/forge-gui/res/formats/Archived/Standard/2013-02-01.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Standard/2013-02-01.txt
index be3468d3b04..1e502a56d5b 100644
--- a/forge-gui/res/formats/Archive/Standard/2013-02-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GTC)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2013-02-01
 Sets:ISD, DKA, AVR, M13, RTR, GTC
diff --git a/forge-gui/res/formats/Archive/Standard/2013-05-03.txt b/forge-gui/res/formats/Archived/Standard/2013-05-03.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Standard/2013-05-03.txt
index d0ab7e8ff1b..fb40af206cd 100644
--- a/forge-gui/res/formats/Archive/Standard/2013-05-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DGM)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2013-05-03
 Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM
diff --git a/forge-gui/res/formats/Archive/Standard/2013-07-19.txt b/forge-gui/res/formats/Archived/Standard/2013-07-19.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2013-07-19.txt
rename to forge-gui/res/formats/Archived/Standard/2013-07-19.txt
index f0db383498d..6f66a9faafa 100644
--- a/forge-gui/res/formats/Archive/Standard/2013-07-19.txt
+++ b/forge-gui/res/formats/Archived/Standard/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M14)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2013-07-19
 Sets:ISD, DKA, AVR, M13, RTR, GTC, DGM, M14
diff --git a/forge-gui/res/formats/Archive/Standard/2013-09-27.txt b/forge-gui/res/formats/Archived/Standard/2013-09-27.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Standard/2013-09-27.txt
index 58f6990c92a..11ea8408176 100644
--- a/forge-gui/res/formats/Archive/Standard/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Standard/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (THS)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2013-09-27
 Sets:RTR, GTC, DGM, M14, THS
diff --git a/forge-gui/res/formats/Archive/Standard/2014-02-07.txt b/forge-gui/res/formats/Archived/Standard/2014-02-07.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2014-02-07.txt
rename to forge-gui/res/formats/Archived/Standard/2014-02-07.txt
index e83787b6316..9a63f589c0e 100644
--- a/forge-gui/res/formats/Archive/Standard/2014-02-07.txt
+++ b/forge-gui/res/formats/Archived/Standard/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BNG)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2014-02-07
 Sets:RTR, GTC, DGM, M14, THS, BNG
diff --git a/forge-gui/res/formats/Archive/Standard/2014-05-02.txt b/forge-gui/res/formats/Archived/Standard/2014-05-02.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2014-05-02.txt
rename to forge-gui/res/formats/Archived/Standard/2014-05-02.txt
index 8731635dccc..409480e4ee3 100644
--- a/forge-gui/res/formats/Archive/Standard/2014-05-02.txt
+++ b/forge-gui/res/formats/Archived/Standard/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (JOU)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2014-05-02
 Sets:RTR, GTC, DGM, M14, THS, BNG, JOU
diff --git a/forge-gui/res/formats/Archive/Standard/2014-07-18.txt b/forge-gui/res/formats/Archived/Standard/2014-07-18.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2014-07-18.txt
rename to forge-gui/res/formats/Archived/Standard/2014-07-18.txt
index 0b50bbd0c2c..e2c8aeb5361 100644
--- a/forge-gui/res/formats/Archive/Standard/2014-07-18.txt
+++ b/forge-gui/res/formats/Archived/Standard/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M15)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2014-07-18
 Sets:RTR, GTC, DGM, M14, THS, BNG, JOU, M15
diff --git a/forge-gui/res/formats/Archive/Standard/2014-09-26.txt b/forge-gui/res/formats/Archived/Standard/2014-09-26.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2014-09-26.txt
rename to forge-gui/res/formats/Archived/Standard/2014-09-26.txt
index a77b8587805..bc1336992a5 100644
--- a/forge-gui/res/formats/Archive/Standard/2014-09-26.txt
+++ b/forge-gui/res/formats/Archived/Standard/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KTK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2014-09-26
 Sets:THS, BNG, JOU, M15, KTK
diff --git a/forge-gui/res/formats/Archive/Standard/2015-01-23.txt b/forge-gui/res/formats/Archived/Standard/2015-01-23.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2015-01-23.txt
rename to forge-gui/res/formats/Archived/Standard/2015-01-23.txt
index 5473f151df7..413bf3f785b 100644
--- a/forge-gui/res/formats/Archive/Standard/2015-01-23.txt
+++ b/forge-gui/res/formats/Archived/Standard/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (FRF)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2015-01-23
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF
diff --git a/forge-gui/res/formats/Archive/Standard/2015-03-27.txt b/forge-gui/res/formats/Archived/Standard/2015-03-27.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2015-03-27.txt
rename to forge-gui/res/formats/Archived/Standard/2015-03-27.txt
index 13619169319..35547079d60 100644
--- a/forge-gui/res/formats/Archive/Standard/2015-03-27.txt
+++ b/forge-gui/res/formats/Archived/Standard/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DTK)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2015-03-27
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF, DTK
diff --git a/forge-gui/res/formats/Archive/Standard/2015-07-17.txt b/forge-gui/res/formats/Archived/Standard/2015-07-17.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2015-07-17.txt
rename to forge-gui/res/formats/Archived/Standard/2015-07-17.txt
index 158ce40e796..c309cc821cd 100644
--- a/forge-gui/res/formats/Archive/Standard/2015-07-17.txt
+++ b/forge-gui/res/formats/Archived/Standard/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ORI)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2015-07-17
 Sets:THS, BNG, JOU, M15, KTK, FRF, UGF, DTK, ORI
diff --git a/forge-gui/res/formats/Archive/Standard/2015-10-02.txt b/forge-gui/res/formats/Archived/Standard/2015-10-02.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2015-10-02.txt
rename to forge-gui/res/formats/Archived/Standard/2015-10-02.txt
index 652b8226bd6..fbb3be0540d 100644
--- a/forge-gui/res/formats/Archive/Standard/2015-10-02.txt
+++ b/forge-gui/res/formats/Archived/Standard/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (BFZ)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2015-10-02
 Sets:KTK, FRF, UGF, DTK, ORI, BFZ
diff --git a/forge-gui/res/formats/Archive/Standard/2016-01-22.txt b/forge-gui/res/formats/Archived/Standard/2016-01-22.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2016-01-22.txt
rename to forge-gui/res/formats/Archived/Standard/2016-01-22.txt
index 8983f805744..d41a925801a 100644
--- a/forge-gui/res/formats/Archive/Standard/2016-01-22.txt
+++ b/forge-gui/res/formats/Archived/Standard/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (OGW)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2016-01-22
 Sets:KTK, FRF, UGF, DTK, ORI, BFZ, OGW
diff --git a/forge-gui/res/formats/Archive/Standard/2016-04-08.txt b/forge-gui/res/formats/Archived/Standard/2016-04-08.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2016-04-08.txt
rename to forge-gui/res/formats/Archived/Standard/2016-04-08.txt
index d1bc2e9d54c..46c23dbaaca 100644
--- a/forge-gui/res/formats/Archive/Standard/2016-04-08.txt
+++ b/forge-gui/res/formats/Archived/Standard/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SOI)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2016-04-08
 Sets:DTK, ORI, BFZ, OGW, SOI, W16
diff --git a/forge-gui/res/formats/Archive/Standard/2016-07-22.txt b/forge-gui/res/formats/Archived/Standard/2016-07-22.txt
similarity index 88%
rename from forge-gui/res/formats/Archive/Standard/2016-07-22.txt
rename to forge-gui/res/formats/Archived/Standard/2016-07-22.txt
index d3ab77c98e0..cdd1c8ddf0f 100644
--- a/forge-gui/res/formats/Archive/Standard/2016-07-22.txt
+++ b/forge-gui/res/formats/Archived/Standard/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (EMN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2016-07-22
 Sets:DTK, ORI, BFZ, OGW, SOI, W16, EMN
diff --git a/forge-gui/res/formats/Archive/Standard/2016-09-30.txt b/forge-gui/res/formats/Archived/Standard/2016-09-30.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2016-09-30.txt
rename to forge-gui/res/formats/Archived/Standard/2016-09-30.txt
index 8c2b6b4cd58..401fc495c2d 100644
--- a/forge-gui/res/formats/Archive/Standard/2016-09-30.txt
+++ b/forge-gui/res/formats/Archived/Standard/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KLD)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2016-09-30
 Sets:BFZ, OGW, SOI, W16, EMN, KLD
diff --git a/forge-gui/res/formats/Archive/Standard/2017-01-20.txt b/forge-gui/res/formats/Archived/Standard/2017-01-20.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2017-01-20.txt
rename to forge-gui/res/formats/Archived/Standard/2017-01-20.txt
index 3743148e98f..d855a8ba2d1 100644
--- a/forge-gui/res/formats/Archive/Standard/2017-01-20.txt
+++ b/forge-gui/res/formats/Archived/Standard/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AER)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2017-01-20
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER
diff --git a/forge-gui/res/formats/Archive/Standard/2017-04-28.txt b/forge-gui/res/formats/Archived/Standard/2017-04-28.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2017-04-28.txt
rename to forge-gui/res/formats/Archived/Standard/2017-04-28.txt
index 0f8b844202d..c30320647b7 100644
--- a/forge-gui/res/formats/Archive/Standard/2017-04-28.txt
+++ b/forge-gui/res/formats/Archived/Standard/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AKH)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2017-04-28
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17
diff --git a/forge-gui/res/formats/Archive/Standard/2017-06-19.txt b/forge-gui/res/formats/Archived/Standard/2017-06-19.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2017-06-19.txt
rename to forge-gui/res/formats/Archived/Standard/2017-06-19.txt
index 0027719aab6..dfe709a11ec 100644
--- a/forge-gui/res/formats/Archive/Standard/2017-06-19.txt
+++ b/forge-gui/res/formats/Archived/Standard/2017-06-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2017-06-19)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2017-06-19
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17
diff --git a/forge-gui/res/formats/Archive/Standard/2017-07-14.txt b/forge-gui/res/formats/Archived/Standard/2017-07-14.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2017-07-14.txt
rename to forge-gui/res/formats/Archived/Standard/2017-07-14.txt
index 3e5ca8fcb3a..7da04606c36 100644
--- a/forge-gui/res/formats/Archive/Standard/2017-07-14.txt
+++ b/forge-gui/res/formats/Archived/Standard/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (HOU)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2017-07-14
 Sets:BFZ, OGW, SOI, W16, EMN, KLD, AER, AKH, W17, HOU
diff --git a/forge-gui/res/formats/Archive/Standard/2017-09-29.txt b/forge-gui/res/formats/Archived/Standard/2017-09-29.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2017-09-29.txt
rename to forge-gui/res/formats/Archived/Standard/2017-09-29.txt
index f8216b19784..83f34ccefc9 100644
--- a/forge-gui/res/formats/Archive/Standard/2017-09-29.txt
+++ b/forge-gui/res/formats/Archived/Standard/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (XLN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2017-09-29
 Sets:KLD, AER, AKH, W17, HOU, XLN
diff --git a/forge-gui/res/formats/Archive/Standard/2018-01-19.txt b/forge-gui/res/formats/Archived/Standard/2018-01-19.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2018-01-19.txt
rename to forge-gui/res/formats/Archived/Standard/2018-01-19.txt
index 956d87dd046..f17befd3f10 100644
--- a/forge-gui/res/formats/Archive/Standard/2018-01-19.txt
+++ b/forge-gui/res/formats/Archived/Standard/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RIX)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-01-19
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX
diff --git a/forge-gui/res/formats/Archive/Standard/2018-04-27.txt b/forge-gui/res/formats/Archived/Standard/2018-04-27.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2018-04-27.txt
rename to forge-gui/res/formats/Archived/Standard/2018-04-27.txt
index b5a78397bce..5dca8259a8d 100644
--- a/forge-gui/res/formats/Archive/Standard/2018-04-27.txt
+++ b/forge-gui/res/formats/Archived/Standard/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (DOM)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-04-27
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM
diff --git a/forge-gui/res/formats/Archive/Standard/2018-07-13.txt b/forge-gui/res/formats/Archived/Standard/2018-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2018-07-13.txt
rename to forge-gui/res/formats/Archived/Standard/2018-07-13.txt
index 437dc4ed3b7..5cedfb9c54d 100644
--- a/forge-gui/res/formats/Archive/Standard/2018-07-13.txt
+++ b/forge-gui/res/formats/Archived/Standard/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M19)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-07-13
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19
diff --git a/forge-gui/res/formats/Archive/Standard/2018-10-05.txt b/forge-gui/res/formats/Archived/Standard/2018-10-05.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2018-10-05.txt
rename to forge-gui/res/formats/Archived/Standard/2018-10-05.txt
index 83b1e8e0a14..d2b8464ddc6 100644
--- a/forge-gui/res/formats/Archive/Standard/2018-10-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (GRN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-10-05
 Sets:XLN, RIX, DOM, M19, GRN
diff --git a/forge-gui/res/formats/Archive/Standard/2018-11-16.txt b/forge-gui/res/formats/Archived/Standard/2018-11-16.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2018-11-16.txt
rename to forge-gui/res/formats/Archived/Standard/2018-11-16.txt
index 683bcfaf54c..62a4baefad5 100644
--- a/forge-gui/res/formats/Archive/Standard/2018-11-16.txt
+++ b/forge-gui/res/formats/Archived/Standard/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (G18)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-11-16
 Sets:XLN, RIX, DOM, M19, GRN, G18
diff --git a/forge-gui/res/formats/Archive/Standard/2019-01-25.txt b/forge-gui/res/formats/Archived/Standard/2019-01-25.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2019-01-25.txt
rename to forge-gui/res/formats/Archived/Standard/2019-01-25.txt
index 80ab900e7e5..dc74d828525 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-01-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (RNA)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-01-25
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Archive/Standard/2019-05-03.txt b/forge-gui/res/formats/Archived/Standard/2019-05-03.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2019-05-03.txt
rename to forge-gui/res/formats/Archived/Standard/2019-05-03.txt
index 47173e3c1a4..b4b3ce617ba 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-05-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (WAR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-05-03
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Archive/Standard/2019-07-12.txt b/forge-gui/res/formats/Archived/Standard/2019-07-12.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/2019-07-12.txt
rename to forge-gui/res/formats/Archived/Standard/2019-07-12.txt
index 82720254d33..b2b15e42876 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-07-12.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M20)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-07-12
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Archive/Standard/2019-08-30.txt b/forge-gui/res/formats/Archived/Standard/2019-08-30.txt
similarity index 89%
rename from forge-gui/res/formats/Archive/Standard/2019-08-30.txt
rename to forge-gui/res/formats/Archived/Standard/2019-08-30.txt
index 103431157c7..7afe2eb6c08 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-08-30.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-08-30)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-08-30
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Archive/Standard/2019-10-04.txt b/forge-gui/res/formats/Archived/Standard/2019-10-04.txt
similarity index 87%
rename from forge-gui/res/formats/Archive/Standard/2019-10-04.txt
rename to forge-gui/res/formats/Archived/Standard/2019-10-04.txt
index 0834b69cdfe..1dc1b844907 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-10-04.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ELD)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-10-04
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Standard/2019-10-25.txt b/forge-gui/res/formats/Archived/Standard/2019-10-25.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2019-10-25.txt
rename to forge-gui/res/formats/Archived/Standard/2019-10-25.txt
index cb8790ee547..269e4d8bb9a 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-10-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-10-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-10-25)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-10-25
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Standard/2019-11-22.txt b/forge-gui/res/formats/Archived/Standard/2019-11-22.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2019-11-22.txt
rename to forge-gui/res/formats/Archived/Standard/2019-11-22.txt
index ff8a4633e1a..e7682ee6258 100644
--- a/forge-gui/res/formats/Archive/Standard/2019-11-22.txt
+++ b/forge-gui/res/formats/Archived/Standard/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2019-11-22)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-11-22
 Sets:GRN, RNA, WAR, M20, ELD
diff --git a/forge-gui/res/formats/Archive/Standard/2020-01-24.txt b/forge-gui/res/formats/Archived/Standard/2020-01-24.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2020-01-24.txt
rename to forge-gui/res/formats/Archived/Standard/2020-01-24.txt
index 58791b73502..a55fcb7e365 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-01-24.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (THB)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-01-24
 Sets:GRN, RNA, WAR, M20, ELD, THB
diff --git a/forge-gui/res/formats/Archive/Standard/2020-04-24.txt b/forge-gui/res/formats/Archived/Standard/2020-04-24.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2020-04-24.txt
rename to forge-gui/res/formats/Archived/Standard/2020-04-24.txt
index 58ec74432aa..6f6e98feb59 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-04-24.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (IKO)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-04-24
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Archive/Standard/2020-06-01.txt b/forge-gui/res/formats/Archived/Standard/2020-06-01.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2020-06-01.txt
rename to forge-gui/res/formats/Archived/Standard/2020-06-01.txt
index c5a2f3fa30a..bf4653f2cce 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-06-01.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-06-01)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-06-01
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO
diff --git a/forge-gui/res/formats/Archive/Standard/2020-07-03.txt b/forge-gui/res/formats/Archived/Standard/2020-07-03.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/2020-07-03.txt
rename to forge-gui/res/formats/Archived/Standard/2020-07-03.txt
index 5f72035ab5e..933701c8637 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-07-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (M21)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-07-03
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Archive/Standard/2020-08-03.txt b/forge-gui/res/formats/Archived/Standard/2020-08-03.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2020-08-03.txt
rename to forge-gui/res/formats/Archived/Standard/2020-08-03.txt
index 62f4f7996fa..a8eb70a3110 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-08-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-08-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-08-03)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-08-03
 Sets:GRN, RNA, WAR, M20, ELD, THB, IKO, M21
diff --git a/forge-gui/res/formats/Archive/Standard/2020-09-25.txt b/forge-gui/res/formats/Archived/Standard/2020-09-25.txt
similarity index 92%
rename from forge-gui/res/formats/Archive/Standard/2020-09-25.txt
rename to forge-gui/res/formats/Archived/Standard/2020-09-25.txt
index 3b2f5ef94e0..a4d53e22a6f 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-09-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-09-25
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Archive/Standard/2020-09-28.txt b/forge-gui/res/formats/Archived/Standard/2020-09-28.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2020-09-28.txt
rename to forge-gui/res/formats/Archived/Standard/2020-09-28.txt
index fb4d8baf036..90ad1cce1c3 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-09-28.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-09-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-09-28)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-09-28
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Archive/Standard/2020-10-12.txt b/forge-gui/res/formats/Archived/Standard/2020-10-12.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2020-10-12.txt
rename to forge-gui/res/formats/Archived/Standard/2020-10-12.txt
index dabd0191419..a7f235b2f47 100644
--- a/forge-gui/res/formats/Archive/Standard/2020-10-12.txt
+++ b/forge-gui/res/formats/Archived/Standard/2020-10-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2020-10-12)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2020-10-12
 Sets:ELD, THB, IKO, M21, ZNR
diff --git a/forge-gui/res/formats/Archive/Standard/2021-02-05.txt b/forge-gui/res/formats/Archived/Standard/2021-02-05.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2021-02-05.txt
rename to forge-gui/res/formats/Archived/Standard/2021-02-05.txt
index 2db8c8b1d4b..bf0163daf83 100644
--- a/forge-gui/res/formats/Archive/Standard/2021-02-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (KHM)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2021-02-05
 Sets:ELD, THB, IKO, M21, ZNR, KHM
diff --git a/forge-gui/res/formats/Archive/Standard/2021-04-23.txt b/forge-gui/res/formats/Archived/Standard/2021-04-23.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2021-04-23.txt
rename to forge-gui/res/formats/Archived/Standard/2021-04-23.txt
index 81468e616a8..bc2fd0f3a4b 100644
--- a/forge-gui/res/formats/Archive/Standard/2021-04-23.txt
+++ b/forge-gui/res/formats/Archived/Standard/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (STX)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2021-04-23
 Sets:ELD, THB, IKO, M21, ZNR, KHM, STX
diff --git a/forge-gui/res/formats/Archive/Standard/2021-07-23.txt b/forge-gui/res/formats/Archived/Standard/2021-07-23.txt
similarity index 95%
rename from forge-gui/res/formats/Archive/Standard/2021-07-23.txt
rename to forge-gui/res/formats/Archived/Standard/2021-07-23.txt
index 45d94d5b66a..af593d739b5 100644
--- a/forge-gui/res/formats/Archive/Standard/2021-07-23.txt
+++ b/forge-gui/res/formats/Archived/Standard/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (AFR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2021-07-23
 Sets:ELD, THB, IKO, M21, ZNR, KHM, STX, AFR
diff --git a/forge-gui/res/formats/Archive/Standard/2021-09-24.txt b/forge-gui/res/formats/Archived/Standard/2021-09-24.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2021-09-24.txt
rename to forge-gui/res/formats/Archived/Standard/2021-09-24.txt
index 8b814e82533..bbc807923ed 100644
--- a/forge-gui/res/formats/Archive/Standard/2021-09-24.txt
+++ b/forge-gui/res/formats/Archived/Standard/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (MID)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2021-09-24
 Sets:ZNR, KHM, STX, AFR, MID
diff --git a/forge-gui/res/formats/Archive/Standard/2021-11-19.txt b/forge-gui/res/formats/Archived/Standard/2021-11-19.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/2021-11-19.txt
rename to forge-gui/res/formats/Archived/Standard/2021-11-19.txt
index d438695e9da..75dd527d5c4 100644
--- a/forge-gui/res/formats/Archive/Standard/2021-11-19.txt
+++ b/forge-gui/res/formats/Archived/Standard/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (VOW)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2021-11-19
 Sets:ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Archive/Standard/2022-01-25.txt b/forge-gui/res/formats/Archived/Standard/2022-01-25.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2022-01-25.txt
rename to forge-gui/res/formats/Archived/Standard/2022-01-25.txt
index 9680f5a2998..37b1749965b 100644
--- a/forge-gui/res/formats/Archive/Standard/2022-01-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/2022-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (2022-01-25)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2022-01-25
 Sets:ZNR, KHM, STX, AFR, MID, VOW
diff --git a/forge-gui/res/formats/Archive/Standard/2022-02-18.txt b/forge-gui/res/formats/Archived/Standard/2022-02-18.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2022-02-18.txt
rename to forge-gui/res/formats/Archived/Standard/2022-02-18.txt
index 4e8f12d13fc..d74043379a7 100644
--- a/forge-gui/res/formats/Archive/Standard/2022-02-18.txt
+++ b/forge-gui/res/formats/Archived/Standard/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (NEO)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2022-02-18
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO
diff --git a/forge-gui/res/formats/Archive/Standard/2022-04-29.txt b/forge-gui/res/formats/Archived/Standard/2022-04-29.txt
similarity index 93%
rename from forge-gui/res/formats/Archive/Standard/2022-04-29.txt
rename to forge-gui/res/formats/Archived/Standard/2022-04-29.txt
index f0e2c2e44ee..1aa4ffae3c4 100644
--- a/forge-gui/res/formats/Archive/Standard/2022-04-29.txt
+++ b/forge-gui/res/formats/Archived/Standard/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Standard (SNC)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2022-04-29
 Sets:ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
diff --git a/forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt b/forge-gui/res/formats/Archived/Standard/China/2018-06-22.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt
rename to forge-gui/res/formats/Archived/Standard/China/2018-06-22.txt
index b4fc3fee165..daf552315f5 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2018-06-22.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (GS1)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-06-22
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, GS1
diff --git a/forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt b/forge-gui/res/formats/Archived/Standard/China/2018-07-13.txt
similarity index 94%
rename from forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt
rename to forge-gui/res/formats/Archived/Standard/China/2018-07-13.txt
index f7c39611998..cd733966b78 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2018-07-13.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (M19)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-07-13
 Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, GS1, M19
diff --git a/forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt b/forge-gui/res/formats/Archived/Standard/China/2018-10-05.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt
rename to forge-gui/res/formats/Archived/Standard/China/2018-10-05.txt
index a3823cf6aab..0b8f98807c5 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2018-10-05.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (GRN)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-10-05
 Sets:XLN, RIX, DOM, GS1, M19, GRN
diff --git a/forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt b/forge-gui/res/formats/Archived/Standard/China/2018-11-16.txt
similarity index 90%
rename from forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt
rename to forge-gui/res/formats/Archived/Standard/China/2018-11-16.txt
index 6dbe528a68f..9f0cdba1ed6 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2018-11-16.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (G18)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2018-11-16
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18
diff --git a/forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt b/forge-gui/res/formats/Archived/Standard/China/2019-01-25.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt
rename to forge-gui/res/formats/Archived/Standard/China/2019-01-25.txt
index 06464f4813e..b36acb4e739 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2019-01-25.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (RNA)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-01-25
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA
diff --git a/forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt b/forge-gui/res/formats/Archived/Standard/China/2019-05-03.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt
rename to forge-gui/res/formats/Archived/Standard/China/2019-05-03.txt
index 0568b889bad..37657f811a4 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2019-05-03.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (WAR)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-05-03
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR
diff --git a/forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt b/forge-gui/res/formats/Archived/Standard/China/2019-07-12.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt
rename to forge-gui/res/formats/Archived/Standard/China/2019-07-12.txt
index 1edac193a4f..011a172e511 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2019-07-12.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (M20)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-07-12
 Sets:XLN, RIX, DOM, GS1, M19, GRN, G18, RNA, WAR, M20
diff --git a/forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt b/forge-gui/res/formats/Archived/Standard/China/2019-08-30.txt
similarity index 91%
rename from forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt
rename to forge-gui/res/formats/Archived/Standard/China/2019-08-30.txt
index d9bd58ecb00..f9d893ec803 100644
--- a/forge-gui/res/formats/Archive/Standard/China/2019-08-30.txt
+++ b/forge-gui/res/formats/Archived/Standard/China/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:China Standard (2019-08-30)
-Type:Archive
+Type:Archived
 Subtype:Standard
 Effective:2019-08-30
 Retired:2019-10-03
diff --git a/forge-gui/res/formats/Archive/Vintage/1993-08-05.txt b/forge-gui/res/formats/Archived/Vintage/1993-08-05.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Vintage/1993-08-05.txt
rename to forge-gui/res/formats/Archived/Vintage/1993-08-05.txt
index 04a7ee46171..58b2725d547 100644
--- a/forge-gui/res/formats/Archive/Vintage/1993-08-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1993-08-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (1993-08-05)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1993-08-05
 Sets:LEA
diff --git a/forge-gui/res/formats/Archive/Vintage/1993-10-04.txt b/forge-gui/res/formats/Archived/Vintage/1993-10-04.txt
similarity index 85%
rename from forge-gui/res/formats/Archive/Vintage/1993-10-04.txt
rename to forge-gui/res/formats/Archived/Vintage/1993-10-04.txt
index 9f522cb2a66..309abb7edc9 100644
--- a/forge-gui/res/formats/Archive/Vintage/1993-10-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1993-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (LEB)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1993-10-04
 Sets:LEA, LEB
diff --git a/forge-gui/res/formats/Archive/Vintage/1993-12-01.txt b/forge-gui/res/formats/Archived/Vintage/1993-12-01.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Vintage/1993-12-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1993-12-01.txt
index 6c9e3ca9a1b..c66920ab1bf 100644
--- a/forge-gui/res/formats/Archive/Vintage/1993-12-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1993-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (2ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1993-12-01
 Sets:LEA, LEB, 2ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1993-12-17.txt b/forge-gui/res/formats/Archived/Vintage/1993-12-17.txt
similarity index 86%
rename from forge-gui/res/formats/Archive/Vintage/1993-12-17.txt
rename to forge-gui/res/formats/Archived/Vintage/1993-12-17.txt
index 4dd3bc4976f..9584f2adf03 100644
--- a/forge-gui/res/formats/Archive/Vintage/1993-12-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1993-12-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pre-format (ARN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1993-12-17
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-01-26.txt b/forge-gui/res/formats/Archived/Vintage/1994-01-26.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Vintage/1994-01-26.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-01-26.txt
index 9af41ababc5..e5e20eb61ab 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-01-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-01-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-01-26)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-01-26
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-02-23.txt b/forge-gui/res/formats/Archived/Vintage/1994-02-23.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Vintage/1994-02-23.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-02-23.txt
index 72fd9be6a95..80fc4522cdd 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-02-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-02-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-02-23)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-02-23
 Sets:LEA, LEB, 2ED, ARN
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-03-04.txt b/forge-gui/res/formats/Archived/Vintage/1994-03-04.txt
similarity index 96%
rename from forge-gui/res/formats/Archive/Vintage/1994-03-04.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-03-04.txt
index 3a8e987e832..2ce2dc1f3ce 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-03-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-03-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (ATQ)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-03-04
 Sets:LEA, LEB, 2ED, ARN, ATQ
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-03-23.txt b/forge-gui/res/formats/Archived/Vintage/1994-03-23.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-03-23.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-03-23.txt
index 1fd86d3705c..19224d5cf13 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-03-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-03-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-03-23)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-03-23
 Sets:LEA, LEB, 2ED, ARN, ATQ
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-04-01.txt b/forge-gui/res/formats/Archived/Vintage/1994-04-01.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-04-01.txt
index 86d235d17f3..9231da51d82 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (3ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-05-02.txt b/forge-gui/res/formats/Archived/Vintage/1994-05-02.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-05-02.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-05-02.txt
index a9e10a73f4d..3118a9547d5 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-05-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-05-02)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-06-10.txt b/forge-gui/res/formats/Archived/Vintage/1994-06-10.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-06-10.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-06-10.txt
index f57d9134a2a..342a2260519 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-06-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (LEG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-06-13.txt b/forge-gui/res/formats/Archived/Vintage/1994-06-13.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-06-13.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-06-13.txt
index 5a2f9cda29b..bfdb7ea40ba 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-06-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-06-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-06-13)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-06-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-07-15.txt b/forge-gui/res/formats/Archived/Vintage/1994-07-15.txt
similarity index 97%
rename from forge-gui/res/formats/Archive/Vintage/1994-07-15.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-07-15.txt
index 04bc1c90fad..438c96687b9 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-07-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-07-15)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-08-02.txt b/forge-gui/res/formats/Archived/Vintage/1994-08-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1994-08-02.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-08-02.txt
index 59a9ae9f5f2..7a631be785a 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-08-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-08-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-08-02)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-08-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-08-08.txt b/forge-gui/res/formats/Archived/Vintage/1994-08-08.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1994-08-08.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-08-08.txt
index 1853a596b0d..31bd6ed5bb5 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-08-08.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-08-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (DRK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-08-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-10-10.txt b/forge-gui/res/formats/Archived/Vintage/1994-10-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1994-10-10.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-10-10.txt
index 4bd42a2140a..33bf633cb59 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-10-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-10-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (1994-10-10)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-10-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK
diff --git a/forge-gui/res/formats/Archive/Vintage/1994-11-15.txt b/forge-gui/res/formats/Archived/Vintage/1994-11-15.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1994-11-15.txt
rename to forge-gui/res/formats/Archived/Vintage/1994-11-15.txt
index a3540523719..dfdb3ce1f41 100644
--- a/forge-gui/res/formats/Archive/Vintage/1994-11-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1994-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Constructed (FEM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1994-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-01-10.txt b/forge-gui/res/formats/Archived/Vintage/1995-01-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-01-10.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-01-10.txt
index 6ee5d83b91e..a652c463348 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-01-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-01-10)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-03-01.txt b/forge-gui/res/formats/Archived/Vintage/1995-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-03-01.txt
index 3bfd653a41a..f6d94dc7160 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-03-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-04-19.txt b/forge-gui/res/formats/Archived/Vintage/1995-04-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-04-19.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-04-19.txt
index 56df9ddc9ec..00529896077 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-04-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-04-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (4ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-04-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-06-03.txt b/forge-gui/res/formats/Archived/Vintage/1995-06-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-06-03.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-06-03.txt
index 194c915b169..8f4844641ba 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-06-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-06-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ICE)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-06-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-07-01.txt b/forge-gui/res/formats/Archived/Vintage/1995-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-07-01.txt
index 4d8c8843997..e7e70287a54 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (CHR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-11-01.txt b/forge-gui/res/formats/Archived/Vintage/1995-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-11-01.txt
index 2aa842a98e0..c4dd7c50cc8 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1995-11-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR
diff --git a/forge-gui/res/formats/Archive/Vintage/1995-11-13.txt b/forge-gui/res/formats/Archived/Vintage/1995-11-13.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1995-11-13.txt
rename to forge-gui/res/formats/Archived/Vintage/1995-11-13.txt
index 94c8f0d15cc..693f3ea64d3 100644
--- a/forge-gui/res/formats/Archive/Vintage/1995-11-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1995-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (HML)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1995-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Vintage/1996-02-01.txt b/forge-gui/res/formats/Archived/Vintage/1996-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1996-02-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1996-02-01.txt
index 90bccf40341..afc82f963e8 100644
--- a/forge-gui/res/formats/Archive/Vintage/1996-02-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1996-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-02-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1996-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Vintage/1996-04-01.txt b/forge-gui/res/formats/Archived/Vintage/1996-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1996-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1996-04-01.txt
index 851e3a27751..ad46ba63ec6 100644
--- a/forge-gui/res/formats/Archive/Vintage/1996-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1996-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-04-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1996-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML
diff --git a/forge-gui/res/formats/Archive/Vintage/1996-07-10.txt b/forge-gui/res/formats/Archived/Vintage/1996-07-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1996-07-10.txt
rename to forge-gui/res/formats/Archived/Vintage/1996-07-10.txt
index 6fc8b1103bc..3461bcb9014 100644
--- a/forge-gui/res/formats/Archive/Vintage/1996-07-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1996-07-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ALL)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1996-07-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Vintage/1996-10-01.txt b/forge-gui/res/formats/Archived/Vintage/1996-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1996-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1996-10-01.txt
index a80b9be6496..95ccb49b68f 100644
--- a/forge-gui/res/formats/Archive/Vintage/1996-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1996-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1996-10-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1996-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL
diff --git a/forge-gui/res/formats/Archive/Vintage/1996-11-07.txt b/forge-gui/res/formats/Archived/Vintage/1996-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1996-11-07.txt
rename to forge-gui/res/formats/Archived/Vintage/1996-11-07.txt
index 34cb5f10be4..8efcf2cd516 100644
--- a/forge-gui/res/formats/Archive/Vintage/1996-11-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1996-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MIR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1996-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR
diff --git a/forge-gui/res/formats/Archive/Vintage/1997-03-05.txt b/forge-gui/res/formats/Archived/Vintage/1997-03-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1997-03-05.txt
rename to forge-gui/res/formats/Archived/Vintage/1997-03-05.txt
index f0c1e5bde50..79c4ee5a1b7 100644
--- a/forge-gui/res/formats/Archive/Vintage/1997-03-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1997-03-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (VIS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1997-03-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS
diff --git a/forge-gui/res/formats/Archive/Vintage/1997-04-23.txt b/forge-gui/res/formats/Archived/Vintage/1997-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1997-04-23.txt
rename to forge-gui/res/formats/Archived/Vintage/1997-04-23.txt
index 8d1e3e5c6e5..7a26f5c4919 100644
--- a/forge-gui/res/formats/Archive/Vintage/1997-04-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1997-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (5ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1997-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1997-07-01.txt b/forge-gui/res/formats/Archived/Vintage/1997-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1997-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1997-07-01.txt
index 8511b46a91a..192a9b16b9a 100644
--- a/forge-gui/res/formats/Archive/Vintage/1997-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1997-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (WTH)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1997-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Vintage/1997-10-01.txt b/forge-gui/res/formats/Archived/Vintage/1997-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1997-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1997-10-01.txt
index a06fe4676ff..ccabdc84a1f 100644
--- a/forge-gui/res/formats/Archive/Vintage/1997-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1997-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1997-10-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1997-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH
diff --git a/forge-gui/res/formats/Archive/Vintage/1997-11-01.txt b/forge-gui/res/formats/Archived/Vintage/1997-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1997-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1997-11-01.txt
index 63d94692578..8ebe275d22e 100644
--- a/forge-gui/res/formats/Archive/Vintage/1997-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1997-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (TMP)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1997-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Archive/Vintage/1998-01-01.txt b/forge-gui/res/formats/Archived/Vintage/1998-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1998-01-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1998-01-01.txt
index fd65df8ea67..0ac09e9bf49 100644
--- a/forge-gui/res/formats/Archive/Vintage/1998-01-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1998-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1998-01-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1998-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP
diff --git a/forge-gui/res/formats/Archive/Vintage/1998-04-01.txt b/forge-gui/res/formats/Archived/Vintage/1998-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1998-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1998-04-01.txt
index 470ef60ff29..fe37417b83b 100644
--- a/forge-gui/res/formats/Archive/Vintage/1998-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1998-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (STH)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1998-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH
diff --git a/forge-gui/res/formats/Archive/Vintage/1998-07-01.txt b/forge-gui/res/formats/Archived/Vintage/1998-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1998-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1998-07-01.txt
index a17f234e506..13ae62cbbca 100644
--- a/forge-gui/res/formats/Archive/Vintage/1998-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1998-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (EXO)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1998-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO
diff --git a/forge-gui/res/formats/Archive/Vintage/1998-11-01.txt b/forge-gui/res/formats/Archived/Vintage/1998-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1998-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1998-11-01.txt
index 3d1f6ee4030..7e0705043ff 100644
--- a/forge-gui/res/formats/Archive/Vintage/1998-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1998-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (USG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1998-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-01-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-01-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-01-01.txt
index 620e10cc6f0..83ec6eb08dc 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-01-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-01-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-03-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-03-01.txt
index bb6aea6a0d3..6a93ad3ca3f 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ULG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-04-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-04-01.txt
index 4f5da49e3d7..9c2dcbe8b6b 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-04-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-06-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-06-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-06-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-06-01.txt
index edf95929f35..b78c2289cfe 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-06-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-06-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (6ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-06-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-07-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-07-01.txt
index 923d7b2f382..6f9a73366d0 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (UDS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-10-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-10-01.txt
index ad427701a13..ca8bb27fe09 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (1999-10-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-11-01.txt b/forge-gui/res/formats/Archived/Vintage/1999-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-11-01.txt
index c4d9ef943e6..952592ada3a 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MMQ)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ
diff --git a/forge-gui/res/formats/Archive/Vintage/1999-11-12.txt b/forge-gui/res/formats/Archived/Vintage/1999-11-12.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/1999-11-12.txt
rename to forge-gui/res/formats/Archived/Vintage/1999-11-12.txt
index 9766fa36607..6e782581fd9 100644
--- a/forge-gui/res/formats/Archive/Vintage/1999-11-12.txt
+++ b/forge-gui/res/formats/Archived/Vintage/1999-11-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (BRB)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:1999-11-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB
diff --git a/forge-gui/res/formats/Archive/Vintage/2000-03-01.txt b/forge-gui/res/formats/Archived/Vintage/2000-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2000-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2000-03-01.txt
index adbd22b231e..c223ef5e676 100644
--- a/forge-gui/res/formats/Archive/Vintage/2000-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2000-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (NMS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2000-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS
diff --git a/forge-gui/res/formats/Archive/Vintage/2000-07-01.txt b/forge-gui/res/formats/Archived/Vintage/2000-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2000-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2000-07-01.txt
index cd695136b06..9cf130e6d0a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2000-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2000-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (PCY)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2000-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY
diff --git a/forge-gui/res/formats/Archive/Vintage/2000-10-01.txt b/forge-gui/res/formats/Archived/Vintage/2000-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2000-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2000-10-01.txt
index eb84d64046b..b9ae018fa7e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2000-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2000-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (BTD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2000-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD
diff --git a/forge-gui/res/formats/Archive/Vintage/2000-11-01.txt b/forge-gui/res/formats/Archived/Vintage/2000-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2000-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2000-11-01.txt
index c9c2e12835a..d7de3a3e217 100644
--- a/forge-gui/res/formats/Archive/Vintage/2000-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2000-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (INV)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2000-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV
diff --git a/forge-gui/res/formats/Archive/Vintage/2001-03-01.txt b/forge-gui/res/formats/Archived/Vintage/2001-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2001-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2001-03-01.txt
index 4fe319cee44..a42637f23ef 100644
--- a/forge-gui/res/formats/Archive/Vintage/2001-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2001-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (PLS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2001-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS
diff --git a/forge-gui/res/formats/Archive/Vintage/2001-05-01.txt b/forge-gui/res/formats/Archived/Vintage/2001-05-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2001-05-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2001-05-01.txt
index 80ea686ed4f..5486f81d96c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2001-05-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2001-05-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (7ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2001-05-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED
diff --git a/forge-gui/res/formats/Archive/Vintage/2001-07-01.txt b/forge-gui/res/formats/Archived/Vintage/2001-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2001-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2001-07-01.txt
index fa5f93fcf43..4ac92837600 100644
--- a/forge-gui/res/formats/Archive/Vintage/2001-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2001-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (APC)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2001-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC
diff --git a/forge-gui/res/formats/Archive/Vintage/2001-11-01.txt b/forge-gui/res/formats/Archived/Vintage/2001-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2001-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2001-11-01.txt
index d2a7d128d36..0104df947f4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2001-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2001-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ODY)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2001-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY
diff --git a/forge-gui/res/formats/Archive/Vintage/2001-12-01.txt b/forge-gui/res/formats/Archived/Vintage/2001-12-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2001-12-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2001-12-01.txt
index 32057ba9c30..794d31fed78 100644
--- a/forge-gui/res/formats/Archive/Vintage/2001-12-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2001-12-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (DKM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2001-12-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Archive/Vintage/2002-01-01.txt b/forge-gui/res/formats/Archived/Vintage/2002-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2002-01-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2002-01-01.txt
index df5f28265ff..f0ef1c54040 100644
--- a/forge-gui/res/formats/Archive/Vintage/2002-01-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2002-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2002-01-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2002-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM
diff --git a/forge-gui/res/formats/Archive/Vintage/2002-03-01.txt b/forge-gui/res/formats/Archived/Vintage/2002-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2002-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2002-03-01.txt
index 7ab7ad19000..b655caeca4c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2002-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2002-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (TOR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2002-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR
diff --git a/forge-gui/res/formats/Archive/Vintage/2002-07-01.txt b/forge-gui/res/formats/Archived/Vintage/2002-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2002-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2002-07-01.txt
index 5fd0d18be19..c000d7827b9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2002-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2002-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (JUD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2002-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD
diff --git a/forge-gui/res/formats/Archive/Vintage/2002-11-01.txt b/forge-gui/res/formats/Archived/Vintage/2002-11-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2002-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2002-11-01.txt
index bbdf3acd203..756f8ed570c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2002-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2002-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (ONS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2002-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS
diff --git a/forge-gui/res/formats/Archive/Vintage/2003-03-01.txt b/forge-gui/res/formats/Archived/Vintage/2003-03-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2003-03-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2003-03-01.txt
index bce06f6f84f..a40f56f62f6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2003-03-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2003-03-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (LGN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2003-03-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Vintage/2003-04-01.txt b/forge-gui/res/formats/Archived/Vintage/2003-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2003-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2003-04-01.txt
index 66d32818015..6abf5495aa5 100644
--- a/forge-gui/res/formats/Archive/Vintage/2003-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2003-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2003-04-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2003-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN
diff --git a/forge-gui/res/formats/Archive/Vintage/2003-07-01.txt b/forge-gui/res/formats/Archived/Vintage/2003-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2003-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2003-07-01.txt
index 8f5c3a2c0e2..9cb5aa82b6e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2003-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2003-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (SCG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2003-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG
diff --git a/forge-gui/res/formats/Archive/Vintage/2003-09-01.txt b/forge-gui/res/formats/Archived/Vintage/2003-09-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2003-09-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2003-09-01.txt
index 04b40261a79..3dad6a15d97 100644
--- a/forge-gui/res/formats/Archive/Vintage/2003-09-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2003-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (8ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2003-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED
diff --git a/forge-gui/res/formats/Archive/Vintage/2003-10-20.txt b/forge-gui/res/formats/Archived/Vintage/2003-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2003-10-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2003-10-20.txt
index 76eaaf09ceb..4d70e3bd109 100644
--- a/forge-gui/res/formats/Archive/Vintage/2003-10-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2003-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (MRD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2003-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-01-01.txt b/forge-gui/res/formats/Archived/Vintage/2004-01-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-01-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-01-01.txt
index b9b6efee4dc..67c7bd6545e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-01-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-01-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (2004-01-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-01-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-02-20.txt b/forge-gui/res/formats/Archived/Vintage/2004-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-02-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-02-20.txt
index 6cd895388b2..dddb74c5bf6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-02-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (DST)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-06-20.txt b/forge-gui/res/formats/Archived/Vintage/2004-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-06-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-06-20.txt
index 2ed2fe46985..92bfcb9db62 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-06-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Type 1 (5DN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-09-20.txt b/forge-gui/res/formats/Archived/Vintage/2004-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-09-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-09-20.txt
index 86adf19170a..19f62747d0e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-09-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2004-09-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-10-20.txt b/forge-gui/res/formats/Archived/Vintage/2004-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-10-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-10-20.txt
index fa544c490c3..69453d336b6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-10-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CHK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Archive/Vintage/2004-12-20.txt b/forge-gui/res/formats/Archived/Vintage/2004-12-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2004-12-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2004-12-20.txt
index de9068f65ed..e52331b4922 100644
--- a/forge-gui/res/formats/Archive/Vintage/2004-12-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2004-12-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2004-12-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2004-12-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-02-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-02-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-02-20.txt
index 4009ce35b90..08f70ec49a7 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-02-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BOK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-03-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-03-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-03-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-03-20.txt
index 6033b95ef5b..40a33229cea 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-03-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-03-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2005-03-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-03-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-06-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-06-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-06-20.txt
index 2e2c41e7a16..4dd6cc641d4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-06-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-08-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-08-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-08-20.txt
index ba45b7434ba..fd4440fd4bf 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-08-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (9ED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-09-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-09-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-09-20.txt
index f3cce07d4a1..c8d3d6e7cc6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-09-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2005-09-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 4ED, ICE, CHR, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ATH, ULG, 6ED, UDS, MMQ, BRB, NMS, PCY, BTD, INV, PLS, 7ED, APC, ODY, DKM, TOR, JUD, ONS, LGN, SCG, 8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED
diff --git a/forge-gui/res/formats/Archive/Vintage/2005-10-20.txt b/forge-gui/res/formats/Archived/Vintage/2005-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2005-10-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2005-10-20.txt
index 3f92f962fa1..b7f0628b2e2 100644
--- a/forge-gui/res/formats/Archive/Vintage/2005-10-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2005-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RAV)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2005-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2006-02-20.txt b/forge-gui/res/formats/Archived/Vintage/2006-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2006-02-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2006-02-20.txt
index fe056ddb0b0..e3c04f07299 100644
--- a/forge-gui/res/formats/Archive/Vintage/2006-02-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2006-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GPT)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2006-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2006-05-20.txt b/forge-gui/res/formats/Archived/Vintage/2006-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2006-05-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2006-05-20.txt
index 04da71688cb..da4410a850a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2006-05-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2006-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DIS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2006-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2006-08-20.txt b/forge-gui/res/formats/Archived/Vintage/2006-08-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2006-08-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2006-08-20.txt
index d08d474f311..e5417e7d493 100644
--- a/forge-gui/res/formats/Archive/Vintage/2006-08-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2006-08-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CSP)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2006-08-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2006-10-20.txt b/forge-gui/res/formats/Archived/Vintage/2006-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2006-10-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2006-10-20.txt
index a6f807ce56e..5ba7c457d7c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2006-10-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2006-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TSP)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2006-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-02-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-02-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-02-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-02-20.txt
index 4554bfd74d8..3cefd4d28be 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-02-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-02-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PLC)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-02-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-05-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-05-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-05-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-05-20.txt
index 70278b9444c..73192d48e49 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-05-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-05-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (FUT)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-05-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-06-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-06-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-06-20.txt
index 3bfbfce0771..b1e4f489ed2 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-06-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2007-06-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-07-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-07-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-07-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-07-20.txt
index 50ffaf0b9da..c40fea97f55 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-07-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-07-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (10E)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-07-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-09-10.txt b/forge-gui/res/formats/Archived/Vintage/2007-09-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-09-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-09-10.txt
index a4379366d58..7d7a806b63c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-09-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-09-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MED)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-09-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-09-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-09-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-09-20.txt
index 75cdc0b3c7a..3c64f52a479 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-09-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2007-09-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-10-20.txt b/forge-gui/res/formats/Archived/Vintage/2007-10-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-10-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-10-20.txt
index c388adb9dad..4d07e8f9dc3 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-10-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-10-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (LRW)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-10-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2007-11-16.txt b/forge-gui/res/formats/Archived/Vintage/2007-11-16.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2007-11-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2007-11-16.txt
index 645c9300503..21598959767 100644
--- a/forge-gui/res/formats/Archive/Vintage/2007-11-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2007-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2007-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-02-01.txt b/forge-gui/res/formats/Archived/Vintage/2008-02-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-02-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-02-01.txt
index aba63536222..5306649733b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-02-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MOR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-05-02.txt b/forge-gui/res/formats/Archived/Vintage/2008-05-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-05-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-05-02.txt
index fcc7c785241..244fab033b9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-05-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SHM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-06-20.txt b/forge-gui/res/formats/Archived/Vintage/2008-06-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-06-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-06-20.txt
index 84b0455d6f6..97512289724 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-06-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-06-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2008-06-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-06-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-07-25.txt b/forge-gui/res/formats/Archived/Vintage/2008-07-25.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-07-25.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-07-25.txt
index 1c5d35fb60e..7a3932df03a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-07-25.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-07-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EVE)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-07-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-08-29.txt b/forge-gui/res/formats/Archived/Vintage/2008-08-29.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-08-29.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-08-29.txt
index ea1c44177ca..c2a5e804150 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-08-29.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-08-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DRB)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-08-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-09-20.txt b/forge-gui/res/formats/Archived/Vintage/2008-09-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-09-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-09-20.txt
index ee49c0b10fa..d91031c38c0 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-09-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-09-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2008-09-20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-09-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-09-22.txt b/forge-gui/res/formats/Archived/Vintage/2008-09-22.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-09-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-09-22.txt
index e161f8d8062..f89cbf44205 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-09-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-09-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-09-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-10-03.txt b/forge-gui/res/formats/Archived/Vintage/2008-10-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-10-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-10-03.txt
index c4d68a6547c..355d6111514 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-10-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-10-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ALA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-10-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2008-11-07.txt b/forge-gui/res/formats/Archived/Vintage/2008-11-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2008-11-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2008-11-07.txt
index ad5a696a919..6fdc72ca397 100644
--- a/forge-gui/res/formats/Archive/Vintage/2008-11-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2008-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2008-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-02-06.txt b/forge-gui/res/formats/Archived/Vintage/2009-02-06.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-02-06.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-02-06.txt
index 85ce3abf4cc..9a7d4f233ed 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-02-06.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-02-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CFX)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-02-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-04-10.txt b/forge-gui/res/formats/Archived/Vintage/2009-04-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-04-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-04-10.txt
index a53e26ad423..6314cde7606 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-04-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-04-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDC)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-04-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-04-30.txt b/forge-gui/res/formats/Archived/Vintage/2009-04-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-04-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-04-30.txt
index 8f72acfcf39..3109e35af7a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-04-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-04-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ARB)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-04-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-07-01.txt b/forge-gui/res/formats/Archived/Vintage/2009-07-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-07-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-07-01.txt
index 742d9769d7c..9e7d729ed42 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-07-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-07-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2009-07-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-07-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-07-17.txt b/forge-gui/res/formats/Archived/Vintage/2009-07-17.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-07-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-07-17.txt
index d9227881eb0..049627b80e9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-07-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M10)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-08-26.txt b/forge-gui/res/formats/Archived/Vintage/2009-08-26.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-08-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-08-26.txt
index 3b67d1cc665..c1f95697d03 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-08-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD0)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-08-28.txt b/forge-gui/res/formats/Archived/Vintage/2009-08-28.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-08-28.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-08-28.txt
index 4382ec48617..d1a83378d57 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-08-28.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V09)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-09-07.txt b/forge-gui/res/formats/Archived/Vintage/2009-09-07.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-09-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-09-07.txt
index 9aff88ed907..47ec2d3aaea 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-09-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME3)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-10-02.txt b/forge-gui/res/formats/Archived/Vintage/2009-10-02.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-10-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-10-02.txt
index dd21f81d924..4aedf26be2a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-10-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ZEN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-10-30.txt b/forge-gui/res/formats/Archived/Vintage/2009-10-30.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-10-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-10-30.txt
index 0f84b1259e6..4ad72e19071 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-10-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-10-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-10-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD
diff --git a/forge-gui/res/formats/Archive/Vintage/2009-11-20.txt b/forge-gui/res/formats/Archived/Vintage/2009-11-20.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2009-11-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2009-11-20.txt
index 6ffa1d0a7fb..d0ce10cce2f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2009-11-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2009-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (H09)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2009-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-02-05.txt b/forge-gui/res/formats/Archived/Vintage/2010-02-05.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-02-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-02-05.txt
index 8389f710b7d..750ed844673 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-02-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (WWK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-03-19.txt b/forge-gui/res/formats/Archived/Vintage/2010-03-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-03-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-03-19.txt
index b149e0ec5f1..eff017caf8b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-03-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDE)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-04-23.txt b/forge-gui/res/formats/Archived/Vintage/2010-04-23.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-04-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-04-23.txt
index f654871deda..e6c3174db37 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-04-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ROE)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-06-04.txt b/forge-gui/res/formats/Archived/Vintage/2010-06-04.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-06-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-06-04.txt
index 144b06c2a45..df1c52ff8a2 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-06-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-06-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DPA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-06-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-07-16.txt b/forge-gui/res/formats/Archived/Vintage/2010-07-16.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-07-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-07-16.txt
index 3f48d625a64..9310981a179 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-07-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-07-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M11)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-07-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-08-27.txt b/forge-gui/res/formats/Archived/Vintage/2010-08-27.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-08-27.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-08-27.txt
index 86ef161a377..7138843806f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-08-27.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-08-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V10)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-08-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-09-03.txt b/forge-gui/res/formats/Archived/Vintage/2010-09-03.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-09-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-09-03.txt
index 5296ce4d44d..be7b28a51f6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-09-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-09-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDF)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-09-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-10-01.txt b/forge-gui/res/formats/Archived/Vintage/2010-10-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-10-01.txt
index 440a3ac2802..ffb5ee0f5f5 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-11-08.txt b/forge-gui/res/formats/Archived/Vintage/2010-11-08.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-11-08.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-11-08.txt
index 938b13c2ada..effaf4e9542 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-11-08.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-11-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-11-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1
diff --git a/forge-gui/res/formats/Archive/Vintage/2010-11-19.txt b/forge-gui/res/formats/Archived/Vintage/2010-11-19.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2010-11-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2010-11-19.txt
index d0715246028..e3ab58b95f7 100644
--- a/forge-gui/res/formats/Archive/Vintage/2010-11-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2010-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PD2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2010-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-01-10.txt b/forge-gui/res/formats/Archived/Vintage/2011-01-10.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2011-01-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-01-10.txt
index 23b924e6f11..55cbfc51b88 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-01-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-01-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ME4)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-01-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-02-04.txt b/forge-gui/res/formats/Archived/Vintage/2011-02-04.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2011-02-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-02-04.txt
index 2b41f3f58ee..3ab096c67b2 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-02-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-02-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MBS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-02-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-04-01.txt b/forge-gui/res/formats/Archived/Vintage/2011-04-01.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2011-04-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-04-01.txt
index 907ebc1bf90..7b14cbf3820 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-04-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-04-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-04-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-05-13.txt b/forge-gui/res/formats/Archived/Vintage/2011-05-13.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2011-05-13.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-05-13.txt
index 3b5ce9cbd4c..4f86bbeef95 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-05-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-05-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (NPH)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-05-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-05-14.txt b/forge-gui/res/formats/Archived/Vintage/2011-05-14.txt
similarity index 98%
rename from forge-gui/res/formats/Archive/Vintage/2011-05-14.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-05-14.txt
index a63e593b1d1..30fe4b6c011 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-05-14.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-05-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TD2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-05-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-06-17.txt b/forge-gui/res/formats/Archived/Vintage/2011-06-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-06-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-06-17.txt
index 09388a6e692..2509c2d4b53 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-06-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-06-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (COM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-06-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-07-15.txt b/forge-gui/res/formats/Archived/Vintage/2011-07-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-07-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-07-15.txt
index ef1f754a9c5..d281e7a75e4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-07-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-07-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M12)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-07-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-08-26.txt b/forge-gui/res/formats/Archived/Vintage/2011-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-08-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-08-26.txt
index 5b96e785268..8c60e704e73 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-08-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V11)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-09-02.txt b/forge-gui/res/formats/Archived/Vintage/2011-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-09-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-09-02.txt
index c1bfdbe30db..a7a4ceff0b6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-09-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDH)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-09-30.txt b/forge-gui/res/formats/Archived/Vintage/2011-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-09-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-09-30.txt
index 059cc481868..e420a9192e1 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-09-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ISD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-10-01.txt b/forge-gui/res/formats/Archived/Vintage/2011-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-10-01.txt
index d5ab776ff4b..88b84cd53ac 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2011-10-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD
diff --git a/forge-gui/res/formats/Archive/Vintage/2011-11-18.txt b/forge-gui/res/formats/Archived/Vintage/2011-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2011-11-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2011-11-18.txt
index 8e5158cb76c..c40de72e265 100644
--- a/forge-gui/res/formats/Archive/Vintage/2011-11-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2011-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PD3)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2011-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-02-03.txt b/forge-gui/res/formats/Archived/Vintage/2012-02-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-02-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-02-03.txt
index 0220b0847d5..12720ec70b4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-02-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-02-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DKA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-02-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-03-30.txt b/forge-gui/res/formats/Archived/Vintage/2012-03-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-03-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-03-30.txt
index 27ac0a53438..598bc365de7 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-03-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-03-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDI)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-03-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-05-04.txt b/forge-gui/res/formats/Archived/Vintage/2012-05-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-05-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-05-04.txt
index 34c5231cd87..bb172cbf2f6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-05-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-05-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AVR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-05-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-07-13.txt b/forge-gui/res/formats/Archived/Vintage/2012-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-07-13.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-07-13.txt
index 31b8b9784da..04f1b7e3db9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-07-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M13)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-08-31.txt b/forge-gui/res/formats/Archived/Vintage/2012-08-31.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-08-31.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-08-31.txt
index a341240cb0d..72e07a82265 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-08-31.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-08-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V12)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-08-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-09-07.txt b/forge-gui/res/formats/Archived/Vintage/2012-09-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-09-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-09-07.txt
index 14ed77c61d2..5be85ab6425 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-09-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-09-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDJ)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-09-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-10-01.txt b/forge-gui/res/formats/Archived/Vintage/2012-10-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-10-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-10-01.txt
index 71f184d320f..008d59ce9ff 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-10-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-10-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2012-10-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-10-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-10-05.txt b/forge-gui/res/formats/Archived/Vintage/2012-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-10-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-10-05.txt
index dc92de2d9d0..1c7611ae24f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-10-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RTR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR
diff --git a/forge-gui/res/formats/Archive/Vintage/2012-11-02.txt b/forge-gui/res/formats/Archived/Vintage/2012-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2012-11-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2012-11-02.txt
index 2b630f409fe..22217569cb1 100644
--- a/forge-gui/res/formats/Archive/Vintage/2012-11-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2012-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CM1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2012-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-02-01.txt b/forge-gui/res/formats/Archived/Vintage/2013-02-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-02-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-02-01.txt
index 59a0194637f..1b534ed008c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-02-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-02-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GTC)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-02-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-03-15.txt b/forge-gui/res/formats/Archived/Vintage/2013-03-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-03-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-03-15.txt
index 12af302c537..acf03ffb6d0 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-03-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-03-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-03-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-05-03.txt b/forge-gui/res/formats/Archived/Vintage/2013-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-05-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-05-03.txt
index 904869bf4bb..f5b90f48441 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-05-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DGM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-06-07.txt b/forge-gui/res/formats/Archived/Vintage/2013-06-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-06-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-06-07.txt
index 49ce71c9e69..e5a451ec796 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-06-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-06-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-07-19.txt b/forge-gui/res/formats/Archived/Vintage/2013-07-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-07-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-07-19.txt
index d140f8dfe13..5992b1d486f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-07-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-07-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M14)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-07-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-08-23.txt b/forge-gui/res/formats/Archived/Vintage/2013-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-08-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-08-23.txt
index 123fc5f23b5..3f0655c698e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-08-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V13)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-09-06.txt b/forge-gui/res/formats/Archived/Vintage/2013-09-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-09-06.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-09-06.txt
index 050d47095c1..e09a8284f42 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-09-06.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-09-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDL)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-09-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-09-27.txt b/forge-gui/res/formats/Archived/Vintage/2013-09-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-09-27.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-09-27.txt
index 8023de403af..fad98c01bc8 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-09-27.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-09-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (THS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-09-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS
diff --git a/forge-gui/res/formats/Archive/Vintage/2013-11-01.txt b/forge-gui/res/formats/Archived/Vintage/2013-11-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2013-11-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2013-11-01.txt
index e7512ff86eb..dc8025d6212 100644
--- a/forge-gui/res/formats/Archive/Vintage/2013-11-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2013-11-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C13)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2013-11-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-02-07.txt b/forge-gui/res/formats/Archived/Vintage/2014-02-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-02-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-02-07.txt
index 253b5108a9d..22e6bd5c095 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-02-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-02-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BNG)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-02-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-03-14.txt b/forge-gui/res/formats/Archived/Vintage/2014-03-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-03-14.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-03-14.txt
index 6a302cd3553..dedb671c60b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-03-14.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-03-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-03-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-05-02.txt b/forge-gui/res/formats/Archived/Vintage/2014-05-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-05-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-05-02.txt
index 97a1cbdba4c..03f4d1e5c91 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-05-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-05-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (JOU)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-05-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-05-30.txt b/forge-gui/res/formats/Archived/Vintage/2014-05-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-05-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-05-30.txt
index ffd7b753fdf..8ce402c198c 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-05-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-05-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MD1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-05-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-06-06.txt b/forge-gui/res/formats/Archived/Vintage/2014-06-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-06-06.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-06-06.txt
index ffec6813b94..4831c19c9c3 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-06-06.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-06-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CNS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-06-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-06-16.txt b/forge-gui/res/formats/Archived/Vintage/2014-06-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-06-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-06-16.txt
index 24f827a064d..cc924729889 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-06-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-06-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (VMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-06-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-07-18.txt b/forge-gui/res/formats/Archived/Vintage/2014-07-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-07-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-07-18.txt
index 753b25286b2..d4f2332d87d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-07-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-07-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M15)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-07-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-08-22.txt b/forge-gui/res/formats/Archived/Vintage/2014-08-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-08-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-08-22.txt
index 997ad848afd..046e6ed1ff8 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-08-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-08-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V14)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-08-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-09-05.txt b/forge-gui/res/formats/Archived/Vintage/2014-09-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-09-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-09-05.txt
index 4b2d91dcd4f..9ecf88ac279 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-09-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-09-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-09-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-09-26.txt b/forge-gui/res/formats/Archived/Vintage/2014-09-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-09-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-09-26.txt
index 56f24622817..2ea6f938932 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-09-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-09-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KTK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-09-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, M13, V12, DDJ, RTR, CM1, GTC, DDK, DGM, MMA, M14, V13, DDL, THS, C13, BNG, DDM, JOU, MD1, CNS, VMA, M15, V14, DDN, KTK
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-11-07.txt b/forge-gui/res/formats/Archived/Vintage/2014-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-11-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-11-07.txt
index 0dfce4faf2e..a21ad0df75f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-11-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C14)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2014-12-05.txt b/forge-gui/res/formats/Archived/Vintage/2014-12-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2014-12-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2014-12-05.txt
index 7fdaa5eeb8b..1fbd3ac501a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2014-12-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2014-12-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DD3)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2014-12-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-01-23.txt b/forge-gui/res/formats/Archived/Vintage/2015-01-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-01-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-01-23.txt
index c953d7bcc1a..f28599a1701 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-01-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-01-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (FRF)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-01-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-02-27.txt b/forge-gui/res/formats/Archived/Vintage/2015-02-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-02-27.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-02-27.txt
index 290fb480fac..3265288b827 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-02-27.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-02-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDO)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-02-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-03-27.txt b/forge-gui/res/formats/Archived/Vintage/2015-03-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-03-27.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-03-27.txt
index e8a04a38d8c..07bb8689077 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-03-27.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-03-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DTK)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-03-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-05-06.txt b/forge-gui/res/formats/Archived/Vintage/2015-05-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-05-06.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-05-06.txt
index c67557bdbd7..53cb73409a4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-05-06.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-05-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TPR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-05-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-05-22.txt b/forge-gui/res/formats/Archived/Vintage/2015-05-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-05-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-05-22.txt
index 9083240d3de..bcca4961f68 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-05-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-05-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MM2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-05-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-07-17.txt b/forge-gui/res/formats/Archived/Vintage/2015-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-07-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-07-17.txt
index 4358a1687ca..9f030d824b9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-07-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ORI)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-08-21.txt b/forge-gui/res/formats/Archived/Vintage/2015-08-21.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-08-21.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-08-21.txt
index 19b8b80b8ab..9201d35ea54 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-08-21.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-08-21.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V15)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-08-21
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-08-28.txt b/forge-gui/res/formats/Archived/Vintage/2015-08-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-08-28.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-08-28.txt
index 2c7ba7a45b8..1cb939cb4d5 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-08-28.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-08-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDP)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-08-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-10-02.txt b/forge-gui/res/formats/Archived/Vintage/2015-10-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-10-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-10-02.txt
index 4f33db58640..6f29469ddc1 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-10-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-10-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (BFZ)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-10-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-11-13.txt b/forge-gui/res/formats/Archived/Vintage/2015-11-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-11-13.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-11-13.txt
index 0ea40f82bfb..29e7c3f9321 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-11-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-11-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C15)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-11-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2015-11-18.txt b/forge-gui/res/formats/Archived/Vintage/2015-11-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2015-11-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2015-11-18.txt
index 91be05fd6a5..de7c56d170f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2015-11-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2015-11-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PZ1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2015-11-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-01-22.txt b/forge-gui/res/formats/Archived/Vintage/2016-01-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-01-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-01-22.txt
index c61d4e64008..05d27062eec 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-01-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-01-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (OGW)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-01-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-02-26.txt b/forge-gui/res/formats/Archived/Vintage/2016-02-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-02-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-02-26.txt
index b01020c89ed..15342b37365 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-02-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-02-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDQ)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-02-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-04-08.txt b/forge-gui/res/formats/Archived/Vintage/2016-04-08.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-04-08.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-04-08.txt
index aa282f7c675..e24675a3a0f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-04-08.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-04-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SOI)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-04-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-06-10.txt b/forge-gui/res/formats/Archived/Vintage/2016-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-06-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-06-10.txt
index 5d4d4ec9ab1..94bb3ee14d1 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-06-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-07-22.txt b/forge-gui/res/formats/Archived/Vintage/2016-07-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-07-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-07-22.txt
index b7874594325..3eaf367d10e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-07-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-07-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (EMN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-07-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-08-19.txt b/forge-gui/res/formats/Archived/Vintage/2016-08-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-08-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-08-19.txt
index cea58252270..de62285ad49 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-08-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-08-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V16)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-08-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-08-26.txt b/forge-gui/res/formats/Archived/Vintage/2016-08-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-08-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-08-26.txt
index 4fab11651ae..91f7b168966 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-08-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-08-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CN2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-08-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-09-02.txt b/forge-gui/res/formats/Archived/Vintage/2016-09-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-09-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-09-02.txt
index f41d629ef34..875644b864e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-09-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-09-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-09-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-09-30.txt b/forge-gui/res/formats/Archived/Vintage/2016-09-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-09-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-09-30.txt
index a57e970f0fc..a40508102a9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-09-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-09-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KLD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-09-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-11-11.txt b/forge-gui/res/formats/Archived/Vintage/2016-11-11.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-11-11.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-11-11.txt
index d590baeae0f..9b9ad57b181 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-11-11.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-11-11.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C16)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-11-11
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2016-11-16.txt b/forge-gui/res/formats/Archived/Vintage/2016-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2016-11-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2016-11-16.txt
index 12b065823d8..1e4de0eea27 100644
--- a/forge-gui/res/formats/Archive/Vintage/2016-11-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2016-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (PZ2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2016-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-01-20.txt b/forge-gui/res/formats/Archived/Vintage/2017-01-20.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-01-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-01-20.txt
index 73f5830bb00..a8eda90cf1f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-01-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-01-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AER)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-01-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-03-17.txt b/forge-gui/res/formats/Archived/Vintage/2017-03-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-03-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-03-17.txt
index 0bb1d4c96ad..d6bc1b26500 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-03-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-03-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MM3)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-03-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-03-31.txt b/forge-gui/res/formats/Archived/Vintage/2017-03-31.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-03-31.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-03-31.txt
index 044442da3a7..e91af436d8d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-03-31.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-03-31.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDS)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-03-31
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-04-24.txt b/forge-gui/res/formats/Archived/Vintage/2017-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-04-24.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-04-24.txt
index be9a6afd7d1..8701588513d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-04-24.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2017-04-24)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-04-28.txt b/forge-gui/res/formats/Archived/Vintage/2017-04-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-04-28.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-04-28.txt
index fbeb136b9f6..c7a466716ef 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-04-28.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-04-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AKH)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-04-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-06-09.txt b/forge-gui/res/formats/Archived/Vintage/2017-06-09.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-06-09.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-06-09.txt
index 86054162f97..c2ba411097f 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-06-09.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-06-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-06-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-07-14.txt b/forge-gui/res/formats/Archived/Vintage/2017-07-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-07-14.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-07-14.txt
index 2ab1c67d2d7..4873567cc9d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-07-14.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-07-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (HOU)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-07-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-08-25.txt b/forge-gui/res/formats/Archived/Vintage/2017-08-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-08-25.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-08-25.txt
index 6e178999075..9dec94a2c4b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-08-25.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-08-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C17)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-08-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-09-01.txt b/forge-gui/res/formats/Archived/Vintage/2017-09-01.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-09-01.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-09-01.txt
index da6f5b6a7e5..155a8828ac9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-09-01.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-09-01.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2017-09-01)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-09-01
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-09-29.txt b/forge-gui/res/formats/Archived/Vintage/2017-09-29.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-09-29.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-09-29.txt
index 323f0170c21..72dc2a554eb 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-09-29.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-09-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (XLN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-09-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-11-10.txt b/forge-gui/res/formats/Archived/Vintage/2017-11-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-11-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-11-10.txt
index e04a35b260f..765a4eff9bd 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-11-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-11-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDT)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-11-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-11-17.txt b/forge-gui/res/formats/Archived/Vintage/2017-11-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-11-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-11-17.txt
index 635ccaac506..dd3412317b2 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-11-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-11-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (IMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-11-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA
diff --git a/forge-gui/res/formats/Archive/Vintage/2017-11-24.txt b/forge-gui/res/formats/Archived/Vintage/2017-11-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2017-11-24.txt
rename to forge-gui/res/formats/Archived/Vintage/2017-11-24.txt
index e87ec929154..dc32771f82a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2017-11-24.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2017-11-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (V17)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2017-11-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-01-19.txt b/forge-gui/res/formats/Archived/Vintage/2018-01-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-01-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-01-19.txt
index c44bdfa242e..8ce927ea5cb 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-01-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-01-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RIX)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-01-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-03-16.txt b/forge-gui/res/formats/Archived/Vintage/2018-03-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-03-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-03-16.txt
index 59beef31e61..6cfd98a7a42 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-03-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-03-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (A25)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-03-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-04-06.txt b/forge-gui/res/formats/Archived/Vintage/2018-04-06.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-04-06.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-04-06.txt
index 70245dc8d30..e9ac060cdb7 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-04-06.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-04-06.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DDU)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-04-06
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-04-27.txt b/forge-gui/res/formats/Archived/Vintage/2018-04-27.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-04-27.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-04-27.txt
index 1b6874d0c80..8b20c2dd613 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-04-27.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-04-27.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DOM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-04-27
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-06-08.txt b/forge-gui/res/formats/Archived/Vintage/2018-06-08.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-06-08.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-06-08.txt
index 4409ac3c57b..bd0f000edc0 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-06-08.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-06-08.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CM2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-06-08
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-06-15.txt b/forge-gui/res/formats/Archived/Vintage/2018-06-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-06-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-06-15.txt
index d91a1e64c1b..82b52aa0998 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-06-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-06-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-06-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-06-22.txt b/forge-gui/res/formats/Archived/Vintage/2018-06-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-06-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-06-22.txt
index be35d720817..55e2a5f2e85 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-06-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-06-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GS1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-06-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-07-13.txt b/forge-gui/res/formats/Archived/Vintage/2018-07-13.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-07-13.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-07-13.txt
index 16a36253e06..66aecda362e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-07-13.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-07-13.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M19)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-07-13
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-08-09.txt b/forge-gui/res/formats/Archived/Vintage/2018-08-09.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-08-09.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-08-09.txt
index 0ce31c2c7c3..5cddb567ce6 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-08-09.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-08-09.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C18)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-08-09
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-10-05.txt b/forge-gui/res/formats/Archived/Vintage/2018-10-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-10-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-10-05.txt
index 74daf7bbb8b..32daef4098d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-10-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-10-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GRN)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-10-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-11-02.txt b/forge-gui/res/formats/Archived/Vintage/2018-11-02.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-11-02.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-11-02.txt
index 4e06e3f830f..64b33d614f5 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-11-02.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-11-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GK1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-11-02
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-11-16.txt b/forge-gui/res/formats/Archived/Vintage/2018-11-16.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-11-16.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-11-16.txt
index 12c3f2d52aa..79c4db9ee0b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-11-16.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-11-16.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (G18)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-11-16
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT
diff --git a/forge-gui/res/formats/Archive/Vintage/2018-12-07.txt b/forge-gui/res/formats/Archived/Vintage/2018-12-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2018-12-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2018-12-07.txt
index b6df6b63e7b..8fbc239d5ac 100644
--- a/forge-gui/res/formats/Archive/Vintage/2018-12-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2018-12-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (UMA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2018-12-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-01-25.txt b/forge-gui/res/formats/Archived/Vintage/2019-01-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-01-25.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-01-25.txt
index 201ff6f865f..372f9efdbdc 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-01-25.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-01-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (RNA)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-01-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-02-15.txt b/forge-gui/res/formats/Archived/Vintage/2019-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-02-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-02-15.txt
index f07ae7c50f7..27d6f95a6c1 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-02-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GK2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-05-03.txt b/forge-gui/res/formats/Archived/Vintage/2019-05-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-05-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-05-03.txt
index 17af170a92b..4359888df2d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-05-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-05-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (WAR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-05-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, RIX, A25, DDU, DOM, CM2, BBD, SS1, GS1, M19, C18, GRN, MPS_GRN, GK1, G18, GNT, UMA, RNA, MPS_RNA, GK2, WAR, MPS_WAR
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-06-14.txt b/forge-gui/res/formats/Archived/Vintage/2019-06-14.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-06-14.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-06-14.txt
index 8ca86a1a8a4..ef9d79fcece 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-06-14.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-06-14.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MH1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-06-14
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-06-28.txt b/forge-gui/res/formats/Archived/Vintage/2019-06-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-06-28.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-06-28.txt
index 4f0231812b2..7ac8b2518c9 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-06-28.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-06-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-06-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-07-12.txt b/forge-gui/res/formats/Archived/Vintage/2019-07-12.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-07-12.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-07-12.txt
index fcf0d6b44c8..96afea6ff2d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-07-12.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-07-12.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M20)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-07-12
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-08-23.txt b/forge-gui/res/formats/Archived/Vintage/2019-08-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-08-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-08-23.txt
index 6768a7a1b20..74e8c1fece0 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-08-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-08-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (C19)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-08-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-08-30.txt b/forge-gui/res/formats/Archived/Vintage/2019-08-30.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-08-30.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-08-30.txt
index 5d0d9f48447..b4b4b8de9ea 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-08-30.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-08-30.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2019-08-30)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-08-30
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-10-04.txt b/forge-gui/res/formats/Archived/Vintage/2019-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-10-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-10-04.txt
index 5258b69ada7..0b360fd741e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-10-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ELD)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-11-07.txt b/forge-gui/res/formats/Archived/Vintage/2019-11-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-11-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-11-07.txt
index 0c312a633cf..785058f478d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-11-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-11-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MB1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-11-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-11-15.txt b/forge-gui/res/formats/Archived/Vintage/2019-11-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-11-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-11-15.txt
index 3e69f4a3a26..6c57f958c0b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-11-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-11-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (GN2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-11-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2019-11-22.txt b/forge-gui/res/formats/Archived/Vintage/2019-11-22.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2019-11-22.txt
rename to forge-gui/res/formats/Archived/Vintage/2019-11-22.txt
index caf3e2c70c4..8903d99d000 100644
--- a/forge-gui/res/formats/Archive/Vintage/2019-11-22.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2019-11-22.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2019-11-22)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2019-11-22
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-01-24.txt b/forge-gui/res/formats/Archived/Vintage/2020-01-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-01-24.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-01-24.txt
index cfb97732042..a16df9d769d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-01-24.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-01-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (THB)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-01-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-04-24.txt b/forge-gui/res/formats/Archived/Vintage/2020-04-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-04-24.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-04-24.txt
index cab9998bd92..19a99577b0e 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-04-24.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-04-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (IKO)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-04-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-05-18.txt b/forge-gui/res/formats/Archived/Vintage/2020-05-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-05-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-05-18.txt
index d4180b646d0..2933c1f31c4 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-05-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-05-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-05-18)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-05-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-06-10.txt b/forge-gui/res/formats/Archived/Vintage/2020-06-10.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-06-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-06-10.txt
index 9eafdfc6700..35d5fa4e062 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-06-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-06-10)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-06-26.txt b/forge-gui/res/formats/Archived/Vintage/2020-06-26.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-06-26.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-06-26.txt
index 0c041f9c98e..fc906badc5d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-06-26.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-06-26.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SS3)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-06-26
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-07-03.txt b/forge-gui/res/formats/Archived/Vintage/2020-07-03.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-07-03.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-07-03.txt
index 88e38b505bd..5417c1ee92d 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-07-03.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-07-03.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (M21)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-07-03
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-07-17.txt b/forge-gui/res/formats/Archived/Vintage/2020-07-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-07-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-07-17.txt
index f8809336799..db6812a1196 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-07-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-07-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (JMP)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-07-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-08-07.txt b/forge-gui/res/formats/Archived/Vintage/2020-08-07.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-08-07.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-08-07.txt
index 710ab9cba9a..6071f401825 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-08-07.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-08-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2XM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-08-07
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-09-25.txt b/forge-gui/res/formats/Archived/Vintage/2020-09-25.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-09-25.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-09-25.txt
index c6a23ec053f..1fcc4a9f112 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-09-25.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-09-25.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (ZNR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-09-25
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-10-04.txt b/forge-gui/res/formats/Archived/Vintage/2020-10-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-10-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-10-04.txt
index dab2373b643..ed0abac03ab 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-10-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-10-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2020-10-04)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-10-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-11-20.txt b/forge-gui/res/formats/Archived/Vintage/2020-11-20.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-11-20.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-11-20.txt
index a053012119d..c514da949cf 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-11-20.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-11-20.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CMR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-11-20
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2020-12-04.txt b/forge-gui/res/formats/Archived/Vintage/2020-12-04.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2020-12-04.txt
rename to forge-gui/res/formats/Archived/Vintage/2020-12-04.txt
index 021083e4bd6..1d733d7159b 100644
--- a/forge-gui/res/formats/Archive/Vintage/2020-12-04.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2020-12-04.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CC1)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2020-12-04
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-02-05.txt b/forge-gui/res/formats/Archived/Vintage/2021-02-05.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-02-05.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-02-05.txt
index fd7d175c61b..8f86ddb6233 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-02-05.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-02-05.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (KHM)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-02-05
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-02-15.txt b/forge-gui/res/formats/Archived/Vintage/2021-02-15.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-02-15.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-02-15.txt
index 469308908c7..2345e9db929 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-02-15.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-02-15.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2021-02-15)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-02-15
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-03-19.txt b/forge-gui/res/formats/Archived/Vintage/2021-03-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-03-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-03-19.txt
index 51b25fec329..65b62d410cf 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-03-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-03-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (TSR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-03-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-04-23.txt b/forge-gui/res/formats/Archived/Vintage/2021-04-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-04-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-04-23.txt
index 5a0bc7e3c69..216ee5c3a97 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-04-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-04-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (STX)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-04-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-06-18.txt b/forge-gui/res/formats/Archived/Vintage/2021-06-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-06-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-06-18.txt
index 1c1747b8e31..b83a74688f7 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-06-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-06-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MH2)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-06-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-07-23.txt b/forge-gui/res/formats/Archived/Vintage/2021-07-23.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-07-23.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-07-23.txt
index c30641577d5..ead845be241 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-07-23.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-07-23.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (AFR)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-07-23
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-09-24.txt b/forge-gui/res/formats/Archived/Vintage/2021-09-24.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-09-24.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-09-24.txt
index 979c70f8a8d..ad4ff78d110 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-09-24.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-09-24.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (MID)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-09-24
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-10-18.txt b/forge-gui/res/formats/Archived/Vintage/2021-10-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-10-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-10-18.txt
index 9337ed9edf4..afaa547ff06 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-10-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-10-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2021-10-18)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-10-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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
diff --git a/forge-gui/res/formats/Archive/Vintage/2021-11-19.txt b/forge-gui/res/formats/Archived/Vintage/2021-11-19.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2021-11-19.txt
rename to forge-gui/res/formats/Archived/Vintage/2021-11-19.txt
index 9bfb6178be3..932961388e8 100644
--- a/forge-gui/res/formats/Archive/Vintage/2021-11-19.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2021-11-19.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (VOW)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2021-11-19
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC
diff --git a/forge-gui/res/formats/Archive/Vintage/2022-01-28.txt b/forge-gui/res/formats/Archived/Vintage/2022-01-28.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2022-01-28.txt
rename to forge-gui/res/formats/Archived/Vintage/2022-01-28.txt
index 3416cfd8f8b..3eae6ba0a50 100644
--- a/forge-gui/res/formats/Archive/Vintage/2022-01-28.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2022-01-28.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (DBL)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2022-01-28
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Archive/Vintage/2022-02-17.txt b/forge-gui/res/formats/Archived/Vintage/2022-02-17.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2022-02-17.txt
rename to forge-gui/res/formats/Archived/Vintage/2022-02-17.txt
index f9e8ef960ac..36ce42518f8 100644
--- a/forge-gui/res/formats/Archive/Vintage/2022-02-17.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2022-02-17.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (2022-02-17)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2022-02-17
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2
diff --git a/forge-gui/res/formats/Archive/Vintage/2022-02-18.txt b/forge-gui/res/formats/Archived/Vintage/2022-02-18.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2022-02-18.txt
rename to forge-gui/res/formats/Archived/Vintage/2022-02-18.txt
index 06e85af0ba8..b0f29d5fa8a 100644
--- a/forge-gui/res/formats/Archive/Vintage/2022-02-18.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2022-02-18.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (NEO)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2022-02-18
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC
diff --git a/forge-gui/res/formats/Archive/Vintage/2022-04-29.txt b/forge-gui/res/formats/Archived/Vintage/2022-04-29.txt
similarity index 99%
rename from forge-gui/res/formats/Archive/Vintage/2022-04-29.txt
rename to forge-gui/res/formats/Archived/Vintage/2022-04-29.txt
index 38c8a029633..35af8e7db07 100644
--- a/forge-gui/res/formats/Archive/Vintage/2022-04-29.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2022-04-29.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (SNC)
-Type:Archive
+Type:Archived
 Subtype:Vintage
 Effective:2022-04-29
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC
diff --git a/forge-gui/res/formats/Archive/Vintage/2022-06-10.txt b/forge-gui/res/formats/Archived/Vintage/2022-06-10.txt
similarity index 100%
rename from forge-gui/res/formats/Archive/Vintage/2022-06-10.txt
rename to forge-gui/res/formats/Archived/Vintage/2022-06-10.txt
diff --git a/forge-gui/res/formats/Block/Amonkhet Block.txt b/forge-gui/res/formats/Block/Amonkhet Block.txt
index 2d6005daec5..c1d4b73a332 100644
--- a/forge-gui/res/formats/Block/Amonkhet Block.txt	
+++ b/forge-gui/res/formats/Block/Amonkhet Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Amonkhet Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:112
 Sets:HOU, AKH
diff --git a/forge-gui/res/formats/Block/Battle for Zendikar Block.txt b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt
index 3d7d7e319d4..49b13e8597c 100644
--- a/forge-gui/res/formats/Block/Battle for Zendikar Block.txt	
+++ b/forge-gui/res/formats/Block/Battle for Zendikar Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Battle for Zendikar Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:115
 Sets:OGW, BFZ
diff --git a/forge-gui/res/formats/Block/Ice Age Block.txt b/forge-gui/res/formats/Block/Ice Age Block.txt
index 0ede56a6530..45878c5929c 100644
--- a/forge-gui/res/formats/Block/Ice Age Block.txt	
+++ b/forge-gui/res/formats/Block/Ice Age Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ice Age Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:135
 Sets:CSP, ALL, ICE
diff --git a/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt
index 855bd7fe8ed..42c3e99de4d 100644
--- a/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt	
+++ b/forge-gui/res/formats/Block/Innistrad-Avacyn Restored Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Innistrad-Avacyn Restored Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:119
 Sets:ISD, AVR, DKA
diff --git a/forge-gui/res/formats/Block/Invasion Block.txt b/forge-gui/res/formats/Block/Invasion Block.txt
index ec257d0e360..b68b4c3c6e9 100644
--- a/forge-gui/res/formats/Block/Invasion Block.txt	
+++ b/forge-gui/res/formats/Block/Invasion Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Invasion Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:130
 Sets:APC, PLS, INV
diff --git a/forge-gui/res/formats/Block/Ixalan Block.txt b/forge-gui/res/formats/Block/Ixalan Block.txt
index 7de8c0717a4..dc40c5e91e0 100644
--- a/forge-gui/res/formats/Block/Ixalan Block.txt	
+++ b/forge-gui/res/formats/Block/Ixalan Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ixalan Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:111
 Sets:XLN, RIX
diff --git a/forge-gui/res/formats/Block/Kaladesh Block.txt b/forge-gui/res/formats/Block/Kaladesh Block.txt
index fe67fc92923..d7c8bdefb3a 100644
--- a/forge-gui/res/formats/Block/Kaladesh Block.txt	
+++ b/forge-gui/res/formats/Block/Kaladesh Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Kaladesh Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:113
 Sets:AER, KLD
diff --git a/forge-gui/res/formats/Block/Kamigawa Block.txt b/forge-gui/res/formats/Block/Kamigawa Block.txt
index 76e9b03c478..50603f6517f 100644
--- a/forge-gui/res/formats/Block/Kamigawa Block.txt	
+++ b/forge-gui/res/formats/Block/Kamigawa Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Kamigawa Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:126
 Sets:SOK, BOK, CHK
diff --git a/forge-gui/res/formats/Block/Khans of Tarkir Block.txt b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt
index 2aa08002f51..99fa0f94a61 100644
--- a/forge-gui/res/formats/Block/Khans of Tarkir Block.txt	
+++ b/forge-gui/res/formats/Block/Khans of Tarkir Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Khans of Tarkir Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:116
 Sets:DTK, FRF, KTK
diff --git a/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt
index baa94c32d58..9631289f70a 100644
--- a/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt	
+++ b/forge-gui/res/formats/Block/Lorwyn-Shadowmoor Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Lorwyn-Shadowmoor Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:123
 Sets:EVE, SHM, MOR, LRW
diff --git a/forge-gui/res/formats/Block/Masques Block.txt b/forge-gui/res/formats/Block/Masques Block.txt
index f531b61b2cf..085d85d045c 100644
--- a/forge-gui/res/formats/Block/Masques Block.txt	
+++ b/forge-gui/res/formats/Block/Masques Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Masques Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:131
 Sets:MMQ, NMS, PCY
diff --git a/forge-gui/res/formats/Block/Mirage Block.txt b/forge-gui/res/formats/Block/Mirage Block.txt
index 50b67258bef..7bbc6989db6 100644
--- a/forge-gui/res/formats/Block/Mirage Block.txt	
+++ b/forge-gui/res/formats/Block/Mirage Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Mirage Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:134
 Sets:VIS, WTH, MIR
diff --git a/forge-gui/res/formats/Block/Mirrodin Block.txt b/forge-gui/res/formats/Block/Mirrodin Block.txt
index 8b760ef05e4..ff2d629af1f 100644
--- a/forge-gui/res/formats/Block/Mirrodin Block.txt	
+++ b/forge-gui/res/formats/Block/Mirrodin Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Mirrodin Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:127
 Sets:5DN, DST, MRD
diff --git a/forge-gui/res/formats/Block/Odyssey Block.txt b/forge-gui/res/formats/Block/Odyssey Block.txt
index 95f5f220359..98d63154881 100644
--- a/forge-gui/res/formats/Block/Odyssey Block.txt	
+++ b/forge-gui/res/formats/Block/Odyssey Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Odyssey Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:129
 Sets:JUD, TOR, ODY
diff --git a/forge-gui/res/formats/Block/Onslaught Block.txt b/forge-gui/res/formats/Block/Onslaught Block.txt
index 19d158c5bd8..51b7651569e 100644
--- a/forge-gui/res/formats/Block/Onslaught Block.txt	
+++ b/forge-gui/res/formats/Block/Onslaught Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Onslaught Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:128
 Sets:SCG, LGN, ONS
diff --git a/forge-gui/res/formats/Block/Ravnica Block.txt b/forge-gui/res/formats/Block/Ravnica Block.txt
index db2dfe65e23..275e81d0f54 100644
--- a/forge-gui/res/formats/Block/Ravnica Block.txt	
+++ b/forge-gui/res/formats/Block/Ravnica Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Ravnica Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:125
 Sets:DIS, GPT, RAV
diff --git a/forge-gui/res/formats/Block/Return to Ravnica Block.txt b/forge-gui/res/formats/Block/Return to Ravnica Block.txt
index 8e5eedd2a76..712a82f8a88 100644
--- a/forge-gui/res/formats/Block/Return to Ravnica Block.txt	
+++ b/forge-gui/res/formats/Block/Return to Ravnica Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Return to Ravnica Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:118
 Sets:DGM, GTC, RTR
diff --git a/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt
index a815c37c528..6519429cb50 100644
--- a/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt	
+++ b/forge-gui/res/formats/Block/Scars of Mirrodin Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Scars of Mirrodin Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:120
 Sets:NPH, MBS, SOM
diff --git a/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt
index 42122fc4a73..f5048f53de3 100644
--- a/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt	
+++ b/forge-gui/res/formats/Block/Shadows over Innistrad Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Shadows over Innistrad Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:114
 Sets:EMN, SOI
diff --git a/forge-gui/res/formats/Block/Shards of Alara Block.txt b/forge-gui/res/formats/Block/Shards of Alara Block.txt
index 37c54c609c5..2359086e5bb 100644
--- a/forge-gui/res/formats/Block/Shards of Alara Block.txt	
+++ b/forge-gui/res/formats/Block/Shards of Alara Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Shards of Alara Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:122
 Sets:ARB, CFX, ALA
diff --git a/forge-gui/res/formats/Block/Tempest Block.txt b/forge-gui/res/formats/Block/Tempest Block.txt
index 411c6150c46..529d49b7982 100644
--- a/forge-gui/res/formats/Block/Tempest Block.txt	
+++ b/forge-gui/res/formats/Block/Tempest Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Tempest Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:133
 Sets:EXO, STH, TMP
diff --git a/forge-gui/res/formats/Block/Theros Block.txt b/forge-gui/res/formats/Block/Theros Block.txt
index 8b96e89e9e8..2a9bb19ace8 100644
--- a/forge-gui/res/formats/Block/Theros Block.txt	
+++ b/forge-gui/res/formats/Block/Theros Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Theros Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:117
 Sets:JOU, BNG, THS
diff --git a/forge-gui/res/formats/Block/Time Spiral Block.txt b/forge-gui/res/formats/Block/Time Spiral Block.txt
index 42818ad739b..236ace89b42 100644
--- a/forge-gui/res/formats/Block/Time Spiral Block.txt	
+++ b/forge-gui/res/formats/Block/Time Spiral Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Time Spiral Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:124
 Sets:FUT, PLC, TSP
diff --git a/forge-gui/res/formats/Block/Urza Block.txt b/forge-gui/res/formats/Block/Urza Block.txt
index f3e92cb480a..67497dca5de 100644
--- a/forge-gui/res/formats/Block/Urza Block.txt	
+++ b/forge-gui/res/formats/Block/Urza Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Urza Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:132
 Sets:UDS, ULG, USG
diff --git a/forge-gui/res/formats/Block/Zendikar Block.txt b/forge-gui/res/formats/Block/Zendikar Block.txt
index a1f06a6c418..1cadef9095d 100644
--- a/forge-gui/res/formats/Block/Zendikar Block.txt	
+++ b/forge-gui/res/formats/Block/Zendikar Block.txt	
@@ -1,6 +1,6 @@
 [format]
 Name:Zendikar Block
-Type:Archive
+Type:Archived
 Subtype:Block
 Order:121
 Sets:ROE, WWK, ZEN
diff --git a/forge-gui/res/formats/Casual/Conspiracy.txt b/forge-gui/res/formats/Casual/Conspiracy.txt
index ecd90709889..3f7eec17b0b 100644
--- a/forge-gui/res/formats/Casual/Conspiracy.txt
+++ b/forge-gui/res/formats/Casual/Conspiracy.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Conspiracy
-Type:Archive
+Type:Archived
 Subtype:Custom
 Order:138
 Sets:CNS, CN2
diff --git a/forge-gui/res/formats/Casual/Un-Sets.txt b/forge-gui/res/formats/Casual/Un-Sets.txt
index eff3b864d28..c558aaf0008 100644
--- a/forge-gui/res/formats/Casual/Un-Sets.txt
+++ b/forge-gui/res/formats/Casual/Un-Sets.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Un-Sets
-Type:Archive
+Type:Archived
 Subtype:Custom
 Order:136
 Sets:UST, UNH, UGL
diff --git a/forge-gui/res/formats/Sanctioned/Extended.txt b/forge-gui/res/formats/Sanctioned/Extended.txt
index fc7b81d1029..aeec27da5a9 100644
--- a/forge-gui/res/formats/Sanctioned/Extended.txt
+++ b/forge-gui/res/formats/Sanctioned/Extended.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Extended
-Type:Archive
+Type:Archived
 Subtype:Extended
 Effective:2013-09-27
 Retired:2013-10-08
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index 06c00000520..74bc11102d9 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -67,7 +67,7 @@ cbManaBurn=Mana Burn
 cbManaLostPrompt=Prompt Mana Pool Emptying
 cbDevMode=Developer Mode
 cbLoadCardsLazily=Load Card Scripts Lazily
-cbLoadArchiveFormats=Load Archived Formats
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=Workshop Syntax Checker
 cbEnforceDeckLegality=Deck Conformance
 cbSideboardForAI=Human Sideboard for AI
@@ -183,7 +183,7 @@ nlWorkshopSyntax=Enables syntax checking of card scripts in the Workshop. Note:
 nlGameLogEntryType=Changes how much information is displayed in the game log. Sorted by least to most verbose.
 nlCloseAction=Changes what happens when clicking the X button in the upper right.
 nlLoadCardsLazily=If turned on, Forge will load card scripts as they''re needed instead of at start up. (Warning: Experimental)
-nlLoadArchiveFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Graphic Options
 nlCardArtFormat=The format of card art images. (Full: image of entire card. Crop: only the art part)
 nlDefaultFontSize=The default font size within the UI. All font elements are scaled relative to this. (REQUIRES RESTART)
@@ -552,7 +552,7 @@ cbWantReprints=Allow compatible reprints from other sets
 lblChooseFormats=Choose formats
 lblSanctioned=Sanctioned
 lblOther=Other
-lblArchive=Archive
+lblArchived=Archived
 lblCancel=Cancel
 #DialogChoosePoolDistribution.java
 lblBlack=Black
@@ -1493,7 +1493,7 @@ lblPlayerDidntAttackThisTurn=%s didn''t attack this turn.
 #FormatFilter.java
 lblAllSetsFormats=All Sets/Formats
 lblOtherFormats=Other Formats
-#ArchiveFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=Choose Format
 #Card.java
 lblAdventure=Adventure
@@ -2672,7 +2672,7 @@ lblRenameQuestTo=Rename quest to
 lblQuestRename=Quest Rename
 #StartingPoolType.java
 lblUnrestricted=Unrestricted
-lblCasualOrArchiveFormat=Casual/Archived format
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=Custom format
 lblEventOrStartDeck=Event or starter deck
 lblMySealedDeck=My sealed deck
diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java
index ca3c7ef2dcf..7c19b9e0b1f 100644
--- a/forge-gui/src/main/java/forge/deck/DeckImportController.java
+++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java
@@ -138,7 +138,7 @@ public class DeckImportController {
             for (final GameFormat f : sanctionedFormats)
                 formatsDropdown.addItem(f);
 
-            if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVE_FORMATS)) {
+            if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_ARCHIVED_FORMATS)) {
                 // Add Block Formats
                 formatsDropdown.addItem(SEPARATOR);
                 final Iterable<GameFormat> blockFormats = FModel.getFormats().getBlockList();
diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
index 906c928412b..6242344f3d4 100644
--- a/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
+++ b/forge-gui/src/main/java/forge/gamemodes/quest/StartingPoolType.java
@@ -5,7 +5,7 @@ import forge.util.Localizer;
 public enum StartingPoolType {
     Complete("lblUnrestricted"),
     Sanctioned("lblSanctionedFormat"),
-    Casual("lblCasualOrArchiveFormat"),
+    Casual("lblCasualOrArchivedFormat"),
     CustomFormat("lblCustomFormat"),
     Precon("lblEventOrStartDeck"),
     SealedDeck("lblMySealedDeck"),
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
index 284f771dcd7..bf016229a4b 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
@@ -216,7 +216,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
         DEV_LOG_ENTRY_TYPE (GameLogEntryType.DAMAGE.toString()),
 
         LOAD_CARD_SCRIPTS_LAZILY ("false"),
-        LOAD_ARCHIVE_FORMATS ("false"),
+        LOAD_ARCHIVED_FORMATS ("false"),
 
         DECK_DEFAULT_CARD_LIMIT ("4"),
         DECKGEN_SINGLETONS ("false"),
diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java
index 6e3f49d9a9e..abadbaeaaba 100644
--- a/forge-gui/src/main/java/forge/model/FModel.java
+++ b/forge-gui/src/main/java/forge/model/FModel.java
@@ -208,7 +208,7 @@ public final class FModel {
         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_ARCHIVE_FORMATS)));
+                new File(ForgeConstants.USER_FORMATS_DIR), preferences.getPrefBoolean(FPref.LOAD_ARCHIVED_FORMATS)));
 
         magicDb.setStandardPredicate(formats.getStandard().getFilterRules());
         magicDb.setPioneerPredicate(formats.getPioneer().getFilterRules());

From fb48847a5d05a10c683dcd4e033cd74d505e5f0d Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Thu, 28 Apr 2022 20:41:31 +0100
Subject: [PATCH 018/309] explorer_fix

---
 forge-gui/res/formats/Archived/Explorer/2022-04-21.txt | 8 --------
 forge-gui/res/formats/Archived/Explorer/2022-04-28.txt | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 forge-gui/res/formats/Archived/Explorer/2022-04-21.txt

diff --git a/forge-gui/res/formats/Archived/Explorer/2022-04-21.txt b/forge-gui/res/formats/Archived/Explorer/2022-04-21.txt
deleted file mode 100644
index a9a4289e134..00000000000
--- a/forge-gui/res/formats/Archived/Explorer/2022-04-21.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-[format]
-Name:Explorer (2022-04-21)
-Type:Archived
-Subtype:Arena
-Effective:2022-04-21
-Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO
-Banned:Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation
-Additional:Abandoned Sarcophagus; Abzan Battle Priest; Abzan Falconer; Accursed Horde; Adaptive Snapjaw; Adorned Pouncer; Aerial Guide; Aerial Responder; Aeronaut Admiral; Aether Chaser; Aether Hub; Aether Inspector; Aether Meltdown; Aether Poisoner; Aether Swooper; Aether Theorist; Aether Tradewinds; Aetherborn Marauder; Aetherflux Reservoir; Aethersphere Harvester; Aetherstorm Roc; Aetherstream Leopard; Aethertorch Renegade; Aetherworks Marvel; Ahn-Crop Champion; Ahn-Crop Crasher; Ainok Bond-Kin; Airdrop Aeronauts; Ajani Unyielding; Alchemist's Greeting; Alley Evasion; Alley Strangler; Ammit Eternal; Ancestral Statue; Ancient Crab; Angel of Invention; Angel of Sanctions; Angel of the God-Pharaoh; Angelic Edict; Angelic Purge; Anger of the Gods; Animation Module; Anointed Procession; Anointer Priest; Appeal // Authority; Appetite for the Unnatural; Approach of the Second Sun; Arborback Stomper; Archfiend of Ifnir; Armorcraft Judge; As Foretold; Assassin's Strike; Assault Formation; Asylum Visitor; Atarka's Command; Attune with Aether; Audacious Infiltrator; Auger Spree; Authority of the Consuls; Aven Initiate; Aven Mindcensor; Aven of Enduring Hope; Aven Wind Guide; Aviary Mechanic; Awaken the Bear; Baleful Ammit; Ballista Charger; Baral, Chief of Compliance; Baral's Expertise; Barrage of Expendables; Barricade Breaker; Bastion Mastodon; Bathe in Dragonfire; Battering Krasis; Battlefield Scavenger; Belligerent Sliver; Beneath the Sands; Binding Mummy; Bitterbow Sharpshooters; Black Cat; Blessed Spirits; Blighted Bat; Blood Host; Bloodbond Vampire; Bloodhunter Bat; Bloodlust Inciter; Bloodrage Brawler; Blooming Marsh; Blossoming Defense; Blur of Blades; Blur Sliver; Bogbrew Witch; Bomat Bazaar Barge; Bomat Courier; Bonded Construct; Bone Picker; Bonescythe Sliver; Bontu the Glorified; Bontu's Last Reckoning; Bontu's Monument; Borderland Marauder; Borderland Minotaur; Boros Elite; Botanical Sanctum; Brain Maggot; Breaching Hippocamp; Bred for the Hunt; Bristling Hydra; Brushstrider; Brute Strength; Bubbling Cauldron; Built to Last; Built to Smash; Burning-Fist Minotaur; Burning-Tree Emissary; By Force; Canyon Slough; Carrier Thrall; Cartouche of Ambition; Cartouche of Knowledge; Cartouche of Solidarity; Cartouche of Strength; Cartouche of Zeal; Cascading Cataracts; Cast Out; Cataclysmic Gearhulk; Cathar's Companion; Cemetery Recruitment; Censor; Ceremonious Rejection; Champion of Rhonas; Champion of Wits; Chandra, Pyromaster; Chandra, Torch of Defiance; Chandra's Defeat; Chandra's Revolution; Charging Badger; Chief of the Foundry; Cinder Elemental; Claim // Fame; Cloudblazer; Cogworker's Puzzleknot; Collateral Damage; Collected Company; Combat Celebrant; Combustible Gearhulk; Commencement of Festivities; Commit // Memory; Compelling Argument; Compulsory Rest; Concealed Courtyard; Confiscation Coup; Consign // Oblivion; Consulate Skygate; Consulate Turret; Contraband Kingpin; Conviction; Coralhelm Guide; Corpse Hauler; Countervailing Winds; Countless Gears Renegade; Creeping Mold; Crested Sunmare; Crocanura; Crocodile of the Crossing; Crow of Dark Tidings; Cruel Reality; Crux of Fate; Crypt of the Eternals; Cryptbreaker; Cryptic Serpent; Cultivator's Caravan; Curator of Mysteries; Cut // Ribbons; Dance with Devils; Daredevil Dragster; Daring Demolition; Dark Intimations; Dark Salvation; Dauntless Aven; Dauntless Onslaught; Dawnfeather Eagle; Death Wind; Death's Approach; Declaration in Stone; Decoction Module; Deem Worthy; Defiant Greatmaw; Defiant Salvager; Demolition Stomper; Demon of Dark Schemes; Demonic Pact; Depala, Pilot Exemplar; Desert Cerodon; Desert of the Fervent; Desert of the Glorified; Desert of the Indomitable; Desert of the Mindful; Desert of the True; Desert's Hold; Destined // Lead; Devouring Light; Die Young; Diffusion Sliver; Dinrova Horror; Diregraf Colossus; Disallow; Disposal Mummy; Dispossess; Dissenter's Deliverance; Djeru's Renunciation; Djeru's Resolve; Doom Blade; Doomfall; Douse in Gloom; Dovin Baan; Dragon Fodder; Dragon Hatchling; Dragon Mantle; Dragonloft Idol; Dragonlord's Servant; Dragonmaster Outcast; Drainpipe Vermin; Drake Haven; Drana, Liberator of Malakir; Dread Wanderer; Driven // Despair; Dromoka's Command; Dukhara Peafowl; Dune Beetle; Dusk // Dawn; Dutiful Attendant; Dwynen's Elite; Dynavolt Tower; Eager Construct; Earthshaker Khenra; Eddytrail Hawk; Edifice of Authority; Electrostatic Pummeler; Elemental Uprising; Elusive Krasis; Elvish Visionary; Embraal Bruiser; Empyreal Voyager; Engineered Might; Enlarge; Enraged Giant; Era of Innovation; Essence Extraction; Essence Flux; Eternal of Harsh Truths; Eternal Thirst; Exemplar of Strength; Eyeblight Assassin; Fabrication Module; Failure // Comply; Fairgrounds Warden; Faith of the Devoted; Fan Bearer; Fanatic of Mogis; Farm // Market; Fatal Push; Fateful Showdown; Fen Hauler; Feral Prowler; Fervent Paincaster; Festering Mummy; Festering Newt; Fetid Pools; Fiery Temper; Filigree Familiar; Final Reward; Firebrand Archer; Fireforger's Puzzleknot; Flame Lash; Flameblade Adept; Flames of the Firebrand; Fleshbag Marauder; Floodwaters; Flurry of Horns; Forge Devil; Forsake the Worldly; Fortify; Fortuitous Find; Foundry Hornet; Foundry Inspector; Foundry Screecher; Foundry Street Denizen; Fourth Bridge Prowler; Fragmentize; Freejam Regent; Fretwork Colony; Frontline Rebel; Fumigate; Furious Reprisal; Furnace Whelp; Furyblade Vampire; Gate to the Afterlife; Gearseeker Serpent; Gearshift Ace; Ghoulcaller's Accomplice; Gideon of the Trials; Gideon's Intervention; Gifted Aetherborn; Gilded Cerodon; Glimmer of Genius; Glint; Glint-Nest Crane; Glint-Sleeve Artisan; Glint-Sleeve Siphoner; Glorious End; Glory-Bound Initiate; Glorybringer; Goblin Dark-Dwellers; Goblin Rally; Goblin Shortcutter; God-Pharaoh's Gift; Gonti, Lord of Luxury; Greenbelt Rampager; Grind // Dust; Grisly Salvage; Gust Walker; Hanweir Militia Captain; Hapatra, Vizier of Poisons; Hardened Scales; Harmless Offering; Harnessed Lightning; Harsh Mentor; Hashep Oasis; Haunted Dead; Hazardous Conditions; Haze of Pollen; Hazoret the Fervent; Hazoret's Monument; Heart of Kiran; Heaven // Earth; Hedron Archive; Heir of Falkenrath; Hekma Sentinels; Herald of Anguish; Herald of the Fair; Hidden Stockpile; Hieroglyphic Illumination; High Sentinels of Arashin; Highspire Artisan; Highspire Infusion; Hinterland Drake; Hive Stirrings; Hollow One; Homing Lightning; Honored Crop-Captain; Hooded Brawler; Hope of Ghirapur; Hope Tender; Hordeling Outburst; Hornet Queen; Horror of the Broken Lands; Hour of Devastation; Hour of Promise; Hour of Revelation; Hungry Flames; Ice Over; Ifnir Deadlands; Illusionist's Stratagem; Imminent Doom; Impeccable Timing; Implement of Combustion; Implement of Examination; Implement of Malice; In Oketra's Name; Incorrigible Youths; Incremental Growth; Indomitable Creativity; Indulgent Aristocrat; Initiate's Companion; Insatiable Gorgers; Insolent Neonate; Inspiring Call; Inspiring Statuary; Inspiring Vantage; Insult // Injury; Inventor's Apprentice; Inventors' Fair; Inventor's Goggles; Invigorated Rampage; Ipnu Rivulet; Irontread Crusher; Irrigated Farmland; Jace, Unraveler of Secrets; Just the Wind; Kalastria Nightwatch; Kambal, Consul of Allocation; Kari Zev, Skyship Raider; Kari Zev's Expertise; Kefnet the Mindful; Kefnet's Monument; Key to the City; Khenra Charioteer; Khenra Eternal; Khenra Scrapper; Kolaghan's Command; Kujar Seedsculptor; Labyrinth Guardian; Languish; Lathnu Sailback; Launch Party; Lawless Broker; Lay Claim; Leaf Gilder; Leave // Chance; Leave in the Dust; Leeching Sliver; Lethal Sting; Lifecraft Cavalry; Lifecrafter's Bestiary; Lifecrafter's Gift; Lightning Axe; Lightning Diadem; Lightning Shrieker; Lightwalker; Liliana, Death's Majesty; Liliana's Defeat; Liliana's Elite; Liliana's Mastery; Liliana's Reaver; Live Fast; Long Road Home; Longtusk Cub; Lord of the Accursed; Lost Legacy; Mad Prophet; Magma Jet; Magma Spray; Magmaroth; Majestic Myriarch; Make Obsolete; Malakir Cullblade; Malakir Familiar; Malfunction; Manaweft Sliver; Manglehorn; Manic Scribe; Marauding Boneslasher; Marionette Master; Markov Crusader; Master Trinketeer; Maulfist Revolutionary; Maulfist Squad; Maverick Thopterist; Maze's End; Merchant's Dockhand; Merciless Javelineer; Metallic Mimic; Metallic Rebuke; Metallurgic Summonings; Metalwork Colossus; Miasmic Mummy; Midnight Oil; Minister of Inquiries; Minotaur Skullcleaver; Minotaur Sureshot; Mirage Mirror; Mobile Garrison; Monstrous Onslaught; Mouth // Feed; Mugging; Murmuring Phantasm; Naga Oracle; Naga Vitalist; Narnam Cobra; Narnam Renegade; Nature's Way; Nebelgast Herald; Nef-Crop Entangler; Neheb, the Eternal; Neheb, the Worthy; Nest of Scarabs; Never // Return; New Perspectives; Nicol Bolas, God-Pharaoh; Night Market Aeronaut; Night Market Lookout; Nightmare; Nimble Innovator; Nimble Obstructionist; Nimble-Blade Khenra; Nimbus Swimmer; Nissa, Steward of Elements; Nissa, Vital Force; Noxious Gearhulk; Nyx-Fleece Ram; Oashra Cultivator; Oasis Ritualist; Oath of Ajani; Obelisk Spider; Ogre Battledriver; Ogre Slumlord; Ojutai's Command; Ojutai's Summons; Oketra the True; Oketra's Attendant; Oketra's Avenger; Oketra's Monument; Ominous Sphinx; Onward // Victory; Open Fire; Ornamental Courage; Ornery Kudu; Ornithopter; Outland Boar; Outnumber; Ovalchase Dragster; Overwhelming Splendor; Oviya Pashiri, Sage Lifecrafter; Pacification Array; Pack Rat; Padeem, Consul of Innovation; Panharmonicon; Paradox Engine; Paradoxical Outcome; Path of Bravery; Pathmaker Initiate; Patron of the Valiant; Peacewalker Colossus; Peel from Reality; Peema Aether-Seer; Peema Outrider; Perilous Vault; Pia Nalaar; Pitiless Vizier; Planar Bridge; Pouncing Cheetah; Prakhata Pillar-Bug; Precise Strike; Predatory Sliver; Prepare // Fight; Prescient Chimera; Pride Sovereign; Primeval Bounty; Propeller Pioneer; Prophetic Prism; Protection of the Hekma; Prowling Serpopard; Pull from Tomorrow; Puncturing Blow; Pursue Glory; Putrefy; Quarry Hauler; Quicksmith Genius; Quicksmith Rebel; Rageblood Shaman; Rags // Riches; Raise Dead; Ramunap Excavator; Ramunap Ruins; Rashmi, Eternities Crafter; Ratchet Bomb; Rattlechains; Ravenous Bloodseeker; Ravenous Intruder; Razaketh, the Foulblooded; Reason // Believe; Reckless Fireweaver; Reckless Racer; Reckless Scholar; Reduce // Rubble; Refurbish; Refuse // Cooperate; Regal Caracal; Renegade Map; Renegade Rallier; Renegade Tactics; Renegade Wheelsmith; Renewed Faith; Reservoir Walker; Resilient Khenra; Rest in Peace; Restoration Gearsmith; Restoration Specialist; Return to the Ranks; Reverse Engineer; Revoke Privileges; Revolutionary Rebuff; Rhonas the Indomitable; Rhonas's Monument; Rhonas's Stalwart; Riddle of Lightning; Ridgescale Tusker; Riparian Tiger; Rise of the Dark Realms; Rishkar, Peema Renegade; Rishkar's Expertise; River Hoopoe; Rogue Refiner; Ruin Rat; Ruinous Gremlin; Rumbling Baloth; Runeclaw Bear; Runed Servitor; Rush of Vitality; Ruthless Sniper; Sacred Cat; Sage of Shaila's Claim; Saheeli Rai; Salivating Gremlins; Samut, the Tested; Samut, Voice of Dissent; Sand Strangler; Sandsteppe Outcast; Sandwurm Convergence; Sarkhan's Rage; Scarab Feast; Scattered Groves; Scavenger Grounds; Scour the Laboratory; Scrap Trawler; Scrapheap Scrounger; Scrapper Champion; Seeker of Insight; Seer of the Last Tomorrow; Seismic Elemental; Select for Inspection; Self-Assembler; Selfless Cathar; Sengir Vampire; Sentinel Sliver; Servant of the Conduit; Servant of the Scale; Servo Exhibition; Servo Schematic; Shadow of the Grave; Shadowstorm Vizier; Shambleshark; Shambling Goblin; Shed Weakness; Shefet Dunes; Shefet Monitor; Sheltered Thicket; Shielded Aether Thief; Shimmerscale Drake; Shipwreck Moray; Shiv's Embrace; Shrewd Negotiation; Sidewinder Naga; Siege Dragon; Siege Modification; Sifter Wurm; Sigil of the Empty Throne; Sigiled Starfish; Sign in Blood; Silumgar's Command; Sin Prodder; Sixth Sense; Sky Skiff; Skyship Plunderer; Skyship Stalker; Skysovereign, Consul Flagship; Skywhaler's Shot; Slate Street Ruffian; Slither Blade; Sliver Hive; Sly Requisitioner; Solemnity; Solitary Camel; Somberwald Stag; Soul of the Harvest; Soulblade Djinn; Soul-Scar Mage; Soulstinger; Speedway Fanatic; Spellweaver Eternal; Sphinx's Revelation; Spire of Industry; Spire Patrol; Spirebluff Canal; Spireside Infiltrator; Splendid Agony; Sporemound; Spring // Mind; Sram, Senior Edificer; Sram's Expertise; Stab Wound; Start // Finish; Steelform Sliver; Steward of Solidarity; Stinging Shot; Stitchwing Skaab; Striking Sliver; Striped Riverwinder; Struggle // Survive; Sunscorched Desert; Sunscourge Champion; Sunset Pyramid; Supernatural Stamina; Supply Caravan; Supreme Will; Swan Song; Swarm of Bloodflies; Sweatworks Brawler; Sweep Away; Sweltering Suns; Synchronized Strike; Tah-Crop Elite; Tajuru Pathwarden; Tandem Tactics; Temmet, Vizier of Naktamun; Terrarion; Tezzeret the Schemer; Tezzeret's Ambition; Tezzeret's Touch; Thalia's Lieutenant; The Gitrog Monster; The Locust God; The Scarab God; The Scorpion God; Thopter Arrest; Thorned Moloch; Those Who Serve; Thoughtseize; Thraben Inspector; Thraben Standard Bearer; Thresher Lizard; Thriving Rhino; Thriving Turtle; Throne of the God-Pharaoh; Thunderbreak Regent; Tightening Coils; Toolcraft Exemplar; Torch Fiend; Torment of Hailfire; Torment of Scarabs; Torrential Gearhulk; Treasure Keeper; Trespasser's Curse; Trial of Ambition; Trial of Knowledge; Trial of Solidarity; Trial of Strength; Trial of Zeal; Trophy Mage; Typhoid Rats; Ulamog, the Ceaseless Hunger; Ulvenwald Hydra; Ulvenwald Mysteries; Unbridled Growth; Unburden; Unconventional Tactics; Underhanded Designs; Unesh, Criosphinx Sovereign; Universal Solvent; Unlicensed Disintegration; Unquenchable Thirst; Untethered Express; Vengeful Rebel; Verdurous Gearhulk; Veteran Motorist; Vile Manifestation; Virulent Plague; Visionary Augmenter; Vizier of Deferment; Vizier of Many Faces; Vizier of Remedies; Vizier of the Anointed; Vizier of the Menagerie; Vizier of Tumbling Sands; Voltaic Brawler; Voyage's End; Wailing Ghoul; Wall of Forgotten Pharaohs; Wander in Death; Warfire Javelineer; Wasp of the Bitter End; Waste Not; Wasteland Scorpion; Watchers of the Dead; Watchful Naga; Wayward Servant; Weaponcraft Enthusiast; Weaver of Lightning; Weldfast Engineer; Weldfast Monitor; Weldfast Wingsmith; Welding Sparks; Whelming Wave; Whir of Invention; Whirler Rogue; Whirler Virtuoso; Whirlermaker; Wight of Precinct Six; Wild Wanderer; Wildest Dreams; Winding Constrictor; Wind-Kin Raiders; Winds of Rebuke; Winged Shepherd; Wispweaver Angel; Witch's Familiar; Woodborn Behemoth; Woodweaver's Puzzleknot; Workshop Assistant; Yahenni, Undying Partisan; Yahenni's Expertise; Young Pyromancer; Zealot of the God-Pharaoh; Zendikar's Roil
diff --git a/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt b/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
index 345dfdcb864..1f4202db28d 100644
--- a/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
+++ b/forge-gui/res/formats/Archived/Explorer/2022-04-28.txt
@@ -1,5 +1,5 @@
 [format]
-Name:Explorer (SNC)
+Name:Explorer (2022-04-28)
 Type:Archived
 Subtype:Arena
 Effective:2022-04-28

From be075c5ccb6ccf7650f2c6292fe1389fca39ee17 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 9 May 2022 16:24:08 +0100
Subject: [PATCH 019/309] log

---
 forge-game/src/main/java/forge/game/GameFormat.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java
index 6cbf44598c0..d27bba2b5fe 100644
--- a/forge-game/src/main/java/forge/game/GameFormat.java
+++ b/forge-game/src/main/java/forge/game/GameFormat.java
@@ -348,7 +348,12 @@ public class GameFormat implements Comparable<GameFormat> {
             try {
                 formatType = FormatType.valueOf(section.get("type").toUpperCase());
             } catch (Exception e) {
-                formatType = FormatType.CUSTOM;
+                if ("HISTORIC".equals(section.get("type").toUpperCase())) {
+                    System.out.println("Historic is no longer used as a format Type. Please update " + file.getAbsolutePath() + " to use 'Archived' instead");
+                    formatType = FormatType.ARCHIVED;
+                } else {
+                    formatType = FormatType.CUSTOM;
+                }
             }
             FormatSubType formatsubType;
             try {

From e5f11d5ac12074c395dec26657ad8fc93c5009e3 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 10 May 2022 09:27:01 +0100
Subject: [PATCH 020/309] properties

---
 forge-gui/res/languages/de-DE.properties | 10 +++++-----
 forge-gui/res/languages/es-ES.properties | 10 +++++-----
 forge-gui/res/languages/it-IT.properties | 10 +++++-----
 forge-gui/res/languages/ja-JP.properties | 10 +++++-----
 forge-gui/res/languages/pt-BR.properties | 10 +++++-----
 forge-gui/res/languages/zh-CN.properties | 10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 95ec592e287..269b8fab220 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -66,7 +66,7 @@ cbManaBurn=Manabrand
 cbManaLostPrompt=Bestätige Leeren des Manapools
 cbDevMode=Entwicklermodus
 cbLoadCardsLazily=Lade Kartenskripte verzögert
-cbLoadHistoricFormats=Aktiviere historische Formate
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=Workshop Syntax-Checker
 cbEnforceDeckLegality=Deckkonformität
 cbSideboardForAI=Sideboard für Mensch/KI
@@ -182,7 +182,7 @@ nlWorkshopSyntax=Aktiviert den Syntaxcheck für Kartenskripte im Workshop. Hinwe
 nlGameLogEntryType=Steuert den Umfang der Daten in der Protokolldatei. Sortiert vom geringsten zum größten Umfang.
 nlCloseAction=Steuert was passiert, wenn X oben rechts gedrückt wird.
 nlLoadCardsLazily=Wenn aktiviert, lädt Forge Kartenskripte erst wenn sie benötigt werden, nicht bei Programmstart. Warnung: Experimentell!!!
-nlLoadHistoricFormats=Wenn aktiviert, lädt Forge auch ältere Spielformate. Verlängert den Programmstart.
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Grafik Optionen
 nlDefaultFontSize=Die Standardschriftgröße. Alle Schriftelemente werden relative zu dieser angepaßt. (Erfordert Neustart)
 nlCardArtFormat=Format der Kartenbilder (Full: Bilder ganzen Karte; Crop: nur Bildteil der Karte)
@@ -551,7 +551,7 @@ cbWantReprints=Erlaube passende Drucke aus anderen Sets
 lblChooseFormats=Wähle Format
 lblSanctioned=Sanktioniert
 lblOther=Andere
-lblHistoric=Historisch
+lblArchived=Archived
 lblCancel=Abbrechen
 #DialogChoosePoolDistribution.java
 lblBlack=Schwarz
@@ -1491,7 +1491,7 @@ lblPlayerDidntAttackThisTurn=%s griff diesen Zug nicht an.
 #FormatFilter.java
 lblAllSetsFormats=Alle Sets/Formate
 lblOtherFormats=Andere Formate...
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=Wähle Format
 #Card.java
 lblAdventure=Abenteuer
@@ -2674,7 +2674,7 @@ lblRenameQuestTo=Diese Quest umbenennen in
 lblQuestRename=Quest umbenennen
 #StartingPoolType.java
 lblUnrestricted=Unbeschränkt
-lblCasualOrHistoricFormat=Gelegenheits-/historisches Format
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=eigendefiniertes Format
 lblEventOrStartDeck=Event- oder Starter-Deck
 lblMySealedDeck=Mein Sealed-Deck
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 7f6d3a055ac..24e5ed65c1b 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -67,7 +67,7 @@ cbManaBurn=Quemadura de maná
 cbManaLostPrompt=Avisar antes de vaciar el maná en la reserva al pasar la fase
 cbDevMode=Modo Desarrollador
 cbLoadCardsLazily=Cargar scripts de cartas modo perezoso
-cbLoadHistoricFormats=Cargar formatos históricos
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=Verificador de sintaxis del Taller
 cbEnforceDeckLegality=Conformidad del mazo
 cbSideboardForAI=Banquillo humano para la IA
@@ -183,7 +183,7 @@ nlWorkshopSyntax=Habilita la comprobación de sintaxis de los guiones de cartas
 nlGameLogEntryType=Cambia la cantidad de información que se muestra en el registro del juego. Ordenado de menos a más detallado.
 nlCloseAction=Cambia lo que sucede al hacer clic en el botón X en la parte superior derecha.
 nlLoadCardsLazily=Si está activado, Forge cargará los scripts de las cartas según sea necesario en lugar de al inicio. (Advertencia: Experimental)
-nlLoadHistoricFormats=Si está activado, Forge cargará todas los formatos históricos, esto puede demorar un poco más en cargarse en el inicio.
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Opciones gráficas
 nlDefaultFontSize=El tamaño de fuente predeterminado dentro de la interfaz de usuario. Todos los elementos de fuente se escalan en relación a esto. (Necesita reinicio)
 nlCardArtFormat=El formato de las imágenes del arte de la carta. (Full: imagen de toda la carta. Crop: sólo la parte del arte)
@@ -552,7 +552,7 @@ cbWantReprints=Permitir reimpresiones compatibles de otras ediciones.
 lblChooseFormats=Elige Formatos
 lblSanctioned=Oficial
 lblOther=Otro
-lblHistoric=Histórico
+lblArchived=Archived
 lblCancel=Cancelar
 #DialogChoosePoolDistribution.java
 lblBlack=Negro
@@ -1491,7 +1491,7 @@ lblPlayerDidntAttackThisTurn=%s no ataca este turno.
 #FormatFilter.java
 lblAllSetsFormats=Todas las ediciones/formatos
 lblOtherFormats=Otros formatos...
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=Selecciona formato
 #Card.java
 lblAdventure=Aventura
@@ -2672,7 +2672,7 @@ lblRenameQuestTo=Renombrar aventura como
 lblQuestRename=Renombrar aventura
 #StartingPoolType.java
 lblUnrestricted=Sin restriciones
-lblCasualOrHistoricFormat=Formato casual/histórico
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=Formato personalizado
 lblEventOrStartDeck=Evento o mazo de inicio
 lblMySealedDeck=Mi mazo cerrado
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index 3cea3506cc4..244622b73f3 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -66,7 +66,7 @@ cbManaBurn=Mana burn
 cbManaLostPrompt=Avviso svuotamento riserva di mana
 cbDevMode=Modalità sviluppatore
 cbLoadCardsLazily=Carica gli script delle carte lentamente
-cbLoadHistoricFormats=Carica formati storici
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=Controllo sintassi per Officina
 cbEnforceDeckLegality=Conformità del mazzo
 cbSideboardForAI=Sideboard umana per IA
@@ -182,7 +182,7 @@ nlWorkshopSyntax=Abilita il controllo della sintassi degli script delle carte ne
 nlGameLogEntryType=Modifica la quantità di informazioni visualizzate nel registro di gioco. Ordinati dal meno al più dettagliato.
 nlCloseAction=Cambia ciò che accade quando si fa clic sul pulsante X in alto a destra.
 nlLoadCardsLazily=Se attivato, Forge caricherà gli script delle carte quando sono necessari anziché all''avvio. (Avvertenza: sperimentale)
-nlLoadHistoricFormats=Se attivato, Forge caricherà tutte le definizioni dei formati storici, il caricamento potrebbe richiedere un po'' più di tempo all''avvio.
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Opzioni grafiche
 nlDefaultFontSize=La dimensione predefinita dei caratteri nell''interfaccia utente. Tutti i caratteri sono ridimensionati rispetto a questo valore. (RIAVVIO NECESSARIO)
 nlCardArtFormat=Formato delle Illustrazioni delle carte. (Full: Immagine per intero della carta. Crop: Solo illustrazione)
@@ -551,7 +551,7 @@ cbWantReprints=Consenti ristampe compatibili da altre edizioni
 lblChooseFormats=Scegli i formati
 lblSanctioned=Sanzionato
 lblOther=Altro
-lblHistoric=Historic
+lblArchived=Archived
 lblCancel=Annulla
 #DialogChoosePoolDistribution.java
 lblBlack=Nero
@@ -1491,7 +1491,7 @@ lblPlayerDidntAttackThisTurn=%s non ha attaccato questo turno.
 #FormatFilter.java
 lblAllSetsFormats=Tutti i set/formati
 lblOtherFormats=Altri formati
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=Scegli il formato
 #Card.java
 lblAdventure=Avventura
@@ -2671,7 +2671,7 @@ lblRenameQuestTo=Rinomina l''Avventura:
 lblQuestRename=Rinomina Avventura
 #StartingPoolType.java
 lblUnrestricted=Senza restrizioni
-lblCasualOrHistoricFormat=A caso/Historic formato
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=Formato personalizzato
 lblEventOrStartDeck=Mazzo evento o principiante
 lblMySealedDeck=Il mio mazzo Sealed
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index 9ffb19c8c0a..f1e2976a7a6 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -67,7 +67,7 @@ cbManaBurn=マナバーン
 cbManaLostPrompt=マナプールが空になる場合に警告する
 cbDevMode=開発者モード
 cbLoadCardsLazily=カードスクリプトを動的ロードする
-cbLoadHistoricFormats=歴史フォーマットをロードする
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=ワークショップ構文チェッカー
 cbEnforceDeckLegality=デッキの適正チェック
 cbSideboardForAI=人間が AI の代わりにサイドボードする
@@ -183,7 +183,7 @@ nlWorkshopSyntax=ワークショップでカードスクリプトの構文チェ
 nlGameLogEntryType=ゲームログに表示される情報の量を変更します。 最小から最大の詳細度でソートされています
 nlCloseAction=右上の[X]ボタンをクリックしたときの動作を変更します。
 nlLoadCardsLazily=オンにすると、Forge は起動時にではなく、必要に応じてカードスクリプトをロードします。 （警告：実験的）
-nlLoadHistoricFormats=オンにすると、Forge はすべての歴史フォーマット定義をロードします。これは、起動時にロードするのに少し時間がかかる場合があります。
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=グラフィックオプション
 nlDefaultFontSize=UI 内のデフォルトのフォントサイズ。 すべてのフォント要素はこれに比例して拡大縮小されます。 （再起動が必要）
 nlCardArtFormat=カード描画時使うアートのフォーマット（Full: カード全体の画像を使う。Crop: カードのアートの部分の画像だけを使う。）
@@ -552,7 +552,7 @@ cbWantReprints=他のセットの再録を許可する
 lblChooseFormats=フォーマットを選択
 lblSanctioned=公式フォーマット
 lblOther=その他
-lblHistoric=歴史フォーマット
+lblArchived=Archived
 lblCancel=キャンセル
 #DialogChoosePoolDistribution.java
 lblBlack=黒
@@ -1492,7 +1492,7 @@ lblPlayerDidntAttackThisTurn=%sはこのターン攻撃しませんでした。
 #FormatFilter.java
 lblAllSetsFormats=全部のセット/フォーマット
 lblOtherFormats=他のフォーマット...
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=フォーマットを選択
 #Card.java
 lblAdventure=出来事
@@ -2671,7 +2671,7 @@ lblRenameQuestTo=変更する名前
 lblQuestRename=クエスト名変更
 #StartingPoolType.java
 lblUnrestricted=無制限
-lblCasualOrHistoricFormat=カジュアル/歴史フォーマット
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=カスタムフォーマット
 lblEventOrStartDeck=イベント、スターターデッキ
 lblMySealedDeck=自分のシールドデッキ
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 8e91e624b89..5f8affb4dc3 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -68,7 +68,7 @@ cbManaBurn=Queima de Mana
 cbManaLostPrompt=Avisar esvaziamento de mana
 cbDevMode=Modo de Desenvolvedor
 cbLoadCardsLazily=Carregar Scripts de Cartas sob Demanda
-cbLoadHistoricFormats=Carregar Formatos Histórico
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=Verificador de Sintaxe no Workshop
 cbEnforceDeckLegality=Conformidade do Deck
 cbSideboardForAI=Humano e a Reserva de IA
@@ -184,7 +184,7 @@ nlWorkshopSyntax=Habilita a verificação de sintaxe dos scripts da carta na Ofi
 nlGameLogEntryType=Altera a quantidade de informações exibidas no log do jogo. Ordenado do menor para o maior nível de detalhe.
 nlCloseAction=Altera o que acontece ao clicar no botão X no canto superior direito.
 nlLoadCardsLazily=Se ativado, o Forge carregará os scripts da carta conforme necessário em vez de ao iniciar o jogo. (Aviso\: Experimental)
-nlLoadHistoricFormats=Se ativado, o Forge irá carregar todas as definições do formato histórico, isto pode demorar um pouco para carregar ao iniciar o jogo.
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=Opções Gráficas
 nlCardArtFormat=O formato das imagens de arte da carta. (Total\: imagem inteira da carta. Recorte\: apenas a parte da arte)
 nlDefaultFontSize=O tamanho padrão da fonte dentro da interface do usuário. Todos os elementos de fonte são dimensionados em relação a isso. (REQUER REINÍCIO)
@@ -574,7 +574,7 @@ cbWantReprints=Permitir reprints compatíveis de outras coleções
 lblChooseFormats=Escolher formatos
 lblSanctioned=Sancionado
 lblOther=Outro
-lblHistoric=Histórico
+lblArchived=Archived
 lblCancel=Cancelar
 #DialogChoosePoolDistribution.java
 lblBlack=Preto
@@ -1527,7 +1527,7 @@ lblPlayerDidntAttackThisTurn=%s não atacou este turno.
 #FormatFilter.java
 lblAllSetsFormats=Todas Coleções/Formatos
 lblOtherFormats=Outros Formatos
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=Escolha o Formato
 #Card.java
 lblAdventure=Aventura
@@ -2750,7 +2750,7 @@ lblRenameQuestTo=Renomear missão para
 lblQuestRename=Renomear Missão
 #StartingPoolType.java
 lblUnrestricted=Irrestrito
-lblCasualOrHistoricFormat=Formato Casual/Histórico
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=Formato personalizado
 lblEventOrStartDeck=Deck de Evento ou Iniciante
 lblMySealedDeck=Meu deck selado
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index 13f2ba3ec67..9a6bb811dd4 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -67,7 +67,7 @@ cbManaBurn=法术力灼烧
 cbManaLostPrompt=提示法术力池将要清空
 cbDevMode=开发人员模式
 cbLoadCardsLazily=惰性加载卡牌脚本
-cbLoadHistoricFormats=加载旧赛制
+cbLoadArchivedFormats=Load Archived Formats
 cbWorkshopSyntax=作坊语法检查
 cbEnforceDeckLegality=套牌一致性
 cbSideboardForAI=玩家为AI换备
@@ -183,7 +183,7 @@ nlWorkshopSyntax=在作坊中启用卡牌脚本检查。注意：该功能任在
 nlGameLogEntryType=更改游戏中日志显示的信息量。排序为最少到最详细。
 nlCloseAction=更改单击右上角X按钮时的动作
 nlLoadCardsLazily=如果打开该选项Forge将在使用到卡牌脚本时才加载（警告：实验状态）。
-nlLoadHistoricFormats=如果打开，Forge将加载旧赛制，这个能会导致游戏载入时间变长。
+nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
 GraphicOptions=图形选项
 nlDefaultFontSize=UI中字体的默认大小。所有字体元素都相对于此缩放。（需要重启）
 nlCardArtFormat=牌图的格式。（Full表示使用完整的牌张图片，Crop表示只使用牌图的插画部分）
@@ -552,7 +552,7 @@ cbWantReprints=允许来自其他系列的重印牌
 lblChooseFormats=选择赛制
 lblSanctioned=常规
 lblOther=其他
-lblHistoric=旧赛制
+lblArchived=Archived
 lblCancel=取消
 #DialogChoosePoolDistribution.java
 lblBlack=黑
@@ -1493,7 +1493,7 @@ lblPlayerDidntAttackThisTurn=%s本回合没有进攻。
 #FormatFilter.java
 lblAllSetsFormats=所有系列/赛制
 lblOtherFormats=其他赛制
-#HistoricFormatSelect.java
+#ArchivedFormatSelect.java
 lblChooseFormat=选择赛制
 #Card.java
 lblAdventure=历险
@@ -2673,7 +2673,7 @@ lblRenameQuestTo=重命名冒险之旅为
 lblQuestRename=冒险之旅重命名
 #StartingPoolType.java
 lblUnrestricted=无限制
-lblCasualOrHistoricFormat=娱乐/历史赛制
+lblCasualOrArchivedFormat=Casual/Archived format
 lblCustomFormat=自定义赛制
 lblEventOrStartDeck=活动或初始套牌
 lblMySealedDeck=我的现开套牌

From 02fd236d8c8fb2b7531dc5200240300576692974 Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Thu, 12 May 2022 11:00:36 +0100
Subject: [PATCH 021/309] explorer_bans

---
 forge-gui/res/formats/Archived/Explorer/2022-05-12 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 forge-gui/res/formats/Archived/Explorer/2022-05-12

diff --git a/forge-gui/res/formats/Archived/Explorer/2022-05-12 b/forge-gui/res/formats/Archived/Explorer/2022-05-12
new file mode 100644
index 00000000000..83ae7e48e37
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Explorer/2022-05-12
@@ -0,0 +1,8 @@
+[format]
+Name:Explorer (2022-05-12)
+Type:Archived
+Subtype:Arena
+Effective:2022-05-12
+Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
+Banned:Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces
+Additional:Abandoned Sarcophagus; Abzan Battle Priest; Abzan Falconer; Accursed Horde; Adaptive Snapjaw; Adorned Pouncer; Aerial Guide; Aerial Responder; Aeronaut Admiral; Aether Chaser; Aether Hub; Aether Inspector; Aether Meltdown; Aether Poisoner; Aether Swooper; Aether Theorist; Aether Tradewinds; Aetherborn Marauder; Aetherflux Reservoir; Aethersphere Harvester; Aetherstorm Roc; Aetherstream Leopard; Aethertorch Renegade; Aetherworks Marvel; Ahn-Crop Champion; Ahn-Crop Crasher; Ainok Bond-Kin; Airdrop Aeronauts; Ajani Unyielding; Alchemist's Greeting; Alley Evasion; Alley Strangler; Ammit Eternal; Ancestral Statue; Ancient Crab; Angel of Invention; Angel of Sanctions; Angel of the God-Pharaoh; Angelic Edict; Angelic Purge; Anger of the Gods; Animation Module; Anointed Procession; Anointer Priest; Appeal // Authority; Appetite for the Unnatural; Approach of the Second Sun; Arborback Stomper; Archfiend of Ifnir; Armorcraft Judge; As Foretold; Assassin's Strike; Assault Formation; Asylum Visitor; Atarka's Command; Attune with Aether; Audacious Infiltrator; Auger Spree; Authority of the Consuls; Aven Initiate; Aven Mindcensor; Aven of Enduring Hope; Aven Wind Guide; Aviary Mechanic; Awaken the Bear; Baleful Ammit; Ballista Charger; Baral, Chief of Compliance; Baral's Expertise; Barrage of Expendables; Barricade Breaker; Bastion Mastodon; Bathe in Dragonfire; Battering Krasis; Battlefield Scavenger; Belligerent Sliver; Beneath the Sands; Binding Mummy; Bitterbow Sharpshooters; Black Cat; Blessed Spirits; Blighted Bat; Blood Host; Bloodbond Vampire; Bloodhunter Bat; Bloodlust Inciter; Bloodrage Brawler; Blooming Marsh; Blossoming Defense; Blur of Blades; Blur Sliver; Bogbrew Witch; Bomat Bazaar Barge; Bomat Courier; Bonded Construct; Bone Picker; Bonescythe Sliver; Bontu the Glorified; Bontu's Last Reckoning; Bontu's Monument; Borderland Marauder; Borderland Minotaur; Boros Elite; Botanical Sanctum; Brain Maggot; Breaching Hippocamp; Bred for the Hunt; Bristling Hydra; Brushstrider; Brute Strength; Bubbling Cauldron; Built to Last; Built to Smash; Burning-Fist Minotaur; Burning-Tree Emissary; By Force; Canyon Slough; Carrier Thrall; Cartouche of Ambition; Cartouche of Knowledge; Cartouche of Solidarity; Cartouche of Strength; Cartouche of Zeal; Cascading Cataracts; Cast Out; Cataclysmic Gearhulk; Cathar's Companion; Cemetery Recruitment; Censor; Ceremonious Rejection; Champion of Rhonas; Champion of Wits; Chandra, Pyromaster; Chandra, Torch of Defiance; Chandra's Defeat; Chandra's Revolution; Charging Badger; Chief of the Foundry; Cinder Elemental; Claim // Fame; Cloudblazer; Cogworker's Puzzleknot; Collateral Damage; Collected Company; Combat Celebrant; Combustible Gearhulk; Commencement of Festivities; Commit // Memory; Compelling Argument; Compulsory Rest; Concealed Courtyard; Confiscation Coup; Consign // Oblivion; Consulate Skygate; Consulate Turret; Contraband Kingpin; Conviction; Coralhelm Guide; Corpse Hauler; Countervailing Winds; Countless Gears Renegade; Creeping Mold; Crested Sunmare; Crocanura; Crocodile of the Crossing; Crow of Dark Tidings; Cruel Reality; Crux of Fate; Crypt of the Eternals; Cryptbreaker; Cryptic Serpent; Cultivator's Caravan; Curator of Mysteries; Cut // Ribbons; Dance with Devils; Daredevil Dragster; Daring Demolition; Dark Intimations; Dark Salvation; Dauntless Aven; Dauntless Onslaught; Dawnfeather Eagle; Death Wind; Death's Approach; Declaration in Stone; Decoction Module; Deem Worthy; Defiant Greatmaw; Defiant Salvager; Demolition Stomper; Demon of Dark Schemes; Demonic Pact; Depala, Pilot Exemplar; Desert Cerodon; Desert of the Fervent; Desert of the Glorified; Desert of the Indomitable; Desert of the Mindful; Desert of the True; Desert's Hold; Destined // Lead; Devouring Light; Die Young; Diffusion Sliver; Dinrova Horror; Diregraf Colossus; Disallow; Disposal Mummy; Dispossess; Dissenter's Deliverance; Djeru's Renunciation; Djeru's Resolve; Doom Blade; Doomfall; Douse in Gloom; Dovin Baan; Dragon Fodder; Dragon Hatchling; Dragon Mantle; Dragonloft Idol; Dragonlord's Servant; Dragonmaster Outcast; Drainpipe Vermin; Drake Haven; Drana, Liberator of Malakir; Dread Wanderer; Driven // Despair; Dromoka's Command; Dukhara Peafowl; Dune Beetle; Dusk // Dawn; Dutiful Attendant; Dwynen's Elite; Dynavolt Tower; Eager Construct; Earthshaker Khenra; Eddytrail Hawk; Edifice of Authority; Electrostatic Pummeler; Elemental Uprising; Elusive Krasis; Elvish Visionary; Embraal Bruiser; Empyreal Voyager; Engineered Might; Enlarge; Enraged Giant; Era of Innovation; Essence Extraction; Essence Flux; Eternal of Harsh Truths; Eternal Thirst; Exemplar of Strength; Eyeblight Assassin; Fabrication Module; Failure // Comply; Fairgrounds Warden; Faith of the Devoted; Fan Bearer; Fanatic of Mogis; Farm // Market; Fatal Push; Fateful Showdown; Fen Hauler; Feral Prowler; Fervent Paincaster; Festering Mummy; Festering Newt; Fetid Pools; Fiery Temper; Filigree Familiar; Final Reward; Firebrand Archer; Fireforger's Puzzleknot; Flame Lash; Flameblade Adept; Flames of the Firebrand; Fleshbag Marauder; Floodwaters; Flurry of Horns; Forge Devil; Forsake the Worldly; Fortify; Fortuitous Find; Foundry Hornet; Foundry Inspector; Foundry Screecher; Foundry Street Denizen; Fourth Bridge Prowler; Fragmentize; Freejam Regent; Fretwork Colony; Frontline Rebel; Fumigate; Furious Reprisal; Furnace Whelp; Furyblade Vampire; Gate to the Afterlife; Gearseeker Serpent; Gearshift Ace; Ghoulcaller's Accomplice; Gideon of the Trials; Gideon's Intervention; Gifted Aetherborn; Gilded Cerodon; Glimmer of Genius; Glint; Glint-Nest Crane; Glint-Sleeve Artisan; Glint-Sleeve Siphoner; Glorious End; Glory-Bound Initiate; Glorybringer; Goblin Dark-Dwellers; Goblin Rally; Goblin Shortcutter; God-Pharaoh's Gift; Gonti, Lord of Luxury; Greenbelt Rampager; Grind // Dust; Grisly Salvage; Gust Walker; Hanweir Militia Captain; Hapatra, Vizier of Poisons; Hardened Scales; Harmless Offering; Harnessed Lightning; Harsh Mentor; Hashep Oasis; Haunted Dead; Hazardous Conditions; Haze of Pollen; Hazoret the Fervent; Hazoret's Monument; Heart of Kiran; Heaven // Earth; Hedron Archive; Heir of Falkenrath; Hekma Sentinels; Herald of Anguish; Herald of the Fair; Hidden Stockpile; Hieroglyphic Illumination; High Sentinels of Arashin; Highspire Artisan; Highspire Infusion; Hinterland Drake; Hive Stirrings; Hollow One; Homing Lightning; Honored Crop-Captain; Hooded Brawler; Hope of Ghirapur; Hope Tender; Hordeling Outburst; Hornet Queen; Horror of the Broken Lands; Hour of Devastation; Hour of Promise; Hour of Revelation; Hungry Flames; Ice Over; Ifnir Deadlands; Illusionist's Stratagem; Imminent Doom; Impeccable Timing; Implement of Combustion; Implement of Examination; Implement of Malice; In Oketra's Name; Incorrigible Youths; Incremental Growth; Indomitable Creativity; Indulgent Aristocrat; Initiate's Companion; Insatiable Gorgers; Insolent Neonate; Inspiring Call; Inspiring Statuary; Inspiring Vantage; Insult // Injury; Inventor's Apprentice; Inventors' Fair; Inventor's Goggles; Invigorated Rampage; Ipnu Rivulet; Irontread Crusher; Irrigated Farmland; Jace, Unraveler of Secrets; Just the Wind; Kalastria Nightwatch; Kambal, Consul of Allocation; Kari Zev, Skyship Raider; Kari Zev's Expertise; Kefnet the Mindful; Kefnet's Monument; Key to the City; Khenra Charioteer; Khenra Eternal; Khenra Scrapper; Kolaghan's Command; Kujar Seedsculptor; Labyrinth Guardian; Languish; Lathnu Sailback; Launch Party; Lawless Broker; Lay Claim; Leaf Gilder; Leave // Chance; Leave in the Dust; Leeching Sliver; Lethal Sting; Lifecraft Cavalry; Lifecrafter's Bestiary; Lifecrafter's Gift; Lightning Axe; Lightning Diadem; Lightning Shrieker; Lightwalker; Liliana, Death's Majesty; Liliana's Defeat; Liliana's Elite; Liliana's Mastery; Liliana's Reaver; Live Fast; Long Road Home; Longtusk Cub; Lord of the Accursed; Lost Legacy; Mad Prophet; Magma Jet; Magma Spray; Magmaroth; Majestic Myriarch; Make Obsolete; Malakir Cullblade; Malakir Familiar; Malfunction; Manaweft Sliver; Manglehorn; Manic Scribe; Marauding Boneslasher; Marionette Master; Markov Crusader; Master Trinketeer; Maulfist Revolutionary; Maulfist Squad; Maverick Thopterist; Maze's End; Merchant's Dockhand; Merciless Javelineer; Metallic Mimic; Metallic Rebuke; Metallurgic Summonings; Metalwork Colossus; Miasmic Mummy; Midnight Oil; Minister of Inquiries; Minotaur Skullcleaver; Minotaur Sureshot; Mirage Mirror; Mobile Garrison; Monstrous Onslaught; Mouth // Feed; Mugging; Murmuring Phantasm; Naga Oracle; Naga Vitalist; Narnam Cobra; Narnam Renegade; Nature's Way; Nebelgast Herald; Nef-Crop Entangler; Neheb, the Eternal; Neheb, the Worthy; Nest of Scarabs; Never // Return; New Perspectives; Nicol Bolas, God-Pharaoh; Night Market Aeronaut; Night Market Lookout; Nightmare; Nimble Innovator; Nimble Obstructionist; Nimble-Blade Khenra; Nimbus Swimmer; Nissa, Steward of Elements; Nissa, Vital Force; Noxious Gearhulk; Nyx-Fleece Ram; Oashra Cultivator; Oasis Ritualist; Oath of Ajani; Obelisk Spider; Ogre Battledriver; Ogre Slumlord; Ojutai's Command; Ojutai's Summons; Oketra the True; Oketra's Attendant; Oketra's Avenger; Oketra's Monument; Ominous Sphinx; Onward // Victory; Open Fire; Ornamental Courage; Ornery Kudu; Ornithopter; Outland Boar; Outnumber; Ovalchase Dragster; Overwhelming Splendor; Oviya Pashiri, Sage Lifecrafter; Pacification Array; Pack Rat; Padeem, Consul of Innovation; Panharmonicon; Paradox Engine; Paradoxical Outcome; Path of Bravery; Pathmaker Initiate; Patron of the Valiant; Peacewalker Colossus; Peel from Reality; Peema Aether-Seer; Peema Outrider; Perilous Vault; Pia Nalaar; Pitiless Vizier; Planar Bridge; Pouncing Cheetah; Prakhata Pillar-Bug; Precise Strike; Predatory Sliver; Prepare // Fight; Prescient Chimera; Pride Sovereign; Primeval Bounty; Propeller Pioneer; Prophetic Prism; Protection of the Hekma; Prowling Serpopard; Pull from Tomorrow; Puncturing Blow; Pursue Glory; Putrefy; Quarry Hauler; Quicksmith Genius; Quicksmith Rebel; Rageblood Shaman; Rags // Riches; Raise Dead; Ramunap Excavator; Ramunap Ruins; Rashmi, Eternities Crafter; Ratchet Bomb; Rattlechains; Ravenous Bloodseeker; Ravenous Intruder; Razaketh, the Foulblooded; Reason // Believe; Reckless Fireweaver; Reckless Racer; Reckless Scholar; Reduce // Rubble; Refurbish; Refuse // Cooperate; Regal Caracal; Renegade Map; Renegade Rallier; Renegade Tactics; Renegade Wheelsmith; Renewed Faith; Reservoir Walker; Resilient Khenra; Rest in Peace; Restoration Gearsmith; Restoration Specialist; Return to the Ranks; Reverse Engineer; Revoke Privileges; Revolutionary Rebuff; Rhonas the Indomitable; Rhonas's Monument; Rhonas's Stalwart; Riddle of Lightning; Ridgescale Tusker; Riparian Tiger; Rise of the Dark Realms; Rishkar, Peema Renegade; Rishkar's Expertise; River Hoopoe; Rogue Refiner; Ruin Rat; Ruinous Gremlin; Rumbling Baloth; Runeclaw Bear; Runed Servitor; Rush of Vitality; Ruthless Sniper; Sacred Cat; Sage of Shaila's Claim; Saheeli Rai; Salivating Gremlins; Samut, the Tested; Samut, Voice of Dissent; Sand Strangler; Sandsteppe Outcast; Sandwurm Convergence; Sarkhan's Rage; Scarab Feast; Scattered Groves; Scavenger Grounds; Scour the Laboratory; Scrap Trawler; Scrapheap Scrounger; Scrapper Champion; Seeker of Insight; Seer of the Last Tomorrow; Seismic Elemental; Select for Inspection; Self-Assembler; Selfless Cathar; Sengir Vampire; Sentinel Sliver; Servant of the Conduit; Servant of the Scale; Servo Exhibition; Servo Schematic; Shadow of the Grave; Shadowstorm Vizier; Shambleshark; Shambling Goblin; Shed Weakness; Shefet Dunes; Shefet Monitor; Sheltered Thicket; Shielded Aether Thief; Shimmerscale Drake; Shipwreck Moray; Shiv's Embrace; Shrewd Negotiation; Sidewinder Naga; Siege Dragon; Siege Modification; Sifter Wurm; Sigil of the Empty Throne; Sigiled Starfish; Sign in Blood; Silumgar's Command; Sin Prodder; Sixth Sense; Sky Skiff; Skyship Plunderer; Skyship Stalker; Skysovereign, Consul Flagship; Skywhaler's Shot; Slate Street Ruffian; Slither Blade; Sliver Hive; Sly Requisitioner; Solemnity; Solitary Camel; Somberwald Stag; Soul of the Harvest; Soulblade Djinn; Soul-Scar Mage; Soulstinger; Speedway Fanatic; Spellweaver Eternal; Sphinx's Revelation; Spire of Industry; Spire Patrol; Spirebluff Canal; Spireside Infiltrator; Splendid Agony; Sporemound; Spring // Mind; Sram, Senior Edificer; Sram's Expertise; Stab Wound; Start // Finish; Steelform Sliver; Steward of Solidarity; Stinging Shot; Stitchwing Skaab; Striking Sliver; Striped Riverwinder; Struggle // Survive; Sunscorched Desert; Sunscourge Champion; Sunset Pyramid; Supernatural Stamina; Supply Caravan; Supreme Will; Swan Song; Swarm of Bloodflies; Sweatworks Brawler; Sweep Away; Sweltering Suns; Synchronized Strike; Tah-Crop Elite; Tajuru Pathwarden; Tandem Tactics; Temmet, Vizier of Naktamun; Terrarion; Tezzeret the Schemer; Tezzeret's Ambition; Tezzeret's Touch; Thalia's Lieutenant; The Gitrog Monster; The Locust God; The Scarab God; The Scorpion God; Thopter Arrest; Thorned Moloch; Those Who Serve; Thoughtseize; Thraben Inspector; Thraben Standard Bearer; Thresher Lizard; Thriving Rhino; Thriving Turtle; Throne of the God-Pharaoh; Thunderbreak Regent; Tightening Coils; Toolcraft Exemplar; Torch Fiend; Torment of Hailfire; Torment of Scarabs; Torrential Gearhulk; Treasure Keeper; Trespasser's Curse; Trial of Ambition; Trial of Knowledge; Trial of Solidarity; Trial of Strength; Trial of Zeal; Trophy Mage; Typhoid Rats; Ulamog, the Ceaseless Hunger; Ulvenwald Hydra; Ulvenwald Mysteries; Unbridled Growth; Unburden; Unconventional Tactics; Underhanded Designs; Unesh, Criosphinx Sovereign; Universal Solvent; Unlicensed Disintegration; Unquenchable Thirst; Untethered Express; Vengeful Rebel; Verdurous Gearhulk; Veteran Motorist; Vile Manifestation; Virulent Plague; Visionary Augmenter; Vizier of Deferment; Vizier of Many Faces; Vizier of Remedies; Vizier of the Anointed; Vizier of the Menagerie; Vizier of Tumbling Sands; Voltaic Brawler; Voyage's End; Wailing Ghoul; Wall of Forgotten Pharaohs; Wander in Death; Warfire Javelineer; Wasp of the Bitter End; Waste Not; Wasteland Scorpion; Watchers of the Dead; Watchful Naga; Wayward Servant; Weaponcraft Enthusiast; Weaver of Lightning; Weldfast Engineer; Weldfast Monitor; Weldfast Wingsmith; Welding Sparks; Whelming Wave; Whir of Invention; Whirler Rogue; Whirler Virtuoso; Whirlermaker; Wight of Precinct Six; Wild Wanderer; Wildest Dreams; Winding Constrictor; Wind-Kin Raiders; Winds of Rebuke; Winged Shepherd; Wispweaver Angel; Witch's Familiar; Woodborn Behemoth; Woodweaver's Puzzleknot; Workshop Assistant; Yahenni, Undying Partisan; Yahenni's Expertise; Young Pyromancer; Zealot of the God-Pharaoh; Zendikar's Roil

From 3e69decb5e84e0622aab45cb96f22d53c66b46d1 Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Thu, 12 May 2022 11:00:54 +0100
Subject: [PATCH 022/309] Rename 2022-05-12 to 2022-05-12.txt

---
 .../res/formats/Archived/Explorer/{2022-05-12 => 2022-05-12.txt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename forge-gui/res/formats/Archived/Explorer/{2022-05-12 => 2022-05-12.txt} (100%)

diff --git a/forge-gui/res/formats/Archived/Explorer/2022-05-12 b/forge-gui/res/formats/Archived/Explorer/2022-05-12.txt
similarity index 100%
rename from forge-gui/res/formats/Archived/Explorer/2022-05-12
rename to forge-gui/res/formats/Archived/Explorer/2022-05-12.txt

From 5374556c6de05f6fb74e3a7623a70a6c6fe6fa02 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 7 Jun 2022 19:41:53 +0100
Subject: [PATCH 023/309] new_sets_added

---
 forge-gui/release-files/ANNOUNCEMENTS.txt              | 1 +
 forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt  | 2 +-
 forge-gui/res/formats/Archived/Explorer/2022-06-07.txt | 8 ++++++++
 forge-gui/res/formats/Archived/Historic/2022-06-02.txt | 2 +-
 forge-gui/res/formats/Archived/Legacy/2022-06-10.txt   | 2 +-
 forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt  | 2 +-
 forge-gui/res/formats/Archived/Vintage/2022-06-10.txt  | 2 +-
 7 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 forge-gui/res/formats/Archived/Explorer/2022-06-07.txt

diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt
index 77bafd97818..2cca343357b 100644
--- a/forge-gui/release-files/ANNOUNCEMENTS.txt
+++ b/forge-gui/release-files/ANNOUNCEMENTS.txt
@@ -1,4 +1,5 @@
 #Add one announcement per line
 Get in the discord if you aren't yet. https://discord.gg/3v9JCVr
 The SNC set is fully integrated, as well as most of the NCC cards (several cards are still missing from the latter).
+Historic-type formats have been renamed to Archived to reduce confusion. You may need to re-enable them in your preferences.
 *** Android 7 & 8 support is now deprecated. Support will be dropped in an upcoming release. ***
diff --git a/forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt b/forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt
index 9f50a85d808..9ff542674c4 100644
--- a/forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-06-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Alchemy (YSNC)
-Type:Historic
+Type:Archived
 Subtype:Arena
 Effective:2022-06-02
 Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC, YSNC
diff --git a/forge-gui/res/formats/Archived/Explorer/2022-06-07.txt b/forge-gui/res/formats/Archived/Explorer/2022-06-07.txt
new file mode 100644
index 00000000000..58bafb4ecfc
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Explorer/2022-06-07.txt
@@ -0,0 +1,8 @@
+[format]
+Name:Explorer (2022-06-07)
+Type:Archived
+Subtype:Arena
+Effective:2022-06-07
+Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
+Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces
+Additional:Abandoned Sarcophagus; Abzan Battle Priest; Abzan Falconer; Accursed Horde; Adaptive Snapjaw; Adorned Pouncer; Aerial Guide; Aerial Responder; Aeronaut Admiral; Aether Chaser; Aether Hub; Aether Inspector; Aether Meltdown; Aether Poisoner; Aether Swooper; Aether Theorist; Aether Tradewinds; Aetherborn Marauder; Aetherflux Reservoir; Aethersphere Harvester; Aetherstorm Roc; Aetherstream Leopard; Aethertorch Renegade; Aetherworks Marvel; Ahn-Crop Champion; Ahn-Crop Crasher; Ainok Bond-Kin; Airdrop Aeronauts; Ajani Unyielding; Alchemist's Greeting; Alley Evasion; Alley Strangler; Ammit Eternal; Ancestral Statue; Ancient Crab; Angel of Invention; Angel of Sanctions; Angel of the God-Pharaoh; Angelic Edict; Angelic Purge; Anger of the Gods; Animation Module; Anointed Procession; Anointer Priest; Appeal // Authority; Appetite for the Unnatural; Approach of the Second Sun; Arborback Stomper; Archfiend of Ifnir; Armorcraft Judge; As Foretold; Assassin's Strike; Assault Formation; Asylum Visitor; Atarka's Command; Attune with Aether; Audacious Infiltrator; Auger Spree; Authority of the Consuls; Aven Initiate; Aven Mindcensor; Aven of Enduring Hope; Aven Wind Guide; Aviary Mechanic; Awaken the Bear; Baleful Ammit; Ballista Charger; Baral, Chief of Compliance; Baral's Expertise; Barrage of Expendables; Barricade Breaker; Bastion Mastodon; Bathe in Dragonfire; Battering Krasis; Battlefield Scavenger; Belligerent Sliver; Beneath the Sands; Binding Mummy; Bitterbow Sharpshooters; Black Cat; Blessed Spirits; Blighted Bat; Blood Host; Bloodbond Vampire; Bloodhunter Bat; Bloodlust Inciter; Bloodrage Brawler; Blooming Marsh; Blossoming Defense; Blur of Blades; Blur Sliver; Bogbrew Witch; Bomat Bazaar Barge; Bomat Courier; Bonded Construct; Bone Picker; Bonescythe Sliver; Bontu the Glorified; Bontu's Last Reckoning; Bontu's Monument; Borderland Marauder; Borderland Minotaur; Boros Elite; Botanical Sanctum; Brain Maggot; Breaching Hippocamp; Bred for the Hunt; Bristling Hydra; Brushstrider; Brute Strength; Bubbling Cauldron; Built to Last; Built to Smash; Burning-Fist Minotaur; Burning-Tree Emissary; By Force; Canyon Slough; Carrier Thrall; Cartouche of Ambition; Cartouche of Knowledge; Cartouche of Solidarity; Cartouche of Strength; Cartouche of Zeal; Cascading Cataracts; Cast Out; Cataclysmic Gearhulk; Cathar's Companion; Cemetery Recruitment; Censor; Ceremonious Rejection; Champion of Rhonas; Champion of Wits; Chandra, Pyromaster; Chandra, Torch of Defiance; Chandra's Defeat; Chandra's Revolution; Charging Badger; Chief of the Foundry; Cinder Elemental; Claim // Fame; Cloudblazer; Cogworker's Puzzleknot; Collateral Damage; Collected Company; Combat Celebrant; Combustible Gearhulk; Commencement of Festivities; Commit // Memory; Compelling Argument; Compulsory Rest; Concealed Courtyard; Confiscation Coup; Consign // Oblivion; Consulate Skygate; Consulate Turret; Contraband Kingpin; Conviction; Coralhelm Guide; Corpse Hauler; Countervailing Winds; Countless Gears Renegade; Creeping Mold; Crested Sunmare; Crocanura; Crocodile of the Crossing; Crow of Dark Tidings; Cruel Reality; Crux of Fate; Crypt of the Eternals; Cryptbreaker; Cryptic Serpent; Cultivator's Caravan; Curator of Mysteries; Cut // Ribbons; Dance with Devils; Daredevil Dragster; Daring Demolition; Dark Intimations; Dark Salvation; Dauntless Aven; Dauntless Onslaught; Dawnfeather Eagle; Death Wind; Death's Approach; Declaration in Stone; Decoction Module; Deem Worthy; Defiant Greatmaw; Defiant Salvager; Demolition Stomper; Demon of Dark Schemes; Demonic Pact; Depala, Pilot Exemplar; Desert Cerodon; Desert of the Fervent; Desert of the Glorified; Desert of the Indomitable; Desert of the Mindful; Desert of the True; Desert's Hold; Destined // Lead; Devouring Light; Die Young; Diffusion Sliver; Dinrova Horror; Diregraf Colossus; Disallow; Disposal Mummy; Dispossess; Dissenter's Deliverance; Djeru's Renunciation; Djeru's Resolve; Doom Blade; Doomfall; Douse in Gloom; Dovin Baan; Dragon Fodder; Dragon Hatchling; Dragon Mantle; Dragonloft Idol; Dragonlord's Servant; Dragonmaster Outcast; Drainpipe Vermin; Drake Haven; Drana, Liberator of Malakir; Dread Wanderer; Driven // Despair; Dromoka's Command; Dukhara Peafowl; Dune Beetle; Dusk // Dawn; Dutiful Attendant; Dwynen's Elite; Dynavolt Tower; Eager Construct; Earthshaker Khenra; Eddytrail Hawk; Edifice of Authority; Electrostatic Pummeler; Elemental Uprising; Elusive Krasis; Elvish Visionary; Embraal Bruiser; Empyreal Voyager; Engineered Might; Enlarge; Enraged Giant; Era of Innovation; Essence Extraction; Essence Flux; Eternal of Harsh Truths; Eternal Thirst; Exemplar of Strength; Eyeblight Assassin; Fabrication Module; Failure // Comply; Fairgrounds Warden; Faith of the Devoted; Fan Bearer; Fanatic of Mogis; Farm // Market; Fatal Push; Fateful Showdown; Fen Hauler; Feral Prowler; Fervent Paincaster; Festering Mummy; Festering Newt; Fetid Pools; Fiery Temper; Filigree Familiar; Final Reward; Firebrand Archer; Fireforger's Puzzleknot; Flame Lash; Flameblade Adept; Flames of the Firebrand; Fleshbag Marauder; Floodwaters; Flurry of Horns; Forge Devil; Forsake the Worldly; Fortify; Fortuitous Find; Foundry Hornet; Foundry Inspector; Foundry Screecher; Foundry Street Denizen; Fourth Bridge Prowler; Fragmentize; Freejam Regent; Fretwork Colony; Frontline Rebel; Fumigate; Furious Reprisal; Furnace Whelp; Furyblade Vampire; Gate to the Afterlife; Gearseeker Serpent; Gearshift Ace; Ghoulcaller's Accomplice; Gideon of the Trials; Gideon's Intervention; Gifted Aetherborn; Gilded Cerodon; Glimmer of Genius; Glint; Glint-Nest Crane; Glint-Sleeve Artisan; Glint-Sleeve Siphoner; Glorious End; Glory-Bound Initiate; Glorybringer; Goblin Dark-Dwellers; Goblin Rally; Goblin Shortcutter; God-Pharaoh's Gift; Gonti, Lord of Luxury; Greenbelt Rampager; Grind // Dust; Grisly Salvage; Gust Walker; Hanweir Militia Captain; Hapatra, Vizier of Poisons; Hardened Scales; Harmless Offering; Harnessed Lightning; Harsh Mentor; Hashep Oasis; Haunted Dead; Hazardous Conditions; Haze of Pollen; Hazoret the Fervent; Hazoret's Monument; Heart of Kiran; Heaven // Earth; Hedron Archive; Heir of Falkenrath; Hekma Sentinels; Herald of Anguish; Herald of the Fair; Hidden Stockpile; Hieroglyphic Illumination; High Sentinels of Arashin; Highspire Artisan; Highspire Infusion; Hinterland Drake; Hive Stirrings; Hollow One; Homing Lightning; Honored Crop-Captain; Hooded Brawler; Hope of Ghirapur; Hope Tender; Hordeling Outburst; Hornet Queen; Horror of the Broken Lands; Hour of Devastation; Hour of Promise; Hour of Revelation; Hungry Flames; Ice Over; Ifnir Deadlands; Illusionist's Stratagem; Imminent Doom; Impeccable Timing; Implement of Combustion; Implement of Examination; Implement of Malice; In Oketra's Name; Incorrigible Youths; Incremental Growth; Indomitable Creativity; Indulgent Aristocrat; Initiate's Companion; Insatiable Gorgers; Insolent Neonate; Inspiring Call; Inspiring Statuary; Inspiring Vantage; Insult // Injury; Inventor's Apprentice; Inventors' Fair; Inventor's Goggles; Invigorated Rampage; Ipnu Rivulet; Irontread Crusher; Irrigated Farmland; Jace, Unraveler of Secrets; Just the Wind; Kalastria Nightwatch; Kambal, Consul of Allocation; Kari Zev, Skyship Raider; Kari Zev's Expertise; Kefnet the Mindful; Kefnet's Monument; Key to the City; Khenra Charioteer; Khenra Eternal; Khenra Scrapper; Kolaghan's Command; Kujar Seedsculptor; Labyrinth Guardian; Languish; Lathnu Sailback; Launch Party; Lawless Broker; Lay Claim; Leaf Gilder; Leave // Chance; Leave in the Dust; Leeching Sliver; Lethal Sting; Lifecraft Cavalry; Lifecrafter's Bestiary; Lifecrafter's Gift; Lightning Axe; Lightning Diadem; Lightning Shrieker; Lightwalker; Liliana, Death's Majesty; Liliana's Defeat; Liliana's Elite; Liliana's Mastery; Liliana's Reaver; Live Fast; Long Road Home; Longtusk Cub; Lord of the Accursed; Lost Legacy; Mad Prophet; Magma Jet; Magma Spray; Magmaroth; Majestic Myriarch; Make Obsolete; Malakir Cullblade; Malakir Familiar; Malfunction; Manaweft Sliver; Manglehorn; Manic Scribe; Marauding Boneslasher; Marionette Master; Markov Crusader; Master Trinketeer; Maulfist Revolutionary; Maulfist Squad; Maverick Thopterist; Maze's End; Merchant's Dockhand; Merciless Javelineer; Metallic Mimic; Metallic Rebuke; Metallurgic Summonings; Metalwork Colossus; Miasmic Mummy; Midnight Oil; Minister of Inquiries; Minotaur Skullcleaver; Minotaur Sureshot; Mirage Mirror; Mobile Garrison; Monstrous Onslaught; Mouth // Feed; Mugging; Murmuring Phantasm; Naga Oracle; Naga Vitalist; Narnam Cobra; Narnam Renegade; Nature's Way; Nebelgast Herald; Nef-Crop Entangler; Neheb, the Eternal; Neheb, the Worthy; Nest of Scarabs; Never // Return; New Perspectives; Nicol Bolas, God-Pharaoh; Night Market Aeronaut; Night Market Lookout; Nightmare; Nimble Innovator; Nimble Obstructionist; Nimble-Blade Khenra; Nimbus Swimmer; Nissa, Steward of Elements; Nissa, Vital Force; Noxious Gearhulk; Nyx-Fleece Ram; Oashra Cultivator; Oasis Ritualist; Oath of Ajani; Obelisk Spider; Ogre Battledriver; Ogre Slumlord; Ojutai's Command; Ojutai's Summons; Oketra the True; Oketra's Attendant; Oketra's Avenger; Oketra's Monument; Ominous Sphinx; Onward // Victory; Open Fire; Ornamental Courage; Ornery Kudu; Ornithopter; Outland Boar; Outnumber; Ovalchase Dragster; Overwhelming Splendor; Oviya Pashiri, Sage Lifecrafter; Pacification Array; Pack Rat; Padeem, Consul of Innovation; Panharmonicon; Paradox Engine; Paradoxical Outcome; Path of Bravery; Pathmaker Initiate; Patron of the Valiant; Peacewalker Colossus; Peel from Reality; Peema Aether-Seer; Peema Outrider; Perilous Vault; Pia Nalaar; Pitiless Vizier; Planar Bridge; Pouncing Cheetah; Prakhata Pillar-Bug; Precise Strike; Predatory Sliver; Prepare // Fight; Prescient Chimera; Pride Sovereign; Primeval Bounty; Propeller Pioneer; Prophetic Prism; Protection of the Hekma; Prowling Serpopard; Pull from Tomorrow; Puncturing Blow; Pursue Glory; Putrefy; Quarry Hauler; Quicksmith Genius; Quicksmith Rebel; Rageblood Shaman; Rags // Riches; Raise Dead; Ramunap Excavator; Ramunap Ruins; Rashmi, Eternities Crafter; Ratchet Bomb; Rattlechains; Ravenous Bloodseeker; Ravenous Intruder; Razaketh, the Foulblooded; Reason // Believe; Reckless Fireweaver; Reckless Racer; Reckless Scholar; Reduce // Rubble; Refurbish; Refuse // Cooperate; Regal Caracal; Renegade Map; Renegade Rallier; Renegade Tactics; Renegade Wheelsmith; Renewed Faith; Reservoir Walker; Resilient Khenra; Rest in Peace; Restoration Gearsmith; Restoration Specialist; Return to the Ranks; Reverse Engineer; Revoke Privileges; Revolutionary Rebuff; Rhonas the Indomitable; Rhonas's Monument; Rhonas's Stalwart; Riddle of Lightning; Ridgescale Tusker; Riparian Tiger; Rise of the Dark Realms; Rishkar, Peema Renegade; Rishkar's Expertise; River Hoopoe; Rogue Refiner; Ruin Rat; Ruinous Gremlin; Rumbling Baloth; Runeclaw Bear; Runed Servitor; Rush of Vitality; Ruthless Sniper; Sacred Cat; Sage of Shaila's Claim; Saheeli Rai; Salivating Gremlins; Samut, the Tested; Samut, Voice of Dissent; Sand Strangler; Sandsteppe Outcast; Sandwurm Convergence; Sarkhan's Rage; Scarab Feast; Scattered Groves; Scavenger Grounds; Scour the Laboratory; Scrap Trawler; Scrapheap Scrounger; Scrapper Champion; Seeker of Insight; Seer of the Last Tomorrow; Seismic Elemental; Select for Inspection; Self-Assembler; Selfless Cathar; Sengir Vampire; Sentinel Sliver; Servant of the Conduit; Servant of the Scale; Servo Exhibition; Servo Schematic; Shadow of the Grave; Shadowstorm Vizier; Shambleshark; Shambling Goblin; Shed Weakness; Shefet Dunes; Shefet Monitor; Sheltered Thicket; Shielded Aether Thief; Shimmerscale Drake; Shipwreck Moray; Shiv's Embrace; Shrewd Negotiation; Sidewinder Naga; Siege Dragon; Siege Modification; Sifter Wurm; Sigil of the Empty Throne; Sigiled Starfish; Sign in Blood; Silumgar's Command; Sin Prodder; Sixth Sense; Sky Skiff; Skyship Plunderer; Skyship Stalker; Skysovereign, Consul Flagship; Skywhaler's Shot; Slate Street Ruffian; Slither Blade; Sliver Hive; Sly Requisitioner; Solemnity; Solitary Camel; Somberwald Stag; Soul of the Harvest; Soulblade Djinn; Soul-Scar Mage; Soulstinger; Speedway Fanatic; Spellweaver Eternal; Sphinx's Revelation; Spire of Industry; Spire Patrol; Spirebluff Canal; Spireside Infiltrator; Splendid Agony; Sporemound; Spring // Mind; Sram, Senior Edificer; Sram's Expertise; Stab Wound; Start // Finish; Steelform Sliver; Steward of Solidarity; Stinging Shot; Stitchwing Skaab; Striking Sliver; Striped Riverwinder; Struggle // Survive; Sunscorched Desert; Sunscourge Champion; Sunset Pyramid; Supernatural Stamina; Supply Caravan; Supreme Will; Swan Song; Swarm of Bloodflies; Sweatworks Brawler; Sweep Away; Sweltering Suns; Synchronized Strike; Tah-Crop Elite; Tajuru Pathwarden; Tandem Tactics; Temmet, Vizier of Naktamun; Terrarion; Tezzeret the Schemer; Tezzeret's Ambition; Tezzeret's Touch; Thalia's Lieutenant; The Gitrog Monster; The Locust God; The Scarab God; The Scorpion God; Thopter Arrest; Thorned Moloch; Those Who Serve; Thoughtseize; Thraben Inspector; Thraben Standard Bearer; Thresher Lizard; Thriving Rhino; Thriving Turtle; Throne of the God-Pharaoh; Thunderbreak Regent; Tightening Coils; Toolcraft Exemplar; Torch Fiend; Torment of Hailfire; Torment of Scarabs; Torrential Gearhulk; Treasure Keeper; Trespasser's Curse; Trial of Ambition; Trial of Knowledge; Trial of Solidarity; Trial of Strength; Trial of Zeal; Trophy Mage; Typhoid Rats; Ulamog, the Ceaseless Hunger; Ulvenwald Hydra; Ulvenwald Mysteries; Unbridled Growth; Unburden; Unconventional Tactics; Underhanded Designs; Unesh, Criosphinx Sovereign; Universal Solvent; Unlicensed Disintegration; Unquenchable Thirst; Untethered Express; Vengeful Rebel; Verdurous Gearhulk; Veteran Motorist; Vile Manifestation; Virulent Plague; Visionary Augmenter; Vizier of Deferment; Vizier of Many Faces; Vizier of Remedies; Vizier of the Anointed; Vizier of the Menagerie; Vizier of Tumbling Sands; Voltaic Brawler; Voyage's End; Wailing Ghoul; Wall of Forgotten Pharaohs; Wander in Death; Warfire Javelineer; Wasp of the Bitter End; Waste Not; Wasteland Scorpion; Watchers of the Dead; Watchful Naga; Wayward Servant; Weaponcraft Enthusiast; Weaver of Lightning; Weldfast Engineer; Weldfast Monitor; Weldfast Wingsmith; Welding Sparks; Whelming Wave; Whir of Invention; Whirler Rogue; Whirler Virtuoso; Whirlermaker; Wight of Precinct Six; Wild Wanderer; Wildest Dreams; Winding Constrictor; Wind-Kin Raiders; Winds of Rebuke; Winged Shepherd; Wispweaver Angel; Witch's Familiar; Woodborn Behemoth; Woodweaver's Puzzleknot; Workshop Assistant; Yahenni, Undying Partisan; Yahenni's Expertise; Young Pyromancer; Zealot of the God-Pharaoh; Zendikar's Roil
diff --git a/forge-gui/res/formats/Archived/Historic/2022-06-02.txt b/forge-gui/res/formats/Archived/Historic/2022-06-02.txt
index 474d8246d73..5b8b10caa0f 100644
--- a/forge-gui/res/formats/Archived/Historic/2022-06-02.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-06-02.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Historic (YSNC)
-Type:Historic
+Type:Archived
 Subtype:Arena
 Effective:2022-06-02
 Sets: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
diff --git a/forge-gui/res/formats/Archived/Legacy/2022-06-10.txt b/forge-gui/res/formats/Archived/Legacy/2022-06-10.txt
index 99f6f8f9b58..204eba23bf4 100644
--- a/forge-gui/res/formats/Archived/Legacy/2022-06-10.txt
+++ b/forge-gui/res/formats/Archived/Legacy/2022-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Legacy (CLB)
-Type:Historic
+Type:Archived
 Subtype:Legacy
 Effective:2022-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, CLB
diff --git a/forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt b/forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt
index aa2bbfbc699..e1ee0ce45fd 100644
--- a/forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt
+++ b/forge-gui/res/formats/Archived/Pioneer/2022-06-07.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Pioneer (2022-06-07)
-Type:Historic
+Type:Archived
 Subtype:Pioneer
 Effective:2022-06-07
 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, VOW, DBL, NEO, SNC
diff --git a/forge-gui/res/formats/Archived/Vintage/2022-06-10.txt b/forge-gui/res/formats/Archived/Vintage/2022-06-10.txt
index 44fbd3b79a3..d1a2b1895df 100644
--- a/forge-gui/res/formats/Archived/Vintage/2022-06-10.txt
+++ b/forge-gui/res/formats/Archived/Vintage/2022-06-10.txt
@@ -1,6 +1,6 @@
 [format]
 Name:Vintage (CLB)
-Type:Historic
+Type:Archived
 Subtype:Vintage
 Effective:2022-06-10
 Sets:LEA, LEB, 2ED, ARN, ATQ, 3ED, LEG, DRC94, DRK, FEM, ARENA, WW, FS, SHC, 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, V09, ME3, ZEN, DDD, H09, WWK, DDE, ROE, DPA, M11, V10, DDF, SOM, TD1, PD2, ME4, MBS, DDG, NPH, TD2, COM, M12, V11, DDH, ISD, PD3, DKA, DDI, AVR, 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, AER, MM3, DDS, AKH, MPS_AKH, W17, CMA, HOU, C17, XLN, DDT, IMA, V17, 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, VOW, VOC, DBL, CC2, NEO, NEC, SNC, NCC, CLB

From d818a9da06a26c705607034f15eb4782820241eb Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Wed, 8 Jun 2022 20:32:42 +0100
Subject: [PATCH 024/309] explorer date fix

---
 .../Archived/Explorer/{2022-06-07.txt => 2022-06-09.txt}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename forge-gui/res/formats/Archived/Explorer/{2022-06-07.txt => 2022-06-09.txt} (99%)

diff --git a/forge-gui/res/formats/Archived/Explorer/2022-06-07.txt b/forge-gui/res/formats/Archived/Explorer/2022-06-09.txt
similarity index 99%
rename from forge-gui/res/formats/Archived/Explorer/2022-06-07.txt
rename to forge-gui/res/formats/Archived/Explorer/2022-06-09.txt
index 58bafb4ecfc..863404a8038 100644
--- a/forge-gui/res/formats/Archived/Explorer/2022-06-07.txt
+++ b/forge-gui/res/formats/Archived/Explorer/2022-06-09.txt
@@ -1,8 +1,8 @@
 [format]
-Name:Explorer (2022-06-07)
+Name:Explorer (2022-06-09)
 Type:Archived
 Subtype:Arena
-Effective:2022-06-07
+Effective:2022-06-09
 Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, THB, IKO, M21, ZNR, KHM, STX, AFR, MID, VOW, NEO, SNC
 Banned:Expressive Iteration; Field of the Dead; Kethis, the Hidden Hand; Leyline of Abundance; Lurrus of the Dream-Den; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Teferi, Time Raveler; Tibalt's Trickery; Underworld Breach; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces
 Additional:Abandoned Sarcophagus; Abzan Battle Priest; Abzan Falconer; Accursed Horde; Adaptive Snapjaw; Adorned Pouncer; Aerial Guide; Aerial Responder; Aeronaut Admiral; Aether Chaser; Aether Hub; Aether Inspector; Aether Meltdown; Aether Poisoner; Aether Swooper; Aether Theorist; Aether Tradewinds; Aetherborn Marauder; Aetherflux Reservoir; Aethersphere Harvester; Aetherstorm Roc; Aetherstream Leopard; Aethertorch Renegade; Aetherworks Marvel; Ahn-Crop Champion; Ahn-Crop Crasher; Ainok Bond-Kin; Airdrop Aeronauts; Ajani Unyielding; Alchemist's Greeting; Alley Evasion; Alley Strangler; Ammit Eternal; Ancestral Statue; Ancient Crab; Angel of Invention; Angel of Sanctions; Angel of the God-Pharaoh; Angelic Edict; Angelic Purge; Anger of the Gods; Animation Module; Anointed Procession; Anointer Priest; Appeal // Authority; Appetite for the Unnatural; Approach of the Second Sun; Arborback Stomper; Archfiend of Ifnir; Armorcraft Judge; As Foretold; Assassin's Strike; Assault Formation; Asylum Visitor; Atarka's Command; Attune with Aether; Audacious Infiltrator; Auger Spree; Authority of the Consuls; Aven Initiate; Aven Mindcensor; Aven of Enduring Hope; Aven Wind Guide; Aviary Mechanic; Awaken the Bear; Baleful Ammit; Ballista Charger; Baral, Chief of Compliance; Baral's Expertise; Barrage of Expendables; Barricade Breaker; Bastion Mastodon; Bathe in Dragonfire; Battering Krasis; Battlefield Scavenger; Belligerent Sliver; Beneath the Sands; Binding Mummy; Bitterbow Sharpshooters; Black Cat; Blessed Spirits; Blighted Bat; Blood Host; Bloodbond Vampire; Bloodhunter Bat; Bloodlust Inciter; Bloodrage Brawler; Blooming Marsh; Blossoming Defense; Blur of Blades; Blur Sliver; Bogbrew Witch; Bomat Bazaar Barge; Bomat Courier; Bonded Construct; Bone Picker; Bonescythe Sliver; Bontu the Glorified; Bontu's Last Reckoning; Bontu's Monument; Borderland Marauder; Borderland Minotaur; Boros Elite; Botanical Sanctum; Brain Maggot; Breaching Hippocamp; Bred for the Hunt; Bristling Hydra; Brushstrider; Brute Strength; Bubbling Cauldron; Built to Last; Built to Smash; Burning-Fist Minotaur; Burning-Tree Emissary; By Force; Canyon Slough; Carrier Thrall; Cartouche of Ambition; Cartouche of Knowledge; Cartouche of Solidarity; Cartouche of Strength; Cartouche of Zeal; Cascading Cataracts; Cast Out; Cataclysmic Gearhulk; Cathar's Companion; Cemetery Recruitment; Censor; Ceremonious Rejection; Champion of Rhonas; Champion of Wits; Chandra, Pyromaster; Chandra, Torch of Defiance; Chandra's Defeat; Chandra's Revolution; Charging Badger; Chief of the Foundry; Cinder Elemental; Claim // Fame; Cloudblazer; Cogworker's Puzzleknot; Collateral Damage; Collected Company; Combat Celebrant; Combustible Gearhulk; Commencement of Festivities; Commit // Memory; Compelling Argument; Compulsory Rest; Concealed Courtyard; Confiscation Coup; Consign // Oblivion; Consulate Skygate; Consulate Turret; Contraband Kingpin; Conviction; Coralhelm Guide; Corpse Hauler; Countervailing Winds; Countless Gears Renegade; Creeping Mold; Crested Sunmare; Crocanura; Crocodile of the Crossing; Crow of Dark Tidings; Cruel Reality; Crux of Fate; Crypt of the Eternals; Cryptbreaker; Cryptic Serpent; Cultivator's Caravan; Curator of Mysteries; Cut // Ribbons; Dance with Devils; Daredevil Dragster; Daring Demolition; Dark Intimations; Dark Salvation; Dauntless Aven; Dauntless Onslaught; Dawnfeather Eagle; Death Wind; Death's Approach; Declaration in Stone; Decoction Module; Deem Worthy; Defiant Greatmaw; Defiant Salvager; Demolition Stomper; Demon of Dark Schemes; Demonic Pact; Depala, Pilot Exemplar; Desert Cerodon; Desert of the Fervent; Desert of the Glorified; Desert of the Indomitable; Desert of the Mindful; Desert of the True; Desert's Hold; Destined // Lead; Devouring Light; Die Young; Diffusion Sliver; Dinrova Horror; Diregraf Colossus; Disallow; Disposal Mummy; Dispossess; Dissenter's Deliverance; Djeru's Renunciation; Djeru's Resolve; Doom Blade; Doomfall; Douse in Gloom; Dovin Baan; Dragon Fodder; Dragon Hatchling; Dragon Mantle; Dragonloft Idol; Dragonlord's Servant; Dragonmaster Outcast; Drainpipe Vermin; Drake Haven; Drana, Liberator of Malakir; Dread Wanderer; Driven // Despair; Dromoka's Command; Dukhara Peafowl; Dune Beetle; Dusk // Dawn; Dutiful Attendant; Dwynen's Elite; Dynavolt Tower; Eager Construct; Earthshaker Khenra; Eddytrail Hawk; Edifice of Authority; Electrostatic Pummeler; Elemental Uprising; Elusive Krasis; Elvish Visionary; Embraal Bruiser; Empyreal Voyager; Engineered Might; Enlarge; Enraged Giant; Era of Innovation; Essence Extraction; Essence Flux; Eternal of Harsh Truths; Eternal Thirst; Exemplar of Strength; Eyeblight Assassin; Fabrication Module; Failure // Comply; Fairgrounds Warden; Faith of the Devoted; Fan Bearer; Fanatic of Mogis; Farm // Market; Fatal Push; Fateful Showdown; Fen Hauler; Feral Prowler; Fervent Paincaster; Festering Mummy; Festering Newt; Fetid Pools; Fiery Temper; Filigree Familiar; Final Reward; Firebrand Archer; Fireforger's Puzzleknot; Flame Lash; Flameblade Adept; Flames of the Firebrand; Fleshbag Marauder; Floodwaters; Flurry of Horns; Forge Devil; Forsake the Worldly; Fortify; Fortuitous Find; Foundry Hornet; Foundry Inspector; Foundry Screecher; Foundry Street Denizen; Fourth Bridge Prowler; Fragmentize; Freejam Regent; Fretwork Colony; Frontline Rebel; Fumigate; Furious Reprisal; Furnace Whelp; Furyblade Vampire; Gate to the Afterlife; Gearseeker Serpent; Gearshift Ace; Ghoulcaller's Accomplice; Gideon of the Trials; Gideon's Intervention; Gifted Aetherborn; Gilded Cerodon; Glimmer of Genius; Glint; Glint-Nest Crane; Glint-Sleeve Artisan; Glint-Sleeve Siphoner; Glorious End; Glory-Bound Initiate; Glorybringer; Goblin Dark-Dwellers; Goblin Rally; Goblin Shortcutter; God-Pharaoh's Gift; Gonti, Lord of Luxury; Greenbelt Rampager; Grind // Dust; Grisly Salvage; Gust Walker; Hanweir Militia Captain; Hapatra, Vizier of Poisons; Hardened Scales; Harmless Offering; Harnessed Lightning; Harsh Mentor; Hashep Oasis; Haunted Dead; Hazardous Conditions; Haze of Pollen; Hazoret the Fervent; Hazoret's Monument; Heart of Kiran; Heaven // Earth; Hedron Archive; Heir of Falkenrath; Hekma Sentinels; Herald of Anguish; Herald of the Fair; Hidden Stockpile; Hieroglyphic Illumination; High Sentinels of Arashin; Highspire Artisan; Highspire Infusion; Hinterland Drake; Hive Stirrings; Hollow One; Homing Lightning; Honored Crop-Captain; Hooded Brawler; Hope of Ghirapur; Hope Tender; Hordeling Outburst; Hornet Queen; Horror of the Broken Lands; Hour of Devastation; Hour of Promise; Hour of Revelation; Hungry Flames; Ice Over; Ifnir Deadlands; Illusionist's Stratagem; Imminent Doom; Impeccable Timing; Implement of Combustion; Implement of Examination; Implement of Malice; In Oketra's Name; Incorrigible Youths; Incremental Growth; Indomitable Creativity; Indulgent Aristocrat; Initiate's Companion; Insatiable Gorgers; Insolent Neonate; Inspiring Call; Inspiring Statuary; Inspiring Vantage; Insult // Injury; Inventor's Apprentice; Inventors' Fair; Inventor's Goggles; Invigorated Rampage; Ipnu Rivulet; Irontread Crusher; Irrigated Farmland; Jace, Unraveler of Secrets; Just the Wind; Kalastria Nightwatch; Kambal, Consul of Allocation; Kari Zev, Skyship Raider; Kari Zev's Expertise; Kefnet the Mindful; Kefnet's Monument; Key to the City; Khenra Charioteer; Khenra Eternal; Khenra Scrapper; Kolaghan's Command; Kujar Seedsculptor; Labyrinth Guardian; Languish; Lathnu Sailback; Launch Party; Lawless Broker; Lay Claim; Leaf Gilder; Leave // Chance; Leave in the Dust; Leeching Sliver; Lethal Sting; Lifecraft Cavalry; Lifecrafter's Bestiary; Lifecrafter's Gift; Lightning Axe; Lightning Diadem; Lightning Shrieker; Lightwalker; Liliana, Death's Majesty; Liliana's Defeat; Liliana's Elite; Liliana's Mastery; Liliana's Reaver; Live Fast; Long Road Home; Longtusk Cub; Lord of the Accursed; Lost Legacy; Mad Prophet; Magma Jet; Magma Spray; Magmaroth; Majestic Myriarch; Make Obsolete; Malakir Cullblade; Malakir Familiar; Malfunction; Manaweft Sliver; Manglehorn; Manic Scribe; Marauding Boneslasher; Marionette Master; Markov Crusader; Master Trinketeer; Maulfist Revolutionary; Maulfist Squad; Maverick Thopterist; Maze's End; Merchant's Dockhand; Merciless Javelineer; Metallic Mimic; Metallic Rebuke; Metallurgic Summonings; Metalwork Colossus; Miasmic Mummy; Midnight Oil; Minister of Inquiries; Minotaur Skullcleaver; Minotaur Sureshot; Mirage Mirror; Mobile Garrison; Monstrous Onslaught; Mouth // Feed; Mugging; Murmuring Phantasm; Naga Oracle; Naga Vitalist; Narnam Cobra; Narnam Renegade; Nature's Way; Nebelgast Herald; Nef-Crop Entangler; Neheb, the Eternal; Neheb, the Worthy; Nest of Scarabs; Never // Return; New Perspectives; Nicol Bolas, God-Pharaoh; Night Market Aeronaut; Night Market Lookout; Nightmare; Nimble Innovator; Nimble Obstructionist; Nimble-Blade Khenra; Nimbus Swimmer; Nissa, Steward of Elements; Nissa, Vital Force; Noxious Gearhulk; Nyx-Fleece Ram; Oashra Cultivator; Oasis Ritualist; Oath of Ajani; Obelisk Spider; Ogre Battledriver; Ogre Slumlord; Ojutai's Command; Ojutai's Summons; Oketra the True; Oketra's Attendant; Oketra's Avenger; Oketra's Monument; Ominous Sphinx; Onward // Victory; Open Fire; Ornamental Courage; Ornery Kudu; Ornithopter; Outland Boar; Outnumber; Ovalchase Dragster; Overwhelming Splendor; Oviya Pashiri, Sage Lifecrafter; Pacification Array; Pack Rat; Padeem, Consul of Innovation; Panharmonicon; Paradox Engine; Paradoxical Outcome; Path of Bravery; Pathmaker Initiate; Patron of the Valiant; Peacewalker Colossus; Peel from Reality; Peema Aether-Seer; Peema Outrider; Perilous Vault; Pia Nalaar; Pitiless Vizier; Planar Bridge; Pouncing Cheetah; Prakhata Pillar-Bug; Precise Strike; Predatory Sliver; Prepare // Fight; Prescient Chimera; Pride Sovereign; Primeval Bounty; Propeller Pioneer; Prophetic Prism; Protection of the Hekma; Prowling Serpopard; Pull from Tomorrow; Puncturing Blow; Pursue Glory; Putrefy; Quarry Hauler; Quicksmith Genius; Quicksmith Rebel; Rageblood Shaman; Rags // Riches; Raise Dead; Ramunap Excavator; Ramunap Ruins; Rashmi, Eternities Crafter; Ratchet Bomb; Rattlechains; Ravenous Bloodseeker; Ravenous Intruder; Razaketh, the Foulblooded; Reason // Believe; Reckless Fireweaver; Reckless Racer; Reckless Scholar; Reduce // Rubble; Refurbish; Refuse // Cooperate; Regal Caracal; Renegade Map; Renegade Rallier; Renegade Tactics; Renegade Wheelsmith; Renewed Faith; Reservoir Walker; Resilient Khenra; Rest in Peace; Restoration Gearsmith; Restoration Specialist; Return to the Ranks; Reverse Engineer; Revoke Privileges; Revolutionary Rebuff; Rhonas the Indomitable; Rhonas's Monument; Rhonas's Stalwart; Riddle of Lightning; Ridgescale Tusker; Riparian Tiger; Rise of the Dark Realms; Rishkar, Peema Renegade; Rishkar's Expertise; River Hoopoe; Rogue Refiner; Ruin Rat; Ruinous Gremlin; Rumbling Baloth; Runeclaw Bear; Runed Servitor; Rush of Vitality; Ruthless Sniper; Sacred Cat; Sage of Shaila's Claim; Saheeli Rai; Salivating Gremlins; Samut, the Tested; Samut, Voice of Dissent; Sand Strangler; Sandsteppe Outcast; Sandwurm Convergence; Sarkhan's Rage; Scarab Feast; Scattered Groves; Scavenger Grounds; Scour the Laboratory; Scrap Trawler; Scrapheap Scrounger; Scrapper Champion; Seeker of Insight; Seer of the Last Tomorrow; Seismic Elemental; Select for Inspection; Self-Assembler; Selfless Cathar; Sengir Vampire; Sentinel Sliver; Servant of the Conduit; Servant of the Scale; Servo Exhibition; Servo Schematic; Shadow of the Grave; Shadowstorm Vizier; Shambleshark; Shambling Goblin; Shed Weakness; Shefet Dunes; Shefet Monitor; Sheltered Thicket; Shielded Aether Thief; Shimmerscale Drake; Shipwreck Moray; Shiv's Embrace; Shrewd Negotiation; Sidewinder Naga; Siege Dragon; Siege Modification; Sifter Wurm; Sigil of the Empty Throne; Sigiled Starfish; Sign in Blood; Silumgar's Command; Sin Prodder; Sixth Sense; Sky Skiff; Skyship Plunderer; Skyship Stalker; Skysovereign, Consul Flagship; Skywhaler's Shot; Slate Street Ruffian; Slither Blade; Sliver Hive; Sly Requisitioner; Solemnity; Solitary Camel; Somberwald Stag; Soul of the Harvest; Soulblade Djinn; Soul-Scar Mage; Soulstinger; Speedway Fanatic; Spellweaver Eternal; Sphinx's Revelation; Spire of Industry; Spire Patrol; Spirebluff Canal; Spireside Infiltrator; Splendid Agony; Sporemound; Spring // Mind; Sram, Senior Edificer; Sram's Expertise; Stab Wound; Start // Finish; Steelform Sliver; Steward of Solidarity; Stinging Shot; Stitchwing Skaab; Striking Sliver; Striped Riverwinder; Struggle // Survive; Sunscorched Desert; Sunscourge Champion; Sunset Pyramid; Supernatural Stamina; Supply Caravan; Supreme Will; Swan Song; Swarm of Bloodflies; Sweatworks Brawler; Sweep Away; Sweltering Suns; Synchronized Strike; Tah-Crop Elite; Tajuru Pathwarden; Tandem Tactics; Temmet, Vizier of Naktamun; Terrarion; Tezzeret the Schemer; Tezzeret's Ambition; Tezzeret's Touch; Thalia's Lieutenant; The Gitrog Monster; The Locust God; The Scarab God; The Scorpion God; Thopter Arrest; Thorned Moloch; Those Who Serve; Thoughtseize; Thraben Inspector; Thraben Standard Bearer; Thresher Lizard; Thriving Rhino; Thriving Turtle; Throne of the God-Pharaoh; Thunderbreak Regent; Tightening Coils; Toolcraft Exemplar; Torch Fiend; Torment of Hailfire; Torment of Scarabs; Torrential Gearhulk; Treasure Keeper; Trespasser's Curse; Trial of Ambition; Trial of Knowledge; Trial of Solidarity; Trial of Strength; Trial of Zeal; Trophy Mage; Typhoid Rats; Ulamog, the Ceaseless Hunger; Ulvenwald Hydra; Ulvenwald Mysteries; Unbridled Growth; Unburden; Unconventional Tactics; Underhanded Designs; Unesh, Criosphinx Sovereign; Universal Solvent; Unlicensed Disintegration; Unquenchable Thirst; Untethered Express; Vengeful Rebel; Verdurous Gearhulk; Veteran Motorist; Vile Manifestation; Virulent Plague; Visionary Augmenter; Vizier of Deferment; Vizier of Many Faces; Vizier of Remedies; Vizier of the Anointed; Vizier of the Menagerie; Vizier of Tumbling Sands; Voltaic Brawler; Voyage's End; Wailing Ghoul; Wall of Forgotten Pharaohs; Wander in Death; Warfire Javelineer; Wasp of the Bitter End; Waste Not; Wasteland Scorpion; Watchers of the Dead; Watchful Naga; Wayward Servant; Weaponcraft Enthusiast; Weaver of Lightning; Weldfast Engineer; Weldfast Monitor; Weldfast Wingsmith; Welding Sparks; Whelming Wave; Whir of Invention; Whirler Rogue; Whirler Virtuoso; Whirlermaker; Wight of Precinct Six; Wild Wanderer; Wildest Dreams; Winding Constrictor; Wind-Kin Raiders; Winds of Rebuke; Winged Shepherd; Wispweaver Angel; Witch's Familiar; Woodborn Behemoth; Woodweaver's Puzzleknot; Workshop Assistant; Yahenni, Undying Partisan; Yahenni's Expertise; Young Pyromancer; Zealot of the God-Pharaoh; Zendikar's Roil

From c905f96800fed1e9be6b5626092beba0ae6b59c5 Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Sun, 12 Jun 2022 12:05:02 +0100
Subject: [PATCH 025/309] ANNOUNCEMENTS.txt

---
 forge-gui/release-files/ANNOUNCEMENTS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/release-files/ANNOUNCEMENTS.txt b/forge-gui/release-files/ANNOUNCEMENTS.txt
index 2cca343357b..c541b86e0ac 100644
--- a/forge-gui/release-files/ANNOUNCEMENTS.txt
+++ b/forge-gui/release-files/ANNOUNCEMENTS.txt
@@ -1,5 +1,5 @@
 #Add one announcement per line
 Get in the discord if you aren't yet. https://discord.gg/3v9JCVr
 The SNC set is fully integrated, as well as most of the NCC cards (several cards are still missing from the latter).
-Historic-type formats have been renamed to Archived to reduce confusion. You may need to re-enable them in your preferences.
+Historic-type formats have been renamed to Archived to reduce confusion between them and the official sanctioned format. You will need to re-enable them in your preferences.
 *** Android 7 & 8 support is now deprecated. Support will be dropped in an upcoming release. ***

From 10f1b0c62d495ebcffb037c0120f6cee596847f0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 21 Jun 2022 02:55:44 +0800
Subject: [PATCH 026/309] update Localizer

---
 .../src/main/java/forge/util/Localizer.java   | 55 +++----------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/forge-core/src/main/java/forge/util/Localizer.java b/forge-core/src/main/java/forge/util/Localizer.java
index 936dcf6108f..173e936ce49 100644
--- a/forge-core/src/main/java/forge/util/Localizer.java
+++ b/forge-core/src/main/java/forge/util/Localizer.java
@@ -77,57 +77,18 @@ public class Localizer {
         }
     }
     public String getEnglishMessage(final String key, final Object... messageArguments) {
-        MessageFormat formatter = null;
-
-        try {
-            //formatter = new MessageFormat(resourceBundle.getString(key.toLowerCase()), locale);
-            formatter = new MessageFormat(englishBundle.getString(key), Locale.ENGLISH);
-        } catch (final IllegalArgumentException | MissingResourceException e) {
-            if (!silent)
-                e.printStackTrace();
-        }
-
-        if (formatter == null && !silent) {
-            System.err.println("INVALID PROPERTY: '" + key + "' -- Translation Needed?");
-            return "INVALID PROPERTY: '" + key + "' -- Translation Needed?";
-        }
-
-        silent = false;
-
-        formatter.setLocale(Locale.ENGLISH);
-
-        String formattedMessage = "CHAR ENCODING ERROR";
-        final String[] charsets = { "ISO-8859-1", "UTF-8" };
-        //Support non-English-standard characters
-        String detectedCharset = charset(englishBundle.getString(key), charsets);
-
-        final int argLength = messageArguments.length;
-        Object[] syncEncodingMessageArguments = new Object[argLength];
-        //when messageArguments encoding not equal resourceBundle.getString(key),convert to equal
-        //avoid convert to a have two encoding content formattedMessage string.
-        for (int i = 0; i < argLength; i++) {
-            String objCharset = charset(messageArguments[i].toString(), charsets);
-            try {
-                syncEncodingMessageArguments[i] = convert(messageArguments[i].toString(), objCharset, detectedCharset);
-            } catch (UnsupportedEncodingException ignored) {
-                System.err.println("Cannot Convert '" + messageArguments[i].toString() + "' from '" + objCharset + "' To '" + detectedCharset + "'");
-                return "encoding '" + key + "' translate string failure";
-            }
-        }
-
-        try {
-            formattedMessage = new String(formatter.format(syncEncodingMessageArguments).getBytes(detectedCharset), StandardCharsets.UTF_8);
-        } catch(UnsupportedEncodingException ignored) {}
-
-        return formattedMessage;
+        return getMessage(true, key, messageArguments);
     }
     //FIXME: localizer should return default value from english locale or it will crash some GUI element like the NewGameMenu->NewGameScreen Popup when returned null...
     public String getMessage(final String key, final Object... messageArguments) {
+        return getMessage(false, key, messageArguments);
+    }
+    public String getMessage(final boolean forcedEnglish, final String key, final Object... messageArguments) {
         MessageFormat formatter = null;
 
         try {
             //formatter = new MessageFormat(resourceBundle.getString(key.toLowerCase()), locale);
-            formatter = new MessageFormat(english ? englishBundle.getString(key) : resourceBundle.getString(key), english ? Locale.ENGLISH : locale);
+            formatter = new MessageFormat(english || forcedEnglish ? englishBundle.getString(key) : resourceBundle.getString(key), english || forcedEnglish ? Locale.ENGLISH : locale);
         } catch (final IllegalArgumentException | MissingResourceException e) {
             if (!silent)
                 e.printStackTrace();
@@ -140,12 +101,12 @@ public class Localizer {
 
         silent = false;
 
-        formatter.setLocale(english ? Locale.ENGLISH : locale);
+        formatter.setLocale(english || forcedEnglish ? Locale.ENGLISH : locale);
 
         String formattedMessage = "CHAR ENCODING ERROR";
         final String[] charsets = { "ISO-8859-1", "UTF-8" };
         //Support non-English-standard characters
-        String detectedCharset = charset(english ? englishBundle.getString(key) : resourceBundle.getString(key), charsets);
+        String detectedCharset = charset(english || forcedEnglish ? englishBundle.getString(key) : resourceBundle.getString(key), charsets);
 
         final int argLength = messageArguments.length;
         Object[] syncEncodingMessageArguments = new Object[argLength];
@@ -194,7 +155,7 @@ public class Localizer {
                 englishBundle = ResourceBundle.getBundle("en-US", new Locale("en", "US"), loader);
             } catch (NullPointerException | MissingResourceException e) {
                 //If the language can't be loaded, default to US English
-                resourceBundle = ResourceBundle.getBundle("en-US", new Locale("en", "US"), loader);
+                resourceBundle = ResourceBundle.getBundle("en-US", new Locale("en_US"), loader);
                 e.printStackTrace();
             }
 

From b93df499b2621f7ff309b02ded6f35148bb957dd Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:15:12 -0500
Subject: [PATCH 027/309] Update ambitious_dragonborn.txt

---
 forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt b/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
index e4c697d21f9..2d723b5e322 100644
--- a/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ambitious_dragonborn.txt
@@ -4,5 +4,5 @@ Types:Creature Dragon Barbarian
 PT:0/0
 K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield 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
+DeckHas:Ability$Graveyard|Counters
 Oracle:Ambitious Dragonborn enters the battlefield with X +1/+1 counters on it, where X is the greatest power among creatures you control and creature cards in your graveyard.

From 6c48533539f1753bde3e26e95d660c17dfb8da96 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:32:59 -0500
Subject: [PATCH 028/309] Update baeloth_barrityl_entertainer.txt

---
 .../cardsfolder/upcoming/baeloth_barrityl_entertainer.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
index 30d52782f60..dc424d78c78 100644
--- a/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
@@ -3,12 +3,10 @@ ManaCost:4 R
 Types:Creature Elf Shaman
 PT:2/5
 K:Choose a Background
-S:Mode$ Continuous | Affected$ Creature.powerLTY+OppCtrl | Remember$ True | Description$ Creatures your opponents control with power less than CARDNAME power are goaded. (They attacks each combat if able and attack a player other than you if able.)
-SVar:DBGoad:DB$ Goad | Defined$ Creature.IsRemembered | SubAbility$ TrigChangesZone
+S:Mode$ Continuous | Affected$ Creature.powerLTY+OppCtrl | Goad$ True | SubAbility$ TrigChangesZone | Description$ Creatures your opponents control with power less than CARDNAME power are goaded. (They attacks each combat if able and attack a player other than you if able.)
 SVar:Y:Count$CardPower
 SVar:TrigChangesZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.attacking+IsGoaded,Creature.blocking+IsGoaded | Execute$ TrigToken | TriggerZones$ Battlefield | SubAbility$ TrigToken | TriggerDescription$ Whenever a goaded attacking or blocking creature dies, you create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 SVar:HasAttackEffect:TRUE
-DeckHas:Ability$Token 
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 Oracle:Creatures your opponents control with power less than Baeloth Barrityl's power are goaded. (They attacks each combat if able and attack a player other than you if able.)\nWhenever a goaded attacking or blocking creature dies, you create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\nChoose a Background (You can have a Background as a second commander.)

From f11488702c72e87d89ff9e48eea622512dbfb8ea Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:35:02 -0500
Subject: [PATCH 029/309] Update blessed_hippogriff_tyrs_blesing.txt

---
 .../res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt b/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
index 9a6e6754583..77d7bb402d2 100644
--- a/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blessed_hippogriff_tyrs_blesing.txt
@@ -14,4 +14,5 @@ Name:Tyr's Blesing
 ManaCost:W
 Types:Instant Adventure
 A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target to make indestructable | KW$ Indestructible | SpellDescription$ Target creature gains indestructible until end of turn.
+SVar:HasAttackEffect:TRUE
 Oracle:Target creature gains indestructible until end of turn.

From f7d7c7aa57020f76aa50ea180487441d70e35d24 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:39:07 -0500
Subject: [PATCH 030/309] Update blood_money.txt

---
 forge-gui/res/cardsfolder/upcoming/blood_money.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/blood_money.txt b/forge-gui/res/cardsfolder/upcoming/blood_money.txt
index 0e53ff61ad9..b6cff0d14dc 100644
--- a/forge-gui/res/cardsfolder/upcoming/blood_money.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blood_money.txt
@@ -2,8 +2,8 @@ Name:Blood Money
 ManaCost:5 B B
 Types:Sorcery
 A:SP$ DestroyAll | ValidCards$ Creature | RememberDestroyed$ True | SubAbility$ DBTreasure | SpellDescription$ Destroy all creatures.
-SVar:DBTreasure:DB$ Token | TokenAmount$ X | TokenTapped$ True | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SubAbility$ DBCleanupSpellDescription$ For each nontoken creature destroyed this way, create a tapped Treasure token.
+SVar:DBTreasure:DB$ Token | TokenAmount$ X | TokenTapped$ True | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SubAbility$ DBCleanup | SpellDescription$ For each nontoken creature destroyed this way, create a tapped Treasure token.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Card.nonToken
-DeckHas:Ability$Token
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 Oracle:Destroy all creatures. For each nontoken creature destroyed this way, create a tapped Treasure token.

From a5ebacf225973b3d4203f35dd331ef06f0d198e7 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Mon, 20 Jun 2022 23:33:11 -0500
Subject: [PATCH 031/309] newcards

---
 .../res/cardsfolder/upcoming/breath_weapon.txt      |  5 +++++
 .../cardsfolder/upcoming/burakos_party_leader.txt   | 13 +++++++++++++
 .../cardsfolder/upcoming/cloakwood_swarmkeeper.txt  |  9 +++++++++
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 13 +++++++++++++
 .../res/cardsfolder/upcoming/displacer_kitten.txt   | 10 ++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/breath_weapon.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/breath_weapon.txt b/forge-gui/res/cardsfolder/upcoming/breath_weapon.txt
new file mode 100644
index 00000000000..578a6782679
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/breath_weapon.txt
@@ -0,0 +1,5 @@
+Name:Breath Weapon
+ManaCost:2 R
+Types:Instant
+A:SP$ DamageAll | NumDmg$ 2 | ValidCards$ Creature.nonDragon | SpellDescription$ CARDNAME deals 2 damage to each non-Dragon creature. 
+Oracle:Breath Weapon deals 2 damage to each non-Dragon creature.
diff --git a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
new file mode 100644
index 00000000000..d64d0f0bccb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
@@ -0,0 +1,13 @@
+Name:Burakos, Party Leader
+ManaCost:3 B
+Types:Creature Orc
+PT:2/4
+K:Choose a Background
+S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ Cleric & Rogue & Warrior & Wizard | Description$ CARDNAME is also a Cleric, Rogue, Warrior, and Wizard.
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME attacks, defending player loses X life
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredDefendingPlayer | LifeAmount$ X | SubAbility$ DBTreasureTokens
+SVar:DBTreasureTokens:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac | TokenOwner$ You | Description$  and you create X Treasure tokens, where X is the number of creatures in your party.
+SVar:X:Count$Party
+DeckHints:Ability$Party & Type$Cleric|Rogue|Warrior|Wizard
+SVar:PlayMain1:TRUE
+Oracle:Burakos, Party Leader is also a Cleric, Rogue, Warrior, and Wizard.\nWhenever Burakos attacks, defending player loses X life and you create X Treasure tokens, where X is the number of creatures in your party.\nChoose a Background
diff --git a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
new file mode 100644
index 00000000000..32ecdf7aeb5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
@@ -0,0 +1,9 @@
+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 enter the battlefield under your control, 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 enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.
diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
new file mode 100644
index 00000000000..2017177db54
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -0,0 +1,13 @@
+Name:Cone of Cold
+ManaCost:3 U
+Types:Sorcery
+A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TapAll,10-19:TapAndLock,20:TapLock2 | SpellDescription$ Roll a d20.
+SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1�9 VERT Tap all creatures your opponents control.
+SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10�19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
+SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | SubAbility$ TapAndLock
+SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+Oracle:Roll a d20.\n1�9 | Tap all creatures you opponents control.\n10�19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
new file mode 100644
index 00000000000..a7d05a3ea93
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
@@ -0,0 +1,10 @@
+Name:Displacer Kitten
+ManaCost:3 U
+Types:Creature Cat Beast
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
+SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:BuffedBy:Card.nonCreature
+Oracle:Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.

From e01e9d35591aadb9de7c1be69c67e1af9cb1a538 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:02:52 -0500
Subject: [PATCH 032/309] Update cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index 2017177db54..be7b53d7ecd 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -2,12 +2,12 @@ Name:Cone of Cold
 ManaCost:3 U
 Types:Sorcery
 A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TapAll,10-19:TapAndLock,20:TapLock2 | SpellDescription$ Roll a d20.
-SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1�9 VERT Tap all creatures your opponents control.
-SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10�19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1=9 VERT Tap all creatures your opponents control.
+SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10-19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
 SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
 SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | SubAbility$ TapAndLock
 SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
-Oracle:Roll a d20.\n1�9 | Tap all creatures you opponents control.\n10�19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+Oracle:Roll a d20.\n1-9 | Tap all creatures you opponents control.\n10-19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From 9ee2b5655b1dd1546793ca483e02f05532007c9c Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:38:21 -0500
Subject: [PATCH 033/309] Delete cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
deleted file mode 100644
index be7b53d7ecd..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Name:Cone of Cold
-ManaCost:3 U
-Types:Sorcery
-A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TapAll,10-19:TapAndLock,20:TapLock2 | SpellDescription$ Roll a d20.
-SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1=9 VERT Tap all creatures your opponents control.
-SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10-19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
-SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
-SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
-SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
-SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | SubAbility$ TapAndLock
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
-Oracle:Roll a d20.\n1-9 | Tap all creatures you opponents control.\n10-19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From a46377680bda728dcc710b051593f9d1611389ad Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:40:09 -0500
Subject: [PATCH 034/309] Delete cloakwood_swarmkeeper.txt

---
 .../res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt   | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
deleted file mode 100644
index 32ecdf7aeb5..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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 enter the battlefield under your control, 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 enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.

From dd86d16b002e7e8cfe66b3ada3b3e197fd39d5e6 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:40:43 -0500
Subject: [PATCH 035/309] Delete displacer_kitten.txt

---
 .../res/cardsfolder/upcoming/displacer_kitten.txt      | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
deleted file mode 100644
index a7d05a3ea93..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Name:Displacer Kitten
-ManaCost:3 U
-Types:Creature Cat Beast
-PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
-SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:BuffedBy:Card.nonCreature
-Oracle:Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.

From e6a4ee7c202029614e16d45c599ba3b21f7da401 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Tue, 21 Jun 2022 01:41:20 -0500
Subject: [PATCH 036/309] updatedunicode

---
 forge-gui/res/cardsfolder/upcoming/balor.txt     | 16 ++++++++++++++++
 .../upcoming/cloakwood_swarmkeeper.txt           |  6 +++---
 .../res/cardsfolder/upcoming/cone_of_cold.txt    |  8 ++++----
 .../cardsfolder/upcoming/displacer_kitten.txt    |  8 ++++----
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/balor.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/balor.txt b/forge-gui/res/cardsfolder/upcoming/balor.txt
new file mode 100644
index 00000000000..79f894645dc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/balor.txt
@@ -0,0 +1,16 @@
+Name:Balor
+ManaCost:3 R R
+Types:Creature Demon
+PT:5/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
+SVar:TrigChoose:DB$ Charm | MinCharmNum$ 1 | CharmNum$ MaxUniqueOpponents | Choices$ TrigDrawDiscard,TrigSacrifice,TrigPump | AdditionalDescription$ choose one or more. Each mode must target a different player.
+SVar:TrigDrawDiscard:DB$ Draw | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 3 | SubAbility$ Discard3 | SpellDescription$ Target opponent draws three cards, then discards three cards at random.
+SVar:Discard3:DB$ Discard | Defined$ Targeted | Mode$ Random | NumCards$ 3
+SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
+SVar:TrigPump:DB$ Pump | ValidTgts$ Opponent | TargetUnique$ True | Remember$ True | SubAbility$ DBDmg
+SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target opponent equal to the number of cards in their hand. | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$ValidHand Card.RememberedPlayerCtrl
+SVar:NeedsToPlay:Artifact.OppCtrl
+Oracle:When Balor attacks or dies, choose one or more. Each mode must target a different player.\n• Target opponent draws three cards, then discards three cards at random.\n• Target opponent sacrifices a nontoken artifact.\n• Balor deals damage to target opponent equal to the number of cards in their hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
index 32ecdf7aeb5..80853eb3337 100644
--- a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
@@ -1,9 +1,9 @@
-Name:Cloakwood Swarmkeeper
+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 enter the battlefield under your control, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZoneAll | ValidCards$ Card.token+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigPutcounter | TriggerDescription$ Gathered Swarm — Whenever one or more tokens enter the battlefield under your control, 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 enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.
+Oracle:Gathered Swarm — Whenever one or more tokens enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.
diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index 2017177db54..e6d002353e3 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -1,13 +1,13 @@
-Name:Cone of Cold
+Name:Cone of Cold
 ManaCost:3 U
 Types:Sorcery
 A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TapAll,10-19:TapAndLock,20:TapLock2 | SpellDescription$ Roll a d20.
-SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1�9 VERT Tap all creatures your opponents control.
-SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10�19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Tap all creatures your opponents control.
+SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10—19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
 SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
 SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | SubAbility$ TapAndLock
 SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
-Oracle:Roll a d20.\n1�9 | Tap all creatures you opponents control.\n10�19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
index a7d05a3ea93..8b5f185389d 100644
--- a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
+++ b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
@@ -1,10 +1,10 @@
-Name:Displacer Kitten
+Name:Displacer Kitten
 ManaCost:3 U
 Types:Creature Cat Beast
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
-SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance = Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Card.nonCreature
-Oracle:Avoidance � Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner�s control.
+Oracle:Avoidance - Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.

From aaea3c7370123a910c8fb7d266f153735514de9f Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 01:46:44 -0500
Subject: [PATCH 037/309] Update burakos_party_leader.txt

---
 forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
index d64d0f0bccb..4af47605213 100644
--- a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
@@ -10,4 +10,5 @@ SVar:DBTreasureTokens:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac
 SVar:X:Count$Party
 DeckHints:Ability$Party & Type$Cleric|Rogue|Warrior|Wizard
 SVar:PlayMain1:TRUE
+DeckHas:Ability$Token|Sacrifice & Type$Cleric|Rogue|Warrior|Wizard|Treasure|Artifact
 Oracle:Burakos, Party Leader is also a Cleric, Rogue, Warrior, and Wizard.\nWhenever Burakos attacks, defending player loses X life and you create X Treasure tokens, where X is the number of creatures in your party.\nChoose a Background

From 373702d1a5bceccc752d41ee7ee8be066f5fd150 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 02:50:42 -0500
Subject: [PATCH 038/309] Update cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index e6d002353e3..3ae92c3b2f2 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -8,6 +8,6 @@ SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card
 SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
-SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ActiveZones$ Battlefield | SubAbility$ TapAndLock
-SVar:ETBTapped:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Tapped$ True | Defined$ ReplacedCard
+SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | SubAbility$ TapAndLock
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From a8aa75304bf09995d8bf5abe3d4ce9620b7ce0c8 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Tue, 21 Jun 2022 11:58:23 +0200
Subject: [PATCH 039/309] CardType: better handling for multiword types (#720)

---
 .../src/main/java/forge/card/CardType.java    | 21 ++++++++-----------
 .../game/ability/effects/VentureEffect.java   | 16 ++++++++------
 .../res/cardsfolder/upcoming/undercity.txt    |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index b22f2b1f9d0..6082b5f8000 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -51,6 +51,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
     private static final long serialVersionUID = 4629853583167022151L;
 
     public static final CardTypeView EMPTY = new CardType(false);
+    private static final Set<String> multiWordTypes = ImmutableSet.of("Serra's Realm", "Bolas's Meditation Realm", "Dungeon Master");
 
     public enum CoreType {
         Artifact(true, "artifacts"),
@@ -752,12 +753,14 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
         while (hasMoreTypes) {
             final String type = typeText.substring(iTypeStart, iSpace == -1 ? typeText.length() : iSpace);
             hasMoreTypes = iSpace != -1;
-            if (!isMultiwordType(type) || !hasMoreTypes) {
-                iTypeStart = iSpace + 1;
-                if (!"-".equals(type)) {
-                    result.add(type);
-                }
+            final String rest = typeText.substring(iTypeStart);
+            if (isMultiwordType(rest)) {
+                result.add(rest);
+                break;
             }
+
+            iTypeStart = iSpace + 1;
+            result.add(type);
             iSpace = typeText.indexOf(space, iSpace + 1);
         }
         return result;
@@ -775,13 +778,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
     }
 
     private static boolean isMultiwordType(final String type) {
-        final String[] multiWordTypes = { "Serra's Realm", "Bolas's Meditation Realm", "Dungeon Master" };
-        for (int i = 0; i < multiWordTypes.length; ++i) {
-            if (multiWordTypes[i].startsWith(type) && !multiWordTypes[i].equals(type)) {
-                return true;
-            }
-        }
-        return false;
+        return multiWordTypes.contains(type);
     }
 
     public static class Constant {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java b/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java
index dece7177118..239576a109c 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java
@@ -24,6 +24,7 @@ import forge.game.trigger.WrappedAbility;
 import forge.game.zone.ZoneType;
 import forge.item.PaperCard;
 import forge.util.Localizer;
+import forge.util.PredicateString.StringOp;
 
 public class VentureEffect  extends SpellAbilityEffect {
 
@@ -42,18 +43,21 @@ public class VentureEffect  extends SpellAbilityEffect {
             }
         }
 
-        Card dungeon = null;
+        List<PaperCard> dungeonCards = null;
         if (sa.hasParam("Dungeon")) {
-            dungeon = Card.fromPaperCard(StaticData.instance().getVariantCards().getUniqueByName(
-                    sa.getParam("Dungeon")), player);
+            dungeonCards = StaticData.instance().getVariantCards()
+                    .getAllCards(Predicates.compose(
+                            Predicates.and(CardRulesPredicates.Presets.IS_DUNGEON,
+                                    CardRulesPredicates.subType(StringOp.EQUALS, sa.getParam("Dungeon"))),
+                            PaperCard.FN_GET_RULES));
         } else {
             // Create a new dungeon card chosen by player in command zone.
-            List<PaperCard> dungeonCards = StaticData.instance().getVariantCards().getAllCards(
+            dungeonCards = StaticData.instance().getVariantCards().getAllCards(
                 Predicates.compose(CardRulesPredicates.Presets.IS_DUNGEON, PaperCard.FN_GET_RULES));
             dungeonCards.removeIf(c -> !c.getRules().isEnterableDungeon());
-            String message = Localizer.getInstance().getMessage("lblChooseDungeon");
-            dungeon = player.getController().chooseDungeon(player, dungeonCards, message);
         }
+        String message = Localizer.getInstance().getMessage("lblChooseDungeon");
+        Card dungeon = player.getController().chooseDungeon(player, dungeonCards, message);
 
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
         game.getAction().moveTo(ZoneType.Command, dungeon, sa, moveParams);
diff --git a/forge-gui/res/cardsfolder/upcoming/undercity.txt b/forge-gui/res/cardsfolder/upcoming/undercity.txt
index 33fe77ce887..1238bda1ea1 100644
--- a/forge-gui/res/cardsfolder/upcoming/undercity.txt
+++ b/forge-gui/res/cardsfolder/upcoming/undercity.txt
@@ -1,6 +1,6 @@
 Name:Undercity
 ManaCost:no cost
-Types:Dungeon
+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.

From f59877db1719bfafd95246c33b8e6c363cc6fd16 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 05:26:23 -0500
Subject: [PATCH 040/309] Update balor.txt

---
 forge-gui/res/cardsfolder/upcoming/balor.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/balor.txt b/forge-gui/res/cardsfolder/upcoming/balor.txt
index 79f894645dc..226c92bbd42 100644
--- a/forge-gui/res/cardsfolder/upcoming/balor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/balor.txt
@@ -6,7 +6,7 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescriptio
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
 SVar:TrigChoose:DB$ Charm | MinCharmNum$ 1 | CharmNum$ MaxUniqueOpponents | Choices$ TrigDrawDiscard,TrigSacrifice,TrigPump | AdditionalDescription$ choose one or more. Each mode must target a different player.
 SVar:TrigDrawDiscard:DB$ Draw | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 3 | SubAbility$ Discard3 | SpellDescription$ Target opponent draws three cards, then discards three cards at random.
-SVar:Discard3:DB$ Discard | Defined$ Targeted | Mode$ Random | NumCards$ 3
+SVar:Discard3:DB$ Discard | Defined$ ParentTarget | Mode$ Random | NumCards$ 3
 SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
 SVar:TrigPump:DB$ Pump | ValidTgts$ Opponent | TargetUnique$ True | Remember$ True | SubAbility$ DBDmg
 SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target opponent equal to the number of cards in their hand. | SubAbility$ DBCleanup

From 8228f39178f16b6d7859000f54f1c6495fa1d66c Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 05:53:47 -0500
Subject: [PATCH 041/309] Update cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index 3ae92c3b2f2..321c6629917 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -7,7 +7,7 @@ SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUnta
 SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
 SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
-SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | SubAbility$ TapAndLock
-SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
+SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard | SubAbility$ TapAndLock
 Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From eb0b4abc36e0a86ff53fd0c5c5c15b4a18847102 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 06:12:20 -0500
Subject: [PATCH 042/309] Update displacer_kitten.txt

---
 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
index 8b5f185389d..ce01b3df342 100644
--- a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
+++ b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
@@ -2,7 +2,7 @@
 ManaCost:3 U
 Types:Creature Cat Beast
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance = Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance - Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
 SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

From bdcef57b5793e9bc9d1d9673c1d1fce0417fbb69 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 14:47:52 -0500
Subject: [PATCH 043/309] Update displacer_kitten.txt

---
 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
index ce01b3df342..4e6a7ff51a3 100644
--- a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
+++ b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
@@ -2,9 +2,9 @@
 ManaCost:3 U
 Types:Creature Cat Beast
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance - Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
 SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:BuffedBy:Card.nonCreature
-Oracle:Avoidance - Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+Oracle:Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.

From 61dc950afb81cf96d11430dd6777f6cd2a2de386 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 14:51:50 -0500
Subject: [PATCH 044/309] Delete displacer_kitten.txt

---
 .../res/cardsfolder/upcoming/displacer_kitten.txt      | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
deleted file mode 100644
index 4e6a7ff51a3..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Name:Displacer Kitten
-ManaCost:3 U
-Types:Creature Cat Beast
-PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
-SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:BuffedBy:Card.nonCreature
-Oracle:Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.

From 3c60eaa5e48dc68f655b2ad0e424c222b1735a3f Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:43:18 -0500
Subject: [PATCH 045/309] Delete cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
deleted file mode 100644
index 321c6629917..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Name:Cone of Cold
-ManaCost:3 U
-Types:Sorcery
-A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TapAll,10-19:TapAndLock,20:TapLock2 | SpellDescription$ Roll a d20.
-SVar:TapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Tap all creatures your opponents control.
-SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10—19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
-SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
-SVar:TapLock2:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap2 | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
-SVar:NoUntap2:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
-SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated
-SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard | SubAbility$ TapAndLock
-Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From 080abe6b4915986fd01685a190cd8f30a81b5ebb Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:44:03 -0500
Subject: [PATCH 046/309] Delete balor.txt

---
 forge-gui/res/cardsfolder/upcoming/balor.txt | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/balor.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/balor.txt b/forge-gui/res/cardsfolder/upcoming/balor.txt
deleted file mode 100644
index 226c92bbd42..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/balor.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Name:Balor
-ManaCost:3 R R
-Types:Creature Demon
-PT:5/5
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
-SVar:TrigChoose:DB$ Charm | MinCharmNum$ 1 | CharmNum$ MaxUniqueOpponents | Choices$ TrigDrawDiscard,TrigSacrifice,TrigPump | AdditionalDescription$ choose one or more. Each mode must target a different player.
-SVar:TrigDrawDiscard:DB$ Draw | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 3 | SubAbility$ Discard3 | SpellDescription$ Target opponent draws three cards, then discards three cards at random.
-SVar:Discard3:DB$ Discard | Defined$ ParentTarget | Mode$ Random | NumCards$ 3
-SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
-SVar:TrigPump:DB$ Pump | ValidTgts$ Opponent | TargetUnique$ True | Remember$ True | SubAbility$ DBDmg
-SVar:DBDmg:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target opponent equal to the number of cards in their hand. | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$ValidHand Card.RememberedPlayerCtrl
-SVar:NeedsToPlay:Artifact.OppCtrl
-Oracle:When Balor attacks or dies, choose one or more. Each mode must target a different player.\n• Target opponent draws three cards, then discards three cards at random.\n• Target opponent sacrifices a nontoken artifact.\n• Balor deals damage to target opponent equal to the number of cards in their hand.

From fb80967e07b3f81359767b8115e33b8a2152fa7f Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 21 Jun 2022 16:46:55 -0500
Subject: [PATCH 047/309] Delete cloakwood_swarmkeeper.txt

---
 .../res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt   | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
deleted file mode 100644
index 80853eb3337..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-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 enter the battlefield under your control, 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 enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.

From b3d6f8a2af2c0bf1689fb81c593b2ed51c501cd5 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Wed, 22 Jun 2022 08:19:47 +0200
Subject: [PATCH 048/309] Fix Feather, the Redeemed and some others

---
 forge-game/src/main/java/forge/game/card/Card.java    |  2 +-
 .../main/java/forge/game/card/CardFactoryUtil.java    | 11 +++++------
 forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt |  3 +--
 forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt     |  3 +--
 forge-gui/res/cardsfolder/d/dodecapod.txt             |  3 +--
 forge-gui/res/cardsfolder/d/draugr_necromancer.txt    |  3 +--
 forge-gui/res/cardsfolder/f/feather_the_redeemed.txt  |  7 +++----
 forge-gui/res/cardsfolder/k/kor_haven.txt             |  2 +-
 forge-gui/res/cardsfolder/s/spell_queller.txt         |  2 +-
 .../res/cardsfolder/upcoming/ravenloft_adventurer.txt |  5 +++--
 10 files changed, 18 insertions(+), 23 deletions(-)

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 7c1975016e1..7b2390b7a00 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -503,7 +503,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
             if (game != null) {
                 // update Type, color and keywords again if they have changed
                 if (!changedCardTypes.isEmpty()) {
-                    updateTypesForView();;
+                    updateTypesForView();
                 }
                 updateColorForView();
 
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 6ab7afbd927..673af59f78f 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1680,7 +1680,7 @@ public class CardFactoryUtil {
 
             final String abString = "DB$ PeekAndReveal | PeekAmount$ " + num + " | RememberRevealed$ True";
 
-            final String dbCast = "DB$ Play | Valid$ Card.IsRemembered+sameName | " +
+            final String dbCast = "DB$ Play | Valid$ Card.IsRemembered+sameName | ValidSA$ Spell | " +
                     "ValidZone$ Library | WithoutManaCost$ True | Optional$ True | " +
                     "Amount$ All";
 
@@ -1893,7 +1893,7 @@ public class CardFactoryUtil {
             String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | " +
                     "TriggerDescription$ " + sb.toString();
 
-            String effect = "DB$ Sacrifice | SacValid$ Self | UnlessPayer$ You | UnlessCost$ " + k[1];
+            String effect = "DB$ SacrificeAll | Defined$ Self | Controller$ You | UnlessPayer$ You | UnlessCost$ " + k[1];
 
             final Trigger parsedTrigger = TriggerHandler.parseTrigger(upkeepTrig, card, intrinsic);
             parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
@@ -2323,12 +2323,11 @@ public class CardFactoryUtil {
             + " | Origin$ Stack | Destination$ Graveyard | Fizzle$ False "
             + " | Description$ Rebound (" + inst.getReminderText() + ")";
 
-            String abExile = "DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile";
+            String abExile = "DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile | RememberChanged$ True";
             String delTrig = "DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You " +
-            " | OptionalDecider$ You | RememberObjects$ ReplacedCard | TriggerDescription$"
+            " | OptionalDecider$ You | RememberObjects$ Remembered | TriggerDescription$"
             + " At the beginning of your next upkeep, you may cast " + card.toString() + " without paying its mana cost.";
-            // TODO add check for still in exile
-            String abPlay = "DB$ Play | Defined$ DelayTriggerRemembered | WithoutManaCost$ True | Optional$ True";
+            String abPlay = "DB$ Play | Defined$ DelayTriggerRememberedLKI | WithoutManaCost$ True | Optional$ True";
 
             SpellAbility saExile = AbilityFactory.getAbility(abExile, card);
 
diff --git a/forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt b/forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt
index 6f84b323efa..acf6cf582fc 100644
--- a/forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt
+++ b/forge-gui/res/cardsfolder/d/darigaaz_reincarnated.txt
@@ -6,8 +6,7 @@ K:Flying
 K:Trample
 K:Haste
 R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | ReplaceWith$ Exile | Description$ If CARDNAME would die, instead exile it with three egg counters on it.
-SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBAddCounter | Defined$ ReplacedCard
-SVar:DBAddCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ EGG | CounterNum$ 3
+SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard | WithCountersType$ EGG | WithCountersAmount$ 3
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Exile | IsPresent$ Card.Self+counters_GE1_EGG | PresentZone$ Exile | Execute$ DBRemoveCounter | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is exiled with an egg counter on it, remove an egg counter from it. Then if CARDNAME has no egg counters on it, return it to the battlefield.
 SVar:DBRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ EGG | CounterNum$ 1 | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Exile | Destination$ Battlefield | ConditionDefined$ Self | ConditionPresent$ Card.counters_EQ0_EGG
diff --git a/forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt b/forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt
index 6f5433e98ea..df68f87791e 100644
--- a/forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt
+++ b/forge-gui/res/cardsfolder/d/dauthi_voidwalker.txt
@@ -4,8 +4,7 @@ Types:Creature Dauthi Rogue
 PT:3/2
 K:Shadow
 R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.nonToken+OppOwn | ReplaceWith$ Exile | Description$ If a card would be put into an opponent's graveyard from anywhere, instead exile it with a void counter on it.
-SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ VOID | CounterNum$ 1
+SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard | WithCountersType$ VOID
 A:AB$ ChooseCard | Cost$ T Sac<1/CARDNAME> | Defined$ You | AILogic$ AtLeast1 | Amount$ 1 | Mandatory$ True | ChoiceTitle$ Choose an exiled card an opponent owns with a void counter on it | Choices$ Card.OppOwn+counters_GE1_VOID | ChoiceZone$ Exile | RememberChosen$ True | SubAbility$ DBEffect | SpellDescription$ Choose an exiled card an opponent owns with a void counter on it. You may play it this turn without paying its mana cost.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ MayPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:MayPlay:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until end of turn, you may play this card without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/d/dodecapod.txt b/forge-gui/res/cardsfolder/d/dodecapod.txt
index a217e5bf007..a594fb330e7 100644
--- a/forge-gui/res/cardsfolder/d/dodecapod.txt
+++ b/forge-gui/res/cardsfolder/d/dodecapod.txt
@@ -3,7 +3,6 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:3/3
 R:Event$ Discard | ActiveZones$ Hand | ValidCard$ Card.Self | ValidSource$ Card.OppCtrl | ReplaceWith$ SurpriseETB | DiscardFromEffect$ True | Description$ If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield with two +1/+1 counters on it instead of putting it into your graveyard.
-SVar:SurpriseETB:DB$ ChangeZone | DefinedPlayer$ ReplacedPlayer | Defined$ ReplacedCard | Origin$ Hand | Destination$ Battlefield | SubAbility$ TwiceTheSurprise
-SVar:TwiceTheSurprise:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 2
+SVar:SurpriseETB:DB$ ChangeZone | DefinedPlayer$ ReplacedPlayer | Defined$ ReplacedCard | Origin$ Hand | Destination$ Battlefield | WithCountersType$ P1P1 | WithCountersAmount$ 2
 SVar:DiscardMeByOpp:3
 Oracle:If a spell or ability an opponent controls causes you to discard Dodecapod, put it onto the battlefield with two +1/+1 counters on it instead of putting it into your graveyard.
diff --git a/forge-gui/res/cardsfolder/d/draugr_necromancer.txt b/forge-gui/res/cardsfolder/d/draugr_necromancer.txt
index 391a6384db8..61ebdb00a72 100644
--- a/forge-gui/res/cardsfolder/d/draugr_necromancer.txt
+++ b/forge-gui/res/cardsfolder/d/draugr_necromancer.txt
@@ -3,8 +3,7 @@ ManaCost:3 B
 Types:Snow Creature Zombie Cleric
 PT:4/4
 R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.nonToken+OppCtrl | ReplaceWith$ Exile | CheckSelfLKIZone$ True | Description$ If a nontoken creature an opponent controls would die, exile that card with an ice counter on it instead.
-SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ ICE | CounterNum$ 1
+SVar:Exile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ReplacedCard | WithCountersType$ ICE
 S:Mode$ Continuous | Affected$ Card.OppOwn+counters_GE1_ICE+nonLand | AffectedZone$ Exile | MayPlay$ True | MayPlaySnowIgnoreColor$ True | Description$ You may cast spells from among cards in exile your opponents own with ice counters on them, and you may spend mana from snow sources as though it were mana of any color to cast those spells.
 DeckNeeds:Type$Snow
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/f/feather_the_redeemed.txt b/forge-gui/res/cardsfolder/f/feather_the_redeemed.txt
index b0c2a966373..66c955809d7 100644
--- a/forge-gui/res/cardsfolder/f/feather_the_redeemed.txt
+++ b/forge-gui/res/cardsfolder/f/feather_the_redeemed.txt
@@ -4,10 +4,9 @@ Types:Legendary Creature Angel
 PT:3/4
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | ValidActivatingPlayer$ You | TargetsValid$ Creature.YouCtrl+inZoneBattlefield | Execute$ DelayedBuyback | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell that targets a creature you control, exile that card instead of putting it into your graveyard as it resolves. If you do, return it to your hand at the beginning of the next end step.
-SVar:DelayedBuyback:DB$ Effect | ReplacementEffects$ MoveToExileReplace | RememberObjects$ TriggeredCard | SpellDescription$ Put that card into your hand instead of into your graveyard as it resolves.
+SVar:DelayedBuyback:DB$ Effect | ReplacementEffects$ MoveToExileReplace | RememberObjects$ TriggeredCard | ConditionDefined$ TriggeredCard | ConditionPresent$ Card.inZoneStack | ExileOnMoved$ Stack | SpellDescription$ Put that card into your hand instead of into your graveyard as it resolves.
 SVar:MoveToExileReplace:Event$ Moved | ValidCard$ Card.IsRemembered+YouOwn | Origin$ Stack | Destination$ Graveyard | Fizzle$ False | ReplaceWith$ ReplaceExile | Description$ Exile that card instead of putting it into your graveyard as it resolves. If you do, return it to your hand at the beginning of the next end step.
-SVar:ReplaceExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile | SubAbility$ DelTrig
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ ReplacedCard | SubAbility$ ExileSelf | TriggerDescription$ If you do, return it to your hand at the beginning of the next end step.
+SVar:ReplaceExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile | RememberChanged$ True | SubAbility$ DelTrig
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | TriggerDescription$ If you do, return it to your hand at the beginning of the next end step.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Hand
-SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 Oracle:Flying\nWhenever you cast an instant or sorcery spell that targets a creature you control, exile that card instead of putting it into your graveyard as it resolves. If you do, return it to your hand at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/k/kor_haven.txt b/forge-gui/res/cardsfolder/k/kor_haven.txt
index 2e489712663..4dd8e250ff1 100644
--- a/forge-gui/res/cardsfolder/k/kor_haven.txt
+++ b/forge-gui/res/cardsfolder/k/kor_haven.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Effect | Cost$ 1 W T | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | SpellDescription$ Prevent all combat damage that would be dealt by target attacking creature this turn.
-SVar:RPrevent1:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt by target attacking creature this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt by target attacking creature this turn.
 DeckNeeds:Color$White
 Oracle:{T}: Add {C}.\n{1}{W}, {T}: Prevent all combat damage that would be dealt by target attacking creature this turn.
diff --git a/forge-gui/res/cardsfolder/s/spell_queller.txt b/forge-gui/res/cardsfolder/s/spell_queller.txt
index d03c0fb7c49..b688e5a5475 100644
--- a/forge-gui/res/cardsfolder/s/spell_queller.txt
+++ b/forge-gui/res/cardsfolder/s/spell_queller.txt
@@ -8,7 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When Spell Queller leaves the battlefield, the exiled card's owner may cast that card without paying its mana cost.
 SVar:TrigExile:DB$ ChangeZone | TargetType$ Spell | ValidTgts$ Card.cmcLE4 | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Mandatory$ True | Destination$ Exile | IsCurse$ True | TgtPrompt$ Choose target spell with mana value 4 or less | RememberChanged$ True
 SVar:TrigPlay:DB$ Play | Defined$ Remembered.ExiledWithSource | Controller$ RememberedOwner | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
-T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered+ExiledWithSource | Execute$ DBForget
+T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered+ExiledWithSource | ValidSA$ Spell | Execute$ DBForget
 SVar:DBForget:DB$ Pump | ForgetObjects$ TriggeredCard
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
diff --git a/forge-gui/res/cardsfolder/upcoming/ravenloft_adventurer.txt b/forge-gui/res/cardsfolder/upcoming/ravenloft_adventurer.txt
index 2a3eab07c11..2b91d8efd86 100644
--- a/forge-gui/res/cardsfolder/upcoming/ravenloft_adventurer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ravenloft_adventurer.txt
@@ -5,8 +5,9 @@ PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInitiative | TriggerDescription$ When CARDNAME enters the battlefield, you take the initiative.
 SVar:TrigInitiative:DB$ TakeInitiative
 R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Creature.OppCtrl | ReplaceWith$ Exile | Description$ If a creature an opponent controls would die, instead exile it and put a hit counter on it.
-SVar:Exile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ HIT
+SVar:Exile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered | CounterType$ HIT | SubAbility$ DBCleanup
+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

From 1b10dc344cf868088c43c49cc119fa9e825a04ed Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Wed, 22 Jun 2022 17:34:17 +0100
Subject: [PATCH 049/309] 2X2 edition update

---
 .../res/editions/Double Masters 2022.txt      | 145 +++++++++++++++++-
 1 file changed, 142 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index cb172d8895a..56562e253a1 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -6,12 +6,15 @@ Type=Reprint
 ScryfallCode=2X2
 
 [cards]
+1 M Emrakul, the Aeons Torn @Mark Tedin
 2 M Kozilek, Butcher of Truth @Michael Komarck
 3 M Ulamog, the Infinite Gyre @Aleksi Briclot
+4 U Abzan Falconer @Steven Belledin
 5 C Ainok Bond-Kin @Chris Rahn
 8 M Divine Visitation @Victor Adame Minguez
 9 C Doomed Traveler @Lars Grant-West
 12 C Gods Willing @Mark Winters
+18 R Mikaeus, the Lunarch @Steven Belledin
 20 C Momentary Blink @Evan Shipard
 22 U Myth Realized @Jason Rainville
 23 U Path to Exile @Raf Sarmento
@@ -22,13 +25,19 @@ ScryfallCode=2X2
 35 C Wingsteed Rider @Cynthia Sheppard
 36 C Advanced Stitchwing @Johann Bodin
 37 C Aethersnipe @Zoltan Boros & Gabor Szikszai
+38 M As Foretold @Tommy Arnold
+40 U Body Double @Winona Nelson
 43 M Consecrated Sphinx @Mark Zug
 44 C Deep Analysis @Jesper Ejsing
 47 U Domestication @Jesper Ejsing
+50 R Force of Negation @Paul Scott Canavan
 51 R Gifts Ungiven @Chris Rallis
 52 C Ingenious Skaab @Jesper Ejsing
 55 R Kederekt Leviathan @Mark Hyzer
+57 M Mana Drain @Raymond Swanland
+59 U Mistfire Adept @Clint Cearley
 60 U Mulldrifter @Eric Fortune
+62 R Pull from Tomorrow @Sara Winters
 65 C Thought Scour @Julie Dillon
 66 R Venser, Shaper Savant @Aleksi Briclot
 67 U Wash Out @Steven Belledin
@@ -40,51 +49,82 @@ ScryfallCode=2X2
 79 M Imperial Seal @Milivoj Ćeran
 80 U Inquisition of Kozilek @Tomasz Jedruszek
 81 M Liliana, the Last Hope @Jaime Jones
+83 R Necrotic Ooze @James Ryman
 85 R Oona's Prowler @Wayne Reynolds
 87 C Seekers' Squire @Anthony Palumbo
 96 C Unearth @Jehan Choo
 97 C Vampire Sovereign @Volkan Baǵa
+99 R Yahenni, Undying Partisan @Lius Lasahido
 102 R Anger of the Gods @Yigit Koroglu
 103 R Backdraft Hellkite @Rudy Siswanto
+104 R Bedlam Reveler @Jama Jurabaev
+105 R Chaos Warp @Trevor Claxton
 106 C Dark-Dweller Oracle @Deruchenko Alexander
 107 M Dockside Extortionist @Lie Setiawan
 108 U Dreamshaper Shaman @Steve Prescott
+111 R Greater Gargadon @Rob Alexander
 112 C Hero of the Games @Josh Hass
+115 U Labyrinth Champion @Chase Stone
 117 U Lightning Bolt @Christopher Moeller
 120 C Pirate's Pillage @Wayne Reynolds
 122 C Rift Bolt @Daniel Ljunggren
 123 M Seasoned Pyromancer @Cynthia Sheppard
 126 C Storm Fleet Pyromancer @Kieran Yanner
+127 U Surreal Memoir @Jaime Jones
 132 M Allosaurus Shepherd @Randy Vargas
 134 C Annoyed Altisaur @Lars Grant-West
+135 U Arachnus Spinner @Karl Kopinski
+136 C Arachnus Web @Karl Kopinski
 138 R Bloom Tender @Chippy
 139 C Brindle Shoat @Steven Belledin
 140 U Centaur Battlemaster @Kev Walker
+143 U Devoted Druid @Kimonas Theodossiou
 144 C Elvish Rejuvenator @Winona Nelson
+145 U Eternal Witness @Chris Rahn
 146 C Experiment One @Jack Wang
 148 C Gnarlback Rhino @YW Tang
+150 R Green Sun's Zenith @David Rapoza
 151 R Hardened Scales @Mark Winters
+152 R Impervious Greatwurm @Simon Dominic
+154 R Oracle of Mul Daya @Vance Kovacs
 155 C Rampant Growth @Scott M. Fischer
+157 R Rishkar, Peema Renegade @Todd Lockwood
 158 U Spider Spawning @Daniel Ljunggren
 159 R Splinterfright @Eric Deschamps
 161 C Thrive @Daren Bader
+162 U Travel Preparations @Vincent Proce
 163 C Tuskguard Captain @Aaron Miller
 164 C Webweaver Changeling @Nicholas Gregory
 165 R Abzan Ascendancy @Mark Winters
+166 U Abzan Charm @Mathias Kollros
 169 M Aminatou, the Fateshifter @Seb McKinnon
 170 R Anguished Unmaking @Wesley Burt
+171 M Animar, Soul of Elements @Filip Burburan
+172 R Arjun, the Shifting Flame @Willian Murai
 174 R Ashenmoor Liege @Mark Zug
+176 R Atarka's Command @Chris Rahn
 177 R Atla Palani, Nest Tender @Ekaterina Burmak
+181 U Bant Charm @Randy Gallegos
+182 U Bear's Companion @Winona Nelson
+183 U Blazing Hellhound @Eric Velhagen
 185 C Bloodwater Entity @Viktor Titov
 186 R Boartusk Liege @Jesper Ejsing
 187 U Bounty of the Luxa @Jonas De Ro
 188 R Bring to Light @Jonas De Ro
 191 C Cartel Aristocrat @James Ryman
+192 R Child of Alara @Steve Argyle
 193 C Chronicler of Heroes @John Stanko
+195 U Conclave Mentor @Raoul Vitale
+196 U Crackling Doom @Yohann Schepacz
+197 R Creakwood Liege @Cole Eastburn
 198 R Dack's Duplicate @Karl Kopinski
+199 R Dauntless Escort @Volkan Baǵa
 202 M Dragonlord Dromoka @Eric Deschamps
 204 C Dreg Mangler @Svetlin Velinov
+205 R Drogskol Reaver @Vincent Proce
 206 R Dromoka's Command @James Ryman
+207 M Elenda, the Dusk Rose @Chris Rahn
+209 R Empyrial Archangel @Greg Staples
 211 M Ezuri, Claw of Progress @James Ryman
 212 R Fiery Justice @Mathias Kollros
 214 C Fireblade Artist @Steve Argyle
@@ -93,28 +133,61 @@ ScryfallCode=2X2
 218 R Glimpse the Unthinkable @Brandon Kitkouski
 219 U Gloryscale Viashino @Volkan Baǵa
 221 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
+222 R Grim Flayer @Mathias Kollros
+224 R Guided Passage @Alex Horley-Orlandelli
+226 U Heroic Reinforcements @Scott Murphy
 227 R Hostage Taker @Wayne Reynolds
+228 R Hydroid Krasis @Jason Felix
 236 R Kaervek the Merciless @rk post
+238 M Karador, Ghost Chieftain @Todd Lockwood
 240 R Lavalanche @Steve Argyle
+242 R Legion's Initiative @Jaime Jones
 244 M Lord of Extinction @Izzy
+245 U Lotleth Troll @Vincent Proce
 247 R Magister Sphinx @Steven Belledin
+249 C Martial Glory @Raymond Swanland
 250 R Master Biomancer @Willian Murai
 254 R The Mimeoplasm @Svetlin Velinov
+255 R Mindwrack Liege @Richard Whitters
 257 M Mizzix of the Izmagnus @Cliff Childs
 258 M Muldrotha, the Gravetide @Jason Rainville
 259 R Murkfiend Liege @Carl Critchlow
 260 M Nicol Bolas, God-Pharaoh @Raymond Swanland
 262 R Phyrexian Tyranny @Kev Walker
+264 R Prized Amalgam @Karl Kopinski
+266 U Psychic Symbiont @Robbie Trevino
+268 R Rafiq of the Many @Michael Komarck
+269 U River Hoopoe @Ryan Pancoast
+270 R Roon of the Hidden Realm @Steve Prescott
+271 R Ruric Thar, the Unbowed @Tyler Jacobson
+272 U Scab-Clan Giant @Zoltan Boros
+273 U Sedraxis Specter @Cole Eastburn
+274 M Sedris, the Traitor King @Paul Bonner
+275 R Shattergang Brothers @Kev Walker
 278 U Sprouting Thrinax @Jarreau Wimberly
 280 R Supreme Verdict @Sam Burley
+281 R Tariel, Reckoner of Souls @Wayne Reynolds
 282 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
+283 C Tenth District Legionnaire @Victor Adame Minguez
+284 U Terminate @Lucas Graciano
 285 R Thistledown Liege @Adam Rex
+286 R Thousand-Year Storm @Dimitar Marinski
+288 U Tower Gargoyle @Matt Cavotta
+292 R Villainous Wealth @Erica Yang
 296 M Wrenn and Six @Chase Stone
 297 R Zur the Enchanter @Josu Hernaiz
+298 R Aether Vial @Karl Kopinski
+300 U Civic Saber @Jung Park
+301 U Coldsteel Heart @Mark Romanoski
+302 R Conqueror's Flail @Franz Vohwinkel
+303 M Crucible of Worlds @Ron Spencer
+304 R Darksteel Plate @Daniel Ljunggren
 305 U Dragon Arch @Dana Knutson
+306 U Firemind Vessel @Daniel Ljunggren
 308 M Mana Vault @Christine Choi
 311 R Phyrexian Altar @Yigit Koroglu
 312 R Pithing Needle @Anthony Palumbo
+313 R Planar Bridge @Chase Stone
 314 R Sensei's Divining Top @Michael Sutfin
 315 R Thrumming Stone @Rob Alexander
 317 R Vedalken Orrery @John Avon
@@ -122,23 +195,30 @@ ScryfallCode=2X2
 319 U Boros Garrison @John Avon
 320 M Cavern of Souls @Richard Wright
 322 U Dimir Aqueduct @John Avon
+323 R Forbidden Orchard @Daniel Ljunggren
 324 U Golgari Rot Farm @John Avon
 325 U Gruul Turf @John Avon
 326 U Izzet Boilerworks @John Avon
 327 U Orzhov Basilica @John Avon
+328 R Pillar of the Paruns @Dany Orizio
 329 U Rakdos Carnarium @John Avon
 330 U Selesnya Sanctuary @John Avon
 331 U Simic Growth Chamber @John Avon
 332 C Cryptic Spires @Sam Burley
 333 M Liliana, the Last Hope @Scott M. Fischer
 334 M Wrenn and Six @Donato Giancola
+335 M Emrakul, the Aeons Torn @Kev Walker
 336 M Kozilek, Butcher of Truth @Ian Miller
 337 M Ulamog, the Infinite Gyre @Thomas M. Baxa
 341 C Seeker of the Way @Douglas Shuler
 343 R Teferi's Protection @Greg Staples
+345 M Consecrated Sphinx @Mark Zug
+346 R Force of Negation @Greg Hildebrandt
+347 R Gifts Ungiven @David O'Connor
+348 M Mana Drain @Chuck Lukacs
 349 U Mulldrifter @Jeff Miracola
 351 C Thought Scour @Jeff Miracola
-353 R Damnation
+353 R Damnation @Ian Miller
 354 M Imperial Seal @Mark Tedin
 355 U Inquisition of Kozilek @rk post
 357 C Unearth
@@ -146,86 +226,145 @@ ScryfallCode=2X2
 359 R Chaos Warp @Phil Foglio
 360 M Dockside Extortionist @Douglas Shuler
 361 U Lightning Bolt @Chuck Lukacs
-363 M Seasoned Pyromancer
+363 M Seasoned Pyromancer @Steve Prescott
 365 M Allosaurus Shepherd @Douglas Shuler
 366 R Bloom Tender @Scott M. Fischer
+368 U Eternal Witness @Keith Garletts
 369 R Hardened Scales @Jim Nelson
+370 R Oracle of Mul Daya
 371 C Rampant Growth @Jeff Miracola
 376 M Dragonlord Dromoka @Richard Kane Ferguson
 378 R Glimpse the Unthinkable @Drew Tucker
 379 R Grand Arbiter Augustin IV @Greg Hildebrandt
+380 R Grim Flayer @Richard Kane Ferguson
 383 R The Mimeoplasm @Mark Tedin
 384 M Muldrotha, the Gravetide @Eric Velhagen
+387 M Sedris, the Traitor King
 388 R Supreme Verdict @Ron Spears
+389 U Terminate @Paolo Parente
+390 R Thousand-Year Storm @Donato Giancola
+391 R Aether Vial
 393 M Crucible of Worlds @Mark Zug
 394 M Mana Vault @Steve Prescott
 396 R Phyrexian Altar @Pete Venters
+397 R Pithing Needle @Ron Spencer
 398 R Sensei's Divining Top @Greg Staples
 399 R Vedalken Orrery @Scott M. Fischer
 400 U Azorius Chancery @Carl Critchlow
 401 U Boros Garrison @Darrell Riche
 402 M Cavern of Souls @Drew Tucker
 404 U Dimir Aqueduct @Mark Poole
+405 R Forbidden Orchard @Drew Tucker
 406 U Golgari Rot Farm @Donato Giancola
 407 U Gruul Turf @Ron Spencer
 408 U Izzet Boilerworks @Keith Garletts
 409 U Orzhov Basilica
 410 U Rakdos Carnarium @Thomas M. Baxa
 411 U Selesnya Sanctuary @Ron Spears
-412 U Simic Growth Chamber
+412 U Simic Growth Chamber @Pete Venters
+413 M Emrakul, the Aeons Torn @Mark Tedin
 414 M Kozilek, Butcher of Truth @Michael Komarck
 415 M Ulamog, the Infinite Gyre @Aleksi Briclot
 416 M Divine Visitation @Victor Adame Minguez
+419 R Mikaeus, the Lunarch @Steven Belledin
 424 R Teferi's Protection @Chase Stone
 425 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
+426 M As Foretold @Tommy Arnold
 427 M Consecrated Sphinx @Mark Zug
+429 R Force of Negation @Paul Scott Canavan
 430 R Gifts Ungiven @Chris Rallis
 431 R Kederekt Leviathan @Mark Hyzer
+432 M Mana Drain @Raymond Swanland
+433 R Pull from Tomorrow @Sara Winters
 435 R Venser, Shaper Savant @Aleksi Briclot
+436 M Bitterblossom @Rebecca Guay
+437 R Damnation @Kev Walker
 439 M Imperial Seal @Milivoj Ćeran
 440 M Liliana, the Last Hope @Jaime Jones
+441 R Necrotic Ooze @James Ryman
+443 R Oona's Prowler @Wayne Reynolds
+445 R Yahenni, Undying Partisan @Lius Lasahido
 448 R Anger of the Gods @Yigit Koroglu
 449 R Backdraft Hellkite @Rudy Siswanto
+450 R Bedlam Reveler @Jama Jurabaev
+451 R Chaos Warp @Trevor Claxton
 452 M Dockside Extortionist @Lie Setiawan
+453 R Greater Gargadon @Rob Alexander
 454 M Seasoned Pyromancer @Cynthia Sheppard
 457 M Allosaurus Shepherd @Randy Vargas
 458 R Bloom Tender @Chippy
 461 R Green Sun's Zenith @David Rapoza
 462 R Hardened Scales @Mark Winters
+463 R Impervious Greatwurm @Simon Dominic
+464 R Oracle of Mul Daya @Vance Kovacs
+465 R Rishkar, Peema Renegade @Todd Lockwood
+466 R Splinterfright @Eric Deschamps
+467 R Abzan Ascendancy @Mark Winters
 468 M Aminatou, the Fateshifter @Seb McKinnon
+469 R Anguished Unmaking @Wesley Burt
+470 M Animar, Soul of Elements @Filip Burburan
+471 R Arjun, the Shifting Flame @Willian Murai
+473 R Ashenmoor Liege @Mark Zug
 475 R Atarka's Command @Chris Rahn
 476 R Atla Palani, Nest Tender @Ekaterina Burmak
+479 R Boartusk Liege @Jesper Ejsing
 480 R Bring to Light @Jonas De Ro
+481 R Child of Alara @Steve Argyle
+482 R Creakwood Liege @Cole Eastburn
 483 R Dack's Duplicate @Karl Kopinski
 487 M Dragonlord Dromoka @Eric Deschamps
 490 R Dromoka's Command @James Ryman
+491 M Elenda, the Dusk Rose @Chris Rahn
+493 R Empyrial Archangel @Greg Staples
 494 M Ezuri, Claw of Progress @James Ryman
 495 R Fiery Justice @Mathias Kollros
+496 R Figure of Destiny @Scott M. Fischer
 498 M Ghave, Guru of Spores @James Paick
 499 R Glen Elendra Liege @Kev Walker
 500 R Glimpse the Unthinkable @Brandon Kitkouski
 501 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
 505 R Hostage Taker @Wayne Reynolds
+506 R Hydroid Krasis @Jason Felix
 512 R Kaervek the Merciless @rk post
 516 R Lavalanche @Steve Argyle
+517 R Legion's Initiative @Jaime Jones
+518 M Lord of Extinction @Izzy
 519 R Magister Sphinx @Steven Belledin
 521 R Master Biomancer @Willian Murai
 525 R The Mimeoplasm @Svetlin Velinov
+526 R Mindwrack Liege @Richard Whitters
+527 M Mizzix of the Izmagnus @Cliff Childs
 528 M Muldrotha, the Gravetide @Jason Rainville
 529 R Murkfiend Liege @Carl Critchlow
+530 M Nicol Bolas, God-Pharaoh @Raymond Swanland
 531 R Phyrexian Tyranny @Kev Walker
+533 R Prized Amalgam @Karl Kopinski
+534 R Rafiq of the Many @Michael Komarck
+535 R Roon of the Hidden Realm @Steve Prescott
+536 R Ruric Thar, the Unbowed @Tyler Jacobson
+537 M Sedris, the Traitor King @Paul Bonner
+538 R Shattergang Brothers @Kev Walker
 541 R Supreme Verdict @Sam Burley
 543 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
 544 R Thistledown Liege @Adam Rex
+545 R Thousand-Year Storm @Dimitar Marinski
 553 M Wrenn and Six @Chase Stone
 554 R Zur the Enchanter @Josu Hernaiz
+555 R Aether Vial @Karl Kopinski
+557 R Conqueror's Flail @Franz Vohwinkel
+558 M Crucible of Worlds @Ron Spencer
+559 R Darksteel Plate @Daniel Ljunggren
 560 M Mana Vault @Christine Choi
 563 R Phyrexian Altar @Yigit Koroglu
+564 R Pithing Needle @Anthony Palumbo
 566 R Sensei's Divining Top @Michael Sutfin
+567 R Thrumming Stone @Rob Alexander
 568 R Vedalken Orrery @John Avon
 569 M Cavern of Souls @Richard Wright
+571 R Forbidden Orchard @Daniel Ljunggren
 573 M Liliana, the Last Hope @Scott M. Fischer
 574 M Wrenn and Six @Donato Giancola
+575 M Emrakul, the Aeons Torn @Kev Walker
 576 M Kozilek, Butcher of Truth @Ian Miller
 577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
 578 R Weathered Wayfarer @Dermot Power

From e92198c2543b18d855a6971151f12ff2179bd48a Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Wed, 22 Jun 2022 23:32:57 +0200
Subject: [PATCH 050/309] confirmAction: add Map Params

---
 forge-ai/src/main/java/forge/ai/AiController.java  |  4 ++--
 .../src/main/java/forge/ai/PlayerControllerAi.java |  4 ++--
 .../src/main/java/forge/ai/SpellAbilityAi.java     |  2 +-
 .../main/java/forge/ai/ability/AlwaysPlayAi.java   |  4 +++-
 .../src/main/java/forge/ai/ability/AmassAi.java    |  2 +-
 .../src/main/java/forge/ai/ability/AnimateAi.java  |  2 +-
 .../src/main/java/forge/ai/ability/AttachAi.java   |  2 +-
 .../main/java/forge/ai/ability/ChangeZoneAi.java   |  2 +-
 .../java/forge/ai/ability/ChangeZoneAllAi.java     |  3 ++-
 .../src/main/java/forge/ai/ability/CloneAi.java    |  2 +-
 .../java/forge/ai/ability/CopyPermanentAi.java     |  2 +-
 .../java/forge/ai/ability/CopySpellAbilityAi.java  |  2 +-
 .../main/java/forge/ai/ability/CountersPutAi.java  |  2 +-
 .../java/forge/ai/ability/CountersPutAllAi.java    |  3 ++-
 .../src/main/java/forge/ai/ability/DayTimeAi.java  |  4 +++-
 forge-ai/src/main/java/forge/ai/ability/DigAi.java |  2 +-
 .../main/java/forge/ai/ability/DigMultipleAi.java  |  4 +++-
 .../src/main/java/forge/ai/ability/DigUntilAi.java |  3 ++-
 .../src/main/java/forge/ai/ability/DiscardAi.java  |  5 +++--
 .../src/main/java/forge/ai/ability/DrawAi.java     |  4 +++-
 .../src/main/java/forge/ai/ability/EncodeAi.java   |  2 +-
 .../forge/ai/ability/FlipOntoBattlefieldAi.java    |  4 +++-
 .../main/java/forge/ai/ability/InvestigateAi.java  |  4 +++-
 .../src/main/java/forge/ai/ability/LearnAi.java    |  4 +++-
 .../src/main/java/forge/ai/ability/ManifestAi.java |  2 +-
 .../src/main/java/forge/ai/ability/MillAi.java     |  2 +-
 .../src/main/java/forge/ai/ability/MutateAi.java   |  2 +-
 .../java/forge/ai/ability/PeekAndRevealAi.java     |  4 +++-
 .../src/main/java/forge/ai/ability/PlayAi.java     |  2 +-
 .../src/main/java/forge/ai/ability/PumpAi.java     |  3 ++-
 .../forge/ai/ability/RearrangeTopOfLibraryAi.java  |  4 +++-
 .../src/main/java/forge/ai/ability/RepeatAi.java   |  4 +++-
 .../src/main/java/forge/ai/ability/RollDiceAi.java |  4 +++-
 .../main/java/forge/ai/ability/SacrificeAi.java    |  3 ++-
 .../src/main/java/forge/ai/ability/ScryAi.java     |  4 +++-
 .../src/main/java/forge/ai/ability/SetStateAi.java |  3 ++-
 .../src/main/java/forge/ai/ability/ShuffleAi.java  |  4 +++-
 .../main/java/forge/ai/ability/SkipPhaseAi.java    |  4 +++-
 .../src/main/java/forge/ai/ability/SurveilAi.java  |  4 +++-
 .../src/main/java/forge/ai/ability/TokenAi.java    |  2 +-
 .../src/main/java/forge/ai/ability/VentureAi.java  |  2 +-
 .../src/main/java/forge/game/GameAction.java       |  2 +-
 .../forge/game/ability/effects/AbandonEffect.java  |  2 +-
 .../forge/game/ability/effects/AnimateEffect.java  |  2 +-
 .../forge/game/ability/effects/AttachEffect.java   |  2 +-
 .../game/ability/effects/ChangeTargetsEffect.java  |  2 +-
 .../game/ability/effects/ChangeZoneAllEffect.java  |  2 +-
 .../game/ability/effects/ChangeZoneEffect.java     | 14 +++++++-------
 .../forge/game/ability/effects/CharmEffect.java    |  2 +-
 .../game/ability/effects/ChooseCardEffect.java     |  2 +-
 .../forge/game/ability/effects/CloneEffect.java    |  2 +-
 .../ability/effects/ControlExchangeEffect.java     |  2 +-
 .../game/ability/effects/CopyPermanentEffect.java  |  4 ++--
 .../ability/effects/CopySpellAbilityEffect.java    |  2 +-
 .../game/ability/effects/CountersPutEffect.java    |  4 ++--
 .../ability/effects/CountersPutOrRemoveEffect.java |  2 +-
 .../game/ability/effects/CountersRemoveEffect.java |  2 +-
 .../game/ability/effects/DamageDealEffect.java     |  2 +-
 .../java/forge/game/ability/effects/DigEffect.java |  4 ++--
 .../forge/game/ability/effects/DigUntilEffect.java |  4 ++--
 .../forge/game/ability/effects/DiscardEffect.java  |  4 ++--
 .../forge/game/ability/effects/DrawEffect.java     |  2 +-
 .../forge/game/ability/effects/EncodeEffect.java   |  2 +-
 .../forge/game/ability/effects/EndTurnEffect.java  |  2 +-
 .../forge/game/ability/effects/FightEffect.java    |  2 +-
 .../game/ability/effects/InvestigateEffect.java    |  2 +-
 .../forge/game/ability/effects/ManaEffect.java     |  2 +-
 .../forge/game/ability/effects/MillEffect.java     |  2 +-
 .../game/ability/effects/PeekAndRevealEffect.java  |  2 +-
 .../forge/game/ability/effects/PlayEffect.java     |  2 +-
 .../forge/game/ability/effects/PumpEffect.java     |  2 +-
 .../effects/RearrangeTopOfLibraryEffect.java       |  2 +-
 .../game/ability/effects/RepeatEachEffect.java     |  4 ++--
 .../forge/game/ability/effects/RepeatEffect.java   |  2 +-
 .../game/ability/effects/RevealHandEffect.java     |  2 +-
 .../game/ability/effects/SacrificeEffect.java      |  6 +++---
 .../forge/game/ability/effects/ScryEffect.java     |  2 +-
 .../forge/game/ability/effects/SetStateEffect.java |  2 +-
 .../forge/game/ability/effects/ShuffleEffect.java  |  2 +-
 .../forge/game/ability/effects/SurveilEffect.java  |  2 +-
 .../src/main/java/forge/game/combat/Combat.java    |  8 ++++----
 .../java/forge/game/player/PlayerController.java   |  2 +-
 .../util/PlayerControllerForTests.java             |  2 +-
 .../java/forge/player/HumanPlaySpellAbility.java   |  2 +-
 .../java/forge/player/PlayerControllerHuman.java   |  2 +-
 85 files changed, 142 insertions(+), 105 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index 66b8d2d6e17..3db91541d00 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -1326,7 +1326,7 @@ public class AiController {
         return discardList;
     }
 
-    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         if (mode == PlayerActionConfirmMode.AlternativeDamageAssignment) {
             return true;
         }
@@ -1339,7 +1339,7 @@ public class AiController {
                     mode);
             throw new IllegalArgumentException(exMsg);
         }
-        return SpellApiToAi.Converter.get(api).confirmAction(player, sa, mode, message);
+        return SpellApiToAi.Converter.get(api).confirmAction(player, sa, mode, message, null);
     }
 
     public boolean confirmBidAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, int bid, Player winner) {
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 990ab51e3df..772f0d51734 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -269,8 +269,8 @@ public class PlayerControllerAi extends PlayerController {
     }
 
     @Override
-    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message) {
-        return getAi().confirmAction(sa, mode, message);
+    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
+        return getAi().confirmAction(sa, mode, message, params);
     }
 
     @Override
diff --git a/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java b/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java
index e96dc0dcbb3..c1654ffa096 100644
--- a/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java
+++ b/forge-ai/src/main/java/forge/ai/SpellAbilityAi.java
@@ -305,7 +305,7 @@ public abstract class SpellAbilityAi {
         return SpellApiToAi.Converter.get(ab.getApi()).chkAIDrawback(ab, aiPlayer) && (subAb == null || chkDrawbackWithSubs(aiPlayer, subAb));  
     }
 
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         System.err.println("Warning: default (ie. inherited from base class) implementation of confirmAction is used by " + sa.getHostCard().getName() + " for " + this.getClass().getName() + ". Consider declaring an overloaded method");
         return true;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/AlwaysPlayAi.java b/forge-ai/src/main/java/forge/ai/ability/AlwaysPlayAi.java
index 331e072aa8e..3c80fd8b35b 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AlwaysPlayAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AlwaysPlayAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
 import forge.game.player.PlayerActionConfirmMode;
@@ -16,7 +18,7 @@ public class AlwaysPlayAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/AmassAi.java b/forge-ai/src/main/java/forge/ai/ability/AmassAi.java
index 85749deda23..d49341d1552 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AmassAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AmassAi.java
@@ -85,7 +85,7 @@ public class AmassAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java b/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
index 7f3a22dc133..849f4eec2d8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AnimateAi.java
@@ -240,7 +240,7 @@ public class AnimateAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return player.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2);
     }
     
diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index 85888b2f456..c0b376fbb2b 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -1729,7 +1729,7 @@ public class AttachAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
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 8e07a8b3832..c6bc4e9dadb 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
@@ -1739,7 +1739,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // AI was never asked
         return true;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
index 4bbdebab113..f820fe99b8a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java
@@ -1,6 +1,7 @@
 package forge.ai.ability;
 
 import java.util.Collections;
+import java.util.Map;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
@@ -334,7 +335,7 @@ public class ChangeZoneAllAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player ai, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player ai, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         final Card source = sa.getHostCard();
         final String hostName = source.getName();
         final ZoneType origin = ZoneType.listValueOf(sa.getParam("Origin")).get(0);
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 4a719fa2ea5..9928a485383 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CloneAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CloneAi.java
@@ -154,7 +154,7 @@ public class CloneAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         if (sa.hasParam("AILogic") && (!sa.usesTargeting() || sa.isTargetNumberValid())) {
             // Had a special logic for it and managed to target, so confirm if viable
             if ("CloneBestCreature".equals(sa.getParam("AILogic"))) {
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 166b45ba933..2577673a7ad 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CopyPermanentAi.java
@@ -224,7 +224,7 @@ public class CopyPermanentAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         //TODO: add logic here
         return true;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/CopySpellAbilityAi.java b/forge-ai/src/main/java/forge/ai/ability/CopySpellAbilityAi.java
index 000c52bc32c..534ad4e5b79 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CopySpellAbilityAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CopySpellAbilityAi.java
@@ -134,7 +134,7 @@ public class CopySpellAbilityAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // Chain of Acid requires special attention here since otherwise the AI will confirm the copy and then
         // run into the necessity of confirming a mandatory Destroy, thus destroying all of its own permanents.
         if ("ChainOfAcid".equals(sa.getParam("AILogic"))) {
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 7c90cf65fd1..667aee15d71 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
@@ -913,7 +913,7 @@ public class CountersPutAi extends CountersAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         final Card source = sa.getHostCard();
         if (mode == PlayerActionConfirmMode.Tribute) {
             // add counter if that opponent has a giant creature
diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java
index 0ae4a0187f3..9e824bc14ee 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java
@@ -1,6 +1,7 @@
 package forge.ai.ability;
 
 import java.util.List;
+import java.util.Map;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
@@ -151,7 +152,7 @@ public class CountersPutAllAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return player.getCreaturesInPlay().size() >= player.getWeakestOpponent().getCreaturesInPlay().size();
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/DayTimeAi.java b/forge-ai/src/main/java/forge/ai/ability/DayTimeAi.java
index a51e6745b6d..e114d50332e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DayTimeAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DayTimeAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -30,7 +32,7 @@ public class DayTimeAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigAi.java b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
index 9f223ca34ae..33b8dac06a2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigAi.java
@@ -209,7 +209,7 @@ public class DigAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         Card topc = player.getZone(ZoneType.Library).get(0);
 
         // AI actions for individual cards (until this AI can be generalized)
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 1f838d9172d..4c63daf2d02 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigMultipleAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtil;
 import forge.ai.SpellAbilityAi;
@@ -94,7 +96,7 @@ public class DigMultipleAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java b/forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java
index ecb26f22112..968b6473ee1 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DigUntilAi.java
@@ -1,6 +1,7 @@
 package forge.ai.ability;
 
 import java.util.List;
+import java.util.Map;
 
 import forge.ai.AiAttackController;
 import forge.ai.ComputerUtilCost;
@@ -122,7 +123,7 @@ public class DigUntilAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         if (sa.hasParam("AILogic")) {
             final String logic = sa.getParam("AILogic");
             if ("OathOfDruids".equals(logic)) {
diff --git a/forge-ai/src/main/java/forge/ai/ability/DiscardAi.java b/forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
index 010260cfedd..b8ac075c536 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DiscardAi.java
@@ -2,6 +2,7 @@ package forge.ai.ability;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import forge.ai.ComputerUtil;
 import forge.ai.ComputerUtilAbility;
@@ -211,11 +212,11 @@ public class DiscardAi extends SpellAbilityAi {
         return true;
     }
 
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         if (mode == PlayerActionConfirmMode.Random) {
             // TODO For now AI will always discard Random used currently with: Balduvian Horde and similar cards
             return true;
         }
-        return super.confirmAction(player, sa, mode, message);
+        return super.confirmAction(player, sa, mode, message, params);
     }
 }
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 f9c18915ca6..b3fc55fb51a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/DrawAi.java
@@ -18,6 +18,8 @@
  */
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.AiCostDecision;
 import forge.ai.AiProps;
 import forge.ai.ComputerUtil;
@@ -541,7 +543,7 @@ public class DrawAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         int numCards = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("NumCards"), sa) : 1;
         // AI shouldn't mill itself
         if (numCards < player.getZone(ZoneType.Library).size())
diff --git a/forge-ai/src/main/java/forge/ai/ability/EncodeAi.java b/forge-ai/src/main/java/forge/ai/ability/EncodeAi.java
index 6627b3847c0..a12fc2fe440 100644
--- a/forge-ai/src/main/java/forge/ai/ability/EncodeAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/EncodeAi.java
@@ -70,7 +70,7 @@ public final class EncodeAi extends SpellAbilityAi {
      * forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // only try to encode if there is a creature it can be used on
         return chooseCard(player, player.getCreaturesInPlay(), true) != null;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/FlipOntoBattlefieldAi.java b/forge-ai/src/main/java/forge/ai/ability/FlipOntoBattlefieldAi.java
index ca37e15340a..3fcee8a8341 100644
--- a/forge-ai/src/main/java/forge/ai/ability/FlipOntoBattlefieldAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/FlipOntoBattlefieldAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import com.google.common.base.Predicate;
 import forge.ai.SpellAbilityAi;
 import forge.game.card.Card;
@@ -42,7 +44,7 @@ public class FlipOntoBattlefieldAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/InvestigateAi.java b/forge-ai/src/main/java/forge/ai/ability/InvestigateAi.java
index e58cf83d66c..7087208f25c 100644
--- a/forge-ai/src/main/java/forge/ai/ability/InvestigateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/InvestigateAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
@@ -20,7 +22,7 @@ public class InvestigateAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/LearnAi.java b/forge-ai/src/main/java/forge/ai/ability/LearnAi.java
index d155f55aba9..a155b4f77de 100644
--- a/forge-ai/src/main/java/forge/ai/ability/LearnAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/LearnAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import forge.ai.ComputerUtilCard;
 import forge.ai.PlayerControllerAi;
 import forge.ai.SpellAbilityAi;
@@ -32,7 +34,7 @@ public class LearnAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
index 1f337d1cd0a..b807069b859 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
@@ -43,7 +43,7 @@ public class ManifestAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
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 55d133adcfe..05c813613e2 100644
--- a/forge-ai/src/main/java/forge/ai/ability/MillAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/MillAi.java
@@ -196,7 +196,7 @@ public class MillAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         if ("TimmerianFiends".equals(sa.getParam("AILogic"))) {
             return SpecialCardAi.TimmerianFiends.consider(player, sa);
         }
diff --git a/forge-ai/src/main/java/forge/ai/ability/MutateAi.java b/forge-ai/src/main/java/forge/ai/ability/MutateAi.java
index 21d3840ac42..00315019dad 100644
--- a/forge-ai/src/main/java/forge/ai/ability/MutateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/MutateAi.java
@@ -65,7 +65,7 @@ public class MutateAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/PeekAndRevealAi.java b/forge-ai/src/main/java/forge/ai/ability/PeekAndRevealAi.java
index 417e12775f7..6ec5340a36f 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PeekAndRevealAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PeekAndRevealAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.AiAttackController;
 import forge.ai.SpellAbilityAi;
 import forge.ai.SpellApiToAi;
@@ -70,7 +72,7 @@ public class PeekAndRevealAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         AbilitySub subAb = sa.getSubAbility();
         return subAb != null && SpellApiToAi.Converter.get(subAb.getApi()).chkDrawbackWithSubs(player, subAb);
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/PlayAi.java b/forge-ai/src/main/java/forge/ai/ability/PlayAi.java
index 6cccbb0de7e..0c03b5a9d08 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PlayAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PlayAi.java
@@ -131,7 +131,7 @@ public class PlayAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player ai, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player ai, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
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 e5705d72927..0747688f615 100644
--- a/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/PumpAi.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class PumpAi extends PumpAiBase {
 
@@ -781,7 +782,7 @@ public class PumpAi extends PumpAiBase {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         //TODO Add logic here if necessary but I think the AI won't cast
         //the spell in the first place if it would curse its own creature
         //and the pump isn't mandatory
diff --git a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
index 6bb36200d39..81da8244c57 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import forge.ai.AiCardMemory;
 import forge.ai.AiController;
 import forge.ai.AiProps;
@@ -92,7 +94,7 @@ public class RearrangeTopOfLibraryAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // Confirming this action means shuffling the library if asked.
 
         // First, let's check if we can play the top card of the library
diff --git a/forge-ai/src/main/java/forge/ai/ability/RepeatAi.java b/forge-ai/src/main/java/forge/ai/ability/RepeatAi.java
index 8a7a58d4951..3ba08023ec8 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RepeatAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RepeatAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import forge.ai.*;
@@ -40,7 +42,7 @@ public class RepeatAi extends SpellAbilityAi {
     }
     
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
       //TODO add logic to have computer make better choice (ArsenalNut)
         return false;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java b/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
index fb78fd03bf2..3cb3cedf5ff 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
@@ -1,6 +1,8 @@
 package forge.ai.ability;
 
 
+import java.util.Map;
+
 import forge.ai.SpellAbilityAi;
 import forge.game.Game;
 import forge.game.card.Card;
@@ -43,7 +45,7 @@ public class RollDiceAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java b/forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java
index 87754161cd9..78341e0afbc 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java
@@ -1,6 +1,7 @@
 package forge.ai.ability;
 
 import java.util.List;
+import java.util.Map;
 
 import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
@@ -175,7 +176,7 @@ public class SacrificeAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
diff --git a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
index e65b97f8e38..c9bf4e7d1d6 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ScryAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import com.google.common.base.Predicates;
 
 import forge.ai.ComputerUtilMana;
@@ -132,7 +134,7 @@ public class ScryAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
index 4b3451a6855..5a8ac20146a 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
@@ -1,6 +1,7 @@
 package forge.ai.ability;
 
 import java.util.List;
+import java.util.Map;
 
 import com.google.common.base.Predicate;
 
@@ -264,7 +265,7 @@ public class SetStateAi extends SpellAbilityAi {
         return true;
     }
 
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // TODO: improve the AI for when it may want to transform something that's optional to transform
         return isSafeToTransformIntoLegendary(player, sa.getHostCard());
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java b/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java
index e4101790445..cf66187b55e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ShuffleAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.SpellAbilityAi;
 import forge.game.phase.PhaseType;
 import forge.game.player.Player;
@@ -54,7 +56,7 @@ public class ShuffleAi extends SpellAbilityAi {
     }  
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // ai could analyze parameter denoting the player to shuffle
         return true;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/SkipPhaseAi.java b/forge-ai/src/main/java/forge/ai/ability/SkipPhaseAi.java
index d5264c0bdac..908308a29c4 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SkipPhaseAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SkipPhaseAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.AiAttackController;
 import forge.ai.SpellAbilityAi;
 import forge.game.player.Player;
@@ -18,7 +20,7 @@ public class SkipPhaseAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
     
diff --git a/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java b/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
index 45bc7c9f67c..0d93d65c3a3 100644
--- a/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/SurveilAi.java
@@ -1,5 +1,7 @@
 package forge.ai.ability;
 
+import java.util.Map;
+
 import forge.ai.AiCardMemory;
 import forge.ai.AiProps;
 import forge.ai.ComputerUtilCost;
@@ -119,7 +121,7 @@ public class SurveilAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 }
diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
index b1ce0ea688a..16af0fbd221 100644
--- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java
@@ -311,7 +311,7 @@ public class TokenAi extends SpellAbilityAi {
      * @see forge.card.ability.SpellAbilityAi#confirmAction(forge.game.player.Player, forge.card.spellability.SpellAbility, forge.game.player.PlayerActionConfirmMode, java.lang.String)
      */
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         // TODO: AILogic
         return true;
     }
diff --git a/forge-ai/src/main/java/forge/ai/ability/VentureAi.java b/forge-ai/src/main/java/forge/ai/ability/VentureAi.java
index 0a3197fac13..12ca13cad58 100644
--- a/forge-ai/src/main/java/forge/ai/ability/VentureAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/VentureAi.java
@@ -36,7 +36,7 @@ public class VentureAi extends SpellAbilityAi {
     }
 
     @Override
-    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params) {
         return true;
     }
 
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index dd71ad57ed0..3ed875b4cde 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -1576,7 +1576,7 @@ public class GameAction {
             c.getGame().getTracker().flush();
 
             c.setMoveToCommandZone(false);
-            if (c.getOwner().getController().confirmAction(c.getFirstSpellAbility(), PlayerActionConfirmMode.ChangeZoneToAltDestination, c.getName() + ": If a commander is in a graveyard or in exile and that card was put into that zone since the last time state-based actions were checked, its owner may put it into the command zone.")) {
+            if (c.getOwner().getController().confirmAction(c.getFirstSpellAbility(), PlayerActionConfirmMode.ChangeZoneToAltDestination, c.getName() + ": If a commander is in a graveyard or in exile and that card was put into that zone since the last time state-based actions were checked, its owner may put it into the command zone.", null)) {
                 moveTo(c.getOwner().getZone(ZoneType.Command), c, null);
                 return true;
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
index 72a88f752c5..7641de47351 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AbandonEffect.java
@@ -25,7 +25,7 @@ public class AbandonEffect extends SpellAbilityEffect {
         Player controller = source.getController();
 
         boolean isOptional = sa.hasParam("Optional");
-        if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeAbandonSource", CardTranslation.getTranslatedName(source.getName())))) {
+        if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeAbandonSource", CardTranslation.getTranslatedName(source.getName())), null)) {
             return;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
index bc166d03de7..5f066d9df5a 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
@@ -164,7 +164,7 @@ public class AnimateEffect extends AnimateEffectBase {
                     ? TextUtil.fastReplace(sa.getParam("OptionQuestion"), "TARGETS", targets)
                     : getStackDescription(sa);
 
-            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message)) {
+            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message, null)) {
                 return;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
index 566ad27c37a..695eb84895e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java
@@ -134,7 +134,7 @@ public class AttachEffect extends SpellAbilityEffect {
         // If Cast Targets will be checked on the Stack
         for (final Card attachment : attachments) {
             String message = Localizer.getInstance().getMessage("lblDoYouWantAttachSourceToTarget", CardTranslation.getTranslatedName(attachment.getName()), attachToName);
-            if (sa.hasParam("Optional") && !p.getController().confirmAction(sa, null, message))
+            if (sa.hasParam("Optional") && !p.getController().confirmAction(sa, null, message, null))
             // TODO add params for message
                 continue;
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
index bf481bc5493..56e5b0c5387 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java
@@ -50,7 +50,7 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
             // Redirect rules read 'you MAY choose new targets' ... okay!
             // TODO: Don't even ask to change targets, if the SA and subs don't actually have targets
             boolean isOptional = sa.hasParam("Optional");
-            if (isOptional && !chooser.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantChangeAbilityTargets", tgtSA.getHostCard().toString()))) {
+            if (isOptional && !chooser.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantChangeAbilityTargets", tgtSA.getHostCard().toString()), null)) {
                 continue;
             }
             if (sa.hasParam("ChangeSingleTarget")) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
index 1bbb7308cd8..f204db8466e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
@@ -120,7 +120,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
                 message = Localizer.getInstance().getMessage("lblMoveTargetFromOriginToDestination", targets, Lang.joinHomogenous(origin, ZoneType.Accessors.GET_TRANSLATED_NAME), destination.getTranslatedName());
             }
 
-            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message)) {
+            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message, null)) {
                 return;
             }
         }
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 1381502eaea..b6100c7f451 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
@@ -492,7 +492,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 PlayerCollection deciders = AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("AlternativeDecider"), sa);
                 alterDecider = deciders.isEmpty() ? null : deciders.get(0);
             }
-            if (alterDecider != null && !alterDecider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString())) {
+            if (alterDecider != null && !alterDecider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString(), null)) {
                 destination = ZoneType.smartValueOf(sa.getParam("DestinationAlternative"));
                 altDest = true;
             }
@@ -564,7 +564,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             }
 
             final String prompt = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblDoYouWantMoveTargetFromOriToDest", CardTranslation.getTranslatedName(gameCard.getName()), Lang.joinHomogenous(origin, ZoneType.Accessors.GET_TRANSLATED_NAME), destination.getTranslatedName()));
-            if (optional && !chooser.getController().confirmAction(sa, null, prompt) )
+            if (optional && !chooser.getController().confirmAction(sa, null, prompt, null) )
                 continue;
 
             final Zone originZone = game.getZoneOf(gameCard);
@@ -956,7 +956,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 sb.append(sa.getParam("AlternativeMessage")).append(" ");
                 sb.append(altFetchList.size()).append(" " + Localizer.getInstance().getMessage("lblCardMatchSearchingTypeInAlternateZones"));
 
-                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneFromAltSource, sb.toString())) {
+                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneFromAltSource, sb.toString(), null)) {
                     origin = alt;
                 }
             }
@@ -968,7 +968,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 final StringBuilder sb = new StringBuilder();
                 sb.append(sa.getParam("AlternativeDestinationMessage"));
 
-                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString())) {
+                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneToAltDestination, sb.toString(), null)) {
                     destination = ZoneType.smartValueOf(sa.getParam("DestinationAlternative"));
                     libraryPos = sa.hasParam("LibraryPositionAlternative") ? Integer.parseInt(sa.getParam("LibraryPositionAlternative")) : 0;
                 }
@@ -985,7 +985,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     prompt = Localizer.getInstance().getMessage("lblSearchPlayerZoneConfirm", "{player's}", Lang.joinHomogenous(origin, ZoneType.Accessors.GET_TRANSLATED_NAME).toLowerCase());
                 }
                 String message = MessageUtil.formatMessage(prompt , decider, player);
-                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneGeneral, message)) {
+                if (!decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneGeneral, message, null)) {
                     return;
                 }
             }
@@ -1071,7 +1071,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                             continue;
                         }
                         SpellAbility tgtSA = decider.getController().getAbilityToPlay(tgtCard, sas);
-                        if (!decider.getController().confirmAction(tgtSA, null, Localizer.getInstance().getMessage("lblDoYouWantPlayCard", CardTranslation.getTranslatedName(tgtCard.getName())))) {
+                        if (!decider.getController().confirmAction(tgtSA, null, Localizer.getInstance().getMessage("lblDoYouWantPlayCard", CardTranslation.getTranslatedName(tgtCard.getName())), null)) {
                             continue;
                         }
                         tgtSA.setSVar("IsCastFromPlayEffect", "True");
@@ -1187,7 +1187,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                         String message = Localizer.getInstance().getMessage("lblCancelSearchUpToSelectNumCards", String.valueOf(num));
 
                         if (fetchList.isEmpty() || sa.hasParam("SkipCancelPrompt") ||
-                                decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneGeneral, message)) {
+                                decider.getController().confirmAction(sa, PlayerActionConfirmMode.ChangeZoneGeneral, message, null)) {
                             break;
                         }
                         i--;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
index 0cea936f918..6e484d4a1a7 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
@@ -180,7 +180,7 @@ public class CharmEffect extends SpellAbilityEffect {
         num = Math.min(num, choices.size());
 
         boolean isOptional = sa.hasParam("Optional");
-        if (isOptional && !activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeCharm", CardTranslation.getTranslatedName(source.getName())))) {
+        if (isOptional && !activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeCharm", CardTranslation.getTranslatedName(source.getName())), null)) {
             return false;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
index 1b708fb097c..d60a1bd5532 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
@@ -131,7 +131,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
                             Localizer.getInstance().getMessage("lblSelectCreatureWithTotalPowerLessOrEqualTo", (totP - chosenP - negativeNum))
                                     + "\r\n(" + Localizer.getInstance().getMessage("lblSelected") + ":" + chosenPool + ")\r\n(" + Localizer.getInstance().getMessage("lblTotalPowerNum", chosenP) + ")", chosenP <= totP, null);
                     if (c == null) {
-                        if (p.getController().confirmAction(sa, PlayerActionConfirmMode.OptionalChoose, Localizer.getInstance().getMessage("lblCancelChooseConfirm"))) {
+                        if (p.getController().confirmAction(sa, PlayerActionConfirmMode.OptionalChoose, Localizer.getInstance().getMessage("lblCancelChooseConfirm"), null)) {
                             break;
                         }
                     } else {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
index dcbf032c2b1..fffc8ca0680 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java
@@ -108,7 +108,7 @@ public class CloneEffect extends SpellAbilityEffect {
         }
 
         final boolean optional = sa.hasParam("Optional");
-        if (optional && !host.getController().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantCopy", CardTranslation.getTranslatedName(cardToCopy.getName())))) {
+        if (optional && !host.getController().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantCopy", CardTranslation.getTranslatedName(cardToCopy.getName())), null)) {
             return;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
index 078e13a8f2d..9e6a7e87c88 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java
@@ -89,7 +89,7 @@ public class ControlExchangeEffect extends SpellAbilityEffect {
         if (sa.hasParam("Optional") && !sa.getActivatingPlayer().getController().confirmAction(sa, null,
                 Localizer.getInstance().getMessage("lblExchangeControl",
                         CardTranslation.getTranslatedName(object1.getName()),
-                        CardTranslation.getTranslatedName(object2.getName())))) {
+                        CardTranslation.getTranslatedName(object2.getName())), null)) {
             return;
         }
 
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 bf90e75864b..a13870820f3 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
@@ -119,7 +119,7 @@ public class CopyPermanentEffect extends TokenEffectBase {
         TokenCreateTable tokenTable = new TokenCreateTable();
 
         if (sa.hasParam("Optional") && !activator.getController().confirmAction(sa, null,
-                Localizer.getInstance().getMessage("lblCopyPermanentConfirm"))) {
+                Localizer.getInstance().getMessage("lblCopyPermanentConfirm"), null)) {
             return;
         }
 
@@ -208,7 +208,7 @@ public class CopyPermanentEffect extends TokenEffectBase {
                             if (choosen != null) {
                                 tgtCards.add(choosen);
                                 choices = CardLists.filter(choices, Predicates.not(CardPredicates.sharesNameWith(choosen)));
-                            } else if (chooser.getController().confirmAction(sa, PlayerActionConfirmMode.OptionalChoose, Localizer.getInstance().getMessage("lblCancelChooseConfirm"))) {
+                            } else if (chooser.getController().confirmAction(sa, PlayerActionConfirmMode.OptionalChoose, Localizer.getInstance().getMessage("lblCancelChooseConfirm"), null)) {
                                 break;
                             }
                         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
index 4fd4b6d36d2..602bf0f185d 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java
@@ -89,7 +89,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
             SpellAbility chosenSA = controller.getController().chooseSingleSpellForEffect(tgtSpells, sa,
                     Localizer.getInstance().getMessage("lblSelectASpellCopy"), ImmutableMap.of());
 
-            if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantCopyTheSpell", CardTranslation.getTranslatedName(chosenSA.getHostCard().getName())))) {
+            if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantCopyTheSpell", CardTranslation.getTranslatedName(chosenSA.getHostCard().getName())), null)) {
                 continue;
             }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index df3ef86ba29..50d4eb60ce0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -174,7 +174,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
         boolean putOnDefined = sa.hasParam("PutOnDefined");
 
         if (sa.hasParam("Optional") && !pc.confirmAction
-                (sa, null, Localizer.getInstance().getMessage("lblDoYouWantPutCounter"))) {
+                (sa, null, Localizer.getInstance().getMessage("lblDoYouWantPutCounter"), null)) {
             return;
         }
 
@@ -509,7 +509,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
                             Player chooser = pc.chooseSingleEntityForEffect(activator.getOpponents(), sa,
                                     Localizer.getInstance().getMessage("lblChooseAnOpponent"), params);
 
-                            if (chooser.getController().confirmAction(sa, PlayerActionConfirmMode.Tribute, message)) {
+                            if (chooser.getController().confirmAction(sa, PlayerActionConfirmMode.Tribute, message, null)) {
                                 gameCard.setTributed(true);
                             } else {
                                 continue;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
index 81e00224dec..a55b34a1bc6 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java
@@ -76,7 +76,7 @@ public class CountersPutOrRemoveEffect extends SpellAbilityEffect {
             }
             if (!eachExisting && sa.hasParam("Optional") && !pl.getController().confirmAction(sa, null,
                     Localizer.getInstance().getMessage("lblWouldYouLikePutRemoveCounters", ctype.getName(),
-                            CardTranslation.getTranslatedName(gameCard.getName())))) {
+                            CardTranslation.getTranslatedName(gameCard.getName())), null)) {
                 continue;
             }
             if (!sa.usesTargeting() || gameCard.canBeTargetedBy(sa)) {
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 203ca93d6a3..302b1059d55 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
@@ -83,7 +83,7 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
 
         if (sa.hasParam("Optional")) {
             String ctrs = cntToRemove > 1 ? Localizer.getInstance().getMessage("lblCounters") : num.equals("All") ? Localizer.getInstance().getMessage("lblAllCounters") : Localizer.getInstance().getMessage("lblACounters");
-            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblRemove") + " " + ctrs + "?")) {
+            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblRemove") + " " + ctrs + "?", null)) {
                 return;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
index bb1d424d7f6..06d5f9904b5 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
@@ -156,7 +156,7 @@ public class DamageDealEffect extends DamageBaseEffect {
         List<GameObject> tgts = getTargets(sa);
         if (sa.hasParam("OptionalDecider")) {
             Player decider = Iterables.getFirst(AbilityUtils.getDefinedPlayers(hostCard, sa.getParam("OptionalDecider"), sa), null);
-            if (decider != null && !decider.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantDealTargetDamageToTarget", String.valueOf(dmg), tgts.toString()))) {
+            if (decider != null && !decider.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantDealTargetDamageToTarget", String.valueOf(dmg), tgts.toString()), null)) {
                 return;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
index 9a8d1caa1a2..a716df1de98 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
@@ -203,7 +203,7 @@ public class DigEffect extends SpellAbilityEffect {
                 else if (sa.hasParam("RevealOptional")) {
                     String question = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblReveal") + ":", TextUtil.addSuffix(Lang.joinHomogenous(top),"?"));
 
-                    hasRevealed = p.getController().confirmAction(sa, null, question);
+                    hasRevealed = p.getController().confirmAction(sa, null, question, null);
                     if (hasRevealed) {
                         game.getAction().reveal(top, p);
                     }
@@ -276,7 +276,7 @@ public class DigEffect extends SpellAbilityEffect {
                     // Optional abilities that use a dialog box to prompt the user to skip the ability (e.g. Explorer's Scope, Quest for Ula's Temple)
                     if (optional && mayBeSkipped && !valid.isEmpty()) {
                         String prompt = !optionalAbilityPrompt.isEmpty() ? optionalAbilityPrompt : Localizer.getInstance().getMessage("lblWouldYouLikeProceedWithOptionalAbility") + " " + host + "?\n\n(" + sa.getDescription() + ")";
-                        if (!p.getController().confirmAction(sa, null, TextUtil.fastReplace(prompt, "CARDNAME", CardTranslation.getTranslatedName(host.getName())))) {
+                        if (!p.getController().confirmAction(sa, null, TextUtil.fastReplace(prompt, "CARDNAME", CardTranslation.getTranslatedName(host.getName())), null)) {
                             return;
                         }
                     }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
index 6a2b42a432e..07ca5f7cfe6 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
@@ -120,7 +120,7 @@ public class DigUntilEffect extends SpellAbilityEffect {
                 continue;
             }
             if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) {
-                if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantDigYourLibrary"))) {
+                if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantDigYourLibrary"), null)) {
                     continue;
                 }
                 CardCollection found = new CardCollection();
@@ -171,7 +171,7 @@ public class DigUntilEffect extends SpellAbilityEffect {
                         final Card c = itr.next();
                         final ZoneType origin = c.getZone().getZoneType();
                         if (optionalFound && !p.getController().confirmAction(sa, null,
-                                Localizer.getInstance().getMessage("lblDoYouWantPutCardToZone", foundDest.getTranslatedName()))) {
+                                Localizer.getInstance().getMessage("lblDoYouWantPutCardToZone", foundDest.getTranslatedName()), null)) {
                             continue;
                         }
                         Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
index 5522a1e8765..9598a4265c5 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
@@ -153,7 +153,7 @@ public class DiscardEffect extends SpellAbilityEffect {
                     }
 
                     boolean runDiscard = !sa.hasParam("Optional")
-                            || p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, sa.getParam("DiscardMessage"));
+                            || p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, sa.getParam("DiscardMessage"), null);
                     if (runDiscard) {
                         toBeDiscarded = AbilityUtils.getDefinedCards(source, sa.getParam("DefinedCards"), sa);
 
@@ -197,7 +197,7 @@ public class DiscardEffect extends SpellAbilityEffect {
                         continue;
                     }
                     String message = Localizer.getInstance().getMessage("lblWouldYouLikeRandomDiscardTargetCard", String.valueOf(numCards));
-                    boolean runDiscard = !sa.hasParam("Optional") || p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, message);
+                    boolean runDiscard = !sa.hasParam("Optional") || p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, message, null);
 
                     if (runDiscard) {
                         final String valid = sa.getParamOrDefault("DiscardValid", "Card");
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
index 3031c56f628..5c90c773ed4 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
@@ -72,7 +72,7 @@ public class DrawEffect extends SpellAbilityEffect {
                 continue;
             }
 
-            if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantDrawCards", Lang.nounWithAmount(numCards, " card")))) {
+            if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantDrawCards", Lang.nounWithAmount(numCards, " card")), null)) {
                 continue;
             }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java
index b1c98c06a8b..02b55a7212b 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java
@@ -48,7 +48,7 @@ public class EncodeEffect extends SpellAbilityEffect {
         }
         // Handle choice of whether or not to encoded
 
-        if (!player.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantExileCardAndEncodeOntoYouCreature", CardTranslation.getTranslatedName(host.getName())))) {
+        if (!player.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantExileCardAndEncodeOntoYouCreature", CardTranslation.getTranslatedName(host.getName())), null)) {
             return;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
index c19f9b2345c..aabcf131ffc 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EndTurnEffect.java
@@ -20,7 +20,7 @@ public class EndTurnEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         final List<Player> enders = getDefinedPlayersOrTargeted(sa, "Defined");
         final Player ender = enders.isEmpty() ? sa.getActivatingPlayer() : enders.get(0);
-        if (sa.hasParam("Optional") && !ender.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantEndTurn"))) {
+        if (sa.hasParam("Optional") && !ender.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantEndTurn"), null)) {
             return;
         }
         Game game = ender.getGame();
diff --git a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
index 738950a6063..2b96aa56a4d 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java
@@ -59,7 +59,7 @@ public class FightEffect extends DamageBaseEffect {
         Player controller = host.getController();
         boolean isOptional = sa.hasParam("Optional");
 
-        if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeFight", CardTranslation.getTranslatedName(fighters.get(0).getName()), CardTranslation.getTranslatedName(fighters.get(1).getName())))) {
+        if (isOptional && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblWouldYouLikeFight", CardTranslation.getTranslatedName(fighters.get(0).getName()), CardTranslation.getTranslatedName(fighters.get(1).getName())), null)) {
             return;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/InvestigateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/InvestigateEffect.java
index 4eaab4d61d6..48dee299959 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/InvestigateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/InvestigateEffect.java
@@ -40,7 +40,7 @@ public class InvestigateEffect extends TokenEffectBase {
         for (final Player p : getTargetPlayers(sa)) {
             for (int i = 0; i < amount; i++) {
                 if (sa.hasParam("Optional") && !p.getController().confirmAction(sa, null,
-                        Localizer.getInstance().getMessage("lblWouldYouLikeInvestigate"))) {
+                        Localizer.getInstance().getMessage("lblWouldYouLikeInvestigate"), null)) {
                     return;
                 }
 
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 6419c7b1371..56ae7f19819 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
@@ -40,7 +40,7 @@ public class ManaEffect extends SpellAbilityEffect {
         final boolean optional = sa.hasParam("Optional");
         final Game game = sa.getActivatingPlayer().getGame();
 
-        if (optional && !sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantAddMana"))) {
+        if (optional && !sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantAddMana"), null)) {
             return;
         }
 
diff --git a/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
index eb422e732d7..fc8ae802494 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java
@@ -48,7 +48,7 @@ public class MillEffect extends SpellAbilityEffect {
                 if (sa.hasParam("Optional")) {
                     final String prompt = TextUtil.concatWithSpace(Localizer.getInstance().getMessage("lblDoYouWantPutLibraryCardsTo", destination.getTranslatedName()));
                     // CR 701.13b
-                    if (numCards > p.getZone(ZoneType.Library).size() || !p.getController().confirmAction(sa, null, prompt)) {
+                    if (numCards > p.getZone(ZoneType.Library).size() || !p.getController().confirmAction(sa, null, prompt, null)) {
                         continue;
                     }
                 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
index 6e760ca602b..68e812f3d85 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java
@@ -87,7 +87,7 @@ public class PeekAndRevealEffect extends SpellAbilityEffect {
             }
             
             if (doReveal && sa.hasParam("RevealOptional"))
-                doReveal = peekingPlayer.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblRevealCardToOtherPlayers"));
+                doReveal = peekingPlayer.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblRevealCardToOtherPlayers"), null);
             
             if (doReveal) {
                 peekingPlayer.getGame().getAction().reveal(revealableCards, ZoneType.Library, libraryToPeek, !noPeek,
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 1ef7a2bfef1..e7d280ae7e2 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
@@ -259,7 +259,7 @@ public class PlayEffect extends SpellAbilityEffect {
             }
             if (singleOption && sa.getTargetCard() == null)
                 sa.setPlayEffectCard(tgtCard);// show card to play rather than showing the source card
-            if (singleOption && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantPlayCard", CardTranslation.getTranslatedName(tgtCard.getName())))) {
+            if (singleOption && !controller.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantPlayCard", CardTranslation.getTranslatedName(tgtCard.getName())), null)) {
                 if (wasFaceDown) {
                     tgtCard.turnFaceDownNoUpdate();
                     tgtCard.updateStateForView();
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 94c86203432..9a2b1e323b3 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
@@ -352,7 +352,7 @@ public class PumpEffect extends SpellAbilityEffect {
                     ? TextUtil.fastReplace(sa.getParam("OptionQuestion"), "TARGETS", targets)
                     : Localizer.getInstance().getMessage("lblApplyPumpToTarget", targets);
 
-            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message)) {
+            if (!sa.getActivatingPlayer().getController().confirmAction(sa, null, message, null)) {
                 return;
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
index 7f16c272931..3d6c7ab50bd 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java
@@ -116,7 +116,7 @@ public class RearrangeTopOfLibraryEffect extends SpellAbilityEffect {
             Card next = orderedCards.get(i);
             player.getGame().getAction().moveToLibrary(next, 0, sa);
         }
-        if (mayshuffle && activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantShuffleTheLibrary"))) {
+        if (mayshuffle && activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoyouWantShuffleTheLibrary"), null)) {
             player.shuffle(sa);
         }
     }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
index 4576d7794ba..2323378939f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
@@ -47,7 +47,7 @@ public class RepeatEachEffect extends SpellAbilityEffect {
         final Player player = sa.getActivatingPlayer();
         final Game game = player.getGame();
         if (sa.hasParam("Optional") && sa.hasParam("OptionPrompt") && //for now, OptionPrompt is needed
-                !player.getController().confirmAction(sa, null, sa.getParam("OptionPrompt"))) {
+                !player.getController().confirmAction(sa, null, sa.getParam("OptionPrompt"), null)) {
             return;
         }
 
@@ -151,7 +151,7 @@ public class RepeatEachEffect extends SpellAbilityEffect {
                 }
             }
             for (final Player p : repeatPlayers) {
-                if (optional && !p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"))) {
+                if (optional && !p.getController().confirmAction(repeat, null, sa.getParam("RepeatOptionalMessage"), null)) {
                     continue;
                 }
                 if (nextTurn) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
index ede9d56820f..3438ee5aa8e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
@@ -115,7 +115,7 @@ public class RepeatEffect extends SpellAbilityEffect {
             Player decider = sa.hasParam("RepeatOptionalDecider")
                     ? AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("RepeatOptionalDecider"), sa).get(0)
                     : sa.getActivatingPlayer();
-            return decider.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantRepeatProcessAgain"));
+            return decider.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantRepeatProcessAgain"), null);
         }
 
         return true;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java
index c538a17918c..684c3b01d0f 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java
@@ -41,7 +41,7 @@ public class RevealHandEffect extends SpellAbilityEffect {
 
         for (final Player p : getTargetPlayers(sa)) {
             if ((tgt == null) || p.canBeTargetedBy(sa)) {
-                if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantRevealYourHand"))) {
+                if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantRevealYourHand"), null)) {
                     continue;
                 }
                 CardCollectionView hand = p.getCardsIn(ZoneType.Hand);
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 76e8e1c234c..5b512848e43 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
@@ -46,7 +46,7 @@ public class SacrificeEffect extends SpellAbilityEffect {
         if (sa.hasParam("Echo")) {
             boolean isPaid;
             if (activator.hasKeyword("You may pay 0 rather than pay the echo cost for permanents you control.")
-                    && activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantPayEcho") + " {0}?")) {
+                    && activator.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantPayEcho") + " {0}?", null)) {
                 isPaid = true;
             } else {
                 isPaid = activator.getController().payManaOptional(card, new Cost(sa.getParam("Echo"), true),
@@ -110,7 +110,7 @@ public class SacrificeEffect extends SpellAbilityEffect {
         if (valid.equals("Self") && game.getZoneOf(card) != null) {
             if (game.getZoneOf(card).is(ZoneType.Battlefield)) {
                 if (!optional || activator.getController().confirmAction(sa, null,
-                        Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", card.getName()))) {
+                        Localizer.getInstance().getMessage("lblDoYouWantSacrificeThis", card.getName()), null)) {
                     if (game.getAction().sacrifice(card, sa, true, table, params) != null) {
                         if (remSacrificed) {
                             card.addRemembered(card);
@@ -153,7 +153,7 @@ public class SacrificeEffect extends SpellAbilityEffect {
 
                     if (sa.hasParam("Random")) {
                         choosenToSacrifice = Aggregates.random(validTargets, Math.min(amount, validTargets.size()), new CardCollection());
-                    } else if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantSacrifice"))) {
+                    } else if (optional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantSacrifice"), null)) {
                         choosenToSacrifice = CardCollection.EMPTY;
                     } else {
                         boolean isStrict = sa.hasParam("StrictAmount");
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
index e5d1ac937dc..5d77f6350b1 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
@@ -44,7 +44,7 @@ public class ScryEffect extends SpellAbilityEffect {
         // Optional here for spells that have optional multi-player scrying
         for (final Player p : getTargetPlayers(sa)) {
             if ( (!sa.usesTargeting() || p.canBeTargetedBy(sa)) &&
-                    (!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"))) ) {
+                    (!isOptional || p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWanttoScry"), null)) ) {
                 players.add(p);
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
index 34c596406cb..39c3d3eb71a 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
@@ -150,7 +150,7 @@ public class SetStateEffect extends SpellAbilityEffect {
 
             if (optional) {
                 String message = TextUtil.concatWithSpace("Transform", gameCard.getName(), "?");
-                if (!p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, message)) {
+                if (!p.getController().confirmAction(sa, PlayerActionConfirmMode.Random, message, null)) {
                     return;
                 }
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java
index 0b438fc57c3..0832d421302 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java
@@ -21,7 +21,7 @@ public class ShuffleEffect extends SpellAbilityEffect {
 
         for (final Player p : tgtPlayers) {
             if ((tgt == null) || p.canBeTargetedBy(sa)) {
-                boolean mustShuffle = !optional || sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblHaveTargetShuffle", p.getName())); 
+                boolean mustShuffle = !optional || sa.getActivatingPlayer().getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblHaveTargetShuffle", p.getName()), null); 
                 if (mustShuffle) 
                     p.shuffle(sa);
             }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SurveilEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SurveilEffect.java
index b148a44af13..f79c5c9e43e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SurveilEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SurveilEffect.java
@@ -43,7 +43,7 @@ public class SurveilEffect extends SpellAbilityEffect {
 
         for (final Player p : getTargetPlayers(sa)) {
             if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) {
-                if (isOptional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantSurveil"))) {
+                if (isOptional && !p.getController().confirmAction(sa, null, Localizer.getInstance().getMessage("lblDoYouWantSurveil"), null)) {
                     continue;
                 }
 
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index f8d8de99028..57bc21386e7 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -724,7 +724,7 @@ public class Combat {
                                 "defending player and/or any number of creatures they control.")
                         && blocker.getController().getController().confirmAction(null, null,
                         Localizer.getInstance().getMessage("lblAssignCombatDamageAsChoose",
-                                CardTranslation.getTranslatedName(blocker.getName())));
+                                CardTranslation.getTranslatedName(blocker.getName())), null);
                 // choose defending player
                 if (divideCombatDamageAsChoose) {
                     defender = blocker.getController().getController().chooseSingleEntityForEffect(attackingPlayer.getOpponents(), null, Localizer.getInstance().getMessage("lblChoosePlayer"), null);
@@ -803,7 +803,7 @@ public class Combat {
             if (!assignToPlayer && attacker.getGame().getCombat().isBlocked(attacker) && attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
                 assignToPlayer = assigningPlayer.getController().confirmAction(emptySA, PlayerActionConfirmMode.AlternativeDamageAssignment,
                         Localizer.getInstance().getMessage("lblAssignCombatDamageWerentBlocked",
-                                CardTranslation.getTranslatedName(attacker.getName())));
+                                CardTranslation.getTranslatedName(attacker.getName())), null);
             }
 
             boolean divideCombatDamageAsChoose = false;
@@ -815,7 +815,7 @@ public class Combat {
                                 "defending player and/or any number of creatures they control.")
                         && assigningPlayer.getController().confirmAction(emptySA, PlayerActionConfirmMode.AlternativeDamageAssignment,
                                 Localizer.getInstance().getMessage("lblAssignCombatDamageAsChoose",
-                                        CardTranslation.getTranslatedName(attacker.getName())));
+                                        CardTranslation.getTranslatedName(attacker.getName())), null);
                 if (defender instanceof Card && divideCombatDamageAsChoose) {
                     defender = getDefenderPlayerByAttacker(attacker);
                 }
@@ -826,7 +826,7 @@ public class Combat {
                                 "a creature defending player controls.") &&
                         assigningPlayer.getController().confirmAction(emptySA, PlayerActionConfirmMode.AlternativeDamageAssignment,
                                 Localizer.getInstance().getMessage("lblAssignCombatDamageToCreature",
-                                        CardTranslation.getTranslatedName(attacker.getName())));
+                                        CardTranslation.getTranslatedName(attacker.getName())), null);
                         if (divideCombatDamageAsChoose) {
                             if (orderedBlockers == null || orderedBlockers.isEmpty()) {
                                 orderedBlockers = getDefendersCreatures();
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 137bcc5b8a3..4a0dac41aa8 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerController.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerController.java
@@ -134,7 +134,7 @@ public abstract class PlayerController {
 
     public abstract <T extends GameEntity> List<T> chooseEntitiesForEffect(FCollectionView<T> optionList, int min, int max, DelayedReveal delayedReveal, SpellAbility sa, String title, Player relatedPlayer, Map<String, Object> params);
 
-    public abstract boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message);
+    public abstract boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> params);
     public abstract boolean confirmBidAction(SpellAbility sa, PlayerActionConfirmMode bidlife, String string, int bid, Player winner);
     public abstract boolean confirmReplacementEffect(ReplacementEffect replacementEffect, SpellAbility effectSA, GameEntity affected, String question);
     public abstract boolean confirmStaticApplication(Card hostCard, GameEntity affected, String logic, String message);
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 e67b9483cec..b8444645190 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
@@ -191,7 +191,7 @@ public class PlayerControllerForTests extends PlayerController {
     }
 
     @Override
-    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message) {
+    public boolean confirmAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, Map<String, Object> newParam) {
         return true;
     }
 
diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
index 6e8ad86c739..bf5eebeeea2 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
@@ -106,7 +106,7 @@ public class HumanPlaySpellAbility {
         }
 
         final boolean playerManaConversion = human.hasManaConversion()
-                && human.getController().confirmAction(ability, null, "Do you want to spend mana as though it were mana of any color to pay the cost?");
+                && human.getController().confirmAction(ability, null, "Do you want to spend mana as though it were mana of any color to pay the cost?", null);
 
         Cost abCost = ability.getPayCosts();
         CostPayment payment = new CostPayment(abCost, ability);
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index a49aa2d8ec9..e8b47b1cfbf 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -733,7 +733,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
      * SpellAbility, java.lang.String, java.lang.String)
      */
     @Override
-    public boolean confirmAction(final SpellAbility sa, final PlayerActionConfirmMode mode, final String message) {
+    public boolean confirmAction(final SpellAbility sa, final PlayerActionConfirmMode mode, final String message, Map<String, Object> params) {
         if (sa != null && sa.getHostCard() != null && sa.hasParam("ShowCardInPrompt")) {
             // The card wants another thing displayed in the prompt on mouse over rather than itself
             Card show = null;

From fb559886df739d5f9f1aafad1b1eb585f56bc108 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Wed, 22 Jun 2022 23:36:07 +0200
Subject: [PATCH 051/309] ~ fix AiController

---
 forge-ai/src/main/java/forge/ai/AiController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java
index 3db91541d00..b2b2ce2ea96 100644
--- a/forge-ai/src/main/java/forge/ai/AiController.java
+++ b/forge-ai/src/main/java/forge/ai/AiController.java
@@ -1339,7 +1339,7 @@ public class AiController {
                     mode);
             throw new IllegalArgumentException(exMsg);
         }
-        return SpellApiToAi.Converter.get(api).confirmAction(player, sa, mode, message, null);
+        return SpellApiToAi.Converter.get(api).confirmAction(player, sa, mode, message, params);
     }
 
     public boolean confirmBidAction(SpellAbility sa, PlayerActionConfirmMode mode, String message, int bid, Player winner) {

From a73ff0427cb216230d2bbf87d822d060578d6427 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 23 Jun 2022 10:37:03 +0800
Subject: [PATCH 052/309] PlayerPanel sort by variant - sort initialize method
 by last used variant on startup

---
 .../screens/constructed/PlayerPanel.java      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index be3fea52c1d..96dbff823bb 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -319,11 +319,39 @@ public class PlayerPanel extends FContainer {
     }
 
     public void initialize(FPref savedStateSetting, FPref savedStateSettingCommander, FPref savedStateSettingOathbreaker, FPref savedStateSettingTinyLeader, FPref savedStateSettingBrawl, DeckType defaultDeckType) {
-        deckChooser.initialize(savedStateSetting, defaultDeckType);
-        lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
-        lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
-        lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
-        lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+        //order by last variant..
+        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPILIED_VARIANTS);
+        if (gameTypes.contains(GameType.Commander)) {
+            lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
+            lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
+            lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
+            lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+            deckChooser.initialize(savedStateSetting, defaultDeckType);
+        } else if (gameTypes.contains(GameType.Oathbreaker)) {
+            lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
+            lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
+            lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
+            lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+            deckChooser.initialize(savedStateSetting, defaultDeckType);
+        } else if (gameTypes.contains(GameType.TinyLeaders)) {
+            lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
+            lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
+            lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
+            lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+            deckChooser.initialize(savedStateSetting, defaultDeckType);
+        } else if (gameTypes.contains(GameType.Brawl)) {
+            lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+            lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
+            lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
+            lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
+            deckChooser.initialize(savedStateSetting, defaultDeckType);
+        } else {
+            deckChooser.initialize(savedStateSetting, defaultDeckType);
+            lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
+            lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
+            lstTinyLeadersDecks.initialize(savedStateSettingTinyLeader, DeckType.TINY_LEADERS_DECK);
+            lstBrawlDecks.initialize(savedStateSettingBrawl, DeckType.BRAWL_DECK);
+        }
         lstPlanarDecks.initialize(null, DeckType.RANDOM_DECK);
         lstSchemeDecks.initialize(null, DeckType.RANDOM_DECK);
     }

From 64580cb7f3694a95aebc36f06eb0ab3d405c36ba Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 23 Jun 2022 10:40:34 +0800
Subject: [PATCH 053/309] refactor typo UI_APPLIED_VARIANTS

---
 .../src/forge/screens/constructed/LobbyScreen.java        | 8 ++++----
 .../src/forge/screens/constructed/PlayerPanel.java        | 2 +-
 .../forge/localinstance/properties/ForgePreferences.java  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index 068e0401352..098ef9f2b04 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -168,7 +168,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                     lobby.clearVariants();
                     updateLayoutForVariants();
                     Set<GameType> gameTypes = new HashSet<>();
-                    FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                    FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
                     FModel.getPreferences().save();
                 }
                 else if (cbVariants.getSelectedIndex() == cbVariants.getItemCount() - 1) {
@@ -183,7 +183,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                     for (GameType variant: lobby.getAppliedVariants()) {
                         gameTypes.add(variant);
                     }
-                    FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                    FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
                     FModel.getPreferences().save();
                 }
             }
@@ -218,7 +218,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                     public void run() {
                         btnStart.setEnabled(lobby.hasControl());
 
-                        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPILIED_VARIANTS);
+                        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPLIED_VARIANTS);
                         if (!gameTypes.isEmpty()) {
                             for (GameType gameType : gameTypes) {
                                 lobby.applyVariant(gameType);
@@ -517,7 +517,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                 for (GameType variant: lobby.getAppliedVariants()) {
                     gameTypes.add(variant);
                 }
-                FModel.getPreferences().setGameType(FPref.UI_APPILIED_VARIANTS, gameTypes);
+                FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
                 FModel.getPreferences().save();
             }
         }
diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index 96dbff823bb..fd4bc7713d8 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -320,7 +320,7 @@ public class PlayerPanel extends FContainer {
 
     public void initialize(FPref savedStateSetting, FPref savedStateSettingCommander, FPref savedStateSettingOathbreaker, FPref savedStateSettingTinyLeader, FPref savedStateSettingBrawl, DeckType defaultDeckType) {
         //order by last variant..
-        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPILIED_VARIANTS);
+        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPLIED_VARIANTS);
         if (gameTypes.contains(GameType.Commander)) {
             lstCommanderDecks.initialize(savedStateSettingCommander, DeckType.COMMANDER_DECK);
             lstOathbreakerDecks.initialize(savedStateSettingOathbreaker, DeckType.OATHBREAKER_DECK);
diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
index dbbdcd9cbe3..0044bc55e30 100644
--- a/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
+++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
@@ -69,7 +69,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
         BRAWL_P8_DECK_STATE(""),
         UI_LANDSCAPE_MODE ("false"),
         UI_MATCHES_PER_GAME("3"),
-        UI_APPILIED_VARIANTS(""),
+        UI_APPLIED_VARIANTS(""),
         UI_COMPACT_MAIN_MENU ("false"),
         UI_USE_OLD ("false"),
         UI_RANDOM_FOIL ("false"),

From 35b08d08a9b62b0c0d43182afb9e905f80cb0bfe Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:55:22 -0500
Subject: [PATCH 054/309] 5squeecards (#753)

* 5squeecards

-closes #742
-closes #752
-closes #693

* Update earthquake_dragon.txt

* Update elturel_survivors.txt

* Update elturel_survivors.txt

* Update endless_evil.txt
---
 .../upcoming/druid_of_the_emerald_grove.txt         | 13 +++++++++++++
 .../res/cardsfolder/upcoming/earthquake_dragon.txt  | 13 +++++++++++++
 .../res/cardsfolder/upcoming/elturel_survivors.txt  | 12 ++++++++++++
 forge-gui/res/cardsfolder/upcoming/endless_evil.txt | 12 ++++++++++++
 .../res/cardsfolder/upcoming/owlbear_shepherd.txt   |  8 ++++++++
 5 files changed, 58 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/druid_of_the_emerald_grove.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/earthquake_dragon.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/endless_evil.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/owlbear_shepherd.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/druid_of_the_emerald_grove.txt b/forge-gui/res/cardsfolder/upcoming/druid_of_the_emerald_grove.txt
new file mode 100644
index 00000000000..68effb418b3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/druid_of_the_emerald_grove.txt
@@ -0,0 +1,13 @@
+Name:Druid of the Emerald Grove
+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 the battlefield, search your library for up to two basic land cards and reveal them,
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Hidden$ True | ChangeNum$ 2 | ChangeType$ Land.Basic | Destination$ Library | RememberChanged$ True | Reveal$ True | Shuffle$ False | SubAbility$ DBRollDice
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:TutuDaDome,10-19:WonTwoField,20: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.
+SVar:WonTwoDome:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | SubAbility$ DBCleanup
+SVar:ToFourField:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.IsRemembered | ChangeNum$ 2 | SubAbility$ DBCleanup | SpellDescription$ 20 VERT Put those cards onto the battlefield tapped, then shuffle.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:When Druid of the Emerald Grove enters the battlefield, search your library for up to two basic land cards and reveal them, then roll a d20.\n1-9 | Put those cards into your hand, then shuffle.\n10-19 | Put one of those cards onto the battlefield tapped and the other into your hand, then shuffle.\n20 | Put those cards onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/earthquake_dragon.txt b/forge-gui/res/cardsfolder/upcoming/earthquake_dragon.txt
new file mode 100644
index 00000000000..21e5f9d1014
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/earthquake_dragon.txt
@@ -0,0 +1,13 @@
+Name:Earthquake Dragon
+ManaCost:14 G
+Types:Creature Elemental Dragon
+PT:10/10
+K:Flying
+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 mana value of Dragons you control.
+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
+DeckHints:Type$Dragon
+SVar:X:Count$Valid Creature.Dragon+YouCtrl$SumCMC
+Oracle:This spell costs {X} less to cast, where X is the total mana value of Dragons you control.\nFlying, trample\n{2}{G}, Sacrifice a land: Return Earthquake Dragon from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt b/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
new file mode 100644
index 00000000000..d84e01c2af3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
@@ -0,0 +1,12 @@
+Name:Elturel Survivors
+ManaCost:3 R
+Types:Creature Tiefling Peasant
+PT:0/4
+K:Trample
+K:Myriad
+S:Mode$ Continuous | Affected$ Creature.Self+attacking | AddPower$ X | Description$ As long as CARDNAME is attacking, it gets +X/+0, where X is the number of lands defending player controls.
+SVar:X:Count$Valid Land.ControlledBy DefendingPlayer
+AI:RemoveDeck:All
+SVar:BuffedBy:Land.ControlledBy DefendingPlayer
+SVar:HasAttackEffect:TRUE
+Oracle:Trample, myriad\nAs long as Elturel Survivors is attacking, it gets +X/+0, where X is the number of lands defending player controls.
diff --git a/forge-gui/res/cardsfolder/upcoming/endless_evil.txt b/forge-gui/res/cardsfolder/upcoming/endless_evil.txt
new file mode 100644
index 00000000000..f74f16f6f4a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/endless_evil.txt
@@ -0,0 +1,12 @@
+Name:Endless Evil
+ManaCost:2 U
+Types:Enchantment Aura
+K:Enchant creature you control
+A:SP$ Attach | ValidTgts$ Creature.YouCtrl | AILogic$ HighestEvaluation
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, create a token that's a copy of enchanted creature, except it's a 1/1.
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ Enchanted | SetPower$ 1 | SetToughness$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When enchanted creature dies, if that creature was a Horror, return CARDNAME to its owner's hand.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ CorrectedSelf | ConditionDefined$ TriggeredCardLKICopy | ConditionPresent$ Creature.Horror | ConditionCompare$ EQ1
+DeckHints:Type$Horror
+DeckHas:Ability$Token
+Oracle:Enchant creature you control\nAt the beginning of your upkeep, create a token that's a copy of enchanted creature, except it's a 1/1.\nWhen enchanted creature dies, if that creature was a Horror, return Endless Evil to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/owlbear_shepherd.txt b/forge-gui/res/cardsfolder/upcoming/owlbear_shepherd.txt
new file mode 100644
index 00000000000..263da52d739
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/owlbear_shepherd.txt
@@ -0,0 +1,8 @@
+Name:Owlbear Shepherd
+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: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.

From 6a466d1953eb703747eeb1e653f4d7ea7a63774f Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Wed, 22 Jun 2022 23:28:11 -0500
Subject: [PATCH 055/309] letstrytheseagain

-closes #688
-closes #740
-closes #741
-closes #480
---
 forge-gui/res/cardsfolder/upcoming/balor.txt      | 15 +++++++++++++++
 .../upcoming/cloakwood_swarmkeeper.txt            |  9 +++++++++
 .../res/cardsfolder/upcoming/cone_of_cold.txt     | 13 +++++++++++++
 .../res/cardsfolder/upcoming/displacer_kitten.txt | 10 ++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/balor.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/balor.txt b/forge-gui/res/cardsfolder/upcoming/balor.txt
new file mode 100644
index 00000000000..a08d700b442
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/balor.txt
@@ -0,0 +1,15 @@
+Name:Balor
+ManaCost:3 R R
+Types:Creature Demon
+PT:5/5
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or dies, ABILITY
+SVar:TrigChoose:DB$ Charm | MinCharmNum$ 1 | CharmNum$ MaxUniqueOpponents | Choices$ TrigDrawDiscard,TrigSacrifice,TrigDmg | AdditionalDescription$ choose one or more. Each mode must target a different player.
+SVar:TrigDrawDiscard:DB$ Draw | ValidTgts$ Opponent | TargetUnique$ True | NumCards$ 3 | SubAbility$ Discard3 | SpellDescription$ Target opponent draws three cards, then discards three cards at random.
+SVar:Discard3:DB$ Discard | Defined$ ParentTarget | Mode$ Random | NumCards$ 3
+SVar:TrigSacrifice:DB$ Sacrifice | ValidTgts$ Opponent | TargetUnique$ True | SacValid$ Artifact.nonToken | SpellDescription$ Target opponent sacrifices a nontoken artifact. | SacMessage$ nontoken artifact
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Opponent | TargetUnique$ True | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target opponent equal to the number of cards in their hand.
+SVar:X:TargetedPlayer$CardsInHand
+SVar:MaxUniqueOpponents:PlayerCountOpponents$Amount
+SVar:NeedsToPlay:Artifact.OppCtrl
+Oracle:When Balor attacks or dies, choose one or more. Each mode must target a different player.\n• Target opponent draws three cards, then discards three cards at random.\n• Target opponent sacrifices a nontoken artifact.\n• Balor deals damage to target opponent equal to the number of cards in their hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
new file mode 100644
index 00000000000..dcfc7c0cefc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cloakwood_swarmkeeper.txt
@@ -0,0 +1,9 @@
+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 enter the battlefield under your control, 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 enter the battlefield under your control, put a +1/+1 counter on Cloakwood Swarmkeeper.
diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
new file mode 100644
index 00000000000..e4fb5063d71
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -0,0 +1,13 @@
+Name:Cone of Cold
+ManaCost:3 U
+Types:Sorcery
+A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBTapAll,10-19:TapAndLock,20:TapLockETBEffect | SpellDescription$ Roll a d20.
+SVar:DBTapAll:DB$ TapAll | ValidCards$ Creature.OppCtrl | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Tap all creatures your opponents control.
+SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUntap | StackDescription$ SpellDescription | SpellDescription$ 10—19 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
+SVar:TapLockETBEffect:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
+SVar:NoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated
+SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
+Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
new file mode 100644
index 00000000000..5172fc2267c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/displacer_kitten.txt
@@ -0,0 +1,10 @@
+Name:Displacer Kitten
+ManaCost:3 U
+Types:Creature Cat Beast
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ DBBlink | TriggerZones$ Battlefield | TriggerDescription$ Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+SVar:DBBlink:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+YouCtrl | TgtPrompt$ Select up to one target nonland permanent you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBReturn | RememberChanged$ True | SpellDescription$ Exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:BuffedBy:Card.nonCreature
+Oracle:Avoidance — Whenever you cast a noncreature spell, exile up to one target nonland permanent you control, then return it to the battlefield under its owner's control.

From 253d495288975ba923edde3202a6d7e181331777 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Thu, 23 Jun 2022 00:02:59 -0500
Subject: [PATCH 056/309] Update cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index e4fb5063d71..7b279272c43 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -1,4 +1,4 @@
-Name:Cone of Cold
+Name:Cone of Cold
 ManaCost:3 U
 Types:Sorcery
 A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBTapAll,10-19:TapAndLock,20:TapLockETBEffect | SpellDescription$ Roll a d20.

From 24f9ae83f469b13e3361a113b2a1e60a07f6e06f Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Thu, 23 Jun 2022 03:03:58 -0500
Subject: [PATCH 057/309] Update cone_of_cold.txt

---
 forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
index 7b279272c43..ed8734ed878 100644
--- a/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cone_of_cold.txt
@@ -7,7 +7,7 @@ SVar:TapAndLock:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ DBNoUnta
 SVar:DBNoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent
 SVar:TapLockETBEffect:DB$ TapAll | ValidCards$ Creature.OppCtrl | SubAbility$ NoUntap | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.
 SVar:NoUntap:DB$ PumpAll | ValidCards$ Creature.OppCtrl | KW$ HIDDEN This card doesn't untap during your next untap step. | IsCurse$ True | Duration$ Permanent | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | TgtZone$ Battlefield | ValidCards$ Creature.OppCtrl | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ TapLockETBTapped | Name$ Cone of Cold Effect | Duration$ UntilYourNextTurn | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.
 SVar:TapLockETBTapped:Event$ Moved | ValidCard$ Creature.OppCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated
 SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 Oracle:Roll a d20.\n1—9 | Tap all creatures you opponents control.\n10—19 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps.\n20 | Tap all creatures your opponents control. Those creatures don't untap during their controllers' next untap steps. Until your next turn, creatures your opponents control enter the battlefield tapped.

From 66d6e1e98ee2cdf12a7e6cd14b2b74e5dd86497d Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 23 Jun 2022 11:37:00 +0100
Subject: [PATCH 058/309] Create young_blue_dragon.txt

---
 .../cardsfolder/upcoming/young_blue_dragon.txt   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt b/forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt
new file mode 100644
index 00000000000..4062f97c07f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt
@@ -0,0 +1,16 @@
+Name:Young Blue Dragon
+ManaCost:4 U
+Types:Creature Dragon
+PT:3/3
+K:Flying
+Oracle:Flying
+AlternateMode:Adventure
+
+ALTERNATE
+
+Name:Sand Augury
+ManaCost:1 U
+Types:Sorcery Adventure
+A:SP$ Scry | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1,
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ then draw a card
+Oracle:Scry 1, then draw a card. (Then exile this card. You may cast the creature later from exile.)

From 6f26ea3fc68dc5c9116758bd62e1276b247a61c9 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 23 Jun 2022 11:37:59 +0100
Subject: [PATCH 059/309] Create young_red_dragon.txt

---
 .../cardsfolder/upcoming/young_red_dragon.txt   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt b/forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt
new file mode 100644
index 00000000000..596ab43fcfe
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt
@@ -0,0 +1,17 @@
+Name:Young Red Dragon
+ManaCost:3 R
+Types:Creature Dragon
+PT:3/2
+K:Flying
+K:CARDNAME can't block.
+Oracle:Flying\nYoung Red Dragon can’t block.
+AlternateMode:Adventure
+
+ALTERNATE
+
+Name:Bathe in Gold
+ManaCost:1 R
+Types:Instant Adventure
+A:SP$ Token | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)
+DeckHas:Ability$Token
+Oracle:Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)

From 3b9322ab06a2bdf999701653c6178628789b82d3 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 23 Jun 2022 13:19:33 +0100
Subject: [PATCH 060/309] Rename young_blue_dragon.txt to
 young_blue_dragon_sand_augury.txt

---
 .../{young_blue_dragon.txt => young_blue_dragon_sand_augury.txt}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename forge-gui/res/cardsfolder/upcoming/{young_blue_dragon.txt => young_blue_dragon_sand_augury.txt} (100%)

diff --git a/forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt b/forge-gui/res/cardsfolder/upcoming/young_blue_dragon_sand_augury.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/young_blue_dragon.txt
rename to forge-gui/res/cardsfolder/upcoming/young_blue_dragon_sand_augury.txt

From 693ce69526a5a7b07413dc94c3942f93061ab1ef Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 23 Jun 2022 13:20:05 +0100
Subject: [PATCH 061/309] Update and rename young_red_dragon.txt to 
 young_red_dragon_bathe_in_gold.txt

---
 ...young_red_dragon.txt =>  young_red_dragon_bathe_in_gold.txt} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename forge-gui/res/cardsfolder/upcoming/{young_red_dragon.txt =>  young_red_dragon_bathe_in_gold.txt} (89%)

diff --git a/forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt b/forge-gui/res/cardsfolder/upcoming/ young_red_dragon_bathe_in_gold.txt
similarity index 89%
rename from forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt
rename to forge-gui/res/cardsfolder/upcoming/ young_red_dragon_bathe_in_gold.txt
index 596ab43fcfe..48ff1e1e3cc 100644
--- a/forge-gui/res/cardsfolder/upcoming/young_red_dragon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ young_red_dragon_bathe_in_gold.txt	
@@ -13,5 +13,5 @@ Name:Bathe in Gold
 ManaCost:1 R
 Types:Instant Adventure
 A:SP$ Token | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)
-DeckHas:Ability$Token
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 Oracle:Create a Treasure token. (Then exile this card. You may cast the creature later from exile.)

From ce73b83f781d6c6717f17264599ddae0e46f55be Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Thu, 23 Jun 2022 22:20:58 +0100
Subject: [PATCH 062/309] Annoyance: remove space

---
 ...ragon_bathe_in_gold.txt => young_red_dragon_bathe_in_gold.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename forge-gui/res/cardsfolder/upcoming/{ young_red_dragon_bathe_in_gold.txt => young_red_dragon_bathe_in_gold.txt} (100%)

diff --git a/forge-gui/res/cardsfolder/upcoming/ young_red_dragon_bathe_in_gold.txt b/forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/ young_red_dragon_bathe_in_gold.txt
rename to forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt

From e21c33e2438d886bb7a81ebc068e97d31855993f Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Thu, 23 Jun 2022 21:54:08 -0500
Subject: [PATCH 063/309] 5moresqueecards

-closes #804
-closes #544
-closes #805
-closes #806
-closes #866
---
 .../upcoming/ghost_lantern_bind_spirit.txt        | 15 +++++++++++++++
 .../res/cardsfolder/upcoming/githzerai_monk.txt   | 10 ++++++++++
 .../res/cardsfolder/upcoming/green_slime.txt      | 10 ++++++++++
 .../cardsfolder/upcoming/hammers_of_moradin.txt   |  9 +++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/green_slime.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
new file mode 100644
index 00000000000..df5aabde9cf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
@@ -0,0 +1,15 @@
+Name:Ghost Lantern
+ManaCost:B
+Types:Artifact Equipment
+K:Equip:1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature you control dies, put a +1/+1 counter on equipped creature.
+SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1
+Oracle:Whenever a creature you control dies, put a +1/+1 counter on equipped creature.\nEquip {1}
+
+ALTERNATE
+
+Name:Bind Spirit
+ManaCost:1 B
+Types:Instant Adventure
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand
+Oracle:Return target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt b/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt
new file mode 100644
index 00000000000..f4cf7c0b658
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt
@@ -0,0 +1,10 @@
+Name:Githzerai Monk
+ManaCost:4 W
+Types:Creature Gith Monk
+PT:3/2
+K:Flash
+K:Flying
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ Psychic Defense — When CARDNAME enters the battlefield, tap all creatures you don't control.
+SVar:TrigTapAll:DB$ TapAll | ValidCards$ Creature.YouDontCtrl
+SVar:PlayMain1:TRUE
+Oracle:Flash\nFlying\nPsychic Defense — When Githzerai Monk enters the battlefield, tap all creatures you don't control.
diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
new file mode 100644
index 00000000000..b8e75dbc627
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
@@ -0,0 +1,10 @@
+Name:Green Slime
+ManaCost:2 G
+Types:Creature Ooze
+PT:2/2
+K:Flash
+K:Foretell G
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.
+SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
+AI:RemoveDeck:All
+Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G}
diff --git a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt
new file mode 100644
index 00000000000..58e1767a30c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt
@@ -0,0 +1,9 @@
+Name:Hammers of Moradin
+ManaCost:2 W
+Types:Creature Dwarf Cleric
+PT:3/3
+K:Myriad
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TapOneEach | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, tap up to one target creature that player controls.
+SVar:TapOneEach:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose one target creature that each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True
+SVar:OneEach:PlayerCountOpponents$Amount
+Oracle:Myriad\nWhenever Hammers of Moradin attacks, for each opponent, tap up to one target creature that player controls.

From e5edd3e9a085056a1627d2a7b21c8230dfcba9f8 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Thu, 23 Jun 2022 22:02:23 -0500
Subject: [PATCH 064/309] Create grell_philosopher.txt

---
 .../res/cardsfolder/upcoming/grell_philosopher.txt   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
new file mode 100644
index 00000000000..71c3f987817
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
@@ -0,0 +1,12 @@
+Name:Grell Philosopher
+ManaCost:2 U
+Types:Creature Horror Wizard
+PT:1/4
+K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
+SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | RememberObjects$ Targeted
+SVar:STSteal:Mode$ Continuous | Affected$ Creature.Horror+YouCtrl | EffectZone$ Command | GainsAbilitiesOfDefined$ RememberedLKI
+AI:RemoveDeck:All
+DeckHints:Type$Horror
+Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities.

From 90787426117462e5d01bf664627b0e8ef2b355eb Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Fri, 24 Jun 2022 04:29:52 +0100
Subject: [PATCH 065/309] CLD Duke Ulder Ravenguard (#981)

* Create duke_ulder_ravenguard.txt

* Update duke_ulder_ravenguard.txt
---
 .../res/cardsfolder/upcoming/duke_ulder_ravenguard.txt   | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/duke_ulder_ravenguard.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/duke_ulder_ravenguard.txt b/forge-gui/res/cardsfolder/upcoming/duke_ulder_ravenguard.txt
new file mode 100644
index 00000000000..a2b553869f1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/duke_ulder_ravenguard.txt
@@ -0,0 +1,9 @@
+Name:Duke Ulder Ravengard
+ManaCost:4 R W
+Types:Legendary Creature Human Noble Soldier
+PT:5/5
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, another target creature you control gains haste and myriad until end of turn. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | KW$ Haste & Myriad
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Token
+Oracle:At the beginning of combat on your turn, another target creature you control gains haste and myriad until end of turn. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)

From 8c537c2d1f79e13fab242025280880f436330be4 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Fri, 24 Jun 2022 05:30:00 +0200
Subject: [PATCH 066/309] Fix Oni-Cult Anvil not triggering when sac itself
 (#774)

Co-authored-by: TRT <>
---
 .../src/main/java/forge/game/trigger/TriggerHandler.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 4e1bed39fab..c0a3e78cffe 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -243,7 +243,8 @@ public class TriggerHandler {
                     TriggerType.Exploited.equals(t.getMode()) ||
                     TriggerType.Sacrificed.equals(t.getMode()) ||
                     TriggerType.Destroyed.equals(t.getMode()) ||
-                    (TriggerType.ChangesZone.equals(t.getMode()) && "Battlefield".equals(t.getParam("Origin")))) { // TODO needs additional logic in case origin=Any
+                    ((TriggerType.ChangesZone.equals(t.getMode()) || TriggerType.ChangesZoneAll.equals(t.getMode()))
+                            && "Battlefield".equals(t.getParam("Origin")))) { // TODO needs additional logic in case origin=Any
                 registerOneTrigger(t);
             }
         }

From 9735a56737ca9c78d09c3b9feb529ff95d8ffa14 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Thu, 23 Jun 2022 22:37:39 -0500
Subject: [PATCH 067/309] Update ghost_lantern_bind_spirit.txt

---
 forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
index df5aabde9cf..013edf4e70c 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
@@ -4,6 +4,7 @@ Types:Artifact Equipment
 K:Equip:1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature you control dies, put a +1/+1 counter on equipped creature.
 SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1
+DeckHas:Ability$Counters
 Oracle:Whenever a creature you control dies, put a +1/+1 counter on equipped creature.\nEquip {1}
 
 ALTERNATE

From 770719908dbd4d6a3a27614a65158771c4b258a5 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Thu, 23 Jun 2022 22:39:53 -0500
Subject: [PATCH 068/309] Update grell_philosopher.txt

---
 forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
index 71c3f987817..d616117de32 100644
--- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
@@ -1,4 +1,4 @@
-Name:Grell Philosopher
+Name:Grell Philosopher
 ManaCost:2 U
 Types:Creature Horror Wizard
 PT:1/4

From babca60f2f2145763000dc10fb40b88ee5aef742 Mon Sep 17 00:00:00 2001
From: Magpie <magpie514@users.noreply.github.com>
Date: Fri, 24 Jun 2022 08:20:22 +0200
Subject: [PATCH 069/309] Adventure mode - Adjustments * Easy mode starts with
 Leather Boots instead of a Jungle Shield. * Added boss flag for enemies. *
 Fixed fences without collision. * Purge all reward objects after leaving
 reward scenes, might fix reported leaks. * Added spellsmith. * Renamed Steel
 gear to Iron, renamed Mithril gear to Steel. * Catch incorrect or
 non-existent items on load. * Added ability to blacklist cards and editions
 from the card pool. This allows removing the Power Nine and other powerful or
 useless cards (like Commander specific ones). * UI: Gave selectbox a 9patch
 background. * Removed basic lands from rewards. * Some adjustments to player
 and enemy avatars. * Cleaning up of maps and removal of multi-area maps
 (cemeteries and crypt remain). * Better cleanup of stale data in NG+ and on
 loading saved games. * Random ColorID for fantasy mode. * Reorganized
 AdventurePlayer.java so it's easier to modify. * Colored bosses now give
 Moxen cards as opposed to items. The two final bosses still drop items. *
 Colorless Castle moved to closer to the center of the map. * Removed unused
 items. * Tweaked value for sold items. * Added Golem and Sliver shops. *
 Corrected some misaligned sprites in the shop atlas. * Added Skep with boss.
 * Added mage tower in blue areas that requires the blue key for some good
 treasure. * Update wastes and plains towns.

---
 .../adventure/character/EnemySprite.java      |   13 +-
 .../adventure/character/PlayerSprite.java     |   11 +-
 .../src/forge/adventure/data/ConfigData.java  |    1 +
 .../src/forge/adventure/data/EffectData.java  |   45 +-
 .../src/forge/adventure/data/EnemyData.java   |    2 +
 .../src/forge/adventure/data/RewardData.java  |   71 +-
 .../adventure/player/AdventurePlayer.java     |  404 ++++---
 .../src/forge/adventure/scene/DuelScene.java  |   20 +-
 .../forge/adventure/scene/InventoryScene.java |   23 +-
 .../forge/adventure/scene/RewardScene.java    |   25 +-
 .../src/forge/adventure/scene/SceneType.java  |    4 +-
 .../adventure/scene/SpellSmithScene.java      |  299 +++++
 .../src/forge/adventure/stage/Console.java    |   65 +-
 .../stage/ConsoleCommandInterpreter.java      |  171 ++-
 .../src/forge/adventure/stage/GameHUD.java    |    8 +-
 .../src/forge/adventure/stage/MapStage.java   |    7 +-
 .../src/forge/adventure/util/MapDialog.java   |    2 +-
 .../src/forge/adventure/util/RewardActor.java |    8 +-
 .../src/forge/adventure/util/UIActor.java     |   17 +
 .../src/forge/adventure/world/World.java      |   12 +-
 forge-gui/res/adventure/Shandalar/config.json |   51 +-
 .../decks/miniboss/sliver_shandalar.dck       |   30 +
 .../Shandalar/maps/main.tiled-project         |    4 +-
 .../Shandalar/maps/main.tiled-session         |  446 +++----
 .../adventure/Shandalar/maps/map/cave_16.tmx  |   39 -
 .../adventure/Shandalar/maps/map/cave_16B.tmx |   52 -
 .../Shandalar/maps/map/cave_16BL1.tmx         |   40 -
 .../Shandalar/maps/map/cave_16BL2.tmx         |   46 -
 .../Shandalar/maps/map/cave_16BL2D.tmx        |   73 --
 .../Shandalar/maps/map/cave_16BL2U.tmx        |   47 -
 .../Shandalar/maps/map/cave_16BR1.tmx         |   40 -
 .../Shandalar/maps/map/cave_16BR2.tmx         |   52 -
 .../Shandalar/maps/map/cave_16BR2D.tmx        |   46 -
 .../Shandalar/maps/map/cave_16BR2U1.tmx       |   46 -
 .../Shandalar/maps/map/cave_16BR2U2.tmx       |   58 -
 .../Shandalar/maps/map/cave_16BR3.tmx         |   40 -
 .../Shandalar/maps/map/cave_16BR3U.tmx        |   40 -
 .../adventure/Shandalar/maps/map/cave_16C.tmx |   46 -
 .../Shandalar/maps/map/cave_16CL.tmx          |   64 --
 .../adventure/Shandalar/maps/map/cave_16D.tmx |   53 -
 .../adventure/Shandalar/maps/map/cave_18.tmx  |   80 --
 .../adventure/Shandalar/maps/map/cave_18C.tmx |   62 -
 .../adventure/Shandalar/maps/map/cave_18E.tmx |   46 -
 .../adventure/Shandalar/maps/map/cave_18N.tmx |   46 -
 .../adventure/Shandalar/maps/map/cave_18W.tmx |   47 -
 .../adventure/Shandalar/maps/map/cave_21.tmx  |   39 -
 .../adventure/Shandalar/maps/map/cave_21B.tmx |   45 -
 .../adventure/Shandalar/maps/map/cave_21C.tmx |   76 --
 .../adventure/Shandalar/maps/map/cave_21D.tmx |   55 -
 .../adventure/Shandalar/maps/map/cave_23.tmx  |   44 -
 .../Shandalar/maps/map/cave_23A1.tmx          |   65 --
 .../Shandalar/maps/map/cave_23A10.tmx         |   78 --
 .../Shandalar/maps/map/cave_23A2.tmx          |   60 -
 .../Shandalar/maps/map/cave_23A3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23A4.tmx          |   64 --
 .../Shandalar/maps/map/cave_23A5.tmx          |   39 -
 .../Shandalar/maps/map/cave_23A6.tmx          |   45 -
 .../Shandalar/maps/map/cave_23A7.tmx          |   45 -
 .../Shandalar/maps/map/cave_23A8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23A9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B10.tmx         |   98 --
 .../Shandalar/maps/map/cave_23B2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B4.tmx          |   51 -
 .../Shandalar/maps/map/cave_23B5.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B6.tmx          |   57 -
 .../Shandalar/maps/map/cave_23B7.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23B9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C10.tmx         |   76 --
 .../Shandalar/maps/map/cave_23C2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C3.tmx          |   39 -
 .../Shandalar/maps/map/cave_23C4.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C5.tmx          |   39 -
 .../Shandalar/maps/map/cave_23C6.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C7.tmx          |   39 -
 .../Shandalar/maps/map/cave_23C8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23C9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23D1.tmx          |   51 -
 .../Shandalar/maps/map/cave_23D10.tmx         |   45 -
 .../Shandalar/maps/map/cave_23D2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23D3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23D4.tmx          |   45 -
 .../Shandalar/maps/map/cave_23D5.tmx          |   45 -
 .../Shandalar/maps/map/cave_23D6.tmx          |   57 -
 .../Shandalar/maps/map/cave_23D7.tmx          |   57 -
 .../Shandalar/maps/map/cave_23D8.tmx          |   57 -
 .../Shandalar/maps/map/cave_23D9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23E1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23E10.tmx         |   60 -
 .../Shandalar/maps/map/cave_23E2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23E3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23E4.tmx          |   45 -
 .../Shandalar/maps/map/cave_23E5.tmx          |   50 -
 .../Shandalar/maps/map/cave_23E6.tmx          |   57 -
 .../Shandalar/maps/map/cave_23E7.tmx          |   57 -
 .../Shandalar/maps/map/cave_23E8.tmx          |   57 -
 .../Shandalar/maps/map/cave_23E9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F10.tmx         |   39 -
 .../Shandalar/maps/map/cave_23F2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F4.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F5.tmx          |   51 -
 .../Shandalar/maps/map/cave_23F6.tmx          |   51 -
 .../Shandalar/maps/map/cave_23F7.tmx          |   51 -
 .../Shandalar/maps/map/cave_23F8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23F9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23G1.tmx          |   51 -
 .../Shandalar/maps/map/cave_23G10.tmx         |   45 -
 .../Shandalar/maps/map/cave_23G2.tmx          |   57 -
 .../Shandalar/maps/map/cave_23G3.tmx          |   57 -
 .../Shandalar/maps/map/cave_23G4.tmx          |   45 -
 .../Shandalar/maps/map/cave_23G5.tmx          |   57 -
 .../Shandalar/maps/map/cave_23G6.tmx          |   45 -
 .../Shandalar/maps/map/cave_23G7.tmx          |   51 -
 .../Shandalar/maps/map/cave_23G8.tmx          |   51 -
 .../Shandalar/maps/map/cave_23G9.tmx          |   51 -
 .../Shandalar/maps/map/cave_23H1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H10.tmx         |   45 -
 .../Shandalar/maps/map/cave_23H2.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H3.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H4.tmx          |   39 -
 .../Shandalar/maps/map/cave_23H5.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H6.tmx          |   39 -
 .../Shandalar/maps/map/cave_23H7.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23H9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23I1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23I10.tmx         |   45 -
 .../Shandalar/maps/map/cave_23I2.tmx          |   39 -
 .../Shandalar/maps/map/cave_23I3.tmx          |   51 -
 .../Shandalar/maps/map/cave_23I4.tmx          |   51 -
 .../Shandalar/maps/map/cave_23I5.tmx          |   45 -
 .../Shandalar/maps/map/cave_23I6.tmx          |   45 -
 .../Shandalar/maps/map/cave_23I7.tmx          |   75 --
 .../Shandalar/maps/map/cave_23I8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23I9.tmx          |   45 -
 .../Shandalar/maps/map/cave_23J1.tmx          |   45 -
 .../Shandalar/maps/map/cave_23J10.tmx         |   73 --
 .../Shandalar/maps/map/cave_23J2.tmx          |   60 -
 .../Shandalar/maps/map/cave_23J3.tmx          |   39 -
 .../Shandalar/maps/map/cave_23J4.tmx          |   39 -
 .../Shandalar/maps/map/cave_23J6.tmx          |   45 -
 .../Shandalar/maps/map/cave_23J7.tmx          |   45 -
 .../Shandalar/maps/map/cave_23J8.tmx          |   45 -
 .../Shandalar/maps/map/cave_23J9.tmx          |   45 -
 .../adventure/Shandalar/maps/map/cave_24.tmx  |   39 -
 .../adventure/Shandalar/maps/map/cave_24B.tmx |   42 -
 .../adventure/Shandalar/maps/map/cave_25.tmx  |   55 -
 .../adventure/Shandalar/maps/map/cave_25B.tmx |   61 -
 .../adventure/Shandalar/maps/map/cave_25C.tmx |   57 -
 .../Shandalar/maps/map/debug_map.tmx          |    5 +-
 .../Shandalar/maps/map/djinnpalace_3.tmx      |   40 -
 .../Shandalar/maps/map/djinnpalace_3B.tmx     |   48 -
 .../adventure/Shandalar/maps/map/fort_11.tmx  |   66 --
 .../adventure/Shandalar/maps/map/fort_11B.tmx |   70 --
 .../adventure/Shandalar/maps/map/fort_12.tmx  |   61 -
 .../adventure/Shandalar/maps/map/fort_12B.tmx |   65 --
 .../adventure/Shandalar/maps/map/grove_10.tmx |   55 -
 .../Shandalar/maps/map/grove_10L.tmx          |   62 -
 .../Shandalar/maps/map/grove_10R.tmx          |   87 --
 .../adventure/Shandalar/maps/map/grove_11.tmx |   55 -
 .../Shandalar/maps/map/grove_11R.tmx          |   80 --
 .../Shandalar/maps/map/grove_11U.tmx          |   62 -
 .../adventure/Shandalar/maps/map/grove_12.tmx |   78 --
 .../Shandalar/maps/map/grove_12B.tmx          |   74 --
 .../Shandalar/maps/map/grove_12C.tmx          |  116 --
 .../Shandalar/maps/map/magetower_1.tmx        |    8 +-
 .../Shandalar/maps/map/magetower_10.tmx       |   81 --
 .../Shandalar/maps/map/magetower_11.tmx       |   81 --
 .../Shandalar/maps/map/magetower_12.tmx       |   81 --
 .../Shandalar/maps/map/magetower_13.tmx       |  271 ++++-
 .../Shandalar/maps/map/magetower_7.tmx        |   39 -
 .../Shandalar/maps/map/magetower_7B.tmx       |   53 -
 .../Shandalar/maps/map/magetower_9.tmx        |   63 -
 .../Shandalar/maps/map/magetower_9B.tmx       |   55 -
 .../Shandalar/maps/map/magetower_9C.tmx       |   55 -
 .../Shandalar/maps/map/main_story/skep.tmx    |   88 ++
 .../Shandalar/maps/map/merfolkpool_6.tmx      |   71 --
 .../Shandalar/maps/map/merfolkpool_6B.tmx     |   45 -
 .../Shandalar/maps/map/plains_town.tmx        |   81 +-
 .../adventure/Shandalar/maps/map/portal_1.tmx |   78 --
 .../Shandalar/maps/map/portal_1B.tmx          |   69 --
 .../Shandalar/maps/map/portal_1B2.tmx         |   88 --
 .../Shandalar/maps/map/portal_1B3.tmx         |   82 --
 .../Shandalar/maps/map/portal_1B4.tmx         |   65 --
 .../Shandalar/maps/map/portal_1G.tmx          |   74 --
 .../Shandalar/maps/map/portal_1G2.tmx         |   50 -
 .../Shandalar/maps/map/portal_1G3.tmx         |   77 --
 .../Shandalar/maps/map/portal_1G4.tmx         |   73 --
 .../Shandalar/maps/map/portal_1R.tmx          |   74 --
 .../Shandalar/maps/map/portal_1R2.tmx         |   75 --
 .../Shandalar/maps/map/portal_1R3.tmx         |   69 --
 .../Shandalar/maps/map/portal_1R4.tmx         |   69 --
 .../Shandalar/maps/map/portal_1U.tmx          |   74 --
 .../Shandalar/maps/map/portal_1U2.tmx         |   55 -
 .../Shandalar/maps/map/portal_1U3.tmx         |   55 -
 .../Shandalar/maps/map/portal_1U4.tmx         |   54 -
 .../Shandalar/maps/map/portal_1W.tmx          |   74 --
 .../Shandalar/maps/map/portal_1W2.tmx         |   63 -
 .../Shandalar/maps/map/portal_1W3.tmx         |   46 -
 .../Shandalar/maps/map/portal_1W4.tmx         |   50 -
 .../adventure/Shandalar/maps/map/portal_2.tmx |   56 -
 .../Shandalar/maps/map/portal_2B.tmx          |   77 --
 .../Shandalar/maps/map/portal_2C.tmx          |   56 -
 .../Shandalar/maps/map/portal_2C2.tmx         |   45 -
 .../Shandalar/maps/map/portal_2D.tmx          |   60 -
 .../Shandalar/maps/map/portal_2E.tmx          |   50 -
 .../Shandalar/maps/map/portal_2F.tmx          |   50 -
 .../Shandalar/maps/map/portal_2G.tmx          |   49 -
 .../Shandalar/maps/map/vampirecastle_4.tmx    |   51 -
 .../Shandalar/maps/map/vampirecastle_4B.tmx   |   56 -
 .../Shandalar/maps/map/vampirecastle_4C.tmx   |   57 -
 .../Shandalar/maps/map/waste_town.tmx         |   43 +-
 .../Shandalar/maps/map/waste_town_2.tmx       |   46 -
 .../Shandalar/maps/map/waste_town_3.tmx       |   46 -
 .../adventure/Shandalar/maps/obj/scroll.tx    |    2 +-
 .../Shandalar/maps/obj/spellsmith.tx          |    5 +
 .../Shandalar/maps/tileset/buildings.atlas    |   27 +-
 .../Shandalar/maps/tileset/buildings.png      |  Bin 232587 -> 233577 bytes
 .../Shandalar/maps/tileset/buildings.xcf      |  Bin 764619 -> 766144 bytes
 .../adventure/Shandalar/maps/tileset/main.tsx |   91 +-
 .../res/adventure/Shandalar/skin/ui_skin.json |    3 +-
 .../Shandalar/sprites/boss/wsliver.atlas      |   32 +
 .../Shandalar/sprites/boss/wsliver.png        |  Bin 0 -> 13092 bytes
 .../Shandalar/sprites/heroes/avatar.png       |  Bin 44298 -> 70626 bytes
 .../adventure/Shandalar/sprites/items.atlas   |   21 +-
 .../res/adventure/Shandalar/sprites/items.png |  Bin 277193 -> 273671 bytes
 .../adventure/Shandalar/sprites/priest.png    |  Bin 1687 -> 12401 bytes
 .../adventure/Shandalar/ui/spellsmith.json    |  280 +++++
 .../res/adventure/Shandalar/ui/spellsmith.png |  Bin 0 -> 2040 bytes
 .../Shandalar/ui/spellsmith_portrait.json     |  280 +++++
 .../res/adventure/Shandalar/world/base.json   |   47 +-
 .../res/adventure/Shandalar/world/black.json  |    4 +-
 .../res/adventure/Shandalar/world/blue.json   |    9 +-
 .../adventure/Shandalar/world/enemies.json    |  292 +++--
 .../res/adventure/Shandalar/world/green.json  |    4 +-
 .../res/adventure/Shandalar/world/items.json  | 1022 +++++------------
 .../Shandalar/world/points_of_interest.json   |  328 +-----
 .../res/adventure/Shandalar/world/red.json    |    6 +-
 .../res/adventure/Shandalar/world/shops.json  |   39 +-
 .../res/adventure/Shandalar/world/waste.json  |    6 +-
 .../res/adventure/Shandalar/world/white.json  |    3 +-
 246 files changed, 2833 insertions(+), 12080 deletions(-)
 create mode 100644 forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
 create mode 100644 forge-gui/res/adventure/Shandalar/decks/miniboss/sliver_shandalar.dck
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_18.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_18C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_18E.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_18N.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_18W.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_21.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_21B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_21C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_21D.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23A9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23B9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23C9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23D9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23E9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23F9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23G9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23H9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I5.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23I9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J8.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_23J9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_24.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_24B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_25.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_25B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/cave_25C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/fort_11.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/fort_11B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/fort_12.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/fort_12B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_10L.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_10R.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_11.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_11R.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_11U.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_12.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_12B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/grove_12C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_10.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_11.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_12.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_7.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_7B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_9.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_9B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/magetower_9C.tmx
 create mode 100644 forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1B2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1B3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1B4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1G.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1G2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1G3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1G4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1R.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1R2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1R3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1R4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1U.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1U2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1U3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1U4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1W.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1W2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1W3.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_1W4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2C2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2D.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2E.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2F.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/portal_2G.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4B.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4C.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/waste_town_2.tmx
 delete mode 100644 forge-gui/res/adventure/Shandalar/maps/map/waste_town_3.tmx
 create mode 100644 forge-gui/res/adventure/Shandalar/maps/obj/spellsmith.tx
 create mode 100644 forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.atlas
 create mode 100644 forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.png
 create mode 100644 forge-gui/res/adventure/Shandalar/ui/spellsmith.json
 create mode 100644 forge-gui/res/adventure/Shandalar/ui/spellsmith.png
 create mode 100644 forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json

diff --git a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java
index 1a873fe741e..67e70e448c4 100644
--- a/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java
+++ b/forge-gui-mobile/src/forge/adventure/character/EnemySprite.java
@@ -8,7 +8,9 @@ import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.utils.Array;
+import com.google.common.base.Predicates;
 import forge.Forge;
+import forge.adventure.data.DialogData;
 import forge.adventure.data.EffectData;
 import forge.adventure.data.EnemyData;
 import forge.adventure.data.RewardData;
@@ -17,6 +19,9 @@ import forge.adventure.util.Current;
 import forge.adventure.util.MapDialog;
 import forge.adventure.util.Reward;
 import forge.card.CardRarity;
+import forge.card.CardRulesPredicates;
+import forge.deck.CardPool;
+import forge.deck.Deck;
 import forge.item.PaperCard;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
@@ -35,6 +40,7 @@ public class EnemySprite extends CharacterSprite {
     public EffectData effect; //Battle effect for this enemy. Similar to a player's blessing.
     public String nameOverride = ""; //Override name of this enemy in battles.
     public RewardData[] rewards; //Additional rewards for this enemy.
+    public DialogData.ConditionData spawnCondition; //Condition to spawn.
 
     public EnemySprite(EnemyData enemyData) {
         this(0,enemyData);
@@ -100,13 +106,16 @@ public class EnemySprite extends CharacterSprite {
             ret.add(new Reward(Reward.Type.Life, 1));
         } else {
             if(data.rewards != null) { //Collect standard rewards.
+                Deck enemyDeck = Current.latestDeck(); // By popular demand, remove basic lands from the reward pool.
+                CardPool deckNoBasicLands = enemyDeck.getMain().getFilteredPool(Predicates.compose(Predicates.not(CardRulesPredicates.Presets.IS_BASIC_LAND), PaperCard.FN_GET_RULES));
                 for (RewardData rdata : data.rewards) {
-                    ret.addAll(rdata.generate(false, (Current.latestDeck() != null ? Current.latestDeck().getMain().toFlatList() : null)));
+                    ret.addAll(rdata.generate(false, deckNoBasicLands.toFlatList() ));
                 }
             }
             if(rewards != null) { //Collect additional rewards.
                 for(RewardData rdata:rewards) {
-                    ret.addAll(rdata.generate(false,(Current.latestDeck()!=null? Current.latestDeck().getMain().toFlatList():null)));
+                    //Do not filter in case we want to FORCE basic lands. If it ever becomes a problem just repeat the same as above.
+                    ret.addAll(rdata.generate(false,(Current.latestDeck() != null ? Current.latestDeck().getMain().toFlatList() : null)));
                 }
             }
         }
diff --git a/forge-gui-mobile/src/forge/adventure/character/PlayerSprite.java b/forge-gui-mobile/src/forge/adventure/character/PlayerSprite.java
index eac20f7d387..9cc22f3f82e 100644
--- a/forge-gui-mobile/src/forge/adventure/character/PlayerSprite.java
+++ b/forge-gui-mobile/src/forge/adventure/character/PlayerSprite.java
@@ -25,9 +25,12 @@ public class PlayerSprite extends CharacterSprite {
                 PlayerSprite.this.updatePlayer();
             }
         });
+
         playerSpeed = Config.instance().getConfigData().playerBaseSpeed;
-        Current.player().onBlessing( () -> playerSpeedEquipmentModifier = Current.player().equipmentSpeed() );
-        Current.player().onEquipmentChanged( () -> playerSpeedEquipmentModifier=Current.player().equipmentSpeed() );
+
+        //Attach signals here.
+        Current.player().onBlessing(         () -> playerSpeedEquipmentModifier = Current.player().equipmentSpeed() );
+        Current.player().onEquipmentChanged( () -> playerSpeedEquipmentModifier = Current.player().equipmentSpeed() );
     }
 
     private void updatePlayer() {
@@ -60,13 +63,11 @@ public class PlayerSprite extends CharacterSprite {
         super.act(delta);
         direction.setLength(playerSpeed * delta * playerSpeedModifier*playerSpeedEquipmentModifier);
 
-        if(!direction.isZero())
-        {
+        if(!direction.isZero()) {
             gameStage.prepareCollision(pos(),direction,boundingRect);
             direction.set(gameStage.adjustMovement(direction,boundingRect));
             moveBy(direction.x, direction.y);
         }
-
     }
 
     public boolean isMoving() {
diff --git a/forge-gui-mobile/src/forge/adventure/data/ConfigData.java b/forge-gui-mobile/src/forge/adventure/data/ConfigData.java
index e8bbf34636d..007cf58b0ee 100644
--- a/forge-gui-mobile/src/forge/adventure/data/ConfigData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/ConfigData.java
@@ -20,4 +20,5 @@ public class ConfigData {
     public DifficultyData[] difficulties;
     public RewardData legalCards;
     public List<String> restrictedCards;
+    public List<String> restrictedEditions;
 }
diff --git a/forge-gui-mobile/src/forge/adventure/data/EffectData.java b/forge-gui-mobile/src/forge/adventure/data/EffectData.java
index e09214a0657..a41f9e7bfc1 100644
--- a/forge-gui-mobile/src/forge/adventure/data/EffectData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/EffectData.java
@@ -17,21 +17,20 @@ public class EffectData implements Serializable {
     //Map only effects.
     public boolean colorView = false;    //Allows to display enemy colors on the map.
     public float moveSpeed = 1.0f;       //Change of movement speed. Map only.
+    public float goldModifier = -1.0f;   //Modifier for shop discounts.
+    public int cardRewardBonus = 0;    //Bonus "DeckCard" drops. Max 3.
+
     //Opponent field.
     public EffectData opponent;          //Effects to be applied to the opponent's side.
 
-    public EffectData()
-    {
-
-    }
+    public EffectData() {}
     public EffectData(EffectData effect) {
-
         name=effect.name;
         lifeModifier=effect.lifeModifier;
         changeStartCards=effect.changeStartCards;
         startBattleWithCard=effect.startBattleWithCard;
         colorView=effect.colorView;
-        opponent=opponent==null?null:new EffectData(effect.opponent);
+        opponent = (effect.opponent == null) ? null : new EffectData(effect.opponent);
     }
 
     public Array<IPaperCard> startBattleWithCards() {
@@ -52,29 +51,31 @@ public class EffectData implements Serializable {
     }
 
     public String cardNames() {
-        String ret = "";
+        StringBuilder ret = new StringBuilder();
         Array<IPaperCard> array=startBattleWithCards();
         for(int i =0;i<array.size;i++) {
-            ret+=array.get(i).toString();
-            if(i!=array.size-1) ret+=" , ";
+            ret.append(array.get(i).toString());
+            if(i!=array.size-1) ret.append(" , ");
         }
-        return ret;
+        return ret.toString();
     }
 
     public String getDescription() {
         String description = "";
-        if(this.name != null && !this.name.isEmpty())
-            description += this.name + "\n";
-        if(this.colorView)
-            description += "Manasight.\n";
-        if(this.lifeModifier != 0)
-            description += "Life: " + ((this.lifeModifier > 0) ? "+" : "") + this.lifeModifier + "\n";
-        if(this.startBattleWithCard != null && this.startBattleWithCard.length != 0)
-            description+="Cards on battlefield: \n" + this.cardNames() + "\n";
-        if(this.moveSpeed!=0 && this.moveSpeed != 1)
-            description+="Movement speed: " + ((this.lifeModifier > 0) ? "+" : "") + Math.round((this.moveSpeed-1.f)*100) + "%\n";
-        if(this.changeStartCards != 0)
-            description+="Starting hand: " + this.changeStartCards + "\n";
+        if(name != null && !name.isEmpty()) description += name + "\n";
+        if(colorView) description += "Manasight.\n";
+        if(lifeModifier != 0)
+            description += "Life: " + ((lifeModifier > 0) ? "+" : "") + lifeModifier + "\n";
+        if(startBattleWithCard != null && startBattleWithCard.length != 0)
+            description+="Cards on battlefield: \n" + cardNames() + "\n";
+        if(changeStartCards != 0)
+            description+="Starting hand: " + changeStartCards + "\n";
+        if(moveSpeed!=0 && moveSpeed != 1)
+            description+="Movement speed: " + ((lifeModifier > 0) ? "+" : "") + Math.round((moveSpeed-1.f)*100) + "%\n";
+        if(goldModifier > 0.0f)
+            description+="Shop discount: x" + (goldModifier) + "\n";
+        if(cardRewardBonus > 0)
+            description += "Bonus enemy deck rewards: +" + (cardRewardBonus) + "\n";
         if(this.opponent != null) {
             String oppEffect = this.opponent.getDescription();
             description += "Gives Opponent:\n";
diff --git a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
index d6d8edda161..7256a8e8a3f 100644
--- a/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/EnemyData.java
@@ -14,6 +14,7 @@ public class EnemyData {
     public String deck;
     public boolean copyPlayerDeck = false;
     public String ai;
+    public boolean boss = false;
     public float spawnRate;
     public float difficulty;
     public float speed;
@@ -28,6 +29,7 @@ public class EnemyData {
         sprite         = enemyData.sprite;
         deck           = enemyData.deck;
         ai             = enemyData.ai;
+        boss           = enemyData.boss;
         spawnRate      = enemyData.spawnRate;
         copyPlayerDeck = enemyData.copyPlayerDeck;
         difficulty     = enemyData.difficulty;
diff --git a/forge-gui-mobile/src/forge/adventure/data/RewardData.java b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
index bdef49bfccc..a968e4c8d09 100644
--- a/forge-gui-mobile/src/forge/adventure/data/RewardData.java
+++ b/forge-gui-mobile/src/forge/adventure/data/RewardData.java
@@ -66,31 +66,39 @@ public class RewardData {
     private static Iterable<PaperCard> allCards;
     private static Iterable<PaperCard> allEnemyCards;
 
+    private void initializeAllCards(){
+        RewardData legals = Config.instance().getConfigData().legalCards;
+        if(legals==null) allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline();
+        else             allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline(),  new CardUtil.CardPredicate(legals, true));
+        //Filter out specific cards.
+        allCards = Iterables.filter(allCards,  new Predicate<PaperCard>() {
+            @Override
+            public boolean apply(PaperCard input){
+                if(input == null) return false;
+                if(Config.instance().getConfigData().restrictedEditions.contains(input.getEdition())) return false;
+                return !Config.instance().getConfigData().restrictedCards.contains(input.getName());
+            }
+        });
+        //Filter AI cards for enemies.
+        allEnemyCards=Iterables.filter(allCards, new Predicate<PaperCard>() {
+            @Override
+            public boolean apply(PaperCard input) {
+                if (input == null) return false;
+                return !input.getRules().getAiHints().getRemAIDecks();
+            }
+        });
+    }
+
+    public Iterable<PaperCard> getAllCards() {
+        if(allCards == null) initializeAllCards();
+        return allCards;
+    }
+
     public Array<Reward> generate(boolean isForEnemy) {
         return generate(isForEnemy, null);
     }
     public Array<Reward> generate(boolean isForEnemy, Iterable<PaperCard> cards) {
-        if(allCards==null) {
-            RewardData legals = Config.instance().getConfigData().legalCards;
-            if(legals==null) allCards = FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline();
-            else             allCards = Iterables.filter(FModel.getMagicDb().getCommonCards().getUniqueCardsNoAltNoOnline(),  new CardUtil.CardPredicate(legals, true));
-            //Filter out specific cards.
-            allCards = Iterables.filter(allCards,  new Predicate<PaperCard>() {
-                @Override
-                public boolean apply(PaperCard input){
-                    if(input == null) return false;
-                    return !Config.instance().getConfigData().restrictedCards.contains(input.getName());
-                }
-            });
-            //Filter AI cards for enemies.
-            allEnemyCards=Iterables.filter(allCards, new Predicate<PaperCard>() {
-                @Override
-                public boolean apply(PaperCard input) {
-                    if (input == null) return false;
-                    return !input.getRules().getAiHints().getRemAIDecks();
-                }
-            });
-        }
+        if(allCards==null) initializeAllCards();
         Array<Reward> ret=new Array<>();
         if(probability == 0 || WorldSave.getCurrentSave().getWorld().getRandom().nextFloat() <= probability) {
             if(type==null || type.isEmpty())
@@ -114,12 +122,12 @@ public class RewardData {
             switch(type) {
                 case "card":
                 case "randomCard":
-                    if( cardName!=null && !cardName.isEmpty() ) {
-                        for(int i=0;i<count+addedCount;i++) {
+                    if( cardName != null && !cardName.isEmpty() ) {
+                        for(int i = 0; i < count + addedCount; i++) {
                             ret.add(new Reward(StaticData.instance().getCommonCards().getCard(cardName)));
                         }
                     } else {
-                        for(PaperCard card:CardUtil.generateCards(isForEnemy?allEnemyCards:allCards,this, count+addedCount)) {
+                        for(PaperCard card:CardUtil.generateCards(isForEnemy ? allEnemyCards:allCards,this, count+addedCount)) {
                             ret.add(new Reward(card));
                         }
                     }
@@ -133,7 +141,7 @@ public class RewardData {
                     break;
                 case "deckCard":
                     if(cards == null) return ret;
-                    for(PaperCard card: CardUtil.generateCards(cards,this, count+addedCount)) {
+                    for(PaperCard card: CardUtil.generateCards(cards,this, count + addedCount + Current.player().bonusDeckCards() )) {
                         ret.add(new Reward(card));
                     }
                     break;
@@ -148,23 +156,18 @@ public class RewardData {
         return ret;
     }
 
-    static public List<PaperCard> generateAllCards(Iterable<RewardData> dataList, boolean isForEnemy)
-    {
-
+    static public List<PaperCard> generateAllCards(Iterable<RewardData> dataList, boolean isForEnemy) {
         return rewardsToCards(generateAll(dataList, isForEnemy));
     }
-    static public Iterable<Reward> generateAll(Iterable<RewardData> dataList, boolean isForEnemy)
-    {
+    static public Iterable<Reward> generateAll(Iterable<RewardData> dataList, boolean isForEnemy) {
         Array<Reward> ret=new Array<Reward>();
         for (RewardData data:dataList)
             ret.addAll(data.generate(isForEnemy));
         return ret;
     }
-    static public List<PaperCard> rewardsToCards(Iterable<Reward> dataList)
-    {
+    static public List<PaperCard> rewardsToCards(Iterable<Reward> dataList) {
         ArrayList<PaperCard> ret=new ArrayList<PaperCard>();
-        for (Reward data:dataList)
-        {
+        for (Reward data:dataList) {
             ret.add(data.getCard());
         }
         return ret;
diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index 572b65a43a7..42e5f08ce5f 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -14,6 +14,7 @@ import forge.deck.DeckSection;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
 import forge.util.ItemPool;
+import forge.util.MyRandom;
 
 import java.io.Serializable;
 import java.util.*;
@@ -22,86 +23,120 @@ import java.util.*;
  * Class that represents the player (not the player sprite)
  */
 public class AdventurePlayer implements Serializable, SaveFileContent {
-    private enum ColorID { COLORLESS, WHITE, BLACK, BLUE, RED, GREEN }
     public static final int NUMBER_OF_DECKS=10;
+    private enum ColorID { COLORLESS, WHITE, BLACK, BLUE, RED, GREEN }
 
-    private Deck deck;
-    private int avatarIndex;
+    // Player profile data.
+    private String name;
     private int heroRace;
+    private int avatarIndex;
     private boolean isFemale;
+    private ColorID colorIdentity = ColorID.COLORLESS;
+
+    // Deck data
+    private Deck deck;
+    private final Deck[] decks = new Deck[NUMBER_OF_DECKS];
+    private int selectedDeckIndex = 0;
+    private final DifficultyData difficultyData = new DifficultyData();
+
+    // Game data.
     private float worldPosX;
     private float worldPosY;
-    private String name;
-    private ColorID colorIdentity = ColorID.COLORLESS;
-    private int gold=0;
-    private int maxLife=20;
-    private int life=20;
-    private int selectedDeckIndex=0;
-    private Map<String, Byte> questFlags = new HashMap<>();
+    private int gold   =  0;
+    private int maxLife= 20;
+    private int life   = 20;
     private EffectData blessing; //Blessing to apply for next battle.
-    private PlayerStatistic statistic = new PlayerStatistic();
-    private Deck[] decks=new Deck[NUMBER_OF_DECKS];
-    private final DifficultyData difficultyData=new DifficultyData();
+    private final PlayerStatistic statistic    = new PlayerStatistic();
+    private final Map<String, Byte> questFlags = new HashMap<>();
 
     private final Array<String> inventoryItems=new Array<>();
     private final HashMap<String,String> equippedItems=new HashMap<>();
-    private boolean fantasyMode = false;
+
+    // Fantasy/Chaos mode settings.
+    private boolean fantasyMode     = false;
     private boolean announceFantasy = false;
 
-    public AdventurePlayer() {
-        for(int i=0;i<NUMBER_OF_DECKS;i++) {
-            decks[i]=new Deck("Empty Deck");
-        }
+    // Signals
+    SignalList onLifeTotalChangeList = new SignalList();
+    SignalList onGoldChangeList      = new SignalList();
+    SignalList onPlayerChangeList    = new SignalList();
+    SignalList onEquipmentChange     = new SignalList();
+    SignalList onBlessing            = new SignalList();
+
+    public AdventurePlayer() { clear(); }
+
+    public PlayerStatistic getStatistic(){ return statistic; }
+
+    private void clearDecks() {
+        for(int i=0; i < NUMBER_OF_DECKS; i++) decks[i] = new Deck("Empty Deck");
+        deck              = decks[0];
+        selectedDeckIndex = 0;
     }
 
-    public PlayerStatistic getStatistic(){return statistic;}
+    private void clear() {
+        //Ensure sensitive gameplay data is properly reset between games.
+        //Reset all properties HERE.
+        fantasyMode       = false;
+        announceFantasy   = false;
+        blessing          = null;
+        gold              = 0;
+        maxLife           = 20;
+        life              = 20;
+        clearDecks();
+        inventoryItems.clear();
+        equippedItems.clear();
+        questFlags.clear();
+        cards.clear();
+        statistic.clear();
+        newCards.clear();
+    }
 
-    static public AdventurePlayer current()
-    {
+
+    static public AdventurePlayer current() {
         return WorldSave.getCurrentSave().getPlayer();
     }
+
     private final CardPool cards=new CardPool();
     private final ItemPool<InventoryItem> newCards=new ItemPool<>(InventoryItem.class);
 
     public void create(String n, int startingColorIdentity, Deck startingDeck, boolean male, int race, int avatar, boolean isFantasy, DifficultyData difficultyData) {
-        inventoryItems.clear();
-        equippedItems.clear();
-        deck = startingDeck;
-        decks[0]=deck;
-        fantasyMode = isFantasy;
-        announceFantasy = fantasyMode;
-        gold =difficultyData.staringMoney;
-        cards.clear();
+        clear();
+        announceFantasy = fantasyMode = isFantasy; //Set Chaos mode first.
+
+        deck     = startingDeck;
+        decks[0] = deck;
+
         cards.addAllFlat(deck.getAllCardsInASinglePool().toFlatList());
-        maxLife=difficultyData.startingLife;
-        this.difficultyData.startingLife=difficultyData.startingLife;
-        this.difficultyData.staringMoney=difficultyData.staringMoney;
-        this.difficultyData.startingDifficulty=difficultyData.startingDifficulty;
-        this.difficultyData.name=difficultyData.name;
-        this.difficultyData.spawnRank = difficultyData.spawnRank;
-        this.difficultyData.enemyLifeFactor=difficultyData.enemyLifeFactor;
-        this.difficultyData.sellFactor=difficultyData.sellFactor;
-        life=maxLife;
+
+        this.difficultyData.startingLife       = difficultyData.startingLife;
+        this.difficultyData.staringMoney       = difficultyData.staringMoney;
+        this.difficultyData.startingDifficulty = difficultyData.startingDifficulty;
+        this.difficultyData.name               = difficultyData.name;
+        this.difficultyData.spawnRank          = difficultyData.spawnRank;
+        this.difficultyData.enemyLifeFactor    = difficultyData.enemyLifeFactor;
+        this.difficultyData.sellFactor         = difficultyData.sellFactor;
+
+        gold        = difficultyData.staringMoney;
+        name        = n;
+        heroRace    = race;
         avatarIndex = avatar;
-        heroRace = race;
-        isFemale = !male;
-        name = n;
-        //todo make coloridentity as colorset so if player is using multi color deck, get rewards based on the current selected deck color
-        setColorIdentity(fantasyMode ? 0 : startingColorIdentity + 1); //+1 because index 0 is colorless.
-        statistic.clear();
-        newCards.clear();
+        isFemale    = !male;
+
+        if(fantasyMode){ //Set a random ColorID in fantasy mode.
+           setColorIdentity(MyRandom.getRandom().nextInt(5)); // MyRandom to not interfere with the unstable RNG.
+        } else setColorIdentity(startingColorIdentity + 1); // +1 because index 0 is colorless.
+
+        life = maxLife = difficultyData.startingLife;
+
+        inventoryItems.addAll(difficultyData.startItems);
         onGoldChangeList.emit();
         onLifeTotalChangeList.emit();
-        blessing = null;
-        inventoryItems.addAll(difficultyData.startItems);
-        questFlags.clear();
     }
 
     public void setSelectedDeckSlot(int slot) {
-        if(slot>=0&&slot<NUMBER_OF_DECKS)
-        {
-            selectedDeckIndex=slot;
-            deck=decks[selectedDeckIndex];
+        if(slot>=0&&slot<NUMBER_OF_DECKS) {
+            selectedDeckIndex = slot;
+            deck = decks[selectedDeckIndex];
         }
     }
     public void updateDifficulty(DifficultyData diff) {
@@ -115,39 +150,51 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         this.difficultyData.sellFactor = diff.sellFactor;
         fullHeal();
     }
-    public int getSelectedDeckIndex() {
-        return selectedDeckIndex;
+
+    //Getters
+    public int getSelectedDeckIndex()     { return selectedDeckIndex; }
+    public Deck getSelectedDeck()         { return deck;              }
+    public Array<String> getItems()       { return inventoryItems;    }
+    public Deck getDeck(int index)        { return decks[index];      }
+    public CardPool getCards()            { return cards;             }
+    public String getName()               { return name;              }
+    public float getWorldPosX()           { return worldPosX;         }
+    public float getWorldPosY()           { return worldPosY;         }
+    public int getGold()                  { return gold;              }
+    public int getLife()                  { return life;              }
+    public int getMaxLife()               { return maxLife;           }
+    public @Null EffectData getBlessing() { return blessing;          }
+
+    public Collection<String> getEquippedItems() { return equippedItems.values(); }
+    public ItemPool<InventoryItem> getNewCards() { return newCards;               }
+
+    public String getColorIdentity(){
+        switch (colorIdentity){
+            case BLUE     : return "U";
+            case GREEN    : return "G";
+            case RED      : return "R";
+            case BLACK    : return "B";
+            case WHITE    : return "W";
+            case COLORLESS: default: return "C"; //You are either Ugin or an Eldrazi. Nice.
+        }
     }
-    public Deck getSelectedDeck() {
-        return deck;
-    }
-    public Array<String> getItems() {
-        return inventoryItems;
-    }
-    public Deck getDeck(int index) {
-        return decks[index];
-    }
-    public CardPool getCards() {
-        return cards;
+
+    public String getColorIdentityLong(){
+        switch (colorIdentity){
+            case BLUE     : return "blue";
+            case GREEN    : return "green";
+            case RED      : return "red";
+            case BLACK    : return "black";
+            case WHITE    : return "white";
+            case COLORLESS: default: return "colorless";
+        }
     }
 
 
-    public String getName() {
-        return name;
-    }
-
-    public float getWorldPosX() {
-        return worldPosX;
-    }
-
+    //Setters
     public void setWorldPosX(float worldPosX) {
         this.worldPosX = worldPosX;
     }
-
-    public float getWorldPosY() {
-        return worldPosY;
-    }
-
     public void setWorldPosY(float worldPosY) {
         this.worldPosY = worldPosY;
     }
@@ -174,30 +221,12 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         }
     }
 
-    public String getColorIdentity(){
-        switch (colorIdentity){
-            case BLUE     : return "U";
-            case GREEN    : return "G";
-            case RED      : return "R";
-            case BLACK    : return "B";
-            case WHITE    : return "W";
-            case COLORLESS: default: return "C"; //You are either Ugin or an Eldrazi. Nice.
-        }
-    }
 
-    public String getColorIdentityLong(){
-        switch (colorIdentity){
-            case BLUE     : return "blue";
-            case GREEN    : return "green";
-            case RED      : return "red";
-            case BLACK    : return "black";
-            case WHITE    : return "white";
-            case COLORLESS: default: return "colorless";
-        }
-    }
+
 
     @Override
     public void load(SaveFileData data) {
+        clear(); //Reset player data.
         this.statistic.load(data.readSubData("statistic"));
         this.difficultyData.startingLife=data.readInt("startingLife");
         this.difficultyData.staringMoney=data.readInt("staringMoney");
@@ -208,44 +237,55 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         if(this.difficultyData.sellFactor==0)
             this.difficultyData.sellFactor=0.2f;
 
-        name = data.readString("name");
-        worldPosX = data.readFloat("worldPosX");
-        worldPosY = data.readFloat("worldPosY");
-
+        name        = data.readString("name");
+        heroRace    = data.readInt("heroRace");
         avatarIndex = data.readInt("avatarIndex");
-        heroRace = data.readInt("heroRace");
-        isFemale = data.readBool("isFemale");
-        fantasyMode = data.containsKey("fantasyMode") ? data.readBool("fantasyMode") : false;
-        announceFantasy = data.containsKey("announceFantasy") ? data.readBool("announceFantasy") : false;
-        colorIdentity = ColorID.COLORLESS;
-        if(data.containsKey("colorIdentity"))
-            setColorIdentity(data.readString("colorIdentity"));
-        gold = data.readInt("gold");
-        life = data.readInt("life");
-        maxLife = data.readInt("maxLife");
-        blessing = null;
+        isFemale    = data.readBool("isFemale");
+        if(data.containsKey("colorIdentity")) setColorIdentity(data.readString("colorIdentity"));
+        else colorIdentity = ColorID.COLORLESS;
+
+        gold        = data.readInt("gold");
+        maxLife     = data.readInt("maxLife");
+        life        = data.readInt("life");
+        worldPosX   = data.readFloat("worldPosX");
+        worldPosY   = data.readFloat("worldPosY");
+
         if(data.containsKey("blessing")) blessing = (EffectData)data.readObject("blessing");
-        inventoryItems.clear();
-        equippedItems.clear();
+
         if(data.containsKey("inventory")) {
             String[] inv=(String[])data.readObject("inventory");
-            inventoryItems.addAll(inv);
+            //Prevent items with wrong names from getting through. Hell breaks loose if it causes null pointers.
+            //This only needs to be done on load.
+            for(String i : inv){
+                if(ItemData.getItem(i) != null) inventoryItems.add(i);
+                else {
+                    System.err.printf("Cannot find item name %s\n", i);
+                    //Allow official© permission for the player to get a refund. We will allow it this time.
+                    //TODoooo: Divine retribution if the player refunds too much. Use the orbital laser cannon.
+                    System.out.println("Developers have blessed you! You are allowed to cheat the cost of the item back!");
+                }
+            }
         }
         if(data.containsKey("equippedSlots") && data.containsKey("equippedItems")) {
             String[] slots=(String[])data.readObject("equippedSlots");
             String[] items=(String[])data.readObject("equippedItems");
 
             assert(slots.length==items.length);
+            //Like above, prevent items with wrong names. If it triggered in inventory it'll trigger here as well.
             for(int i=0;i<slots.length;i++) {
-                equippedItems.put(slots[i],items[i]);
+                if(ItemData.getItem(items[i]) != null)
+                    equippedItems.put(slots[i],items[i]);
+                else {
+                    System.err.printf("Cannot find equip name %s\n", items[i]);
+                }
             }
         }
+
         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"))));
 
-        questFlags.clear();
         if(data.containsKey("questFlagsKey") && data.containsKey("questFlagsValue")){
             String[] keys = (String[]) data.readObject("questFlagsKey");
             Byte[] values = (Byte[]) data.readObject("questFlagsValue");
@@ -256,11 +296,9 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         }
 
         for(int i=0;i<NUMBER_OF_DECKS;i++) {
-            if(!data.containsKey("deck_name_"+i)) {
-                if(i==0)
-                    decks[i]=deck;
-                else
-                    decks[i]=new Deck("Empty Deck");
+            if(!data.containsKey("deck_name_" + i)) {
+                if(i==0) decks[i] = deck;
+                else     decks[i] = new Deck("Empty Deck");
                 continue;
             }
             decks[i] = new Deck(data.readString("deck_name_"+i));
@@ -269,20 +307,20 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
                 decks[i].getOrCreate(DeckSection.Sideboard).addAll(CardPool.fromCardList(Lists.newArrayList((String[])data.readObject("sideBoardCards_"+i))));
         }
         setSelectedDeckSlot(data.readInt("selectedDeckIndex"));
-
-        cards.clear();
         cards.addAll(CardPool.fromCardList(Lists.newArrayList((String[])data.readObject("cards"))));
 
-        newCards.clear();
+        fantasyMode     = data.containsKey("fantasyMode")     ? data.readBool("fantasyMode")     : false;
+        announceFantasy = data.containsKey("announceFantasy") ? data.readBool("announceFantasy") : false;
+
         onLifeTotalChangeList.emit();
         onGoldChangeList.emit();
+        onBlessing.emit();
     }
 
     @Override
     public SaveFileData save() {
         SaveFileData data= new SaveFileData();
 
-
         data.store("statistic",this.statistic.save());
         data.store("startingLife",this.difficultyData.startingLife);
         data.store("staringMoney",this.difficultyData.staringMoney);
@@ -291,23 +329,23 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         data.store("enemyLifeFactor",this.difficultyData.enemyLifeFactor);
         data.store("sellFactor",this.difficultyData.sellFactor);
 
-
         data.store("name",name);
-        data.store("worldPosX",worldPosX);
-        data.store("worldPosY",worldPosY);
-        data.store("avatarIndex",avatarIndex);
         data.store("heroRace",heroRace);
+        data.store("avatarIndex",avatarIndex);
         data.store("isFemale",isFemale);
+        data.store("colorIdentity", getColorIdentity());
+
         data.store("fantasyMode",fantasyMode);
         data.store("announceFantasy",announceFantasy);
-        data.store("colorIdentity", getColorIdentity());
+
+        data.store("worldPosX",worldPosX);
+        data.store("worldPosY",worldPosY);
         data.store("gold",gold);
         data.store("life",life);
         data.store("maxLife",maxLife);
         data.store("deckName",deck.getName());
 
         data.storeObject("inventory",inventoryItems.toArray(String.class));
-        data.storeObject("blessing", blessing);
 
         ArrayList<String> slots=new ArrayList<>();
         ArrayList<String> items=new ArrayList<>();
@@ -318,6 +356,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         data.storeObject("equippedSlots",slots.toArray(new String[0]));
         data.storeObject("equippedItems",items.toArray(new String[0]));
 
+        data.storeObject("blessing", blessing);
+
         //Save quest flags.
         ArrayList<String> questFlagsKey = new ArrayList<>();
         ArrayList<Byte> questFlagsValue  = new ArrayList<>();
@@ -331,9 +371,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         data.storeObject("deckCards",deck.getMain().toCardList("\n").split("\n"));
         if(deck.get(DeckSection.Sideboard)!=null)
             data.storeObject("sideBoardCards",deck.get(DeckSection.Sideboard).toCardList("\n").split("\n"));
-        for(int i=0;i<NUMBER_OF_DECKS;i++)
-        {
-
+        for(int i=0;i<NUMBER_OF_DECKS;i++) {
             data.store("deck_name_"+i,decks[i].getName());
             data.storeObject("deck_"+i,decks[i].getMain().toCardList("\n").split("\n"));
             if(decks[i].get(DeckSection.Sideboard)!=null)
@@ -380,21 +418,11 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         }
     }
 
-    SignalList onLifeTotalChangeList=new SignalList();
-    SignalList onGoldChangeList=new SignalList();
-    SignalList onPlayerChangeList=new SignalList();
-    SignalList onEquipmentChange=new SignalList();
-    SignalList onBlessing=new SignalList();
-
     private void addGold(int goldCount) {
         gold+=goldCount;
         onGoldChangeList.emit();
     }
 
-    public int getGold() {
-        return gold;
-    }
-
     public void onLifeChange(Runnable  o) {
         onLifeTotalChangeList.add(o);
         o.run();
@@ -419,14 +447,6 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         o.run();
     }
 
-    public int getLife() {
-        return life;
-    }
-
-    public int getMaxLife() {
-        return maxLife;
-    }
-
     public void heal(int amount) {
         life = Math.min(life + amount, maxLife);
         onLifeTotalChangeList.emit();
@@ -443,15 +463,15 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         onGoldChangeList.emit();
     }
     public void addMaxLife(int count) {
-        maxLife+=count;
-        life+=count;
+        maxLife += count;
+        life    += count;
         onLifeTotalChangeList.emit();
     }
     public void giveGold(int price) {
         takeGold(-price);
     }
     public void takeGold(int price) {
-        gold-=price;
+        gold -= price;
         onGoldChangeList.emit();
     }
 
@@ -465,8 +485,6 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         onBlessing.emit();
     }
 
-    public @Null EffectData getBlessing(){ return blessing; }
-
     public boolean hasBlessing(String name){ //Checks for a named blessing.
         //It is not necessary to name all blessings, only the ones you'd want to check for.
         if(blessing == null) return false;
@@ -497,60 +515,56 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return false;
     }
 
+    public int bonusDeckCards() {
+        int result = 0;
+        for(String name:equippedItems.values()) {
+            ItemData data=ItemData.getItem(name);
+            if(data != null && data.effect.cardRewardBonus > 0) result += data.effect.cardRewardBonus;
+        }
+        if(blessing != null) {
+            if(blessing.cardRewardBonus > 0) result += blessing.cardRewardBonus;
+        }
+        return Math.max(result, 3);
+    }
 
     public DifficultyData getDifficulty() {
         return difficultyData;
     }
 
     public void renameDeck( String text) {
-
         deck = (Deck)deck.copyTo(text);
         decks[selectedDeckIndex]=deck;
     }
 
-    public ItemPool<InventoryItem> getNewCards() {
-        return newCards;
-    }
-    public int cardSellPrice(PaperCard card)
-    {
-        return (int) (CardUtil.getCardPrice(card)*difficultyData.sellFactor);
+    public int cardSellPrice(PaperCard card) {
+        return (int)(CardUtil.getCardPrice(card)*difficultyData.sellFactor);
     }
 
     public void sellCard(PaperCard card, Integer result) {
-        float price= CardUtil.getCardPrice(card)*result;
-        price=difficultyData.sellFactor*price;
-        cards.remove(card,  result);
-        addGold((int) price);
+        float price = CardUtil.getCardPrice(card) * result;
+        price *= difficultyData.sellFactor;
+        cards.remove(card, result);
+        addGold((int)price);
     }
 
     public void removeItem(String name) {
-        if(name==null||name.equals(""))return;
+        if(name == null || name.equals("")) return;
         inventoryItems.removeValue(name,false);
-        if(equippedItems.values().contains(name)&&!inventoryItems.contains(name,false))
-        {
+        if(equippedItems.values().contains(name) && !inventoryItems.contains(name,false)) {
             equippedItems.values().remove(name);
         }
     }
 
     public void equip(ItemData item) {
-        if(equippedItems.get(item.equipmentSlot)!=null&&equippedItems.get(item.equipmentSlot).equals(item.name))
-        {
+        if(equippedItems.get(item.equipmentSlot) != null && equippedItems.get(item.equipmentSlot).equals(item.name)) {
             equippedItems.remove(item.equipmentSlot);
-        }
-        else
-        {
+        } else {
             equippedItems.put(item.equipmentSlot,item.name);
         }
         onEquipmentChange.emit();
     }
 
-    public String itemInSlot(String key) {
-        return equippedItems.get(key);
-    }
-
-    public Collection<String> getEquippedItems() {
-        return  equippedItems.values();
-    }
+    public String itemInSlot(String key) { return equippedItems.get(key); }
 
     public float equipmentSpeed() {
         float factor=1.0f;
@@ -566,6 +580,24 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return factor;
     }
 
+    public float goldModifier(boolean sale) {
+        float factor = 1.0f;
+        for(String name:equippedItems.values()) {
+            ItemData data=ItemData.getItem(name);
+            if(data != null && data.effect.goldModifier > 0.0)  //Avoid negative modifiers.
+                factor *= data.effect.goldModifier;
+        }
+        if(blessing != null) { //If a blessing gives speed, take it into account.
+            if(blessing.goldModifier > 0.0)
+                factor *= blessing.goldModifier;
+        }
+        if(sale) return Math.max(1.0f + (1.0f - factor), 2.5f);
+        return Math.max(factor, 0.25f);
+    }
+    public float goldModifier(){
+        return goldModifier(false);
+    }
+
     public boolean hasItem(String name) {
         return inventoryItems.contains(name, false);
     }
@@ -578,6 +610,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         return true;
     }
 
+
+    // Quest functions.
     public void setQuestFlag(String key, int value){
         questFlags.put(key, (byte) value);
     }
diff --git a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
index 65716571865..20dcc49108e 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java
@@ -45,7 +45,6 @@ import java.util.*;
  * Forge screen scene that contains the duel screen
  */
 public class DuelScene extends ForgeScene {
-
     //GameLobby lobby;
     HostedMatch hostedMatch;
     EnemySprite enemy;
@@ -59,13 +58,10 @@ public class DuelScene extends ForgeScene {
     List<IPaperCard> AIExtras = new ArrayList<>();
 
 
-    public DuelScene() {
-
-    }
+    public DuelScene() {}
 
     @Override
-    public void dispose() {
-    }
+    public void dispose() {}
 
     public boolean hasCallbackExit() {
         return callbackExit;
@@ -88,7 +84,7 @@ public class DuelScene extends ForgeScene {
                     "Thought you could beat me?  Whew, talk about conceited.","*Yawn* ... Huh? It's over already? But I just woke up!",
                     "Next time bring an army. It might give you a chance." ,"The reason you lost is quite simple...",
                     "Is that all you can do?","You need to learn more to stand a chance.","You weren't that bad.","You made an effort at least.",
-                    "From today, you can call me teacher.");
+                    "From today, you can call me teacher.", "Hmph, predictable!", "I haven't used a fraction of my REAL power!" );
             String message = Aggregates.random(insult);
             FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemyName, new FBufferedImage(120, 120) {
                 @Override
@@ -128,7 +124,7 @@ public class DuelScene extends ForgeScene {
     }
     void addEffects(RegisteredPlayer player,Array<EffectData> effects) {
         if( effects == null ) return;
-        //Apply various effects.
+        //Apply various combat effects.
         int lifeMod=0;
         int changeStartCards=0;
         Array<IPaperCard> startCards=new Array<>();
@@ -180,8 +176,12 @@ public class DuelScene extends ForgeScene {
         //Collect and add items effects first.
         for(String playerItem:advPlayer.getEquippedItems()) {
             ItemData item=ItemData.getItem(playerItem);
-            playerEffects.add(item.effect);
-            if(item.effect.opponent != null) oppEffects.add(item.effect.opponent);
+            if(item != null) {
+                playerEffects.add(item.effect);
+                if (item.effect.opponent != null) oppEffects.add(item.effect.opponent);
+            } else {
+                System.err.printf("Item %s not found.", playerItem);
+            }
         }
         if(enemy.getData().equipment!=null) {
             for(String oppItem:enemy.getData().equipment) {
diff --git a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
index dea63ec1147..6d03ba899fb 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
@@ -43,13 +43,14 @@ public class InventoryScene  extends UIScene {
     public void delete() {
 
         ItemData data = ItemData.getItem(itemLocation.get(selected));
-        Current.player().removeItem(data.name);
-
+        if(data != null) {
+            Current.player().removeItem(data.name);
+        }
         updateInventory();
 
     }
     public void equip() {
-        if(selected==null)return;
+        if(selected == null) return;
         ItemData data = ItemData.getItem(itemLocation.get(selected));
         Current.player().equip(data);
         updateInventory();
@@ -242,17 +243,19 @@ public class InventoryScene  extends UIScene {
                 }
             });
         }
-        for(Map.Entry<String, Button> slot :equipmentSlots.entrySet())
-        {
+        for(Map.Entry<String, Button> slot :equipmentSlots.entrySet()) {
             if(slot.getValue().getChildren().size>=2)
                 slot.getValue().removeActorAt(1,false);
             String equippedItem=Current.player().itemInSlot(slot.getKey());
-            if(equippedItem==null||equippedItem.equals(""))
+            if(equippedItem == null || equippedItem.equals(""))
                 continue;
-            Image img=new Image(ItemData.getItem(equippedItem).sprite());
-            img.setX((slot.getValue().getWidth()-img.getWidth())/2);
-            img.setY((slot.getValue().getHeight()-img.getHeight())/2);
-            slot.getValue().addActor(img);
+            ItemData item = ItemData.getItem(equippedItem);
+            if(item != null) {
+                Image img = new Image(item.sprite());
+                img.setX((slot.getValue().getWidth() - img.getWidth()) / 2);
+                img.setY((slot.getValue().getHeight() - img.getHeight()) / 2);
+                slot.getValue().addActor(img);
+            }
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
index 8f60ab6b771..9f693e86889 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
@@ -47,6 +47,17 @@ public class RewardScene extends UIScene {
     float flipCountDown = 1.0f;
     float exitCountDown = 0.0f; //Serves as additional check for when scene is exiting, so you can't double tap too fast.
 
+    public void quitScene() {
+        //There were reports of memory leaks after using the shop many times, so remove() everything on exit to be sure.
+        for(Actor A: new Array.ArrayIterator<>(generated)) {
+            if(A instanceof RewardActor){
+                ((RewardActor) A).dispose();
+                A.remove();
+            }
+        }
+        Forge.switchToLast();
+    }
+
     public boolean done() {
         GameHUD.getInstance().getTouchpad().setVisible(false);
         if (doneClicked) {
@@ -76,11 +87,11 @@ public class RewardScene extends UIScene {
                 doneClicked = true;
             } else {
                 clearGenerated();
-                Forge.switchToLast();
+                quitScene();
             }
         } else {
             clearGenerated();
-            Forge.switchToLast();
+            quitScene();
         }
         return true;
     }
@@ -102,9 +113,10 @@ public class RewardScene extends UIScene {
         stage.act(delta);
         ImageCache.allowSingleLoad();
         if (doneClicked) {
-            if (type == Type.Loot)
+            if (type == Type.Loot) {
                 flipCountDown -= Gdx.graphics.getDeltaTime();
                 exitCountDown += Gdx.graphics.getDeltaTime();
+            }
             if (flipCountDown <= 0) {
                 clearGenerated();
                 Forge.switchToLast();
@@ -135,10 +147,8 @@ public class RewardScene extends UIScene {
 
 
     public void loadRewards(Array<Reward> newRewards, Type type, ShopActor shopActor) {
-        this.type = type;
+        this.type   = type;
         doneClicked = false;
-
-
         for (Actor actor : new Array.ArrayIterator<>(generated)) {
             actor.remove();
             if (actor instanceof RewardActor) {
@@ -236,9 +246,7 @@ public class RewardScene extends UIScene {
                 if (currentRow != ((i + 1) / numberOfColumns))
                     yOff += doneButton.getHeight();
 
-
                 TextButton buyCardButton = new BuyButton(shopActor.getObjectId(), i, shopActor.isUnlimited()?null:shopActor.getMapStage().getChanges(), actor, doneButton);
-
                 generated.add(buyCardButton);
                 if (!skipCard) {
                     stage.addActor(buyCardButton);
@@ -283,6 +291,7 @@ public class RewardScene extends UIScene {
             setX(actor.getX());
             setY(actor.getY() - getHeight());
             price = CardUtil.getRewardPrice(actor.getReward());
+            price *= Current.player().goldModifier();
             setText("$ " + price);
             addListener(new ClickListener() {
                 @Override
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SceneType.java b/forge-gui-mobile/src/forge/adventure/scene/SceneType.java
index 66455737811..0bd3a81bc58 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SceneType.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SceneType.java
@@ -17,8 +17,8 @@ public enum SceneType {
     DeckSelectScene(new DeckSelectScene()),
     ShopScene(new ShopScene()),
     PlayerStatisticScene(new PlayerStatisticScene()),
-    InventoryScene(new InventoryScene());
-
+    InventoryScene(new InventoryScene()),
+    SpellSmithScene(new SpellSmithScene());
 
     public final Scene instance;
     SceneType(Scene scene) {
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
new file mode 100644
index 00000000000..d8422f97a14
--- /dev/null
+++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
@@ -0,0 +1,299 @@
+package forge.adventure.scene;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.*;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import forge.Forge;
+import forge.StaticData;
+import forge.adventure.data.RewardData;
+import forge.adventure.util.Config;
+import forge.adventure.util.Current;
+import forge.adventure.util.Reward;
+import forge.adventure.util.RewardActor;
+import forge.card.CardEdition;
+import forge.card.ColorSet;
+import forge.item.PaperCard;
+import forge.util.MyRandom;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+
+public class SpellSmithScene extends UIScene {
+    private List<PaperCard> cardPool = new ArrayList<>();
+    private Label goldLabel;
+    private TextButton pullButton;
+    private ScrollPane rewardDummy;
+    private RewardActor rewardActor;
+    SelectBox<CardEdition> editionList;
+    //Button containers.
+    final private HashMap<String, TextButton> rarityButtons = new HashMap<>();
+    final private HashMap<String, TextButton> costButtons   = new HashMap<>();
+    final private HashMap<String, TextButton> colorButtons  = new HashMap<>();
+    //Filter variables.
+    private String edition = "";
+    private String rarity  = "";
+    private int cost_low   = -1;
+    private int cost_high  = 9999;
+    //Other
+    private float basePrice  = 125f;
+    private int currentPrice = 0;
+
+    public SpellSmithScene() { super(Forge.isLandscapeMode() ? "ui/spellsmith.json" : "ui/spellsmith_portrait.json"); }
+
+    public boolean done() {
+        if(rewardActor != null) rewardActor.remove();
+        cardPool.clear(); //Get rid of cardPool, filtering is fast enough to justify keeping it cached.
+        Forge.switchToLast();
+        return true;
+    }
+
+    private boolean selectRarity(String what){
+        for(Map.Entry<String, TextButton> B : rarityButtons.entrySet())
+            B.getValue().setColor(Color.WHITE);
+        switch(what){
+            case "BCommon":
+                if(rarity.equals("C")) { rarity = ""; return false; }
+                rarity = "C"; break;
+            case "BUncommon":
+                if(rarity.equals("U")) { rarity = ""; return false; }
+                rarity = "U"; break;
+            case "BRare":
+                if(rarity.equals("R")) { rarity = ""; return false; }
+                rarity = "R"; break;
+            case "BMythic":
+                if(rarity.equals("M")) { rarity = ""; return false; }
+                rarity = "M"; break;
+            default:
+                rarity = ""; break;
+        }
+        return true;
+    }
+
+    private void selectColor(String what){
+        TextButton B = colorButtons.get(what);
+        switch(what){
+            case "BColorless":
+                if(B.getColor().equals(Color.RED)) B.setColor(Color.WHITE); else {
+                    for (Map.Entry<String, TextButton> BT : colorButtons.entrySet())
+                        BT.getValue().setColor(Color.WHITE);
+                    B.setColor(Color.RED);
+                }
+                break;
+            case "BBlack":
+            case "BBlue":
+            case "BGreen":
+            case "BRed":
+            case "BWhite":
+                if(B.getColor().equals(Color.RED)) B.setColor(Color.WHITE); else B.setColor(Color.RED);
+                break;
+
+        }
+    }
+
+    private boolean selectCost(String what){
+        for(Map.Entry<String, TextButton> B : costButtons.entrySet())
+            B.getValue().setColor(Color.WHITE);
+        switch(what){
+            case "B02":
+                if(cost_low == 0 && cost_high == 2) { cost_low = -1; cost_high = 9999; return false; }
+                cost_low = 0; cost_high = 2; break;
+            case "B35":
+                if(cost_low == 3 && cost_high == 5) { cost_low = -1; cost_high = 9999; return false; }
+                cost_low = 3; cost_high = 5; break;
+            case "B68":
+                if(cost_low == 6 && cost_high == 8) { cost_low = -1; cost_high = 9999; return false; }
+                cost_low = 6; cost_high = 8; break;
+            case "B9X":
+                if(cost_low == 9 && cost_high == 9999) { cost_low = -1; cost_high = 9999; return false; }
+                cost_low = 9; cost_high = 9999; break;
+            default:
+                cost_low = -1; break;
+        }
+        return true;
+    }
+
+    @Override
+    public void enter(){
+        edition = "";
+        cost_low = -1; cost_high = 9999;
+        rarity = "";
+        currentPrice = (int)basePrice;
+
+        for(Map.Entry<String, TextButton> B : colorButtons.entrySet())  B.getValue().setColor(Color.WHITE);
+        for(Map.Entry<String, TextButton> B : costButtons.entrySet())   B.getValue().setColor(Color.WHITE);
+        for(Map.Entry<String, TextButton> B : rarityButtons.entrySet()) B.getValue().setColor(Color.WHITE);
+        editionList.setColor(Color.WHITE);
+        filterResults();
+        super.enter();
+    }
+
+    @Override
+    public void resLoaded() {
+        super.resLoaded();
+        List<CardEdition> editions = StaticData.instance().getSortedEditions();
+        editions = editions.stream().filter(input -> {
+           if(input == null) return false;
+           return(!Config.instance().getConfigData().restrictedEditions.contains(input.getCode()));
+        }).collect(Collectors.toList());
+        editionList = ui.findActor("BSelectPlane");
+        rewardDummy = ui.findActor("RewardDummy");
+        rewardDummy.setVisible(false);
+        editionList.clearItems();
+        editionList.showScrollPane();
+        editionList.setItems(editions.toArray(new CardEdition[editions.size()]));
+        editionList.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor){
+                CardEdition E = editionList.getSelected();
+                edition = E.getCode();
+                editionList.setColor(Color.RED);
+                filterResults();
+            }
+        });
+
+        goldLabel  = ui.findActor("gold");
+        pullButton = ui.findActor("pull");
+        pullButton.setDisabled(true);
+        goldLabel.setText("Gold: "+ Current.player().getGold());
+        for(String i : new String[]{"BBlack", "BBlue", "BGreen", "BRed", "BWhite", "BColorless"} ){
+            TextButton button = ui.findActor(i);
+            if(button != null){
+                colorButtons.put(i, button);
+                button.addListener(new ClickListener() {
+                   @Override
+                   public void clicked(InputEvent event, float x, float y){
+                       selectColor(i);
+                       filterResults();
+                   }
+                });
+            }
+        }
+        for(String i : new String[]{"BCommon", "BUncommon", "BRare", "BMythic"} ){
+            TextButton button = ui.findActor(i);
+            if(button != null) {
+                rarityButtons.put(i, button);
+                button.addListener(new ClickListener() {
+                    @Override
+                    public void clicked(InputEvent event, float x, float y) {
+                        if(selectRarity(i)) button.setColor(Color.RED);
+                        filterResults();
+                    }
+                });
+            }
+        }
+        for(String i : new String[]{"B02", "B35", "B68", "B9X"} ){
+            TextButton button = ui.findActor(i);
+            if(button != null) {
+                costButtons.put(i, button);
+                button.addListener(new ClickListener() {
+                    @Override
+                    public void clicked(InputEvent event, float x, float y) {
+                        if(selectCost(i)) button.setColor(Color.RED);
+                        filterResults();
+                    }
+                });
+            }
+        }
+
+        ui.onButtonPress("done", new Runnable() {
+            @Override
+            public void run() {
+                SpellSmithScene.this.done();
+            }
+        });
+        ui.onButtonPress("pull", new Runnable() {
+            @Override
+            public void run() { SpellSmithScene.this.pullCard(); }
+        });
+        ui.onButtonPress("BResetEdition", new Runnable() {
+            @Override
+            public void run() {
+                editionList.setColor(Color.WHITE);
+                edition = "";
+                filterResults();
+            }
+        });
+
+    }
+
+
+    public void filterResults() {
+        RewardData R = new RewardData();
+        Iterable<PaperCard> P = R.getAllCards();
+        float totalCost = basePrice * Current.player().goldModifier();
+        final List<String> colorFilter = new ArrayList<>();
+        for(Map.Entry<String, TextButton> B : colorButtons.entrySet())
+            switch (B.getKey()){
+                case "BColorless":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Colorless");
+                    continue;
+                case "BBlack":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Black");
+                    break;
+                case "BBlue":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Blue");
+                    break;
+                case "BGreen":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Green");
+                    break;
+                case "BRed":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("Red");
+                    break;
+                case "BWhite":
+                    if(B.getValue().getColor().equals(Color.RED)) colorFilter.add("White");
+                    break;
+            }
+        P = StreamSupport.stream(P.spliterator(), false).filter(input -> {
+            //L|Basic Land, C|Common, U|Uncommon, R|Rare, M|Mythic Rare, S|Special, N|None
+            if (input == null) return false;
+            if(!edition.isEmpty()) if (!input.getEdition().equals(edition)) return false;
+            if(colorFilter.size() > 0) if(input.getRules().getColor() != ColorSet.fromNames(colorFilter)) return false;
+            if(!rarity.isEmpty()) if (!input.getRarity().toString().equals(rarity)) return false;
+            if(cost_low > -1) {
+                if (!(input.getRules().getManaCost().getCMC() >= cost_low && input.getRules().getManaCost().getCMC() <= cost_high))
+                    return false;
+            }
+            return true;
+        }).collect(Collectors.toList());
+        //Stream method is very fast, might not be necessary to precache anything.
+        if(!edition.isEmpty()) totalCost *= 4.0f; //Edition select cost multiplier. This is a huge factor, so it's most expensive.
+        if(colorFilter.size() > 0) totalCost *= Math.min(colorFilter.size() * 2.5f, 6.0f); //Color filter cost multiplier.
+        if(!rarity.isEmpty()){ //Rarity cost multiplier.
+            switch(rarity){
+                case "C": totalCost *= 1.5f; break;
+                case "U": totalCost *= 2.5f; break;
+                case "R": totalCost *= 4.0f; break;
+                case "M": totalCost *= 5.5f; break;
+                default: break;
+            }
+        }
+        if(cost_low > -1) totalCost *= 2.5f; //And CMC cost multiplier.
+        cardPool = StreamSupport.stream(P.spliterator(), false).collect(Collectors.toList());
+        pullButton.setText("Pull (" + cardPool.size() + ") " + totalCost + "G");
+        currentPrice = (int)totalCost;
+        pullButton.setDisabled(false);
+        if(!(cardPool.size() > 0) || Current.player().getGold() < totalCost)
+            pullButton.setDisabled(true);
+    }
+
+    public void pullCard() {
+        PaperCard P = cardPool.get(MyRandom.getRandom().nextInt(cardPool.size())); //Don't use the standard RNG.
+        Reward R = new Reward(P);
+        Current.player().addReward(R);
+        Current.player().takeGold(currentPrice);
+        if(Current.player().getGold() < currentPrice) pullButton.setDisabled(true);
+        if(rewardActor != null) rewardActor.remove();
+        rewardActor = new RewardActor(R, true);
+        rewardActor.flip(); //Make it flip so it draws visual attention, why not.
+        rewardActor.setBounds(rewardDummy.getX(), rewardDummy.getY(), rewardDummy.getWidth(), rewardDummy.getHeight());
+        stage.addActor(rewardActor);
+    }
+}
diff --git a/forge-gui-mobile/src/forge/adventure/stage/Console.java b/forge-gui-mobile/src/forge/adventure/stage/Console.java
index 19db3d919c9..0aeb1827749 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/Console.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/Console.java
@@ -8,23 +8,22 @@ import forge.adventure.util.Controls;
 
 public class Console extends Window {
     private final ScrollPane scroll;
+    private String last = "";
+    private final InputLine input;
+    private final Table content;
+    private final ConsoleCommandInterpreter interpreter = new ConsoleCommandInterpreter();
 
     public void toggle() {
-        if(isVisible())
-        {
+        if(isVisible()) {
             setVisible(false);
             getStage().unfocus(input);
-        }
-        else
-        {
+        } else {
             setVisible(true);
             getStage().setKeyboardFocus(input);
         }
     }
 
-    class InputLine extends TextField
-    {
-
+    class InputLine extends TextField {
         private Console console;
 
         public InputLine(Console console) {
@@ -32,36 +31,34 @@ public class Console extends Window {
             this.console = console;
             writeEnters=true;
         }
+
         @Override
         protected InputListener createInputListener () {
-            TextField self=this;
+            TextField self = this;
             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:
-                            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;
-                    }
-                    return super.keyTyped(event,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:
+                        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;
+                }
+                return super.keyTyped(event,character);
                 }
             };
         }
-
     }
 
     private String complete(String text) {
@@ -72,6 +69,7 @@ public class Console extends Window {
         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(interpreter.command(text));
         newLine.getActor().setColor(0.6f,0.6f,0.6f,1);
         newLine.growX().align(Align.left|Align.bottom).row();
@@ -79,14 +77,11 @@ public class Console extends Window {
         scroll.scrollTo(0, 0, 0, 0);
     }
 
-    private InputLine input;
-    private Table content;
-    private ConsoleCommandInterpreter interpreter=new ConsoleCommandInterpreter();
     public Console() {
         super("", Controls.GetSkin());
-        content=new Table(Controls.GetSkin());
-        input=new InputLine(this);
-         scroll=new ScrollPane(content,new ScrollPane.ScrollPaneStyle());
+        content = new Table(Controls.GetSkin());
+        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 9aceeab35e7..245dfec284c 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/ConsoleCommandInterpreter.java
@@ -23,28 +23,28 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class ConsoleCommandInterpreter {
-    public String complete(String text) {
-            String[] words=splitOnSpace(text);
+    Command root = new Command();
 
+    class Command {
+        HashMap<String, Command> children = new HashMap<>();
+        Function<String[], String> function;
+    }
+
+    public String complete(String text) {
+        String[] words=splitOnSpace(text);
         Command currentCommand=root;
         String completionString="";
-        int i;
-        for(i =0;i<words.length;i++)
-        {
-            String name=words[i];
-            if(!currentCommand.children.containsKey(name))
-            {
-                for(String key:currentCommand.children.keySet())
-                {
-                    if(key.startsWith(name))
-                    {
-                        return completionString+key+" ";
+        for(String name : words) {
+            if (!currentCommand.children.containsKey(name)) {
+                for (String key : currentCommand.children.keySet()) {
+                    if (key.startsWith(name)) {
+                        return completionString + key + " ";
                     }
                 }
                 break;
             }
-            completionString+=name+" ";
-            currentCommand=currentCommand.children.get(name);
+            completionString += name + " ";
+            currentCommand = currentCommand.children.get(name);
         }
         return text;
     }
@@ -65,50 +65,38 @@ public class ConsoleCommandInterpreter {
         return matchList.toArray(new String[0]);
     }
 
-    class Command
-    {
-        HashMap<String,Command> children=new HashMap<>();
-        Function<String[],String> function;
-    }
-     String command(String text)
-    {
-        String[] words=splitOnSpace(text);
-
-        Command currentCommand=root;
+    public String command(String text) {
+        String[] words = splitOnSpace(text);
+        Command currentCommand = root;
         int i;
-        for(i =0;i<words.length;i++)
-        {
+
+        for(i = 0; i < words.length; i++) {
             String name=words[i];
-            if(!currentCommand.children.containsKey(name))
-                break;
+            if(!currentCommand.children.containsKey(name)) break;
             currentCommand=currentCommand.children.get(name);
         }
-        if(currentCommand.function==null)
-        {
-            return "Command not found options are "+String.join(" ",Arrays.copyOfRange(words, 0, i))+"\n"+String.join("\n",currentCommand.children.keySet());
+        if(currentCommand.function == null) {
+            return "Command not found. Available commands:\n" + String.join(" ",Arrays.copyOfRange(words, 0, i))+"\n"+String.join("\n",currentCommand.children.keySet());
         }
         String[] parameters=Arrays.copyOfRange(words, i, words.length);
         for(int j=0;j<parameters.length;j++)
             parameters[j]=parameters[j].replaceAll("[\"']","");
         return currentCommand.function.apply(parameters);
     }
-    Command root=new Command();
-    void registerCommand(String[] path,Function<String[],String> function)
-    {
-        if(path.length==0)
-            return;
 
+    void registerCommand(String[] path,Function<String[],String> function) {
+        if(path.length==0) return;
         Command currentCommand=root;
-        for(String name:path)
-        {
+
+        for(String name:path) {
             if(!currentCommand.children.containsKey(name))
                 currentCommand.children.put(name,new Command());
-            currentCommand=currentCommand.children.get(name);
+            currentCommand = currentCommand.children.get(name);
         }
-        currentCommand.function=function;
+        currentCommand.function = function;
     }
-    public    ConsoleCommandInterpreter()
-    {
+
+    public ConsoleCommandInterpreter() {
         registerCommand(new String[]{"teleport", "to"}, s -> {
             if(s.length<2)
                 return "Command needs 2 parameter";
@@ -122,72 +110,63 @@ public class ConsoleCommandInterpreter {
             }
         });
         registerCommand(new String[]{"teleport", "to", "poi"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
+            if(s.length<1) return "Command needs 1 parameter: PoI name.";
             PointOfInterest poi=Current.world().findPointsOfInterest(s[0]);
             if(poi==null)
-                return "poi "+s[0]+" not found";
+                return "PoI " + s[0] + " not found";
             WorldStage.getInstance().GetPlayer().setPosition(poi.getPosition());
-            return  "teleport to "+s[0]+"("+poi.getPosition()+")";
+            return  "Teleported to " + s[0] + "(" + poi.getPosition() + ")";
         });
         registerCommand(new String[]{"give", "gold"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
-            int amount=0;
+            if(s.length<1) return "Command needs 1 parameter: Amount.";
+            int amount;
             try {
                 amount=Integer.parseInt(s[0]);
             }
-            catch (Exception e)
-            {
+            catch (Exception e) {
                 return "Can not convert "+s[0]+" to number";
             }
             Current.player().giveGold(amount);
             return "Added "+amount+" gold";
         });
         registerCommand(new String[]{"give", "life"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
-            int amount=0;
+            if(s.length<1) return "Command needs 1 parameter: Amount.";
+            int amount;
             try {
                 amount=Integer.parseInt(s[0]);
             }
-            catch (Exception e)
-            {
-                return "Can not convert "+s[0]+" to number";
+            catch (Exception e) {
+                return "Can not convert " + s[0] + " to number";
             }
             Current.player().addMaxLife(amount);
-            return "Added "+amount+" max life";
+            return "Added " + amount + " max life";
         });
         registerCommand(new String[]{"give", "card"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
-            PaperCard card=StaticData.instance().getCommonCards().getCard(s[0]);
-            if(card==null)
-                return "can not find card "+s[0];
+            //TODO: Specify optional amount.
+            if(s.length<1) return "Command needs 1 parameter: Card name.";
+            PaperCard card = StaticData.instance().getCommonCards().getCard(s[0]);
+            if(card==null) return "Cannot find card: "+s[0];
             Current.player().addCard(card);
-            return "Added card "+s[0];
+            return "Added card: " + s[0];
         });
         registerCommand(new String[]{"give", "item"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
-            if(Current.player().addItem(s[0]))
-                return "Added item "+s[0];
-            return "can not find item "+s[0];
+            if(s.length<1) return "Command needs 1 parameter: Item name.";
+            if(Current.player().addItem(s[0])) return "Added item " + s[0] + ".";
+            return "Cannot find item "+s[0];
         });
         registerCommand(new String[]{"fullHeal"}, s -> {
             Current.player().fullHeal();
-            return "Player life back to "+Current.player().getLife();
+            return "Player fully healed. Health set to " + Current.player().getLife() + ".";
         });
         registerCommand(new String[]{"setColorID"}, s -> {
             if(s.length < 1) return "Please specify color ID: Valid choices: B, G, R, U, W, C. Example:\n\"setColorID G\"";
             Current.player().setColorIdentity(s[0]);
-            return "Player color identity set to " + Current.player().getColorIdentity();
+            return "Player color identity set to " + Current.player().getColorIdentity() + ".";
         });
         registerCommand(new String[]{"reloadScenes"}, s -> {
             SceneType.InventoryScene.instance.resLoaded();
             SceneType.PlayerStatisticScene.instance.resLoaded();
-
-            return "Force reload status scenes. Might be unstable.";
+            return "Force reload status scenes. WARNING: Game might be unstable.";
         });
         registerCommand(new String[]{"resetQuests"}, s -> {
             Current.player().resetQuestFlags();
@@ -204,12 +183,12 @@ public class ConsoleCommandInterpreter {
                 DeckProxy DP = new DeckProxy(D, "Constructed", GameType.Constructed, null);
                 ColorSet colorSet = DP.getColor();
                 System.out.printf("%s: Colors: %s (%s%s%s%s%s%s)\n", D.getName(), DP.getColor(),
-                        (colorSet.hasBlack()    ? "B" : ""),
-                        (colorSet.hasGreen()    ? "G" : ""),
-                        (colorSet.hasRed()      ? "R" : ""),
-                        (colorSet.hasBlue()     ? "U" : ""),
-                        (colorSet.hasWhite()    ? "W" : ""),
-                        (colorSet.isColorless() ? "C" : "")
+                    (colorSet.hasBlack()    ? "B" : ""),
+                    (colorSet.hasGreen()    ? "G" : ""),
+                    (colorSet.hasRed()      ? "R" : ""),
+                    (colorSet.hasBlue()     ? "U" : ""),
+                    (colorSet.hasWhite()    ? "W" : ""),
+                    (colorSet.isColorless() ? "C" : "")
                 );
             }
             return "Enemy deck color list dumped to stdout.";
@@ -235,7 +214,7 @@ public class ConsoleCommandInterpreter {
             return "Enemy color Identity dumped to stdout.";
         });
         registerCommand(new String[]{"heal", "amount"}, s -> {
-            if(s.length<1) return "Command needs 1 parameter";
+            if(s.length<1) return "Command needs 1 parameter: Amount";
             int N = 0;
             try { N = Integer.parseInt(s[0]); }
             catch (Exception e) { return "Can not convert " + s[0] + " to integer"; }
@@ -244,37 +223,31 @@ public class ConsoleCommandInterpreter {
         });
         registerCommand(new String[]{"debug","on"}, s -> {
             Current.setDebug(true);
-            return "Debug mode on";
+            return "Debug mode ON";
         });
         registerCommand(new String[]{"debug","off"}, s -> {
             Current.setDebug(false);
-            return "Debug mode off";
+            return "Debug mode OFF";
         });
         registerCommand(new String[]{"remove","enemy","all"}, s -> {
-            if(!MapStage.getInstance().isInMap())
-            {
-                return "Only supported for poi";
+            //TODO: Remove all overworld enemies if not inside a map.
+            if(!MapStage.getInstance().isInMap()) {
+                return "Only supported for PoI";
             }
             MapStage.getInstance().removeAllEnemies();
             return "removed all enemies";
         });
         registerCommand(new String[]{"remove","enemy"}, s -> {
-            if(s.length<1)
-                return "Command needs 1 parameter";
-            int id=0;
-            try {
-                id=Integer.parseInt(s[0]);
-            }
-            catch (Exception e)
-            {
-                return "Can not convert "+s[0]+" to number";
+            if(s.length<1) return "Command needs 1 parameter: Enemy map ID.";
+            int id;
+            try { id=Integer.parseInt(s[0]); }
+            catch (Exception e) {
+                return "Cannot convert " + s[0] + " to number";
             }
             if(!MapStage.getInstance().isInMap())
-            {
-                return "Only supported for poi";
-            }
+                return "Only supported for PoI";
             MapStage.getInstance().deleteObject(id);
-            return "removed enemy "+s[0];
+            return "Femoved enemy "+s[0];
         });
     }
 }
diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index 8f4620db22b..08457be0005 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -273,14 +273,8 @@ public class GameHUD extends Stage {
 
     @Override
     public boolean keyDown(int keycode) {
-        if (keycode == Input.Keys.F10) {
+        if (keycode == Input.Keys.F9 || keycode == Input.Keys.F10) {
             console.toggle();
-
-            return true;
-        }
-        if (keycode == Input.Keys.F9) {
-            console.toggle();
-
             return true;
         }
         if (keycode == Input.Keys.BACK) {
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index f728344c078..df973dd5781 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -75,7 +75,6 @@ public class MapStage extends GameStage {
     private Stage dialogStage;
     private boolean dialogOnlyInput;
 
-
     //Map properties.
     //These maps are defined as embedded properties within the Tiled maps.
     private EffectData effect;             //"Dungeon Effect": Character Effect applied to all adversaries within the map.
@@ -471,6 +470,12 @@ public class MapStage extends GameStage {
                             }
                         }));
                         break;
+                    case "spellsmith":
+                        addMapActor(obj, new OnCollide(new Runnable() {
+                            @Override
+                            public void run() { Forge.switchScene(SceneType.SpellSmithScene.instance); }
+                        }));
+                        break;
                     case "exit":
                         addMapActor(obj, new OnCollide(new Runnable() {
                             @Override
diff --git a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
index 336a1ffeb97..f86b7fee73e 100644
--- a/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
+++ b/forge-gui-mobile/src/forge/adventure/util/MapDialog.java
@@ -141,7 +141,7 @@ public class MapDialog {
         return false;
     }
 
-    boolean isConditionOk(DialogData.ConditionData[] data) {
+    public boolean isConditionOk(DialogData.ConditionData[] data) {
         if( data==null ) return true;
         AdventurePlayer player = Current.player();
         for(DialogData.ConditionData condition:data) {
diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
index 23b47abe30c..f2220bdd37d 100644
--- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
@@ -67,10 +67,12 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
 
     @Override
     public void dispose() {
-        if (needsToBeDisposed)
+        if (needsToBeDisposed) {
+            needsToBeDisposed = false;
             image.dispose();
-          if (generatedTooltip != null)
-             generatedTooltip.dispose();
+            if (generatedTooltip != null)
+                generatedTooltip.dispose();
+        }
     }
 
     public Reward getReward() {
diff --git a/forge-gui-mobile/src/forge/adventure/util/UIActor.java b/forge-gui-mobile/src/forge/adventure/util/UIActor.java
index 00fa6cbe413..96556330bac 100644
--- a/forge-gui-mobile/src/forge/adventure/util/UIActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/UIActor.java
@@ -72,6 +72,13 @@ public class UIActor extends Group {
                         newActor = new ScrollPane(null, Controls.GetSkin());
                         readScrollPaneProperties((ScrollPane) newActor, new OrderedMap.OrderedMapEntries<>(element));
                         break;
+                    case "CheckBox":
+                        newActor = new CheckBox("", Controls.GetSkin());
+                        readCheckBoxProperties((CheckBox) newActor, new OrderedMap.OrderedMapEntries<>(element));
+                        break;
+                    case "SelectBox":
+                        newActor = new SelectBox<>(Controls.GetSkin());
+                        break;
                     default:
                         throw new IllegalStateException("Unexpected value: " + type);
                 }
@@ -211,6 +218,16 @@ public class UIActor extends Group {
     private void readSelectorProperties(Selector newActor, ObjectMap.Entries<String, String> entries) {
     }
 
+    private void readCheckBoxProperties(CheckBox newActor, ObjectMap.Entries<String, String> entries) {
+        for (ObjectMap.Entry property : entries) {
+            switch (property.key.toString()) {
+                case "text":
+                    newActor.setText(property.value.toString());
+                    break;
+            }
+        }
+    }
+
     private void readButtonProperties(TextButton newActor, ObjectMap.Entries<String, String> entries) {
         for (ObjectMap.Entry property : entries) {
             switch (property.key.toString()) {
diff --git a/forge-gui-mobile/src/forge/adventure/world/World.java b/forge-gui-mobile/src/forge/adventure/world/World.java
index d935893e845..a7ecf515a65 100644
--- a/forge-gui-mobile/src/forge/adventure/world/World.java
+++ b/forge-gui-mobile/src/forge/adventure/world/World.java
@@ -22,7 +22,6 @@ import forge.adventure.util.Config;
 import forge.adventure.util.Paths;
 import forge.adventure.util.SaveFileContent;
 import forge.adventure.util.SaveFileData;
-//import forge.util.MyRandom;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.ArrayList;
@@ -34,8 +33,6 @@ import java.util.Random;
  * Class that will create the world from the configuration
  */
 public class World implements  Disposable, SaveFileContent {
-
-
     private WorldData data;
     private Pixmap biomeImage;
     private long[][] biomeMap;
@@ -58,8 +55,7 @@ public class World implements  Disposable, SaveFileContent {
         return (int) (Math.log(Long.highestOneBit(biome)) / Math.log(2));
     }
 
-    public void loadWorldData()
-    {
+    public void loadWorldData() {
         if(worldDataLoaded)
             return;
 
@@ -230,12 +226,8 @@ public class World implements  Disposable, SaveFileContent {
     }
 
     public World generateNew(long seed) {
-
         loadWorldData();
-        if(seed==0)
-        {
-            seed=random.nextLong();
-        }
+        if(seed==0) { seed=random.nextLong(); }
         this.seed=seed;
         random.setSeed(seed);
         OpenSimplexNoise noise = new OpenSimplexNoise(seed);
diff --git a/forge-gui/res/adventure/Shandalar/config.json b/forge-gui/res/adventure/Shandalar/config.json
index 1583fcfa2a1..6380a7c71e4 100644
--- a/forge-gui/res/adventure/Shandalar/config.json
+++ b/forge-gui/res/adventure/Shandalar/config.json
@@ -2,7 +2,7 @@
   "screenWidth": 480,
   "screenHeight": 270,
   "skin": "skin/ui_skin.json",
-  "playerBaseSpeed": 30,
+  "playerBaseSpeed": 32,
   "minDeckSize": 40,
   "starterDecks": [
     "decks/starter/white.json",
@@ -20,35 +20,58 @@
     "Mox Jet",
     "Ancestral Recall",
     "Timetwister",
-    "Time Walk"
+    "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"
   ],
+  "restrictedEditions": [],
   "difficulties": [
     {
       "name": "Easy",
       "startingLife": 16,
-      "staringMoney": 200,
+      "staringMoney": 500,
       "enemyLifeFactor": 0.8,
       "spawnRank": 0,
-      "sellFactor": 0.5     ,
-      "startItems": ["Treasure","Jungle Shield"]
-    },
-    {
+      "sellFactor": 0.6,
+      "startItems": [
+        "Manasight Amulet",
+        "Leather Boots"
+      ]
+    },{
       "name": "Normal",
       "startingLife": 12,
-      "staringMoney": 100,
+      "staringMoney": 250,
       "startingDifficulty": true,
       "enemyLifeFactor": 1.0,
       "spawnRank": 1,
-      "sellFactor": 0.2        ,
-      "startItems": [ "Treasure"]
-    },
-    {
+      "sellFactor": 0.5,
+      "startItems": [
+        "Leather Boots"
+      ]
+    },{
       "name": "Hard",
       "startingLife": 8,
-      "staringMoney": 10,
+      "staringMoney": 125,
       "enemyLifeFactor": 1.5,
       "spawnRank": 2,
-      "sellFactor": 0.1
+      "sellFactor": 0.25
     }
   ]
 }
diff --git a/forge-gui/res/adventure/Shandalar/decks/miniboss/sliver_shandalar.dck b/forge-gui/res/adventure/Shandalar/decks/miniboss/sliver_shandalar.dck
new file mode 100644
index 00000000000..ebbb1863cfe
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/miniboss/sliver_shandalar.dck
@@ -0,0 +1,30 @@
+[metadata]
+Name=sliver_shandalar
+[Main]
+2 Battle Sliver|M14|1
+2 Blur Sliver|M14|1
+1 Bonescythe Sliver|M14|1
+4 Cultivate|AFC|1
+3 Forest|M14|1
+1 Forest|M14|2
+4 Forest|M14|3
+1 Forest|M14|4
+3 Groundshaker Sliver|M14|1
+3 Hive Stirrings|M14|1
+1 Megantic Sliver|M14|1
+1 Mountain|CMR|1
+2 Mountain|M14|1
+3 Mountain|M14|3
+2 Path to Exile|TSR|1
+2 Plains|M14|1
+3 Plains|M14|4
+3 Predatory Sliver|M14|1
+3 Rampant Growth|AFC|1
+2 Sentinel Sliver|M14|1
+3 Shock|M21|1
+3 Sliver Construct|M14|1
+3 Striking Sliver|M14|1
+4 Terramorphic Expanse|AFC|1
+1 Thorncaster Sliver|M14|1
+[Sideboard]
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-project b/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
index b51eafb172b..20f71bf61df 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-project
@@ -8,5 +8,7 @@
         "obj",
         "tileset"
     ],
-    "objectTypesFile": ""
+    "objectTypesFile": "",
+    "propertyTypes": [
+    ]
 }
diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 3f01c7e41ef..feb7c920a10 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,13 +3,13 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "map/debug_map.tmx",
+    "activeFile": "map/main_story/skep.tmx",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
-        "obj",
-        "tileset",
         "map/main_story",
-        "map"
+        "map",
+        "obj",
+        "tileset"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
     "fileStates": {
@@ -17,32 +17,35 @@
             "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 233.25,
-                "y": 135.5
+                "x": 239.75,
+                "y": 136
             }
         },
         "map/aerie_1B.tmx": {
-            "scale": 5.5,
+            "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
         "map/aerie_1C.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 5,
             "viewCenter": {
-                "x": 400,
+                "x": 399.75,
                 "y": 320
             }
         },
         "map/barbariancamp_1.tmx": {
-            "scale": 3,
+            "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.83333333333331,
-                "y": 136
+                "x": 265,
+                "y": 79
             }
         },
         "map/barbariancamp_2.tmx": {
@@ -50,7 +53,7 @@
             "selectedLayer": 4,
             "viewCenter": {
                 "x": 217.66666666666666,
-                "y": 180
+                "y": 180.33333333333331
             }
         },
         "map/barbariancamp_3.tmx": {
@@ -65,8 +68,8 @@
             "scale": 1.5,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 319.66666666666663,
-                "y": 320
+                "x": 337,
+                "y": 352.3333333333333
             }
         },
         "map/castle_plains.tmx": {
@@ -78,51 +81,51 @@
             }
         },
         "map/castle_plains_1.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 228.75,
-                "y": 168
+                "x": 254.99999999999997,
+                "y": 167
             }
         },
         "map/castle_plains_2.tmx": {
             "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
-                "y": 136.66666666666663
+                "x": 240.33333333333331,
+                "y": 137
             }
         },
         "map/castle_plains_3.tmx": {
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 240,
-                "y": 136.5
+                "x": 239.75,
+                "y": 136.75
             }
         },
         "map/catlair_1.tmx": {
-            "scale": 1.5,
+            "scale": 2,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 280.3333333333333,
-                "y": 108
+                "x": 173.25,
+                "y": 132.25
             }
         },
         "map/catlair_2.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 287.66666666666663,
+                "y": 117.66666666666666
             }
         },
         "map/catlair_3.tmx": {
-            "scale": 4,
+            "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 209.25,
+                "y": 134.75
             }
         },
         "map/cave6.tmx": {
@@ -143,33 +146,33 @@
         },
         "map/cave_1.tmx": {
             "scale": 1.5,
-            "selectedLayer": 3,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 234.33333333333331,
-                "y": 217.3333333333333
+                "x": 259.66666666666663,
+                "y": 330.6666666666667
             }
         },
         "map/cave_10.tmx": {
             "scale": 1,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 232,
-                "y": 136
+                "x": 232.5,
+                "y": 137
             }
         },
         "map/cave_11.tmx": {
             "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232,
-                "y": 135.99999999999994
+                "x": 232.33333333333331,
+                "y": 136
             }
         },
         "map/cave_12.tmx": {
             "scale": 1,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232,
+                "x": 232.5,
                 "y": 136
             }
         },
@@ -202,7 +205,7 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 215.33333333333331,
-                "y": 134.66666666666669
+                "y": 135.33333333333331
             }
         },
         "map/cave_16B.tmx": {
@@ -210,7 +213,7 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 228.93255653204307,
-                "y": 135.55840821566113
+                "y": 136.03238866396765
             }
         },
         "map/cave_16BL1.tmx": {
@@ -218,7 +221,7 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 219.9111286659425,
-                "y": 135.17922385701587
+                "y": 135.6690036535993
             }
         },
         "map/cave_16BL2.tmx": {
@@ -337,40 +340,40 @@
             "scale": 1.0548958333333331,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240.78206773970578,
-                "y": 136.50636911227411
+                "x": 241.25604818801227,
+                "y": 136.9803495605807
             }
         },
         "map/cave_18C.tmx": {
             "scale": 1.020866935483871,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.15562358052728,
-                "y": 136.15878345018268
+                "x": 232.64540337711068,
+                "y": 136.64856324676606
             }
         },
         "map/cave_18E.tmx": {
             "scale": 1.0017137096774194,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.60138874911942,
-                "y": 136.76562342759388
+                "x": 233.1005333601691,
+                "y": 137.26476803864347
             }
         },
         "map/cave_18N.tmx": {
             "scale": 1.0017137096774194,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232.60138874911942,
-                "y": 136.76562342759388
+                "x": 233.1005333601691,
+                "y": 137.26476803864347
             }
         },
         "map/cave_18W.tmx": {
             "scale": 1.0017137096774194,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 231.60309952702016,
-                "y": 136.76562342759382
+                "x": 232.10224413806984,
+                "y": 137.26476803864347
             }
         },
         "map/cave_19.tmx": {
@@ -382,11 +385,14 @@
             }
         },
         "map/cave_2.tmx": {
-            "scale": 1,
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 219.5,
-                "y": 135
+                "x": 231.75,
+                "y": 136.5
             }
         },
         "map/cave_20.tmx": {
@@ -441,8 +447,8 @@
             "scale": 1,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 312,
-                "y": 320
+                "x": 312.5,
+                "y": 320.5
             }
         },
         "map/cave_23A1.tmx": {
@@ -1274,15 +1280,15 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 142.25,
-                "y": 135.5
+                "y": 135.75
             }
         },
         "map/cave_24B.tmx": {
             "scale": 3,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 240,
-                "y": 136
+                "x": 239.83333333333334,
+                "y": 136.16666666666666
             }
         },
         "map/cave_25.tmx": {
@@ -1290,7 +1296,7 @@
             "selectedLayer": 0,
             "viewCenter": {
                 "x": 466.5,
-                "y": 319
+                "y": 319.5
             }
         },
         "map/cave_25B.tmx": {
@@ -1298,7 +1304,7 @@
             "selectedLayer": 4,
             "viewCenter": {
                 "x": 463.3333333333333,
-                "y": 318.6666666666667
+                "y": 319.3333333333333
             }
         },
         "map/cave_25C.tmx": {
@@ -1306,7 +1312,7 @@
             "selectedLayer": 5,
             "viewCenter": {
                 "x": 471,
-                "y": 319.33333333333326
+                "y": 319
             }
         },
         "map/cave_3.tmx": {
@@ -1314,7 +1320,7 @@
             "selectedLayer": 0,
             "viewCenter": {
                 "x": 225.25,
-                "y": 135.5
+                "y": 135.75
             }
         },
         "map/cave_4.tmx": {
@@ -1386,7 +1392,7 @@
             "selectedLayer": 4,
             "viewCenter": {
                 "x": 242.99999999999997,
-                "y": 150
+                "y": 150.66666666666669
             }
         },
         "map/crypt_2.tmx": {
@@ -1422,27 +1428,30 @@
             }
         },
         "map/debug_map.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 3,
-            "selectedLayer": 2,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 242.83333333333334,
-                "y": 325.3333333333333
+                "x": 179.5,
+                "y": 274.3333333333333
             }
         },
         "map/djinnpalace_1.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 186.33333333333331,
+                "y": 90.66666666666669
             }
         },
         "map/djinnpalace_2.tmx": {
-            "scale": 4,
+            "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 228.625,
-                "y": 135.75
+                "x": 217.25,
+                "y": 143
             }
         },
         "map/djinnpalace_3.tmx": {
@@ -1465,8 +1474,8 @@
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 233.25,
-                "y": 135.5
+                "x": 239.75,
+                "y": 136.5
             }
         },
         "map/evilgrove_1.tmx": {
@@ -1510,11 +1519,11 @@
             }
         },
         "map/factory_1.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 244.99999999999997,
+                "y": 139.33333333333334
             }
         },
         "map/factory_2.tmx": {
@@ -1546,15 +1555,15 @@
             "selectedLayer": 4,
             "viewCenter": {
                 "x": 254.99999999999997,
-                "y": 132.66666666666669
+                "y": 133
             }
         },
         "map/fort_1.tmx": {
-            "scale": 2,
+            "scale": 1.5,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 240,
-                "y": 136.5
+                "x": 289.66666666666663,
+                "y": 92.33333333333331
             }
         },
         "map/fort_10.tmx": {
@@ -1593,7 +1602,7 @@
             "scale": 1.5,
             "selectedLayer": 6,
             "viewCenter": {
-                "x": 400,
+                "x": 399.6666666666667,
                 "y": 400
             }
         },
@@ -1601,7 +1610,7 @@
             "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 400,
+                "x": 399.75,
                 "y": 400
             }
         },
@@ -1686,18 +1695,24 @@
             }
         },
         "map/graveyard.tmx": {
-            "scale": 1,
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 232.5,
+                "x": 232.33333333333331,
                 "y": 136
             }
         },
         "map/graveyard_2.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 1,
-            "selectedLayer": 0,
+            "selectedLayer": 3,
             "viewCenter": {
-                "x": 240,
+                "x": 240.5,
                 "y": 136
             }
         },
@@ -1730,7 +1745,7 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 255.66666666666666,
-                "y": 103.33333333333334
+                "y": 103.66666666666666
             }
         },
         "map/grove_10.tmx": {
@@ -1910,66 +1925,81 @@
             }
         },
         "map/grove_9.tmx": {
-            "scale": 2,
-            "selectedLayer": 4,
-            "viewCenter": {
-                "x": 240,
-                "y": 136
-            }
-        },
-        "map/island_town.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 248.99999999999997,
-                "y": 114
+                "x": 245.66666666666666,
+                "y": 115
+            }
+        },
+        "map/island_town.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1.5,
+            "selectedLayer": 4,
+            "viewCenter": {
+                "x": 256.3333333333333,
+                "y": 129
             }
         },
         "map/magetower_1.tmx": {
-            "scale": 2,
-            "selectedLayer": 0,
+            "scale": 1.5,
+            "selectedLayer": 2,
             "viewCenter": {
-                "x": 240,
+                "x": 240.33333333333331,
                 "y": 136
             }
         },
         "map/magetower_10.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 1.6011458333333333,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.76507709322752,
+                "y": 136.15249495803786
             }
         },
         "map/magetower_11.tmx": {
             "scale": 1.6011458333333333,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.76507709322752,
+                "y": 136.15249495803786
             }
         },
         "map/magetower_12.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 1.6011458333333333,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.76507709322752,
+                "y": 136.15249495803786
             }
         },
         "map/magetower_13.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 2,
-            "selectedLayer": 4,
+            "selectedLayer": 5,
             "viewCenter": {
-                "x": 240,
-                "y": 136
+                "x": 240.25,
+                "y": 369.5
             }
         },
         "map/magetower_14.tmx": {
             "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
@@ -1977,7 +2007,7 @@
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
@@ -1985,7 +2015,7 @@
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
@@ -1993,7 +2023,7 @@
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
@@ -2001,16 +2031,16 @@
             "scale": 1.3694556451612903,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 223.08133971291866,
-                "y": 135.82039013617964
+                "x": 232.5741626794259,
+                "y": 136.55060728744942
             }
         },
         "map/magetower_6.tmx": {
-            "scale": 4,
+            "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 239.75,
+                "y": 136
             }
         },
         "map/magetower_7.tmx": {
@@ -2018,31 +2048,31 @@
             "selectedLayer": 3,
             "viewCenter": {
                 "x": 225.25,
-                "y": 135.5
+                "y": 135.75
             }
         },
         "map/magetower_7B.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 366.5,
-                "y": 136.25
+                "x": 256.3333333333333,
+                "y": 175
             }
         },
         "map/magetower_8.tmx": {
             "scale": 1.6011458333333333,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.14052436406223,
+                "y": 136.15249495803786
             }
         },
         "map/magetower_9.tmx": {
             "scale": 3,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
-                "y": 136
+                "x": 239.83333333333334,
+                "y": 136.16666666666666
             }
         },
         "map/magetower_9B.tmx": {
@@ -2073,16 +2103,16 @@
             "scale": 3,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 232.5,
-                "y": 124.66666666666664
+                "x": 215.16666666666666,
+                "y": 331.3333333333333
             }
         },
         "map/main_story/colorless_castle.tmx": {
             "scale": 2,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 243.25,
-                "y": 340
+                "x": 242.75,
+                "y": 339.25
             }
         },
         "map/main_story/crypt.tmx": {
@@ -2094,11 +2124,14 @@
             }
         },
         "map/main_story/final_castle.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 269,
-                "y": 1692
+                "x": 273,
+                "y": 250.66666666666669
             }
         },
         "map/main_story/green_castle.tmx": {
@@ -2117,6 +2150,17 @@
                 "y": 328
             }
         },
+        "map/main_story/skep.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1.5,
+            "selectedLayer": 4,
+            "viewCenter": {
+                "x": 232.33333333333331,
+                "y": 233.3333333333333
+            }
+        },
         "map/main_story/unbenannt.tmx": {
             "scale": 1.2990728021978022,
             "selectedLayer": 0,
@@ -2137,8 +2181,8 @@
             "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 232,
-                "y": 136.66666666666663
+                "x": 232.33333333333331,
+                "y": 137
             }
         },
         "map/maze_2.tmx": {
@@ -2209,24 +2253,24 @@
             "scale": 0.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 720,
-                "y": 720
+                "x": 721,
+                "y": 721
             }
         },
         "map/merfolkpool_6B.tmx": {
             "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 480,
-                "y": 480
+                "x": 479.6666666666667,
+                "y": 479.6666666666667
             }
         },
         "map/monastery_1.tmx": {
             "scale": 2,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 240,
-                "y": 136.5
+                "x": 210.75,
+                "y": 121.75
             }
         },
         "map/monastery_2.tmx": {
@@ -2278,35 +2322,38 @@
             }
         },
         "map/nest_blue_1.tmx": {
-            "scale": 2,
+            "scale": 0.75,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 400,
-                "y": 400
+                "x": 391.3333333333333,
+                "y": 350
             }
         },
         "map/nest_white_1.tmx": {
-            "scale": 2,
+            "scale": 0.75,
             "selectedLayer": 2,
             "viewCenter": {
-                "x": 400,
-                "y": 400
+                "x": 467.3333333333333,
+                "y": 515.3333333333333
             }
         },
         "map/plains_town.tmx": {
-            "scale": 8,
-            "selectedLayer": 4,
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1.5,
+            "selectedLayer": 1,
             "viewCenter": {
-                "x": 238.3125,
-                "y": 135.875
+                "x": 240.33333333333331,
+                "y": 239.3333333333333
             }
         },
         "map/portal_1.tmx": {
             "scale": 1.5298958333333332,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 239.8856131272554,
-                "y": 136.6106080206986
+                "x": 240.2124327636686,
+                "y": 136.93742765711175
             }
         },
         "map/portal_1B.tmx": {
@@ -2561,32 +2608,32 @@
             "scale": 1.6011458333333333,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.14052436406223,
+                "y": 136.15249495803786
             }
         },
         "map/snowabbey_2.tmx": {
             "scale": 1.6011458333333333,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 239.82824799947957,
-                "y": 136.15249495803783
+                "x": 240.14052436406223,
+                "y": 136.15249495803786
             }
         },
         "map/snowabbey_3.tmx": {
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 240,
+                "x": 239.75,
                 "y": 136
             }
         },
         "map/swamp_town.tmx": {
-            "scale": 4,
+            "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 236.625,
-                "y": 135.75
+                "x": 239.75,
+                "y": 136.25
             }
         },
         "map/swamp_town_2.tmx": {
@@ -2660,43 +2707,46 @@
             }
         },
         "map/waste_town.tmx": {
-            "scale": 3,
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 1.5,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 235.5,
-                "y": 135.66666666666663
+                "x": 214.33333333333331,
+                "y": 298.6666666666667
             }
         },
         "map/waste_town_2.tmx": {
             "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 480,
-                "y": 135.99999999999994
+                "x": 479.6666666666667,
+                "y": 136.66666666666669
             }
         },
         "map/waste_town_3.tmx": {
-            "scale": 0.75,
+            "scale": 1,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 480,
-                "y": 271.9999999999999
+                "x": 461.5,
+                "y": 281
             }
         },
         "map/wurmpond_1.tmx": {
-            "scale": 3,
+            "scale": 1.5,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 227.3333333333333,
-                "y": 168.33333333333331
+                "x": 250.33333333333331,
+                "y": 148.33333333333331
             }
         },
         "map/yule_town.tmx": {
-            "scale": 4,
+            "scale": 1.5,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 192,
-                "y": 126.25
+                "x": 250.99999999999997,
+                "y": 33.666666666666686
             }
         },
         "map/zombietown.tmx": {
@@ -2708,13 +2758,13 @@
             }
         },
         "tileset/buildings.tsx": {
-            "scaleInDock": 0.75,
+            "scaleInDock": 1.5,
             "scaleInEditor": 2
         },
         "tileset/main.tsx": {
             "dynamicWrapping": false,
-            "scaleInDock": 1.5,
-            "scaleInEditor": 1
+            "scaleInDock": 1,
+            "scaleInEditor": 2
         }
     },
     "map.height": 60,
@@ -2724,25 +2774,25 @@
     "map.tileWidth": 16,
     "map.width": 90,
     "openFiles": [
-        "map/debug_map.tmx",
-        "tileset/buildings.tsx",
-        "tileset/main.tsx"
+        "map/waste_town.tmx",
+        "map/main_story/skep.tmx",
+        "map/debug_map.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
     "recentFiles": [
-        "map/main_story/black_castle.tmx",
-        "map/main_story/final_castle.tmx",
-        "map/main_story/green_castle.tmx",
-        "map/main_story/colorless_castle.tmx",
+        "map/magetower_10.tmx",
+        "map/magetower_12.tmx",
+        "map/magetower_11.tmx",
+        "map/main_story/blue_castle.tmx",
+        "map/waste_town.tmx",
         "map/debug_map.tmx",
-        "tileset/buildings.tsx",
-        "tileset/main.tsx",
-        "map/cave_1.tmx",
-        "map/catlair_1.tmx",
-        "map/cave_2.tmx",
-        "map/crypt.tmx",
-        "map/crypt_2.tmx"
+        "map/main_story/skep.tmx",
+        "map/waste_town_3.tmx",
+        "map/waste_town_2.tmx",
+        "map/snowabbey_1.tmx",
+        "map/snowabbey_2.tmx",
+        "map/snowabbey_3.tmx"
     ],
     "resizeMap.removeObjects": true,
     "textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx
deleted file mode 100644
index ff554acb98c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="66">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VEkKgDAMzK0tPsO3uOBHxeVX4vIME2ow9GalUxi6QJlOZtI2ELUf0TFkNBl3czB7ooWx87quiAYQp/C5KJVG3l8A3oMx+ciJ0qroH19FM5JXNaNqnHqM0mpzrP0jZ6vH1FezvIX4BplLcs9GK5k+OkNZnyXHznCi8ix1PsPbv1rr0v5a3Xagcp3mC9lP+kcj/w7Vi9SaevyX9wbvzaup
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="209" y="272">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="224.166" y="17">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx
deleted file mode 100644
index 33af25fbb3b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16B.tmx
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="73">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VFsOgyAQ5BPSY/QsGuNFmz5uZawco2x0kikFqvIgmRDiLrMzu9gbpfqdGBxkjW5/aKVeen9uDsA7uX02K39tTtE3b7yybu5sG/C+He565bxeymkVPc8Nsb7BZ/Q4hw9c7KH0L8QNzewx15uq2Y/jfi3k5WR+70KPR/N95oU85g/FCZfAeppCdyG3i8wZ58EzjoO2JTFD+O7XwO+I77KUx55x3JH5j9XAfKn5S8WdeUupeeZaS7xx7lVs5muA/funuSTY51b/Sd/nrhHnkbmq2eNc3g9/+sci
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+AD7CLOXFoDefqGWfYTMIcWewRKfg8UduAAt3DfY/TxcwGg4Dx0AAGf/AE4=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="208" y="272.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" gid="1073746531" x="192.5" y="16">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16C.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_left.tx" x="464.5" y="113.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR1.tmx"/>
-    <property name="teleportObjectId" value="73"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/door_right.tx" x="2" y="113.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL1.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx
deleted file mode 100644
index a9ae4ed9a89..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL1.tmx
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="76">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9lGsOgjAQhPklbaLHkhhO4slqRG+FCsewaztx3EBptLjJhleZjx0GGltVTWYft+/uTFVdYl9NvkZOszbry/m730o5370ty3/4PnutOiBe+jcbmHLuZMJ1VFtwZmEPscEAc1TXxx89nfPrYMvNBha8g59TbPiOWVMZWMoKSrTYy97O56m1n8fwnu9jfqfmktLvhrPklBYYe8XEc+OZkXFh8zrMNixkibPK1cdMO9Ia1X01rQMzN3f6O2KfmJfKX2pdKuPsJWuldL79toSH/8NUSa42u9Cl/hPskyFvXdyvV+SyTzpf8HgN7tL7AnNtbqNY/2LOsX/RegL3Q80v
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="74" template="../obj/door_left.tx" x="462.602" y="113.984">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16B.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_right.tx" x="1.99972" y="111.984">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL2.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx
deleted file mode 100644
index 6a43cd61f0f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="78">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFVFsKwkAMzN9u8RiexSJeVGq9VdH2GCa0gyG2ZR8aA8PCkuwkM2nbhqhNxJkhccmo+Qb+wXuLRA8+A/MOfN6jD++T0cV53uPBd2bo7K21nhlai/69wpb+Nq/EY4Rww3N9Z/ltnUQqX69qA33GNb61sHqgN8kZmxm5vlpOvDUtPozGC/QqeVOBr/o9y7fWZ0jIK9mrvX1Gn7V8a/vh+e+Az9DQ6xvWOpfsSa3OMu/JiTNnr37pcS3vC0ZetsQ=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="75" template="../obj/door_left.tx" x="461.491" y="112.962">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL1.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="192.173" y="17.9086">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL2U.tmx"/>
-    <property name="teleportObjectId" value="71"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_up.tx" x="207.327" y="270.696">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL2D.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx
deleted file mode 100644
index 302e260e9cd..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2D.tmx
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="77">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUEANquRkY9vDQ315poJ2yA2DvTqCduwbA3lEwCkYBbQEAnAwDLA==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDHawdKAdMApGwSgYNgAAz6YApg==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VdsNwjAQy19SMQazUBCDgmjZCjV0DO7UGFkBQV6KJavv+Oy7tuNgzJjJo1BxKHi2hJMzZhYusm9F99xJcwk+FVc5XjvoeuHNbT73uz5ewRP57akLzykZYxburl2PU7wim5pceI7x/kw/vEyNZp77qngM27q6VW3UNUf14d7SvKFrzSdQwz+gxtx5egbqXCku9B7z+bB5X6/V5r4xVqoN2ow4o5J+x32O1/iWCzKwFbrwlLIG18B1lGTNOed+nz3p53pmD6X/BF/xbAu+AOxYtVo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+MDPgXbAKBgFVADRJKr/TUW7XyCxf1HRXFoCPxqbT+twiCFSnREjTZ0xCgYpAAAZ0AYJ
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="67" template="../obj/door_down.tx" x="223.169" y="18.5974">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL2.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/treasure.tx" x="455" y="239"/>
-  <object id="69" template="../obj/gold.tx" x="369" y="103.5"/>
-  <object id="70" template="../obj/gold.tx" x="368" y="175"/>
-  <object id="71" template="../obj/treasure.tx" x="208" y="251.5"/>
-  <object id="72" template="../obj/enemy.tx" x="198.5" y="91">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="274" y="168">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/enemy.tx" x="351.5" y="174.5">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/enemy.tx" x="365.818" y="124.455">
-   <properties>
-    <property name="enemy" value="Goblin Warrior"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/enemy.tx" x="438.5" y="228.5">
-   <properties>
-    <property name="enemy" value="Goblin Chief"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx
deleted file mode 100644
index b928efd1faf..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BL2U.tmx
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="77">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUjwi8gGHg3TCKR/EoHlgMADJSrZw=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztVEkOwjAM9C3Jw1oh/gmIlF9VUJ5BLHWE6zoLOcAFS5bSJJ4ZL+kYiMa//8SjJ7r57+HwvSn5Pa3n0M8tcYaG+4fksBRmcpdykHwwxpgqeTOvo63JuLhiHht0a5xcTBQ6z7Q35sf5kMlb8p6MeCtnGWNpvqSYq99q0FiP8L5jmcUNXh3GfEs6e653vLFf0u+Vfl1vaHUFXJlPS48ts+IYdwl2HnoGMG9yVqOaZaJ9ryzc1nfmFC40SE7ZL6xzNaq5nhvURu7p91Orcet/iHNi7CGjR849vku9+zRfay6BXZuTHkePe2sGfwEsNbJD
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2DoAFtB0vXU8VLXPnsS3fCDfOuHHKAkrEfBKBgF9AEAyOIC+w==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="71" template="../obj/door_up.tx" x="208.638" y="271.962">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BL2.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="157" y="138">
-   <properties>
-    <property name="enemy" value="Vampire"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="272" y="216.5">
-   <properties>
-    <property name="enemy" value="High Vampire"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/treasure.tx" x="440" y="170"/>
-  <object id="75" template="../obj/gold.tx" x="375" y="74.5"/>
-  <object id="76" template="../obj/treasure.tx" x="42" y="151.5"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx
deleted file mode 100644
index 87ad4ac31c8..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR1.tmx
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="74">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztk2EKwjAMhfNv28Ec4kEVN28lbjuGCTb4EVahTuqfFR5la/JeXpr2nUhfgKEVubXvvST3W5jWQ/d799pPFTV9XfR7qaA7Ka6q1ajmWX7n1fyMCfHe/Ix+t+qOgdP82P25duxv7DHrXat5zZeBXHPqpSTt6DF6HUK9zKO+xzXgMC2D1z9B25fF89chM2fM854xzr3NH2bIz8lFT5FrQR57xriS+Y810FeO64iesq4tb4m+clystcYb37Hj33gCbZ/E8A==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="72" template="../obj/door_left.tx" x="464" y="113">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/door_right.tx" x="1.5" y="112">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16B.tmx"/>
-    <property name="teleportObjectId" value="71"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx
deleted file mode 100644
index 7f43740ae36..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2.tmx
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="77">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VFsOgyAQ5BPSY/QsGuNFmz5uZawco2x0kikFqvIgmRDiLrMzu9gbpfqdGBxkjW5/aKVeen9uDsA7uX02K39tTtE3b7yybu5sG/C+He565bxeymkVPc8Nsb7BZ/Q4hw9c7KH0L8QNzewx15uq2Y/jfi3k5WR+70KPR/N95oU85g/FCZfAeppCdyG3i8wZ58EzjoO2JTFD+O7XwO+I77KUx55x3JH5j9XAfKn5S8WdeUupeeZaS7xx7lVs5muA/funuSTY51b/Sd/nrhHnkbmq2eNc3g9/+sci
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFgxGwD7QDqAyGmn+IcS8pfhpq/h8oMJzCaTj5hRgw0vw7lAEA9IwAOQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="73" template="../obj/door_left.tx" x="462.667" y="113.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR3.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_right.tx" x="1.33333" y="112">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR1.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_up.tx" x="209.333" y="272">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2D.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="194" y="15.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2U1.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx
deleted file mode 100644
index 866bad0d512..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2D.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFgxFI8wy0C0bBKBj6oI57YOzdNYjy71I62LEH6N9oXjpYNAqoAgAGsANM
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VNsJgDAMzGeLYziLVVxUfGwlrY5hggZC8cdiL3D0AeV6uSTBE4WP6BkSXcHbEiyOaGVE3rcN0QjijI9OiYnPJ4A3MWZ3c6K0KgajF8mrmlE5zj1GabV1rP0jd5vD+Sqx+/sPstbkznm1jw5f12epp+OB9hKynu3sqJ3jN05kD795jOBNxlvkfM7rCzmv/sQFspes4A==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+AD7ANkbMlAWMwycn0fB8AQcA2z/aHqmPbjDwsBwl2WgXTEKiAUAydACOg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_down.tx" x="224.547" y="17.2198">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="208.5" y="184.75">
-   <properties>
-    <property name="enemy" value="Djinn"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/treasure.tx" x="207" y="252.25"/>
-  <object id="69" template="../obj/gold.tx" x="193" y="250.75"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx
deleted file mode 100644
index 80574eed47b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U1.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="81">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1Ve0KwyAM9Keyx9izrBRfdEz3VqPtHmPKDLuG+AFmQmjFeGcuZ7s4Y5bBWFPk4dMzWGOednxvLzJeLMFxifeVnpv78mtxbgWb8Imbr93T/K3Eu6d42B9ufvfC2vWiW2ssNVEtmQtrIp2pxxq8iIn6SnqgxugHyROSb6I9Yx6gZebmWNRj785zHLQP+aW8Vo85Fu29VXyG+0gzzMs5R6mv5i8JCzE5FvmBa4Z5I/5fi56EhXicr+WVVl7tHnPPYg9afsazjvJhH7mvQ2NtJiRPYV2oX6/mmXvMsfFcmt9JyROIHdhd0uLseWLUV/8I/AfP4HwANWjPUA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFhAD7EDOXEkALNw1Gf9ILEOt3dHW49JEbluxo9GAGQ8GNxABa+mOgwohjgOzF59/hkl7oCQDDrwBy
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="78" template="../obj/door_up.tx" x="209.971" y="272.629">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/door_down.tx" x="193.306" y="17.9975">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2U2.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
-  <object id="80" template="../obj/door_left.tx" x="463.269" y="111.318">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR3U.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx
deleted file mode 100644
index 95158d120fb..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR2U2.tmx
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="80">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFuMAeHgaGvTz0tzeKl4Ehmpf+9o6CUTBcwZ4ByMcgAMrLddz0t3cO/a0cBUMIAAAJ/AS1
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUjwi8gGHg3TCKR/EoHlgMADJSrZw=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFU1sKgDAM6+eGx/Asm+JFxcetZOox7NgKZfjjxFgIWz9Glqbxlsg/RMeI5Sre1mA2RAsj8L1tiAYQZ8g6Y43cnwDenTGZxInSKuiVXiSvaEbNuPQYqVXvlcv9arDebjb9IZ5fc4u3OkeHxWfpL48RM77zGKlZzxmZ4TJLKH+1XuReaY/f8l6EpaxI
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYCAdrOJgYFgNxGs4yNA8hMBPfghmp7O9ogIQPFBg+sBZPQpoCMwY6Z+WRzIYiLCG5d05A2D3aNoaOgAAmLoGkQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="72" template="../obj/door_up.tx" x="209.304" y="272.629">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2U1.tmx"/>
-    <property name="teleportObjectId" value="79"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/treasure.tx" x="224.667" y="27.6667"/>
-  <object id="74" template="../obj/gold.tx" x="245.667" y="153.333"/>
-  <object id="75" template="../obj/gold.tx" x="232.333" y="140"/>
-  <object id="76" template="../obj/gold.tx" x="235" y="43"/>
-  <object id="77" template="../obj/enemy.tx" x="198.667" y="104.667">
-   <properties>
-    <property name="enemy" value="Demon"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="222" y="153.667">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/enemy.tx" x="204" y="184.333">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx
deleted file mode 100644
index 1c275cedb74..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3.tmx
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="77">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNlW8KgzAMxfuxZcfYWZThRcVttxKrx7DFPshiUyfGucBD/JD8Xv6ItTOm/lKPoBjNjhwNXcF9WmOGxO3D821/w/VBnV2495tez7GfV5LUC+asMWuwBlJTmiN6boOmjN+SZy5ErDWSWfZuXQs7btznOw3kbfHHpIn1lKsFRiUwec7e2/PED/eAmiXmEfaWB74XKTTunnoo7UWbK4l+X5qzPsI9s+crZw127t7O/o94dm/8Bv9BM1jwszE=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+AD7QDtgGICRHoak+p8W4cWORiOLc6CJLaWB/cSAgUonywbIXnr7F1vc0xugpzV6g5FeFsEAANdDAbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="75" template="../obj/door_right.tx" x="1" y="111.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2.tmx"/>
-    <property name="teleportObjectId" value="73"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="193.333" y="16.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR3U.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx
deleted file mode 100644
index 6cfedfed3ba..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16BR3U.tmx
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="79">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNU1EOwjAI5a80HsOzuBgPqlnnrczcjmGJkjEsc1u3RhKyQArv8WCVB6j+3AMC3LE8Zhu/j+hNQfxn9DpikR0PAz5zCDjES3iFGTVn/8a9wtiIQ+u/c1O9GIvqnKhJvZczO0ib5nQx5mS7xX6d6Kt1lDuWJvExkbNm6D7eq5l0baMwEcZGvGuV5NCaOaUn87F05Zh16kWdrpmL+4uDxrPuj9+l3qz9l6ZmkFxzMfVdWfeyh5N+LnNvuTpvsbc1Op8KYS65q712vAXuC15CtpM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="77" template="../obj/door_up.tx" x="208.638" y="270.629">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR3.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/door_right.tx" x="1.33315" y="111.318">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16BR2U1.tmx"/>
-    <property name="teleportObjectId" value="80"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx
deleted file mode 100644
index 91ab37c7ccc..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16C.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="66">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUjwi8gGHg3TCKR/EoHlgMADJSrZw=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VVkKgCAQnU+jY3SWFrpotNwqWo7RSA7IkFk6KjwqMN/is5oCoPmJFqFHHfBuCCYFMCM2vK9KgD4T52Z86jHg8xmx3mw8LOp93o4Y1c0p4ZXGWvj5O2t+LO9hQF6I/0kDeY7N2JUjz4A00B5L92l/8G9roF7Vpme+TqTSoK8puLkGzk8aUnK7OiDZMRekvx1fYZ9fiTMcknMurzznXP8i7jdXxnyPY3kvOXq2Mg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+AD7QDtgAAC1/TwYwnAg3TAY/D/QYDCEwWBwwyigPhiNV9IBAAJjADk=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="63" template="../obj/door_down.tx" x="224" y="17.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16D.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/door_up.tx" x="209.5" y="271.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16B.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_right.tx" x="1" y="80">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16CL.tmx"/>
-    <property name="teleportObjectId" value="73"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx
deleted file mode 100644
index a64eca4cb5d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16CL.tmx
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="84">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VEEKhDAM7LFln+FblMWPitv91aL1GbZo2DGYSiVWCKWQZDKZqZ0zpiuIjzXma/9nSe3dSFhTPH9uO/uKmPQN8b5UwJ1jjHbDbF56XBMfvwfp55mGb+CrhYs9ST/enzjjjnFePqfEy9tjzwC7xBmoF2ncu+Od53P8s7ycjrwX1baCz7CO5sW8lBN2fpKHgsCf60C9lpOd8bwS/0szIF7OK7m8O28p52ecVeONo1bot6cD93fFWTNwz7X+k3zPbSXMEl89ha3h0xVTgsj4
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFhAD7ANj5egDspBVAD7+5/PS1v46XNPXUjO/vRJpHrBspdVsUkep+UGgPJWAg8ttwA74DYOeyAbBzFJAHAOVFBhQ=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="73" template="../obj/door_left.tx" x="464" y="114">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16C.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/enemy.tx" x="135.5" y="136.833">
-   <properties>
-    <property name="enemy" value="Black Wiz1"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/enemy.tx" x="199.5" y="104">
-   <properties>
-    <property name="enemy" value="Zombie Lord"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/enemy.tx" x="207" y="185">
-   <properties>
-    <property name="enemy" value="Big Zombie"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/enemy.tx" x="296" y="114.5">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="381.5" y="154">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/treasure.tx" x="58" y="93.5"/>
-  <object id="80" template="../obj/treasure.tx" x="200" y="33.5"/>
-  <object id="81" template="../obj/treasure.tx" x="207.5" y="268"/>
-  <object id="82" template="../obj/gold.tx" x="41" y="91.5"/>
-  <object id="83" template="../obj/gold.tx" x="232.5" y="40"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx
deleted file mode 100644
index 7c5e62cdce0..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_16D.tmx
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="78">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUjwi8gGHg3TCKR/EoHlgMADJSrZw=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9lEsKgDAMRLNri8fwLBbxouLnVuLnGCZocHCn6AQG2oUMMy82J5H8UH0UGVRjfP7tG7nfrOeyEGlInuZnE1St3jeC76Lq4uHJyuqqIS/T1zPbTIm3W8hYSIzvnqyuka1NPLv+u2dk6x2vif8vMfcZGTM6RsbhqpqWGRmz3kns2TJXRL6Yl7lXzvgL3x2zsas9
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFgxFwDrQDBgCIDbQDRgDgG0C7lwyg3SMFbIbSKwbUFSMDLB5oB1AAAJXGAtA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="70" template="../obj/door_up.tx" x="208.638" y="272.629">
-   <properties>
-    <property name="teleport" value="maps/map/cave_16C.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="214.833" y="40.5">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="228" y="108.5">
-   <properties>
-    <property name="enemy" value="Hydra"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="229.5" y="148.5">
-   <properties>
-    <property name="enemy" value="Snake"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/treasure.tx" x="227" y="27.5"/>
-  <object id="75" template="../obj/gold.tx" x="250.667" y="104"/>
-  <object id="76" template="../obj/gold.tx" x="249" y="153"/>
-  <object id="77" template="../obj/gold.tx" x="236.667" y="40.3333"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_18.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_18.tmx
deleted file mode 100644
index df26b51da44..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_18.tmx
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFuEAd90C7gLZgFw+E3gOk9/IgxKN46WM/yJ5oJLt28tDPblIAqW4ChesuHsLqkAF6HIAANcMDl3vQ42CgADb/0wMMFv+TCkhNX/jAaNiPPAAACvERDg==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjY2BgYKMyZqWBmYMJMwwCN9DSL4PVf6S4ixw/DBZ/U+oOXPpJNXewhMdgCFNcZg2FMKKHG2ltx1AI56EUnwA5VguO
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9lF0OhCAMhHmEg61ruKjZn1tt1uUYSnSS2rSApuwkfbDWfhRGhuDcYBj3NbJuBr2e3rkXibc/5vIzasedG4XvaV0L67v3gj7hmMvPWAvypVyJyVk18bVouViY8Syzpt/a7+Fl7pUZWwTOHDZ++gMT0jw1dmRCkqd6cSe/7a3G7sHNzETOFqK+monfrMTvDfiH+9mSTWflnk2hzV84I76mnEcONYik9JTuDG3mKLzDPNI/qc1C96DG5rXSnV+LlrXVaq9wLcKSuwDK+o2z
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFuICzICqfFYiX0MAeVjQaHUSj2RuDx6xfRNoJMk9NCMJW5QOy+RByl4HsK0h8bP7+Q6Q9+IAj0A4nJHveA9kf+BDuQ3YrMjuaSPNZcbCJAUuQ9KCHByGgKMDAoCSA3Uxc/PNA8y+g2YEcHoQAyK22QDvtBCDmIrsfBCoEsafd10Dz32Cxg9x0DtOHLcxW4DH3NFDtGRx+/Y3Hvp9ofOQwIyb+nwPVviAhbmEAV/okZF+VIG49pAB3Qfz2wAAx9swF4nkUuodYu5CBNSMDgw0jFSweAECLeoCeAADYGCw0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="194" y="273.333"/>
-  <object id="49" template="../obj/enemy.tx" x="96.333" y="146.167">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="51" template="../obj/enemy.tx" x="336.149" y="37.3715">
-   <properties>
-    <property name="enemy" value="Goblin Chief"/>
-   </properties>
-  </object>
-  <object id="53" template="../obj/enemy.tx" x="192.167" y="208.166">
-   <properties>
-    <property name="enemy" value="Goblin Warrior"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="346.167" y="57.5">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="325.833" y="57.834">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="336.333" y="50.5">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/door_down.tx" x="336.5" y="16.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18C.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/enemy.tx" x="424" y="188.333">
-   <properties>
-    <property name="enemy" value="Goblin"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_18C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_18C.tmx
deleted file mode 100644
index 9b900381dd2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_18C.tmx
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjY2BgYBvFJGGGQeAGWvplsPoPl7uWUMkPg8XflLoDl35SzR0s4YEtfqkVJuSYzUCEuYMJY3MjNcKUmPClVvwOhXAeyPgkFQMAfBkOpQ==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJytVdEKwjAQ6+P2Y0P8UXH6V8O5z3CFBmPMdSdYOERnkmsvzaaxlClZp73qOv+AydQ8lHJrdR/yuoxT7Bxw8f8fjbeuZfzmcLpzw132z+f+eR3eWHDW76rNC1jgWZ/7Ag9rbo1vJSyvRfYInVob9bOOn8+Uq/JoH4oFpval+OzslUv53FxW2o/uI/KX84Kew2b6cfpZP8MLPI+ez91cGd/rAR6J/BX5w52r4qIzUM3IX5WL74veqWgePAN3L1XTcel9ycwz4u/ln2YRa/BMXTYc8eN3h8UznTFra05pTj4CXe77KAOjeXB/mmdY7jx5z5yLrNGbh7vHwMOPzjuaJy47M+9B5UG29Px6VP98/74AYrH6wg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBjZIBqIXQfYDaxoNDawhMp2YjMPZj8XktgRqDgu+3/TwB0wcTYCamgJQHayIrGpZSax4CuF9iC7fzoZ9tMqzEk1l1ruwJe3hgI4jEMc5i9OHPLEhh81whmfGYtxiKtRwd6BAANRJlETAAA/jRHl
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="192.102" y="272.145">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="192.462" y="17.2541">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18N.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="464.545" y="82.0692">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18E.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_right.tx" x="0.333333" y="64.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18W.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_18E.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_18E.tmx
deleted file mode 100644
index 2c9991cc8ac..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_18E.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjY2BgYBvFJGGGQeAGWvplsPqPFHeR44fB4m9K3YFLP6nmDpbwGAxhisusoRBG9HAjre0YCuE8lOITAED6C48=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNVEEOwjAM67F5GBPaRweDX00rewZULMIEpw0niGRt6uY6TdwMktLwp5hzStcc//cCiPIYt8Yi/T3m/V8bEX2P29NG3vR4v8kTGC3to3zyMcYOr3I2WC9BbcZHLtPVs1pNdpZv+apta105q/ianq71T41Dh78Ab5V2/TVn7bfmxsLTtb2K9N3DKb9g98D7pLXF3CvOuV3jCGwPy75v6zxFfM3ovGG+0lwidbTzpvYevdC7QyPJhc0MptMKb+4wv3q8OaAT9R/z65Tfn5qT3ln0GHK8dc8L1q8beId9Y9zo+i9wByt+ygw=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF6OApJ4RmJUFtJJT/mJN8e0D0bxL0wQBI30oOBgZVEuz/jsQG6SUFoIcLTD8pfifWbpBfl5BuLIp+EMAWl/jspoadhADMDmLSGSGAbAY+tyP72Y0I9cQAUtIPNf2My+6fVDIbH8AWx6TmI2oBYtMbCMTQyc7HWMQOM2DGex0vfnOwhSlMjFB4g+TvEWkmqYDSPDPQAADQtSGH
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_right.tx" x="0.350854" y="145.147">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18C.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/gold.tx" x="444.333" y="224.667"/>
-  <object id="62" template="../obj/gold.tx" x="425" y="124.667"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_18N.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_18N.tmx
deleted file mode 100644
index 8a651c93e77..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_18N.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjY2BgYBvFJGGGQeAGWvplsPqPFHeR44fB4m9K3YFLP6nmDpbwGAxhisusoRBG9HAjre0YCuE8lOITAED6C48=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFVEkOwjAM7DF9GBXio0gpz0JJngERRIwm3qoesORDU3tm4iXbuizbH3xPP3+8vVtO8znmeP8jzran+awbYl+VvCM6Krhlt9Xm1WJHfSwtBTS077eEVRytzNt18pnn425aXhH4JV7uleUZet2cWKwNx3raeV6jnFY9UbvGy3wRjYzP8VgHrdYcM+br7BxYPeB86X82dhR3S7qTN9Pa7GXhPcG3gu25frzjYK4206jbwsVeSLsc3W2txxrWPc29GLvcDCyr1hhfCSu6i6ylBvOKMsuD9xLkjWCe3Zcj/gJ4vqzB
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgY4MbJwLCKA5VPL3s9oHY9htJPgbQYVJ4TSRwdsALxEiR5VhLtfQbVtxLJ38s5EHxs5sXC1JFgFykAZHc0AXmYv0FgC5XtX0JAHmQ/PjW44goXAMX1cg7C6mB2E6uWWnYSModYdaAwIyV94jMfFA4rGPCHNSwNU8Of6OYSMpMSO0lNPzCAXA6gA1A4wsIeXQ0sjHHpB8kT4yb0MghmriiSmuVoeQcUllwMiPAC8UHmEJuuQOrvAenXaHbA5AjlZXSzIqHsP0Sqp0XaIheQ4tfBCAAWJDew
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="209.567" y="272.873">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18C.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/gold.tx" x="22.75" y="46.75"/>
-  <object id="62" template="../obj/gold.tx" x="409" y="74"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_18W.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_18W.tmx
deleted file mode 100644
index 1b13b760ff9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_18W.tmx
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybycnAMHMUj+JRPIpH8SgexSMCAwCsCkLM
-  </data>
- </layer>
- <layer id="7" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjY2BgYBvFJGGGQeAGWvplsPqPFHeR44fB4m9K3YFLP6nmDpbwGAxhisusoRBG9HAjre0YCuE8lOITAED6C48=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNVNEKgzAM7KP9MRl+aud3aT9jyAw75NJcHIwdFLQ2ubO5ZK6lzH+y2lTKE9Y6ffbtOTp7h4cB91GHd1bhf1Qeb9jre3k6GLrwv9uAtw/OmZ5+fsN39a4Z9zK4GyV3E+uOmj3dBy/TwzivQA9lfW449F/93QJvIjK8nv9ULrzLTI0wnuVCLKLXWP+zGln8RnKhNxUPRD2c6Q/M883sUL3r1TjivsvrzUo1HmsT9bDX8wzqvMzMuJGG7Lz81XoBq5mv4g==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFTzkhtBiU/5gTIQ5jI6uNBtJ/gJiVAVOeHAAyZzkHhAaBlUA2J5o7GKBqQHK/gGxfKJ9YsBJN7RIc+mHqkOVYMZWRBGBmhhNQR4p/iAGsONjkAlg8bGGgPN6xpS18doIApX5YAqUjGSB2o7sB2S5YWkPmkwtA5sL0g8xENwtmD7XjiBg3o+cLYgEsLGHhSG74kJuOjkBpUsMM5FaYHnLsBun9SYJdyGAFiXZhSyuk6geBe1A+tcuXoQwAWhEykQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="462.668" y="135.761">
-   <properties>
-    <property name="teleport" value="maps/map/cave_18C.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/gold.tx" x="23.6667" y="64.8333"/>
-  <object id="62" template="../obj/gold.tx" x="39.25" y="212.167"/>
-  <object id="63" template="../obj/gold.tx" x="265.417" y="233.25"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_21.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_21.tmx
deleted file mode 100644
index d9e74fa419e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_21.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="66">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6C+M1f/cipkkNBLqqqqqqqqqr446Chj1w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzlmH2KAjEMxfvXzpQ9hmfxgwX3mn5exxO4O3qMbZgJE0MVVPqrrIXgKMibl/eStJ3FEGZ3xjyFrOkD/30ktm0IuxS/6XnyGcIXhCl4TU81rNL3M4Dbpdi0PSbFVWMx6CqcSVzlTOXYa0xxtT7W+pHf9i2TX/XyMfbvIJ8lsbeGazB1dIpldRYfNwaT8rPk+RTH+tVcl9bX8raL8rXMg6UJGrcB+7N6ehnZHIu2h48Rl/JVFy/9XBOb1lgXtc/x9Uvl2eNSnHPeourpVTz9Dv4Szuu23lzU88or1BW1D6nlb8n1ymlN9ZKzyTk5K37iOC/IPOsi9tQelz6rib7iKbJvqL72vEbhWn3J86nd9/z3mZg7nxKcc3xr3C+RGkvY3kH1K6sxxTXnq5J+9jOIyrHfVxG96tqdUmkvea4EZo4rld9vGHcxYNK4Xez7ocWlerFyJnrELdxac17egbwrpPX1uOT+0dbTMzn+A4iHUl4=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEKgDAMRNGuVLz/DbR6TRH0CPJt/rxNlwOhaUJbiz+aodwFyo3aqPtsc/cvVesdyo3abDPJ+FYeQOYGZNrRvWzqrQ7nn3B+xMjIXX6CcglvjYkdxMg0gwn0jlVZ/ji+Rd3d9TltbxM182x1HtUFa0QFuA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="216.98" y="959.379">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="224.166" y="17">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_21B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_21B.tmx
deleted file mode 100644
index 745f1155f3b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_21B.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="69">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6C+M1f/cipkkNBLqqqqqqqqqr446Chj1w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzdWVFuwjAMzRc02jF2lgGatF1zjO06OwHQ7RiLRS2MsdsR6hdpliK1H+3Le36xXXWVU1rduNZlUTxVPFuzdl1KH2Udy/XjQ0rPIEzCW6Zz7Mv9ZxeL25f13p3wiCsHgvNmyGtLzhxv5f4HlGMUpvSxjOhzxPouL2HDc6v1RelMPpZc+Tr6DJHO3/nay4gzxLx1IGo09YOXYSE5M672dSRn9rTkSn6mvEd7+mtxiYvIbZ/b+VljI3qCzDFSZ84xWmevRkdztmoVRXSNXju4kVp7GkdqPYUZxdnLaxQ28TxknyvVjDnrlzfDSbztUKcsLWr8PZVLXRf7PA9n76xwWL61nrnV32MesnqApU9Nr7B0G3uXtc9ab+l3je1f7/Oe+YPeRc9uhW//uk9UX9ScUfOH5a0Ws0CruafVnIfS2aob//mb2IoWc0/k99JYr4zkOjX3RPnZw22lceT87s0j0WfHwkXU5Lnmx5rcvmYs7mbAROP2+dR7JC6q3zJnDuRsIXFb9XnaA+K/Bi15hlH51bjIeVmep3s0/gXhfjeM
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEsKgCAURR1lBbXkNtNv0s7aRAQJISSJ6e15PZMcVAde96mpVOGPaJC3BnkL8ekVLlcoLxtn/6JqPYG8jDD1E9uaxPRtDQvAOQKcbNhZTtHLLof03hq69/fOHzmb27jyeG4N9Jo5YQ98jy8+NUYiPcsFN8i9vE+fS8fUGLEHYUE/jHPEztGW2M/2v5SScsYRF1R22+ua+9xkg1rz2OoslQM/UAn5
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="216" y="958">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="223.333" y="17.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="58.75" y="505.5">
-   <properties>
-    <property name="enemy" value="Mimic"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_21C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_21C.tmx
deleted file mode 100644
index 425c00836b2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_21C.tmx
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="75">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzt07EJwDAMRUFXgSzn7b1PijTGhdx9Q3LFtXpIoH631qEwrle6d7qb7Ke78/z0vlX7q/fe9U91//DXazvZndvpLgAAAABA5QG+x34j
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzlmF1Ow0AMhPOEshIILtVS9STcjFJ+LkVZOAZrpSOMu5smij1IZSUrzUP0ZWzv1Jt16rr1jNiUkLWa+dzSAHdLZO77rvs4ct/L9aXnMmU9lvuvC2RK5BJP/Q+XlWOJe6WX2VeWK5qf+1jdtr4s3ZsGE9x9kG7kWPr4s9JjkosI3TkNPOydmv7oHh+rdRS7xbwtcRfY51nVVmq964f713L/Ftznwt4pn0Ttda9F769WLhh9NsZmzgbaT5lcrZk9C4HNrLHNN5Nt/YWVb+vfLC7q+xd9rTX/Fw/Rmll+bXuaMQdarVje875ogxb5fUin80EEU5/VWPOunedrudUzYWQdo3I7hauZVzdDeHJzOp2tZGmfiODWZlvG+bjWVwxvstxL+/4APxJvqp3Fo/xXz02MfoIHt3zQkwnWGK+2Xz17Zmx5aZ3CxDnUy/OnMoUF/1vigXh+7P8Fa2ueYXEjZsM5er1iag97+9K5mcWyD078nOrfSFjap9S4pX1Jf0P3XO2r5DfTyDvAl3Btvcs2+ezpc/mw74FaR3ERNa/RmqO5WWlmzHRaF/a+cB+uf0ft2W+N6zSE
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEKwjAQRbPRVkH0fuI1dONtquJGz6NXceUMZmBaUDft/yHJg9AEAj+dZv4kDaGSIif2AgpgLW1D0L1JuxN0jQtYr3V9VMyvgzE75sqcpNv+nzIa6lsNUC9VmDFg1Q60r3jqnqtMge6rUs8JDGbsBYBRr2b6Jho9izC8esqz105a58Yov3jFp8UT5Rfb8Ikns+YycmYJ1mPlisK6qzCwGJfgw8i7oOLvIjmf0VHv5vMSuV9Z3051z0C9RXyi86QZ9LtvE0fiuOqPU/nfjIz7Q5LpGRPKajtin+9F5PBDCFl7zUM0x5Cxz7kW5MQbHpUXcw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="303" y="958">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21B.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="207.333" y="18.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21D.tmx"/>
-    <property name="teleportObjectId" value="83"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/door_right.tx" x="184.5" y="120">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_right.tx" x="376.5" y="391.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_right.tx" x="344.5" y="535.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_right.tx" x="280" y="232.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/door_right.tx" x="231.5" y="168">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/door_right.tx" x="152" y="872.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_21D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_21D.tmx
deleted file mode 100644
index 1300855300d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_21D.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="84">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzt07EJwDAMRUFXgSzn7b1PijTGhdx9Q3LFtXpIoH631qEwrle6d7qb7Ke78/z0vlX7q/fe9U91//DXazvZndvpLgAAAABA5QG+x34j
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="60">
-  <data encoding="base64" compression="zlib">
-   eJy1WW1OWzEQfH+ABIljhSJu0J6l6mUSqRR6K9oHUg/Q/mxWyojJMLu2k4cl6ymJvbM73q/n3K6n6XZg3u1njM3gvpH5uJqmJ5o/93Pef/+wf75+IObvg20Yz/vPv2iGHi0ZI2ufDKaO7w2bofcf0tlhQzeHd3Uipu512HeEpzg8vhS6Y34yuv87PO9lbfjLj9Xbum83BbjZ72xgGRDt4gDYwWM8rw9rLwxu2Awfz+RgH/irzif2vArvMT4P2q1ct3yiOqMM99HYzefWi+k4z8bzIQbYbo7FEUzlPJ4vDb+Dj2u+qfyvd+qZ89mFTrA9xtWCuI578KhxGN8vmceVe5bLfLg4df63xGRc5Rfn3sp15+KqfI7LpWv3LH63WR/XmyV9jXnUerYRDpb2NdcjwM9H+IXuWd7XCdlcP8FlcB/xtS1wXa+B3ma03t6vj7lo1aIsF2fxiDO9OHAbMc1xDZ1a+sMPwBlqqNvHdjp7st5Qsd06jK83x/wxbsYh6+XOXnm+FEy3h3XMcpDWkUuR4XR0x8x2sQ9n9rK/rKY6ftW3/ibreV2Vc1u1Qtf29GJVHRjVj+VFT1Hp2Cuz5X/qLz29EftsFqPQL+MEmNvO88hyleutY10mL/R6oB4GdWw0RzI+9sa63vcb9GngT22o8oza3tPTht0vZPvWyMneHVs69PY40CHwq/dEHlwfcGZVfmnhc++qfTyPjdH7nD4DMl6NLqfyeerM/JmxUaeX0qXlz+zLMc7pI1l3Z2t29uszcTW2FU/rJMNX547eDjbxHVQVs2qLcpH17Fkv6e6D3FBben0d+u2mtzrP8YrP2fu/ywmQuaU1XJey2ufiFXcuqpvzGc4ZyBszyeP+oqf2zev3ueOUXNHTD1QTeo9ic2y4nroli32ouk/Lcs719P4+CPUXsZXlO5xlLz56uJXhObu/6enheG3VczmfzHAzee7+d1foGvJ35reeu0LeU+npsLP+e+7AhTzNdVofXJ6s7gKyfJcNrQ+8X/0Hv2UxyHmn6m+c3ry/9T7WqpPz+jhHKuen5q3evdkZjGLDjoyTbI9y/5H/a2Vc9fYy/wFgLpcl
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EsKgDAMhOGufB3Mi/rAY0oXgYKLupo/ynzgeoK2TWop76zz81Gicik7XYD91inOm8R51QVk9gx0AQL13BrpIhIg3wHVO9TnSstrzszMCBuYTfQ+epYlZo1FnEfcmwL9fZVi/5Dzq4p6TbV3Ec/oZn11n6jniSz/m6meF709wxml7L3R8w5hpn3HDej8DAI=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="74" template="../obj/treasure.tx" x="150.833" y="44.3333"/>
-  <object id="75" template="../obj/treasure.tx" x="103.417" y="347.25"/>
-  <object id="76" template="../obj/treasure.tx" x="391.333" y="60.6667"/>
-  <object id="77" template="../obj/gold.tx" x="132.333" y="42.25"/>
-  <object id="78" template="../obj/gold.tx" x="56.6667" y="936.667"/>
-  <object id="79" template="../obj/gold.tx" x="460" y="276.667"/>
-  <object id="80" template="../obj/enemy.tx" x="280.667" y="196.333">
-   <properties>
-    <property name="enemy" value="Troll"/>
-   </properties>
-  </object>
-  <object id="81" template="../obj/enemy.tx" x="112.667" y="553.333">
-   <properties>
-    <property name="enemy" value="Troll"/>
-   </properties>
-  </object>
-  <object id="82" template="../obj/enemy.tx" x="375.833" y="174.167">
-   <properties>
-    <property name="enemy" value="Troll"/>
-   </properties>
-  </object>
-  <object id="83" template="../obj/door_up.tx" x="304.75" y="959.083">
-   <properties>
-    <property name="teleport" value="maps/map/cave_21C.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23.tmx
deleted file mode 100644
index ffe6b1677ad..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23.tmx
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVllEOwjAMQ/u5HoyBuCgwuNWg7BjEH9ZCtH0gldWLZI1OaHpNUjd9TqmvpJMJca74zRoaupTuppcg3+C4EBdbTwJcVDHduplPKXcU+06VjzlUqy3FHjwIsKyxIRT5fO8p8pU8n9/Rfj9Nj6491xqj4hnxPTgK5s/3oKIH+voilOurfobVaksdswYfZz36HNZ4ko8e2MIH46wHFqz5jIH3fi//5os+8kts4Yslf/vIWuAOWfrfFmebjGC4LnDwfmM/xvdb9CEYp8Abc+T3gWdLX2RfxhxxH34/LcRaKt4dnk9xdome2Pr+iPKeqDiblryf2UC9/9Trq+4viny+vornw88BiuejmN5Z32Po04o5ZB73kkN1vpo+8wE6Ag3T
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1jEKwCAMQFEX8f53EOkx6+CodJIE+h5kyfSXQEqBb21OjY4AgAtadAAkN6IDlr7Zne73uRkCAD+W/XfO8rcAebzZwAK6
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="321" y="640.667">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.333" y="16.6666">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A1.tmx
deleted file mode 100644
index e5fc80bbba8..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A1.tmx
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="4425" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzdmGtuwjAQhPMzlnqtpoiT9Gak0FvRpjlGY4kRw7B2/AjUqqWVIG3sbx+etRlc1w3/0I591325q332f8/E9rYYj3NjjNNiH33bjBrDw8I2N8ClMfRc44XN1+Wpf14cj7TWUdb137/dNa/4/qxc8/on+ow9CxY/9svnneR7/+B48no+h7wf/Pcfd312Fl59tnU8OVeIxSQ8fj34oPwhH7bSSkvfNKavF2bPMLt7zdm7232kz7fiw3waUytn4AXzYDDW8jEHa5rGNHctvF9Ti1bdhXKOHKfOzTHMeY/N0gjNnWpyie+lOWYfQ/1qcmV9TPdWaf0hj7k+rmkx+55bgzjPnSgHlo9ggI6h52lvw1zKUBpDq/bZR3CpvqDnae/g/+Ez7E7eZx/eX9brNjR/6O85I+QH6ijEp3s2Z2gPwzPtdbH35xU+X7dj5pxjf9sjMAc0h7UoNriGPF+IMYXz0N/3rRS9subEXLkaqjpg5aHEdM4a/bP2y9ZnjpoerL5ude/RfVjDCF9DbKznqWtYdVPao3x+Y3FTnU1ljZ0/cnMQendNz2OcXIM5dRPqX3q3tNgsPbY4Y2fLlNqAHvFaere02FiPVZOtu3GJjq7VcWiE7iDKaN0XaozX4B5r9VsrT5PkouS8nZpz7rHWXSl2r9U5nmV+n+u+aOn3NcRSObfog4/ibC2GytlqDGGIYet8NWc7tV8ehEju
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1+EKgjAQB/D7Umrga/XBDz5R9DLVNOitAhN6iRYtGCJ46u424f+DoYzdPLfpGBHAdlXu+o6aBWjbKz6ryYleBdE957U/l7L5+Iwtlc3taEtX/Op6RlwmmZTnO3a9yy9FT5vXgzmv2sbmqPbuT4rrDMK6CPa9E+wb4lvz7+bG3kbqNPZc465Ta5j7Hma6yWJ+DqG3kES3JGoC93cI3B9AClL9fv+uK2KzGfHDcdA6d2xdGzsBgAHJMwtADB9FdxHc
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_up.tx" x="319.688" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/treasure.tx" x="335" y="107"/>
-  <object id="63" template="../obj/gold.tx" x="341.5" y="187.5"/>
-  <object id="64" template="../obj/treasure.tx" x="242" y="44.5"/>
-  <object id="65" template="../obj/treasure.tx" x="277.5" y="44"/>
-  <object id="66" template="../obj/gold.tx" x="261.5" y="41"/>
-  <object id="67" template="../obj/gold.tx" x="217" y="248.5"/>
-  <object id="68" template="../obj/enemy.tx" x="160" y="138">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="233.5" y="137">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="296" y="153">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="377.5" y="152.5">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A10.tmx
deleted file mode 100644
index fe5edf4d5bc..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A10.tmx
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="73">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt1MEJgDAMQNFeBaFbOYuDO4j0IPagYMHSiO9B7p9AkhIAAAB8zzqPLuBNy3RONHWbvufKjZbZ8uiSa0cf/djvPbtpF/HP1aL3/dUOYN0JXw==
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzlWFtSwzAMzGfCDxfit6X0XNwlbcqtSEuOQTxEk2VHsuQkHWDQjKdtaktrefVw9k1V7f/R6Oqqeqt/HoeF7Tp+vjf3x1jqB8EmkjBexmf9HbCiH5INGTk7hwlbO845jeNj/H2uZ6x94+uIjmTLsmPZeJ7WDPDsBmsF+7ASm/jumLFzNNbsFH24dgteiu94n2hnp2DTcKNvt/CfF3+CEXnJMZHWdfUcG5cA/hLfiWhnxXM0SRivxpy1+PAMUVc3+aKfbHPspN/Izxz2tfwTrmhn2E6YOEYHWCfzLNxb+PCk6M1xu6M9DID70MR0LImT6L6RF3yGEU4vwSYci+QuzX8R7Ev5hzYi+q24Yk5vwb+ki3VgbbX4Ixg8fJgjS32p1TbEhzHdkx2Me8lFYh/9K3OseshDbGFuy9U2FLFj5WSrzrAvc/hYLH54dWOpeHw81fOQ2opnxzU0ItF6EsGX47GFqaU98X9cTywdXIu8cWt0m5p9i5s7eq75cm0dseLB0mvln1sz17pcf7sVRisfyFnm8oWWA5fg4l4KxeuPc3a36hM4jyB/NHzcS2h3E6vPLvWb6MH+E3skTW+OW9w3YE9b2sug39gHiEHLj9q9nPeK55n4gHoivrN0IX4861x+RPHunBE/cv23eijuhy15evga2lkwxggXcT9ebHl1gUWzz7yI5MNc/2bFalS0mHl9jPlD87d2xoytrb+/m/F8eFFiKUlJHCO3+N2Vdce0+Ki9X9LmlORpj/tW74oYrDuy1d+W5OmkR/oXPL9c3sG9vTR+DWRZcueUXMLfvTW5fg73bvn5NwxvH39tfAL0CVsA
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sSQDAMBmAbj7FxPA7kJl4H4wqsseumRLRJ6f+tjKn+mY42JAkAaMuEcnLmc4XTKv5nFMzqBLM0lcY19711KYQaAACkUftb77WKe6nlvlm/xjmu3Tukvi+fGhzP11aOJ4xIo10ARGE+9ugS2D6VOJ9tvYmC+3+5vsi8MhHG1J6yuTbiOM1efWZTelhoawvwRTuyEguI
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_right.tx" x="2.95097" y="319.688">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/treasure.tx" x="464.667" y="619.333"/>
-  <object id="63" template="../obj/treasure.tx" x="503.333" y="594.667"/>
-  <object id="64" template="../obj/gold.tx" x="484.667" y="603.667"/>
-  <object id="65" template="../obj/gold.tx" x="435" y="604.667"/>
-  <object id="66" template="../obj/enemy.tx" x="410.333" y="558.333">
-   <properties>
-    <property name="enemy" value="Gorgon"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="503.667" y="498.667">
-   <properties>
-    <property name="enemy" value="Gorgon"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="461" y="441.667">
-   <properties>
-    <property name="enemy" value="Snake"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="390.333" y="547.333">
-   <properties>
-    <property name="enemy" value="Gorgon"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="378.333" y="457.333">
-   <properties>
-    <property name="enemy" value="Gargoyle"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="404.333" y="444.667">
-   <properties>
-    <property name="enemy" value="Gargoyle"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="304.667" y="601">
-   <properties>
-    <property name="enemy" value="Gargoyle"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A2.tmx
deleted file mode 100644
index f13af06ed3f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A2.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl31qQyEQxN+fT+i18kFP0pu1TXKrmFePUQcyZLOoIR/gtLgwyBOMP3d1NOswTeuhoaGhoX+t3TxNMbeHuT9Lie2U28/cJgGeEhviKJi/7ZmN8S7AZLVk/WR9z7r1xblAjVcCPKX8IXeKtaU2QYMPtdwbn8M3WvLh/MZw2wc57t65OcZ7LbnoI2TBN1sf6Oda7HqiGbefL/p4a7NxTAzXfhYr898btXUwWnzWw+AR3O+PRG18qR998CaoxcczSP/ynut/8+us0nzJnBcbKzcPmKxXgu8WYwrX91WJLRXWZRn8er1vL+E5D/dz1tj83iixpxfw1Bh9/Wp3A2vZ4+7w+7LF1+vt0qqP36u97w8v70tqbxfWXzF3VO/915Ldf+r1VXyb2voq8tn6Kp4P+w5QPB9LuPx3U80hRJ9WzCHz+FdyqM73Sp/5BeUEHBA=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1j0OgCAMgNFOChdz8JqicfBgHsOFgcES7FBM+N5Cw2+BkCACAAAwrrl3AoDBFUSW6LPW0dhvKuI12vKrDUkvddr7PXMZlPY752c9Q23eL/Yi1vbhdcfett4JAADM/v53bv23ABjHAysGB58=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/treasure.tx" x="40.3333" y="338.333"/>
-  <object id="64" template="../obj/gold.tx" x="56.3333" y="312.667"/>
-  <object id="65" template="../obj/enemy.tx" x="79.6667" y="331.333">
-   <properties>
-    <property name="enemy" value="Hydra"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="312" y="226.333">
-   <properties>
-    <property name="enemy" value="Green Beast"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/gold.tx" x="326.667" y="168"/>
-  <object id="68" template="../obj/gold.tx" x="278.667" y="206"/>
-  <object id="69" template="../obj/treasure.tx" x="510.333" y="315.667"/>
-  <object id="70" template="../obj/treasure.tx" x="467.667" y="315.667"/>
-  <object id="71" template="../obj/enemy.tx" x="429.333" y="329.667">
-   <properties>
-    <property name="enemy" value="Cyclops"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A3.tmx
deleted file mode 100644
index 3ecfed56c84..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmG0KwyAMhv2psGutGzvJbtZu3a3WbR5jhiKVUIfWxAhr4AXpj/bpaz5qO6NUt2vXrr/UXSs1mVmjWz+0PFOok1MYT9MGo/fthfhaYAS2NS7MOAlwprBJeZnLVpvxvIGtJmMJH8Slwb3l9hC4RgI2Lsa3003TsIWMVL2HYl9jcSzkis0HqgAfR73oekjnw3O1RuTwlfaSlOidZ4PTx8xK5ePMOc8FPBY9F/hSGDn3FtgwV644+ShmCCdfSU/h7MkQFHvLWR8U3nHWLkXucfa9lnMPgurbpZTRzwV8D6r62NpjPJcN3hPmxBCZF7U9pMgvTkaJc3luPUt52Af57tdrdcB5RvvFaM2S7za4hj2W/vcS4w99lPAwRd7H1vkoa+QLP5GW2Q==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1k0KgCAQBWA39nf/G0TWMdsouDAtyJk38r5NEsK8hkFzjoiIRrVoBxjMrB0gsxbeIeV7cmgHiCz0yir03ob43BRqe1fvzy4V5EfpeyahOmldu9/QZ1DKqR2gI6T/G5+tkWavlEU639s7XzrX13qhvaW7fOavxl6pflq8s9AgnRkl6Pms8u0tVIFwJpM9N1xzBpE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="321.655" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_left.tx" x="544.011" y="320.655">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A4.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A4.tmx
deleted file mode 100644
index 40f80622f5d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A4.tmx
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="69">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt0aENACAMAEEsy3V91kEjiiMFcuL8Jx+9tQAAOGgkqrte6MvabujbtenTV9l2e5+3//ZVtwEAsJppolCS
-  </data>
- </layer>
- <layer id="7" name="Ground" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt00kOgCAQRNHedt8JQW9lHE5qPIsSIU64toz1klr7AyJCREREX1fpPkSTlocCue+pDa0vrGsA+2rd1plIa+dGJC6939Hw+tylC6Evft8rZlvu6+3eFtL/+LZSU34nCI59M8B5leS+eM9DmgdtJSIiIvqzBS0IN+U=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWEFuwzAMy7EG9q11XV6ynw3L+qu2aZ6xBoMAQiElxetlBnyooto0TUm2j20Yjv+sT4dh+IZ+PsT2bBzv58eJxmK+t4cd26XFduvX9tttrlPjfn6ctY1ijSfi+/kY407s+O3rwL/jXLPwszFwHIVvbtv/LfDt7rr6hjguwOFMfBCL8aPwVXymgk48V2ysNzJPDz6vSdSL1xJiPiV+N4LF+F0K+GxfvCYzzY1tiy9qEVdZjIzu94ot0xzDF63JcxvlqQl4Nyw4z+sOXfh1qvjYwycb0+vo2ra5jeHDGGFzmr/ndi8+WzNbL4s9n0/W/0X4PA/4/wo+H1tZ7mL2CJ/hyfjOcgLWXZ8b0MbsOJbnlnEY1Q+lW1Z3VawuxB5pooovyhvYfO1DrZvNc6q43Ysvw8vyOxtX5edK/onqh8+HlbMZq4mMO4YPOc86ntvU2axSSxV3TJtqLz9etra/tgxfli8zfCwu8PzouWC6rOytyi8Zvkzzc9MxksUFwxHt8YovwliJdXZWfRa+LG5ZjYjuTpgjWGNxWqm52R5lmmLcoA4iPah6Wj0DqjqlYqN3jzIdZJpQ9ZXpMOJgEtroOQMqfFF+xlb1w7l675fVu05Ps/1gMVnB5+8kUf6unHmy+1RWjy0/sPtl9S5did+esx/77yx0q957stxgPs/Cp/Ko0mTlTWEszlHFxzjcEzOMI9PAEszRE8Psrs3ONxm+KF9nNd/82H5W7y7s/UppVtXyiDtr/t5WjQeWL+YWv2V6/wq+rCm8im/EuOftVOUuXG8lF1e0tn57b1t9e1ulI17Gu1+PP/OwNy8fu8rm+w8qa1yC
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF9AbsJKjlwiPHAcSsRJqzhIA8seaQ4nZK9AxXMNjDYhmd7SM1PAilY3IBJxqfVvmBjUT1o4A6YPFAO4AAILdcoFV+QAccZOobLOUdyB3Elm0Hkdi1vMSZPQoQ4BYLA8NtFgg7a2CdQhDMHmgHIIF6Xvq4h1ploS6VzKEWQE5rxORbeoJDA+0AAgCU7mD59iRUTGUgHUQA1A9g/ILqkeFc5lOzrURuu2GoAnL7T9j6G6A0tpyAPjYG0tIiNrUrSNA/CgY3oEd+G+x9KUJg6UA7gAAYHVMYnABUtqOHNTXbAcO5TTFYAQAe2BVp
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="-0.33333" y="320.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.94" y="639.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/enemy.tx" x="343.667" y="230.333">
-   <properties>
-    <property name="enemy" value="Faerie"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/enemy.tx" x="342.667" y="213.333">
-   <properties>
-    <property name="enemy" value="Faerie"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/treasure.tx" x="311.667" y="276.667"/>
-  <object id="66" template="../obj/treasure.tx" x="326.333" y="396"/>
-  <object id="67" template="../obj/gold.tx" x="395" y="255"/>
-  <object id="68" template="../obj/gold.tx" x="279.333" y="376.333"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A5.tmx
deleted file mode 100644
index c023084da10..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A5.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtOwzAQzB+1xLVCq56EmxEKtyqlHINadMQw3fWuTYuEpUit42RnHzNe56FM08M/u3araXpd/fz/InO6vnX/2tfmdO3Ll816HU6/68DcW/nGsjPu3xrn+myvNYDlIGufTnMfN84t27wTXPpfx/YPcltj8Lxq48AaXZvFh5rtrYf38pWfjZE3xaFrM7ndrS7rYiTm1TbiczzjqHP190I4uB5mB0/lEzhl1fa+jHEK8YnqAWM2cGmcPO5Zvl3jQpwRB8SJ57UmMH8n90a4XO1pDat+s02uQY4Vzyv2EU1SnWHtrTnVXLJGA/tanmefejgVYeOxP9cU21OuW9qtOKBjI1qu9jxNRs1ofpfzVefwLNcm/B/lRGZ/Y99hr2KZHT9ZpzA/iq/GA/57e8ks67FmK5it3GL9qO7xez5Kjm+IOWzWZ47lO2ZWDV2zl1Auci3pvoD7rb0VPdxo/KB9llYwDnC5xXfe33RfYYyP9/36gvd79q3h8d3yg3OcwdfSPtiO+q9MfwYfmGcRvggbBvbRxcCBeEQaxXrD+FoYlafW+xZHKzBmmddYQr9HeQu/eR+I3uftpZY+/VbzYKvnPfCptR+w36Oxa2k+aw7rDttu+ZRZk40dOJDBrpyyntNeRjUxi4/rxOvv9P1eD2X199bojaeVB+23GA/3UFvx9Vgue3lLu3t6e+u8Y/WDiFXETeaFpzdZvni1xBj0XsSp+uxCvkC7R3TQO8/oPQ97Nk/AqT1IK25ay5orrSfG4mmH9d2Nv2tYPUzEWx6WvUNp60vru5z1vStTg9F5DRi5lry8j4wofpGNVl1p3jkmfIZBb2HlKYpfhC9zztKzGn8r0HNvD7ZW/WWf7+GxxiK7f1gYe3sNxCaqh1F9Ri1ZfWgPvqgewLOMjU+HQlsR
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A6.tmx
deleted file mode 100644
index 72f8e2bde76..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A6.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWO1ugzAM5N+CtNdaqfoke7OysrfqtvYxRqRavRkHXz7g15AiVHCc8/niBh/6rjv8j13GJXTdNI/PUPZ+a2zf8z1e136JIfV+L8zDY225IoYvwHFMvEfMW+FEbl66JY7JeH+en93mZ+N8/whL3C2xCndxzTEs19RXtLur+dZcSyclQ3KH/o6wZuQJ8b6p+T/9Ey/mogVG9Ie84JryWzBqfBorxqO5boHNshMNMutdMmyZvK5xwsYgtrKna7HpnJ2IGDwtYY1a00DOEJ8pfBiDx4nE0oK7HJ1IDB4nrF0ud54/4dDLL2vHDqvuebYshym95OaW1QuDD33W5pipLblc5+x1dj12r4m21uJBG8E4hed4f+XxlehE5qxxozHixeLzzqLeHC8uzLOcw+Jg8ekYGQ71miV1OuJjMQ4JH0xMa/EgzzU1hq1nOZrQGqipMbn4kL8U59Y3SkmNKc2BVwO1RsfCc0JJHWX271DgtzRXHjfWHPS7t/7Ys2er/ziJlfXB5E5rIFffVqwl9S81R/cgWny75fQlPE1ofDX601pO9YTwmXemsHo4Lc5YllaQX1lDaxbxW9qr1Z/F4RT+9qVSz6/9E7+2b6E/jfGsekLY7/H6RRauaF/7DYIY74+74NFxW/9dVlySU/HZAl+uFk59Oq7bzrgsDlvlbSt8rfoDcfwC2KJMjw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="323.623" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="543.962" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A7.tmx
deleted file mode 100644
index 8981bda7fa8..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A7.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGsOgkAMhPnJJl7LRzyJN1PRW4Grx5AGG8dSTHQXnESaNCgbyMe02xZWoShWs1N4VRZF0x7P5e9ZPLZLexSryRiRTWzf/r8RcKnH1o/lk0/0O5WdM+ho9UPbErMxxHnjsAnXgYDNyz2GmL5jZIipdebaJ25zcI7va+yw1lam5uq6xncbpu3Da4id5JZwaH9oQr/21eE1F0/Aap8th3ZDtfdTU+7lSNrlMMzNb7S013i9IcVsXuAcIb5b9JlwXa9pgp9bY5vH92uTmF9D5x6fnD88+rnto1NwYa0UPo/Rq7N6j9zMHtcnHkHT2wh7OGd98TRNtdzzQ2qN1lkVczynhqn6Wb1iQu4NudRp3Cv6e+9w45oex55n9Jkj7Bs8Z2crXGOYpXWPM87OuH8Y3z0wvrlr27/FVxll9mH59vKu/zHEO4auX3s1nOk9087abHs5goZMullGlu9WU/kdsJfw5Q==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEKgCAQBdDZlHX/I2TRMaNFIEZag8xX+28nIvNxEEURIrIwowN0YEIHeLCgA9CvOXQAogpsijVj8RR3Xto/o2H+1bh26t4fEnPxnodjTd9dpp5GrW8ahNwZief9y3UWzj6ic+zg+kRE9M31f6B5v1pC329EJR27fgW0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.16667" y="335.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="543.962" y="320.672">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A8.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A8.tmx
deleted file mode 100644
index d605815f588..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGFugzAMhfm3Rtq1YIiT7Gbr6G7VlvUYw1KfcB82IYwSNC1SVJoi8uXZfgmtQlFUf7y3h6I43fvXIT8Ps137T7Rz2Bdj1/fPnueleGQULS87Ya2Vftz2oOcU30fPdtuYp6U6QIx1Q7xz6Cd6ybw6v97CoBdY5fqYQb86jGMnfPgueubggs/BT1CnGIOmueoWMeQcs1qzMVsV7DrwWpmBTzPqOsjhKewhzHgL9t4RY2tX2lfgIbznx7yP46rvb6m2ljLynl8a3B4j/yb3N+patyWMmk1i9R2GeE2tX9d2Q/fjXqu+UurcOyshRuwvrCvnn9arNMbm1BH8VXL2SvODUcZLIz6sEzPr9WCtNY1dFMP765hvbjsb/Hg+a+6t13qGbhbf8b6Hz/XdNRvyG93i83yCnzPFz2cWz795jGtD+FIZkcNcG97vTRj8W3JN897C2ItSvdrzKB5n7wGLrkdwduFxPLWGpzS01s2x0T4X08PysNT30k7lrLVuMGMvterUmo/ZlmoY49ZnZq9ZjN571NrvKHyOtvLSOt8jR3TNWHFaS0fLR2LzeDXzjI45tLc8c76lsUac98bXkpcv8dstdLPqMfd/bVPegjre+v08hS/3/1ZdiJ9pcuoHRnixtWfnZPNY194L/vvv+g9isDUw
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.16667" y="320.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23A9.tmx
deleted file mode 100644
index dd0ee3e2acc..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23A9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtuwjAQzGci9VqBKCfpzaDQWzUtHKOJYMRoumvvWqJVLVlAsL2zs09nN3Tdbp2nvuuW9fO9f/w+3yee/eWc1rmNj+GG6fP+G89KGKHLUlnXOk+CB+OwPn/rHxiXwcawp73zE7lTbNf1+dfwwIgxyn5eU+O6ZSoGYPP+hw8wDubwGRgnOV/tuMlneysOSwcP46kh7iIcXg1fAJebPuzDuh+4eB32RrEqh9jL+zecF8MndSh/Xgx6ungcerJVHvhmm+P79nkkmSVsODuTm4BTseo5sDnWX+lZKT8Af8mfSpP9F7L5vEx8MnfKK/t89Ew+T32wpabwHs2bnJdq/GlsRUapVrBNlTdrXU1f5hrnwf8Ove2Pio/rMOvprTuL7Wv8Ye0ouDUPAmskDjZ9RpLh2ahWt9VXrdyX9Y1R9FObQ0/P9iWMPKw879lS97FuwJfJJZCl9UFzCsvMxNFMMlrqGnzUy+HAW6tn3oDv7R191JcUn7few2lxag3NKR4+HYrv2FBrPD9VPbUWar2GLPjTJRm/0XxZ4tDq0dBLao56fbnNaI6uxVgNY8lXMvFr5dhoz8M5w/IVxrkE7FKb7MeZmsP5vxbz2X7PkodzSmfUeo9p+BkPUd1LtuJh1UXtnbzaCT+z/DQSgzV8no4ZHyjZPMuh6qn9pPLWYiO9J2fei6j/zYX/LPwtHGRtYN2HtE+Hz7e+a7HktPBnDX4vE9HZe1egGCO6WvGro2RT7gm1N7R8uXZ3ynCnvXp2v+YT7Wcy9yOPt5JNrdxk1RDr/WeUQy+2IrGgfMz03KshKicaw1zn52AssG4sC3txrtUDRrjzZGbze+0uhjO5dkfvb785I7r8h/kNH4l3Gg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEsOgCAMRNmgxvvfwN81hQWJC0mowXa085IugQGm5RMC8UJMMVqLcMBkLaCRmhcGVRV+QfNJzQ+sGVj8aT+Wzv2tnfsjMuYUu9HYrXlhlT93427qKmQUzeWsisJ2qLBOkBro3n2LnONe5n5YC/gwXjxCMLm+GVC9qHUHzvPX/K9BXe+nWL1VCAYn5qEGfQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.16667" y="319.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="558.667" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A10.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B1.tmx
deleted file mode 100644
index daaaaef7f47..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJytWEFuwzAM67EB9q11XV6ynw3L9qutaZ6xBpgAgiMlJYgBH+qoMi1TtOzLcDpdDurXR1/beKBP1afz6fQJ/eucjzt8k7FjP8oms739zRPte8jH+X8j4XV22FzMr8L2/eHjLsbx28dZf8e5ZmMXPtCPwzcP//+3wLc7dfcNcazxiv2ahQ1i6XC2spkaPOFYKV8vYp49+JiTyBfmEmK+FnbMT4zv0sAX+8KcrDjH+VC1rfqDfkf6vWKrOKfwZWvi2DrOxF5G3AMLzvO8gRe8TpcfW+KpfDKPfqDjWhkf5oiaM+w5tlvxxZrVelXuoZ5k+ejijf/v4OPcqrRLzZnhCzxVvCtNwHOXtQHHXEzYj8JT6R/rKjZ17rpcXcS42he3xxkHnW5g47MPub6QL4dP7cOemozxKn3P/PKedPQnOz9YDzu1WVXrVbq1p4ZlzkfrnKWOV46bKhffnnJ83fMTW4XP6ZHy08WH9SM2HEdeRtxVrLhWCV6yr2UDPlX/ZBxWXFS1VJVXK74MYyfXVa3Kmqz0csscVW64OtXNPRtesTbyWrK6KsuNZfC5jM3xIOODy+FuDejOKZcbR+hXtd+VFqh96ur4ZLixpwZ0+DJ9xta1w7n23i/3aHW3xX5kOtTVL3XXV1ys3gmy+5TiD/bQB3W/7N6lO/m7p/ZT/50Nb917T6UNYXMUPqejjpOdN4WxOUcXn4rhlpxRMQoOLMkce3JY3bVVfVPhy/S6OvPDrnuXVXmR1fSVNnbv6OjrZnxXd2l+s8neMtm+g69qDq+LN2Lc8nbqtAvX29Hi7tvB6/Cf3zzW6YhXxZ3XwzWPevPi3HVj3H8BOoxhjw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="640.36">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B10.tmx
deleted file mode 100644
index 15e2ff9a1f5..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B10.tmx
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="79">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt1EsKgDAQBNFsvZj3P5K4UkI0IGgXY71dVun5MK1JkpS3LukEB1KWSva+nnvbv9Po+VLofaDne2JWU7reij3/k9H8vpjn1R+jLLP9J+9fKh/pZjijd9zlJtREz0eSuMHV0XeMnk+qbgOlTQ9v
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWNEOgyAM5FE+bE79UTfdXznRzxiNkrBm6IAWWLJLLrpplstxtB21FKL+MxuHSohx56PKrwez0Ww1AV0BejCV5l371muuBehxeViid0DI36yvk+ZTlpfBqxRvmArRCL6BXzPSV4JGs6ZHyLXe32jL5aWvttQamwBtKTXG6ANw1sjQteX20PT/WG1cGpXc+islQmvP8GFGolhXFy4B+eqsz67+QAXw8Wx2HFG+jPecumzA7NhK997OCZgZF7nRNTvCs9v+HvU+ONPlO88qya+TYs7GMx0lKHoIpz6fmpKyJgOo/kNx1WQK7zj7BUX2YmeoI5ScPQDV7BKrEfYB1Hz8G5RnDCE1xugyGiAr5ruQfkHtIc4X97mHr0acrxTnMj77GedLEa/pkYe9lXdzb++DnOdrxge4Ltb9ip7n0Pbnb/MF7syi6w==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMFwBx0A7gATgITjQLkAAdxxuYaevM/ACTixiA+m+P0SoCedjYIjgQ/BTgew0PtzqaQmwhVUx0C0lQBwN5TcC2U0D5D4QaOOH4IEGpMYTvdMhejwJA9kiSPx4IDsBib8MSnPRxXWogBWI9YFuMQBiPWgmrgaya6DuWwxVlwzkp1Ap7bGRoecrF3Y2CIDSZD3QbQ1AHMOAiG9S7InkIh1P4Uawv3GhspHlkHEUnSL5FxBP5sYtj0+OlmA5DjckAuMuiQ9VzpUOdbADDjscBVHdVwt0Wx0fovxDDz9VoJwanctmYuMXlB8cgW5zGgD3OaGFLzuSnJsgqhitwUSg/ycB8VIkN+ACIDl61xtrgW5bB8S/kdyAC4DklmERj6WFw/C4AdSmf87LwPACiFegyYEAcl1Nr/CE1VkgN/wE0sxA+1nQ0j7MffRsU0Wg1QXf8NQt0waofHZBy5POg6gfhAwGU9+HEDgNTF9nBrDdjg+A2gnPgW57AXUf64C6ZhSMgpEJABvCRzY=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/inn.tx" x="240.667" y="304.667"/>
-  <object id="61" template="../obj/shop.tx" x="304.333" y="305"/>
-  <object id="62" template="../obj/treasure.tx" x="377" y="551.5"/>
-  <object id="63" template="../obj/gold.tx" x="377.273" y="533.682"/>
-  <object id="64" template="../obj/treasure.tx" x="532.75" y="331.75"/>
-  <object id="65" template="../obj/gold.tx" x="533.25" y="312.5"/>
-  <object id="66" template="../obj/treasure.tx" x="271" y="58.75"/>
-  <object id="67" template="../obj/gold.tx" x="291" y="57.6667"/>
-  <object id="68" template="../obj/gold.tx" x="153" y="587"/>
-  <object id="69" template="../obj/enemy.tx" x="80" y="350">
-   <properties>
-    <property name="enemy" value="Golem"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="279.5" y="97.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="512" y="323">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="377" y="514.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="192" y="316.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/enemy.tx" x="370" y="352.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/enemy.tx" x="355" y="197.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/enemy.tx" x="273" y="225.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/enemy.tx" x="303" y="480">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="194" y="446.5">
-   <properties>
-    <property name="enemy" value="Dwarf"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B2.tmx
deleted file mode 100644
index 2d333bcf608..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtuwjAQzB9Y6rUCFSfpzZrS3iqlcIxiwYjpdNdem4ClSODE3tnHjDfZpGHYLHS9nq88dgvuaV379TB8rf/+/5Q5fT7fPzwJX47DnC422S7mvtMN657uYzwa31bsWQNYFdv7ee704NyyzZXg0v86npHbHIOPdRkHntFno/hQs6W6tq6fdMkPuKh4GIc+G8mtcqk35tk24nO84shz+fdEOLgeRgdP5hM4ZdX2nNpiqLGs1QPGaODSOHncs3xb4kKcEQfEiee1JjC/kns9XM72tIZVv9km1yDHiucVe48mqc7MhDPnVHPJGg7sW1nPPrVwqoaNx3ytKbanXLe0W3FAx3q0XO15moya0fxO1yvPYS3XJvzv5UTkfGPfYS9jGR0/Wacw34svxwP+e2fJKM/jmZ1gtnKL53t1j/c5pRjfEHPYzGuO6RYzq4aW7CWUi1xLei7gfulsRQ/XGz9on6UVjANcLvGdzzc9V1ow8lnJ6/Wcqg2P754fUZ6orni2a/1XpD+DDy01GNGVPHCOTgYO2KvtxXrDGN5eynz1/MZ+k6MVGKPMayyh3728hd98DtT2885SS5/u1TzYatkHPpXqnP3ujV1J85XfjF21uYTvnvgxf7Vf9LBrr2Ot015GNTGKj+vE6+90f6+Hsvp7a7TG08qDp4vgJrRsJ74e0/9e3tLult7eet+x+kHEqsZN5oWnN1G+eLXEGPRejVN57US+QLt7dNB7n9F7HvZonoBTe5BS3LSWNVdaT4zF0w7ruxx/14j2MFb+PHuHVNaX0nc563tXpAZr72vAyLXk5b1n1OJXs1GqK807x4TfYdBbWHmqxa+GL9I/6rsafyvQ994WbKX6i65v4bHGInp+WBhbe43I93u102IDtWT1oS34avUAnkVs/ALjyFYi
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B3.tmx
deleted file mode 100644
index e5754879956..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzlWFFuwjAM5W+ttGsNECfZzWB0t2IDjrFGwuLx6sRO4rGPRYoQbeI8P784btbjarUO6tu5p7YLtBnZNzd8p/n3c3j++sd5zWnIry349vP76x9g+y7wk3tv+RQdO2kJwxfg2GbeI+bfwoncvKyWOCblfYrxZX52mH8/hiXuSKyoq8OwXJMb6y/N1+ZG7SOJHdrbwpqJJ8T7RvPP4x0vxiICI9pDXnBN+S8YGR9jRX969noOmzZONOhZ71gx1hPXEideH2Ss7OmIHIkxy51Z6IOlJcxRJQ3UdLGZw4c+WJyIL1Hni1cn4oPFiXdcLXeWPeHQiq93nLdrec8a6+Wwtwar2ZdefGizN8ae3FLLdc1ez/nH9Yh3r4m2Sv7gGME4Dff+/mprg+uiGp146mfGiM3CxzVcTRz43C/5hetIHZa6hz+teTjkNVvydMJXwqhx36K/kj/Ic0uOOY+P9Y83D1jfJ5oGenKMN99q/OU4175RWs6R1hhYOZA1emisE1ryqGf/bhrstsbK4kabg3afrT9v7dl7xrGvXhue2LEGavWt+dqS/3JzOP9HfLvV3EtYmmB8PfpjLefuhPCZVXtqdzg9dTTn0x1hE35lDdYs4te016s/jcNpeKy/cs9P4x0/j4/QH2Pc050Q3vdY90UarjQ+6h44YbzefgUP+63VdJpfElOxGYHP64Pc9/EdEvp1eTKu/95/ALxCT7E=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A3.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="544.945" y="322.639">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B4.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B4.tmx
deleted file mode 100644
index 496bff739b7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B4.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGkOgkAMhfnJHMwlXhQVbyUix5AGXix1Mi505JnYpEEh6JfXFdahKNZOvu1dbOf4m56+GflWBCwp/Rj5jmVRXEa+c388lcszxdjEqv57R8AFb3s/lHc+0a8uB2fQ0eqnbelaTrExxBk1a7n2BGyx3GOIaYqRIabWmXufuM3Bf3ynsdO99mh6Lq4jvrvxXPOlOGMnQW4JB+ZDEx573zlMc7HOyJrqve8aWD05N05sMJ2bNk9e1UvfE5sNc8zmxSu9qFb5j3uaEM+tHPZsl13anvXKaxhmubidozlNclH++51e2YYpY5WB+RMuywhNuww17P3sZDWda977w9wejV1Vu+d8nqvfN/Yt6dO6VvC5inDrazjm3mdEw248Ij76nN2t9DWGXRo1zrg76/phfPbQ8WV8L/RL8QWj7D4s715S848h3m0Y5nWshzM9Z9pdm62WW6Uhk24xDdn5POviBmZ/6PA=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEKgCAQBdDZlHX/I2TRMaNFIEZag8xX+28nIvNxEEURIrIwowN0YEIHeLCgA9CvOXQAogpsijVj8RR3Xto/o2H+1bh26t4fEnPxnodjTd9dpp5GrW8ahNwZief9y3UWzj6ic+zg+kRE9M31f6B5v1pC329EJR27fgW0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="336.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="320.333" y="18.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A4.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B5.tmx
deleted file mode 100644
index 3199556ef40..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B5.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzlmGFugzAMhfm3Rtq16BAn2c220d6qjHGMxZqe8B5OWGhoIs1S1DaN4Ouz/ZJydk1zzjQ6PyT6jNfMMYZT01z8+KyQb1BciJr4Jj8+POOT4ru5Hz1H/3o9lWdE3Vlxq4Axxvfm2eYH80jNaU2QYx3Idwn9RC+5r66vF7foBVZ5/15Av86tcyd8+Cx6luBin0OfYg6alupb5JBrzIoSHih54z4IRVuATzPqPijhKewhzDg7e++IsQ2nfPUJD7kQ55b3cV71el2/9/gi7/mtwR1i5O9kfa/e69jDqNkkV19uyddA3qKvrbXpaT3WWv2V0uesG66LHLG/sK5cf1qv1phL6SPrHAdGmW+N/LBOzGzVW0dzo1s8/vU53g+xACfPjW6tOc5+1npLA8Q9fEcE6hsjxmfVrr5ObN/gM0vIv3mOe0P4UhlRw9wboe97t/i35ETzzm7tRaleHfIonmfvAYvuR3BO7vf83h62NLR+N+dG+9yWHpaH8R71F0bUrPW7wYz91OpT634hD8t1npiIOVSTIcaQR+T+j8LnaKsurfM9akT3jJWnXDpaPrJ1n1DPHDFwD+0tR95vb65rfC4ENq7zWp65hLwCnKmelnvEvAV9/Oj/5yl8pZ9bTW77TFNSPzDCi609uyRbjLU2tv88vgENYTD9
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B6.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B6.tmx
deleted file mode 100644
index 6984f32fcf7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B6.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtywjAQy2dyMB6Ti0LT3qpQOEbjKRqEZtcvst0ZDxASW9ZqZTv7aRj2a1vGYbisn1/j8/fno+FaqR3XlmKuuLe1oe/v6Q/T9fEb13IYMZdrEL5F8CBO6/WP8YnxMr1yjHaYXp+5B3Gn2NI4P9MTI2Inz/M9Ja57mmJQDvR/aIBxMIcRGI/Sv+Yxjc/5VhzWHLbEWMPh3dACuEzzYQ1H6xDjqscknDdDkxpROvTG1vHAN+cc39PnOYA/xalYVZfIOe6/07UIXGgL5RRjn8dYD2nBBp2rBlvWlAhcWoOliFhnc5pjnad8Qn+n0daj4uvZU/TkdSe41QeBVetA/SnKnz3va9WGrtNbYlTvU6zIZU6zkR6tnsJjttTRljW0GLkE3tJ65sW7OVZ/s/ZOjNPi1Iqt1jiv71y/nk45rD1aT7M48ThsxbjlHit5l+5FSn2XMNbMs6Vuef9Zmx/cD715NQ8vehdvy1mM1xz2EdSSx22vNvWcWfJXzMWbh2rmXW1a50zLX2vP49CMpdMebSo+b44953Er560c6jzV+5W3nhzpORl1U8Oj6m/O/Gfh7+GgJd/6LOpM9/bQfO/a72FknGg5/qzg9zKaW2t/wWetWowcpfrVyOU0aYs5532YpWXvnRn2d7cG7pBTC5/WjRWqr4ODzau3Et87J6fes+DB8z1rLqV688apqQXVBu633ntZ0eKjvM7PGd48X+Ox8Cz61Xc2tdx5WGv9l7nPcY0+ee2OfJdk5bjGF8Hnf+BSfFuee38BL/FaPQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2M0KgCAQBGAvZvT+b9Dfa6YHoUOCetjZmPlA8OYou2WFICxiHgkdgsCKDtCpVQuLaQoRGaFneNuBDkBuy+MCrd3bF6j++Vr3NE8xpmaud5qICiJihPX9WnqcZe83OsCPsdSI+LS/5l5r0eoOXPZv+b/G63nPQn2riA8PsW0FGQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0" y="336.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B5.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="320.333" y="15.8333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23A6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="623.333" y="514">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B7.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B7.tmx
deleted file mode 100644
index 37d212fbb72..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B7.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWG1uwjAM7c9G2rVgEyfZzcrobkXpeowlAovHm+0kJZX2A0tWEbT2i/38Ufah6/Yv/Rd66rtujDrFz9/99r5qfKT7L/E6xOtX1HPYDqv4Eh+inp+PG7YlXueox/6qgnUKeRulKr6S/Z9w9ZHk7Ph4j7ozbIkI/haxO8B3M2BMcjCe0fDhs+cGucY8WX52CjYNN8a2RfyQd9o5BSPyUrBhfLCOxwL8NbET0XLF92iSMF6Me57FhzlEW6dbLKZw7yFYO9JTctKCf8IVLYfDDdNCZ1rgObnPwt0ihkfFrsftE51hAdyt+wv7Kzk38oJzWMLpNdiEYyW9S4tfCfa1/EMfJfatumJOt+BfssU2JEcefwRDDh/2yNpYarMN8WFNT+QH6156kfjH+Mo91jxkFV/Y27zZhiJ+rJ5szRnt96Sfb3/xsVj8yM2NFqLhkz2NdzXJHc/QEimdJ3Jv6vlJNXwejy1MA52Jf+N54uFCLiV8HsY56D41/xY3d/S9Fstn54hVD5Zdq//M4T7rvP22FUarH0guvX6h9cA1uHiXQsntx57fVnsC9xHkj4aPdwnt3cTas2vjJnZw/8QdSbPrcYv3Btxpa3cZjBvHADFo/ZFjMypnxXwmPqCdkthZthA/5trrjyi5d86SOPL8t3Yo3odLxKopwVjCRTxPrrZyc4FF84+8KK1lb3+zanVNDHP1nouhlWO2O/SP/83kYjgqtVTbB5FbvJtZ75gaH3l/0M6ypkfnuG/truwbOTeHx3cZwb1mfsjzfGav72h10+o918O5KJ9zz8ieuSW2l9bpL4fQX4U=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_right.tx" x="2.95097" y="319.688">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B6.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="542.978" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B8.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B8.tmx
deleted file mode 100644
index 71fa3863aa1..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl31ugzAMxfmTSLvWWLWT7GZlpbeC0R5jRGDx9HDI5zRtSiSLkDbm58T4hc40TVetWrV/abe2ae6t3h/g/rfYvpbraFYW6U9m7dsm95ZTmCdl7CfiuGwMIW0EZm1sNGUZZe2kXZf7x3LfL9fPdh+TfmgMUyHON2J7wm+zWVmfW98yCj/y2rFeGX8vsH7I5/M3m51f2B/mGJMw5vLh3vLalYg5Jxc570rshbaGr4k++J0tyYexp/rFGEvuLceeun6YJ7Ex+moxxh6bg7et7g+wB1qMqBGiD3JlTdFYU9cQ6wnWU9ZbfHdEHzTtwP+g3l1o/tDu9vFy5JK5Pv+u32PaWRy2aXy5zaUbobon861pfKKpfaRP0S3UDfEjusfcWsMcsnwaY0fPcPm8tkfdCqlXmk88b8TWMKwD6C+nFrLPnPrHGmdb6TNHjgZzrKV0hLUzh1FidbFhPQ99hpY3qRpl9/ds3bjOhrLmnj9wvmuulp/IesZ5di6P5WN9Y53F5/C+aZwlzpacI/xtqbFhPeaaLDHymTy2jvry2NW0NdBiLP29gM9AjcW6f1b7Z3P8Fk3RCh8ja2yKFuXsZbVq1f6ufQPTRDdT
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kkOgCAMQFE2ivH+N3A8pisSQ4wWKIPkv6VJa2WwNQYA/mWsXcCLqeC79sg4q1oFcmCP+rVkzD1kzI36Uv4L0tjt4VmJnuv62dcZln5HbH+UuNeg3fNLzhAhDuV8s3I+oAWt3l9nTYi1AfH+OjDTypy1CwCAzl1t5AZS
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="544.333" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_right.tx" x="0.43462" y="336.943">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23B9.tmx
deleted file mode 100644
index 230e411a8ae..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23B9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztlEEOwiAQRVkOiddqvYo3U1tvJVWOIYT8OCKkrWLq4pO8kM4w8GYW7a0xPSGEEEIIIR8wiDEX2d5hDDibXOAU9ynErjblkG/Zi64Z5PUNeEUHrOgCJx3XefSi+3GqbpQnh927k1Po/vFe/v3NqvWBVfL7xTqGWZxl+dm7TZT8YvwkiTV31mpizoc79zO9w8srl+hXcgQ3O++J93WNPt9lccwSPujLVxyWkL9Zc8vPl9y92lv+R0qz7GbOt3ZYM8va7P6BrWZDCCGEEFLiAc2KCW4=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztz0kKgDAMAMCcrP7/CS74TC89NlKwIOjMJZCELBEAAABtR2ffNGDXclPbGrmS9J41zs/OSY2Yu9dYIv/jq9a3DwAA4Dcuu2gDbw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="3.33333e-06" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C1.tmx
deleted file mode 100644
index 350f9f96a71..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWO0OgjAM5Of2YILhRVHwrcDpY0gDjaXMJboiZ2KTZsoScrvr1yh9UZRGfhydrDZ8p6VXM74DAJYUf4j4WlcU1xlfP64Xtz+mGDayZvx/B8DFHkY/uyc+4q9zkyPwqPmTtncup7Ah6Mw5q3GdALDFYg9B0xRGBE21I9c+ch2Df32X2sla26qay/usbz0/G76kM88kHFuEg/vD4Ne1r/fLWOwEVn02C+5e1d53jXFbzjaVETY2GZsWXMZ6Q47puMjJc0ttU3g/5TD4dd/awnLi0Tr+pFEs3nxerdwCnwWuLTW2vjtZY7SeH3LzmGdVdjqrJYe5/Gm+glHsSac63bjljEK/mwhuucfr1vMMn5lWvlfIZ3q2knsIszTXIcTZWeYP4t1D6ov4XeiX9GWMND+hfHtJ9WgEvYOf+n2shiPdM/WsjZbLQXCIxFuMQ3R8lnnxAPSR5q4=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2MsKgCAQhWE33d7/EbLoMaNFEEZmInOs/m8nMnhQZETnAFgY1AE+oFcHuDCqA+DXOnUAoAJzRk1bPMWZd++/o8f8k/Hasb7fRObCPT+OLc49Ra1vGoW7OxLO+8Q6C9s5qnMs4vUBAM/s/wc571dL6v4GlLQCLdIFqA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C10.tmx
deleted file mode 100644
index 9b1f5b4f344..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C10.tmx
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="75">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWFFuwyAMzd/gYGujXrTZslu1a3KMBW3WjGNjg0m/GsmqCsQ8Pz/A4RSH4fSyp9hnGIZ5s68g99+j3H80tu/tNz03BoPUr8XUy85/c8OTMGCuRqEfYz4KJ+bmbdjjmJn+69a2bG3T9vsR9rh7Yn3E3znSnFPI57yGPYbUthLuuXc5nXj4w/7GmOPA+X9n4luJL8ynByP2h/HgOSnHa8FfGrfEnP/S+BZs3DjQ4KXCrwcb5FDKWW0MMBbWtBcbzll6JF5wDJqWShptNfAp4cMxaJxALD24q9EJxKBxYh1Xy53mDzjU8msdZzXIh8UfjLVyaFnnltxa9WLBh316c2zZW2q5rlnrUny0HrGuNdBWKR48xopxDv8GZyyui2p0AtoqzUsxarnRHmse6Llfims0jksGNRqtkfBj4RDPedQ+Tblv1V8pHsxzyx7ziHn9Y90HtO8TTgOePca633L8SZxz3ygt50hrDrQ9kGp0aqwTWvZRy/o9N/htzZXGDfcO9vts/VlrT+8ZR2O1+rDkjmqgVt9crC37n/QOvYPo8e1Wcy+haYLi8+iPalm6E8JtWu3J3eF46mi6n14INnqnQDWL8XPa8+qP43AOef0ltd8iX6/10h/FCPdR0r2QdE/E1UWes0PCiO9dsO/0f4n7/7iN6s77bdTbIKYp5Lhfdrz9AFKOVls=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.16667" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/enemy.tx" x="184.25" y="569">
-   <properties>
-    <property name="enemy" value="Red Beast"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/enemy.tx" x="309.5" y="570.5">
-   <properties>
-    <property name="enemy" value="Hydra"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/enemy.tx" x="396.5" y="570.25">
-   <properties>
-    <property name="enemy" value="Beholder"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/enemy.tx" x="168" y="120.25">
-   <properties>
-    <property name="enemy" value="Green Beast"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="273.75" y="105.5">
-   <properties>
-    <property name="enemy" value="Cyclops"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="456.75" y="105.5">
-   <properties>
-    <property name="enemy" value="Troll"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/treasure.tx" x="503.25" y="317"/>
-  <object id="69" template="../obj/treasure.tx" x="503.25" y="343.5"/>
-  <object id="70" template="../obj/gold.tx" x="504" y="328"/>
-  <object id="71" template="../obj/gold.tx" x="343.818" y="326.545"/>
-  <object id="72" template="../obj/treasure.tx" x="343.455" y="344.364"/>
-  <object id="73" template="../obj/treasure.tx" x="248" y="541.25"/>
-  <object id="74" template="../obj/gold.tx" x="233.25" y="138"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C2.tmx
deleted file mode 100644
index 01b6dd9818f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmOFuwjAMhPtv+MFgqC+6reytYIXHWKzpxOmatKLN6liKgLSjH+f44uVkXXeqNM5pePQVv7PGGA5dd0njp0G+gbgQLfGNaXwlxjfiu9qfnrf0+n2IZ8S6y8W1AcY5vo/E9tiZx9cca4IccyDfEfq5Xv5cXl/v9tQLrP7+M0C/s01z53z47HpGcKnPoU4xB02j6hY51DWWiwgP9LxpHZTiGMDHjFwHEZ6iHqKMD8vvHXv5HTzkIpxL3qd5nfudW7TjPZ+fCe4So17z+2vWCrN5ru72zNcg3sIcXNu93F9rD1Hd8L3IkfqL6qrrj/flrfWc6+PA6PNHm/YBqpNy8O/ZqqFqU+LUuZtNNUfvl7t/LeNcj1Qz1uaZa1Bjzov1Ot6X/mZLLecYsd5L+dfrvT3923PCvOwFa4fmGWtG5/V5YOHng3OswFXSkHs6nuc8sc/t0Vs5y92m+VCPG/6hTmtwc89cisj/27SPzq3LiP5edcz5SBRTiVO9JZopl+sWz4XApjXRyplLqd8Bp/bde4+lfifi3OUVvuhzq9GWe5por3FGeHFuz45km9OzNZ/BaPX8Xvlqnr38AlAFHuA=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgDAMBdFstOL9b2DpOUWKuwoNFH4i85bSxSA0jRkwp6gDfuCw/h83dQiAT9X6Xc2iqQOAIE51QHBZ9rh98M3b/py/FrR4qd+OrO9BVQdAJupcertG8whAbKodwEu9M8yKOqcBrxsCkwRV
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C3.tmx
deleted file mode 100644
index 1ddc40c6095..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C3.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzFWFtuAkEM45M9GAVxUVraW5W2HKO7ai0s18kk29dII2CZh+M4mczeTZvN3dzP283mMn8+bW+/Hz87nv1nP8x9ac/TB6aXz994lmGELZfBuLX9LHjQTvPzh+0N42XyGPY0d/eL3Cm26/z8dbphjDDwmBHXa7piALbof2iAcTCHv4HxIOurH5f92d+Kw9kQYTyviLsKh1ejBXC52MMa1vnAxeMwt4pVOcRcnr/gfDOa1Kb8RTEY2RJxGO2t+4Fv9jm+L5/3tGeGDWt3chNwKlZdBz7H+Cs9y/ID8Gd6yjrrF3vzep34ZO6UV9Z8dU1eTzW45kzhOS537wl7xp/GVqUdi7GmvLlxI3uZa6wH/Z22Xo+Kj89htjMa9yi+H/GHsTvBrXkQWCtxsNizoz0iH2W+cFp1ua+rjZ3Ypz6HnZHvM4zcXJ6PfKnz2Dbg6+QSh5HtUrzIgdU4gt+ivNA5g89mPPCOzrOoQXv7wJ5u3nO1E+N0nLqmOSXCxzZkXbWb6SPSqfKiZ6Ge15W9HL6Iwy7GqEZDLely1CguOEeP5o4wZlpZG7983lRqHs4Z96YuYZyXgl9GnXXcOXM4/49ivlvvuf2wTrbGqPY4TF/joWr7KEbQ3LmotVN0dkJnTqeVGBzhi2zsaCDzeZdDtVPzpvK2xkd6T+68F1H9HZP/HP41HHR94O5DWqdD86OarbPPGv5c4/cy7v6t+0TvChRjxVYXv9oyny7aYs65DnNaHt2dOtxprZ7FjWuaT7Se6dyPIt6cTzPNuzPEvf+schjtU4kF1QbGu/dernVimM/5Y8Kbas/thblY19WAFe4irJ36DHtmXGNNPrur97fvdvi4kivA51/gUnw/+Y78HaPDcqs=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEsOgCAMRNmgxvvfwN81hQWJC0mowXa085IugQGm5RMC8UJMMVqLcMBkLaCRmhcGVRV+QfNJzQ+sGVj8aT+Wzv2tnfsjMuYUu9HYrXlhlT93427qKmQUzeWsisJ2qLBOkBro3n2LnONe5n5YC/gwXjxCMLm+GVC9qHUHzvPX/K9BXe+nWL1VCAYn5qEGfQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C4.tmx
deleted file mode 100644
index 1648918440e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C4.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFuOwjAM5LM9GA9x0bLt3mpLt8fYRDBisGzHKUFiLUVFqLUn9viRHPrd7tBondLKcm6os+U6/hN8P+n53b3X1tjV2cjvX9NzSM+v7oZxSs/5DVhhCzawPDunO7Y1PZe0Lt1tAevcl3VEF2xl/b/9zQbiZtnIsd0buiDA38J3zPGFMGr8xzcaPv62BS85TpadvYLNy1vkzav+Y95p+wRG5iWwsX/G7pEbUwB/je8gWqzkO5pkjFfjnVfxcQxZ13j3xdw/agjnDmpKSVrwj2usjOFwx7SKPa30Hd6zcLfw4UXR63F7FHtYCXfr+iLtRfbNvJAxjHB6CzZwLFK7NP9FsG/lH9uI6LfySnK6Bf+yLqkDMfL4481WjI9rZK0vtd7G+DinZ2GH8x61CPbZv3jH6ocR3nm9jQV2rJps9Rnpy2hcPX6U+sZWifIRPkJ8EDvZQyMS7Sc1+DQeW5hQe7w6fizsR+tFER9qNjX7Fjf34n/Nl6/2ESsfLL1W/Vn6R6/z5ttWGK16gFh69UKrgVtwyVmKpTQfe3ZbzQmyjjB/NHxyltDOJtacXes36OH5k2ckTa/HLTk38ExbO8uw36QPGINWH6VvJmWvHM/MB9YT8Z2li/FzrL36yFI6c0b8KPu/NUPJeTgiVk4BY4SLvJ9SbpX6ghTNPvMimsuRuzFt7q/1YSnfSz60Yiz1Dt3z3UzJh5OSS7V1kLkl766sM6bGRzk/aHvZUqNL3LdmV2mbObf0z2cZ4N7SP/C93LNXd7S8aXXO9XCuyu9oDfjU++dPv78Hvhb3BFh/J6hYeQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D4.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="17.7058">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B4.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C5.tmx
deleted file mode 100644
index 80e1b3b9f3e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C5.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWFtugzAQ5BMfrEmVi4Y2vVUSwjGKVUaZTtbE2CvEB5YsHIN3Zx/esXMITXPY+973vkr/bpvmNj5/2vX0QZeOL+1/HHHuPj5ju66AEfqirguNo38YB/z1Oc2hnRJ2eHXVN9euhNma8/Ynxyq28/j7Mf7uxudX+5zDONcGr9w8CraB3vXhD+swjSNG4Ge8ca4z5k8O/mN87+T14Ykf2B/h1SZgrMXHsVXfedhck4uadx6xsHz4USjDqhFe+Nj2Urlso2ds1fZS/3GeLLXxXS1m20tyEPIRA8tGfIM6Bs5TbovvLaylPtR9oTYqdrwH5+la/uYWbA5c4sMUlynf1jTLjtwcOhbqT/FGLu/lxrgP+TKZt5g3umkevKe4rbZkD0JHSua5feWtUpklsuZ8WVsLVWZN/bP2sveZo4aD1VYvHtEaUYMRtqaw4R605Oxu5U0pR8X4zvlN62wu1trzB69PrbXyk7HO4Zw7l9fksMWzrEfjZuH0OFtqjujd0sLG9VhrMmzUM3lp7UvlcapZe9Cy0fu+wDqYYy2+teIU1+tdtHPCxjqUYzHWPE3da1XGWj3uc90Xa/znssS3g4HT8z7ljXNrPlScW/UhOny4dXw1Zzvtv9FON/A=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10kOgCAMQFE2ivH+N3A8pisSQ4wWKFTNf0uT1jJowTkA+JbeuoAbQ8N3rZlxXrUK1MAa/ddUMXdXMTfslfwXpLHLxbMWPTf0s6c9LB1Hbn+UONeg3fNbniFSbMr5RuV8wBu89fsN5oJYnxAfzwNnWpndugAgUvPOAlg4ADr+BvU=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_up.tx" x="320.672" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C6.tmx
deleted file mode 100644
index f014a1f722b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C6.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVV+0KwjAM7M/2wbaJL6puvpWz7jFswGOhNANppWfg6DpwuebjGsfg3NgIpwSxc8NvtsDsnVsSnoT8ZsVL7JL2GwEvICbc/M6PKXYA6o6VH2LIllsANTgQcLG4iTHy07XHyC+GvX8f6XlNuPv+vCyOjD2ia/BBGD9dg4waqPMrxpxf9h5myy0wBQ5+mPWgc7KXFfyggb/QQfjCs/aRz6DgInusucn7xbfhihrH+bWerYb/b6xWF3MNqzG5Q7TewGp6O4byNy3/1w/y3+B+mwrnrdUe4VjyWfJvnWvI3iOWLe9lK5aWD9RGifum1pa9XIqllR/kssfdofNkxUBrX4/Z5Sg/+f/f3vdHDq1LjLMp8s8YO6B3/R1B1x97fhlnU51fRn46v4z9oecAxv6ICa/ArzHQacYYIo7/EkN2fi115g08/BHL
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1jEKwCAMhWGXkvb+R1CLx2wHR6PQqlH4PwiCQnxLIM4BbfLWYR0CAIABxDoAsLh74l9X5S0U7rT5Tfk8/8VR9egbO/TYlbcOAAD4bPXdeebeAmAPDxoABBs=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="320.833" y="17.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23B6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.155" y="639.909">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C7.tmx
deleted file mode 100644
index e2c5dece9f5..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C7.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmFsOwiAQRfmEhVmNG22t7spqWYYQJU4QmgIzDIncZNKmH+3pnQe0gxJi6NGjx1/GLIVYzPEq33GT/Ewwjiag7qoNRufbw+NrgdGyhbh8xoWBcw8bl5epbLUZTxlsNRlL+KzODeaW2sP5M3dL2agYnyYuEocNMmLNHoy8xnQo5IqtD1jKyXUNLqiUnqbMZUijeZ5O4PP3IpRcq0pjc726EvSrz5bKVdNHjDWEkq9kplDOZCuM3FL2MYZ3lDMGo/ZK91Bbarn2rLD2LqWMtg8m+XsPrP7InTGOS4P3tPN+ylwvsD3EqC9KRo7v8tR+5vJwBPXuzkN9QPmNtsWo1bfeNbjme8z97yXGD33k8HBPOB9b58PskRfJzZbE
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1t0KgCAMBWBv7O/93yCyHjMCg12YGuh2Jvtukhh5HKI5Z4wxZlSLdIDBzNIBiDXxDinfl0M6QKShV1qh9zbE5yYwt3f5/uxcQRp61zM1+EZtzTPO3W/oe5DLKR2gI6T/G0/GSHsvlYU7X+2dz53r73yhXNId3fNXoZarnxrvLDRIZ0YKej6tfLnEZCCcyUafG7ODBpg=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="320.672" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D7.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C8.tmx
deleted file mode 100644
index 5a63cbb0017..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWEFuwzAMy7EB9q21XV6ynw3r9qutaZ6x5iCAYElJCXqZAB/quDItU7Tl4zgMx3/WLodh+IL2fcj7Kz88jv1kvtTY670f7WfM+90851GPYz+rTWaNZzH24+7jJvrx2+dBf1+xBMbZjAsf6Mfhm8fH/y3w7UbNfUMcjDHDEvFx+DpjLg2ecKyUr5OYZw8+5iTyJePcuRh3FVgivksDX+wLc7Li3DQ+4sssi1WVIxP9XrFVnFP4sjVxbDOdukDcAwvO87qBF7xOlx9b4ql8Mo9+oSl9QyyZXsR4ju1WfLFmtV6Ve6gnWT66eOP/O/g4tyrtUnNm+AJPFe9KE/DcZW3APhcT9qPwVPrHuoqmzl2Xq4voV/vi9jjjoNMNND77kOsL+XL41D508FV4lb5nfnlPOvqTnR+sh527mTsT1VmX4dvSmPNhnbPU8cpxU/l8f8nxnQS2yip8To+UdfHh/REN+5GXEXcVK76rBC+Vrwqf8+lyJOOiuktVebXiyzB2cl3dVVmTlV5umaPKDXdPdXPPhlesjbyWqv5T/1ttGX0uozkeZHxwOdy9A7pzyuXGM/Sr2u9KC9Q+dXX8Yrix5w7o8GX6jNYdh3PtrS+7tc4ei/3IdKirX6rWV1ys3gmyekrxB1vog6ovu7V0J3/33P3Uf2fDW/feU2lDjHkWPqejjpOdN4WpOUcXn4rhlpxRMQoOLMkce3JY1drqflPhy/S6OvNjXLeWVXmR3ekrbezW6OjranxXtTS/2bj6MKzSl61a7PC6eCPGLW+nTrtwvR0t7r4dvI2P/Oa+TkO8Ku68Hr7zqDcvzl3Xx+0PPJJjjA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D8.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23C9.tmx
deleted file mode 100644
index 1ec65bdb6c3..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23C9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtuwjAQ5I9E6rUCiJP0Zk1pb8WrxygrGHU67HodByrVkiVw7Ozsa3adVb9YrP7Z3HWLxWf3+/+HrOl+e37o4z2PnJvL3PdXmTaPl982sMY4dvQce56NcU3yogGsR9n7dln7erJvWeZScOl/Hds/8K3Z4L0r48Ae3VuLDzFbimtvnvqrfzaO3xSH7q3x7a67j4sWm5ts2Od8w2Fr9nskHBwPQ4DH8gk55cV2a07BPlk8YAwOLrVTlHuebo+YsDPsADvxusYE1pfyrCWXTZ7GsPI3y+QYZFvxumJv4SSPd4HTfKq+ZA4H9rWcZ52m5FSGjcf+FlMsT3Pd427FAR5r4XKVF3EyYkb9O96mreEsxyb0b82JmvrGukOeYRkCPZmnsN6Kz+wB/aNaMsh+7NkKZs+32D+3lzj1P7yc5RtsDpl25tz/2MyLoUf2EpqLHEtaF/C8VFvRw9Xaz+tJuc+L6hJyuZTvB9GH6wr3ma8v97i4B+X+k89rncpGlO8lPWx4+KYOk531XzX9GXRAXtv08KEfGSveiYE66p1BzGccxXwDLIbPw+jxRPS+sfO5AmOQdbUl+Ls1b6E314HsfVEt9fhpLudB1pT3QKdSPWC9W21X4nzmHL3nKjeX8M2xH9dL7Rcj7NrreOe0l1FOrMXHcRL1d/r+qIfy+ntvTLWn5wfttxgP91Bb0fXc3/fyHndP6e29+47XD8JWWW5yXkR8U5svUSwxBn2W5ZSdHUkXcHcLD0b3GX0WYa/1E3BqD1Kym8ay+krjibFE3OF9l+PvGt6dKstbHp68Y1/ml9J3Oe97V00MZvc1YORYivzeMjL7ZTJKcaV+Z5vwHQa9heenzH4Zvpp7lt7V+FuB3nunYCvFX+15tmPGGWqL2vrhYXzGt1qVM0UGbFBjh7kYa/pKm98lsl46
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D1.tmx
deleted file mode 100644
index 4d693547f36..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D1.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWG1uwjAM5Wcr7Vp8aCfZzWAtt1rpeowlgicelu04JUjMUlS0pfaL/fyR7vrNZtdoHdLK8tlQZ8u1/yf4ftLz3L3W1tDV2cj7L+l5TM/v7opxTM/pBVhhCzawPDuHG7YlPee0Tt11AevUl3VEF2xl/b/91QbiZtnIsd0auiDA38J3zPGZMGr8xzsaPn63BS85TpadrYLNy1vkzbP+Y95p5wRG5iWwsX+G7p4bYwB/je8gWqzkHk0yxoux51l8HEPWNdx8MfX3GsK5g5pSkhb84xorY3i8YVrEmRZ6D/ss3C18eFL0etwexBkWwt26vkh7kXMzL2QMI5xegw0ci9QuzX8R7Gv5xzYi+q28kpxuwb+sS+pAjDz+eLMV4+MaWetLrbcxPs7pSdjhvEctgn32L/ZY/TDCO6+3scCOVZOtPqP9P6+vDxtfaTYv9Y0W4uGDjxAfxE720IhE+wn25pqfl4dP47GFCbXHq+P7wnm0XpTxlXyo2dTsW9zcir9rvny2j1j5YOm16s/c33udN9+2wmjVA8TSqxdaDVyDS85SLKX52LPbak6QdYT5o+GTs4R2N7Hm7Fq/QQ/PnzwjaXo9bsm5gWfa2lmG/SZ9wBi0+ih9Mypn5XhmPrCeiO8sXYyfY+3VR5bSnTPiR9n/rRlKzsMRsXIKGCNc5POUcqvUF6Ro9pkX0VyOfBvT5v5aH5byveRDK8ZS77F7/DZT8uGo5FJtHWRuydnMumNqfJTzg3aWNTW6xH1rdpW2mXNz/3iXAe41/QPvyzN7dUfLm1b3XA/novyO1oB3/f787t/vga/FdwKsP7nNWqc=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E1.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="17.7058">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="542.978" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D10.tmx
deleted file mode 100644
index 5b483e95b7a..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D10.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtuwzAMy2dysHZDL9ou263WrT3GEixEOILyM5gAI2ga2xRFyY/zNAznpc3jMNyX58e4/37fGt61tHnrP3eO87q01T6nX0xf22+8S40NX+7T7hPaOs7af31eOnxkPLDr8v5t3DHep78co72Yvs7gezROjjvF9lzef087RthJ+us38EufbvwSfG78Z+J/8MD+M4eXrc+TnspBTjMpDhFLnV954DnYB4ffxahGjyUcRjxAU6zhXAxq8TkOOQ+Zp4eZS03jpzlYoz/2MZpb5wMfHHPOhxvN7+pDa61hnIpVdck58JB8SNWfFu64zRRTzH2TWliae8yd8tqKDeOpBlvWFO6jdbMWl+ZgzlIa4lw7gjfonceD/q6j16Pi43WY/ezJBRfXk+DWOgasyofWRuRzT1wdf1Htq9XGyfh3FEY2xqv7w5Rma9fYUoyIH9cUnrMmj47QHsdI/QXe3HoWWa/2tLa5vQfjdJw6O6KmnIMY5dafSKdsbo/W0hwnEYe1GHvXWW5r7dK9SG7sHMYSP2vylvefpfHB99BblPN8vuvBy3uhHIe85nAdQS5F3LZqU/eRufoKXyI/VDO92iw9w+jeKarB0IzTaYs23frufKzRQCrmtRyqn1r7lbeWGLFvnDclPKr+Lon/HP4WDmpj4M5Duk+H5lvXfjdPC3/O+F5GfXZ3aHzWSmEs8dXlr1oqpqu2mHPehzkt15ydctyl9ururKam9UTPxLkYO90qby6mKc27NcTdf5ZyGM1TkguqDXzv7r2c1eQwr/N8l5fqF9Vs9MW40X1la61queNMcY0xee0+Yp9d0hDjkloBPv8Dl+I74jyO9gO5qWfL
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EsOgCAMBFA2qPH+N/B3TWFB4kITakin0HkJWxikKBgCeRFTm9EhHFjQASp91cKkmoKs4LuhDyOt09a4v71xfySzpnaCxq7dF6j98zbuoZ5CpmQuZ5qICkKkZKTvq0Te417mfqEDdMxLjZBNzzuD1VrUOgPn+Wv+r7H6vP9C3VXIhhu4PgXD
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333337" y="336">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="323.623" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E10.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D2.tmx
deleted file mode 100644
index 76308f2526e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtuwyAQzKc5WJOqF7Wb9FZxHB+jIGXk0WYxYNYuRUIhTlhmH8yAz+50Ohv1T99D+zK0adn/C767//zp/h4P96vH83jh6/14bgCTFrvQPhrAI/vk+3e35PfWHZPjK60jxxLDhWJ4xD5BTSEeGI9uqTV8Dzg5x8Cn+bFHTaXanTBrz6z3NO9H7Mmn/z50S531NM71YTTCeRHYmC/CXghYZ7fsC+BnvOHZoDy3qEvGl7I3uQU/sD/du0/AWItvL66FzzW1KOvOkiM4hls5XOMIK3zs+1a77KO1jlppIOqk1McUF7PvpTUYbAduulEONB+BATwGzePcgec0rFtjKLVT+ghcvHegD5p28H9Gp2tgTgwxN2U/9ntJ0/xI1VBti+lGru6l8EFThwKbrFusG7AD3ZO4NTsl/IA1Yjb77l23ttqs4S7mAQt7ms0a/pMal1MnpRxRo8HSVysdkdpZgxG+xrAxn+euodXNVo0K+V2Lm+TZXKy15w+eH5ur1SdjXcO5di7PjZtWH5rO8joybxrOmrNlqA15/+F1YjqLGGC+5GT4KM/kpTyaquNY0/agnM9+WXEBr8Ea27+epe5jk3u/iw5G2GTOZwWzjGHsXitt7N3X3im08N5qrTZbeeenYWztnWnIc9/td9eziCHzXkvYjuy/SWs4fw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10kOgCAMQFE3ivH+N3A8pisSQ4yWqSXkv6VJawGxMAxAP5x1AVAxWRfwYVZ815EYxz5pH2vUr7Vi7rFibtjL+S9IY/eXZxo91/ezv29YOo7U/ijxrKF0z9c8Q8Q4C+dbCucDWtDq/vW2jFgXER/OA2damcu6ACBQ884CWLgB1k4G/A==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_right.tx" x="0.95097" y="336.378">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D3.tmx
deleted file mode 100644
index 108b9893e3d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVVlsOgjAQ5JMeTDReVEVvJaLHsBuZOG4oCtZ03GRS2gCd7mO6TaiqJhM2EWbbjP/MgbauqmPERZBfS7zMdnF+E+AF9BGH+slPyXcA8k6VH3yoFlsAObgS4JLiZqbIj3NPkV8fnvV7js9dxKkuzyvFUbFGOAfPgv7jHFTUQI6vmXJ81WtYLbbAOmjwQ68HnbO5jeAHDfy1Drb16x6+BwUXm2P0Zus4C5+nG9aX8Mf3rGddYv+55s8xVyt9L7zU7A5hvZmyOfW+/pCb7b8f4Hngfnv3L3vvGuZpZR/G9xzbn7/h91duHb4EH5zrGw33e6a4AbjfxrjfaMxZv2O+TOUKYlni7uA4pXzA2leid5mKj6/50veHB/dWir0p4q/oO6B0/k2B8089voq9KcdXkR/HV7E+uA9QrI8+PO59dY2BTiv6EH78Fx+q88upM3f44BOq
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1ssKgCAQheHZ2Nj7P0ImPWYtXOaFNEbw/0AGVPRsvIgAdfo0Zx0CAIAfqHUAYHKxcd42YK+9MBZe+nLn90rV98XJGrHumarKevfQYR0AAPDZ7G9W678FwDpuBgMELw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D4.tmx
deleted file mode 100644
index f682245d6ca..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D4.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmE0OgjAQhbtsDyYSLwqitxKxx7CzaBgrEGjf0HnJJOiCfMx/2zhjGpC1wUg34DsRNlhjHsHeCvkGxkXqwm+vgCvaFOxuZz5NvosW8450UcCz5cNXeH7a+kzRKP9GN+egtvy7sthq8l/qN02MaU9ZEjGOFTj3sNXy5VG2sxnbDLYzGUv4SJKzJTe20j5Md5NSoRkn9zv/UYyo3oOI65pKdomt+YBSSazTuSqlnJqWjClX7q5T2uf2cH1c/h4mGVvEfijJh5ghknyI84lETyahdn+p+kX4TrK3IHJPsrdozj0SancpZaQ66O3/O5Bn45weE7k8+06aE33hvED58Oy7l6OMNc7lR+u5lg87lu/xeakOatz/EaN3c7579l/q49p3L2v83I8a71C5H7XzIWvkC0rymJ0=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2MsKgCAQBVA3Pf//DyLrMyNIcGHay5k7cc+mCMHbII7lHFFZox2AiB7ptQP8TKcdIDIkniHlOzNrBzhYqJVV6LX1x3VUmHs/T+XqM0kF+VB4n1ZonnCf62/oa1DKoh2gIqTzTfydhLT2Ulmk813t+dK57s7ny0Oqi9f8WhgrVU+LPQsN0p6Rgp7PKv5fewdhTyZ7Ns6rBpY=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_down.tx" x="321.655" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C4.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_up.tx" x="319.688" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D5.tmx
deleted file mode 100644
index bc2c894c9c0..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D5.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJytWEFuwzAM67EB9q21XV6yn23r9qutaZ6xBpgAgiMlJYgBH+qoMi1TtOzTcDicduqXR1/auKNP1a/Hw+ET+tcxH3f4rsaO/SibzPb2N0+07yEf5/+NhNfZYXMxvwjbt4ePuxjHbx9H/R3nmoxd+EA/Dt80/P/fDN/u1N03xLHEK/ZrEjaIpcPZyuba4AnHSvk6i3m24GNOIl+YS4j5UtgxPzG+cwNf7AtzsuIc50PV1uoP+h3p94Kt4pzCl62JY+s4E3sZcQ8sOM/zCl7wOl1+rImn8sk8+oGOa2V8mCNqzrDn2K7FF2tW61W5h3qS5aOLN/6/g49zq9IuNWeGL/BU8a40Ac9d1gYcczFhPwpPpX+sq9jUuetydRbjal/cHmccdLqBjc8+5PpMvhw+tQ9bajLGq/Q988t70tGf7PxgPezUZlWtV+nWlhqWOR+tc5Y6XjluKp+vTzm+s8BWtQqf0yPVKnys71yj4jjyMuKuYsW1SvBS+eriU/VPxmHFRVVLVXm14MswdnJd1aqsyUov18xR5YarU93ck+EVayOvJaurXOyWNg8+l7E5HmR8cDncrQHdOeVyYw/9qva70gK1T10dvxpubKkBHb5Mn7F17XCurffL7l1nS4v9yHSoq1/qrq+4WL0TZPcpxR/soQ/qftm9S3fyd0vtp/47Gd66955KG8JmL3xORx0nO28KY3OOLj4VwzU5o2IUHJiTObbksLprq/qmwpfpdXXmh133LqvyIqvpK23s3tHR1834ru7S/GaTvWWyfQdf1RxeF2/EuObt1GkXrrejxd23g5fhP795rNMRr4o7rwf38t3sFeeuG+P+C5oBYyo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D6.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D6.tmx
deleted file mode 100644
index c394827088c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D6.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtuwjAQzB9Y6rUCFSfpzZo+bhUoHKOsYMR0WNtrN2DJEvi1s6/xOps0DJuF+uu5W9steKbXP9fD8L3++/9LxnS9zR+ehM/sMKeLTJaLsX26Yf2kebRH49uKPK8Bq2J7P4+dHuxblrkSXPpf2zN8azb4WJdxYI2ujeJDzJbi2us/6eIf5KLiYRy6NuJbzaVem5ts2Od4xWFj9nsiHBwPYwaP5RNyyovtObXZUG1Ziwe00cGldsrlnqfbEh12hh1gJx7XmMD4SuZ6ctnkaQwrf7NMjkG2FY8r9h5OUp6ZCaf5VH3JHA7sW9nPOrXkVA0bt/kaUyxPc93jbsUBHuvhcpWX42TEjPp3unYbw16OTejfmxOR+411hzzDMmb0ZJ7CeC8+swf0z90lo6zHmp1g9nyL9b28x+ecUizfYHPItD3HdLOZF0NL1hKaixxLei9gvnS3ooZrsR/XoeA+jysYB3K5lO970YfvFa4z317uMWFO61D+rfdUreXyvaSHNQ9fazPZtforUp9BB+S1dQ8f6pEpcCYa7lFvD2K+xlHMN8Bi+DyMHk/kzuPaytszyrjaEvzdm7fQm++B2nm5u9Tjp/9yHmS1nAOdSvcB691ruxLnY565QmWXdIqsidoOORDBrrWOt09rGeXEKD6Ok1x9p+fnaiivvvdaqz09P2i9xXi4htqJrsd0X8t73N1S23vvHa8ehK1qucl5keObaL7kYokx6Fwtp2zvRLqAu3t4MPee0bkc9qifgFNrkJLdNJbVVxpPjCXHHd53Of6u4b2pannLzZN3SGV+KX2X8753RWKw9l4DRo6lnN97Ws1+NRmluFK/s034DYPawvNTzX41fJF3lr7V+FuBvntbsJXiL7q/JY/VFtH7w8PYWmtEvt+rnBYZiCWvDm3BV4sH5FlExi+coFlI
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333337" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D5.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D7.tmx
deleted file mode 100644
index ce1646b3e3a..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D7.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWFFuwyAMzd+ItGutjXKS3axds1t1a3uMgVSrr47BBrxsSKhqAub5+WEcduMw7Jz6FHtqs6NNz76/4zvH38+w/fqnuOYS8msTvkN8f/sDbN8FfnLvNZ+8Y0ctYfgCHFPmPWL+LZzIzcuwxrEI71OMr/HZMf5+hDVuT6yoq2NYr8kb11+aL8312kcUO7Q3wZqJJ8T7xuZfxgdejIUHRrSHvOCa9J8wcnwcK/rTs9dz2KRxpEHLeqeKsZa4ljix+kBjaU975EiMWe7MQh80LWGOKmmgppPNHD70QeOEfPE6X6w6IR80TqzjarnT7BGHWnyt46xdynvaWCuHvTVYzb604kObvTG25JZarmv2es4/Xo9Y9xppq+QPjiGMS3j099f1HHyfuOd1UY1OLPUzx4hNwqc1axz4uV/yC+NMdVjqEj6q0Uo1k4VDvmZLnk74JIwl7lv0V/IHeW7JMZfxuf6x5gHt+0TSQE+OseZbib8c59I3Sss50hoDLQdyjR4b64SWPGrZv/sGu62x0riR5qDdrfVnrT17zzjuq9WGJXZcA7X6lnxtyX+5OfwOwuPbreZeQtMEx9ejP67l3J0QPtNqT+kOp6eO5vl0ZtiIX1qDaxbxS9rr1Z/E4RKe66/c8/Mo12te+uMYD6y+wfse7b5IwpXGe90DJ4y3+y/h4X5LNZ3kF8WUbHrgq9XCPOb9um6MS+Lwv97f156Jlv4D1H1P3Q==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="336.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C7.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E7.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="542.978" y="325.59">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D8.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D8.tmx
deleted file mode 100644
index dcaa9c340c7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D8.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmH2OgkAMxfmTSbyWuvEk3kxXvZU4cgxp4GVrrSTuFHibbJMGZQL58foxhU2qqk2Qf3Uutgu8Z6RvB741AcuYfox8p7qqbgPftTte6uWZPDaxQ/e/JeCC586/6x8+0e9c986go9VP29K1PMbGEGfUrOU6ErB5uccQ0zFGhphaZ+594jYH/+P7HDvda0+m52Id8d0N55qZ4oyZBLklHNgfmvTa+67pORfPitU+W4R273rvpwbuyNlmG8QG07n5Gy3tNd7eUGI2L/QcIb5fvTLpdVzTJD+3pjaPb2mTmN9T7x6fnD8O+7ndR+fg0r1S+DxGr8/iHtHMHtcnnpWm7QQ1HP3uZDUttej5obRHY1bVOR6pYal+Vq9ckHvvXPq0rhX8Pjjceg3HqecZPHNWdaPP2dlKrzHM0qhxxtlZ1w/ju4eOL+N3ob8UXzDK7MPy7WVs/2OId079fu31cKb3TDtrs9VyVhoy6eZpyM4XWRcPZhnsXw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEKgCAQBdDZlHX/I2TRMaNFIEZag8xX+28nIvNxEEURIrIwowN0YEIHeLCgA9CvOXQAogpsijVj8RR3Xto/o2H+1bh26t4fEnPxnodjTd9dpp5GrW8ahNwZief9y3UWzj6ic+zg+kRE9M31f6B5v1pC329EJR27fgW0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.68301" y="335.268">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D7.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23C8.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E8.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="542.978" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23D9.tmx
deleted file mode 100644
index 1373582bb1c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23D9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmFFugzAQRPkrlnotKOIkvVlT0lslIRyjWOqIzTAGTAlGVVeyQhyEH7O7g0npsqz846PJs+zcj2t//JWn52G2W/+JuByMse3HZ8/zkj0yHknPyujHcQQ9p/g+erZuZx5fc1YT5NgG8p1CP6+XX9fW15sb9AKrPz4l0K9y49x5Pnz3eqbggs/BT9CnmIOmqfoWOeQaU1HvzFY63QehKBLwWUbbByk8hT2EGTunnx1TbE2+XX3CQ87EOed9nFd7vq3f3/giP/MLwR1i5N/8+bU5trGG0bL5XN3dkK+GvMVe22pT0/k4V/VXTJ+H9krIEfsL68r1Z/UqxNySPoK/+pq90fpg9POFyA/rxMyq3iqauxqG99cx39K4CH5cnzUP3a+6hg3Fd/8ZS313y0B9Yyi+kE/wdab4ec8S8m+e497wfLGMqGHujdDvtRv829ea5e3c2ItivTrkUTzP3gMW24/gbN3jfGwPT2mo7ptzY31uTg/lYfyMWsKImlX3DWY8T1WfqvWYba2Gc9x2zxwKxRh6j9r6HYX30aou1f4eNWJ7RuVpKx2Vj8ytE+qZZwysYb3lmeutzTXyfDS+hrx8jd/uoZvqx1hP23pMeQv6eO/38xi+1P9btW5+T5NSPzDCi9UzOyWbYj0l+r/qf4THN7FjNLg=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="320.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D8.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E1.tmx
deleted file mode 100644
index 0f1aba857e2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmNEOgjAMRfe4fZhI/FEQ/SsR9xmuDwtzAoHtlvYmTdAHcrhr126NM6YBRRuCdAO+ExGDNeYR4q2Qb0i4SF347RVwxZhC3O3Mp8m7GDHvSBcFPFsevsLz08ozxaD8G92cg9ry75qsrSb/ct80MeZ7ypKIcRTg3MMm5eVRtrMZ2wK2Mxlr+EicvaV0bbk9zGeTWqEZJ/fb/1GMqL0Hsa5rqpkltvqDNB+nZ6lKc7F2H9mrklnnDO+I6+PK5jCOes3ZaufDfKZDCtFDOPkQ5xOuNUbN/lw1gvCOs34Ruce592nOPRJqdqllpDro7f87kGfjkj0mcvnkO6lP9BX9Aunh2XcvRxklzuVH61nKwy7J9/i8VAcS93/E6N2c7z75L/dY+u5ljT/1UeMdauqjdj5kjXwBMhWamg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2MsKgCAQBVA3Pf//DyLrMyNIcGHay5k7cc+mCMHbII7lHFFZox2AiB7ptQP8TKcdIDIkniHlOzNrBzhYqJVV6LX1x3VUmHs/T+XqM0kF+VB4n1ZonnCf62/oa1DKoh2gIqTzTfydhLT2Ulmk813t+dK57s7ny0Oqi9f8WhgrVU+LPQsN0p6Rgp7PKv5fewdhTyZ7Ns6rBpY=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_down.tx" x="320.672" y="18.6895">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D1.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_up.tx" x="320.672" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E10.tmx
deleted file mode 100644
index 418da4c1210..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E10.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVl0EKAjEMRbtsD+YoXlQdvdVox2PYIGFi6cgsinkGPuhGHj8/aRxSCEMnHYqkjh1/s4fGGMK16AHkGw2X1Kl8fwK4VLnoEhc+kncqzR2VTz2k9ValGdwBWNbYpIh8NntEvpyW+Z3K53vRLfpzrTESZ8RmcAL6ZzNI3IG2v1LU/hKzZ/2TvtJ6q9on5mxYPuoOrG9A0p5psZHeu3r36RsyJ8Ysa+7+5b4n9HSNkeZd3WeidyKdYcpOabERbxf6f3P63VfvPlr+aj57H3jfCN/eXcKubr27LS+9PNzC5+lhK3t1ee6bnD7vAlp/t3jova/Fw7nhI+k+tZzn+BaF6xd6AcP8ApM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgCAQBVA3UXmwLlqox8yBGZiFULs/1n8gA64+6qgpET1b+1jQIYiIaOhCB5jcig7wwrGjE9CfFa0VmmJshv6N6kQHIAqMd8u3ybcq4psmJFfrI2uN9AWULJLJ+kMyVq0RNK3FzWU3j2br59UUZ4+tL+z8RVo7Ixl9b8hZ3KCJaBY3+EgNeg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D10.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/gold.tx" x="301" y="527.667"/>
-  <object id="63" template="../obj/gold.tx" x="318.333" y="540.333"/>
-  <object id="64" template="../obj/gold.tx" x="300" y="543"/>
-  <object id="65" template="../obj/gold.tx" x="285" y="537"/>
-  <object id="66" template="../obj/gold.tx" x="312.667" y="555"/>
-  <object id="67" template="../obj/gold.tx" x="289.333" y="553.667"/>
-  <object id="68" template="../obj/enemy.tx" x="295.333" y="401.667">
-   <properties>
-    <property name="enemy" value="Harpy"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="296.333" y="265.333">
-   <properties>
-    <property name="enemy" value="Griffin"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="296" y="105.667">
-   <properties>
-    <property name="enemy" value="Bird"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E2.tmx
deleted file mode 100644
index 7d80c9f6aa1..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWEFSwzAMzLGe4VuUkpfwM4bAr9qkeQbNQTNisyvJgQue8aGOK6/l1VryuQ3D+Z/16TQMn65/neLxzA7OQzuRLTZ3foz7dm3xuPVb+7nOpfF5aGdro9jjhcx9f9i4k3H/7ePEv18dxkXMMxvejsK3tP3/VvftDl198zgQY4TF/KPwVeZMBZ6gr5itF7LOEXzISc8X5JLHfEnmzQSL+Xct4LNzQU5mnBvbHl/UIl9lMTLC7w1bxjmGL9oT+jbSqcn53bD4dZ47eIH7VPHR409mE3l0c53pm8cS6YXNR9/24rM9s/2y2PN6EsWj8rf/fwUfxlamXWzNCJ/hyfydaYK/d1Eb/JjyCdpheDL9Q131jd27KlZXMs7ORZ1xxEGlG77h3ee5voIthY+dQwVfhpfpe2QXz6SiP9H9wTQx0091J7K7LsLX25H3W6vcpYpXipvM5ttTP7asZfiUHrGW4UN9xxzVj3te2r6YrzBXMV4yW1V8LP+JOMy4yHKpLK42fBHGSqyzXBU1mellzxoZ91SeqtZeBK9QG3EvWf3H/re1tdViRfEg4oOK4WoOqO4pFRu/1S7Fg4wT6n5lPIx8MAluHMkBFb5In32rzvNrHa0vq7XOkWbnEelQVb9Yrc+4mL0TRPUU44/vpg+svqzW0pX4PZL7sf8ugrfqvSfTBpvzV/iUjipOVt4UxuIaVXzMhz0xw3xkHFiDNY7EMKu1WX6T4Yv0OrvzbV61lmVxEeX0mTZWa3Rvaxa2s1oa32xUfWgt05deLVZ4lb89xp63U6Vdfr8VLa6+Hby2Pb9xrNI9XuZ33A/mPOzNC2NXjWH/Bl3OZQI=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E3.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E3.tmx
deleted file mode 100644
index e70636202cd..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WNFuwjAM7Bvth5VN/Og62F8VBp8xIjhxO9mxGwqRKkGa1OezfXG7Hbpuu9L1eb3K2K34TOva91330///f5A5XV/un96Er/AwDzebbBdzx+GBdU/3MV6N70PsWQNYFdvXde7y4tiyzY3g0v863hHbwsF3X8eBNbo2iw85W8tr6/odbvFBLSoexqFrM7HVWmrlvNgGP+c7jjJXfk+Eg/NhdPCUekJNWbk9D8s4VC6jfMAYDVzKk1d7lm9rXOAZPIAnntecwPxG7rXUcrGnOaz6zTY5B5krnlfsLZqkOjMTzhJTjSVrOLB/yH72aUlNRdh4zPecYnta65Z2Kw7oWIuWqz1Pk5EzGt/pfpU57OXchP+tNZE539h32CtYRsdP1inMt+IrfMB/7ywZZT3W7ASzFVusb9U9fs5lyNUbOIfNsuc8PDizcmjNXkJrkXNJzwXcr52t6OEi/tDPWRrHfZ53LqGWa/V+FH/4XIkw6rMOxn49p6Lh1bvnR+3sQI5E/RTbjvqvTH8GH7I5qDVQGzhHJwMH7EUaxXqzpF49jHje1NtagTHKvHIJ/W6tW/jN50D0PO8stfTpWc2DrSXPgU+184D9buWupvmsOaw7bLvmU2ZNljvUQAa79jrWPu1lVBNb6sPr7/T5Xg9l9ffWWMqnFQfttxgP91A78ZV1FWss7V7S21vvO1Y/CK6i2uS68PQmWy9eLjEGvRfVVNk7kS/Q7hYd9N5n9J6HPRsn4NQepMab5rLGSvOJsXjaYX2X4+8a2R7Gip9n7zTU9aX2Xc763pXJweh9DRg5l7y4t4yIv8hGLa807swJv8Ogt7DiFPEX4cu8Z+m7Gn8r0PfeJdhq+ZfdzzxGmqFcZM8PC+MrvtWqnSU2wEGGh2cxZvrKcv0BM25bWA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="320.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E4.tmx
deleted file mode 100644
index ab457b6cb14..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E4.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWFFuwjAM5W/pwYBqF6WD3Qq2cow1EhZvrp3YielWKapoHfv5+cUNOQy73SFojMvI13ugz8hxfOC7LvfPtH388xLzkvTYhO+0vL//AbavAj/a+1pO0bWjK2O4AY5ReY+YX4UTuXnbrXFchPe5xvPybFruH2mNOxIr6mpK65j84vrL86W5UeuIaof+RoiZeUK8ezb/e3jixVpEYER/yAvGpN+EkePjWDGfnrWuYZPsSIOWeGeHraWuJU6sOZAtremIHok1075ZmENNS9ijShrwDPKp4cMcapxQLlHfF6tOKIcaJ1Y7L3c1f8Rhrb5WO+uQ+l7N1sph7x7Msy6t+NBnb40tvcXLtWetW+NZ1xppq5QP2vRgxDp4dGLZP3OMXh22fr/5vFLc0WhX4gAviw+M+co+zflv0V8pn1bteLVeiqtpgmugp8dY+62Uk8a59B9ly/Vb64Fco1PjPqGlj1rW77HBb2utatxIc9Dv1vqz7j2jvnGUq9WHpXZcA159S7m29D9tDu/9Ef/dPOcSNU1wfD3641rWzoTwWW3vKZ3hROyxJK0gvxSDaxbxS9rr1Z/E4SX9PpfSnl+HJ35uH6E/jvGU1vuGKdnOiyRc2T7qHDhjvD/uhIfnzfvzrORFNSWfEfi8WtgPel7zxrgkDv/r+b33m2gZPytsS1U=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E5.tmx
deleted file mode 100644
index 6c42b81ec30..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E5.tmx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="65">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWFEOgjAM3SdLvBZoOIk3Q9FbqZNjuAYaax0w2AaN0uRl6AJ5eV37CoVWqtiw4QdQZ0pdLK7Z+lw4r7tdHxYQNy2L56HjxQN4rs0RtEPdeFR2rxGoHfA6CeAGMBbn7JNfKYBXH0cJOeWgZ1BCTXDwM7jl9zt/2G9r1ndxD/Nb6ne/XiLP/GzBNfoD9Qzak7mPpOTa5w1TI0XdDHnDnMjZs0P5xtIOg58L/I047vw0g/tdZyt1jPGLnU+fgH701C3G+MXOpw8v2iuB3xBHoz+9Hp7BvT8FrykwndY4H+0ja5rP5OWraWjE9ubQmsFZFRHbm0P1W2LegrqmtYLXlYM33cM19TwDGjbdijmi//HZiu5JmKWxxiXOzrR+JL570PzG7m3/ll/kCLOPlO8vQ/4nId9Gt37t6uGS3jP5bCatlg3RUJJuLg2l84tZFy8JSecT
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgCAQhWE3pWfsell0w7YVtBALrUGcpP8DiRhknomYMQDQBrePQTvEjVU7AH7NagcAPmAWzOmLp7jypv0zGuafKvd2iVqXqMXfPHyX7LvN9JNIre1vcmckrvuH82o49lE7x6LcHwDwzng+Jf+vNWnfb0BJG5UlBlk=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_right.tx" x="541.994" y="320.672">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E6.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/enemy.tx" x="319.5" y="91.75">
-   <properties>
-    <property name="enemy" value="Mimic"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E6.tmx
deleted file mode 100644
index fefecb1d5ac..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E6.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmGtugzAQhPlXLPVapIiT9GZtSW9FSjhGvWpH2Q5rg6kTe6VVEgeZj32MjU+uaU6ZvPcuNmScM4ePbdOcvX9VyDcqLlhNfLP3D8/4pPgm9xPPi//8bMszou4smypgjPG9ebblwTxSczomyLE25LtE/CRecl9dXy/uFi+wyvf3AvHr3Tp3woffEs8SXKxz6FOMIaal+hY55BqzrIQGSt64D0LWFeDTjLoPSmgKawgzLs5eO2JsY5uvPqEhZ+Lc0j7Oq75e1+9/dJHX/M7gDjHyf3L9oL5rO8Ko2SRXV3fL10jaoufWsRnoelxr9VdKn3PcMC9yxPrCceX60/HqjLE9fQR9lZrlfRwYZbwz8sNxYmar3noauyiG1+c1316bDH7MzzEPPa81hzaL7/rre3U3p6G+4RZfSCd4nhg/71lC+s1j3BvCl8qIGubeCP0/uJt+S61p3sWttShVq0MaxeOsPWDR/QjO2f0dT+3hWAyt5+bcaJ3bioelYbxG7WFEzVrPDWasp1afWvez3kWPxHCLW++ZQ2Yxht6jcr+j8D7aqktrf48a0T1j5SlXHC0d2bpPqGfu4biH1pZ73u9orms8FwIb13ktZy4hrQBnqqbl9pi2oI8f/X6ewlf63Gp223uakvEDI7TYWrNLssXiWZvOwGs9v2e+nGcv31NOMI8=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.16667" y="319.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E5.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="636.425">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E7.tmx
deleted file mode 100644
index c180f968749..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E7.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFFOQjEQ5JOXeC2QcBJvpj69laAcQxqZMI6z7e4j2KQBHm13Oju73b7ttFptz31er1aH8+f7+vr77dLxbNR3597aPjG22rH2x/SD6Xj5jWc9jNjL8U74ZsGD9nx+/rq+YjxMvzlGf5x+zzndiTvF1ux8TleMaBuZz2NGXC/pikE50P+hAcbBHN4D407WVz82++xvxeH2EGGci3GX5fBktAAu235Yw06Hs4zD3CxW5RBzeX7D+WU0qU35i2Iw2kvEYWRb7YFv9jm+t88XstnDhrVdXhjhVKy6DnyO8Sd61ssPwN/TU6+zfmGb16vEJ3OnvLLms2vyeqrBW86U1jRvcl4a8aexlWm9c4x9qry5caP9MtdYD/p7Xns9Kj5wpvuMxr2J70f8YexGcGseBNZMHLT9bMhG5KNRTaFadbmvqo2N7E99jn1Gvu9h5ObyfORLncd7A75bahz2n+Yo2KzEEfwW5YXKGTyb8cA7Os+iBu09BvtRLSkmzW+udmKcjlPXNKdE+LQpvmjtnj4inSovehbqeQ1b0NOXseU4iTisYoxqNNSSmqOeHn66s7eb/tYioxgbYexppRq/mMPnTabm4ZzxYuoSxnlI+GXUK3cxzhmc/0cxX633nD2s01tjVHuoZnrazHR3z3TnYvY+Ds04nWZicIQv2uOS+7jzeZVD3afWk8rbEh/pPRlxU62d1W/ujuPq4SoHVR+4+5DW6dD80vdAzs4S/lzj9zLu/q12oncFijGzVxe/2no+bdpizrkOc1oe3Z0q3Gmt3osb1zSfaD1TuR9FvDmf9jTvzhD3/jPLYWQnEwuqDYx3771cq8Qwn/P7Dm+qPWcLc7GuqwEz3EVYs/mXue9xjTX57M7e327tlff34PM/cCm+Jb6K+jdipHW7
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEsOgCAMRNmgxvvfwN81hQWJC0mowXa085IugQGm5RMC8UJMMVqLcMBkLaCRmhcGVRV+QfNJzQ+sGVj8aT+Wzv2tnfsjMuYUu9HYrXlhlT93427qKmQUzeWsisJ2qLBOkBro3n2LnONe5n5YC/gwXjxCMLm+GVC9qHUHzvPX/K9BXe+nWL1VCAYn5qEGfQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.16667" y="335.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="558.667" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E8.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F7.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E8.tmx
deleted file mode 100644
index 18be29be8f9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E8.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWO1OwzAM3M9W4rU2Jp6EN+toeSu60seg0XbacdhO2mXSsBQVsdS+2OeP9NDudodK67isJG8VddZcr/8E39fy/Gwea6tv1tlI+8/Ls1ueH80F47A8xwdghS3YwIrsHK/Y5uU5LevUXBawjm1eR+mCraT/u73YQNw8Gym2e0cXBPhr+I45PhFGi/94x8LH79bgJcfJs7M3sEV5i7y513/MO+ucwMi8BDb2T9/ccmMowL/GdxArVrrHkoTx7Oy5Fx/HkHX1V1+M7a2GcO6gpuSkBv+4xmoMuyumWc4003vY5+Gu4cOToTfidi9nmAl37fqi9krOzbzQGJZwegs2cKykdln+K8G+lX9so0S/l1fK6Rr8S7pUB2IU8SearRgf18i1vrR6G+PjnB7FDuc9ahHss3+xx+uHumCLa1vU21hgx6vJXp+xfk/r/eUvPhWPH7m+UUMsfJjTdFZD7LSHlkhpP8HeVPPTsvBFPPYwdXIm/U37SYSLuZTwRRin1rZp2fe4uZf/W768t494+eDp9erP1N56XTTf1sLo1QPEMqoXVg3cgktnKZbcfBzZrTUnaB1h/lj4dJaw7ibenL3Wb9DD8yfPSJbeiFs6N/BMu3aWYb+pDxiDVR/VN4NxVo5n4gPrKfGdp4vxc6yj+siSu3OW+FH7vzdD6TxcIl5OAWMJF/k8udzK9QUVyz7zojSXS76NWXP/Wh/m8j3nQy/Gqrdrfn+byflwMHJpbR1kbuls5t0xLT7q/GCdZUuNznHfm13VNnNuan/fZYB7S//A+3rmqO5YeVPrnhvhnI2/S2vAs35/fvbv98BX4zsB1g/l2Ft4
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="22.6241">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23D8.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="542.978" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E9.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_right.tx" x="2.95097" y="321.655">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E7.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23E9.tmx
deleted file mode 100644
index 24935721e1d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23E9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmH1ugzAMxfmTHGxd1YuWrbtVWcsxRkStPr065MPehCYiRQRonJ+dxI/0ELrusNe97vVf1s++6756vX2B+7V+v8n2PV+vYWGR9hiWdixyH1ni70d4fyrww1KPD4aScgVm7dk1+DJK7KSc5/v7fD/M14/++UzapT6MTpzvxDbBu1tYWKdHOzIKP/LGZ4Py/OQQP+TL2buFJ7+w38OrT8Jo5cO55dh5+GxZi7zuPOZCi+Fbow3es5586HurXfTRc27Z99b44Tqp9TGXi9H32jUouf8Cc6D5KAyoGXJlTdFYW2OI+QTzKest7h3RB0078DeiedHWkfrnYoh6uWY/9b6maH7k1pC1pHSjVPdyfKKpQ4VN1C3UDbEjusfcmp2a/CBjpGye+1fdarVpyV2YBzzsaTYt+Y81rmSd1OYIiwazr146wtppYRRfU2yYz0vH0NZNq0bF+V2LG+fZUlbr9wf2T/XV1ieyrnGufZfX8rG+sc7iODxvGqfHtyWvET5bamyYjzkni4/8TV6bR3PrOFW0Paj56H1ewDFQYzW91eYp9uez6ODEhmOwxkqbc23qXMs2/qrGfcT7wvs/AmtsJ4XT8zzlzbm1GDLnVmMoVWK4dT7Ltx3XH0mGOnQ=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10kOgCAMQFE2ivH+N3A8pisSQ4wWKFTNf0uT1jJowTkA+JbeuoAbQ8N3rZlxXrUK1MAa/ddUMXdXMTfslfwXpLHLxbMWPTf0s6c9LB1Hbn+UONeg3fNbniFSbMr5RuV8wBu89fsN5oJYnxAfzwNnWpndugAgUvPOAlg4ADr+BvU=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F9.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_right.tx" x="2.95097" y="334.443">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E8.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F1.tmx
deleted file mode 100644
index ff67ee4cfcd..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWFFuwzAIzd+Sg62NdtFmzW7Vbe0xZktFfSPYgE2zRbKixhge8IxdDtMwHILGnEZ+3gJ1Ro7jHd8lvT/G/e2fk811LNsmfKc0f/sDbF+V+JTmNZ+ic0dPxvAJOObCPGJ+Fk6MzcuwxbEK8znH1/RtSe/3cYs7Eivyahm3NvnD+ZfXS2uj9hHlDvXNYDPHCfG+svXf0wMv5iICI+rDuKBN+k0YOT6OFf3p2eslbJIccdBi7+yQteS1FhOrDyRLezqiRmLOSmcW+qBxCWtUjQOeQTpL+NAHLSbkS9T5YuUJ+aDFxCrnjZ2mj2Ko5dcqZx1S3dNkrTHsvYN59qUVH+rszbGltnhj7dnrVnvWvUbcqvmDMj0YMQ8enljuzxyjN8+t5zdfV/PLy53SWostad0z6zS/J7fwr+ZPK3fQDt5/rPHX/p9IHOipMdZ6K8WvFHPpP8qe+1ergZyjS+M9oaWOWvbvsUFva6602EhrUO/e/LPePaPOOPLVqsOSO84BL78lX1vqX2lNa22t8d3Tl9A4wfH18I9zudQTwm/a3VPq4UTcsSSuYHzJBucs4pe418s/KYbr+LsvVfp+mR74uXwE/zjGE+sJYb9H6xdJuLJ8VB84Y7zd34SH+825QBi4X5RT0hmBz8sFypvk13VnXFIM/2v/3nsmWsYPOddKsA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F10.tmx
deleted file mode 100644
index 072b8451a9c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F10.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWO1uwjAM7D/aBytDvOg6trfia48xLDhxO+w4DWXSIkWCNKnPX2en66Hr1v9s7vqu++p///+UNd1vzw9DvGfJubnM/XCVafN4+W0Da4xjR8+x59UY30heNID1KHvfL2vfL/Yty1wJLv2vY/sHvjUbfPRlHNije2vxIWZLce3N03D1z8bxm+LQvTW+3fWPcdFic5MN+5xvOGzNfk+Eg+NhDPBYPiGnvNhuzSnYJ4sHjNHBpXaKcs/TbYkJO8MOsBOva0xgfSXPWnLZ5GkMK3+zTI5BthWvK/YWTvJ4FzjNp+pL5nBgf5PzrNOcnMqw8djfYorlaa573K04wGMtXK7yIk5GzKh/p9u0NZzl2IT+rTlRU99Yd8gzLGOgJ/MU1lvxmT2gf1RLRtmPPVvB7PkW+5/tJU7DnZezfIPNIdPOnIe7zbwYWrKX0FzkWNK6gOel2ooertZ+Xk/KfV5Ul5DLpXw/iD5cVzKM3INy/8nntU5lI8r3SI9S7Zg7THbWf9X0Z9Ahi0H0I1PFOzFQR70zkJdxFPPNnHyNMOJ9U+9zBcYo62pL8Hdr3kJvrgPZ+6Ja6vHTs5wHWXPeA51K9YD1brVdifOZc/Seq9xcwveM/bheas5H2LXX8c5pL6Oc2JIfUX+n7496KK+/98Zce3p+0H6L8XAPtRVdz8NjL+9x95ze3rvveP0gbJXlJudFxDe1+RLFEmPQZ1lO2dmJdAF3t/BgdJ/RZxH2Wj8Bp/YgJbtpLKuvNJ4YS8Qd3nc5/q5R28N4/ovkHYcyv5S+y3nfu2piMLuvASPHUuT3lpHZL5NRiiv1O9uE7zDoLTw/ZfbL8NXcs/Suxt8K9N47B1sp/mrPs++znk5tUVs/PIyv+FarcubIQCx5fejSGGv6Sps/y9hdIA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="335.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F2.tmx
deleted file mode 100644
index 1eacf35580b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWO0KwjAM7M/1wXTii/ox30qtPoYL62GM3UAb3QkGQrcVyvUuSdMtYwhLJ1/1LrZ2XNPT24xvQYBlij9GfPsmhHPGd+zHQzM/phI2sU3/fiXABU+975o7PuGvawZn4NHyp23uXJ7CxqAzctbi2hJgK8Ueg6ZTGBk0tc5c+8RtDP71fdRO19q9qbmYh77r/O30JZ3RkyC2BAfOh1N8rn3H+BiLncJq9+bB3VjtfdWA27O3aZ2wwbxjs3Q21JjVuzYnvLQdw/ouRm/eSlaj9Tfw1dTwFId6K3u0Z3+tyZqXWJ8nKa/hncPedydw6WXe/UNtjUavCpe9enJYy5/lC3HjqbHks84VPG8KuPUcxk/3M9izjLhX6G+2t9JzDL00cpyxd9b5w3j30Poy/hf6JX2BUfonln8vU+cfg94pDud9qYYz3TNtT8aWy0lxyMRbiUN2fJ55cQODD+Z1
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2MsKgCAQhWE33d7/EbLoMaNFIEZWg3is/m8nInNwEEXnAJQwqAN8QK8OcGJUB8CvdeoAQAVmw5o2e4oj795/RsP8U+HaqXu/SczFex6OrX1P1bOo9U2jcHVG4nl/c10JWx/VORZxfQDAM/v/geX9WpL6fgNyWgFozgWt
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F3.tmx
deleted file mode 100644
index ad5752c6e9c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmFFqwzAQRP0XC3qtpMEn6c3axr1VatfHqBcyZDqR5CAkJKgFC0YR1vPs7tjKyXXdaY899vg3cem77quvzxGK8xrXNb5dm5zGZ+N9ZVsa0tQYxjWmG59pONIcNK2l6+uNC+PQhcdQQb95jc8+AkXjWCnHYLTaC7FyXdZiXIj18CSb1W/p+tQ+1ZxrXnk91++1ECO8L8Sov9n6ga555Ga8iLfwvVmbQdZjrWqdu8/VXziXPs9mvY6eudx9pPlRnZTZV29nmbNegce/vaTn1e4zCR/uP8meY2S9zvFI5dO85hqW3x93j1Q+zatvH9Q9rn3+rXPaG8aXwujrO95zIY0Hd/dvey7mXdyjF+XyatUQueFe1X4E5+z+zpfoYdWQc8M+t6UH9zo0HDN9O6rHxfrat5+yldCQcxrrax9jqM9KvOfGiBb2DB8eTVAj3DPwlpzvEejo85GtfUI9UyKwB3tLyf1Sc408t8Z3Ec9u6Uwc8gpw5vK01Nj6Zqh9RtriK3W+eDZmFz8L19YPjPBiZm2BLaZnaz6DwPu1db6c/738ApGwIZI=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1ksKwCAMRVEn/dD976BauszagZ0VDJiPcA9kJvENDCYlAADQ5Fq7dwiByzsAQri9A3QotTbF/odib/iSvpv3/Dmgj9RMf0ck2TsAPovxfZKZtJyvlms1vBPAGH87QDSz7AzauxNg5QFTJQTv
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F4.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="636.425">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F4.tmx
deleted file mode 100644
index 8cbc03cbe37..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F4.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWNFuwjAM7CP9sALqj8LK/mqw8RlrNE4cNzt2ijrxsEjWRknj8/liJ2z7rtvONm267jz/fd/cP59uhmeR7WcrY0zMbTWs/dH/YLrcPuNZDSNiuayEbxI8GIf5+dvmjvHcP3IM2/WP71xX4k6xFT+f/R0jxiDv85yI6yWmGJQD/R4aYBzM4RoY97K+5rH453wrDisGD+PUuO+yHF4NLYDLEg9r2NLhJPPwbharcoh3+f2C88vQpA7lz9uDXiweh55v9Qe+Oef4v/w9ks8aNqxt1YUIp2LVdZBzzL/Ss1p9AP6anmrG+oVvXq9lfzJ3yitrPrsmr6cafKanlKF1k+tSxJ/urcyo9THOqfJmzYviZa6xHvR32Nh6VHzgTOP05p0k9xF/mDsIbq2DwJrZByWegXx4OYrOFKpVq/a1amOQ+DTniNPLfQ0jD6vOe7nU9zg24Gs940xGf9Cawj5b9tFIPpb0NWjUq+HAG/Uzb0B7Oyce6yzElp0PnBan1tCa4uFjvxZGq25E+vB0qv60F3r9utVnxHkWo3dGw1mSz2uZ/qY1OtpjEcaaVqwenLlXcTyZMw/XjKNxLmGcZwcv1rD6s1rLXYxrBsce7XmO3etbkb+MJqKzx77/fWfR2FtqtnXPtDSRvY9DZ5ZOEXvL/rD6uxXTkvu4lfNRfEb51Th1vvK25LcCvSfzaNXfWPkus16Gg0hLtXexz/ScDs0v/R3IwxitF90DOafQ/hJ8Fsal+1fHkpzWMKKmR9gi7vSs/tdW0y14ezana2B8di+sgZH7/PgCvNWwviKuf8vbNwiQaM0=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl0sOgCAMRNmg4v1v4C+ey3gPIZGEhSiQQov0JSxpB2gnRQimFaRePbaIBhiwBQTiq4WuqIp2MXUyYotw8NUDewYt/vQeE3C8GTgeE4fxsxUpd2hfYPXPU96luIo4rGY708jIfVRhn3iH0lwCQUw9Uq/dXJger+HsEP+TDSDGZw59ofttnNT8xrzzoYQ4VdrektTgRVT7BmsWy4n7Z+B7ZxgmlQtIegqA
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.16667" y="319.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F3.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E4.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F5.tmx
deleted file mode 100644
index eda8a1d4db0..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F5.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWG1uwjAM5Wcr7Vp8aCfZzWAtt1rpeowlgicelu04JUjMUlS0pfaL/fyR7vrNZtdoHdLK8tlQZ8u1/yf4ftLz3L3W1tDV2cj7L+l5TM/v7opxTM/pBVhhCzawPDuHG7YlPee0Tt11AevUl3VEF2xl/b/91QbiZtnIsd0auiDA38J3zPGZMGr8xzsaPn63BS85TpadrYLNy1vkzbP+Y95p5wRG5iWwsX+G7p4bYwB/je8gWqzkHk0yxoux51l8HEPWNdx8MfX3GsK5g5pSkhb84xorY3i8YVrEmRZ6D/ss3C18eFL0etwexBkWwt26vkh7kXMzL2QMI5xegw0ci9QuzX8R7Gv5xzYi+q28kpxuwb+sS+pAjDz+eLMV4+MaWetLrbcxPs7pSdjhvEctgn32L/ZY/TDCO6+3scCOVZOtPqP9P6+vDz+uHj9KfaOFePjgI8QHsZM9NCLRfoK9uebn5eHTeGxhQu3x6vi+cB6tF2V8JR9qNjX7Fje34u+aL5/tI1Y+WHqt+jP3917nzbetMFr1ALH06oVWA9fgkrMUS2k+9uy2mhNkHWH+aPjkLKHdTaw5u9Zv0MPzJ89Iml6PW3Ju4Jm2dpZhv0kfMAatPkrfjMpZOZ6ZD6wn4jtLF+PnWHv1kaV054z4UfZ/a4aS83BErJwCxggX+Tyl3Cr1BSmafeZFNJcj38a0ub/Wh6V8L/nQirHUe+wev82UfDgquVRbB5lbcjaz7pgaH+X8oJ1lTY0ucd+aXaVt5tzcP95lgHtN/8D78sxe3dHyptU918O5KL+jNeBdvz+/+/d74GvxnQDrD6y1WqY=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="322.639" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="544.945" y="321.655">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F6.tmx
deleted file mode 100644
index e9d1a1ce35f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F6.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl2FuwjAMhfnZSLvWyrST7GbtgFvRAcdYLO2pT67TNI1hTGski1CI8zlx/NI27Hatk71Fk/bu6NPT/grfOX6emt/nYTtEnq8fvi72b0/AZK2dtNcn4NF2ifbZjPt7bB6zxweaR/c1w57W8BHnBDmF9UB/CGOu4btw8h6Dz4rjHjmVa2ditp55n2k+jziT1/i9b8Y866i/NIbBiXOv2LheyFkQ1lsYzwX4mVee9cZzj7xkvpy/Sxj5wX4N05jAWMt3r1qLmGtyUeedZ43gNVxbw60a4cXHsa/1yzF666iXBiJPSmPM1WKOvTQHxbfUpiPtgRUjGFDHoHm8d6hzFuvaNdTaqWMEF58d6IOlHfyfIdgaCN2EfbxMuTA25z/1e0mbi0OaxVfbUrqxVPcwXszig6b2hT6hW6wb8APd09xW4xwSPouxVXOkfHbNVLeW1CvLJ983SmsY1wH2V1MLtc+a+qc1Tpr3naNGg3WsXjqitbOGEbGm2LieL53Dypu1GiX7O7duus4uZa29f/D41FgrP5l1jnPuXl7Kp/VN6yzPo/fN4vS4W+oc0e+WFhvXY12TEaO+k5fW0Vwep5p1Bq0Yvd8XeA7WWN1P1X8Zr99F12hFjlFrrNUv8bHZZpv9H/sGPXo5EQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kkKgDAMQNFutOL9b+B4TFcFEdF0Skr5bykkxrYxdQ7oh7cuACpG6wI+TIrv2hPj6JP2sUf9WirmHirmhr2c/4I0dnt5pjFzwzz7O8PS70idjxL3GkrPfM07RIyjcL65cD6gBa32b7BmxPqI+Oc6cKeVOa0LAIDOXQlDBlk=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="544.333" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_right.tx" x="0.95097" y="336.41">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_down.tx" x="320.672" y="17.7058">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F7.tmx
deleted file mode 100644
index 72f83524edf..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F7.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWFEOgjAM5XMkXksxnsSbqeCtmOgxXBNeqLNjGEj2PmzyAhi3vb12beFQV9VhIxwDxE4bzrkFWldVXcCDkF+reIldwvOLgBcwBNzcxI9JOwBxx8oPGrL5FkAM7gm4pLiJMfLTscfIb6in89uHex9wd+V5pTgynhEdgz2hfjoGGXOg9q8Ys3/ZzzCbb4Gm5uCHXg95Tp7lCn7Igbk8iHG59bCWH+8xpnWfa8Q9KLjIM66x9dH82I9X4zo34bz75mfN6evPfOYT6/9qqX3ALH7PETo/rDWpIUvnk/+Cg8XPOoNL5ryOiMegvjUZvcFL50rhl+NorWmtn9rXPvodWoIP9rUmh6e0TNV+1DeL+0tdt8wjlpZWbShdO7SfLA10nJXqXSz/6DymjaW/gq6Wla5xlm/ZNIy/a1gcS76LxD1zykr1g3PxxxKLSzQs2U/nNGR415zrAxjyjGho9WcM2lk80aMwcfuDF2+Sew9m
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgCAQhWE3pnX/G1TSMWvhokVa0MhY838ggoo+kBGdA+6Fo3ntEAAANBC0AwCdSw/XDQJnjZW55WKsVL9b7uO7OEUS+665t/gGzdoBgAqLNWlVj3c9aQf4gfO/ReJvAuD7dkN7BD8=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333337" y="320">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F8.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F8.tmx
deleted file mode 100644
index 46fe75c8689..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGEOwiAMhfkJB3Muu+h081bOyTGkMc2w0QnsMTDxJY2bidvno9BCY5RqQNG6IHXAZyJi0EqNLm4V8g0eF6l397YCLo7ZxVkvfDV5x8F5RzpUwLPm4dVdX3R5Jg7Kv8ksOVhb/h29sa3JP+lbTYxyTXknYpwKcIawlfIylm1vxjaBbU/GLXyknLUldWxzeyh7k61CM87mtf6jGFPWHvJK/gYxrp8U00swR+fdf6oPKIWM9Sjyi73PyeXrm4clFdLr3F2c9PMTPQ/WuOh9sX3YbPJzIvpD2dMhhaghOfkQ+5McazIJ1fvnWpMR3uWsF4jc29pDranm3COhepetjDQPaM2Xz0DujVPWGOay3v/06xNy357i4d5nLzGMpc41QuZzyTMX9rD38p2vZb6VCmK0Zsl3631Xkusfvx8PVF6fZQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2O0KQDAUBuD9Ybj/O5BxmVLUSbMNnY/xPn9Iy3mdlg3nAPIa7QAA8EinHeBjvHYAoo9cs5TvyqQdYFdDr2plvbdhPw4Ktbf9VKo/I0PNluGe1PE8b+qUzBl/Ok+tb9bnoJRZOwAjS/sb+p1kae7FskjnK13zpXPdrRfyQ9jROb9kxkr1k2PN+htL74wY6/lqhf9rAPJWA+MF/Q==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333333" y="336.666">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F7.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_down.tx" x="321.655" y="17.7058">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23F9.tmx
deleted file mode 100644
index e6a26a40764..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23F9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJytWFFOQzEM2+eexLUYYyfhZojBrYDHOwabRCTL2EnaLVI/1tembuq46Q7Lbne4Uzte2tVOd/Sp2nm/271D+9jn/Q7f2YxjP2pMNvb7b52wzyXv53knwuvGobmYH8XY14uPH9GP3972+juutZpx4QP9OHzr8n/eBt9+qLlviOMarzivVYxBLB3OVmPODZ5wrJSvJ7HODD7mJPKFuYSYj8U45ifGd2vgi3NhTlac43yobFR/0O+Jfl+xVZxT+LI9cWwdZ+IsI+6BBdd5HOAF79Plx0g8lU/m0Rc03CvjwxxRa8Z4ju0ovtiz2q/KPdSTLB9dvHF+Bx/nVqVdas0MX+Cp4l1pAt67rA3Y52LCfhSeSv9YV9HUvetydRP96lzcGWccdLqBxncfcn0jXw6fOoeZmozxKn3P/PKZdPQnuz9YDzu1WVXrVbo1U8My58M6d6njleOm8vnykOPr3p9oFT6nR8q6+LB+RMN+5GXEXcWKa5XgpfLVxafqn4zDiouqlqry6oovw9jJdVWrsiYrvRxZo8oNV6e6tVfDK9ZG3ktWV2W5sS0+l9EcDzI+uBzu1oDunnK5cQ/9qs670gJ1Tl0dPxtuzNSADl+mz2jdcbjW7PtyRqu7FueR6VBXv9RbX3Gx+p8ge08p/mALfVDvy+5bupO/M7Wfmrsa3saY7E3n8gP3fSs+p6Mz2o9zZt5HDp+K4a34ggNbssZMDs/WutWeuvmL4249T4ev0sbuGx19fRvfI/c6nqGzSl9GtXgUL2Ic+e8U5zut7WhxVx+el//85r7umWQ1Cu+nky8qtzr59gsDc1+W
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmN0OgCAIRr3JrPd/g34fs7h1loKoTDlbF00gxuBLNUapzYywXX/W3PtMiXH2yHpqHEzuOT69Ir0WZ+XvYesR62Mqi/deah4s0l7hYWudQASqLpSaBx9H9JOid5AHRduOxNiKws3XbOf2m3QtVNpD1fsRgP9Iz5rPqQ+j9RH1/BQ6b0CPXRE/a3C9GLK9Ef6KbGrMm+4fZKF3CnUAbfdrzbkP6HlPIZUHy/gLLQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23E9.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G1.tmx
deleted file mode 100644
index 93ca4e2898d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G1.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtuwjAQzGci9VoBxEl6M2jorQqFYzQWjBimu34mrLSiUD/Gs+P12puh6zazT33XnefP7/75/fRw/Jby3ezB9hltSx1j/wx3TJfHd/wWw4i1XFbCNwke2GH+/at/YjwPrxzDt8Nrn9tK3Cm2MM/v8MQIG6U/t0lxXeOKQTnQ/0MDjIM5XAPjTsbXOIb5Od6Kw1qDh3Eq3He5HN4MLYDLsB7WsKXDSdqhby5W5RB9uX/AeTU0qab8eXvQW4vHoTe3zge+Oeb4O3weac4YNoxt5YUUTsWq4yDmaH+j32L5Afhjeoo56xdz83gl+5O5U15Z87lj8niqwZYzJZjmTc5LKf50b+VY7BzjmCpvVrvUeplrjAf9HXpbj4oPnOk6vXYniX2KP7QdBbfmQWDN2QdhPSPN4cUoVVOoVq3cV6qNUdanMcc6vdjHMLJZed6LpfbjtQFfS43D8dMchTlL9hHi5uWF1joCeFPnmWfQ3tZZj2qpFafFqWWaUzx8ai1cpnSqvOhZqOc11gE9XRfAVoLRq9FQS2qO+vy4+7swWnU241wKR8w5ZxyNuoRxnh28aznnDM7/2Eset6X1Xq2nao/d8H8/eNpcmrec+zh0ZunU0+aSvJXwYMV8aQ6Vt5rx9Z6MfdPKo3XHserhHB411jV3D+QCq7aH5mvfgRRjzd3DM36Xse7fOo/3VqAYc9ZqvROpxWIatIXcprWh9lMuUlpJcae1emzfWKb5ROuZkvuRx5sV05jmrTPEev/M5dCbJ2cvqDbQ3nr3sqwkj/I5v4/wptqz5kJfjGvVgDnceVhz8xJzH+MaY/LZnXt/a/WS93vw+a46kPHVxMrzPwo3ayo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2N0KgCAMBWBvzOj936Cf50wvhIIEJ7Id2vnAy3TVttIQyIuYR7IOwoHVOoBOrVxYVKPwCy1PWvnAnoHlT+9jnzzfMXk+ktnyuIzW7q0Lq/r5WvdUj0Kmxly/VVF4HSr2CaK3UuPodUtEvj33DKj9SusfuNy/5nkN6vMeZbVXIQw3NBYFyA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="558.667" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G2.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G10.tmx
deleted file mode 100644
index 3411e723296..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G10.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzdmFFuwjAQRPNX9mBQlIu2TXsr2sAxyKodZTTYhiZW1sKSleAE8jzrHS85WNcdnrwPu677nPq3/R6/dvFMzPYzHbn1DXChj1P/mBhfiO9ks54taHkU/TphjWYs8b1NbJeNeQbJAcSYG+IdoZ/r5c/l9fVqs15g9fP3AP2Odhs758Nn1zOCCz4HP0GeYgyaRuUtYqhrLNUiPNDjpnmQa/sAPmbkPIjwFPUQZbxYeu/Yyu/gIbrf3/M+jWtpnmu04z2fnwnuHKNe8/tr5gqzeazONsdrEG9hDs7tXu6vtYeobvhdxEj9RXXV9cf78tJ8hr+6p2odB0Yf39ttHaA6KQfPZ6mGj7ZTgh/7hWqem+8SxvNff9R317alOqpPcCt5sV7Heeo7a+uZFCPWu+ZG7npvs3/7emXeGr6tOYB46Lh6D1iYAZyj1dtTVEOu6XicPZd9bovaaqS84Xmrxw0V87QmN9fMuRb5v03r6NS6jKjvVceUj0Qx5TjVW6KZUrFGnFvjG8TLt/KX/+qWyt3o92wlb2GPbJUv+r3VaPdrmmivcUZ4cWrPjmQr6dmaz6Cjfmidr+a7lyvsASQD
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgDAMBdFstOL9b2DpOUWKuwoNFH4i85bSxSA0jRkwp6gDfuCw/h83dQiAT9X6Xc2iqQOAIE51QHBZ9rh98M3b/py/FrR4qd+OrO9BVQdAJupcertG8whAbKodwEu9M8yKOqcBrxsCkwRV
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1" y="320">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G9.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="318.704" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H10.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G2.tmx
deleted file mode 100644
index 681a4bd3cb8..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G2.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWO1OwzAM3M9W4rU2Jp6EN+toeSu60seg0XbacdhO2mXSsBQVsdS+2OeP9NDudodK67isJG8VddZcr/8E39fy/Gwea6tv1tlI+8/Ls1ueH80F47A8xwdghS3YwIrsHK/Y5uU5LevUXBawjm1eR+mCraT/u73YQNw8Gym2e0cXBPhr+I45PhFGi/94x8LH79bgJcfJs7M3sEV5i7y513/MO+ucwMi8BDb2T9/ccmMowL/GdxArVrrHkoTx7Oy5Fx/HkHX1V1+M7a2GcO6gpuSkBv+4xmoMuyumWc4003vY5+Gu4cOToTfidi9nmAl37fqi9krOzbzQGJZwegs2cKykdln+K8G+lX9so0S/l1fK6Rr8S7pUB2IU8SearRgf18i1vrR6G+PjnB7FDuc9ahHss3+xx+uHumCLa1vU21hgx6vJXp+xfk/r/eUvPhWPH7m+UUMsfJjTdFZD7LSHlkhpP8HeVPPTsvBFPPYwdXIm/U37SYSLuZTwRRin1rZp2fe4uZf/W768t494+eDp9erP1N56XTTf1sLo1QPEMqoXVg3cgktnKZbcfBzZrTUnaB1h/lj4dJaw7ibenL3Wb9DD8yfPSJbeiFs6N/BMu3aWYb+pDxiDVR/VN4NxVo5n4gPrKfGdp4vxc6yj+siSu3OW+FH7vzdD6TxcIl5OAWMJF/k8udzK9QUVyz7zojSXS76NWXP/Wh/m8j3nQy/Gqrdrfn+byflwMHJpbR1kbuls5t0xLT7q/GCdZUuNznHfm13VNnNuan/fZYB7S//A+3rmqO5YeVPrnhvhnI2/S2vAs35/fvbv98BX4zsB1g/l2Ft4
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="15.7385">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="543.962" y="323.623">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G3.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_right.tx" x="1.96731" y="321.655">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G1.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G3.tmx
deleted file mode 100644
index 80bc54d4dd3..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G3.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFFugzAM7SeRdq21006ym8Ha3qqM9hjD0p54Mg4kxGVpJKuUNs6zY78XOIbD4ehkH6PJ+HT06Wmvgu82fl6b/8fDdh7x/Pzha8frRwWYrNzJeK8Aj7ZhtO9m2t9Ls88en2kdfa0xnCiHe/QJagr5wHUfplrDd8HJewx8VhzPqKm1cSPM1j3vnuZ+RE/ex+9dM9VZS9epMfROOE8KG/OF9IJgfYSpL4Cf8cq9zrjvUZeMb83fECb8wH4P85iAsRTfs7gWMZfUoq47T47gHG7lcIsjvPBx7Fv9cozeOuqlgaiT3BjXuJhjz61B8S3cdKE9sGIEBvAYNI/3DjxnYd2aQ62dOkbg4t6BPljawf/pg62B0E3Y19scF+au+Y/9njOW4pBh4SsdMd1I1T3MF7PwQVO7TJ/QLdYN+IHuadzW4BoSfBbGo1oj5rNt5rqVwleWTz5v5HIY8wD7K+FC7bOE/7TGyfA+c5RosI7VS0e0dpZgRKwxbMznqWtYdbNVo2R/l/KmeTYVa+n5g+fH5lr1yViXcC6dy1PzZtWHpbO8jt43C2fJ2VJqQz//8DoxnUUOMF9zMmLUZ/JcHl2r49iwelDP57i8uIDXYI219NbapyHMn0W3aEXKnrPG4lpzbey5VvvYy6TPdV/U9N4PudQ4a3t3yjhry6HGWWsOYa/yftzz/e4vnHc+NQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10kOgCAMQFE3ivH+N3A8pisSQ4yWqSXkv6VJawGxMAxAP5x1AVAxWRfwYVZ815EYxz5pH2vUr7Vi7rFibtjL+S9IY/eXZxo91/ezv29YOo7U/ijxrKF0z9c8Q8Q4C+dbCucDWtDq/vW2jFgXER/OA2damcu6ACBQ884CWLgB1k4G/A==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="544.333" y="320.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G4.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_up.tx" x="320.672" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_down.tx" x="321.655" y="15.7385">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_right.tx" x="0.983656" y="335.427">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G4.tmx
deleted file mode 100644
index 6c762d53e1e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G4.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl2tuwjAQhPMzlrgWFHGS3ow25VY8j1GvyEhTZxc7FLz+kZVGMY/EH2sy42xC120WLVr0Fg191x366diT5xTu+onjczwelbEX50dUSYGzJusw9mhuCWsNxtLeabVuaG3T2sfe3SrwXaK++3Kmr1E12JhR5ryGu2SsMddYz2f7WrtnOfF93VLftP7tGuDRhHvbm28YM0HyTTwXmQs+8WLk3yNPfiar06znOcDF+SEsyFwtV5BxzIvrclZDn6spE3+Oc040X/r6P2X9DpTG947aG55ofRdeqvHBYy2fta5pnYMsy2UhuNgnhU9jZJ/IcaZZyt4itU7eRy/B84rMS+e02KBtsNlvdHylj2i9tLIBa+mRHbxOVg/Y+zz29bn14f+DF+Mj8f6g1l50jthLWuofZxUXMseTs+RZzquXc54zPT2npDw951rA6X0/a/sAzlpvr7mEvzno3a8cZ4tsi9rVL6LADnY=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1sEKgCAMgOGd1N7/EcroMSPyYLGGkDIP/3eZWDiRchMBAPwRq/Hmtovb3vheGroLW5DnmQHe+B4BW2ttCR1yLcYzrcZ+/b9HiaPqXY91c4lRfO4h66xHWx1zA8DMtFrneV/X4itekszXS2t9S1bmPPXomQC0OwElRgcA
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333337" y="336">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G3.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G5.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G5.tmx
deleted file mode 100644
index 151b82ec97b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G5.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmGEOgjAMhfm5JV5LJJ7Em6HorUDcMVxjGuocRMYb60uaIDHw8dat3WpbVTUoGh+kM/CZiOhMVd19PBXydYKL1PrfTgEXx+jjZiY+Td5xcN6Rjgp4ljzs/fXDlGfioPwb7JSD2vLvJMZWk3+hb5oYwzUlJmIcCnD+w1bKy7VsezM2CWx7Mm7hI+WsLaljm9vDsDfZKjTjaL/rP4oRtfYgxnVOa3sJYuFvWqoPKJGPdzPF5fDLNIgglt7m55pTjK+kqNe5+njZT8T46D7/Bz0PlrjofWEfRnwxRjlXc3Mi+sOwp0MKUUNy8iH2JznWZBKq98+1JiO8y1kvELm3tYdakubcI6F6l62MXBfCZyD3xilrDHM58Z2yPiH37Ske7n32spaxxL587Xwu5WEr8p2vY/OgxPkfMTo75bsT90KPS5+9zPFLHzWeoUoftfMh58gbFwCfIw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmFEKgCAMQP0pqzt2usg6ZggGIywtmdty7ycJca8xnGaMoqTpqAUURfnEQC3wMyy1AGCMvOPkd8dKLRCQkCupcM+tC8+JILY/Tz3lZ0GI2SOsCTm/pyROTs3Yy9j3t7lgvRbYqAUQ4XS+gfckTrUXc6ntl9vza3u9jefSU9CBNb8n5tbKJ0bPag1Oe0YM7n5S0f9rZXDYkxV5HOTWBwA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.5" y="335.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G4.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_up.tx" x="318.704" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_left.tx" x="541.011" y="324.606">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G6.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_down.tx" x="320.672" y="18.6895">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23F5.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G6.tmx
deleted file mode 100644
index 3d390cc095a..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G6.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWEFuwzAMyzEG9q11XV6yn23r9qu2aZ6x5iCUUEhJznaZAKOo48i0TFF2Dm0YDv+sncZh+IL2Pcb9mR8/zvuJfLGx13s/2rnF/dgu7THXsfFx3s9qk1jjkYx9v/u4kX589jny5zjXLMaZD/Sj8M1t+94Cz26uqWeI4wwxnMkYxGLxUfgqY04FnvhYMV8vZJ49+DwnkS+Mc55vatyVYLH4LgV8ti+ekxnnprbFF1kUqyxHJvd/xZZxjuGL1uRjG+nUCeJuWHCe5w5e+HWq/OiJJ/PpeXSBhmv1+DBH2Jw23se2F5+tma2X5R7qSZSPKt74fgWfz61Mu9icET7Dk8U70wSsu14bsE/FxPtheDL987qKxuquytWF9LN9UXsccVDpBpqvfcj1xflS+Ng+VPBleJm+R379nlT0J6ofXg8rZzNVE1mti/Blzc5sF8I1s0otVbxS3GQ+3562+H5rGT6lR8wYPpYXeH5Ew37kpfGexcqfVdgc1hi+jPNz0zkScZGdpbK8WvFFGCu5zs6qXpOZXvbMoeZlNSK6O6FGMPPa6NeS3f/Ye6stbVu/mCkeRHxQOVw9A6o6pXJj7x5Fa63wTtVXxsMoBifBjT1nQIUv0me06jica+/9snrX2WO2H5EOVfWL3fUZF7PvBNF9ivEHm+kDu19W79KV/N1z9mPvzoK36ntPpg025q/wKR1VnKx8U5iKc1TxsRj25AyLkXFgCebYk8Psrs3ONxm+SK+zmm/jqndZlhcf4+PX16FMG6t3dPR1Fb576jruobJMX3q1uBcvYuz5dqq0C9db0eKqPry2Lb99X3VPojOKX0/lHONzV/X59gMA4Wft
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.66667" y="320.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G7.tmx
deleted file mode 100644
index c10e750e53f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G7.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtuwjAQ5I9E6rUCiJP0Zk2ht+LVY5QVjJgOu17HQKVasgSOnZ19za6z6GezxT+bm242++p+/9/Kmu635/s+3vPMuTrPXX+RafNw/m0Da4xjQ8+x59UYlyQvGsB6kL0f57XvF/uWZc4Fl/7Xsf4D35oNPrsyDuzRvbX4ELOluPbmsb/4Z+X4TXHo3hrfbrr7uGixucmGfU5XHLZmv0fCwfEwBHgsn5BTXmy35hTsk8UDxuDgUjtFuefp9owJO8MOsBOva0xgfS7PWnLZ5GkMK3+zTI5BthWvK/YWTvJ4FzjNp+pL5nBgX8p51mlKTmXYeOyuMcXyNNc97lYc4LEWLld5EScjZtS/43XaGs5ybEL/1pyoqW+sO+QZliHQk3kK6634zB7QP6olg+zHnrVg9nyL/Y/2Esf+xstZvsHmkGlnTv3NZl4MPbOX0FzkWNK6gOel2ooeLrMf+jmP47jPi+oScrmU73vRh+sK95nvb/f49F1b57zWqWxE+V7Sw4aHDzGS9VMsO+u/avoz6IC8tunh83IwG6ijo4MDMZ9xFPMNMBi+Vox439j5XIExyLraEvzdmrfQm+tA9r6olnr89CjnQdaU90CnUj1gvVttV+J85hy95yo3l/A9Yj+ul9ovRti11/HOaS+jnFiLj+Mk6u/0/VEP5fX33phqT88P2m8xHu6h1qIr8yr2eNw9pbf37jtePwhbZbnJeRHxTW2+RLHEGPRZllN2diRdwN0tPBjdZ/RZhL3WT8CpPUjJbhrL6iuNJ8YScYf3XY6/a3h3qixveXjyDn2ZX0rf5bzvXTUxmN3XgJFjKfJ7y8jsl8koxZX6nW3Cdxj0Fp6fMvtl+GruWXpX428Feu+dgq0Uf7Xnp+Sx2qK2fngYp/YasE0WD638jFjy+tAp+LJ4QJ7VyPgBv/hckw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="319.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G8.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="640.36">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H7.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G8.tmx
deleted file mode 100644
index d42b034a878..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G8.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWG1ugzAM5d+ItGutrTjJblZWequuH8cYkWrNPJzYTlL2Z5GsquAkz88PY7ILXbf7t03s1HfdNNu5/3ssErbr/BvHJcgYCT+PYauY9k9sNCLG77DEcQ3r+zymV+Hke791a5yTcP84X7vP18b596tf426JlbiLe479ek8c0e8B86W5KZ147SDo7sD2jDxxvB8w/xZ+8Uo6qMHI1+O88D3pP2FEfIiVx4Nct8Am+ZEGLfudHL6WvOY4scZAvvRM12LDnA2GGDQt8RqV04DHaM0UPh6DxgnF0oI7j04oBo0Tq5+XO2094lDLr9XPalLd03ytHKb04s2tVS8WfHzN2hxbaouXa8+znoqPv788zxppKxcP9yGM1I9F+3xfz+H3I/fYF3l0QtrKcYMY+ZDwacOaB3zv5+LieaY+LJqEj3q0XM9k4RD3LKnTEZ+EMcd9if5y8XCeS2rMLSz7H2sdsH6fcA3U1BhrvZX4S3HONeDRdqscaDUQNToW9gklddTy/O4L1i3NlcaNNIevu7X+rL1n7TsOY7WuYckdasCrbynWkvqXmoNnEC2+3TznEpomEF+N/lDLUs5OgFvrPaUznJo+GuvpANiIX9oDNcvxS9qr1Z/E4dQv+6/U9UuQ+7VW+kOMR+hv+HmPdl4k4Yr+td8gHOPj+Ut4MG6pp5PiopzSmi3webUwhHRc941xSRy2ytur8LU6H4j2A0UJT+g=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="-0.33333" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G7.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H8.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="542.978" y="322.639">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23G9.tmx
deleted file mode 100644
index 9f1440379f8..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23G9.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGFOwzAMhfszkTgC19lAPQk369i4FaPsGNTqnnjz3ECpk2Zilqy0STN9fYntdNvYNNu73/2GfR+a5ji0h3P7FtZjeXwYndk+hpbtPV5yYo6em5NPuA4GG9smXvOV0u45wcU6ag1LaZfSrQvXjCX5+uH6NUzzaWsL6acZdyHNKTrKM6cV+HA/pWV35pqaV9J1rGi2tZ01LM2GPCcucbgPl/VB58E2fteTEnXkidZOcoVwSItaZtUO9PFz1rt5aJfKc3MM3BsnNq2dh/He/IuWes5vatgc0/sC9/AXI//wOOYco723cpvFt7bJmn/G0S0+6d+Fn2tVLi7OlcJnMVp5Fr/hzWxxzfGeND1liGHP/GJputT4zFpDjsYZi/e4p4ZL9dN69Qv23pRLnuZYwXVncPMY2tznGbxzT3HDffpsxWM1nAMR495738M5fmo7N2Ptsb7eue2/rS8Y8V9RDayp+lfDevdxrNdWDm8r4IPf0jdwTbpZGtbO5xkXX9oA4mU=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEKgCAQBdDZlHX/I2TRMaNFIEZag8xX+28nIvNxEEURIrIwowN0YEIHeLCgA9CvOXQAogpsijVj8RR3Xto/o2H+1bh26t4fEnPxnodjTd9dpp5GrW8ahNwZief9y3UWzj6ic+zg+kRE9M31f6B5v1pC329EJR27fgW0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="336.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G8.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H9.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="543.962" y="322.639">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H1.tmx
deleted file mode 100644
index 7ca0cb4db7c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVl0sOwjAMBbNsJI7AdSioF0UUblUIHIN4YdWyyAaMMrX0pHaTjvx5ccec0hikU5XEFHhmhOYhpWvVA8g3Gy6Jc31/AbhUpeoyrHyk3Km076h8mkNabVXagwcAS4tNgshne4/IV/I6v0t9vlfdhv5cLUbijNgeXID5sz0Y7YH73Xdq1Vcisr4RfP/0mOj8TQFn229E8ImOeRt8dn4JfNJ74sl2B1TG3nx+N/Ue05vP+57foXvzed/z91tvvk+M1v8IfLbOfjeg8Km3+LuDxud3FwKf95jo/7df+azHEHfT1m5AUqv/CLL9R68v8f/S1pfIZ+tLnA/NHXU+StUz8z1GfZqYQ83jVnJI54v0mTdnHcr5
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1rENACAIAEEaw/5LOKdOoJVCcZfQf0MgAu5yz6iOAIAHsjoAmpvVAQf2FwD+6n57O/8tQI0FCF8Bbg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="318.704" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H10.tmx
deleted file mode 100644
index 0af22a24253..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H10.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVmGtuwjAQhPkZH6xQ9aKh0FuRAseoLTHKaFgnsb2kwZJVEzXOt89xsg+73d5pfsaZxpfjnp7zXfgu8e9P9/88PE+R5/fB18f1fQNMlu/S+NgAj85rnN/dGN9zt06MT/QcXSvDgXy4Rp0gp+APrIcw5hp+J06OMfgsO16RU3PjQszWNe+a5npETd7i72M35llP66U2DE6cB2HjfpFqIbHew1gX4GfedO1oXPfIS+ab2+8aRn6w38KzTWBs5XtVr4XNLbmoeefZI9iHtT3c6hFefGx77b5so7eOemkg8qTUxrlezLaX5mDaO/WmM8XAshEM6GPQPI4d+pzFWutD1U61EVxcO9AHSzv4f4Zga2CJD3NapnrbMnIauISRc6Nk5HRj6V4lNbj0PMC6xbpxfFyH7im3NUpijGfk9uy7Z92q3ZPPG6U9zIp1ay/UPVv6n2pcGt5njhYNVlu9dETzu4URtubYuJ+X5LfmTa1GpfhO+U377FLW1vMH35+718pPZp3inDqXt+SwpbP8HI2bxelxttQc0XdLi437sfZk2Khn8tI+OpfHuWHVoGWj9/sCP4M11tJbK07pfn0XrdGKOUbVWKw1T3PvtbrHWjPVudbFlr77wZfKubVvp8y5NR8q51Z9iPku38c9v+/+AZNwOj8=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10kOgCAMQFE3ivH+N3A8pisSQ4yWqSXkv6VJawGxMAxAP5x1AVAxWRfwYVZ815EYxz5pH2vUr7Vi7rFibtjL+S9IY/eXZxo91/ezv29YOo7U/ijxrKF0z9c8Q8Q4C+dbCucDWtDq/vW2jFgXER/OA2damcu6ACBQ884CWLgB1k4G/A==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_up.tx" x="320.672" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I10.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_down.tx" x="321.655" y="18.6895">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G10.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H2.tmx
deleted file mode 100644
index 01c1d0f59d2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmFEOgjAMhvc4DiYaL4qitxLBY7gmNoxFCKx/tzZpmA/ql79dW9o2zrUgvwQnuwJ/E+G9d+4R/G2Qr4+4yLrw+WOAi30MfvcznyXt2DnvyE4GeLY0fIXz09dnYqf8G5o5B63l3zmKrSX9Ut0sMaY15Z8R41CBcw9bLS2PspVmvGSwlWSU8JFp9pbc2GprmM4mUkMzjs2y/6MYUbUHEdc1k8wSW/0BZbmx1tQstaMalmTLmXWkNW4v19TkzWEa9zVlk86H6UyHNEQP0eRDvJ9oxRg1+2vdYYR2mvUFkXua9cVy7pGhZhcpY7fyXeS7MbLGSPqFdpw19wkSRg3NUPe55A6GNaT/ZC35TM+bX2pcYz80/uJEzyk6M0esce3dyxp/rKPFHWqso3U+5I73C1cUlPo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmN0KgCAMRr3p9/3fILIeMwQFL0ytdPsWOzdGDD2N4UxjFKXMwC2gKMorZm6BnzFxC0QsiXdIfnfs3AIeCbmSCnpurR9XhrXdeSqXn41KpCHhe8YGc9TGuOdcf0OvQSoOboGOIJ1v4v8kpNpLuVD71fZ8aq+n69lySHfimj8LsVT5lNiz0EDaM1Kg+0lF79e+gbAnK/K4ACXKBp0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.688" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H3.tmx
deleted file mode 100644
index 2e15053e4e9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H3.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJytWFtuwzAM62dzsHVdLjos2622pjnGWmACCJaUFK8C/FFXkWmZoh+n6XA4Pamdb+1u8xNjqrYcD4dPaF/HvN/hW4wfx1E+me/lb5yw7ynv5+9mwuv80FzOz8L3/RbjKvrxv4+j/h/HWo1fxMA4Dt86PX63wX9Xau4/xHHPV6zXKnwQS4ezlc/S4AnnSsV6FeOM4GNOIl+YS4j5XPgxPzG/WwNfrAtzsuIc10Nle/UH4870+46t4pzCl82Jc+s4E2sZeQ8sOM7LDl7wPF197Mmnisk8+oGGc2V8WCNqzPDn3O7FF3NW81W1h3qS1aPLN37fwce1VWmXGjPDF3iqfFeagPsuawP2uZxwHIWn0j/WVTS177pa3US/Whe3xhkHnW6g8d6HXN8olsOn1mHkTMZ4lb5ncXlNOvqT7R+sh52zWXXWq3Rr5AzLnA/r7KWOV46bqn6q1t0/0Sp8To/Qsj1K4cPzIxr2Iy8j7ypXfFYJXmKsLvdczCqO4qI6S43W655v1VmVNVnp5X/xuT0iuzuhRihjbeS5dOuCubtNvpbRHA8yPozUMGJx+5SrjWfoV7XelRaoderq+GK4MXIGdPgyfUbr+uFYo/fLEa3uWqxHpkNd/VJ3fcXF6p0gu08p/mALfVD3y+5dulO/I2c/9e1qeOveeyptCJ9n4XM66jjZeVOYm2N08akc7qkZlaPgwJaMMVLD6q6tzjcVvkyvqz0//Lp3WVUX2Zm+0sbuHR1jXUzs6i7NbzbZWyb7d/BV5vC6fCPGPW+nTrtwvh0t7r4dvE2P/Oa+TkO8Ku88Hz7zqPsE167r4/YLc/tgGw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H4.tmx
deleted file mode 100644
index 3521adf0443..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H4.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWO1OwzAM7L81D9aB+qKUwluVsT0GtbQTp5udr21IRIoYTVKfHd/F6TENw/Gf93Ucho+9f475cetfKZ73SDxmBzZP+29rW7rFsNI42vzkeL2IPa8Bq2J7259d/hDfQXDp/9qeHTvr33t/H/M4LE42B39b8XHO9uTrq7NvisP8uNDcmr1dx9u86Ik5Ymg2z1cc9sx+L4SD+TEFeIxP4JSX21vqiyHiUxvnycGlcYq45/n26FzdKE5eDs8y/yBjrbZZBzn+q/zPNjkHOVb8XLH3aJLq7kY4bU91L1nDgf1F1rNPLZwqYeO2XXOK7SnXPe1WHLamV8vVXqTJyBnd3+Xa7RnWcm7C/15O1Jxv7DvsGZYp8JN1Cs978Vk84L/qMtok8zFnFsze3mJ+r+7xey6pjm+IOWzamnP6jZmXQ4+sJZSLnEt6LmA8d7YavnviB+3ztIJxgMs5vvP5pudKK0ZvvZ5TpRbxPfKjlic53WPbEWfQSuPsQ0sOqu5FDefo4uCAvZJGsd608DXyG+9bAq1Am+S5xhL63ctb+M3nQOl90Vnq6dO9mgdbLe+BT7k8Z797Y5fTfOa23nFVm3P47okf80PrxQi7ct5bp7WMamIPP6L6Tt8f1VBefe+11nh6+xDpDrgJLZvF13O6reU97W6p7b37jlcPIlYlbjIvIr2p5UuUS4xBx0qcsrUL+QLt7tHB6D6jYxH22n0CTq1BcnHTXNa90nxiLJF2eN/l+LtGbQ3j7V9k75Ty+oK7kfddzvveVZODpfsaMHIuRfve00rxK9nI5ZXuO8eE7zCoLbx9KsWvhK+mftS7Gn8r0HtvC7Zc/tWub+GxxqL2/PAwttYaiE0pH3r1Gbnk1aEt+Er5AJ7V2PgBmVpVoA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H5.tmx
deleted file mode 100644
index ba65f1c40bd..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H5.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWFFuwyAMzd+Sg62NdtFm7W7Vru0xBtKsvjoGHuBmQ0KREmM/28+GsJuGYec05zDj+HDU6Tn3v/jO4fk1bm//GGyexrRtwXcI3+9/gO07E5/U95JP3rmTETFcAMec+I6YX4UTY/M2rHGcjO8xx7fwbgnPz3GN2xMr8moZ1zb10Py7To91uNarjiR3qA9txjgh3ncyFx4YUV+uLq+AMYcvyqE/PbXOYpMajbKMvWOFLJPXXExYH0RWatqjR2LOUnsW+lDiEvaoHAdqpuhM4UMfSjERX7z2F5Yn4kMpJqxcbexK+iSGpfyycuy0+l5Jlo1h7xmspi5ZfKizN8dMb6mNdU2ts/bYWhNu5fxBmR6MmIcanjDnZ42xloet+7del7M7k3K5GOBgdKDNV/ZpHf8W/uX8aeVOLddzdlOc0Bzo6TFsv7V8SsXc+kfZsn5LPVBzdGk8J7T0UaZ+9w16W3NVio21BvVuzT/27Om1x4mvrA4md5oDtfy2fG3pf6k1uvd7/LvV3EuUOKHx9fBPczl1J4TvSmdP6w7H44xlcQXji3cKyFnEb3Gvl39WDE/j871U6v15euDX8h780xgP4/rcYN35MKNn70hhvE/Pd0Jat+aC+KP96s2pBxckb5Zft2n7u18dw/96f1+7JzLzByjwSX4=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G5.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="636.425">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I5.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H6.tmx
deleted file mode 100644
index c1068b40cfe..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H6.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztlm0OgjAMhvdzSzyC11EMF0XBW/Ehx3ANNNZZDWxlLHFN3pQwsj3pu46djVJnTx0Py+Q7f6gyX+bLfFlZWVn7qtZKdTbfdfx1m1mwdq3fGXC8t88QJXkfg7WY14VozcQBuZnr1ZNx/KZjvtuCtdaf6/sGskpyFkJsGJVlGwX9vwjzufuiDfBd0ttfcUqYzZdP2lcuYC8+zGs/rtFgddPTHJBT4XIZxw162MfPJbVMlS+0V8DPK1Gor9L1Cznj1vQz7RV8rhhuOoZZumbfegUyekTfUW53bGu2JcIej+HlWtH+ieGlj/for/TZ8W/+IiPcn6TvoqG14yIFvwcz/e+5M7zciYmTeydLrZcHUsOU6sbVMHU+yb54AgrX1OA=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1lEKgCAMgGFfyu5/hUw6ZgU9iMKqYRvR/4GIDNlUREMAAAAAvisr5ozdq2ilvUWDPG8q61+Mc09CbBBi9Z6XY+25S/k0pLX9zdUdqePp5jwLxzl617E65wcAPDOfveb/asn7fQN62gD8iQTy
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H7.tmx
deleted file mode 100644
index f70a5a60ac5..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H7.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmOFywiAQhPOv4cFiM3nRtrFvpY15jIbp7OTcLERSFJhhVGTC597dgpxc05wy9X7pvg0Zn5mjj23TnJf+UyHfaLjQauKblv61ML4Zvov70/O6vH635RmRd6pdKmCM8X0sbPOLeXzOWU0QY9sQ7xL6eb38uja/3t2qF1j9+88C+vVuGzvPh89ezxJc7HOoU4xB01J1ixhyjqlWwgN93LgOQq0rwGcZbR2U8BT2EGacnd47Ymxjmy8/4SFn4tzzPo6rnW/z9z++yHt+J7hDjPydnz+Y97YdYbRsPlY3t8ZrJG+xz7baDDQfc1V9pdQ564bnIkbsL6wr55/VqxNjKXWkznFg9OOdiA/rxMwq33ox9mg9xBo4eezqtprj7KfmHz3Lcuxe0VLiq3LXPie2b/CZJeTfPJa6BypG/MaQvvz94Fb/9jljeWe39aJUrw55FI+z94DFxguck7sfP1rDSkP1uzk21uf29FAexnvUI4w3d6+P8jjsp6pO1XohD8t1npiIOVbzijHkYbn/o/A5WuWlOt8jR2zNqDjl0lH5yN46oZp5Rsca1lueud7RWNd4LwQ2zvNa7lxCXgHOVE/L3ffOEyXuXVL4St9bTW7/TFNSPzDCi9WeXZItpmdtPoNe6/098+W8e/kFD7sszg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I7.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H8.tmx
deleted file mode 100644
index 8ed1e3a66ef..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtywjAMzGdysECGi0JDb1VoOUbjKTtZtpIt54FmNBTqx2r1sOxD1zSHSce2aW7T52c7f78+Fb+VdJg0ySkwtlax9lf3h+n+/I7fchhhy30nfKPggZyn3z/aGeOte+UYeuxe5zx24k6xpX2+uxkjpJf5PKbE9RJVDMqB/h8xwDiYwz0wDrK++jHtz/5WHJYNHsaxMu+iHD6MWACXyR6OYSsORxmHuVGsyiHm8vyE88eISRXlz8tBzxaPQ29v3Q98s8/xd/q80J45bFjbqgslnIpV14HPMf5Bv+XqA/Dn4imnHL/Ym9eryU/mTnnlmI+uyetpDK45U5Jo3eS6VOJPcysiuXOMfaq8WeNK9jLXWA/xd27teFR84Ezt9MZdxfcl/jC2F9xaB4E1kgfJnp728HxU6ik0Vq3aVxsbvdinPoednu9zGFmsOu/5UuexbcC3psdh/2mNwp41eQS/eXVhbR8BvKXzzBPE3tGxZ6teBzgtTi3RmuLhYxu2Ui9OlRc9C/W8hh1b99tRjF6Phl7SqlHvxGj12YxzL1ysXDMuRl/COG8O3r2UawbXf+SSx21tv7dUS73H0P3Ph73zArxF7uOIMytOvdjckrcaHiyfb82h8rZkfb0nI2/W8mjdcZbUfcvXtXcP1AGvt0fML30HUoxL7h6e8LuMdf/Wfby3AsUYsdV6J1LJ+TTFFmqb9oY6T7koxUqJO+3Vc3ljidYT7Wdq7kceb5ZPczFvnSHW+2eUQ2+fSC5obGC89e5lSU0d5XP+lOFNY8/aC3OxrtUDRrjzsEbrEnOf4xpr8tkdvb+t1Zr3e/D5rj6Q8W15n/gFHA1pxA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2N0KgCAMBWBvzOj936Cf50wvhIIEJ7Id2vnAy3TVttIQyIuYR7IOwoHVOoBOrVxYVKPwCy1PWvnAnoHlT+9jnzzfMXk+ktnyuIzW7q0Lq/r5WvdUj0Kmxly/VVF4HSr2CaK3UuPodUtEvj33DKj9SusfuNy/5nkN6vMeZbVXIQw3NBYFyA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G8.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="322.639" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I8.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23H9.tmx
deleted file mode 100644
index e1ead967291..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23H9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFuOwjAM5LM9GA9xUdh2b7Wl22NsIhh1sOzEKUZiLUVFqLUn9viRHPrd7hC0TmllOQfqjFzHf4LvJz2/u/faGro2G/n9W3pe0vOru2Mc03N6A1bYgg2skp3TA9uSnnNa1+6+gHXq6zq8C7ay/t/+bgNxs2zk2O4NXRDgj/Adc3wmjBr/8Y2Gj7+N4CXHybKzV7CV8hZ586r/mHfaPoGReQls7J+hW3NjdOBv8R1Ei5V8R5OM8Wa88yo+jiHrGh6+mPq1hnDuoKbUJIJ/XGNlDC8PTIvY00Lf4T0Ld4QPr4reErcHsYeFcEfXF2nPs2/mhYyhh9NbsIFjntql+c+DfSv/2IZHv5VXktMR/Mu6pA7EqMSf0mzF+LhGtvpS622Mj3N6EnY471GLYJ/9i3esftgSWy1+LLBj1WSrz0hfevGdFN9peRgpLT489mt8EDvZQz3i7SdZWvJF5qqFCbWnVMePlf1ovagVo6XXqm9Z9uJ/zZev9hELo6XXqj9zv/a60nwbhdHiMmJZ4rpWA7fgkrMUS20+LtmNmhNkHWH+aPjkLKGdTaw5u9Vv0MPzJ89Imt4St+TcwDNta+9gv0kfMAatPkrfjMpeOZ6yznp8Z+li/BzrUn1kqZ05PX6U/d+aoeQ87BErp4DRw0XeTy23an1BimafeeHNZc/dmDb3t/qwlu81H1oxlnov3fPdTM2Ho5JLrXWQuSXvrqwzpsZHOT9oe9lSo2vct2ZXaZs5N/fPZxng3tI/8L3cc6nuaHkTdc4t4VyU394a8Kn3z59+fw98EfcEWH/7lFex
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23G9.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I1.tmx
deleted file mode 100644
index 84e347ea32c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WFtuwjAQzB/4YIGKizalvVVKwzHKCkZMp7t+EbAUCRzHO/uY8Sa7NAy7la63y2XjsOKe3nXcDsPX9u//T5nT9Xb/9CJ8Foc5XW2yXcx9pzvWI93HeDa+vdjzBrAqtvfL3PnJuWWbG8Gl/3W8IrcWg49tHgfW6NpafKjZXF1710+65gdcVDyMQ9fW5Fa51Btzs434LDccNme/J8LB9TAGeIxP4JRX23Nqi6HGslQPGKODS+MUcc/zbY0LcUYcECee15rA/Ebu9XDZ7GkNq36zTa5BjhXPK/YeTVKdmQmn5VRzyRoO7Ht5nn1q4VQJG4/5VlNsT7nuabfigI71aLnaizQZNaP5nW6XzeFZrk3438uJmvONfYc9wzIGfrJOYb4Xn8UD/kdnySjrseYgmL3cYn2v7vE+51THN8QcNu2ZJd1j5tXQmr2EcpFrSc8F3M+drYbvkV4C2udpBeMAl3N85/ONz5XW/OLs5nMJ+0f2vRHx3fOjJYaqK5HtUv9V05/BhxYO1+CDz8xxxXYO6kHXRdzJ8TXyG/tNgVZgjDKvsYR+9/IWfvM5UNovOks9fXpU82CrZR/4lKsl9rs3djnNZ81h3WHbOZ9q1rTwQ3kfYddex3tOexnVxB5+RP2d7h/1UF5/743WeHp5iHQH3ISWHcTXJf3v5T3t7tXo0ZmDDcSqxE3mRaQ3tXyJaokx6L0Sp+zZiXyBdvfoYPQ+o/ci7LV5Ak7tQXJx01rWXGk9MZZIO7zvcvxdw3unKvGWh2fvlPL6kvsu533vqqnB0vsaMHItRXnvGaX4lWzk6krzzjHhdxj0Fl6eSvEr4avp0fRdjb8V6HtvC7Zc/dU+38JjjUXt+eFhbO01ar7fq50WG6glrw9twVeqB/CsxsYvrnZUZg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEEOgCAMBLko6v9/oKLP9GRCDJaAFFrcOaEBWpMyNhgDgEwWbzxF5o6ciShmbZ0AMHvgnZZ6jZ07blzj+D0wMO+vwTGt6xgAjVD+3aplESfVcXOhuKXcx+Eny7AnANo5M9ZI6ddzz/Ttam4nSOjX376R+kfAlaAUX1xxPJ6puqxdsy4hZm4/Y721oXuTvyCpt+6ZC15MCbA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="320.672" y="637.409">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J1.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I10.tmx
deleted file mode 100644
index 9997d68d5c4..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I10.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJytWEFuwzAM67F52NouHx2W7Vdb0zxjLTABBEdKilcBPtR1ZFqmaNmn6XA4Pald7u1h8xN9qrYcD4cPaJ/HvN/hW8w49qPGZGOvv/OEfU15P383E143Ds3F/CLGvt193EQ//vd+1P/jXKsZFz7Qj8O3Tn+/2+C/GzX3H+J4xCv2axVjEEuHs9WYpcETjpXydRbzjOBjTiJfmEuI+VKMY35ifLcGvtgX5mTFOc6HyvbqD/qd6fcDW8U5hS9bE8fWcSb2MuIeWHCelx284HW6/NgTT+WTefQNDdfK+DBH1JwxnmO7F1+sWa1X5R7qSZaPLt74fQcf51alXWrODF/gqeJdaQKeu6wN2Odiwn4Unkr/WFfR1LnrcnUT/Wpf3B5nHHS6gcZnH3J9I18On9qHkZqM8Sp9z/zynnT0Jzs/WA87tVlV61W6NVLDMufDOmep45Xj5p4zJNpZYKuswuf0CO116sUz8GH9iIb9yMuIu4oV1yrBS/bV4Z/zWflQXFS11Gi+7vlW1aqsyUov/4vPnRHZ3Qk1QhlrI6+lkxOKu9vkcxnN8SDjg8vhbg3ozimXG8/Qr2q/Ky1Q+9TV8cVwY6QGdPgyfUbrjsO5Ru+X3bvOiMV+ZDrU1S9111dcrN4JsvuU4g+20Ad1v+zepTv5O1L7qW9Xw1v33lNpQ4x5Fj6no46TnTeFuTlHF5+K4Z6cUTEKDmzJHCM5rO7aqr6p8GV6XZ35Ma57l1V5kdX0lTZ27+jo62p8V3dpfrPJ3jJ5fAdfZQ6vizdi3PN26rQL19vR4u7bAdfxqq/TEK+KO6+Hax715sW56/q4/QBw12Em
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H10.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J10.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I2.tmx
deleted file mode 100644
index 7dd6a7a893b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I2.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzlWFFuwzAIzd+Sg62tetFmzW7VLukxFktDeyXYgE2zj0WyIiUEHvCMCYeh6w5B67SudJ0DdUau4w++23r/7Pe3f11tTn3eNuG7rO8ff4DtqxCf3HvNp+jc0ZUw3AHHKfMeMb8KJ8bmrdvimIT3KcfL+mxc7x/9FnckVuTV2G9t8ovzbx5+seK3UfuIcof6ZrCXbCPed2MuIjCivtK+nAFjCR/FkmRb9roVG+3RJGuxd3XIWvJaionVB5KlPR1RIzFnuTMLfdC4hDWqxAHPIp05fOiDFhPyJep8sfKEfNBiYpXzxk7TRzHU8muVsy6p7mmy1hi29mCefWnFhzpbc2ypLd5Ye/Z6zj/ej1j3GnGr5A/KeDFS7Hlf5OGJpX/mGK36ef/m9ZGf+yW7Xu5IfuFl8RFtvqpOSxhr+FfyB+NcU2OSHex/rPHX/k8kDrTUGGu9leKXi7n0j1JzjtTmQKuBnKNjZZ9QU0ct+/dYobc2V1pspG9Q7978s/aerWcc99Wqw5I7zgEvvyVfa+pf7hs+g4j4d/PMJTROcHwt/ONczs2E8JnWe0oznJY+mtfTM8NG8cWZAnIW8Uvca+WfFMOpf+6/cs9vg9yvRfGPY7ywmRDOirR5kYQryUfNgRPGx/A8E+J+8/q8ZPyinJLOCHxWHzh2ya9lZ1z/fX0DX5dN7Q==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I3.tmx
deleted file mode 100644
index 41d8ee47d1f..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I3.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGsOgkAMhPnJJl5LMJzEm/m8FYgcQxpoLGXdCHRhTGzSoJKYL9PHDmQuSTKjPLRJURj+p2XmPd8egCWkHyLfNU2SR89Xttd7uj2Tj43i1H5vALg46zYv6ZuP9LulXSLoqPWTsfUsh9gQ6swzq7nOAGy+3kOoaYgRoaY6kXcfpe7Bf32HtZO79qp2Lt/n+hb9b9VKdWZPwr1FHHw+VG68+0o37MVbRNbQ7p0azGrJmRuxccje1H0yJ31nw5LQfSF9BOVxt01tv40pfNbafQqq+dN1OYWvduNzNQaX3JXEt7WGPq65GUND62cnS8YYZ9/SOWavGsuvLtVvDb9Fc0I6SI9Cn08ebnmPr7H9DGnY9Feuk/xNeyt5D8FL8zmN6J3l/CA+e8j6Ir4X+qX6MiP5J5R3LyEPi1Dv2nXnvW+HIz1naq+DNsu10BBJN5+G6HyWc/ECC0XmlA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2MsKgCAQhWE33d7/EbLoMaNFEEZmInOs/m8nMnhQZETnAFgY1AE+oFcHuDCqA+DXOnUAoAJzRk1bPMWZd++/o8f8k/Hasb7fRObCPT+OLc49Ra1vGoW7OxLO+8Q6C9s5qnMs4vUBAM/s/wc571dL6v4GlLQCLdIFqA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="638.393">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J3.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="541.994" y="322.639">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I4.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I4.tmx
deleted file mode 100644
index 7589323a1d7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I4.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNmOFywiAQhPOv4cFinbxo29i30qqP0dy0O7muCwkWBWYYFTPky97dQtiFrtsV6vu5WxsLzlmiT33XHeb+1SDf5LjQWuI7z/1jZnxxfMfwo+dp/vzs6zMi71Q7NsCY4nub2a5P5rGc85ogxr4h3jX0M73svj6/XsOiF1jt+3sF/fbhNnbGh9+mZw0u9jnUKcagaa26RQw5x1Sr4YEWN66DWBsq8HlGXwc1PIU9hBmvQa8dKbapL5ef8JADca55H8fVX+/z9z++yGv+ILhjjPyfXT+6777dw+jZLFaXsMRrIm/xc3ttRroe16r6yqlz1g3zIkbsL6wr55/XaxBjW+oI/mo5y/s4MNr4IOLDOjGzyre9GEvxbW1HwY/1gjWPPa+aYy2+l9++1XdLthyfVLnr50nx854l5t88lrsGKkY8I9dG7P8xLP5tueZ5r+HWi3K9OuZRPM7eAxYfL3Cew9/x3BpOaaiem2PjfW5ND+VhvEZtYUTdqOcGM9ZTVafqfupd9B4N17j9njnWFGPsPar0Owrvo1Veqv09csTXjIpTKR2Vj6zdJ1Yzj+i4h/eWR97v3li3eC4ENs7zVs5cYl4BzlxPK91T3oI6fvb7eQ5f7XOrc1jf09TUD4zwYrVm12RL6dmaz6C3en7PfCXPXr4BKdIuhQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.16667" y="320.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I3.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H4.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="321.655" y="639.376">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J4.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I5.tmx
deleted file mode 100644
index 72ddf0fb508..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I5.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJy9WNluwkAQ45F8WADxo9DQvyq0fEazKhbG9eyRg5FGQNjD4zl2Nrtus9mNOmw3m+v4+bl9/r48FM9Kehg1ybFibKti7a/uD9Pt8RvPchhhy20lfIPggZzG5x/bJ8Zr98oxdN+9zrmvxJ1iS/t8d0+MkF7m85gS11NUMSgH+j9igHEwh2tgPMj66se0P/tbcTgbIoxDY97Vcng3sQAukz0cwy4OBxmHubVYlUPM5fkJ54+JSRXlL8rByJaIw2hv3Q98s8/xPX2eac8cNqzt6kIJp2LVdeBzjL/Ts1x9AP5cPOWU4xd783ot+cncKa8c87Vr8noag3POlCRaN7kulfjT3KqR3DnGPlXe3LiSvcw11kP8nbY+HhUfOFM7o3EX8X2JP4ztBbfWQWCtyYNkT097RD4q9RQaq672tcZGL/apz2Fn5PscRhZX5yNf6jy2Dfjm9DjsP61R2LMlj+C3qC7M7SOAt3SeRYLY2wf2LNXrAKfj1InWlAgf27CURnGqvOhZqOc17Fi6367FGPVo6CVdjXonRtdnM861cLFyzTibvoRxXgO8aynXDK7/yKWI29Z+b6qWeo9D9z8f1s4L8FZzH0ecuTiNYnNJ3lp4cD6fw+FgbFPepqyv92TkTQuPiPvePGOZUvedr1vvHnyOoybo3TbtMfU9kGKccveIhN/LuPt3FBOuRud6cafuPZFKzqcptphz7sN0nnJRipUSd9qr5/LGidYT7Wda7kcRb86nuZh3Z4h7/1nLYbRPTS5obGC8e+/lpKWO8jl/zPCmsef2wlys63rAGu4irLV1ibnPcY01+eyuvb/N1Zb39+DzXX0g41vyPvELLjdrTg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2N0KgCAMBWBvzOj936Cf50wvhIIEJ7Id2vnAy3TVttIQyIuYR7IOwoHVOoBOrVxYVKPwCy1PWvnAnoHlT+9jnzzfMXk+ktnyuIzW7q0Lq/r5WvdUj0Kmxly/VVF4HSr2CaK3UuPodUtEvj33DKj9SusfuNy/5nkN6vMeZbVXIQw3NBYFyA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H5.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="319.688" y="636.425">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I6.tmx
deleted file mode 100644
index 8f36f8f235c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I6.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFuOwjAM5LM9GA9x0bLt3mpLt8fYRDBisGzHKUFiLUVFqLUn9viRHPrd7tBondLKcm6os+U6/hN8P+n53b3X1tjV2cjvX9NzSM+v7oZxSs/5DVhhCzawPDunO7Y1PZe0Lt1tAevcl3VEF2xl/b/9zQbiZtnIsd0buiDA38J3zPGFMGr8xzcaPv62BS85TpadvYLNy1vkzav+Y95p+wRG5iWwsX/G7pEbUwB/je8gWqzkO5pkjFfjnVfxcQxZ13j3xdw/agjnDmpKSVrwj2usjOFwx7SKPa30Hd6zcLfw4UXR63F7FHtYCXfr+iLtRfbNvJAxjHB6CzZwLFK7NP9FsG/lH9uI6LfySnK6Bf+yLqkDMfL4481WjI9rZK0vtd7G+DinZ2GH8x61CPbZv3jH6ocR3nm9jQV2rJps9Rnpywi+0mxe6htbJepD+AjxQexkD41ItJ9kqckXyWMLE2qPV8ePhf1ovSjiQ82mZt/i5l78r/ny1T5i5YOl16o/S//odd582wqjxWXE0uO6VgO34JKzFEtpPvbstpoTZB1h/mj45CyhnU2sObvWb9DD8yfPSJpej1tybuCZtnaWYb9JHzAGrT5K30zKXjmemQ+sJ+I7Sxfj51h79ZGldOaM+FH2f2uGkvNwRKycAsYIF3k/pdwq9QUpmn3mRTSXI3dj2txf68NSvpd8aMVY6h2657uZkg8nJZdq6yBzS95dWWdMjY9yftD2sqVGl7hvza7SNnNu6Z/PMsC9pX/ge7lnr+5oedPqnOvhXJXf0RrwqffPn35/D3wt7gmw/gD1kVh1
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="319.333" y="638.667">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.688" y="21.6404">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H6.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I7.tmx
deleted file mode 100644
index 47b72c2e4a3..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I7.tmx
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="74">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl31uwjAMxfmzOdjotIvSld2KUjgGiTQrTw83aRLzJTWSRSmb+7NjP6d7t9vtjezbW1g/hj4t7VP4Tv7zr3s9D9roec7/fAd/fX0DJi13YX29AQ/b7O23i/t77J6zxyM8h6+ZoYccPqNPpKYkH3I9uVhr8j1w4h4LnxbHI2oqt07ArN2z7mnsR+nJi/8+dLHODnC9NobJiLMnNtSL0AuB9epiXwg/8oZ7g3Lfoi6RL+dvdpFf2C/uPiZhbOV7lNZKzC21yHVnqRGYw1oN1zTCig9jr/WLMVrPUasZKHVSGmNOizH22hrEPdBiFAbWMfw/0TmNtSWH3Bsco/a7sPLswL+ZnD4DS/eH5zvGyGyyNF1eWjwD1/KNiRzweYDZUJdL595avuB7SPjkHMnc4t4WPzL3cnktPSdqnJwjnlu1seN5o1TDLHQg5TOsFv3L9XGt9UY+OVarOcKzs4VRYl1ik54vrW+uw9oZFfY3lTfMRUkeWs8fa/Rd02qcaamcps7lFjWssYlWoN5p2mZxtuQakeccYd+ZbekcjzHymbxUR3N1vPT+oz1DY7R+X8BnaDMkp/uzu38XrZkVOcaWfbDysdlmm32m3QDdTkHI
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1ksOQDAUBVATamKBNmMzvjtkaEIiIvXaeh/NPROJeHVLf0UBkA+nHQBEVNoBPGrBd02RdZgn9uEf5atnbLtkbPvvVu0AH0hZF6i148O9657bNQkhPNrj+jaGqf2I3R8pONdnyTNEiFk7gDCucQ55szp/T0NCrQuov38HK2da6/N6ITyzsacAAMjXDsU/CYo=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="321.655" y="16.7221">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H7.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/treasure.tx" x="238.5" y="444.5"/>
-  <object id="63" template="../obj/gold.tx" x="256" y="443"/>
-  <object id="64" template="../obj/treasure.tx" x="223" y="298.5"/>
-  <object id="65" template="../obj/gold.tx" x="208" y="298.5"/>
-  <object id="66" template="../obj/gold.tx" x="22.5" y="344.25"/>
-  <object id="67" template="../obj/treasure.tx" x="515.75" y="364"/>
-  <object id="68" template="../obj/enemy.tx" x="494.75" y="359">
-   <properties>
-    <property name="enemy" value="Ghost"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="39.75" y="345.5">
-   <properties>
-    <property name="enemy" value="Big Zombie"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="176.333" y="505.667">
-   <properties>
-    <property name="enemy" value="Vampire Lord"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="293.667" y="474">
-   <properties>
-    <property name="enemy" value="Lich"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="141.333" y="346.333">
-   <properties>
-    <property name="enemy" value="Geist"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="285.333" y="312.667">
-   <properties>
-    <property name="enemy" value="Death Knight"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I8.tmx
deleted file mode 100644
index aa50165e63c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztlmEOgjAMRvdzSziC1xGMJ/FmKnordHIM18AXlmUgkS7WpE1ewsICb11XqJ0xNROHAMWR8ZkctNaYW+Ap0K+NvCjOYdwL8AI+cLWTn6TcAdSdVD/kUNreAtTgXoDLnBuFRL+49iT6eTed3y5cPwJ3+3uvOUeJZySuwU5g/uIalNgD4/2lkLy/3Gd4V20jzR/33nL4EY37Dz/0wE99kGpizTnn8Ev/ARHkSv+tsW87jmk+7oNTVcavybjlonP5dSBK+aX9hb4h8XgpaO7LDZTygyPe06/IKbziXkl+qSOXXwpyilzC52IH1vbwrX5L+DE/3n3/TSnpJ6H/qZ9sv5JrUz/1Uz/1Uz/1U788b4yv1NM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1DEKgEAMBMA0Gv//B+WeqcWViiLEs5iBsE2KbZIIuJfHTKNLAECBHF0Afm57uDeXtjh3db+t5/JVkRfWnhn+EAAAVNkB49YCKg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H8.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23I9.tmx
deleted file mode 100644
index 2726e82cfe9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23I9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmFEKgzAQRPNpDlYrXlSrvVWt9RjNgsE0qMQ4mw3YgYH2Q3lONu6aUitVglwZk2rgPRHuCqV643eGfJ3DRWrM/ykDLuvR+FEsfDllZ23rjnTLgGcvw5f5/Szkmayp/ga91GBu9Xd31jan/PzccmL03ylrIsZBgDOETSrLo2ypGasItpSMZ/hInL0ldm25M/Rnk7NCM476t/9LMlJW/nWIdV1T6BzRz33A9oLa4drqDwiFZrh2HSeXq5D9/JmNrjEUH+c+2BLNYJTJ0TlsTJAlYj70ZzqkED2Ekw/xfcJVi6jZX/qdLMFGQtTe2RlqT1eoPQQjsbTFcg+Ob+KYd4zlmpznjOkTXBmmPns5wih1rhGynyXPXGyGjVfvVFetV29SJsZJ89b739f0F87Tnhs=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt11sOQDAQBdD+UOx/B6IsUyQkE6m2yDzKPT9EGnNNJopzAHmNdgAAeKTTDvAxXjsA0UeuWcp3ZdIOsKuhV7Wy3tuwHweF2tv3VKo/I0PNluGe1PE8b+qUzIw/naf2N+szKGXWDsDI0vcN/U+yNHuxLNL5Svd86Vx364X8EnZ05pfMWql+cuxZf2PpnRFjPR8AQKkV8nwF+A==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1" y="319.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_down.tx" x="320.672" y="17.7058">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23H9.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J1.tmx
deleted file mode 100644
index ff720db0d36..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J1.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmGFOhDAQhftPmngtVsJJvJnKeqtF5Bh2Yl4YH1OwbLH9YZNmd0tDP97MvHa5eOcumXoXurQ+4z1z9KFx7hr6R4V8g+JCq4lvCv0tMD4ovpv/1nMMn+9NeUbkndVuFTBu8b0EtvmPeSTntCaIsW6Idwn9RC9ZV+fXk1/0Aqt8fy2gX+fXsRM+/BY9S3Cxz6FOMQZNS9UtYsg5ZrUSHihx4zqItbYAn2bUdVDCU9hDmHH29t6xxTY0+fITHnIlzj3v47jq+Tp/7/FF3vNbgzvGyNdkfq++63aEUbNJrD79Eq+BvEXfW2vT03zMteorpc5ZN9wXMWJ/YV05/7RerTGWUkfWOQ6MMt4a8WGdmNnKt47GRr94/PNjnI+1iXHy2OjXmuPsZ823NEC7h++MhvxG3+KzclffZ2vf4DNLzL95jGtD+FIZkcMxffl67xf/llzTvLNfe1GqV8c8isfZe8Ci6xGck/85frSGLQ2t5+bYaJ/b08PyMN6jfsOInLWeG8zYT606tdaLeViu88REzFs1bzHG/kfl/o/C52grL63zPXJE14wVp1w6Wj6yt06sZs7oWEN7y5nrHY11je+FwMZ5Xss7l5hXgDPV03L3vfNEifcuKXyl31tNfv9MU1I/MMKLz/TbXKy1Mf13574AfwAx2Q==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt180KgCAQBOC99EPv/wZZ9JgRkielFdLZlfmOEjIEq6MIkc6CDjCAVeJ/nNBBiKgoSJxVL050ADLhQgdQOKRtl9ga7j0CLz1uzqzVZn++33/Ypxb67vB6HwR0AEp6v1FqZrLnfL25cucREdlW6gDWoDuDlpf+SPTlBoQfBb0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J2.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I1.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J10.tmx
deleted file mode 100644
index 8d303321704..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J10.tmx
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztlm0KgzAMhv3ZHmw6vKib7lY69RhrsMGYlaK21fxo4KVqQR7yXeqiKCPpaQRWR/xnTFWW7yGAxec/iXytKoqv5evN+VH3M7nYwBrzPgvgQo1Gb7Xygf86tUiCH7n/qN1dyz42CXHGmuVcLwFsrtyTEFMfo4SYcknufSCegzm+29jRXtuynov3GN/afhsuijPuJJhbwIHzYdD/va/X21zsErL6eu9RA9bYnFUkNrTQ3OS55ZoNIUbjvXd36Ej+Y24N2p1bsW1PH7rT9uzZk15mOYjP0dR2tI+PesvYRGaG/0161ZlaGYlP58g1nGLucZ+etVRzL7RHp95VQ/13xb4FfZrWCj43Dm56h2fqfQZ8ONsTY0W/8d2K3knYpYHjbL/IysrKyspKoR9ax+R+
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgCAQhWE3ZW07RBfPovt1gYg2YaRR4bP6v60O83AQNQZACrU6wAdU6gAHOnUA/JpVBwAyMFyoKR9PsefM++/oNn+fuHfo3S8Ca/6Z352BjfS7Ioc/TduoE6xi85m8De5kXQrLHNU5RnF/AACA3M0gPQWJ
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.66667" y="336.333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J9.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="319.333" y="19.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I10.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/treasure.tx" x="488.333" y="322"/>
-  <object id="63" template="../obj/treasure.tx" x="489" y="354.167"/>
-  <object id="64" template="../obj/gold.tx" x="488.167" y="334.5"/>
-  <object id="65" template="../obj/enemy.tx" x="367.5" y="388.5">
-   <properties>
-    <property name="enemy" value="Green Wiz1"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="431.75" y="313.333">
-   <properties>
-    <property name="enemy" value="Green Beast"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="431.583" y="329.75">
-   <properties>
-    <property name="enemy" value="Troll"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="431.167" y="346.417">
-   <properties>
-    <property name="enemy" value="Red Beast"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="432.167" y="362.5">
-   <properties>
-    <property name="enemy" value="Giant Spider"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J2.tmx
deleted file mode 100644
index 1d9b3f53cd5..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J2.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWFtuwjAQzCeReq3QipP0ZlDaWzV9HKOJYMR0tC8bKmrJQiSxPTM7u3ayHYdhu/TjZhjm5fdtc/n/eu64ds/+tPS1vY8nTB/n/7gWYQSXefwbPkfBg7Zfrr9sLhjn8bfGGKst49OrnWL7Xq5/jheMaFPCa227G+qnGIDNuw8tPWy3xqcaYn2O0eN4wv01nrpq2hLjY0feVTSMNNWm44GLdUcuVrGqhhjrjbd86+kXedXi4mnoxc6Klz6PfF9/D7RmhM2bu4JTsVq+5OeR76qF6gz8PHdLPrF/sTbP18KXtVNd4eFqfHU+9WDPnsJjJuO5tS5UtNPcqrRoXo6p6qZaVOLB9QLzwX9e3VN8vA8zT++51njg+Ulwa90D1koerHx4P/RilHmQ9avUvoo3JuEX1cuKBxkjN6vOe7HUccztWnwaP61RWLMlj7DutTVaz8+KNzsPeA3ee0z4eP6bR3vP9nBamnrrcU3J8Fm1ceuMacklr+leiDF7g1+0nqWJp2ErRu+MxmdJrdvPD369Z26VPTHDGHmlut/qGH6Ps/LF4gU+B+Ncwjhv8X7HPs405JrB9SvL+Sr3aD3ME80BLh4P9UzkzUq36rtV13V/92o/PGP5tJKDGT6PY4sHopi3aqg8tWaqbj0xYm6cNxUd1X+74J6Fv0eD1hhY70N6loTne78RWOv06Gc1/i7jceZvc14OKMYK1+h8Vompd0619FEtMq9k2ulZvXW81hM9z2QxtnyrukUxrWjPOC0umYZeblVyIeOHubx9ryWHeZ/fJbrpWO/7G69vcemtVa3118JqvZvz3m3dv3dHnP4brtb+AwnlX+Q=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmEkOgCAMRd3gdP8bOB5TuyAaIwGE0kr7Epe0H/wFStMoUjDn1yWMH3MJEUjKumPh0tQWVeFnoxaARE8t4IHLDxy9K5ma/seUOd6cOV4Iei5ewFqsRLlD64Kqft7yLh/i7KlCIrCa7VllIsdxhWKfUP4Bd+9iATUuZe619hQlkOIRhSf3noGrF3PdgX39Ecy/5HsN5BsK5sOGqldReHAAlL8Iiw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.16667" y="335.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J1.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/enemy.tx" x="215.5" y="90">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/enemy.tx" x="518.667" y="202">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/enemy.tx" x="445.333" y="567.333">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/treasure.tx" x="297" y="560.667"/>
-  <object id="67" template="../obj/treasure.tx" x="366.667" y="524"/>
-  <object id="68" template="../obj/treasure.tx" x="344" y="83.3333"/>
-  <object id="69" template="../obj/gold.tx" x="329.667" y="152.333"/>
-  <object id="70" template="../obj/gold.tx" x="516.333" y="284.333"/>
-  <object id="71" template="../obj/gold.tx" x="463" y="263"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J3.tmx
deleted file mode 100644
index 9a60d615213..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J3.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWFuOwjAM5LM5GA9x0bJlb7UFeoxtRC2Gke04bfhYaSNFu0KJPbbHj/SQdrtDo32ad17nhjJb7uMfwfcz//3uPqtr6Op05PO3BZ9gvM6/jR/AKrpEh2xPzwmw9fO5y7K/uqecMZVlRHfWJToe6akDfaLpkNjme5ODe9qITXyHHL8DRo3/ckfTj3db8PIU0LM3eLc3ZFq+3cI7zU7BiLzknMj3hu6VG3hma91Brli+wDPayhhvxpmt+DCGKGtYfDGmF88wd/runZ8e9q38wxrLMewXTBPZNME9OWfhbuHDiyLX4/ZANkyAu3V9YX0Ru5EXHMMIp9dgE45Fapfmvwj2tfxDHRH5Vl4xp1vwL8tiGRIjjz/ebIX4sEbW+lLrbYgPc3okPZj3UotEP/pXzmQ9NXyM9lBcoseqyVafYV9G4+rxo9Q31q4oRvGRxEdixz00sqL9RM5GayLz2MLE86em71iwR+tFER9qOj17mZt7+l3z5dY+YuWDJdeqP/f06nXefNsKY2n+9OqFVgPX4OJZCpdld+Rd2WpO4DqC/NHw8SyhvU2sObvWbyIH50+ckTS5Hrd4bsCZtnaWQb+xDxCDVh+1dznbivHMfEA5Ed9ZshA/xtqrj7g0P6G9ET9y/7dmKJ6HI8vKKcEY4SLaU8qtUl/gpelHXkRzOfJtTJv7a31YyveSD60Ys9y+e/82U/LhVcml2jqI3OJvV9YbU+Mjzw+aLWtqdIn71uzKupFz9/T+lhHca/qH3Gebvbqj5U2rd66Hc1L+L915pPqZ7n9/dv8CtqFbSw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt10sKwCAMRVEn/dD976C/bXZUcCJNxeQVe89IBMkbSKIpAVAbg+pMlefmpin6cwTWWgNrKS3ZuvbetvSFDAAQzTrfNtcUz4bCfp5f0cfVsyPqffnWrg4A4Pfu/uz5tyrNJovI/6XFqQ7gSDmrLbXVbyygFxfJKwbT
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="320" y="18">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I3.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J4.tmx
deleted file mode 100644
index 62c25ab3e47..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J4.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztV+1uwjAM5GfyYIOJF20HeyvKx2MskWbldrjNl2FMaySLUIhz59i+dOs3m62RvQeLY2/o09L+Cr5T+Px0v48H7RDwnL/xDWF+ewFMWuzieHsBPGyXYB8une/RPeeMD7APzxnDDmL4jDqRnJJ4yHzyKdfke8SJZyz4NB6PyKncOAFm7Zl1TWM9Sk1ew/fRpTwbYF7KYTLCuSNs2C9iLUSsN5/qQvAj3vhsVJ5b5CXiy/m7+IRfsF/9PSfB2IvvUb1WOPfkIuedZY/AGLb2cK1HWOFD7q1+kaO1jlppoORJLcdcL0butTkYfcfedIQz0DgKBuljonl4dtLnNKytMWTtZI6CC2tH9EHTDvzP5HUNLI0h16zmf+73mqHxKMmhGp3lMacbpbpXcsYxb8cKn6hbN/IxuqR7jFsbNTWYwzm4e91q9dniS+sD6K+nF7LPnv6n1Yv1naNHg5mrlY5wHfZgFK5z2LCfl+6h5U2rRsXzXYob99lSrL33D1w/tzbXz5dwLt3La/GxvrHO4j58bhpOi7sl5wi/W2px2/uf93pez7x6et9cHmtjbh+No/X7Au6BGivzHP+4nt9FRyNsuAdrbK1/9rHaaqv9H/sC6bAyxA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1kkKgDAMQNFutOL9b+B4TFcFEdF0Skr5bykkxrYxdQ7oh7cuACpG6wI+TIrv2hPj6JP2sUf9WirmHirmhr2c/4I0dnt5pjFzwzz7O8PS70idjxL3GkrPfM07RIyjcL65cD6gBa32b7BmxPqI+Oc6cKeVOa0LAIDOXQlDBlk=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="61" template="../obj/door_down.tx" x="322" y="17">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I4.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J6.tmx
deleted file mode 100644
index 97c6f4f2b08..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J6.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmH0OwiAMxfcnJF7LuXgSb7Y5vZVzcgxplIBkHzIeUBNf8pJNk+W3UtqyWlZVDXKjTToCn4lwL6rqon1nyNc7XKRW3ysGXMaj9llYPk6xMzZ5R9oz4FmK4U1fX0V5JmPKv0HaHOSWfwdnbTnFz48bJ0a/pkyJGIcCnN+wlYplKFtuxmYDW07GGD5Syt6ydW1Tx9CfTWKFZhzlZ/9HMaJqD2Jd5xQzSyz1B5Qojhdhfdrx4JrTGl/KtZwSzTqd9kO+vMYXW99CuIjHn8OIb4lxfL8Her/6bLHzoT/TIYXoISn5EOeTFDWZhJr9U+1jROxS1hhE7qWsMZxzj4SaXWIZTV/wn4E8G2+pMYZLOe9J9b6b6Re5Y5j720soY4lzeeh+LhXD1sl3c+3vg1LfhohRSZvvyvnN/N8VYvv7t/0EBAOeOw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmN0KgCAMRr3p9/3fILIeMwQFL0ytdPsWOzdGDD2N4UxjFKXMwC2gKMorZm6BnzFxC0QsiXdIfnfs3AIeCbmSCnpurR9XhrXdeSqXn41KpCHhe8YGc9TGuOdcf0OvQSoOboGOIJ1v4v8kpNpLuVD71fZ8aq+n69lySHfimj8LsVT5lNiz0EDaM1Kg+0lF79e+gbAnK/K4ACXKBp0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_down.tx" x="322" y="16">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23I6.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_left.tx" x="544" y="321">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J7.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J7.tmx
deleted file mode 100644
index c577e772067..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J7.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWEFuwzAMy7EG9q11XV6yn21L96u2aZ6xBoMAQiElOdtlAnyI48i0TNFyjm0Yjv+sTYdhOEP7OsT9mR8/zvuJfLGxt0c/2qXF/dau7afZXKfGx3k/q41ijScy9v3h40768d3ngb/HuWYxznygH4VvbtvvFnh3d029QxwXiOFMxiAWi4/CVxkzFXjiY8V8vZB59uDznES+eC4h5lMy7kawWHyXAj7bF8/JjHNj2+KLLIpVliOje16xZZxj+KI1+dhGOjVB3A0LzvPcwQu/TpUfPfFkPj2Prm2rbQwf5gib08b72PbiszWz9bLcQz2J8lHFG7+v4PO5lWkXmzPCZ3iyeGeagOeu1wbsUzHxfhieTP+8rqKxc1fl6kL62b6oPY44qHQDzZ99yPXF+VL42D5U8GV4mb5Hfv2eVPQnOj+8HlZqM3UmsrMuwpc1rNtUbVY5SxWvFDeZz7enLb7fWoZP6REzho/lBdaPaNiPvDTes1j5WoXNYY3hyzg/N50jERdZLZXl1YovwljJdVarek1metkzh5qXnRHR3Qk1gpnXRr+W7P7Hvlttadvzi5niQcQHlcPVGlCdUyo39u5RtNYK79T5yngYxWAS3NhTAyp8kT6jVcfhXHvvl9W7zh6z/Yh0qKpf7K7PuJj9J4juU4w/2Ewf2P2yepeu5O+e2o99Owveqv89mTbYmL/Cp3RUcbLyT2EszlHFx2LYkzMsRsaBJZhjTw6zuzarbzJ8kV5nZ76Nq95lo7z4IHVWpo3VOzr6ugnfPec67qGyTF96tbgXL2Ls+Xeq9gjXW9Hiqj68ti2/fV91T6Iaxa+nUsf43FV9vn0DBoFoZw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmE0SgCAIRt1U1v1v0O8xy61jCYhKyptp0QjGMPCFGqOUZkLYLh9r9nkG4D5bZB26Dyb2FJ9WkZ6Lo/D3sPmI1TGV2XvP1Q8j0l7hYa0dQASqLuTqBx9L9JOidy4OirbtwL0VhZu33k6tN+laqNSHqvc94P4jLWs+pz70VkfU81PovOFq7Iz4jQZXiyHbC+GvyKZEv/19foDM9DXROwWZOG33c805B7Q8U0jlBn/VC9k=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.66667" y="320.833">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J8.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J8.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J8.tmx
deleted file mode 100644
index 9adb6788f30..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J8.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzVWFtuAjEM5K8bqdfagjhJb9Yt9FYLpccoVhkxHezEm8JHI0WCbBKPXxMnL2W1evlnfTesVh/D7/97GdP5e+rRvHv1zbnP5SrveP5tDWOHcsWwo+9o2wfbby3yvAasiu3tPPb1YN+yzCfBpf+1Pdp25luzwftQx4E5OjeLb9cZr5/lxz8bx2+KQ+dmfLsbbuOix+YmG/Y5XXDYmP2eCAfHwxjgsXxCTnmxPZe+nId9WvGANjq41E5R7nm63aPDzrAD7MTjGhMYf5JvPbls8jSGlb9ZJscg24rHFXsPJynPzITTfKq+ZA4H9rWsZ52W5FQLG7f5ElMsT3Pd427FAR7r4XKVF3EyYkb9O126jWEtxyb0782JzPnGukOeYRkDPZmnMN6Lz+wB/aOzZJT5mLMVzJ5vMb+X93ifr5LLN9gcMm3NqVxt5sXQPWsJzUWOJT0X8L12tqKGa9kP9ZzHcVznRecScrmW7wfRh88VrjNfn2/x6V57Z72eU60W5XtND2stfFnZrforU59BB+S1dQ8f+pTYEw3nqLcGMd/iKOYbYDB8NYyap95+0+BzBdoo42pL8Hdv3kJvPgda+0VnqcdPf+U8yFqyD3SqnQesd6/tapzPnMO8w7JrOmXmZG2HHMhg11rHW6e1jHJiFh/HSVTf6f5RDeXV915bak/PD1pvMR6uobai66nc1vIedy+p7b37jlcPwlat3OS8iPgmmy9RLDEG/dbKKVs7kS7g7h4ejO4z+i3CnvUTcGoNUrObxrL6SuOJsUTc4b3L8buGd6dq5S03T96x1Pml9i7nvXdlYrB1XwNGjqXI7z2tZb+WjFpcqd/ZJnyHQW3h+allvxa+zD1L72r8VqD33iXYavGXXc92jO5DkS2y54eH8RFvtSpniQy2wV9qyIycTF1p/Rtn01sE
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmN0KgCAMhb0ps/d/g8rqxeo1uohAwh80l67OB4KKmwrbcSgEAHXSG/0usLalPAhjhtIHAGKyzHGJ11DeUaML7/8FGmL/HDSmdBwDwBGf/o4Z/O/qbOvDBI3VOBW5fnMY5NI+Cn2SBD4B4M6SYFNLvZ6a05dWU2tCDfW6646+NwJaCXLxRCvm29gXl2/HrI7YM7WekYat7d/kL+SorUGYA3qODTA=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="0.333337" y="320">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J7.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_left.tx" x="542" y="322">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J9.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_23J9.tmx
deleted file mode 100644
index 5a17f161212..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_23J9.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAAAAAMCXARkAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+M1f/cupjJJBeUlVVVVVV1UcHjs4f3w==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztWG1uwjAM7b8l0q41mDjJbgajuxWscIw1GhYP17GdD/pni2RVahzn2X5x3WziMGz+ZRU5hmEYZ/kKuo42/0xs3/MzjVNcYkjz5/irg/Men3rI9oaNRsJwBhzvmXn06Vk4MXYvwxLHKMzv53eX+d1hfn6GJe6eWCl2ac9DWO7JR9K7wvop3rHiWoknNUK5Q3u4Z3oi3jdnLnpgRHs8LigTYNTwkV+kq9nshY3OaNL17Hcs0PXkVYuJ1wfSpTPdio3nbOfwweIS1iiNAyVCNnP40AcrJuRLj9iV8IR8sGLi1SuNnWWPYmjl16vnFanuWbreGOb4UppbL188+NBma449taU01iVnPecf70e8Z424pfmDOoRxDHf5eF2uwXnq3bAvKuEJcUuLDceIQ8JnDW8e+Hdf8wvzTH1YEgmf1Pfw4Ykh37OmTid8EkYt9jX80/zBONfUmCk+9j/eOmD9n0gcaKkx3norxS8Xc+kfpeY7UpsDqwZyjh4q+4SaOuo5v9sKu7W5smIjrUG7a/PP23u2fuO4r14bntxxDpTyW/K1pv7l1vA7iB7/biX3EhYnOL4W/nEu5+6E8J3Ve0p3OC19NK+nO4aN31VxziJ+iXut/JNiOIbH/iv3/hTlfq0X/zjGPetv8K7Iui+ScCX91n8QxHi9PQkP91vq6SS/KKdkswc+rw8cu+TXZWVcf11+AAjnUZI=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2EEOgCAMBEAuivr/HyjGZ3ryqEToWtvuXE2alUCppkRkx155Pn6SwodBOwBYFqyFWKsVUJNiYt+zadIOEMiiHUCIlT2zaQcAan037zMX0eUA1ZWc69/4e9/lDNiv9n/Bgmh3DKIfFMFad9/5LfPo3BNEyFOf8XB+KI4T2uUGRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="59" template="../obj/door_right.tx" x="1.33334" y="336">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J8.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="543.833" y="320">
-   <properties>
-    <property name="teleport" value="maps/map/cave_23J10.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_24.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_24.tmx
deleted file mode 100644
index 3ca2ae555e7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_24.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="66">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VdsNwjAM9F9SMQaztFRZlEfZCkoZg1jBwrKOSiSmkay2zuNy50s6dETDj3HIwa2vmFsTl0g05Zjz+35HlDbCZLxQqNIxfz//gHHPz2v85B45zrFgenIVLA7mhfiM77oyZy9c8Yq0m+GrOXtqPBpchC019tR4BrhyVrSPdc7q0aqx5Sx4weRQLTy4ch3Fw6hv6errrM+HbUn1B5X38vM3nZPa22L216LxmpfR2nZcK+c1rXswLjjhImzkG31He94djH2KJdCaem9b/IuQF1pxXwScrj0=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFhADbANjJNQB2DkfADsSsA2Av3wDYiQzYB9h+eoCR4EdksJgEtUuobPdIC+vhDgAB0AGH
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="209" y="272">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="224.166" y="17">
-   <properties>
-    <property name="teleport" value="maps/map/cave_24B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_24B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_24B.tmx
deleted file mode 100644
index a51eea7149c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_24B.tmx
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="77">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNVEkOwjAMzDEVz+Ataat+lKX8ii3PIFYZYUYOStqCsGQpOXjGHi9t41z75370zp3873m75Ofk4xf4pabR29h9crHtxrmwMuf1ib1L70jagldsWJFX4waVBzhuyQ/+lZOlj/wvzeSlvQCumPQRtQ/Nux78h+kY/Gu474of8aPiCAYnm2giOLGAM1c7m64L+Hs/Ofdh6YyxBlwP+iox0GfOvsmuMrbWYMjkyFY69zpvjtH4ema6DGeN3hqDb0NP+Lxf1hyU6sw7nJs1rgV94Rkorde6DZbOVk6R+GtvKTA+7VZuXhCbw5jr6MPS+/wA1wbJjg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+AD7CLR3CY3MHWqAmm5mJdNOLiq6AZv55KoZSmCk5WFaAZB/FhOQHwVDAwAAmDIBqw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="208" y="272.5">
-   <properties>
-    <property name="teleport" value="maps/map/cave_24.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="327" y="164">
-   <properties>
-    <property name="enemy" value="Dragon"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/gold.tx" x="321.5" y="188.5"/>
-  <object id="75" template="../obj/gold.tx" x="351.5" y="185.5"/>
-  <object id="76" template="../obj/gold.tx" x="341" y="220.5"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_25.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_25.tmx
deleted file mode 100644
index 83628c8ecfe..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_25.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="69">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6C+M1f/cqphPyT0kqqqqqqqqqqqqvo+qPovzg==
-  </data>
- </layer>
- <layer id="6" name="Background Tint" width="60" height="40" opacity="0.75">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Ae8++kHqthPyT0kqqqqqqqqqqqqvo+XvN7uw==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWm1uwjAM5dfUStuxYIiT7GZlsFvtq8dYrfWJh7GTtHE2IkVMKcR+9rNjp9v1m83uD+fzNGVs/1hubp66zeatu3z+N95oPSy93qf5OX9GydrPeGXPcwID2/ujgR5a1uesF0aUrK9pvnbpfSEf9uZxaOBbrRNGVMyB096+nvyWcb/vb2VF+VjvjX2Zw9qvw7T2Pa2NjfBaNhaZEfJk72N3y2vBuFX+H+bvyfrLYxusHuZoLmleM27BeZzt+0V+Rf5qlasZc3R+tGImZVvm+aEhduZfpI81f3Jxw3zg3C1/t8At/ojeWzAMXT5urBymR+RZxfKi8hZ8PPYXblt7l2CFn6PrIuZPSX2Usp+unzydPd638LHWx7Mp4+P6yLIJnh/627PHO2NLMNfybgmPGJ9Vi8r62fBlaYzkdImIMet8bDVysSf+1TUKj4hzY0ncyECNAL2GLq2jpXOuhtI6cV1Si7eUz5A7Kr3GBXvg9yU1I/Mu8gwCh0p85MlN1VDMB2C1ZsoHrXpiT+8cn1Jxh5hL4SuJsWjMXn+2JG4Yt/7tqbvO39Ddw2/Z/pD4/hpea5uuzYeyF9tozV1Ka7xaRmQ96Z15KXt6nAZHarht1VdRPZKXu0vsifiwckNNzmZbRt+pWH5aou/D0+/UHKk9o7Bf9N2glwdL7enhrc3XiN0ov1oxwvdUNfvUxhz3OpE9vsVh4TdqMt1zwZe85sVDTT6FblE52ctRyK/8LgE9I+Pd99d3Vy18Gxm73vmj73QsO2hbeGONrkvrVH2fYd0d5s6fVK1dOtby0Isx656GY5z9ADvpNUs/cLV2RPgWg98BsA9Le8acfoIXtbWc87qWGGjdera2D87da8BneA+AHsB6/+I9w3OrZ96ptaODJaoPFhmpfpfvLbb97Z0qBj+z9qytS1O2WDq17syzkeRp/8CfVt3pvRes0TNqsu5L+9xU7x9Z27fAHP2+lTFH9pX3PO/1f3RaTcTxf3D5B0mxPB0=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt2U0KgCAQBlA3BXX/GxTUMdsUGGQ5Mb/6vU0bGaXGcaSUQNpovQC4mZnjLczxuEzC8VfimJrxXHbFuUDPdj4HwTkkYwNY2b6HdCnf75pnVC/wTvXlPalUL1Q6J0v3nbc8iJQjXvt94HPlI/UORd0ToMvT3o1U8578yWncrcArT7XB01pKIqyxN+gz2sTdK0Q+hy37Ju5/R7naevr17Szqcmt1h7o/SuMl8wXoWstTC9HvrQBeHJZrEJY=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="480.98" y="639.379">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="465.499" y="22.3333">
-   <properties>
-    <property name="teleport" value="maps/map/cave_25B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="469" y="577">
-   <properties>
-    <property name="enemy" value="Adventurer"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="173" y="150.5">
-   <properties>
-    <property name="enemy" value="Sliver"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/treasure.tx" x="104.5" y="50.5"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_25B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_25B.tmx
deleted file mode 100644
index 2197a8034c4..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_25B.tmx
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztzgENAAAIA6AXMLPVjeGmkIAEAAAAAADgjq7tAQAA8MkA/f0AjQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6C+M1f/cqphPyT0kqqqqqqqqqqqqvo+qPovzg==
-  </data>
- </layer>
- <layer id="6" name="Background Tint" width="60" height="40" opacity="0.75">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6D+M1z51bAfEnpJVVVVVVVVVVVVfR/0r8xd
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzNWm1uWjEQfD8fEkfodRqiXDQEeoDcp4T2GH1WWGm6mf2yrYAlS0HY652d/bLJ025Znr55Pm+zjZ8DMk7rspy3edn+/rV+P4aKnh83vL8Lup5u2No8gwyRMxP3LFuelJ4VzNdtvq2LOV637/5OwhjZ8sf+c0YyDzuuaxaztX8Gx55sLT+Dl3GLIxPLEcdtvHTy6unWfEfObbjPgb9HWEVOhpvnQK+qT0e8ikzrXMGPuns6VjFbHPfGr+czKLOtO672WvF3z1deyf4q5ibjOJirNMdN5p8dlylnM92tgToy7jMxKPuq8ZrhOMol15stMvlE+x3bE3GM+WCkZ9EYjg6vvfHP9GN7ZJ30GZgTdX28Z39VzZ9W7pa8F+X10T5jdixEejX7sNiXGI/i4978Mo49Dpp9JPaP69cYEvt5+bAnhnU/PmIz5Djjb9KfsYk2Yb7Q488jfbw1JQdF9cLDqntUwY35rdo3v+/jXqmHb5Hp2Q1xvTs4Pf+p+nQ7J6ohiD1rS5TJOI54jTCj/IpPZ3p5HJ5srJUi01vfg1nOQJ0rPVaGW30fYhx7dfRC9vRyy2KvEsMYC4hLemapDXqd5qx9H9VLHWMZflnOss7I8iy6Ci7WQ2Z6Vi82rN5Kvxmw3MUwCxeIfWbvgXa18Hq9ktVboZ4Mo4VZPut4HL0vnaAWRe+o193/vRLGg5bJ3hix9glGPD8Tj6O9dLOf7t17/Ab1zryNncEm0XmHAb08+2mdItnCI+qdufNYNrDOw5w9w58t/byeplrXZVTuBSwuRu//Fr+WzZkOcreL6pXEX/NPhltjYe9OM+7CmXdu9vbAdLDsp98CMzVf14MZb1k6Pioj+57h8eLlIrGLrJnxlmXFIb4/9NRcHB4vuN7KWTPzs+XLoiPzPQuDZbssXsuG0V2sMlm8Wee2ta2/sN6/rbiwdNT20feC0btSBvNIDqzYzlqPuCt5oEfX0d8tGMdRjqnkyln5eebU+kc5xuKYjUd4m430z/ighZnVhUfkWPJpJd4aZqx/7Pe2e//WEOHt6Q8abt2veTXhEeaM/0fqnf8AMLUwOw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmFEOgjAQRPnRBBMPpolH8CpeRhI9GsfwQ4glIeC2s+0U5v2UkHYh29nZQtMIwcvLKe4NHO+ZsPYAe4sp3TBehrF3ek4sKTkrxREUp1uf8heP83dE5tJLjylcI9bE5oRFl+M+oOoWpTlRnja4tniSpZ+ivE7kY6nGGX09xNOfWDy9JvZa/29QnL3mzwtUDYdx2D2RAVQ9iCls2svZI+WN20bfmsJKbj+8G+d7+mNqvVj8tJbaZOuPMaxpxrIXteyb+HFyiFnq7MR8ZmP2ilED+ge1zFx+2pl7W4VZw96ot4k98gFeWBYY
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="480" y="640">
-   <properties>
-    <property name="teleport" value="maps/map/cave_25.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="480.438" y="17.5026">
-   <properties>
-    <property name="teleport" value="maps/map/cave_25C.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="223.302" y="88.091">
-   <properties>
-    <property name="enemy" value="Harpy 2"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="7.5" y="319">
-   <properties>
-    <property name="enemy" value="Mimic"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/treasure.tx" x="72.75" y="114.5"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_25C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_25C.tmx
deleted file mode 100644
index 517d5ed6f23..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_25C.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="80">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt1LENgDAMBEAPkEyAWAwmDVkOGiRQaBHIupO++crfOALIaq0RW7lnqV9f9Z65jN300GVhr72ZnD+qH2mXnwUAAAAAAADwdztv7gnM
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6C+M1f/cqphPyT0kqqqqqqqqqqqqvo+qPovzg==
-  </data>
- </layer>
- <layer id="6" name="Background Tint" width="60" height="40" opacity="0.75">
-  <data encoding="base64" compression="zlib">
-   eJztw6ENAAAMAjDs/ld8yw3zbdJeUlVVVVVVVVVVVd8HxDLvDA==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzFWlFSI0EIzdc6Y2VvkKP4q6bmJHuivYLZ6C32KLvGHMOhzCsZBBp6umNXUUnFSTePBzQQH8bN5sGR47DZ/J9fXwb/uV7ya2tLy3OA83UWWv/m1+fhEzf9/XlYftZDjuIMDfOxUgdgpP2BUy7Cze1Aa0rsH9FL0wP2BnY8A13uV3CZXaSLhSOr19GxNT9PPuPpIGXv7P/3pvzZ03zO2fBDTS8vBk6z/Bl8vNrSdKjBG1nStiWOSrpJfej5kg0y/lxrUwvzY8F+pXiX+twre8IG9HpIcAsp6RhZE9P3zbEhfNq75zjH02XPwwUb7X2+fJbFyW16MPzm96i/l0v6lOTpaVjawfJrGQ+lmK8VL+7ubj9EW5ZPyf3AP7izcGj5JJOPMhxnl6eH5Bcxbn1u3Ys9sEKyeat078m8IDnm+1i+Fa1najl+uwjiWbsPEIul3GjhlRxrC2f04tbCj1yIXBP1Lx6/mu7evd/ThyOC2pd0LPmwrK0s3S28/PkfPz/k2ngfx2WMWZi1HG/VPpZP8+e/Cy/pJu9n9ErIrVq97PmlZptMrFyjL9c40XJrpM7TajovF8Omsi9H/9ULO+np1fBRjrSaOOMLcmV6wizHpNfewB3pVaT+2Z5pjZ2jsSJrP+AGT8Bu4eUxJ7ktcQPban0Izm3Br1a7y3gh3IhV2MDzXyvePW74vqfxa8/BdajF6c2xaGXmVt5eNX7Ie47WnFqL30cWxpLNanXmMbQ2ZrPzHeDms8Ps7C/bE8Cn1/Jbo6vEXvo+7maee2p6ep4PajEj7r15zJoF/0OdeBq/zqqyvLS6h6QuUu+sPWQfQL8P1M5u9uI7reoMfk/Knhf2iGKXehFe+JNWo1p5UJuBtMLMOdb2pL+fx/hM18pL9H0ZQ3yOGcn1mRl0lGNL30ie4/68236KdVZ2tZr78FixbBjRcxI4Nbw4i9eOfLau+VDtzL3EW2kW6eV0fFfDu9su45Kfw+OF143afPNa3Fr8yBrXwxr9fVXLVy37Iq1X8GwJns/ifQRrZB7Zg9/S78ER3FIsvDzuM3pz3Gv51WxoxWN2b8+Pa/Y8FfwhI17fsDb3a7XkNH7fPBK2037fa5H7CdNuuzyj5+8mGcytMEq84BExTHh7/s8RyTslyjg7
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmA0KgjAUgMdAxaBblCeILhPdJLpMQd2jG1Q38QIpOZySbb69vb3hPniooL5f39sUIpFYJpdAeq+NrIh07aUQj2IoO9nbEZoM6dm8O1aNf9uRbIr5787NtxhtalE1Bn3fP+pi2t/awmfX+nfJHRSs/HKn7I5Vl0vlaw3wF5qnEP3hJb/ybuQp++uWUP3aB798wY53LPE6r2n0+OjBVEzZfhTDPHOY6Qk8DqLPfdvHbwFtcSXEeiEWqPYDUKb6T+o3ZqBz566dU8c5G+n3hT67Yp7PS4FzD+dmm097MNcBnHu4sg2jN3Crj7lw6I8Ue0pbHRziAcVUi661Gsve34bYv1sTpfkWFLjGEVKr+revz8LxLNP3zpjY2Hwa/deimLNUtZTAgfPaiwO+5pjvuMe8NokdFXvu/9QSiQ94uieC
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="543" y="638">
-   <properties>
-    <property name="teleport" value="maps/map/cave_25B.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/treasure.tx" x="187.5" y="91.75"/>
-  <object id="76" template="../obj/treasure.tx" x="148.5" y="92"/>
-  <object id="77" template="../obj/gold.tx" x="168.5" y="90.25"/>
-  <object id="78" template="../obj/enemy.tx" x="167.75" y="156">
-   <properties>
-    <property name="enemy" value="Immersturm Demon"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/enemy.tx" x="199.5" y="234">
-   <properties>
-    <property name="enemy" value="Rakdos Devil"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx b/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx
index 2b1093d4538..891290064bf 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/debug_map.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="97">
+<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="98">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -150,7 +150,7 @@
           {
             &quot;name&quot;: &quot;I'll take it&quot;,
             &quot;action&quot;: [
-              { &quot;removeItem&quot;: &quot;Treasure&quot;, &quot;giveBlessing&quot;: { &quot;name&quot;: &quot;Debug Elf&quot; ,&quot;lifeModifier&quot;: 2, &quot;startBattleWithCard&quot;: [ &quot;Llanowar Elves&quot; ] } }
+              { &quot;removeItem&quot;: &quot;Treasure&quot;, &quot;giveBlessing&quot;: { &quot;name&quot;: &quot;Debug Elf&quot; ,&quot;goldModifier&quot;:0.2, &quot;lifeModifier&quot;: 2, &quot;startBattleWithCard&quot;: [ &quot;Llanowar Elves&quot; ] } }
             ]
           }
         ]
@@ -407,5 +407,6 @@
     <property name="enemy" value="Doppelganger"/>
    </properties>
   </object>
+  <object id="97" template="../obj/inn.tx" type="spellsmith" gid="6707" x="224" y="368" width="16" height="16"/>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3.tmx
deleted file mode 100644
index 38fd2f94889..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3.tmx
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="56">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJx7ws7A8GQUj+JRPIpH8SgexSMCAwBnNdQ6
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzt1FsKgCAQBVD/zRVoG6u1WNuy194yYkik8s4QfUTCRVDGM4IYKqXCC3FZkJrWKDVW12nMcy7tb+YU57sxADbnvoiJ2qjLMREbcSVmyUbcWmjSsML7/u633SWm1zLTx7pZ6DqhTebZuZx/kmPfmdx/ErVLJtdN7U7voR68PtZKpsTNa+itW0H/aVYIl805
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFgxV8Yx9oF4yCUTAKRsEoGG4AAFE3AP4=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="207.632" y="272.303"/>
-  <object id="49" template="../obj/entry_down.tx" x="208.821" y="64.8904">
-   <properties>
-    <property name="teleport" value="maps/map/djinnpalace_3B.tmx"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/gold.tx" x="208.615" y="38.5488"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3B.tmx
deleted file mode 100644
index 7089cade866..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/djinnpalace_3B.tmx
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="73">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MVDXxwFtFMWSNMbSPOM2jtq76i9o/aO2jtqL6q9e4G4npt+dtYC7doDtHMnneteEN4NxAD/oTSv
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzr5GRg6BzFo3gUj+JRPIpH8YjAAGRZIuw=
-  </data>
- </layer>
- <layer id="7" name="Floor" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJz7w8TA8GcUj+JRPIpH8SgexSMCAwCWUPoU
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMAooA9/YB9oFo4BYAACu/AD+
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="224.543">
-   <properties>
-    <property name="teleport" value="maps/map/djinnpalace_3.tmx"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="206.212" y="75.9209">
-   <properties>
-    <property name="enemy" value="Djinn"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_11.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_11.tmx
deleted file mode 100644
index 6d0cde56a08..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_11.tmx
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="61">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt12EKgjAYxvF9DfUE1nU6RN0lz1Wru2XEQ0NsOAt6tP8PXhTZYA/zlRkCAAAAXG3rsnKktR2bEC51vg6NZxataTdhXV3zvLZm+1KSYcglyycZxCHLsB/GeiP2dX7TJxqvfvlljnQvHvd6/3M0RnNbg/0Y5ihBju/K5dhvxivlmiOuZD+6qmy+a45//V7FBeSY0ufikCPNspYzVmkOlwwy57zolkG0pltfp+pVkj67mmaQ3L/rUv5rAQAAAADLcgdmxjOS
-  </data>
- </layer>
- <layer id="1" name="Background" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1zEOwjAMQNEMWRATt2XmFj2E71ghFBFZaSkkdnH0hycxoJKvxBCWS0oLAAAAYOh+Telx0PO9Z6+3t+EfWm75RfL79S8NdUt53h6rjhENumWvx7qjt6HQDfpzInXoPYneoefPukMMO3RL9A6ZoKNuiTof+mxF7pjlXHnMuRjvh8f3br3fo+8lrbuJRUfrzjDintiaCa/56G3RDWf9DuqOb/9HfWrw7pC8va6y7tZ53Fq7x30XAAAAADCHFdhctmw=
-  </data>
- </layer>
- <layer id="8" name="Ground" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzNWm1OIzEMHWAkdqa9A3COLtA/iHPBIfhZ7d26nGO3VvtUY2zH8SQVT6qQSibxd+w3XU3D8L4ahs95MDEe1nwon+tJX787fP/k7CfxOtsybOfjfo/zed1fY+/psO5h7Z+1mc+y054bY69/v47n7gwdNaxOtqQPlwM6wF58Xcn2HsaCbFwHzycvyvcrYUu+z+P8fS10sUA2qIkJSwfLJ/tTbGi6cBl2TtwS7ta6T/CsZQPrvKvTWSN79nr6KseG2YbbMhsXlizShpoOlFtkS5zN8w8Yhewc9D/oTPl4vz7+JfB9LZC/n+fzXxm3dN4Nk+dG0QN1gj50NnKer3sO2NbyMXzUomZae7wx+Xkewt5kn61inxJ4TBJa1EzkjJV71v4tYzKKUs208t9Dq5iU2DbIf4pVryZeKfbIxqQE928UMj4Bzy84hz+XjUlt39bxqZ2NeMBH0yV7H/SIT6o/mp/kmR8Vvo+iRXyS/OgtvH7gJXBnZdA6Pj0dIuctwZL4rNEBwP3bQxfsX7t3VA9pI+qPIr7OwPML+iuZw5Eed2k9ysCqmVRjRqVmwg+lHiHSy7WCVy/3p/Nl3a3pceCXnvBqJu6QUs2EvffOmkv6RYLseC/iDf22XBeZ1UiXqcM9WAuvH4O9ZZ5l5/ZeKPEABGlrrveT0V+2QnY2jEByCKVZZikys2EUqN0/CVl7Uh3o1YtY6JWXl6q7GT5NPg9Ysvasu9nZkIM/53HghF49YmY25OjFbWdROxsSarlti6PQsL89yHQbl5+QmQ0j3LbM7U0Ff5jRg5CZFb7dC5BxWn53Z/UAonwaX8O52lK9iNppqR5RPo3nu9TBuvNrfL5UD0KETwNq+YbofSj1aP1OR+uXfs/t50PNH947HYDzaR4ifFp0PpTg73SsuCrx7bV8GnzscdbRmVx7pxPJD34fZfm00nvi6Hxo1TmpR4kzz/Jpozj7j/JsaT4kWH0R1yPCmY+TX+8JXr0cK/wo50MOuTf0qOHML8mnafVO64u4P1r3yK34NG0+lD5fcg/W8GnAa9I/Wt3lWKJHDZ9GIB28d8uoiZFYlLnD9ai9y63fAUEuXi9b/fZJ6oL8l/6I3OUcd8r/NT6t92+ftLjKvP/n0Pi0/97OU/0=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1I0KQDAUhmFzTculmuvCBUk6mRI7fuqj96mV1LQ326oKAAAAeN9Qlw1l8/rGgjX2wi2lDUaxxdtglFrOzsHc13/gvDT1/rNnbqTjMXRodeS8d5a3+035Wrpwba7C//jLvrrTMQp1pLDupyv7vQ3LNxRYi7dDqcEkZ4dig8n32BHlBpPCdpy9/4J44y4DAAAAAKDEBFRKOCU=
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1zEKgDAQRcHgmcT7H83qg4Vgoqhhmam3ecWGTWsAAPC+bbmeWTtm/tTTELO2jDTEbC13GmKWlmPDaE/mZ2kBzj15q8KeU1Wl/ahwl0SFOzEq3O1R4R8FAAAAX9sBjtYFKw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="50" height="50">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmsGNAjEMReGC9ro90AAUuQ1ALzTFlTsKaFZRZCf+jj32IJ7EBYbJj+fbjhG7Hc31h/mA4bzHrrfiQui8ItcO9imJA3XfLdPGrxcDq71ftN8zjj3nHY6Tk++5+7bvI/tHc5qjXRONmRYk1mtpsgB5hlupNXU/0PjOK6+iqZ9fHZeo/hlNiUHE3qX9xivfovNYsn9Ko1T3p+Yvuq/bwUcHQrTXZtCeC7VwvUoaw4x1vGjq9eDlrNS9RumhP/CaIxE/y3nuU8mW41Z5O6q391/65bVeTdQc9L9esmfuyVqxResVheU8l+UcNTvPtXBzEId1nn95s/b5yoJsva6QUZME7Tw3qktUTi9reZ6R23UznscLM37ZqtcKvXoTfZ6h5qDo/iv1Mxo7baw5PVv2ZEYs4jnr55EGjUZpH4moBdHznIRHtIAArHq4h59HtD62zL9oan3oPLewlp8zzTmon6HfE7Bbv0D0eNTlGZ9b6uF0ROVhb90ZP1P/75md5xA9mevaE0+0U9Y=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="391.632" y="511.303"/>
-  <object id="49" template="../obj/entry_down.tx" x="513.654" y="304.89">
-   <properties>
-    <property name="teleport" value="maps/map/fort_11B.tmx"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="391.848" y="282.871">
-   <properties>
-    <property name="enemy" value="Death Knight"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="297.833" y="378.371">
-   <properties>
-    <property name="enemy" value="Dark Knight"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/treasure.tx" x="337" y="243.333"/>
-  <object id="59" template="../obj/gold.tx" x="275.167" y="295.667"/>
-  <object id="60" template="../obj/enemy.tx" x="390.75" y="470.75">
-   <properties>
-    <property name="enemy" value="Skeleton Soldier"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_11B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_11B.tmx
deleted file mode 100644
index ee33a05e9a6..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_11B.tmx
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="79">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJztl1EOgyAMhn1d1BO4XWeH8C7Ocznd3bY/oZkQCrxRzP8lTRQ16WcpYtcRQgghhBDL3IeysAzyeysxj/6xVRfk9XC5raN/DedTkPdksC5nB43QQ8asuJTO95iHjNd2KemH/RebG9Oo7ZKaT9r71+5t2UOeteIRrk8Aua19+nlrHjE21xspWvBY+nw9nrf/umDBQ5tXuXrAA2G5Hrk+Fwe5t1UPIC6I2h6vPh6Hu4YeWdyYRu16ANmXaN91+Z7PkR4CFhyEK+wThZjLeR1rYd8uIK+P0jPH4B9bdRCu8F9LCCGEEEIIIaQdvnXHO+g=
-  </data>
- </layer>
- <layer id="1" name="Background" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1z0OwjAMQOEMWRATt2XmFj2E71ghVDWyQvqTOK2jN3wSQwV9Sg1meoQwAQAAAIbezxA+O32vvfp+axvu0PKKPxLX12ca0pbl/UqsOlo06JZSj3VHbcNCN+jP8dShz8R7h54/6w4x7NAt3jtkgI60xet86GfLc8coz1WPORfj8+jxvZued+u9JLebWHTkdoYWe2JuJnrNR22Lbrjqd1B3HP0ftdXQu0Pi//sq7bBHrm3dAQAAAAAYwwzp1ra0
-  </data>
- </layer>
- <layer id="7" name="Ground" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzNWltOI0EMHGAkdia5A3COLJAfxLngEHxGe7cs59iNlZRijO12e7ojShpFSvrlZ9s1WU3D8L4ahs95MDEexnwoz/Wkj98dvn9y1pN4ne0zbOfjeo/zedxfY+3pMO5h7e+1mc9npzU3xlr/fh333RkyaliddEkPPwdkgL74uJLuPYyFs3EZPJu8KN+vhC75Oo/z97GQxQLpoMYnLBksm+xPvqHJws+wc/yWcLfWbYK5lg6s/a5Oe41s7vX09Rwbphuuy6xfWGeROtRkoNgiXWJvHn/AKM7OQb9BZorH+/Xxk8DXtUD2fp7Pn9Jvab8bdp4bRQ7kCXpob8Q8H/cc0K1lY9ioRc601nhj5+dxCH2TfraKfkrgPklokTMRM1bsWeu39MkoSjnTin8PrXxSYtsg/slXvZx4pegj65MS3L5RSP8EPLtgHz4v65Pauq39U9sb/oBHkyV7H/TwT8o/mp3knh8Vto+ihX/S+VFbePXAS+DOyqC1f3oyRPZbgiX+WSMDgPu3hyxYv3btqBxSR1QfRWydgWcX1FcyhiM17tJ8lIGVMynHjErOhB1KNUKklmsFL1/uT/vLvFtT48AuPeHlTNwhpZwJfe+dMZe0iwTp8V74G+ptOS7Sq5EsU4d7sBZePQZ9yzjL9u29UOIBCFLXXO4no75shWxvGIHkEEq9zFJkesMokLt/ErL6pDzQqxax0CsuL5V3M3yanA9YZ+2Zd7O9IQef53HghF41YqY35OjFbe9vD3Nv6+fV9oaEWm7b4ig0ZOTI9IYRblvG9qaCP8zaI9MrfLsXcMZp+d2dlQOI8ml8DOdqS/kiqqelckT5NB7vUgbrzq+x+VI5CBE+DajlG6L3oZSj9TsdrV76PbfvDzV7eO90AM6neYjwadH+UIK/07H8qsS31/JpsLHHWUd7cu2dTiQ++H2U5dNK74mj/aGV56QcJc48y6eNYu8/ytxSf0iw6iIuR4QzHyc/3xO8fDlW2FH2hxxybchRw5lfkk/T8p1WF3F7tK6RW/FpWn8obb7kHqzh04DXpH20vMuxRI4aPo1AMnjvlpETI74oY4fLUXuXW/8Dwrl4vmz13ycpC+Jf2iNyl3PcKb9rfFrv/z5pfpV5/8+h8Wn/AWz1VdM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1QEKwjAMRuHVMw2Punmu6YEkYLGULYlK9RfeBwN1HfQ546YJAAAAGO96yh3KbH+3gz3OzeebcIvXYObunGJL1GD6DqPUEs2B9Xn7VWk5J+Yh8sraUT7pqNeqd1xK7lrlji0x+//QsZT4fig9F73fVXQ/2rW/xv/Ve2tHWYt/2Iwsj9d7vHPftiZmeu87V2qoopa+Q7Gh8lraDuWG6mhOrKN9DwAAAAAAnu6S/z62
-  </data>
- </layer>
- <layer id="8" name="Ornamental Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1jEKgDAMQFH1TOJVvZgHEofg0qIVKqG8N4VO+UMh0wQAAP1tS/l9XcpzRrWGkqwtLQ0hW8uXhpCl5Wo4Cru07JelBejHP2dUb+7CJ1n+xwh3SRjhTgwj3O2h1rLP95y9AQAAAP52Aln9BpM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="50" height="50">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztWjsOwjAMLRNchAkWGLgM9+EC7UUZEBJioEUqqqI4sR0nL6l4Ugf6iV/c519F1/kx7IgLBM4b2f1W6D08B8m9kX1y/OBbt2W4/gv5wGrvvfY5Y99T2qFwyqR7al33vGT/0pim4NqU+kwLia9LcbKA5B22kmuW9UCju1xxhcby/S39gqqfaEw+QOydW29yxRs6jjn793Hk8l5r/Pr2dYv8RgOttRRo+0ItqFrF9WGNeXziFKrBc68UvAeoIct5bq0I6fNQcX2NwaqO7JnrSOyh5qCfPbDWj8p38xyPl/CZ2ua5a+Ca5TxXoo96j8clYid1nnNBzUF/lEXp/soC1v3sfZu+Rqs9tnaei+UlX0zPtnL2yK7dGvvxCSl6aVVrE0L5Bl0HfHMQ+jsGV89S32l9TfFpWZM1wsKfqXqOcdBw5NYRRC5Az3McPNAEALCq4Tn0HIOrY8v4Q2PJTzvPldJzTXOOVM+i7wmypb+Q8MmRl1N0bsmH4oGKw5DdFD37/t+TOs9J+NSc1z4Z9ksC
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="511.833" y="350.043">
-   <properties>
-    <property name="teleport" value="maps/map/fort_11.tmx"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/gold.tx" x="369.417" y="240.666"/>
-  <object id="74" template="../obj/treasure.tx" x="271.417" y="362.416"/>
-  <object id="75" template="../obj/enemy.tx" x="392.084" y="438.25">
-   <properties>
-    <property name="enemy" value="Lich"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/enemy.tx" x="391.5" y="283.333">
-   <properties>
-    <property name="enemy" value="Dark Knight"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/enemy.tx" x="357.584" y="360.833">
-   <properties>
-    <property name="enemy" value="Death Knight"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="454.5" y="299.5">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_12.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_12.tmx
deleted file mode 100644
index 187b83af097..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_12.tmx
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="60">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt11EOwiAQBND+V05AezG9iz2XGu+mG524IlCqHw7JvIRYK02YLAgdBhERERFhNe22NUYY23xv50I7hMfnPnBm8RnMEj772L3ZjTuS1SXNUJP2YcmyJYPJ9WPIMrk5n2uA76W8kSBHaWx+jeCaPUduXbeyZ1ly/Kq3HMzzyu9ta0r/CdgX/8XXI36xfwBDPTC2U0NNcjkY1/lalksH9YCWuqQYctSyLOP7fdZziallSecR6zkRWs+LzOd28FmO46uBXV+fv7FmgNq7ay/vtSIiIiIiItKXGyNlNGU=
-  </data>
- </layer>
- <layer id="1" name="Background" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1zEOwjAMQNEMWRATt2XmFj2E71ghFBFZaSkkdnH0hycxoJKvxBCWS0oLAAAAYOh+Telx0PO9Z6+3t+EfWm75RfL79S8NdUt53h6rjhENumWvx7qjt6HQDfpzInXoPYneoefPukMMO3RL9A6ZoKNuiTof+mxF7pjlXHnMuRjvh8f3br3fo+8lrbuJRUfrzjDintiaCa/56G3RDWf9DuqOb/9HfWrw7pC8va6y7tZ53Fq7x30XAAAAADCHFdhctmw=
-  </data>
- </layer>
- <layer id="8" name="Ground" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzNWm1OIzEMHWAkdqa9A3COLtA/iHPBIfhZ7d26nGO3VvtUY2zH8SQVT6qQSibxd+w3XU3D8L4ahs95MDEe1nwon+tJX787fP/k7CfxOtsybOfjfo/zed1fY+/psO5h7Z+1mc+y054bY69/v47n7gwdNaxOtqQPlwM6wF58Xcn2HsaCbFwHzycvyvcrYUu+z+P8fS10sUA2qIkJSwfLJ/tTbGi6cBl2TtwS7ta6T/CsZQPrvKvTWSN79nr6KseG2YbbMhsXlizShpoOlFtkS5zN8w8Yhewc9D/oTPl4vz7+JfB9LZC/n+fzXxm3dN4Nk+dG0QN1gj50NnKer3sO2NbyMXzUomZae7wx+Xkewt5kn61inxJ4TBJa1EzkjJV71v4tYzKKUs208t9Dq5iU2DbIf4pVryZeKfbIxqQE928UMj4Bzy84hz+XjUlt39bxqZ2NeMBH0yV7H/SIT6o/mp/kmR8Vvo+iRXyS/OgtvH7gJXBnZdA6Pj0dIuctwZL4rNEBwP3bQxfsX7t3VA9pI+qPIr7OwPML+iuZw5Eed2k9ysCqmVRjRqVmwg+lHiHSy7WCVy/3p/Nl3a3pceCXnvBqJu6QUs2EvffOmkv6RYLseC/iDf22XBeZ1UiXqcM9WAuvH4O9ZZ5l5/ZeKPEABGlrrveT0V+2QnY2jEByCKVZZikys2EUqN0/CVl7Uh3o1YtY6JWXl6q7GT5NPg9Ysvasu9nZkIM/53HghF49YmY25OjFbWdROxsSarlti6PQsL89yHQbl5+QmQ0j3LbM7U0Ff5jRg5CZFb7dC5BxWn53Z/UAonwaX8O52lK9iNppqR5RPo3nu9TBuvNrfL5UD0KETwNq+YbofSj1aP1OR+uXfs/t50PNH947HYDzaR4ifFp0PpTg73SsuCrx7bV8GnzscdbRmVx7pxPJD34fZfm00nvi6Hxo1TmpR4kzz/Jpozj7j/JsaT4kWH0R1yPCmY+TX+8JXr0cK/wo50MOuTf0qOHML8mnafVO64u4P1r3yK34NG0+lD5fcg/W8GnAa9I/Wt3lWKJHDZ9GIB28d8uoiZFYlLnD9ai9y63fAUEuXi9b/fZJ6oL8l/6I3OUcd8r/NT6t92+ftLjKvP/n0Pi0/97OU/0=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1VsKgzAURdGkY5IMVTsu7YBKsBfSoM2tKBx1L8iHT7LRaAgAAADA8aaHbyjL83v9mGP6HBuFW1oNWSqOK7Z4GrJUnaPU4lkDtl13ZCotS3P799zuZB1r6NjPVd4rW6Oetar8X7zK87hjxxqFjiGG8Izbr+/jfA8F3pb62Sk1GE9L2aHYYFot1qHcYIb4PVr7z6D8Du3xXQMAAAAAoPYGgdU3Cg==
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt10sKgCAURmFzTRG009ZVLaga3In4KKX6kfNNK/CAN9Q5AAAA4H2TLz8bM+8oyDWEVFueNBi1lpoGo9LS0mBUWgDEXXO++XuzmvonKM250lparGfHTMvvwj1f06KyJ1Mty1D+VqXBxFr2whrVGkwP53bTwz0KAAAAAICvHfENDSM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="50" height="50">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmksOwjAMROmOg7CDDRySC7RXZY+CVFRFdupfMi7irVApzcQZx3HF6USznJkvGB6T7v4oZkLnorl3Z56SOFDPPTJ1/FoxiJr7bP1dcOw573DcO/mee259XTN/bU5z1GNqY2ZFE+tRmiLQrOFR9pptPbD4rldeodmu3zYuqPqJpsQAMXdpvemVb+g8lsyf0ijV/av5S83rSlx79pciBu01D9ZzoRWuVkljmHEfL5paNXg9KzXvcXroNtGfJUT2cxo8OTw6/7PleFTejq4jmvFQfdB3PPCaXwauTdZ+jsrzyH4uyznK28/VcH3Qn7GMPl9FkK3WFTJqkmDt5/b2JSqn17F6npHrcTOexwsevxzVa4XWfoOuA1QfhK6/Uj9rY2eNNafnyJ7MSEQ8vX7e02DRKK0jiL0A3c9JeKEFAIiq4T38vEft48j8Q7PVZ+3nRvk5U5+j9bPqfYLu0R80enrsyx6fR+rhdKDysDWux8/U/3u8/ZxGT+Z97Q3vgUfD
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="391.632" y="511.303"/>
-  <object id="49" template="../obj/entry_down.tx" x="273.154" y="384.89">
-   <properties>
-    <property name="teleport" value="maps/map/fort_12B.tmx"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="375.848" y="284.121">
-   <properties>
-    <property name="enemy" value="Centaur"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="427.333" y="425.121">
-   <properties>
-    <property name="enemy" value="Centaur"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/treasure.tx" x="354" y="242.333"/>
-  <object id="59" template="../obj/gold.tx" x="513.667" y="383.667"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_12B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_12B.tmx
deleted file mode 100644
index 9711d50079a..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_12B.tmx
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="78">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt18ENgzAMhWEGaCaALtYO071gucoHq6lVQuiFF+v/pAgScfDDgMI0AQAAQNly6xvKrL71x3iW7/mj6Gaxuu5Vba/yOff1em0W7EvMcMTzKGU5myFSyNKbwa7xHsSjuTrLmRwtI+Sw+x6/V3Fc/f3K2I+5UceWJMeRUXJkeK5Gec/revbEfcka5kr9aFF/rkyGfYn7N4tSBtezb68pZnB7fYlryhlchv9aAAAAAMA43rw0LPs=
-  </data>
- </layer>
- <layer id="1" name="Background" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1z0OwjAMQOEMWRATt2XmFj2E71ghVDWyQvqTOK2jN3wSQwV9Sg1meoQwAQAAAIbezxA+O32vvfp+axvu0PKKPxLX12ca0pbl/UqsOlo06JZSj3VHbcNCN+jP8dShz8R7h54/6w4x7NAt3jtkgI60xet86GfLc8coz1WPORfj8+jxvZued+u9JLebWHTkdoYWe2JuJnrNR22Lbrjqd1B3HP0ftdXQu0Pi//sq7bBHrm3dAQAAAAAYwwzp1ra0
-  </data>
- </layer>
- <layer id="7" name="Ground" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzNWltOI0EMHGAkdia5A3COLJAfxLngEHxGe7cs59iNlZRijO12e7ojShpFSvrlZ9s1WU3D8L4ahs95MDEexnwoz/Wkj98dvn9y1pN4ne0zbOfjeo/zedxfY+3pMO5h7e+1mc9npzU3xlr/fh333RkyaliddEkPPwdkgL74uJLuPYyFs3EZPJu8KN+vhC75Oo/z97GQxQLpoMYnLBksm+xPvqHJws+wc/yWcLfWbYK5lg6s/a5Oe41s7vX09Rwbphuuy6xfWGeROtRkoNgiXWJvHn/AKM7OQb9BZorH+/Xxk8DXtUD2fp7Pn9Jvab8bdp4bRQ7kCXpob8Q8H/cc0K1lY9ioRc601nhj5+dxCH2TfraKfkrgPklokTMRM1bsWeu39MkoSjnTin8PrXxSYtsg/slXvZx4pegj65MS3L5RSP8EPLtgHz4v65Pauq39U9sb/oBHkyV7H/TwT8o/mp3knh8Vto+ihX/S+VFbePXAS+DOyqC1f3oyRPZbgiX+WSMDgPu3hyxYv3btqBxSR1QfRWydgWcX1FcyhiM17tJ8lIGVMynHjErOhB1KNUKklmsFL1/uT/vLvFtT48AuPeHlTNwhpZwJfe+dMZe0iwTp8V74G+ptOS7Sq5EsU4d7sBZePQZ9yzjL9u29UOIBCFLXXO4no75shWxvGIHkEEq9zFJkesMokLt/ErL6pDzQqxax0CsuL5V3M3yanA9YZ+2Zd7O9IQef53HghF41YqY35OjFbe9vD3Nv6+fV9oaEWm7b4ig0ZOTI9IYRblvG9qaCP8zaI9MrfLsXcMZp+d2dlQOI8ml8DOdqS/kiqqelckT5NB7vUgbrzq+x+VI5CBE+DajlG6L3oZSj9TsdrV76PbfvDzV7eO90AM6neYjwadH+UIK/07H8qsS31/JpsLHHWUd7cu2dTiQ++H2U5dNK74mj/aGV56QcJc48y6eNYu8/ytxSf0iw6iIuR4QzHyc/3xO8fDlW2FH2hxxybchRw5lfkk/T8p1WF3F7tK6RW/FpWn8obb7kHqzh04DXpH20vMuxRI4aPo1AMnjvlpETI74oY4fLUXuXW/8Dwrl4vmz13ycpC+Jf2iNyl3PcKb9rfFrv/z5pfpV5/8+h8Wn/AWz1VdM=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1OEKQDAUhuHNNcml4rpwQZIWzbaOpL7xPrU/WjpvG84BAAAA75sb21K2zbckZuyiZ5NwS64hR7HlbkOg1GKZI75XZyotpRmte9pKOmr4f33tPJ7M8pUOBX+6VzV855ZZajiPwTs3+vKeUkfv93cosLSkKDUEd1sUG4JcS3yvlBuCwV/X1hE/AwAAAAAAhxUvvTpO
-  </data>
- </layer>
- <layer id="8" name="Ornamental Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgDAMBdHqmcSrejEPJF1kIUSKrZFvnLdTXHRoiykFAAAAiLfO7XeL840Sr+GKasudBqPW0tNgVFpqwz64FpWWv2idO/YDEZTOldJaonzhno/8A5U80aGwH1WGucRkmBNNhrndeC3bdH5WbwAAAAAA4G0HslMHcw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="50" height="50">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmsFxAjEMReGS5ZoiUkBoIF0wOVAPDSy9UFkuTA6ZDVnGMZYtyZK/ncm77LAstix/SdYOm02a8474gmC/lT1vxZyw8yx5trBOjh9S445M7L+cD6zWPmt/Z+x7SjsUr066p8aN70vWL41pinhOqc+0SHzdyiYLJHs4Sq4J64FGd15xhSbcv9AvqPqJZvEBYu3ceuMVb+g45qw/ZSPX7r8av9S6Lk+P9z59TWFjpbWjzTAitOdCLVSt4vrQO5ddf67v0+16mMq/WWzK1eD1rJR9BpivLPs5K05tpmGDricxVnHbuo5I5kP1Qff5wHv+0nBvUP2cJs4t+zkP/a9renv+/TlHbT8XQ/VB/7Sl9fnKAstalzq3a+it/nLR9nOlvJSK6XUuzzNyPG+v71Vq9DKq1hZy+QZdB1J9EPo9BlfPUt9pfU3ZM7Ime8TCn7V6LtmgsZFbRxC5AN3PcfhAGwDAqoZ76LlErGPL+EMT2qft51rpuac+R6pn0fsE2dDfSOzxyMs1Ore0h7IDFYe5eWv0nPp/T20/J7Gn57z2BU2uTBY=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="272.333" y="382.543">
-   <properties>
-    <property name="teleport" value="maps/map/fort_12.tmx"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/gold.tx" x="522.917" y="363.166"/>
-  <object id="74" template="../obj/treasure.tx" x="521.917" y="349.416"/>
-  <object id="75" template="../obj/enemy.tx" x="408.084" y="360.75">
-   <properties>
-    <property name="enemy" value="Green Wiz2"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/enemy.tx" x="383.5" y="360.833">
-   <properties>
-    <property name="enemy" value="Satyr"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/enemy.tx" x="272.084" y="309.833">
-   <properties>
-    <property name="enemy" value="Centaur"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_10.tmx
deleted file mode 100644
index 51a32fa337e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_10.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzVl1sKgCAQRf2N2kG1HZfV2sMPQcTHvNTrgYFIa06jafnDOZ9FSt5mEZr754zwbuXgXNdCkzfluezduPTy9BwRaDkigO4X2dGP4hjqXzpG8ZPyMp/Fwu87ef0DlJojvyPBbaVfr+boazTy2AZG+lmsN3H+1Tyt0LiO9tPWEXkOzhhbrk/p3Ao/6rhL/azeT6kfyvzj7h8jv6Ms/CL3BM+d998d/FY7Sv/TS221/r2+tRxUN0nU/KziB638ZF4=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztlzEOwjAMRbvAJWCjEtBrwyXKVgZA6qUQg6UoCrH9bTcI9U1tkzip/e0kXbcSwan1Av6Aa7D9h2HsUdl/SJ43jnYljMnz7DjXDhhzrrTdwXX0jP0LaFdKyQ+34DmXJEKTCPk6SNcHwBYXn73C1sx3gfkV3xOTcTzFivuvp3GenJezPS0j38UE6ZX2lta60ewNmlwjpHu3tPaXdO1VwzW+iIybxTbni2i99dk7p5nofPsQWfdTWueyF9sv36XaKp3tavcsa8339LunVoZKG1JLc9BzeATpXakUjyXynAO5B6348AYH3Rhd
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzFmG1uwjAMhhF/2S0Y8Gu34DQ9CBRp2p2gm1RxKpqpkSzLrz+StLySpZI07hPHTiKOH5vNcbb9ZH+TUR1I3y+xTzIuYifg3zKJLWmYeRA3He/h53xfFWyaBsbDx4+AMxq/EraIRjaPJ/vWYOQKn0/WeSs/I3XlU/ifgzcfIhw1TFxonSmfJ05eWb54v4ePqiQ2NfNDeXif7Lazx1928nOUTXovt0Vj2ELSXJAQnxRDbX0j39TGeHPQimEkF7vg+1nXif+x8B5dE3MUO4mt5T7jVWltLMEq+aypXYsxUi/Il7X/tTqraliX3v9K9p2sb1C/Un3QWK5VK+84OzTxWKM71hp83nWXYsj5pDpB/vnaa7ngYZT4vPcXpFb5qZ1vaI1r6jGq0rtBUimntqfyvhq+VtJ4Nb6Ugz8rrmWUr0WdWEr5j/yjs8OKYxrXE8t91/k3/57Untses/+eveNlo4w98Sn15Xb0X4XmA/lC9gKQ84lf
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="270.951" y="479.787">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="480.667" y="16">
-   <properties>
-    <property name="teleport" value="maps/map/grove_10R.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_down.tx" x="96.6667" y="17.3333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_10L.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_10L.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_10L.tmx
deleted file mode 100644
index 19566ebe5c3..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_10L.tmx
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzlllEOgzAMQ/mdthuw83Ar7j7xgdR1jWOnKQhmKT+QNq8pdVke07RcKGpZ73pqvF/fEWVD2uug8ah+mcOsJ6K6D2gtVh2mh1ExbMpc2Xwl4935No3kO7uHNcf6/D0fKmudi/jQ2WrVngGbx4xyWM9UepPB1/JTlk2VOp7pXys3qui3OMKjj+AbIXUPrsDH/E+cxVeOYfkyzq86jvFnxmcYL1R9wfM/j48JxlPLOgwf6kFPeGLvD2YONLfVD0YMX+T89t4xFuORHqgy/hNf5v7egU9ljN6vPXyeF+6y8lvPvbtKYYuExZcVH0JRg/4=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl0sKwjAQQLvRnSfQnUK1Z5Rexl6i7upChV5KCgZCSec/RkreKiSTmZD5JVVV8OCc+wAroEvMXXd2+p+CPe3Xfs3c10TjDSDH1Uuhj8Yj01YL3PdecJYLsPYQ6Js4IfpvQr0a7hlsFuhg/jkwdI24iBiPeqBhUO4/EuVeSjtz3sb6uPS4iIoQr6G35I4bTm/g5FqA2ruptT8V11Y1nHMXuf22xL/1MyxmvPNtwrPur5HtwjwWWyEnUm876J+lrfmWuWgZKw2wJqmlc6TvcA/iv1LKH7/IcwzJP6hgwwdJJhf3
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzdl1FuwyAQRPOPb2E7zUlLKlm9U+1GtXqqGsmrrKY7ZMF2FRVpPyJ2hwfBA5yb0+m8RrvEJ0RH+jpV9xeRxr8tgW1aebCvN+q9/K0jx8OWaxPov0D9TBj0WLODsYYN1zCnIZwS35CH88TAedfwbdGQOTDGLdpJ97IDX2q4n/fgE91n5/tY4i1s02H70Ksdl5xruOcO6+9R6VzDPd4faA5GLltDxhiVxgjrLb7IfAx5tX5Uejp3JHyWnuSj7+Y83OJtjbpcvtfPLV1v0/+TZ397PVDPq9aza/iwZq/zgzVZjxLto/wlN16J9rPzbfW/o/mkpmQNY6hjF38r4Rsy/odrGJX/iS8iJ2PX3ptq09kQiU/rlvt+O5irlav9O43RN9zT0T+Zb0V1trE7VuKaG+7vXWOfIT1wYHh8JY3z1fyeW8n3O5GxesPfXiv26qOzo/b7Zdw17cg7/l6NfR//la/WG2v4xKdK9vde7w4Pn2Y8gs+6y2N/7u7MGIdgvynY+YVvFJ3L/MLLZp0TWIfvBOTrHRqefh0/uVvj9g==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="86.167" y="34.583"/>
-  <object id="63" template="../obj/gold.tx" x="324.666" y="46"/>
-  <object id="65" template="../obj/enemy.tx" x="215.192" y="144.446">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="231.674" y="391.307">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="191.667" y="31.333"/>
-  <object id="69" template="../obj/enemy.tx" x="438.548" y="166.452">
-   <properties>
-    <property name="enemy" value="Werewolf"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_up.tx" x="273.333" y="479.333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_10.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_10R.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_10R.tmx
deleted file mode 100644
index 4ac89ecc83c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_10R.tmx
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="76">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKgDAMBECvok/wPX2Wb/caQ9Mk7Sat4MJeqtAxFrTs21Y+1Ot8V7qG2mvE1qr32WhprEaPzVu6Ry2aMdLGK6Vl/H1r+7TUzmqGkec+ZFeWzzonqRE+z/vL9iFtaF+WzetDmtCzi7IhfFEui3PWzEZ9K9i4T0uEyzq7Wa5RX4ZN880yWc/fqrYeH78P8Wy9Pm2tFZQPEf7/6TVG+6QgfLV3vJqPzpFa+bo099q69VtqsfVU8qH6AEMexk8=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl8sNwjAMhiskuDACvVGJxxxM00FYBJYoNzgAEktBhCIs63fipE55iE9CJGlwzB/bSavqTwmW73bgB9gb29tOn98zA1uLxPlr0h6D5+3jsxml29XQkfaNtLVred04OTquAs9OGfacZg2wTzWW/LcC6XBQ/M755fxvrR0ygPpUIiYRO9bn6/K+j+t5xlqx/amFtoPv960qx1Daazkq50m57Pcq9r8uynW0XMGYxTmgpYtP6YWPUV/3rOMm9SxO0Zbnl4YzGEMa85oigeJaU8M1pGhRMt+p7RqMhYhpUbpONawfi5nS+eYoWfcpn3YG5DIRxrWxhe6OofcsVPNTsNS9b6zQ+F+Ls155EboTofcPSs49nEPzT8rVUI76Z9RXtB+WeS7FJ4L6MuQ9AmF1Tn0jd1DkImA=
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy9V21uFDEMzc78KDCrXqIfXGRp/3CSKUj9wX+giO4gVT0GFIlL0G2lFbeghXsQd2PNm1c7SaHCkrUzmcR5duzn7P48hP2kO1GvSHedb7uw7n+o7H8dddGEOzntNrpKeOSbjsucPWN9Lf6dijkWNpE+6seETUTx4pjIivCob336vnYw4F6rCowcN8Sk0gf7HWPNPsg3eV6THz/mU1sljM/ndnxysbRw92G6nn3IyTqDUfDhPppflrAP+H4U9VXSN1FfB98vSzifOX5qg2PyIo6/bO7vgfNFn85CeAbazUZ/9ZfzpBYfxkT2xbi8b+N71IM4fkg+4LovEc8Twsf5khMvD79H/dRN90W5y6uI7yZie0s4uRYE40XSr7OpHSu/WXIx5DpArPJ+G/VXUsGpGHVu6fxElt0mFhbOPoMPY+j5i/h+Rv3QbmzW5L7gGqJeplh4XObh4zq2eEby8CSd8+/GnudhuzS4OTcv1z/QH8arODV2/4KN69CLHfc2XB+M9xIu5RsLW85GrjYWkOu6/jhsOBbtlc5T61gE+7N1pqfEGSV+1nmCS3rAZ+CwUm1yvVu9TccsntF7Uo7/dM124tetxGGlmHHf5TuDJV7fK8VQ1n0Dfi3lGseHMXENePwvcubUr+ZuH3wbFi7lPjx7eebzs87S4sxS7HTfnKjtGh9E5G5x0Ex7ogr74d2x9H5gnY/KWeL/oRv7zKKZ1qv6hpjetWO/GdrpPKuerBhi7rHoGWJtWb2Q+fsG+uBJ4nNvj1J/0/08PlabGH/lTOy/mIty31m2Y8ysfsmS6298B1SbWDOyv/6XuIb5Fjdaefq3dyvuIegj5hfmaO6/FIvFOSLMOyV8jyFejGrqPYdPcvD8AXfxh4iXexh3mZPD59XlY2Jcdvftl3qHF0e9EyDviZ53491pMPazxvHuLPaZR2uxIcYBbFrfdJzzdq/ChmfL0z/YehwC
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="480.167" y="48.583"/>
-  <object id="63" template="../obj/gold.tx" x="514.166" y="77"/>
-  <object id="65" template="../obj/enemy.tx" x="414.584" y="135.833">
-   <properties>
-    <property name="enemy" value="Green Wiz3"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="352.166" y="160.667">
-   <properties>
-    <property name="enemy" value="Giant Spider"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="449.667" y="66.333"/>
-  <object id="69" template="../obj/enemy.tx" x="288" y="208">
-   <properties>
-    <property name="enemy" value="Centaur"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="208.5" y="256">
-   <properties>
-    <property name="enemy" value="Gorgon"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="144" y="320">
-   <properties>
-    <property name="enemy" value="Green Beast"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="72" y="383.5">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="145" y="441">
-   <properties>
-    <property name="enemy" value="Satyr"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/enemy.tx" x="272.5" y="429.5">
-   <properties>
-    <property name="enemy" value="Ape"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_up.tx" x="272.25" y="480">
-   <properties>
-    <property name="teleport" value="maps/map/grove_10.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_11.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_11.tmx
deleted file mode 100644
index 6dae341ba99..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_11.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzdlksOgCAMRNmaeATPw6E9nbpwV+wM/QBO0l3LvPSTULdS6h2v6jZnjOA79rn5GMYsPslHY2SF1Go5TB9HKJvvef+JGfikOomNnS9zz8yuS73TemC5ZZYP8W7dbjYfkp/Fh84N4YvYP4ZPy4tgW4EP2St2D7Taljz5Wm9LfYxQj8fXnGfhs8zY4mVhY3fK26vnhjWvUXy9fla2FfgYHy8+VBF8nvoDH1uL5EfwnTtWZ/HKug0Proy/VVTfLiG77/0=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztlzEOwjAMRbvAJWCjEtBrwyXKVgZA6qUQg6UoCrH9bTcI9U1tkzip/e0kXbcSwan1Av6Aa7D9h2HsUdl/SJ43jnYljMnz7DjXDhhzrrTdwXX0jP0LaFdKyQ+34DmXJEKTCPk6SNcHwBYXn73C1sx3gfkV3xOTcTzFivuvp3GenJezPS0j38UE6ZX2lta60ewNmlwjpHu3tPaXdO1VwzW+iIybxTbni2i99dk7p5nofPsQWfdTWueyF9sv36XaKp3tavcsa8339LunVoZKG1JLc9BzeATpXakUjyXynAO5B6348AYH3Rhd
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzFV9FOwzAM7Hv7F6PjT1eQEP9Ey2CCn6IRRNyOs+N0bYlkMdbUOTtnn3fsmuZ+trz6+fNhttcfu5vt+M/G+Pj/iA+Mae24LHxD2zRjpY9T+/33YmDMcUTxp/1nwvMy20MFtiO8gzaKvH50f3nkYcXcTbSXfaN5eyz/uPCerFyr9yc452z4xljU+crHk8hthOdWfLgG8PvY/n5/IW7gMysePjvz1cKXeIN+h1bziHmG76TcvAG3rHgYY7RPILdr6zWtT+JC39nx9wvwLelpfC7mn2PEvYy9Ni+l2lH3MxhcUL6W5KmE71S4n8iZW+BTtTOKM1VtWvhy71lL/zyO1PCbubKHrlu89+LE/dachLoXiUtpWPZn8crSVrxn7ElKcybBsUlgUTo30TPGZ3Eznffs6AwvxQ1reRqm8OW6VxhZWyL4BtIk1jqcvVi/PO1S+Jm/ShPTdxjP2PmcKtWlpQ1e31azZmn+rMFXU8NrmeK2N+tuoQ21d+Zpxd741J1hX+C8Yr+yeq3VP5cYnlma16LzvbcnivcgfPbwDOdjrvXSfM+9i1dtr+D31JzAd/veXfcU1V/U79DofMrzXun3+dKZ5Ja6QG3cama6FWM053vg+wJe8kpS
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="270.951" y="479.787">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="39.5" y="17.5">
-   <properties>
-    <property name="teleport" value="maps/map/grove_11U.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_left.tx" x="544" y="279.5">
-   <properties>
-    <property name="teleport" value="maps/map/grove_11R.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_11R.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_11R.tmx
deleted file mode 100644
index 94418f04600..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_11R.tmx
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="78">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzVllEOwjAMQ/eLtBsMrrM7A5dDfExEoXVtt3QiUgRiSfraBHf7ZVn2P/JstWdO7ev6+YzusiEr1W7FxO8xhtmXw6bGl3KYM3TYRvHFmF6+X7GdxafuZRQfy+yctcsYOW7r92/I2f0iPqaOy3fU3og4xMdyPEGPXb6sjy22yJcZlFlQ41vzVzsnZU2V78jp0egz+dh8p2eszdZnhw/NoFqD7bFiKl+v7jp8jD6rultjK+nC2zaQi/TPuRdyXktTI19mRL29B73r4XPnAN0fyJg+5vuulVuKQXzqO7S6tsI4io81hXEml2qj+Rx9m8Wn6u+D/C+j+VPWc+6HXr7ae36um+vEZ6W+sGswbI5njR3tL2nhj4U=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl0sKwjAQQLvRS9SdgrXX1kvUnV2o0EtJwcAgk/l1JinYt2lIpvnMN2majQi62hvIcED62uK7kHFTymvP8VTKQ85K+R60d47zUozf7wD6Jse1tPqe93EhxkdijOIE2tj8V+O8S7hXWHNDDmcfLE/mmHgRM575YOBFWB7G/5K+j0L5l3EduBbkjfRpbLwUD91TpLOk2uLpNxY0tcFiB2ntluZ+zK+9crhGF7XtlmNt9Yzzmeh4m4nM+1GUzHm/7DP9nG+lmMDudtQ7C8v5GqyxiOnY01d6YszDvtZ7eATwrYTZo0Scc6z1/fwPfAC/mxqm
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzNl1FugzAMhnmHW1C6p2m3XJiEdqdBy9BONSJh1f1lOzZlUy3lKXbyxTG/w7mpqvM22nVcYJyUuROL+4+R97+uA23aeHCuE+K9/K3Dx8Om2VBX1Qw8GL8oDHyvxcEYZaPcvThjOEPe6wfipgKjdx+ytOZuDMZ1hTxYeYzsQ2xSHqyY2XFHWM97+Ep50Ng8ZzmKD/0zQ7+Oj9rnr5lWh1+NvDYa1h1xjWydvr4fVp0OzO+zvp1HyqHFiBy0H+liSceIm9bH9bjP6Finh/uagEHKB2dFXtJiqln09ei0pOfI0Rl8aJ2xjmReDeRn0/qZp16jfBizp39E9qR8RLToUX3hd+C946h2HaF/f8X3qP5xPm8NRnt7NIdJ0FtP3ve8IQZD/zAfkoZ6857q+56Se0MSdDWxvmHlrt3unfcti0tj1M6UfWZBt3K9fTc3Ru2NlbmWRtd30glN8yXtRJ835Z6JUaqfiJZJGuZ5a3m+91LviHy/Hm5pb6rDPYxSLzvStP8/NO37eBY7mi8pb+Zn4Ivqr/UPUOLDN7lVx7iWl++VfYvS+lbvsPRmENi5fmffd6HvYC/Ctzyfj7BRvKaXeU76b0B/aw3PPB+//W/+Ag==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="324.167" y="48.583"/>
-  <object id="63" template="../obj/gold.tx" x="545.666" y="143"/>
-  <object id="65" template="../obj/enemy.tx" x="288.069" y="336">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="306.167" y="46.833"/>
-  <object id="69" template="../obj/enemy.tx" x="224" y="160">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="447.75" y="319.75">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="415.75" y="176">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="128.25" y="176.25">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="64" y="321">
-   <properties>
-    <property name="enemy" value="Treefolk"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/treasure.tx" x="88" y="33"/>
-  <object id="75" template="../obj/treasure.tx" x="191.5" y="33.5"/>
-  <object id="76" template="../obj/gold.tx" x="486.5" y="47.5"/>
-  <object id="77" template="../obj/door_right.tx" x="0.666667" y="415.667">
-   <properties>
-    <property name="teleport" value="maps/map/grove_11.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_11U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_11U.tmx
deleted file mode 100644
index 9b613bca9d7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_11U.tmx
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzVlkEOwyAMBHONxBOa7+TP7et6ikoRXq/XjkpX8iUBe7DBcO7bdv6RjbL+ZWI82repbEhXHDQfxe/HMOtRNOYBrcWKw+RwBSHGFXQXn1fbiCr5xr1XwZjJ4YwHGcvTj0V86GxVGePX65ksm7IONH7WT2f9fObDqodXN2U8u/9Qvav5rjnZHv0rPlZKzSK+V+dDezCi1w18/Rzm/Kox+nkKH/tmZPsXYhvfeR4z0/+yxvg82oeH4UM5yBhTT+b+YHwg3/23qBg+5Y2lnh2PsYrv2bg+E2FEfFW5WIWvsr4sX+Qur863x8fmMHM3KL1ZeeNb52r2nYnDsKlm8VXZGxqBiRM=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl0sKgzAQQN3YS9idBa3X1kvoThda8FKli0CQmPk3InmrYCYzwflliiJjQZv6AjdgMNa/Cs42RPnOW5eKejGM3npXtFUxzrwjewvzHi9Af8/UK2FKYDODB/LPk6Brh0XYWNQDCbPwfI2U24R2jnyU9VEZYRERLl5db0kdN5TeQMk1B7Z3Y2t/KK61ajjlX6T22xlX62dQzFjn2w/Lun9HHiffodhyORF628XmLGnN18xFzVjpInucWnqE+w63wJ+VQv74R55DcOagjA5fSzYWWA==
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzNl91ugzAMhbkvb9HSPSqtVO2dRvaD9lQjUi1ZZ7Y5MayrJV8RO1+c5Dic+6473/24+Dv4yfl2UnGP8Dr/x+Jo5c6D3wYjnuU/EmMYtsgK5H+B+Nlh0HPNBGOGDWtr1Rc5xb/73zkiRlz3f1hUx2fgq4bneS++8dB118Pz8VWuy+LTEv/Wb2f0ziGbW3guigvz6O+vKzlvxlivhh7j6PAwWoe8Ov8I+WQsrjlilByopZYelYBX4nVMND7Sc51jABY5H8x51fvEjM9oYI1BLR3+iA9jsv2D5ZN6tObeqi9Dw31n17InX+sZzOTO6p/YTO5ZK5/EeNqCGlUt27tEm1r4biv6Z2nq5LCPhuYim+SrvQF7j9Vbovsrd43tB5OzHv1NayrqsZyPUbF6b6y6B3imCrBG/cxaF6srdZ4vY90t97cYc3n65v2rrOWPekf2bZS5n1nGzDyszrDm3Y8tNdzTIr5MDfd617N8LTWsbJ8P3N+WGmZ7Q6TNTO/Qem/ltbTZ6ofMW/4KczBsUZ9g6z2QOVrm+AEQY/Fq
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="237.667" y="177.583"/>
-  <object id="63" template="../obj/gold.tx" x="322.666" y="47"/>
-  <object id="65" template="../obj/enemy.tx" x="224.36" y="392.771">
-   <properties>
-    <property name="enemy" value="Centaur"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="220.861" y="281.033">
-   <properties>
-    <property name="enemy" value="Satyr"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="16.167" y="350.833"/>
-  <object id="69" template="../obj/enemy.tx" x="476.796" y="309.503">
-   <properties>
-    <property name="enemy" value="Satyr"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_up.tx" x="271.5" y="480">
-   <properties>
-    <property name="teleport" value="maps/map/grove_11.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_12.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_12.tmx
deleted file mode 100644
index 8760572f6b0..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_12.tmx
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="75">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzV10EKAzEIBdDZFnqEOc/c/0hdBYLoz/erLRXcTE18ySQDfV7X9ZC5BzumO/e437M+O3/GtnwrbUT99lqmF2v0AvmiutNaovFZW8WoBDIyY6t7+A3fpFH12Z6ob9WnGD1f1Fux2Xkn95C1RWvuOoOeIfoNWSZ91nJ6VvVl72bV582PbNX52XWhul/7TnXq2fOs3WPQGZyK7JrQHZn2sfWVd6z2rO6deqY6fauWub/Z7yyyT/rYzK4j68saTz2UsciGzmD2e8xavRr1P0gl/sXH1Cm+yvvNxMkXGbt90VyMzzPuZ2NFVO89Z3swNiUjX1d+AGfcjXg=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztlzEOwjAMRbvAJWCjEtBrwyXKVgZA6qUQg6UoCrH9bTcI9U1tkzip/e0kXbcSwan1Av6Aa7D9h2HsUdl/SJ43jnYljMnz7DjXDhhzrrTdwXX0jP0LaFdKyQ+34DmXJEKTCPk6SNcHwBYXn73C1sx3gfkV3xOTcTzFivuvp3GenJezPS0j38UE6ZX2lta60ewNmlwjpHu3tPaXdO1VwzW+iIybxTbni2i99dk7p5nofPsQWfdTWueyF9sv36XaKp3tavcsa8339LunVoZKG1JLc9BzeATpXakUjyXynAO5B6348AYH3Rhd
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1l2FOwzAMhfd/u8WactN1E4g7QTdRcSoaCQtjnuPnRFjynyaNv7jOczqfDof528+735XPyp9211bM+H97ZXsABmFGY946df4UxIrmRGzCUPN2Of4dW1WedRzJ8+Yw6FgbweixCcPH7jfAZ+dNhk9sO/2umU8w3mK06/UyFnI9ZC1GZr1C7qPGeCP24sUY4WPiSowexl6+ZY/zTsaVGK2azvJFMXXtR/NLB1vd/1XloPeMIA1BfEy9CFPEla3B1nypAzumWTJMI3z1G9c4+jsjfVkcFttHo16SOZt6fV1nq/NsCt5D63uMNidenWQ0mD3TUT+/g71FPTbDF70zos+WldUPXX9ZjcjUXq9l9Xo0h1mTnDDrvzTOeo/eszlnNTvKHbqDttZhc87yeXcsq6dXkB+kMy09srqd2Yune1bjvOeRHk3gXe8fgeFj+s7Z4UGGNBPl2prXC6O+sybPj33X3s28mhi5X42Y/kdt9aiRf6QRY/Pfqr2a91enNpaE1o0Yc39BjCXgzxo6x17viBj1e8/HnzGvh6Dn6P58c2Iw7umeHvPuJIVYgxnX/gVfaPFK
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="271.951" y="480.787">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="48" template="../obj/treasure.tx" x="78.8337" y="33.9163"/>
-  <object id="63" template="../obj/gold.tx" x="502.666" y="206.5"/>
-  <object id="65" template="../obj/enemy.tx" x="271.917" y="435.333">
-   <properties>
-    <property name="enemy" value="Green Beast"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="342.166" y="197">
-   <properties>
-    <property name="enemy" value="Ape"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="509.667" y="67.333"/>
-  <object id="69" template="../obj/treasure.tx" x="16" y="257.5"/>
-  <object id="71" template="../obj/enemy.tx" x="391" y="439">
-   <properties>
-    <property name="enemy" value="Ape"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="199" y="280">
-   <properties>
-    <property name="enemy" value="Ape"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="87" y="233">
-   <properties>
-    <property name="enemy" value="Ape"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_down.tx" x="191.75" y="16.25">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12B.tmx"/>
-    <property name="teleportObjectId" value="72"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_12B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_12B.tmx
deleted file mode 100644
index dd7724eb4ce..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_12B.tmx
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="74">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzFl0EKAzEIRWdb6BHa68yhe7qhlECQqO9HhwpuzGieafyh5+M4zj/6MPV7mzfs9fx5B9u3DuWjFvF5va24ZrY7+Gx90o+N0X5svYyLsnksXh3KR1xhI3zRnd7hW9X3OGgvO3dP5bMxapku0PxoT+UeeOdd5VP6iM5T4SM9e2teLLsDnit8Wb+qVfgiph3dyxhXcfX9IDPrfT/bG/wOXbNL71NUx1vr1haqjYRvXo8YK3VV/d7hi/IIn5dD2Svv2xyL1rM6d/Ap/GqdiK+qy93aSPnUmezQcaoxmW7s+i5b9n4M+8Azppw23vH/KOMj393N1zkTc02Fr3v/Kp83I9U96YwQPvsO25xhXk9eDTInhG2ljcqZ7+RnfgFqJpBZ
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V21u6zAMy8802ddFvQ69aLp1B5q9hYDAUbLibgKCt5cqMiVTtLwu0/RQn895ms6n6dtK/fe1Pm/7/61t1e+5+r/U52P++fZx+e1n4+Bp/uy77mu335/q3++zjrWaddZFr9uwZXBZXw9b+x1Yehib73X2sdscbqIGyorBhVwspkJYPIy2JlgXe9jDuzk52dqBM3gHzqg9AkaLBe8s1/Cu5eHVFeudBUfLXrcbrcO1V/mtgjf8jrmjOBHttVqDsUT59cxyAc9IHGsXyvPi9PMoRq/3VW95+2b5pmo8grHtIXNW5WHry7X6b+vlyr97+nmPZTQwqzu977KcsGY1JdKTo5xW33FvwEetbfNQWmjxe3qicudzmvefsXl9yDUb6Ss+q5pdTrlzGn7oQYXH21fmicdR1cMZjbZ+ZZ+XvFgqT/aNcsnUPdIdnp+8WJyjx5URfYvmNi/WRvvn9RHigye2V7z+yOJX/IWh5ldTm0hDVO05fi9PFTOaNew5O3Jmsy5l5uGmPVmtz94BejGYp8wDWElqD8fHLMD6fIRLzaLZiefoo2t4s+qReJH2RVo2Mk9wPGg0Y47uIvBXM66aq0fnMqt/2fMdvInuq94dqpeLiqU4jxpH848yqyvefGR73eOZN4dE6/H3DXPmPsr5FZofeve4zD2eMaOuEQdQf28W690x/0K/R84mz+xcdg82xnhU/78AR0z7Ww==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl80OgjAMx7ngS+hNEpTX1pfAmx7AhJcykDRplrmuX5sx/E4Dtna0/3Vb0+x4cCnk51HITw3uzvYn1D4xx/bM/gNqt4Z2cxhRezH0dRSMuSa+vYTz6Aj7N6HdXGJx+Kd16aFJCeE8QNdngS0qP5x6sNBdxPxK7IGncjzkivqvWekn5G1sj8tId1EBeoW9pbZuOHsDd+9dmeguG7m1P6ZrqxrOiYVn3jS2qVh4660LninNeK+3Fc+6j6m9lq04fHmfq63Y2S51z9LWfMu4W2plSHyT1NIQ6TncA3xXiuWjxDqnkNyDdmz4ABrPGTM=
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1V1tug0AMzD/cIpBIPWhIJdSeqdBH1F6qrMSq7nQ8a5bUkj+SNWt7GD84tYfDadXjoq+gHZx1xn6vnhfNMjTaNvl/M/ZZ5jWufNaL51leUX/evSo2Jr2DMz5/c+I8rv+dwX4WOaFtKb5kf2nq8vlsf+5gtqX4nhe/T8R34sd10akyH/zvZdHH5u//ER6kZ6/Nb50q8E45vZN3j5zOtlMBO/us4nmO3+Y/NByPaC6Rd8tkNnFiXXi4pzhHBzvlx8MC8/byU3Vh6zXdqXiauRzhX5RP0XdlccDch7X2esevF5+tBw9LLz6Gp+Uw48BE/GINsjrGvmk5v4XrnmRs1RxV8+MmOL+173mytTer2TZDbh6f7G/GkcwBVdN7ayPSy6fCnQ/ibG98DGfEt9SzFIej/Y/VY6k2LL6Z7x+ECyUO12IYiQ/xnQkX1Gz0+ktp92N5XzbiYnPw+qLXW6L3ejl4swAF8cSz2l0kyr179cbot4Dty7aH4O6KvFIzsjY+bwfEWdS1sZnJ9ttSzN5+qt4NcmZu9bxUc1XVbWk32Mqdcb1P7assJ7Qp5Vsb35eIp1ZUj0nYI+/Z98R/ioqPzbl77HtDsEbGAv8Yjuw7M50Nwh/uV4gJ60HR2PAOr2+o72DshcpvxCbpNw/qFrM=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="175.834" y="32.7497"/>
-  <object id="63" template="../obj/gold.tx" x="368.333" y="70"/>
-  <object id="65" template="../obj/enemy.tx" x="40.3949" y="76.4357">
-   <properties>
-    <property name="enemy" value="Green Wiz3"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="472.039" y="390.454">
-   <properties>
-    <property name="enemy" value="Bird"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="210" y="351"/>
-  <object id="69" template="../obj/treasure.tx" x="502.667" y="209.333"/>
-  <object id="70" template="../obj/enemy.tx" x="263.323" y="118.856">
-   <properties>
-    <property name="enemy" value="Green Wiz1"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="502.667" y="295.333">
-   <properties>
-    <property name="enemy" value="Green Wiz2"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/door_up.tx" x="272.333" y="480.667">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/door_down.tx" x="520" y="17.3333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="80"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_12C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_12C.tmx
deleted file mode 100644
index efbfec4fd2e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_12C.tmx
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="82">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzVl9ENgzAMRPmtRDdgHpbopLQdrvQjUhTlbN/FFHpSfogVv5iLA+ttmtY/Gq3QXEauZR5js8TuDcVGGY+UlefL5zEerW3P/9zHa8YxFuMVxPB57Oz+yjtcxPq1eZT5eq7mqNl6o437BV9hVIbqwR4DivNqVSuLT5HnuV681cvP1pX5mLuuKNMD3hoZfAqnsr6aj41l9m+dYUVv4Nd27cc9vqbVY1g2rx4MV82XdX4Rn8JV2Dw+tp9G1PMBemeRMxy9lyJciAP5yuPz7mwrj+XFSLzHh2ql/sOwfJHaIVnfGEgoRuVjNNI3Ve+drRG+I/oOy2d5MIMv4/8o2qsi3u89Q72C7RFKP0Eso+MD6IymQg==
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztwzENAAAMA6Aes13vtbEDEnpJVVVVVfXpAffWXM8=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJy1WO1Ow0AM689uHR8v2g3tRTc+Hoge1JJlnFxaIFIFdFnOyTm+HNNxGE7L8zEOw+UwfNm8/Dwvz8v6N9tt8Xta/J+X5238/u7D8acfx8HT/NV3Wtdunz8uv7+OPtZE60xHv27DVsHFvhG29jmw9DA23/sYY+cc3k0NnM2EC7kwplmwRBi5JlgXe9jDewty4tqBM3gHzrg9AkbGgnfMNbxreUR1xXoXw9F5rdu7rKO1d/lNhjf6TrnjOJHttVtDsWT59Yy5gGdPHLar5HkN+nkvxqj3XW9F+8Z8czXeg7HtoXLW5cH11Vr9t/Vy1c8j/fyNVTSwqju971U5wcaakunJVk6772lvwMetzXk4LWT8kZ643PWc1v1XbFEfas329JWeVc2uh9o5DT/0oMMT7avyJOKo6+GKRrPfvM5LUSyXp/pmuVTqnumOzk9RLM0x4soefcvmtijWTfYv6iPEB0+4V6L+qOJ3/IWh5neqTaYhrvYav5eni5nNGnzOujm3p8mqS5V5uMWsav2W2TWLoTxVHsDmovZUcFfnebZsdtI5mt/vnSe28j/TvkzLKnUAN1SHee/upgbZXQT+bsZ1c3WmNeCN02HWv+r5Do5k99XoDqV2pVleezLjPPYsm3+cMb8rvcjnF2YP4Kv0cXRHg45U7qO9/FCLk6x1PuT3zSwecs44gPrvvTNl/0OpYtxzNm3B9xf3wa1zxScg+fpc
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztl70SwiAMgFmce7rqZu/8fxyfUF+ibjr4c119FB/ApTkxpQ0JSev1/JYCJSGEEMC5PxYs+zZgAByN9V8TZBfM/muvPFLUG0PhlUvFsaYCmVXLv4vQjpzQfxDqjSXkh5PxmF1iEZMSsB0Q13OBLrw+T1SfMXSVdBcxv+J74JwoD2tFzeuWOA7mrqyPS0F3SQLiFc6WvuOGczZw9hoQe3bH5v5QXGvlcI4vLNctRTflC+t4y1Gdihnr/dYlXN9uTKzQAfL/y9XXtAmYf+hu1/bO4uZ8fAdoapOgcUfYVd9x5twk+24DJLkUI72Hh9gnyvtvpdA+4O7zh/vk+q3IojqSdxCFVtwNnTf3OB3d
-  </data>
- </layer>
- <layer id="7" name="Walls of Trees " width="40" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzNV0luwzAM9N35RezkqW5Rt3+q1cUt0JsfVAuwAmIypJbITQnwkJASRyKHok+Hpjltelz1DbQjtk6s+Sv18d9XRXEbJmlzBCOezTrDMcEnBZslDvDg+lnBIGOxc9bAliMz1Mg3xIphPO+ITWL8ItjYGe6BL0X6DHxD2zQPqz62fK9gt3xy9rPwvR6u1/Zg0+zBR9qG9vr3RPYL+tLa+CRHlm1P5GYH99xDPwn8WjabxDFBHNw3+E4GvlgN+vr9ET7O4LyD+BIT8mMmeLUcp9RRrljnYGLl+N48Hm7M8d5i3Z3G40HhWokgr1PxIadwDpC1+5TY7xBX4CfrRYznJXmVb9QSd7/E/iDnt/pYDe6Oq/+zkm/EVYO/udwIMwfLVwkuL6OR45I7xLl1afL7nZQS/t4qo7If47I1YzGcOfMJk9BvWe30Ss5id8i+jz6Ne8X+6H0WiCXxyV7D6j5lhkGRXMDZiPUOjCUx4Cx/Fr3Get9i3yCsT6WswblM4sb1NWeDVJ76mmffQ6z//OfZJYbP15b19sfe9r3xxXp0X+GOrTNab4d1jyPMHsGmfY+x/3F+wb6aio31Z1yH3zIaN609tL00/QVzlAuo
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="527.167" y="104.583"/>
-  <object id="63" template="../obj/gold.tx" x="528.166" y="116"/>
-  <object id="65" template="../obj/enemy.tx" x="416.084" y="93.1663">
-   <properties>
-    <property name="enemy" value="Faerie"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="527.667" y="87.333"/>
-  <object id="70" template="../obj/door_down.tx" x="328" y="353.333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_down.tx" x="520" y="368">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/door_down.tx" x="208.667" y="256">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/door_down.tx" x="279.333" y="304.667">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_down.tx" x="56" y="143.333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_down.tx" x="296.667" y="145">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="472.333" y="256.667">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="160" y="191.333">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="272" y="422.667">
-   <properties>
-    <property name="enemy" value="Faerie"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/enemy.tx" x="280.667" y="215.333">
-   <properties>
-    <property name="enemy" value="Faerie"/>
-   </properties>
-  </object>
-  <object id="80" template="../obj/door_up.tx" x="273" y="480.5">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12B.tmx"/>
-    <property name="teleportObjectId" value="73"/>
-   </properties>
-  </object>
-  <object id="81" template="../obj/door_down.tx" x="89.2488" y="404.978">
-   <properties>
-    <property name="teleport" value="maps/map/grove_12C.tmx"/>
-    <property name="teleportObjectId" value="80"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
index bbb8e33cc25..bc9d645bc50 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
+<map version="1.8" tiledversion="1.8.5" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="6321" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBgF6ECah4FhFx4sy0M7e/EBatuL7E98gNr+JuRPdECpvfjiczfU7J00iG9S/YkOhqK9yGmJ1LCjpn+Hu7113BAMA8SUVzA91MhPxACYPdQsN9D9jQ3s5aGOP7HZX4/D7loa2IdsL8xPMPtroeGwh8zyCQABdykZ
@@ -17,7 +17,7 @@
  </layer>
  <layer id="2" name="Walls" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJzbwcPAsIMOWAYN08NOUuxFVmPCxMBwGQ82Y6K+f2H24gPUtBfdn/gAMf4m1V5SAKX24ovPK1C3XCIxvom1lxIwFO1FTkuwsBsI/w53e6czQjAMECqvQACmh1x7Sc2/MHtBNC4zSSknsfkbl724/Enr8pmQWeTUg7j8jS8+CdkLAMkr4wk=
+   eJzbwcPAsIMOWAYN08NOcu01YWJguIwHmzHRzl58gNr2IvsTHyDG36TaSwqg1F588XkF6pZLJMY3sfZSAoaivchpCRZ2A+Hf4W7vdEYIhgFC5RUIwPSQay+p6QtmLzXLDXR/47IXlz/JsZdYf9OyXsDmb3zxScheAFQQ6SE=
   </data>
  </layer>
  <layer id="3" name="Clutter" width="30" height="17">
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgFgwkwM2MX/8BOX3fQGtgJEqfOnkh1gxXYkuB+UTYE+w/1nUIUGOrhPRgALG1/wpNnKQ1nZx7K9NMaSEDT8q8BsHs64wBYOsQAAEnMBuk=
+   eJxjYBgFgwkwM2MX/8BOX3fQGkTJEKcumkh1gxVEkuB+UTYE+w/1nUIUGOrhPRgALG1/wpNnKQ1nZx7K9NMaSEDT8q8BsHs64wBYOsQAAASqB9M=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_10.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_10.tmx
deleted file mode 100644
index ba567f77252..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_10.tmx
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8IJqXgWEXDyqO4sUujg2D1JIDZHkwxXYCxXZjEccGpIlUhw72AvXVc6OK1XJjilHbXmLDExlTw15s4UwKGEn2gtLBHirYK01iPFMrH5ETZtQI55FsL764pra95JhHC3uJKSspKZ/ruDExKF/C3FSLRR5ZHTkAX96E2UsoXxMCAC9+QjQ=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFFOFfXMPH3oHyy2DGo/E7vPBMzoF3w0jCC9gReNRe8rEMD34+KRgAjBcb9Q==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzbwcPAsIMOWAYNY1NzmYlyTI69ZkB9pIK1LBD8i4uBYRHn0LIXX/gxc2IXB9kHwjD7qe1fkNm4xGlp70xO2oXzQNpbwQ3BJkTGL7XzkQma33HFLzIwoZO9XGhhTwt7sQERFtraix7XyLiJG4GpYS9yuOLzO8g+Tk5ImHNROR8Rsnc50L4VnOT7dzojAoPyJIyNbi+yOhAG2Qtjk2MvuhoYRrcXFC641BIyEwAw/uG+
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8wIyJNHF0YEKkOmqA5ZzUsVeCjf724gvPyzjkqOVfUgGt7eXixC4+1P0LMmclFr/hil9kQE//0hq4cQ20C0YBDAy1dIVcTk5nxM7GBmDyg9m/APFuDHI=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="271">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="48" template="../obj/treasure.tx" x="95.6663" y="41.1666"/>
-  <object id="50" template="../obj/enemy.tx" x="168.277" y="57.2669">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/gold.tx" x="96.6667" y="51.3333"/>
-  <object id="64" template="../obj/door_down.tx" x="296.667" y="87.5">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="271.333" y="190.667">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/door_down.tx" x="128" y="224.667">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="104.667" y="143.333">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/door_down.tx" x="192.5" y="125">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="327.667" y="225.333">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_10.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_11.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_11.tmx
deleted file mode 100644
index d23dacaa25e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_11.tmx
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8IJqXgWEXDyqO4sUujg2D1JIDZHkwxXYCxXZjEccGpIlUhw72AvXVc6OK1XJjilHbXmLDExlTw15s4UwKGEn2gtLBHirYK01iPFMrH5ETZtQI55FsL764pra95JhHC3uJKSspKZ/ruDExKF/C3FSLRR5ZHTkAX96E2UsoXxMCAC9+QjQ=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFFOFfXMPH3oHyy2DGo/E7vPBMzoF3w0jCC9gReNRe8rEMD34+KRgAjBcb9Q==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzbwcPAsIMOWAYNY1NzmYlyTI69ZkB9pIK1LBD8i4uBYRHn0LIXX/gxc2IXB9kHwjD7qe1fkNm4xGlp70xO2oXzQNpbwQ3BJkTGL7XzkQma33HFLzIwoZO9XGhhTwt7sQERFtraix7XyLiJG4GpYS9yuOLzO8g+Tk5ImHNROR8Rsnc50L4VnOT7dzojAoPyJIyNbi+yOhAG2Qtjk2MvuhoYRrcXFC641BIyEwAw/uG+
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8wIyJNHF0YEKkOmqA5ZzUsVeCjf724gvPyzjkqOVfUgGt7eXixC4+1P0LMmclFr/hil9kQE//0hq4cQ20C0YBDAy1dIVcTk5nxM7GBmDyg9m/APFuDHI=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="271">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="48" template="../obj/treasure.tx" x="95.6663" y="41.1666"/>
-  <object id="50" template="../obj/enemy.tx" x="168.277" y="57.2669">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/gold.tx" x="96.6667" y="51.3333"/>
-  <object id="64" template="../obj/door_down.tx" x="323.667" y="89.5">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="193.333" y="165.334">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/door_down.tx" x="128" y="254.167">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="104.667" y="143.333">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/door_down.tx" x="192.5" y="125">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="327.667" y="225.333">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_11.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_12.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_12.tmx
deleted file mode 100644
index 4761a990d6e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_12.tmx
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="70">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8IJqXgWEXDyqO4sUujg2D1JIDZHkwxXYCxXZjEccGpIlUhw72AvXVc6OK1XJjilHbXmLDExlTw15s4UwKGEn2gtLBHirYK01iPFMrH5ETZtQI55FsL764pra95JhHC3uJKSspKZ/ruDExKF/C3FSLRR5ZHTkAX96E2UsoXxMCAC9+QjQ=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFFOFfXMPH3oHyy2DGo/E7vPBMzoF3w0jCC9gReNRe8rEMD34+KRgAjBcb9Q==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzbwcPAsIMOWAYNY1NzmYlyTI69ZkB9pIK1LBD8i4uBYRHn0LIXX/gxc2IXB9kHwjD7qe1fkNm4xGlp70xO2oXzQNpbwQ3BJkTGL7XzkQma33HFLzIwoZO9XGhhTwt7sQERFtraix7XyLiJG4GpYS9yuOLzO8g+Tk5ImHNROR8Rsnc50L4VnOT7dzojAoPyJIyNbi+yOhAG2Qtjk2MvuhoYRrcXFC641BIyEwAw/uG+
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBg8wIyJNHF0YEKkOmqA5ZzUsVeCjf724gvPyzjkqOVfUgGt7eXixC4+1P0LMmclFr/hil9kQE//0hq4cQ20C0YBDAy1dIVcTk5nxM7GBmDyg9m/APFuDHI=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="271">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="48" template="../obj/treasure.tx" x="95.6663" y="41.1666"/>
-  <object id="50" template="../obj/enemy.tx" x="168.277" y="57.2669">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/gold.tx" x="96.6667" y="51.3333"/>
-  <object id="64" template="../obj/door_down.tx" x="296.5" y="120">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="271.333" y="190.667">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/door_down.tx" x="128" y="224.667">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="322.167" y="54.833">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/door_down.tx" x="192.5" y="96">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="327.667" y="225.333">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_12.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
index d2d4b5eb67a..7971f951003 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
@@ -1,39 +1,286 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="65">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="83">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
+ <properties>
+  <property name="dungeonEffect">{
+  &quot;startBattleWithCard&quot;: [ &quot;As Foretold&quot; ],
+}</property>
+ </properties>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
+ <tileset firstgid="6321" source="../tileset/buildings.tsx"/>
+ <layer id="6" name="Collision" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwWAFu3ggmJAYsQAA2igDGQ==
+   eJztyDENAAAIwDAE4F8M6jgQAC9Jm+xZBAAAAB9UTtu7auBAAxk=
   </data>
  </layer>
- <layer id="1" name="Background" width="30" height="17">
+ <layer id="1" name="Background" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFo3gUj+JRPIpH8YjAAJnxGPY=
+   eJztw7ENAAAIA6Dufu3lHT1CSEgA4Oyoql8WoAkY9g==
   </data>
  </layer>
- <layer id="2" name="Walls" width="30" height="17">
+ <layer id="2" name="Walls" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzN1G0KgCAMBmD/myewLlZnqa7V590yYjBkzW1INBhBNR/fCJfGueWDbrOWzAzBua157z7Uc+H5be7pytUqsDV5c5PKKrWlriSnJrfEtZglW+J2RhMqGvNy/y7sKRbeq50Xu7Xz/tGVlNU9U8/eZo5p7jC6LWNz3xlMal3NOUnZby5nas9Jyqbckql1sT35p7EL90qmxc1nsKvdP+4Lkd3cuQ==
+   eJzt0mEKgkAQhuH5Gyr439WD1VmqW3QWM72bKzYwLO5k0xcRjPCysqiPu9qXRL3neZ7n/UGnimgo8x2r75iPON4ORO1zTLuDbWkuba0Vbafmnj61LSbCzn3HvTXG9Wr/Lr9T8+I6xHqXg8+li16vts+/ckO9jl2Nd6fYtbD9U+d432h0g2Jr+8xmMLqanXMRpmZvuUgztS/FmnR5Dm1Km5OunH/3mTPAN3+e
   </data>
  </layer>
- <layer id="3" name="Clutter" width="30" height="17">
+ <layer id="7" name="Walls(Ex)" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRMAqGFpDlGWgXjIJRQD6ApV96p+ORZi82AHOD9CBwyygYBYMFAAAfygFw
+  </data>
+ </layer>
+ <layer id="3" name="Clutter" width="30" height="30">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgFIxm0UVndKEAAWR7K9EtTqB8doMfhaJwOfTCaf0cBOQAADEIDdQ==
+   eJxjYBgFo2AUjIJRMApGwSiAgDYqqxsFCCDLQ5l+aQr1owP0OKRnnNbxMzDUA3EDPx0tHQFgNP+OAnIAAPloBR8=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208.333" y="270.665">
+  <object id="38" template="../obj/entry_up.tx" x="208.333" y="478.665">
    <properties>
     <property name="teleport" value=""/>
    </properties>
   </object>
-  <object id="48" template="../obj/treasure.tx" x="208.174" y="46.0151"/>
+  <object id="65" template="../obj/gate.tx" gid="4125" x="208" y="384" width="16" height="16">
+   <properties>
+    <property name="dialog">[{
+  &quot;text&quot;:&quot;A big gate is blocking the path&quot;,
+  &quot;options&quot;:[
+    { &quot;name&quot;:&quot;go away&quot; },
+    {      
+      &quot;name&quot;:&quot;unlock with blue key&quot;,     
+      &quot;condition&quot;:[ { &quot;item&quot;: &quot;Blue Key&quot; } ],    
+      &quot;text&quot;:&quot;The gate is unlocked&quot;,
+      &quot;options&quot;:[
+        {
+          &quot;name&quot;:&quot;continue&quot;,&quot;action&quot;:[{&quot;deleteMapObject&quot;:-1}]
+        }
+      ]
+    }
+  ]
+}]</property>
+   </properties>
+  </object>
+  <object id="66" template="../obj/enemy.tx" x="176" y="400">
+   <properties>
+    <property name="enemy" value="Doppelganger"/>
+   </properties>
+  </object>
+  <object id="75" template="../obj/enemy.tx" x="96" y="320">
+   <properties>
+    <property name="defeatDialog">[
+  {
+    &quot;text&quot;:&quot;The doppelganger reforms, mysteriously.&quot;,
+    &quot;loctext&quot;:&quot;&quot;,
+    &quot;options&quot;:[ { &quot;name&quot;:&quot;Leave it.&quot; } ]
+  }
+]</property>
+    <property name="effect">{
+ &quot;lifeModifier&quot;: 15,
+ &quot;changeStartCards&quot;: 2,
+ &quot;startBattleWithCard&quot;: [ &quot;Fellwar Stone&quot; ]
+}</property>
+    <property name="enemy" value="Doppelganger"/>
+   </properties>
+  </object>
+  <object id="74" template="../obj/enemy.tx" x="211" y="252">
+   <properties>
+    <property name="effect">{
+ &quot;lifeModifier&quot;: 15,
+ &quot;changeStartCards&quot;: 2,
+ &quot;startBattleWithCard&quot;: [ &quot;Fellwar Stone&quot;, &quot;Frozen Aether&quot; ]
+}</property>
+    <property name="enemy" value="Doppelganger"/>
+   </properties>
+  </object>
+  <object id="71" template="../obj/enemy.tx" x="123" y="368">
+   <properties>
+    <property name="effect">{
+ &quot;lifeModifier&quot;: 10,
+ &quot;startBattleWithCard&quot;: [ &quot;Hesitation&quot;, &quot;Hesitation&quot; ]
+}</property>
+    <property name="enemy" value="Blue Wiz3"/>
+   </properties>
+  </object>
+  <object id="67" template="../obj/enemy.tx" x="240" y="400">
+   <properties>
+    <property name="enemy" value="Djinn"/>
+   </properties>
+  </object>
+  <object id="82" template="../obj/enemy.tx" x="208" y="352">
+   <properties>
+    <property name="effect">{
+ &quot;lifeModifier&quot;: 30,
+ &quot;changeStartCards&quot;: 4,
+  &quot;opponent&quot;: {
+    &quot;startBattleWithCard&quot;: [ &quot;King Suleiman&quot; ],
+  }
+}</property>
+    <property name="enemy" value="Djinn"/>
+   </properties>
+  </object>
+  <object id="80" template="../obj/enemy.tx" x="288" y="312">
+   <properties>
+    <property name="enemy" value="Blue Wiz3"/>
+   </properties>
+  </object>
+  <object id="68" template="../obj/scroll.tx" x="96" y="352">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Storm Crow&quot;, &quot;count&quot;: 1 } ]"/>
+   </properties>
+  </object>
+  <object id="69" template="../obj/booster.tx" x="96" y="368">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;editions&quot;: [ &quot;STX&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 10,
+    &quot;rarity&quot;: [ &quot;Common&quot; ]
+  },
+  {
+    &quot;editions&quot;: [ &quot;STX&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 3,
+    &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
+  },
+  {
+    &quot;editions&quot;: [ &quot;STX&quot; ],
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 1,
+    &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
+  }
+]
+</property>
+   </properties>
+  </object>
+  <object id="78" template="../obj/booster.tx" x="304" y="320">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 10,
+    &quot;rarity&quot;: [ &quot;Common&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 3,
+    &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 1,
+    &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
+  }
+]
+</property>
+   </properties>
+  </object>
+  <object id="81" template="../obj/booster.tx" x="320" y="368">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 10,
+    &quot;rarity&quot;: [ &quot;Common&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 3,
+    &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 1,
+    &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
+  }
+]
+</property>
+   </properties>
+  </object>
+  <object id="79" template="../obj/booster.tx" x="304" y="304">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 10,
+    &quot;rarity&quot;: [ &quot;Common&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 3,
+    &quot;rarity&quot;: [ &quot;Uncommon&quot; ]
+  },
+  {
+    &quot;type&quot;: &quot;card&quot;,
+    &quot;count&quot;: 1,
+    &quot;rarity&quot;: [ &quot;Rare&quot;, &quot;Mythic Rare&quot; ]
+  }
+]
+</property>
+   </properties>
+  </object>
+  <object id="70" template="../obj/gold.tx" x="96" y="384">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 250,
+    &quot;addMaxCount&quot;: 250
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="76" template="../obj/gold.tx" x="320" y="320">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 250,
+    &quot;addMaxCount&quot;: 250
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="77" template="../obj/gold.tx" x="320" y="352">
+   <properties>
+    <property name="reward">[
+  {
+    &quot;type&quot;: &quot;gold&quot;,
+    &quot;count&quot;: 250,
+    &quot;addMaxCount&quot;: 250
+ }
+]</property>
+   </properties>
+  </object>
+  <object id="72" template="../obj/treasure.tx" x="123" y="352">
+   <properties>
+    <property name="reward">[{
+  &quot;type&quot;: &quot;randomCard&quot;,
+  &quot;count&quot;: 2,
+  &quot;colors&quot;: [ &quot;colorID&quot; ]
+},{
+  &quot;type&quot;: &quot;item&quot;,
+  &quot;count&quot;: 1,
+  &quot;itemName&quot;: &quot;Life Amulet&quot;
+}]</property>
+   </properties>
+  </object>
+  <object id="73" template="../obj/treasure.tx" x="192" y="256">
+   <properties>
+    <property name="reward">[{
+  &quot;type&quot;: &quot;randomCard&quot;,
+  &quot;count&quot;: 2,
+  &quot;colors&quot;: [ &quot;colorID&quot; ]
+},{
+  &quot;type&quot;: &quot;item&quot;,
+  &quot;count&quot;: 1,
+  &quot;itemName&quot;: &quot;Spirit Guard&quot;
+}]</property>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_7.tmx
deleted file mode 100644
index 7a04e5230b7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_7.tmx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="55">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybx8nAMG8Uj+JRPIpH8SgexSMCAwBydkzC
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzV1G0OgjAMBuD9H5wA5GB6FsRj8eXdHCGLr0s73k5DYpOGBCgPha1j5dx4QrZJMjW32rm50vNa/86N1zdzCcdcTIRt6ZcxWZt1U7NTvvHDczbjSqbW90TajHshTc1uCvuNbkOYaGPdt64l/t1N/1sucB2Uus+Qg/+0h4yPZh/uWwvdVrC19SWZ0nMtcxJtdHBuMKZ1Tko27u0YR6bVRfvu94xu79/njswSN63BvWJ9f8wX9L/jXg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFowAVPOYbGHv/D5C99ADEhim1wx5bmD7iIU7dKKAMjOajUTBYAQCaAAjn
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="207.632" y="272.303"/>
-  <object id="49" template="../obj/entry_down.tx" x="208.488" y="144.557">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_7B.tmx"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_7B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_7B.tmx
deleted file mode 100644
index 476cd6b177b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_7B.tmx
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="73">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MVDXxwFtFMWSNMbSPOM2jtq76i9o/aO2jtqL6q9e4G4npt+dtYC7doDtHMnneteEN4NxAD/oTSv
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzr5GRg6BzFo3gUj+JRPIpH8YjAAGRZIuw=
-  </data>
- </layer>
- <layer id="7" name="Floor" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJz7w8TA8GeQ42YGBoYWJNzKQB97FRkZUIAy4/C2dz/QnngmiJ2xQPoghfY2kxBnMD9Tw6/I4TeTGTXtoOPZzLSxl1hAbXtB8XaAETeGxS817N2PZC6htELN+CUnbOhpbzNSugKlv9HyanjZux8tT1FaTg4EBgB/d7C0
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMAooA494BtoFo4BYAACV4wDv
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208" y="224.543">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_7.tmx"/>
-   </properties>
-  </object>
-  <object id="50" template="../obj/enemy.tx" x="206.644" y="57.6553">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="41.5904" y="125.514">
-   <properties>
-    <property name="enemy" value="Djinn"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_9.tmx
deleted file mode 100644
index 6d60fd01b32..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9.tmx
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="89">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBj8QJYHgkFAmgeCh7O9u3ggGAR2IrFHAXkAFp7IOIqXgSGal7DYLiqH/06kNAUDoHS1ezSOKQLY8ia2cCakhhSAnjaISVe49NICDFS6omf5PBLsxVUOUVI+AQAFOSFt
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFo3gUj+JRPIpH8YjAAJnxGPY=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzd1F0OgyAMAGDiK/ME6i2Ih9nOMnctt7lT7EKjAZKmE/sTtwebNISIfhQb5pNz8x+yJyl559I694jj2KSxZMjzc7ufW56D+YwjBLg4Qp7fBbamXmxywdlSV2NKbIlrMTlb4g4x3813jmQeVtZAdsZ6h0qttb6isbcrjaO4vz7nV+6rEpK+wmsXo9tn++a3z5PWe/XJXPuu5p7kbOxumdp7ktq1/8uZWhfbk09u2QNY4E4C0+LSd0qvd4b94/wAfcvfsw==
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBi8wIKJgeEyHmzJRBs7rxAw9xKV7SbGTmrbTYqd1LKbHDupYfdlHPrQxYlVRywwozCeTEbtHdT2gtLFDEbs4vj4IDCNkfx0BQLXcNiND4DsvE6FsoMUu6llJ7F23+ehvp3Idk9nhGCYG6YxIsRoYSc6gKV1ctMsDAAAHFAnkg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBj8wIwJlW/ChF0dtcFKXgaGVbyYbFqB+zwQ+ijQnmO8mOxRQB5ATz+4xHGlK3qlt1FAPtjERl99IHCNwnR1fTRdDTkwnRGC0cWGGgAAA7gNsQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208.333" y="270.665">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="50" template="../obj/enemy.tx" x="207.402" y="64.0586">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/treasure.tx" x="208" y="47.5"/>
-  <object id="83" template="../obj/door_up.tx" x="256.5" y="240">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9B.tmx"/>
-    <property name="teleportObjectId" value="87"/>
-   </properties>
-  </object>
-  <object id="85" template="../obj/door_down.tx" x="144.5" y="64.5">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9C.tmx"/>
-    <property name="teleportObjectId" value="88"/>
-   </properties>
-  </object>
-  <object id="87" template="../obj/gold.tx" x="195.667" y="40.6667"/>
-  <object id="88" template="../obj/gold.tx" x="221.667" y="41"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_9B.tmx
deleted file mode 100644
index 06c06d6b6ed..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9B.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="90">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBjcYA8PA8NeHsJi1AZRvAwM0byExUbB4Ae7eDAxvvjFpp5aYCfQLFkap10QkMZiBzH2Uuo2bPYSE570CBNqA3S/IKcrbGmNlulqFEDAfTqEKXpaxZbmqQmwpRtK0xEAol4mAQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFo3gUj+JRPIpH8aDGMjwITIk5AElyF8c=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzd1O0NQDAQBuDG3zIBthDDMAvW8jmFhRAkp5y+14iES970B+3TSy6tfaXqFxIZQfbkgVKtzycLnnP374vZzetdNYAt6RcxURt1JSZiI66LabMRN54zeuek3tFILv5ZEjr2GzO9mi5Xf3HR+po7bHO1F50rOj/cXPWObrTZlZb1WejVvDpX8k5K7DtT+k6its2UutQuNR+b6eKae2hJ708zAaNd3yU=
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzd1AsKgCAQBNDVM0nURatzZdR1ZKkgQm3XxogGRBT1IX6IvpvWEvlM6Wwdc75ZdwLbEhNta0yUXWIibJ+Yd+2XjpOmeXhO7idu7O2+4UpT6vI+RhPvz7U5vSm/V5wlYefC5gr4OzQ2ytTYaPNsD2a7b1wfxe3tGmatBJK6Kjg=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBjc4CMvA8MnXsJi1Aa8fAwMfHyExYY6uM8z0C6gPTBjIk7cBIc6XOKDGTwkM52Sqw8G/pKpn1x9AwmuUZiurtMpXY2EPE4vMJ0RggmJDXYAANAXD44=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="87" template="../obj/door_down.tx" x="273" y="209">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9.tmx"/>
-    <property name="teleportObjectId" value="83"/>
-   </properties>
-  </object>
-  <object id="88" template="../obj/door_right.tx" x="128.5" y="81">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9C.tmx"/>
-    <property name="teleportObjectId" value="90"/>
-   </properties>
-  </object>
-  <object id="89" template="../obj/enemy.tx" x="252" y="168.5">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_9C.tmx
deleted file mode 100644
index 0099cf8aabd..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_9C.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="92">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF2IA0D3ZxWRzio2Dwgl08mDiKl4Ehmhe7GDZ9o2Bwg71kxtEeCuIWPW0QSlfY0uEoGHoAvQ7AVVdQC2BLN5SmIwCfVx1o
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr4mZgaBrFo3gUj+JRPIpH8YjAAJnxGPY=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzt1O0JgCAQBmDprzZBtUU0TM1SrWVfU7RQRQVSV753RPSjgxdR0YcD0Rql7AuJD0HOFKFSrblOHj7n7vuL2c3jXTWAzekXMVEbdTkmYiOuxPTZiJvMGYNzlnLnqbPu7kXCfhNhr3v97rfdwdDvJQvod3VML3Tjza41r89SryZ1L+ef5Nh3JvefRG2fyXVdu9LX8ZkSlzpDhXvHBAmT38o=
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBi8wIKJgeEyHmzJRBs7rxAw9xKV7SbGTmrbTYqd1LKbHDupYfdlHPrQxYlVRywwozCeTEbtHdT2gtLFDEbs4vj4IDCNkfx0BQLXcNiND4DsvE6FsoMUu6llJyl2U9tOZLunM0LSG4iGYRMonxZ20goAANB3Jg8=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF2IAIG3ZxMRziwwnc5xloF1AXmDERJ26CQx0u8VEweIATmWk2iJ18O69RmK6uD/N0NdzKERCYzgjBhMQGOwAA5jQIDw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="88" template="../obj/door_up.tx" x="208.5" y="79.5">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9.tmx"/>
-    <property name="teleportObjectId" value="85"/>
-   </properties>
-  </object>
-  <object id="90" template="../obj/door_left.tx" x="273.5" y="226">
-   <properties>
-    <property name="teleport" value="maps/map/magetower_9B.tmx"/>
-    <property name="teleportObjectId" value="88"/>
-   </properties>
-  </object>
-  <object id="91" template="../obj/enemy.tx" x="278.5" y="107.5">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
new file mode 100644
index 00000000000..bab8a5c600f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="65">
+ <editorsettings>
+  <export format="tmx"/>
+ </editorsettings>
+ <properties>
+  <property name="dungeonEffect">{
+  &quot;startBattleWithCard&quot;: [ &quot;Manaweft Sliver&quot;, &quot;Diffusion Sliver&quot; ]
+}</property>
+ </properties>
+ <tileset firstgid="1" source="../../tileset/main.tsx"/>
+ <tileset firstgid="6321" source="../../tileset/buildings.tsx"/>
+ <layer id="1" name="Background" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzt1z0OABAMBWCbSKzu2NM4s9hE4qe0jVSHt75v4QWIzgFRcpiHsgsbaW/H5TJHNrfXu1Je60qb5r6R5M9i7lvuaK843dk+m6vT1Xyef9wNc2XvEZfb96/ezzcu1b+nZsek9DA2pqsA8yt8nw==
+  </data>
+ </layer>
+ <layer id="6" name="Ground" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJzt0T0OgCAMBeCO7eWM8aL+3kpFjkAbB2viwAAsvi95CROvBSIAADAjE11yZ9LzzHV7rMMS9dy5BKnTveu9h8vG715LL+V7v+ZY+Zlh0ZwNer0hc9fS/2C75+za+j0AAOC/EnSXGoc=
+  </data>
+ </layer>
+ <layer id="2" name="Walls" width="30" height="30">
+  <data encoding="base64" compression="zlib">
+   eJy1V1FuwjAM7WdzMAaqxIp6SRibNAa7EQyQBowjLBZ5ijGOkzJmyUqbgJ8dPztpVaVlWlfVzlXVLIxcaQ5K73uvc/+88eNrGKH0/uZ1659fahuP7Fm2yA5fI/1yaZvr8J9R4jdTgZeytTbWUtK4GDPhYOQx9rVZIoh56KIPJTE+QghvVIj37td//NoijPyZRjx/GJyBDNwl3tyeEubZrz8ruvRrBz+u/Pjp9VSADdwUv3KYpCcX4z+zOQs7h5vDtLQNNlH/vOb3gU8p3O5OTNKJu61H1Dh6yPAfcNtQJynuYK81+XYXrtyLa/UV3j80GTPeSh/AZczTO3jduphbzTbhPgXsWX37my7YO7prH1ZhjnNv4qKviFfLI/JOMmfnBcfvQl0sgn3EQiL53jI/4EOjxIS8Q8i/jfCRc4vwzy7W59hd7zvWsT/S5tbF81KroYZxjbiFHPIcA0PrX0fFJvBlXBJX+jPOYB2CfxqmlIFiHzmX8xQ3uMp5i9j7nAvIucTUap34gpxq+eUczwl4TsLvR1qtd2Kf5Z63BXgy5nmdvx9ZPTPFJUu0HGti9cy+sZLwmumDLWuqhE9crHNBE+z3X/IL/qZ6sya8nrR7h4wbd1ScD7xm+F1+V+iDlm/wi39jAAP2Zc2gj2k+cH8h8kxY1hGPx4M7KrdvfQdY3zaL+rZf0j6jJh95/8Y5PTTqWOvrlvwCeM1RFw==
+  </data>
+ </layer>
+ <layer id="7" name="Foreground" width="30" height="30">
+  <properties>
+   <property name="spriteLayer" type="bool" value="true"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJxjYBiewBeIX0PpUYAd1PFS17zRsB4YMJDh/noA7R4FowAEZvHQzmwLKpeRIxHMpGH8jIKRB6jdbqEUjNaBCDBY4gZXmWM+SNw3WAEAA6QIEA==
+  </data>
+ </layer>
+ <objectgroup id="4" name="Objects">
+  <object id="38" template="../../obj/entry_up.tx" x="192" y="480" width="112" height="8">
+   <properties>
+    <property name="teleport" value=""/>
+   </properties>
+  </object>
+  <object id="57" template="../../obj/enemy.tx" x="384" y="192" width="16" height="16" visible="1">
+   <properties>
+    <property name="enemy" value="Wounded Sliver"/>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;item&quot;, &quot;itemName&quot;: &quot;Shell Wand&quot;, &quot;count&quot;: 1 } ]"/>
+    <property name="spawn.Easy" type="bool" value="true"/>
+    <property name="spawn.Hard" type="bool" value="true"/>
+    <property name="spawn.Normal" type="bool" value="true"/>
+   </properties>
+  </object>
+  <object id="59" template="../../obj/gold.tx" x="432" y="400" visible="1">
+   <properties>
+    <property name="reward">[{
+ &quot;type&quot;: &quot;gold&quot;, &quot;count&quot;: 250
+}]</property>
+   </properties>
+  </object>
+  <object id="64" template="../../obj/gold.tx" x="432" y="128" visible="1">
+   <properties>
+    <property name="reward">[{
+ &quot;type&quot;: &quot;gold&quot;, &quot;count&quot;: 250
+}]</property>
+   </properties>
+  </object>
+  <object id="61" template="../../obj/gold.tx" x="432" y="240" visible="1">
+   <properties>
+    <property name="reward">[{
+ &quot;type&quot;: &quot;gold&quot;, &quot;count&quot;: 150
+}]</property>
+   </properties>
+  </object>
+  <object id="60" template="../../obj/scroll.tx" x="448" y="176">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Sliver Hive&quot;, &quot;count&quot;: 1 } ]"/>
+   </properties>
+  </object>
+  <object id="62" template="../../obj/scroll.tx" x="16" y="160">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Sliver Construct&quot;, &quot;count&quot;: 1 } ]"/>
+   </properties>
+  </object>
+  <object id="63" template="../../obj/scroll.tx" x="144" y="48">
+   <properties>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Terraforming Expanse&quot;, &quot;count&quot;: 1 } ]"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6.tmx
deleted file mode 100644
index cf97cf91849..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6.tmx
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="90" height="90" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="90" height="90">
-  <data encoding="base64" compression="zlib">
-   eJztm0FOxDAMRWc1KzgBcP8rcDw0EpWiKontxP/bnfpJlaDTOplXN3FKeX4+Hs/aKFuBpTxzKM8cyjOH8syhPHMozxzKM4fyzKE8cyjPHMozh/LMoTxzKM8cyjOH8syhPHMozxzu7Pn7Y7x5czfPGp8I53fyvOLNy/W7e/bITQ/X7+zZ897P7Jk1x8zazhIP4XnmFO3cI/ZsflwF5Vl7nGazxkH1fSd+pGfNOez7QoqVxTNiPECO80cc671jBeFZs88rtlfc8/WTxg8rnp6Z9YQX5z6jctrLs9R2Nv+9vLX4i/SsPU5zbzJYyeXRuRJMzxHrFakvvd8ROR3huf0Zmd+zenDUh934IyLHjfM+VF2iWZ/2zrO2M4M1D2qORaw5evk7O94aX4t3Xbd77K5ryemsXWs7kZ6tOb0z5/diSv2w+pfa0oJad1vuT886RBNjd+6NXKf0+sI4d2WdsXtNo9fd576g1lajtlBr5l4MK+i/p6DiaWuIUYydXM7sGbUGRM9fXuezPWvmKG3clVy+g+fzPu25O8e0xzJqmRHs8VnyrRlrrPnsVaPvXKeIeVBb31pr4dUYGnbjRNUb2ly3uJ65jRqXDzJ5PvaPHEnrZVRNM2rbQtS4MbvXtfstbe7gcf0yvfe1+pnH8ehYzPcYV+c06TMkXu2yPe+6ZuJ5bdnv5VrrB8t5nni3F/H+s2VO86yBtSDai/K8Uj8gXaOvadT7/BFzWg/W/RLpebVW81xHs6535P+nRNUPETVitGfGd7aslVBk+H8r1HeP9Homg+cXXk6i83ZEFs8Hh5+ff0dfBmfZ3LZk83zQen4h5Wlmxy+u4rnF+hwwA1f0fEXKM4fyzKE8cyjPHLJ53qmfM5PFs1SfXaV+G5HBs/W5/xV9X/V5XW+NMlq/ZLguL8fM/iDa0sTL4LnN51kerPhh5pXkWfN51N8Htffn6PjoPGo590X7HXr7et9tNmZ5jM9ZvZ5ZyQHNM0LtuBVdb7CIzIM7eY6kPHMozxzKM4fyzKE8cyjPHMozh3ZNiNx+le209D6Xnsll3v4AU+R4jw==
-  </data>
- </layer>
- <layer id="1" name="Background" width="90" height="90">
-  <data encoding="base64" compression="zlib">
-   eJzt3EFOwzAURdEMQAgxZo9shUUgdTWsC3WAGrVOmtix/38vd3AnSEjOySOgUvXyNk2XgH5fz1WEMc4446wdzjg7hTPOTuGMs1M44+wUzjg7hTPOTuFMRER03n5ebkWfxa257bWvj8evRZ9RvbntUli3+z4zxrrdd6uxonXkWWtsS9bRhnt2NPJ3TO1+1Ta9do1r5i33ouX5oLrpLde5tvet1j1tFTZ95M/r2uZ72mZ3Pvr6SzsfYbvlnkc7j3YY6R3t22PL2cqwaXdjnM/l7P5szubsbJ3F2X3T2Zxdd53F2N07o/O9d7TREcaZnV2ssxu7WKs4/1tHe9UaqzkrWqsZR3u5b1l1xypbdvgbWsU52qnVWMVZ2VrBuPTsUDHP+P9Ax30rG6tYOxjPraM93Y2zbtrNONOm977PTLHITbvbRm/6bL6jN31W35J1L++z+/bwLr23NPq6MlZrjW2bdakl5+hzO7VkH30u5zAmIiIiIpqm7/fHos/kVMkX7/HGeI/zVfYefe7raxKtvoree85e87rN/WtrRxsf5f3Z6TN8a86+5dp6Oh7tvvd7r/fi2f2IvuboejngS0REREREqv0B74q6RA==
-  </data>
- </layer>
- <layer id="2" name="Ground" width="90" height="90">
-  <data encoding="base64" compression="zlib">
-   eJztnNtu00AQhi2ChGOueQWElJLwOm0R1zxJ7xJQL3kangchFVyk0iIksqpGHqYzO7OH1HY6v7SiIs4evv13vLveuGlcLpfL5XK5XC6Xy+VyuVwul8vlcrlcLpfr+HW6aJovz4d0thi7RscjzPZu//erF0O6XTjzGgqMKVspBebOOk3gYStjZ52mXL5zY306YrxLiRFa+jNRzpyPHuseo3n4YjmkOXva4iOOeckcKzaHoGxD2i3TeU/N038z7jXSHCvGOsaWcg2pb5vmpGua6/Y+hb9/tXbOU/M0x5m2ObUPOM9rcaFHPEN6u08fXw7pav/Zu27w985Qr6l4WooZnL9yeGvxCDOmXDHfTTcwnmOcjnm5J2M1pX2WZGWM+ebUY2xPa17+vLxv6+UBGEM5O1QO5fujlT2cMtbG9LTGGDwWZOWc6je49hPDeSswpPfJEM8t420sT0tzDG4ca5ylWG5hHj5fd/fe3aB/wcdS/a5RHVeGechYno5xpuPYwrln5l5Wzil9xNXPGtvG8PTNvsz3QtzA7QiycMZjf9U9HM+14rsUz6fKOUiaa4Rx/LN9eC+ycsa8U9cWlpjOlaVxPt+39fdInDlPg/fW3cP5lBZjQ99wc7NtRU9LcUMrY+y5nWUtaI2xgfWG4b1dDvsTNThzfRq7F47pZVDw9IdIrE6dz1EOdJ1Rg7Pm6al5GSvGm0vc/gJlTdfKNWM05L9B9xLpPjIlziBpHpLjuRp8tbUKdy+ZWsyQVIN1Ld/C2jw2n4716RS9jDU269jaOmV8TJ0z3f/IWVPTZNkvxuX1wtraWvaUYwb3rA5766RLX1vncqZzCsp6rl7W9vDo2pry1jiWcrbuGU3dy7G9pdJ258Rnbj0Sm7/NwctBGmdpbb0ytDuHc8maZ46cNdbweQpHy3PU3DXPlGNGkDaXk/Yxcr2qzWFy5zhT9jII1t/angfwDvumgXcOX3w+wzJ/sXCeupc5xZ4FpPqMY4ufjXHPBlLHyRwZg2qtC/G6I4jbpy6Zv8yZMSj1XJjEmXsOEjuv8ZQYB9Xaw4s9c8ndqz4WxqBST3P3Tnwehp6J0eZtcK8+JsZBtfelpTlxjPH5kbKlquXp1LnKU+ELeuw96afGFyv1OaLzLVNtbx/zva1UpaydrV14P4SmWB8c27x3TEl7Us74cLrxGOFyuVwulytT9Lf0kFx1hM+Hcftv8LtjV77gfJh2PsB55ynwTWHM8Z4T88d8fxt9r0Mq3zl7XPIJ5R4YfX2W/54XfD63lO2OJKh7iQ7VV9B2zStni//P2Gp9wXG1Pm9K5cuxTpmn4HoGafHIki9tf8q4jF1/e4BYEGOMz6fDmWnMWovj1rrSPrtDfpLyPWT7U30nMbHkic8ggVaIdYlfctOh8k3lgv2WyxquD2eQsPA7eHL6rtQvNcspqV/gAmcKuXGu5Y+vo16G80ZcXjXY0LK5uqfkHbvGMv6578L/w9ksaZxb2m1hXNuL9NrwGw+oe+D9fV/+N/QbudQ8pc9wf2p9S/PkWG8jZXJ1gHZaGeP+gXpyMSxnHFFdMvlxXGL9QVmtuqFMiAe4T6VyKGvrvesCfR/ewyPFCu57ELfg/XX4XLQ2FvD7fKjoOb4etYVj3LfyOOZYbRCvq3b4eyvUOfb9y0g7rePf0j90LHGxi+ZFxxC0F/d13/L1wX2E31EYi5lc2/CZwTXxmIUR/r6Vs3ZNrH+srLk+erNPr0l9tX7m+kiLM1ZfWcrO9WVuwvnT+aDW5pL6Qh/Bu8Zi84CSth2CWSlrqd012qz1D5T9D2RW6nM=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="90" height="90">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztm19u1DAQxpMnUCW0L23hpffhMvBUWEBa4BpwDLYgoZ6GV05BLHak6Wj8Z2LHsZPvJ1ltV9vE+fJ5PB4nwwAAAAAAAAAAAAAAAAAAAAAAAAAAAEK8e7F2DwCwcy98++bq6d/v4esqHNfuwA7oXWM5VluFdH69ai/K0kIcdLqepvbx0r4o33l7pXzYIDXGYkpOpunlND6Pw/Dy0u7G/5/3Fj9az0lvmcauvRrX7lEePn/IOChzrBCpcUeLtdQfqfNd5zo7ZBxcamymzrkfhqcx43pqjx3qLOMh986PUZ9zLMfLwY2bW6Hxr05js+Rhuo4boXUpf2vxRjueu1f0OfWHa7wVpNZSc6vHNbi+PFZ98vQn5GPLfNEaPq1Lzvek71ncS01rotd4EcoH5DzPdZbXm5IbUk5B646z8T4eE8/TEilrVufpn5d2U8jPMY1Dnu5lzWdB+pVrnjMfxTTWtO41VpQgdu08P6bvpmocik9bQouBudcr1xuhdn0ZN5b1SC+1xlIcld8tGvP478utgY4vb4npHKOFmm0OMu+XY5L7zLdGmOvlLdTjUkmNxSn1PauXe60TzYH8G/Mqree0XFfWJ6wap9Zoe0e7Th4PeTyIjXOf1pRXUNuLjyVarqTV3mM1CQfXmvSl9c7pMAyfD9vOlUP49upk7SeWi9Fnv0d9Pflt0vj7wda3nmt0HOdlTTPfvJbiaWKvvpWEvBLKH6z5GPT2E8ofLJ4OsZWYkEuNPQDJnuoXvL6kaS338OS6eE9alYTyhxJ1aRBHq9GB9ZF5+dbW0rmk1H6P4icoS++14F5BDgwA8PH32do92AfQuQ7QuQ7QuQ7QuQ7QuQ7QuQ7QuQ7QuQ6n52v3YB9A5+Xg+3ykM2r1ywI/1wE6l0d93g46z8ayF2LRuZfnN1p7F/TPlDt/3ZGfpU/4nmjOvQntraZovNYeoXXc+DRqYY+zdFyes18+VwdtnikV00rnt1znmEa5517qncEa7yKm3L+QPqX9zM+VE+vk//a6fqKxKnVOHXel5vJS+lmPU/t93F7z5hpzm3aOuc9rpehsufexd3BrkqpJqbEZOk4Lftbu4xzf1H420OK/FnRegn9b864q
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="576.668" y="1439.31">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/enemy.tx" x="607.332" y="1024.08">
-   <properties>
-    <property name="enemy" value="Elemental"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/gold.tx" x="962.75" y="594.667"/>
-  <object id="57" template="../obj/enemy.tx" x="847" y="1249">
-   <properties>
-    <property name="enemy" value="Merfolk Soldier"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="1383" y="1374">
-   <properties>
-    <property name="enemy" value="Blue Wiz2"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/enemy.tx" x="375.167" y="735.667">
-   <properties>
-    <property name="enemy" value="Sea Monster"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/treasure.tx" x="376" y="796.5"/>
-  <object id="61" template="../obj/door_down.tx" x="888.667" y="814.333">
-   <properties>
-    <property name="teleport" value="maps/map/merfolkpool_6B.tmx"/>
-    <property name="teleportObjectId" value="55"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/enemy.tx" x="1016" y="634.666">
-   <properties>
-    <property name="enemy" value="Bird"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6B.tmx
deleted file mode 100644
index 07ba294c662..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/merfolkpool_6B.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="56">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="5" name="Collision" width="60" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztz0ERADAIwDAEIBT/CvacA7iDREEbAQAAAAAAAAAAAAAAXFY5XdDL725+Ab4H2dcCRQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztw7ENAAAMAiDXPu/N/tFAQi+pqqqqqqqqqqqqqqqqqvrqAKuZS+k=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztmFsOgkAMRfkyTKI7cDugYSWuhm343JVKXIbTaEOpEB9xMky5TU5M/OpJ4U6H0mVZCQAAAAAAAAAAAAAAAAAAAAAA4CcOeZYdPae8+/9yHr+3EK5X/1t7zu7V2RorD1X9dK5G0FNI1k9fdrY+48azz7szLkbQVyj4/Z2Kr3yeqbbe/zaCvkLRuPZ5tu7KUEZPxZXfX+u5LGfLVbh21+rbtywg9w2aMWc1lcXdo3GPvOKzqFbzjt3fv5H7M0PZtTOaX3z+Sl/L2aXvC5Z3rL5d0qqvdNW+1nYP7ap9LZ1D71w5ry7ORmbJfWrIl0vn9CbB71nf+Epnck3Rt3Ht/e8TX6rKpevb5zzkK/eslH2189BsZU6n7svOND95X5CzlXNN3bVv1vpuRI6zRfz+QjrrjLLqS8hvlbHmewe7yXpy
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1zEKgDAMBdCcTvT+RxDFY7hUEAen2mD73pJm+9CSkggAAAAAAAAAgIgtO0CSJTsAn5mzAwDwypymB94xfzfdzqPuhD0ym8awP/qj1Ov+14ZZoDZ/EtR1AjqLB1g=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="53" template="../obj/enemy.tx" x="407.288" y="647.674">
-   <properties>
-    <property name="enemy" value="Geist"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/treasure.tx" x="416.667" y="523.5"/>
-  <object id="55" template="../obj/door_up.tx" x="457.333" y="956.667">
-   <properties>
-    <property name="teleport" value="maps/map/merfolkpool_6.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/plains_town.tmx b/forge-gui/res/adventure/Shandalar/maps/map/plains_town.tmx
index e1be1ee3c16..00359e187cf 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/plains_town.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/plains_town.tmx
@@ -1,65 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="4425" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
+ <tileset firstgid="6321" source="../tileset/buildings.tsx"/>
+ <layer id="1" name="Background" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlEsOgCAMRFki1/ATLyqGk6LGQ0hiSLApRWyJi9lQ4TnQjuuUckFeK7Ul2vW9ztESZDOKzNk81yfDZ5e4ufra2C9WP4LX0fC4fdh/6vdcCWbJM/wvSWY8e0AE65LMP+QF57GGGeeSOxNfeintFZhLLe4G9gqWS9jdSGQVdi7GhXMm8S45JsXleqaYKRfLNI5nKpst8S03t2q4aaZxc6vEvQCt8SCT
+   eJzr5GRg6Bxk+AUHBJOqz28QuH0UY8dN3NTHg9He5xy0tbcNDcPs1OCiv72tSOyRYi+t0xU2e5W5aG+vChcqHuh8NGovde19zoGoV7HVrbSyF1QuoadnUuwlx20wsymxl5L4HUn2YiuvKGkbEKuHWvYi0/SydxSP4sGKARuK+bI=
   </data>
  </layer>
- <layer id="2" name="Ground" width="30" height="17">
+ <layer id="2" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VEsOgjAQ7bJdcC82guE6GK+EovfQQ6AbED2CbdpJBtLPTCW+5IXS0nl9nWGE+A8OhX22BW/fgMaVZ/3pmQONkSeVjTIwz/UaQieFeCvLs4x/azSPDN27svFPjlhjp8eV40zUN9pU36OOd5VLDXOGD9IF1sruGeIhvbip5XsX0PBxjnjm5nftN8VapWMCQjUIaIiavT7fK6I7aT4Ca+ZezV3heqXcc0ozhcbliZpT4P4HTQNuPrfwmqvNqSWK9kVaTqtz9G4OuIXXEHBNQ+9I9acYUv8QAPxj31BLlP6U08MwsO/cGv4CS6dfbw==
+   eJztlUFOAkEQRT8xBGZkOAD3wKg744ZzsGCjyAo3Gg+iLInXUSIBlmB0JYegO3YnDVR3fya9g5/8ZKZTNS9V1akBjlsfdeAzoSd1jntWAbpI5x5Z73kONBK6yEmw0msBvCmPCj4nRf5lE7hSvm7+v/cz4IHwIJPzWc1U/Fx5YfLY3tue7uZrPZvanwI9cO/0ofd7ItzlP7LevtM3/TxWrhF+d3LcvluFapW4N2SfdZyPq5kvJbhawxbw2NqOdc9CXCvN9tXt48bEcENiuL6z1PNNwZXUCXCX+f7dvRXOvgnuWvk3UK+9o9LOuDc9uMvk3WGfy8zX7jrJev9pbiymDNfuOskLw43FlOFKM43Nd5Xvz/oQxf4DhdlNTFxqsbskpE48BO0qcFH1c3+IbzAxu/pSzGmAe9JJx6wNQ9mM8g==
   </data>
  </layer>
- <layer id="3" name="Foreground" width="30" height="17">
+ <layer id="3" name="Walls" width="30" height="30">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYCAOVPASqZBMUE6C+aSorcKjtpLGfsIHtrAwMIhTGW9jIWxvICuEfoVFzodMv8DMJEaNOZC2AGJLKN8bTd1eUQaGfaK4zVnCTZ69V4H0NSC+jkOPPjths8ixt5iNgaEEiEvZIPyXaOrOAu3V46Suvehhis6H2YsNYMsTpPiXEADZS2z+pba9xAJCZoLKFJiaXUhpFRsbZi8hdTB7CYUNzF7k9IqNDbOXkDpkM7GV8TAxmJocDgaGyWwQnIuFfZ4dtxwI53Fg2osPfGAlrtwD+ZfYMvUTkWmGEAC5H2QvsWmQVICrfiJkLzH1GgDz1jkk
+   eJxjYBgFo4D2YAsLA4M4FfE2FuLsDWTFLr5ACpUvLYVfnpB55KojFlBqb5wMgq0ki0oTY14VL241lbyDz78j3V5VYNyqkRC/5KpLBtqRgsMefG6gRTjrcVLPvMEev8PB3iqkcgO5LEJnw8piEI1PHbK95XjKK2LdRwpANq8Ci90wMVLsdaRi/v3ASnydSkxd/YmK4QfzA7XjBAYqscTHPinC9mLTRw2AbO8cHO0MWts7CkYBNgAAb/0jMQ==
   </data>
  </layer>
- <layer id="5" name="AboveSprites" width="30" height="17">
+ <layer id="5" name="Overlay" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFowAV/BcEEkIMDIxC9LVXGmifDBDL0tneUTD0wTxRwmxS1I2CUTCcAQDm1QXy
+   eJxjYBhYMIuXgWE2DfEcXuz2WvDR1l9WOMwftRc/+C9JX3tbeRgYdKHsU1A+PewFATZZVJpe9pIDhqK9kVIMDFFShMUosVcHjxnpwLScAcSZeNK0LhqfWHu10eTdgWnIA5qOmoH2tQBxK9ReTqA4F1oaO0Wmvao4ylNXItMwev7CZu8rmcGdruhhL756EVanEaOGVHuRyyJcbFLUDfZwHrV31N6hbO81oPh1IjEyIFbPDRr7axQMLgAASzNJWQ==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="224" y="271"/>
-  <object id="41" template="../obj/shop.tx" x="97" y="193"/>
-  <object id="43" template="../obj/shop.tx" x="352" y="194">
+  <object id="38" template="../obj/entry_up.tx" x="219" y="383" width="28" height="16"/>
+  <object id="41" template="../obj/shop.tx" x="97" y="305">
    <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
    </properties>
   </object>
-  <object id="47" template="../obj/inn.tx" x="225" y="99"/>
-  <object id="48" template="../obj/shop.tx" x="352" y="97">
+  <object id="56" template="../obj/shop.tx" x="208" y="144">
+   <properties>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+   </properties>
+  </object>
+  <object id="57" template="../obj/shop.tx" x="240" y="144">
+   <properties>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+   </properties>
+  </object>
+  <object id="43" template="../obj/shop.tx" x="352" y="306">
+   <properties>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+   </properties>
+  </object>
+  <object id="47" template="../obj/inn.tx" x="224" y="211"/>
+  <object id="48" template="../obj/shop.tx" x="290" y="225">
    <properties>
     <property name="shopList" value="Plains"/>
+    <property name="signXOffset" type="float" value="-32"/>
+    <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
-  <object id="49" template="../obj/shop.tx" x="304" y="194">
+  <object id="49" template="../obj/shop.tx" x="304" y="306">
    <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
    </properties>
   </object>
-  <object id="50" template="../obj/shop.tx" x="256" y="194">
+  <object id="50" template="../obj/shop.tx" x="256" y="306">
    <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
    </properties>
   </object>
-  <object id="51" template="../obj/shop.tx" x="192" y="194">
+  <object id="51" template="../obj/shop.tx" x="192" y="306">
    <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
    </properties>
   </object>
-  <object id="52" template="../obj/shop.tx" x="144" y="194">
+  <object id="52" template="../obj/shop.tx" x="144" y="306">
    <properties>
-    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant"/>
+    <property name="shopList" value="Human,Boros,Orzhov,Selesnya,Selesnya,Azorius,White,Creature,Instant,Angel"/>
+   </properties>
+  </object>
+  <object id="53" template="../obj/spellsmith.tx" x="157" y="225"/>
+  <object id="54" template="../obj/enemy.tx" x="16" y="240">
+   <properties>
+    <property name="dialog">[{
+  &quot;text&quot;:&quot;I am a big gate. Greetings.&quot;,
+  &quot;options&quot;:[ { &quot;name&quot;:&quot;Okay...&quot; } ],
+  &quot;action&quot;: [ { &quot;setMapFlag&quot;: {&quot;key&quot;: &quot;gate&quot;, &quot;val&quot;: 1} } ]
+}]</property>
+    <property name="enemy" value="White Wiz1"/>
+   </properties>
+  </object>
+  <object id="55" template="../obj/shop.tx" x="160" y="151">
+   <properties>
+    <property name="shopList" value="Plains"/>
+    <property name="signYOffset" type="float" value="0"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1.tmx
deleted file mode 100644
index 5d9eaf7d364..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1.tmx
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="78">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBicIJqXOHVRRKobBQhAbNjiAqNhPgpGwcCBvTyU6d9Dpv5dPAhMD32DCRAb5uSGLS6AHHbo4YdPjhAAAJpcD5U=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJwTZGFgEATiaZwQmpoYZCYuTEhfEzfxmJDdhPyHrJZSe0kJS2rbS6ydpNhFDTeQ40dq2QuiaWkvvrimt39Hmr30iF988U0ve9HLTGrbi61cJlSG0cKP1E5j5KThwWAvsWUKsekGm3kAsWqmYw==
-  </data>
- </layer>
- <layer id="8" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYEAFUzgY8IJw/NI4wWQC5lIDEHL7QAJa+v8r7YymChjpcU8NgCsM6e1vbPl/sKc/SgE90i8IDMY0TC+/0wN8I0EtpXFBrbgkxc24AHocgvIrAIdXDfs=
-  </data>
- </layer>
- <layer id="2" name="Floor and Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBicYBcP8ZiaQJZI86SHsL2XmRB4N5Hm7eRB1UcOINaPuAC5fh+1d9Te4WTvdEYErucmTk8tN6o+SsFIKCeRASzc6rghGBbutdwIMWqFLT4A8z+l/gMAkX4dBQ==
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBic4DIT8ZiawIxI80yGib1XiDTvEhXsJdaPuAC5fh+1d9Te4WQvMpjBSJy6aUSqIxaMtHISBKYzIjAs3KchidEDwPxPqf8AYAwVUg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBicwIyJOHUmRKobBQhAbNjiArQK82X8tDF3pIPlBMJ16Wi4DymAK/+i558VOOJ1tMwkHQy3+ggAfq4FRA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="208.333" y="270.665">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_up.tx" x="209" y="96">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_down.tx" x="176.667" y="210">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_down.tx" x="241.333" y="210">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="145.333" y="144.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="272.667" y="147.333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="87"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1B.tmx
deleted file mode 100644
index 70c86c2d2a7..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B.tmx
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="66">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MVDXxwFtFMWSNMbSPOM2jtq76i9o/aO2ktNe2u5GRjquelrL8jOPUjqpZHql708pLmHWHthdu7CYS8uu3fhMBtdLzEY2V5k80nFAFfPOzA=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyr42RgqCMB3+RgYKgE0sJcpOkjB08jAg+EndS2mxQ7qWU3OXZSajcldlJi96i9o/YOJ3sHKv9SYjeldpJjN7XsJMVuatuJzw2UmAMAS4AhXQ==
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy91UsOwiAQANDRRaktroy6aLyEB9B76EXcqAepNr2Gv3MYE6/ih5ESRwK0kEYS0qZ8HjQzAOAu6xRg06BuU/c8txhgkNRgxDxzgGUf4MjtdSHaL9xtj4Q5Bbs9TGQbNU/cvb5DQxv3jPZdPF+ReGG/6/IxfW2cH/29MEv2tUNMX1sVtOexfM8CTd2eeI5H13dMyBx6fP3LVbGt/DZdzI1rbO6DsTWuYgz7tOnazE8OWca04epWl8m6Y+YxTfPAVFQeUrdTWZivD+HPDP/BNwdNpp6HmKfPSJqF2qthzyF23XmDdkGsnJxVobbvGYdxjv8819ZisvX7jt6PvibmbmkxqU3vPBUvmfa96bm66kn3DVIfX0Y=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJy1lNsNgzAMRbMA6jKlP52tghBW6WMd+uKvs7SWMNy4SRRIciREgNava7ut1MwJzkQnnpkXnD9wbqbft9PdiDu/Rz9oqwQUE/nAXDjmTsSViq5su0dl29/ncTNTK7v+RBPIJTbPyy4+BtTSZX+IN7WaHvy5tDSZdGW0sDcq26dvXnLhqm/M/FyFnjfxfPbojbafasmPeoxi4fqO8o+J8Nz0hevpAjWW88r1l32QysPznuord3KINXOL4IyyxneIgZB7ZiucE+4p7iemhT4rgdTPeDRP7WsNtcPdQP2NvT2o//112OCvDnzDWr5/1xcZ9DSx
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="60" template="../obj/door_up.tx" x="207.5" y="271.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_down.tx" x="144" y="144.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_down.tx" x="176.5" y="207">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_down.tx" x="208.5" y="144.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/door_down.tx" x="208.5" y="81">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/door_down.tx" x="272.5" y="143.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="81"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1B2.tmx
deleted file mode 100644
index 09f40ab23c2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B2.tmx
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MWDwMgAWZyaOApopyyaXfQA0jyj9o7aO2rvqL2j9o7aS7q9tdzkmY9eryLbS6s6lhAGAOe3MVg=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyr42RgqBvFo3gUj+JRPIpH8YjAAOMFDQI=
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJydVdsNwjAMDHzQwi+iMAcDwFJ8wCwtr6kQ0FV45GisGhMnFidZVG3isy++4NwvduPIS4HZxLml62LqnzeZPdeyW5eChRd5iPdS5tdXk77GGNBHri6ex8Ipa23972vkH4rvfBZNODcH8g2L75xyD/Lv/fdTZN3MwAtwXnA2Id9Z4eUA91rohZoQbXg/UHqg+oFj4Hx4/oOBNwXKqeki61+VNs7cOVZszmK6/Aua7RQ/19IKzAdCm3fkm4e8KU9URn8RZ8pjHw8l9koe6lnzOPUIzoX4Tv5CNInzJ2+SVqQLYhH0uZd9DfzelH0Oit5fmPWVogPuSQqrtlRrTFvM43Mk/KX0jJ60PP8A3NxfdcaTFmh3igacCTSvC5vXb+w8W6bD0XCncE7MwMnIyedG/p/RXWbh3o67/W+Po0Zu
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJydVUluwzAMVB8gBH5JD+0tb0tlJf5Il0v7hy6X9p7EQLp9o8uxFKppxjSlGB2AsCRS4pCU6Na7PyxonLCUeSuyyuuR9FiP2SbZBjVP+o72t37sh8+3EJReczyE4PexANFYS5jTeJv1x0f7NdjzWk97OHY+L62dul8p4UzlpDP4QldD8OV5aa/Ovz4DWNMYsehagiu+vMdCOudkAieLG+cIOS/FGCt56yo65q/P2Lmhz2Uh1zs3xqaiK0HHxvm2UKqjBXAv5aInm6D6AmLQ74mxpbHF+bxx7kLkUuSqsbngznFcvfs/Eu9b8XUnci/y0Ay56feKt13L+VS8iK9XkTeR98a2SfnV/e565tzNbMhpCmD3Ib4+Rb5EvrNfvuOoIe4navwoPp/Ir8Zz/pb6M3ohYuIa4j5pTOld1n21+gkjKn+JE+LlmvO9Xvnxv6r2dvE2ERu/jbnivXaH+xfnSNtuyI5ruVA5xt607wf/12dZ
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="51" template="../obj/treasure.tx" x="400.666" y="34"/>
-  <object id="52" template="../obj/gold.tx" x="200.083" y="17.25"/>
-  <object id="53" template="../obj/enemy.tx" x="351" y="32.6667">
-   <properties>
-    <property name="enemy" value="Big Zombie"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/enemy.tx" x="85.3333" y="59.1667">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/enemy.tx" x="343.167" y="238.333">
-   <properties>
-    <property name="enemy" value="Black Wiz1"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="220" y="66.6667">
-   <properties>
-    <property name="enemy" value="Zombie Lord"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="351.333" y="136.667">
-   <properties>
-    <property name="enemy" value="Big Zombie"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="123" y="186">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/enemy.tx" x="19" y="82.5">
-   <properties>
-    <property name="enemy" value="Snake"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_down.tx" x="79.8159" y="16.3908">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_up.tx" x="73.4021" y="203.816">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B3.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_left.tx" x="320.689" y="188.137">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B4.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1B3.tmx
deleted file mode 100644
index 8ec78699e07..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B3.tmx
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MVDHEYGxOrBhqOAdsqimUcPIM0zau+ovaP2jto7au+ovYPDXkrqUUowAEnuMAo=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyr42RgqBvFo3gUj+JRPIpH8YjAAOMFDQI=
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzVlUsOgjAURYsDCp0a0HWwAN2Uie5FRXZlNGzFTy/lhZbQnzDxJg0d+HreX8bidMzVtxCMVUydtbwfcrfdI1O/+1XExTvEvWd+u1IMPk4Jcbj8Ii69E8Ikka+t/H5SeeGmX66clMK8V+FY4/2rZDbcZENFYC1iubrA3kfkSxf5/y+a09tzRL29NB/9gWPrd9Rm09coZiZ8TNeMdTPksI3NAcUI5nZkC9aKq3Phk+adaDYpV749p+/NcZxJz8K8viR/58lr7E4tLfXEnL5TxawpVk/MS9Uc7Fpjnfucu/g+JZH2qAnlvA6we2ZDv7VaHm6WXWtjogcaHsbU+2b8f0Y7PoR9ypX9F6sJM2s=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJyNVUtOxDAMzaJd9gQcg8+moOESw22qpu0catRbDAghEMwpqlkTq3maF9cJPCmq4zR2/GwnvnHu0a3ognwIwzfrfIxfgScZ8ymMIYybah19kOdqXRvjugBf2OgKdhl9YU1jX5dtcCwDyU/0bxvGOcpvyo7w0hp+eD4oX23Ue+JIBuOd5KkQ71Jv9z7nf09iBB5Its7yH+zi91PppybNJfyfXD43X/ELvsBFp84OHo9VyqOMuUptcFyX6Hepr2uXzFkszAV+JKYPpRsL+WsN3XfBtuCl3uoAcG3lWbBTc+bK8sVyTof4+uba/5IT8MD2se/sUqDGrXpe6lSW2Kx8iX/rjCxzX1ncA1KDP5m1OzX30S8436vz5npqUPUNcE6OtA864aozfHGd6T4swepDzR1sv0ZdKS6B5Pfwxz1t5YfvdtFZ7wD/k6t35g3vzm2cT8rHRDb4LhA97kbOOeoabxlqHvawbvHqqVdgA5B6ZM5OtK55wNuMnoMt3QP3bruP71E+h9j5BTSIYsQ=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="45.684" y="212.261"/>
-  <object id="50" template="../obj/enemy.tx" x="214" y="253.333">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="51" template="../obj/treasure.tx" x="399.333" y="145.873"/>
-  <object id="52" template="../obj/gold.tx" x="397.002" y="227.014"/>
-  <object id="53" template="../obj/enemy.tx" x="284.333" y="41.3334">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/enemy.tx" x="103.167" y="96.3334">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/enemy.tx" x="406.5" y="193.666">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="195" y="64">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="383.666" y="109.667">
-   <properties>
-    <property name="enemy" value="Big Zombie"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="279.333" y="134.333">
-   <properties>
-    <property name="enemy" value="Zombie"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/enemy.tx" x="56" y="162.667">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_down.tx" x="196.563" y="17.1034">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1B4.tmx
deleted file mode 100644
index a0144287b77..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1B4.tmx
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2DkgV081FEzWADIraRgcvUNpTAZBcMXDKf8S04epASDAADEMSwX
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJybxsnAMG0Uj+JRPIpH8SgexSMCAwDOljzS
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztk0sKgDAMBbMUrCdQL6YrD6Jey/q5mw0quLD5tBVcGJjdkKQ0rzIAlYLJg6bHRVsAzMZPU/CexLl7SO2gqhR4EufuSVx77roQnsTRzk1Zmrl9DjA4xjzO0c596383c+zqY33w8F0941C9QsF3lZE9QvKLd2sZ54v5xf24zL2R3y6jvdR1zcX74zL35zfMSZHfWHbiCXJ9
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBi5YAYaf/GAuII4EElAnpWAfBwJ4nEkyBMjjg7qeFH5bFCakB+wgSgc4n9IMANm7xIobcZIhkNGAd2BPQlq70LpH1jk2LCIgQB6+UCJ/djUkqIflLeQ3bkESRyfWnz5dwkOcVoC9LyPD8QgsfGVzejhSEw5Tk5ZM5wAAPwjEAI=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="384.142" y="171.315"/>
-  <object id="50" template="../obj/enemy.tx" x="167.485" y="201.702">
-   <properties>
-    <property name="enemy" value="Black Wiz1"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/gold.tx" x="231.828" y="40.3107"/>
-  <object id="63" template="../obj/treasure.tx" x="80.264" y="42.7647"/>
-  <object id="64" template="../obj/enemy.tx" x="151.667" y="215.333">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/enemy.tx" x="168.083" y="214.5">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/door_right.tx" x="4.5459" y="207.287">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="151" y="201.667">
-   <properties>
-    <property name="enemy" value="Skeleton"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/gold.tx" x="234.5" y="250.5"/>
-  <object id="69" template="../obj/treasure.tx" x="375.333" y="42"/>
-  <object id="70" template="../obj/treasure.tx" x="392.667" y="42.0833"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1G.tmx
deleted file mode 100644
index b5582eb921d..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G.tmx
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="79">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwWAEu3gQmBhxYgAAQ08EpQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzdlTsOgDAMQyuVhdNxDhbu3JsAQyWrxEn6HRg8oBo/NQkhxRDSo2v/KsU6nfAOy3o9mg+9x2bLk8nY2YvPHmYWy5PqJ3lbmMguc7R7j2BizTU2O+9hetiruVb9/8Rls4v8WdxSq/orsZE/s7/WvXuYWi+tXdWzr9ie9sxYC9v6TqSdoZ2NYpbZNf9ez+wwJubeVmQbrA==
-  </data>
- </layer>
- <layer id="2" name="Floor and Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1lW1uwjAMhiMhSkjhBIjCubYDgLgDH9cCtt8TH3eYBhyEWM0rXMcpUHWvFIkGO4/t2K0xpawzkeb96vPI29ysMSu/X/jffzb2IS2EX+Zi/0nwP4szjuz5c2jMbpBeH8Oqb8efeRJnZiwvGTvZk61k7gd6XtBWYUOc3VPy1ur2CvMZO1VzEtgbZvMOs45NNUQdIfQN5X0J+9RfTZh1bAjsrujhn7A/bsiERjX+J5Y38Xoshv/g/tq4f+Tdt8klHs3q1JW9OxE15vfeJpfPDFbhqvPTce1zIcmWs0vsb++3zpsxl97vKxE32Bers0lN2GAWypwcwtlXG8cwFvbvsMHk7z8woYPoZ8RAsyT/e4Uta3sNOWjfOCluo7FXebkQwzJ/7Gn3mWLOwsxSHaRNpuQNodfr3kkpJv/O3QG6iVtj
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBic4DEXA0MTN2H8lIv6diry4Fcnz0M9u4m1k5p2k2ontewmx050u8m1lxIwau+ovbj0kZsXYHmQHEBuPiQ331NiNzXsJNVuatqJbjcMN0PjrhGtPqKmneigEc3eZgrSPQArjCuE
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJytlTsOwjAMhiMmpJZTUFoGuAUbN8mMxMDGgEBCTFwoVRHlcShqaqsmJG3a5JesuEnkz3k4TWMhUoNNK3tWBpqKbi2xlVq7GtX+jMUGv0B7Mx/sFjvAOgS8Q1T7JcZNkK3YmMT8fPTSuCTilMgm5WxO4of+CvKn9XBBLuXAvdxO3OeuhXkPaV8ot/mwVIwqDH2mPUgDMttYClv5NzOcshZ+X13Hv98by3kvDH20Rn6Pc8M8X92RZeL41qxNSvu2ceAsXN5EV9lqI8Mc9Lxs2mnnuHeoY1pHH04IddUKv+OPwGx+rsA5R00/+Edml4G1Bm+PLRZx8rgZy7X/r6rsFLn9I6gupGji6rF0zgd4vjz0
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="69" template="../obj/door_up.tx" x="208" y="143.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_up.tx" x="208.359" y="271.521">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_down.tx" x="176" y="209.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="241.602" y="208.842">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="208.16" y="79.1689">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/door_down.tx" x="272.314" y="145.37">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1G2.tmx
deleted file mode 100644
index 4fd69654769..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G2.tmx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztlWEKhSAMx/e9dQJ5F6uzVOfyaXerUcOxXAnvVRD9YUyZ7reJIkDSBxfvZt/WAE2d/C+iHF9cLJdLcmnM3uP+PovBFjDFvcpB64PBlfIZvmQFtT4nh1tmqbzRT4mYq3s6Wy/3udyuAog3cJ1gvdxruOM8HqrruRab7l6/mlVXdxA/4jK7F6wo5lZd/CZKz4y5+s/6h42qp6jipAnAtj93
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyrZWFgqB3Fo3gUj+JRPIpH8YjAADIiAQ4=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJydlV1uwjAQhC2lVI6vAP25HC996GPfEFUvF4i4Q1vagzSjeMR4sR3TlSxE4vU33h07zv0v1sG5X+/cW5+Os2/Lfwzld8O0xrGyjmWTuZSHwPwcG7mv/Ty4xuf0++3TOXgH/o8878Kcd1/ZE7W+9+lzHy7c0c/M5zBrBFt15eLkU80tXGVirKb/O+kh2F24roeN0vvBX3O3fcocY45yOV/n5QLaVqbWrJPl6j40x3rIcmu9tExyrfdzOi0bXMw7Ffz3ZTyIeBGdredN2fDug+hijaCV/oO2vam/1vKWqJ3JLur4kN6Rq+eZNbIxFNamx2ts3es51oQ9zfVNmSWPtJybXX87E7Fd8Kf2scZFfbnWuOA1u6dS72va4blNuHjuTuZSk70XlU0+dT5VWMd4Zx7iPg6FHrDvJa4N+jP37bD3qQ49y+q11tC7gt+EJaayWfuN0f0HDRV5wA==
-  </data>
- </layer>
- <layer id="7" name="Trees" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1VVsOgkAMbPxlb6H44Tk8DQdRjMY7iZp4LGlgwqR2HyhOsj/ddmZaCoiINPIJjR0qkTqIbP9w9qtJh4H4vc95mLNxeNZOXqqG+2Nor4hbb56XZxhqkMscipfRZt65UF72F8uRUYO1G+d+CbAPTzvlNccXA8/XQx3K+ktp5TQYqtWMujneEsypv/Q+u8J+l8TO7BXg7cOv4N6wV7H3qCSGb1quztaU7tW38HzJqNv28Wu13ExTHhTYK33GtzBoNyaHEfM1d172PwNt+31Vf201zQW+OI67lAdwef8maKMPngnuodOZ2jP58hDTLOHOHdSejP7R0XwDzR5VyA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxTYRh4cGyA7T9IBTMO0VnvQIcZKQDZrcpIbA0satHj4jiUVqeqi8gD2NyLDeBzqwoJ9sHCAhRmJ6FsXGlFB485sPAnJwy1iFADiyN0t2mj8ZHllRkoA9TIs+QAXGkAV9gSm2ZgAF/6QA4zUv1Pr/yDz13ocgORp0mNDxg4xENVZww4AADo/hJ6
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="62" template="../obj/door_down.tx" x="64" y="15.3333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_up.tx" x="368" y="271">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G3.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1G3.tmx
deleted file mode 100644
index 6c945bcc2b1..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G3.tmx
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="72">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFlVsOAiEMRfs/nRUQN6ZrMa4L0b2NhDQ213aKOMSbECiPHp6F6K3LSnRnovPayjr/ReJXfKNO3PLErSx55v1xFkNUy0XZGXzU/sXhamWDr9dToL+lxJ9MPU9MXpuMtfp6XIs5W7iPCfiPl/3sqOvhoF193Ba7Xe5zVDfCrdL3eIZmcnH/vfO4Lq3N4kY+LJ+4/9556LXhG418jJxxD/doada/uDpO6rc0m4s2sqN4F8VEL8Za8/g2Do0q7cT+KutvOCptbIlYNg==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyrZWFgqB3Fo3gUj+JRPIpH8YjAADIiAQ4=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJydlVFOwzAQRC2FIsdXoBQu1x8++OSvAnG5tFHvALQchIziUcdb23FZyapar/3Gu2PXuf/FQ3Du1zv31qfj5NvWb0J5bpj2OFT2sWwyl9YhkJ9jY+1rPw/u8TV9/vg0B3Pgn+X3Lszr7itnotaPPv3dhwt39DPzOcwawVZduTj6VHMLV5kYq+n7TnoIdheu62GjND/4a+62T5ljXKNc5mteLqBtZWrNOlmunkPXWA9Zbq2Xlkmu9X5Op2WDi7xjwX/fxoOIF9HZet+UDe8+ii7WCFrpP2h7N/XXWt4StTvZRR2f0jty9T6zRjaGwt70eI2tZz3FmrCnub4ps+SRlnuz629nIrYL/tQ+1rioL/caF7xmz1TqfU07PLcOF8/dSS412XdR2eRT51PI60Qc4pu5j/P7Qh77XuLaoD9z/x32PdWhd1m91hr6Vmzk3DWmZa9j/TX+ACzueoQ=
-  </data>
- </layer>
- <layer id="7" name="Trees" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFlVEKwjAMhouv2y108yKepgdRH5x3kikMT2WCBENImm5t8YfAaJt+aZJ2Yx/CWNmOYKRzF8LgrN+DPTPs4Pi+BHcxfMjvLdajIthp9/tGzUosyEIfWsulscmvtTAezo6+S3V2q3NSjVJ8rR5SqZx4DMmLbL/SXK/xv0Gck9F/LTX8oa8kVztzzpgWs5c/4rbOs+w74l5h/L6iJ0vF345H77Ot+7IlXwt7L3PYpaLYMVbr/1VD1l1Bfop76b711+YxPzTPDXOG+0bGoHeK1+oDraNBhg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFB6lgxiEy9YmzYGJ0OXx6iAEuTGQ6jkogkBXBVgZiVyEGBjcg1kBSYwnkWwlhxsVxKK1OwFxk0MaNXT4RaH6SEKpYKJAfhiaGC8Dci8teXO7SZkewVbCI4QKwsACF2UmoubjSmQ4WezM4GBj62VBxJpqYHtQdjsAwcEIKB2cg2wWItQg7E26vNVC9DZIZtkC2HRLfHsh2gPJPQu2NBfLjkNTEA9kJRMQHcjoJB6qPQNITCWRHIfGjgewYNHvRw5+Y+AAB5DSLrEcdhxkw+9BpdHkQAIWjCgNuoAyl0eMVPU6RxdBpGM7iQLWXWgBfWYouR4q9hMo7QmUisvwnMv3bAyxXOtBwHzfp5mSRYbcaDyqG2U8qgNUFAA6INjE=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="63" template="../obj/door_down.tx" x="359.959" y="17.8328">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G2.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/door_up.tx" x="80.5779" y="271.455">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G4.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="65" template="../obj/gold.tx" x="2.33333" y="94.6667"/>
-  <object id="66" template="../obj/enemy.tx" x="22.6667" y="94.6667">
-   <properties>
-    <property name="enemy" value="Hydra"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/treasure.tx" x="447.667" y="257.333"/>
-  <object id="68" template="../obj/enemy.tx" x="447.333" y="229">
-   <properties>
-    <property name="enemy" value="Spider"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="353" y="63.3333">
-   <properties>
-    <property name="enemy" value="Snake"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="79.6667" y="224.667">
-   <properties>
-    <property name="enemy" value="Dino"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="254.667" y="201.333">
-   <properties>
-    <property name="enemy" value="Bear"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1G4.tmx
deleted file mode 100644
index 9bedce60d1c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1G4.tmx
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="73">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNlOsNwyAMhP0fZwKUxdpZaOeiJLu1FbHiXiAxaZF6kgXhcR8OD6JV14HowUSXIdd1+Y3EV7xRI+fSc65LGXl/Xo0hkXjtj+DxHp8qXK0I38hKhX6U5y2zVVZWiYs59da/cz1vz0otLDm0cK3qyfU7+R15BUc0neDKPOHOr7g7O1d7tYwt7fV40quVe3Of0ZOr/2VNwbVxcY9QcdlHnaNIt02GtwvP6BH7VyrdyVpOVul1h8UDc0EunpVSlN4n3a/XLXcUc5H2Jz2DT8o=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyrZWFgqB3Fo3gUj+JRPIpH8YjAADIiAQ4=
-  </data>
- </layer>
- <layer id="2" name="Grass" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyVVctuAjEMRFqoktB+AZT2xJ/tpQfEiVtV1J/jIW7lTlv4ENbaWJk1jrM7Uk7reMb2xLt8Ho2WhVPCxqfz78rxhEXIf9s1OQ498hDf0Ht0h7j/RBzdXfn2cI6L68Zx/pnQXoX23pNRE/dnKzS7kHiPkesbNKIuDSfX1ZzjxZqRk84ktLW+h6SxCo/9kMh9J83oh9cmV+27nFir1IhxGkjbRPSa+yT7jHXgHZrhzXXjkdeapeRced37mk7Jzb0+Zfz36x69+gE6+7435L7GmaBOzQfyjWIvh8B6k1XkQB9wTfieuUcSu0xu9rjFjbWyT3mm2tyQM+eRPu/m0w/nJNQFf+IcLd4vn3IdC17jvGfw51qZv6WdPDcPyXNjiGVNci8i949r+V+iP9+U/c04xJ25j9/3SpzcdRamwp/af0vuUzz4ltFrfYG7wtrhFvc89h9xB/q2fGU=
-  </data>
- </layer>
- <layer id="7" name="Trees" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VdsNgzAMtPqbbEEfi3QaBoF+oO5UKHs1JzjhWk5VaMNJFsExPj+CIyJSi48qihyTnJVc4rvNyexbgX0TRK6HSciFtTjc1A/pu6eSMcNbGbucPfy2YXm3vE1Y9LnYdFyjysuCvvhErNrvVuT6pKE5hpiv76/QfpknfGNdOzZ7gGdsTz7kuDbfJuT31tQsd/62+P4Uk2dnfZXotc2N9fZyLtV3O69KcXj1h/6W9Pcve/OPOADkitn6iBP3Xv8xasB7g9yl+wowX8vNvS5MfaB4/ehmfefse/Vjv+19CW7y9M5dqudNO9vgm17FrWcwZ4Q+Y1i/AHcOQq0=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYGBgUONhwADYxKgJQOajY2UgPgLEp6hk9zEgdmFCFTvCg4kJ2SdNhF2HsNgFAjJo/DZuBEbWSyo4RqJ6dDtxAR0y3IIPoIeJMhJbA4v6g2j841BanQEzLLGZDwP4/OoA1LOYkTjshGQ+Nvdis08dh5q7QLNU8JiBrhYWFqAwOwll40or2OJtJ5JZyO4SFWJgEANicSCWEMK0FxloEeFWWByhuw3dLEOgXUZAbAzEJgTsRQa7sIihpxN8ZvkC7fIDYn8gDsBjL7b0hQ5wpQF1LPZmAu3KAuJsIM6B2nufg4FBgQu3f/GlD+S8g+x/fGEHAqDySxpo5xMOwmrxAVAah8UFKG3VMGPmFxhAF69jRrj5FJRGzie48jGxAFsawQaQ408ZpyrCgNTyFwTQ/UiOGbByhpiyHB8AANW0Qh0=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="63" template="../obj/door_down.tx" x="223.901" y="16.5119">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G3.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/treasure.tx" x="232.364" y="121.027"/>
-  <object id="65" template="../obj/treasure.tx" x="303.667" y="126.667"/>
-  <object id="66" template="../obj/gold.tx" x="233" y="131.333"/>
-  <object id="67" template="../obj/gold.tx" x="160.667" y="123"/>
-  <object id="68" template="../obj/enemy.tx" x="209.333" y="124.667">
-   <properties>
-    <property name="enemy" value="Elf"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="253.667" y="124.333">
-   <properties>
-    <property name="enemy" value="High Elf"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/enemy.tx" x="161.333" y="151.667">
-   <properties>
-    <property name="enemy" value="Elf"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/enemy.tx" x="304" y="149">
-   <properties>
-    <property name="enemy" value="Elf"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="232" y="212.333">
-   <properties>
-    <property name="enemy" value="Elf warrior"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1R.tmx
deleted file mode 100644
index 8d74125989e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R.tmx
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="72">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name=" Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5GRgiCQR57KQroccPA+It3HjpwfCTmrbTYqd1LKbHDsptZsSOymxm1I7QfSof0f9O1j8O1D5lxK7KbWTHLupZScpdlPbTnxuoMQcAAScCK0=
-  </data>
- </layer>
- <layer id="7" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYMAEE5ixCAKBCJQ+wsHAEMfJwPCPE1W+D6jvPROE7cmGEA9DU0cL0IfkZmnaWzdkgT0d4gIbuDPM7JUZIHsHG9hIAzP3c9DAUCJA0giJM2xgFxo/kGlg7AfVFSD8FRoXm6DidVzk5amdULqWC1X8N9CsQ0jpDNlOGIDZCcKklpvhTMS5Gd1OEIDZ6QDE1VyY8njNA9r7jQlhRg0O/QAuuiD2
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1ldtKA0EMhkOl0rHrlZfFRxHBNygVj6C+hqD1CWx9nXq4EHwMb70VWhAED5ifTthsmqnOsv4QdnZ2ko/sTDLjFaKxMa3LLtHwD3bVLX1eW0Q3HOckzG20hNFv0YLAvC+IjteJbou0HfH3h6Jkg/nUKblnYZHj8SzzrvDXiCYO+yNUuSnOe7seM8VGPOT8sjo3y9nQOa7VY6bY0Cfn+hWq68CB8A+GPH7m772aTMvedPw1BzqPY+F6PjnSMfT+aY6e2/kHrpVwcnya4KbqqGnut5Pbbz5NcFFDHhtzj51y/+Gj6yBXUofClb5lOVLXmIO8Gsxl2jrU/QMc7K28n6p/UYe9rN+gZ3qcfeYP2HbVGcthe8wtjr8dqudXOIM4vub7Y8rPmTnbmm3vO30/aibiHbAdsl3Efog91ZypGc9iH7NsfefJeemZecnzLcbai3zJT3NgP+dqkQI=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBh+QHqgHUAFsI0bgelt7xP2gbF3IPxLL4DuP0J8atpbyYlqTxOavRNoEN8D5d+BBgPlT2T7YLQbJ/n2BjIRb+9IiNfhBgAYyyd/
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="65" template="../obj/door_up.tx" x="208.385" y="271.283">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="208.833" y="144.167">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/door_down.tx" x="208.667" y="80.6667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_down.tx" x="144.667" y="146.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="75"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_down.tx" x="240.667" y="208.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_down.tx" x="272.333" y="144.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="80"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1R2.tmx
deleted file mode 100644
index 9a657cdbc81..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R2.tmx
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VVsOwyAM47/0BKg7GD3LtnN1o3dbo87CSgGNCbAU8aiJSQh0nY1ZD3vZ2Hqay5l8z/FkjuEVR8aLPU24uz15zpoLtH9Zs31bzXurOT9Hg39oSutIV8egfUFvUXFqHvxxLh1xJdbndF2Tg46zBGdjLjfKM/zU+PoX9yO2YGN+eQ89gTzvdK6ps2kNznOqfltDNB5T7KOeewNxIr+52u+FkbWkdd2gu5PSrX0vWunyW5jaA+45+jV7FL7U8K3w/kKTx1oz0Ln8kivo8JpQ0Bak9FP/w5I265Z8jLQPjfZyjQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5GRgiITi7RwMDHGcEBxJR/wZStPbXhgOg9odBsU7Oejvhl1AO78OkP9H8eDAnynQe5GZMruJSXug8mEg8sYPTki+pLe9ezgGpkwCpQNa2bsdGn+44pEW9hKKP1LsBIXNbhLKSh82CB1OQ79ewZP3BmuZDgCqn82d
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyNlc9KAzEQxkO2Lc3iy4gelZa+Qe2h9OCfJxA81hafQGtBfBkRiuJjbMGLV2sLolAV85kMOzubbB0Y2mYn8/tmNpMutVJL76/Wj4xSC/8b36+Toi910eVz+Idd5/amy/s4c2r3PDWVmiSOfWJUySTjs65UlzipUi+N8p6Jj10EmLeJi1kbl2si8k+TPM+zjcmsz7kuzzwOaIVB2w1jg9kyTLNyNSMH1w4t3Dp2zyh132csHv7QLPL4fmJnbD/P/WXXv5n2feP0xWqJcaX1beyVZY8tc6XjcZT3InUaY2xiPjImtI7TYty77/NKh7m89qFnkrdM8fmhybm8R6SVs/k7pjPTragb7I5gy3p5rTJ+7s8Q9TmWJ2aUS/ZvUzydIZrlTKzDcD5/KnScp8V4GOk+E+cedbdZLs5tBxjoWxWbG87Pnu/ZaT0eh3qIS8ydmlK7tTwGM4x7EmzMhZxfMlof+h6AOwvMEX+34F7az552PhDnit8f2/+sHdzQXclrJQd7oHM+aaA7s+r+i3F5/N+cpOH/B2LTvcQ1hOyAPUNeuiu3GuV68ewuUC+5nHPU2hd9IKcZpPcEzch93yzOcdf3jb/bkGdsPnsbYkP9Wvt7XeqVeX4BQq/VvQ==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJytlVkKwjAQhodUBaHQXkXwIlVfPITLi97BBUXBI7hcx2souPTJRyfY4DidpLH6w4+FTPPNElOATy2Dt+8qbyppncb0q1BKdK+LeuXCdVX5uE3wHfcU+ufUqL9+F8FnjzTzHPpxN0IdRbwk6+fDsbeLm+L7XfXeh+ss9MAWa3I4VgCa6Khm595Z3qaeX+QzV3r+pNq+le6FxOXzSB09luSapxHnSu+kDmZSohfHbK5SPJ0hr5fHmzPiaylnSZo7igDGkbxe9s4xst0JmrtC5jrj8vxd/4V/ypyBonn6ztsVZ+7WueXeorPiZ5OelSQGaKHb6E7slxf/ptAcuirP52taPWT10QP0MJbz9GEX9YF/FyfImqJn6LlnvS6uTTey1sbnLbJ26D36UMB9AtuiY8A=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="64" y="31.75"/>
-  <object id="50" template="../obj/enemy.tx" x="173" y="220">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="51" template="../obj/treasure.tx" x="240.166" y="48.6666"/>
-  <object id="52" template="../obj/gold.tx" x="453.083" y="120.75"/>
-  <object id="57" template="../obj/enemy.tx" x="430.742" y="100.349">
-   <properties>
-    <property name="enemy" value="Goblin Chief"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="68.5909" y="52.9852">
-   <properties>
-    <property name="enemy" value="Red Wiz1"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/enemy.tx" x="237.909" y="67.2727">
-   <properties>
-    <property name="enemy" value="Minotaur"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/door_down.tx" x="367.884" y="15.8514">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_right.tx" x="27" y="182.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R4.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="62" template="../obj/door_up.tx" x="328.5" y="240">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R3.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/gold.tx" x="152.5" y="245.5"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1R3.tmx
deleted file mode 100644
index 8bbdd3b5f2a..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R3.tmx
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="10" nextobjectid="69">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzFlGEOgyAMhf1vOQHhYnIWsnPp5G6zGY2lgw4NYy9pxEj68VqLN9Pkj9jgfGrBVfq+mDwPvi/mc4+Dd+Dep8h7RyvkHFyTaG0Z03VgaudA0TlsR58tbIyV1XmEOHuHkzuCz9nxWD/mcb5R5DdCmavNkKZvs0f99cz3lXwtM14S/59rnnsrzHmdW7g9/CLTgt7fX8glLvW1pb9XVPPuhN8RnkOaV35vROjvWTL3xNyExxo73DiLrLNlzH/GCx/NcaY=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5GRgiMSDIwjI0wLv4mBg+DoA9pKDw4B4JwdlZnwjU1/4APl5IOwFpQkL7oGPb1rjPRwQv5Kq7yIzKn87hWmSXBw2QOE2EPZ+hsbXQPh3FFOOqVXHXGGmv52UYgD2f8mi
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJytlV9KAzEQxkOr0uzuDYpH8c8V9KHig+IVfFPUegFFoQieQa0oVUurIEqP0Vdfbes/BBGcj82Q2TSbFuzAB9tsZn75Jpt0UFBqYPRKWtdWH/T7qGh1SnJDvvepJ+r7BOYxzeuULHdD2/pLhWEm4ntavIuUepmx44haYA1gnhgvPzrLzeMNhWD6AnVqgs1Mro91wjNqfAm/vH5fPJr5LOS1Sv65zH7L8fNOub86O7ag/XMRHcFu0/NnYG7f7OmoQC+q1MeuDrBH9FnW6gf2bi8mFsswWWDLvq9p6xU9qsZZ7cfZ2uB2c9ZfTpS6Il0Y3SSWuxsN15Zy82YTWxfrZa6vf+BekrbiVOei1iidibyGw5V+oZ3IjuP7dLnX9Hw7puoBLu8vmIvOfj0Y7p2pAWaT1B5Tbh5z4eeJ1CylTOlVRtt4bph694l/noxWEsiL7Dk7oHO0WvDfS2WR7+5RKHx58Fohj8/mbOPOYrZ7J3F+fUqpzTHOeTCi1OcycQ6L9o6ukOZoHfPi254UF17BXHGYrO3Ink/J/W+f8V+Tx2TxuZokF+Ey/wCab833
-  </data>
- </layer>
- <layer id="9" name="Mountains" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYECAj0youJ8ZFaODaVjEsJkDwrgAuh0gPAGHuYTAFCQzCNlLS/AeyV6YG97RwS2TmSFh8B4p3D/RMQwmI9lNT3tBoA9qdw+ZaYdSQEpak+Whrr0Dkc4H0l5sZRGtQDjQvl5oeULPtPWByPKTVvaCAL3jF5u9kTR2A7Kd6OFNS7tx2UsPu0EAABKwPKk=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJytlV0KwjAMx0dFRTbw3ekhPIoIGzuDZ9i8wPwADzPmkRTm1Ad9tGUra0uTpcMflEGb5p82yep5OqeRPlx5MPc9FJbI2nfseRcg1idrho1b0O/bBTUOTFflHtjn1zPcTmhRePXEAOn3sTBiMeOVujJOcx0jJNiUwHzO7z/h2hsGny3zm7H3Yf9yb0qwEYhcS20BdgapnyG+Q2JeZJ2dgfovJjQ/lL1qn1Ss6fUP63I8tJZcEHVVIedVWRHiodxzzbp6Toy6KgPdB0XTpm3bJ3SjNr9qHxd0CRBb/ck81q1WRLxnk/eUbnvlI+Y6B0NHaG+Nf8hQUt/e80fkzcjbNaimd3P9C82pyPfGPKtKpGj/i9jyBvwAwXJE8g==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="51" template="../obj/treasure.tx" x="360.02" y="195.254"/>
-  <object id="52" template="../obj/gold.tx" x="238.5" y="183.902"/>
-  <object id="57" template="../obj/enemy.tx" x="360.667" y="229.501">
-   <properties>
-    <property name="enemy" value="Minotaur"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/gold.tx" x="136.867" y="257.909"/>
-  <object id="63" template="../obj/door_down.tx" x="210.691" y="15.1909">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R2.tmx"/>
-    <property name="teleportObjectId" value="62"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/treasure.tx" x="259.492" y="185.519"/>
-  <object id="65" template="../obj/gold.tx" x="376.218" y="174.852"/>
-  <object id="66" template="../obj/enemy.tx" x="164" y="230.5">
-   <properties>
-    <property name="enemy" value="Minotaur"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="326.5" y="153.167">
-   <properties>
-    <property name="enemy" value="Minotaur"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="166" y="155.167">
-   <properties>
-    <property name="enemy" value="Minotaur"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1R4.tmx
deleted file mode 100644
index 48b4f58a70e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1R4.tmx
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="65">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFowAB9vAwMOzlob+9UbwMDNG89Ld3FIyCUTAKRhoAAKm9AmE=
-  </data>
- </layer>
- <layer id="6" name="Background 2" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJwTYWFgEBnFo3gUj+JRPIpH8YjAAOuCL9E=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy7y8DAcHcUY8X2QOwAxPfobO89NDa97YdhBxr5iZhwp6a/7XGYdQ/Nj9S0E5d99mSEx1DGyH6mB3ZAspNeYYwepwMZtyMlXQ0GPzsw0DdtUxMDAHvnsGo=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNVAsKgzAMDftAZfYUu4sML6qbu9U29RBjrKE+jKEVZzdYIFCi7fskbZERFX+cF0PUuLya6frXuM+c6Hggurn1wyUHrxsz5rd5sD5gcTA+snLfusxnn+il5t66PBuaBHBZc4pOrQkeop/ymwzWu1Yn5ynz/HFWbbxG2U9oxD9bS7S3cc+kb7ouvdR9kjXmAEyOMtIj7Qt80/UlXrxyvw8zBB8kf3munDXMhax1Ab6hGUEPysAchLBkv9tATZ8NX3RP5H3FGlqAt2a2YrOMmpwzOb/tSjytNeZdL7gxp41djzWHG/JuZ6d36z5kyvuo3yN9R0IcKzPumft/CfaSdxa45bCnTnyvPuWXivUGRA/Xrw==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFuADbANm7BInNSme7D/MzMBzhh7ihhpd65hIKy/tAOx/wQ9iLqWctSljiksOnhhaAWPtwqQOJUzOMaAnQ/QDig9LCYhzylJiNDGidd+uomDdIATA/06tcoHfeIAcgxzU9y8uhEDa4AABmuxBJ
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="51" template="../obj/treasure.tx" x="207.75" y="268.583"/>
-  <object id="53" template="../obj/gold.tx" x="194.273" y="108.447"/>
-  <object id="55" template="../obj/treasure.tx" x="71.4167" y="92"/>
-  <object id="56" template="../obj/enemy.tx" x="110.833" y="201">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="288.667" y="152.583">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/enemy.tx" x="183.417" y="198.167">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="60" template="../obj/gold.tx" x="208" y="107.5"/>
-  <object id="61" template="../obj/enemy.tx" x="96" y="104">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="63" template="../obj/door_left.tx" x="379.814" y="137.793">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R2.tmx"/>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
-  <object id="64" template="../obj/gold.tx" x="55" y="213"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1U.tmx
deleted file mode 100644
index 425e5e6b731..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U.tmx
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="82">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwWAEu3gQmBhxYgAAQ08EpQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy11csNwjAMBuBcQgKIh5CYAPFYAMQUHJmGEydgFaAts3BgBgpDYItacaOERm04/Lc2X+3USaaEyBzpQRLIVvuTQ6YdIY5tk7sUou9Z81fQ2+iyue9WZwb+Uxsb1wj1XTWGmNyeQxaQXUuIqwqzbw1MCr2LbqiNLj5b1+Q2uZi0wk0Kt4lJ4a6v5h4zY7ovqPut/TXfVPn7Yri5NrOFtu3atcZy+Vy55vohTS/yoi8x95dsnK3Ucvl5g4npHmC9CZgDsC7MPUOG6tuXf7i47lKWTfu/IvvU0ObzO1b++aWayca9iHVe2f112aPC5/dNHZPbVWeVXTufvzomJfRuIHstv1lJ03e797/u5qo+fwDgsBsv
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBi8IJqXgWEXD24cxUsbO3fz4Fezk8p2E2Mnte0mxU5q2U2OndSwW5ZMO2FAmkz9o/YOb3v3AvXVc5Ontxaobw8F7ibHbkrtJMduatlJit3UthPZ7jpuCIa5oZYbIUYLO9EBLK2Tm2ZhAAAmeyDZ
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBic4D8HA8M8TsKYkZP6dtpy4VdnzUU9u4m1k5p2k2ontewmx050u8m1lxIwau+ovbj0kZsXYHmQHEBuPiQ331NiNzXsJNVuatqJbjcMz4e6YS5afURNO9HBXDR751OQ7gFlTSuS
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYCANlPBCaA8ksTJeEg0ZZCCPC9U/pIJcLqo5hWRAqrtLiYirNn7izCoZ4vFOLsjDE9+gvECLcCEm3nABD7T4fMxHmVuQASztU5J/cAF6py9iyzFK4gIXoEYZ0o0Wz+1E5mNCgFrxQG4awZffBiuAuZlaaYVQ2JEatgCY4w5h
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="76" template="../obj/door_up.tx" x="208" y="272">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U2.tmx"/>
-    <property name="teleportObjectId" value="83"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="208" y="145.333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1.tmx"/>
-    <property name="teleportObjectId" value="87"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/door_down.tx" x="144" y="145.333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/door_down.tx" x="207.333" y="80">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
-  <object id="80" template="../obj/door_down.tx" x="176.667" y="208">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="71"/>
-   </properties>
-  </object>
-  <object id="81" template="../obj/door_down.tx" x="241.333" y="209.333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1U2.tmx
deleted file mode 100644
index dbe8ff26732..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U2.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="86">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYGBg2MWDHSMDYtSMglEwmIEsNL1K0zndjtpLXzBQ9g4kILZMHi5lN7F+GA5+pQTgyosAE8QSvA==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9lE0OgjAQRtk0yoKfkHAtlx6JpWdwjyhcgr0sOI8zoV8yNlNKpGLykpZW3tcBpj8lyUDcUp3r2U9B/3sQ/Y+0RKm4cX9fptcOp88dcsby9k69Q869NZa8zXLmLc6J9s4mjnftWbvnnCN74a7s+E6MZplXEWsbAt4jXEd6M+JC71Muxsw/vex5EjXRiTEYA++QzKyta9czxaPBPYLd2N+JmvC8SZdruZNF7pX+YYOzts8ZaOv8Q20A1jiTzMX58b2GvHwfn1PL51tfcxdi3thegT6xlnHrPtnX0SuYyXzP0Z/cfaXI5fYUXx1j9PVW8YFZZJc9D2f4APjWF9I=
-  </data>
- </layer>
- <layer id="7" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYCAevOJgYHjDQYIGKgGQvZ2c9Le7gxNirwYXfe1V46K/nSMBtDAOtAtGAT3AT2b62AMql15Dy0R6lU2wslCdC0J3cULEf0P9/AuL35HLbXR1xJbpyGUSMeUTzJ241HUguZ2agJDbRmrZGoeWLgCHJRrD
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYECAXC4GDHCWHZVfwguhPTCVkg1gZoKAqyADg5MgxF4QGx3kYXEjpQBkpgHQvslsDAznobQRkHbGYj81AcyfjlDaBYkPAmW8+PWTCuQFGBgUBCDsbA4GBgeofSB/gvi0AtZAO22g9sLCFJauQGEgC5STE6Cd/SAAs+MVO4JtCcRWNLYXZgfIXnrYhw5esRNWM5zspQcoRcuXpJRJ2MpYWgBY2VFCoAwhRh1MDtntMH0b2CCYEMCljlrlOTHm0CvsCQFCcUJtgC0vAgAvvCJz
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="83" template="../obj/door_down.tx" x="128" y="16.6667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="84" template="../obj/door_up.tx" x="402" y="270.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U3.tmx"/>
-    <property name="teleportObjectId" value="85"/>
-   </properties>
-  </object>
-  <object id="85" template="../obj/enemy.tx" x="328.022" y="216.915">
-   <properties>
-    <property name="enemy" value="Djinn"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1U3.tmx
deleted file mode 100644
index abeacbd07af..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U3.tmx
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="89">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1lEsOgCAMRLsXTmC8mJzFeC5R76ZdNDZYoAqdpAu+LyUzAPRX8ADRPcWF49nbMHdX3jNW1i2Yvbka5jIAHMLbWzFbeXi/5IlJwfwr6mkT/Jjj9mKSUvZ5j9fBlsnZPItnskfr2TTrVDWPUu/Bv+ejK/8T2tz9leQJa2aOXcpATjyPWJKvamzNmZQj5b+VTQya+5KHqHwD7nWpFzzbkkGLXGslZRN1AQJTSsY=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJw7xsrAcIxGuI2TgUGNi4GhkxOCNbggYiBMKzvR7aannch209O+UTyKRyIWZUdlwzCt7cSF+6B5fgGV3YDPTkrshelHLq9AZizAEa7UsBdkDzaz0O1FthuZj1yukutfbHbTO61i8y+9MMheAPrObnA=
-  </data>
- </layer>
- <layer id="7" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztlVEKwjAMhoP1we0QPqpXmpOdRz2CR5y+1zoEG9bgbyxond3TfghLB8uXv4SM6P+yhmhnMhQeyK4z96TZzGt8XEe4CxtYY/EmTWJVftZOc6KteeYSOZm3MOMOcpHLMP9VhNMuiM4+LiFY3Y9sru3gLkX3CPNQEK3L/nks+vcpntFLC71jDb3LVp63Kd/zlJ2KXvbQu7DFd2yP6nPKjsN62LuoU75xj8q3zFzOvmfG2LXKP3mwA3e5Na//A8wfWgY8ow==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwUgBAAf4AAE=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYKAtKOPFFCvFIkZtkMfFwOCBxC+hg52jYBSMgoEFoHxPSxDLx8AQx4cq5oFdKVVBJdDOKj7C6kgFsPIZX/kIk8tFClts5To5gNbxhQxy0eyiR7xhA4OhLgIA/ckJJA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="85" template="../obj/door_down.tx" x="417.002" y="17.7448">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U2.tmx"/>
-    <property name="teleportObjectId" value="84"/>
-   </properties>
-  </object>
-  <object id="87" template="../obj/door_right.tx" x="47.0918" y="203.382">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U4.tmx"/>
-    <property name="teleportObjectId" value="55"/>
-   </properties>
-  </object>
-  <object id="88" template="../obj/enemy.tx" x="175.4" y="170.623">
-   <properties>
-    <property name="enemy" value="Blue Wiz1"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1U4.tmx
deleted file mode 100644
index ac5a065f31b..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1U4.tmx
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztlM0KgzAMx8MOtj6SIj3ukTzuQQbt3HsK24IWY9Z0jYqnHf5QSppfPjsYgOEEXeu1NG/DiVxnlzN81Ctj3cpFjjdr9qs6hou+qUr8NFbHT3GBsDW+GruPi7rM2jo3KT3JPHCuZ7ZBmB28e8znTpEnCPmiv9YudeM9pj1oCU9iu4wNrS/vJwgxczsncNHWM7vc3lPbX/9D7EXMn8dwZ/3N7QjdU57fWE1K5R/M947z+FC3wv0cC/aJzmtOfa3/r1L9wLpGlb7by9X+a3/upDdiMyqI
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJytlF8KwjAMxgt72aZnUMEjTFA8wBgeyEevIzoP4DVkQ/DRf9NjmNIGs9BubVngY2yN3y9tGvNEiLxHx1iIEnSK+3Nt4uHCfOvfbQKZIdwCtIC8JeiZhO/Zl9uAPlqHWLFDztzExf71+TWaLQL2zoP2z8Wv0Lm1Z795FIZvNj9e4xDclX7PLH6c2XU2MveVKOG6iZuR9z3kfZlHyZg0n7OxvhtZx3sjA/3wvsr7YuqZqQ80KuKN9cna0XOaCnGPlWj91H8+atePtVeEU3fwkYfnRWdwkrbPlM8pnVGsjc4vjQthUZ5tBiXbltcYzpXP75XU3cXy/b+aQV1beK713nk/fJmu3B3oIX2j/954P3yYrtwmUkzbeohcuFLn8XBME/cHUPi4Yg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjILBCR5zItjmdLR3JQeEvkJHO2HgOSdhNTDgRYJaSoEHml1rOOhn7yUoGxQ2L+jk52ec9LWPngAALbMKxQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="48" template="../obj/treasure.tx" x="39.3954" y="91.712"/>
-  <object id="49" template="../obj/gold.tx" x="159.038" y="25.203"/>
-  <object id="50" template="../obj/enemy.tx" x="81.297" y="205.515">
-   <properties>
-    <property name="enemy" value="Merfolk"/>
-   </properties>
-  </object>
-  <object id="51" template="../obj/treasure.tx" x="150.492" y="155.444"/>
-  <object id="53" template="../obj/enemy.tx" x="296.9" y="172.963">
-   <properties>
-    <property name="enemy" value="Merfolk warrior"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/enemy.tx" x="167" y="57">
-   <properties>
-    <property name="enemy" value="Merfolk Avatar"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/door_left.tx" x="373.85" y="151.83">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U3.tmx"/>
-    <property name="teleportObjectId" value="87"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/gold.tx" x="64" y="142"/>
-  <object id="57" template="../obj/gold.tx" x="137.5" y="58"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1W.tmx
deleted file mode 100644
index dad4408afcc..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W.tmx
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="79">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwWAEu3gQmBhxYgAAQ08EpQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyrYWNgqEHDYRyUY3QzCWFsZjxhJ4ypbS8xdmKzmxJ7SbET3W5S7YXZTY6dyHaTYy8ldsLwqL2j9o50ewcq/w5keUVp+UyvuoEa9SG+epUYu4ixDwC1sVGi
-  </data>
- </layer>
- <layer id="2" name="Floor and Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy91V0OgjAMB/A+sgxOYLwSvutZ0CP5+eLXiRDDEVxjGspsYVsWmyxGYPsx+RcBAC4FQG2GcXLftdqza99Gv46qn1izNWN35a23qQBupT7WVbwp2R1z0byX03u6CnaIye1YU7NbYQ8hFWNq9j9MzdbqKPz+y0STauHNxx7A580t6gc8hufxM6er9V0t9FBO1383kO33bpfZxfXPxeDzvqJzlL/cz5eMuXw/3bydTTMbN++RcN+UvRQ71cTqWb5ibG5KfRNi8tyF2GSidxDyO+drmUd7a7+D7qGxwzHaZ29++zLUfpmx7//HUtb9zGqmZn8AulhqKg==
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBic4DEXA0MTN2H8lIv6diry4Fcnz0M9u4m1k5p2k2ontewmx050u8m1lxIwau+ovbj0kZsXYHmQHEBuPiQ331NiNzXsJNVuatqJbjcMN0PjrhGtPqKmneigEc3eZgrSPQArjCuE
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJy9lUkSQDAQRW0tlINxH9N5DLfhGpyCFFHt60ySeBvVIUnn9+/osuTBlrixQtxm72/m9Hx2zDtu7pI6JgGo9qmO8ZLJywc8v47acP6vUL2aa4+S/9RYgy9gzWnsW0sVVPcQdbRBVz/O939Be7Zh8hjzZzxB3EMsQF9T3whvxdTcRssi3vY36N0YvSORerrcJ8hgqLMteM7QPUzXrxhNccz33lTNt/3XhfAap6HoVbk27SdXn2F+qvm0r3adwSVC
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="69" template="../obj/door_up.tx" x="208" y="143.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1.tmx"/>
-    <property name="teleportObjectId" value="71"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_up.tx" x="208.359" y="271.521">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W2.tmx"/>
-    <property name="teleportObjectId" value="56"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/door_down.tx" x="176" y="209.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1R.tmx"/>
-    <property name="teleportObjectId" value="68"/>
-   </properties>
-  </object>
-  <object id="76" template="../obj/door_down.tx" x="144" y="144.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1G.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="272" y="144">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1U.tmx"/>
-    <property name="teleportObjectId" value="79"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/door_down.tx" x="241" y="209">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1B.tmx"/>
-    <property name="teleportObjectId" value="64"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1W2.tmx
deleted file mode 100644
index 053299ca12e..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W2.tmx
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJyL5mVg2MWDiqOAYtFYxEnByACb+bJoakBgJ1SOVkCaB7u9MLuxuZ3W9tISjNo7au+ovaP2DjZ7a7kZGPZgMZ+W9qLbCeLXc9PeXmkeTD7MLmkK6ldKMQBFYzbz
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzr42Rg6MOC25AwNnl86onB1DJnqNtLrt3E6hu1d9TeUXtH7R3q9pJjJ6nuG6z20qL+BQDfkyFi
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy9VUkSwiAQnJOBh6kno19SH4TbzXf4AvWUqHmCoXSKCTSBlBW7isuE6SZMd0JEdFJEpe6uQ1uTaNraZUK01ATxaut7FdabCJ9FpUPdhw732PP5dcldalxHmkgbcSMY1dWU/DmaUhtpWn50h4ueuVQD3wGBz/4EHHUP9y+aFnIGSHtMSM8/I96Nwc5p5+2fFW7Ni3gv8nyOtlH4rm6FWymgnKe0G28/a0vdc2J2nGHJs8roOSrXx77fqM/aDpgX6+dkU/ak/B3L65jgb9C/8zLk+xbrt2eO/Sf6NH3PG9E//XpQ5k7y+77LyTrq4bNw71Xk7V64fPJzlPMc7RpkRd75WnUzwN5mbqNCXaT9BjGjeVo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJydVdttwzAM9F/jDyMLFMgw/bCAeJ/YDdI9+pqjLTqEA7Qdwp4iJOxDzgwlCz2AsERJPPFEyUVxxbmcvqNYW03tnnzAY3Vt63gw/uP8PW2Wfeawfi8287bk398uWwC8a6ip3VUTh7cnD9hXN89vZl5o0VOewfS7TI6Q4b+XuN/lctxqaIHxc+mP615TOnicANfJQO0YVy7AiTjQIFULfL6jGbN9BXRBrYEzpSd0epXvm9i7MxfxDjQWO9uUtora9D8k5qfYl9hO1j3crdvT5tannNCkmb+s0cHk9SP9X7E/44/lpci5l/0/6iS1ZiRePsc28w4qtOb21B6cOV49pfLlvaCG7Nnmoi6W99XyHjPfTk8T5IUYITI3EG9Dfk8XhXenvL3F1o8U47SVmt5GJtJ8rmF+jwbHl4Nn4XxZ4VVwrrlvs8Lepdib7OkGXx/5314AQfBTcQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="51" template="../obj/treasure.tx" x="397.583" y="258.75"/>
-  <object id="53" template="../obj/enemy.tx" x="398.333" y="233.417">
-   <properties>
-    <property name="enemy" value="Cat"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/enemy.tx" x="134.917" y="28.9163">
-   <properties>
-    <property name="enemy" value="Human"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/door_down.tx" x="368.891" y="16.2321">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/gold.tx" x="114" y="22.5"/>
-  <object id="60" template="../obj/door_up.tx" x="216" y="244.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W3.tmx"/>
-    <property name="teleportObjectId" value="54"/>
-   </properties>
-  </object>
-  <object id="61" template="../obj/door_right.tx" x="31.5" y="144.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W4.tmx"/>
-    <property name="teleportObjectId" value="51"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1W3.tmx
deleted file mode 100644
index 4958b2b3771..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W3.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxr42RgaBvFo3gUj+JRPIpH8YjAAIblHPI=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzlU20KgDAI3c91saguGn3cKtY6RkoKMqTc1q8SHhOy93zOtY1zrREdAGPI+OcN/E13B0zeuQ3O1f/DM+s+eZ7h20KonQ1yBdIdIT8MdZYerV7vNGWdjFJt6QE57uan6ebuBN9TULikh5n6SGfM8TQjrfeegCFPBHsPlGuaJfu/A2JzvdtUH4E+oqhhb5yX6kr9lCudHfd4KPU1711yWe7Luv85c7fw5NR+HScCU7S4
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgF+MDTgXbAKKA58BhoBxAAflQ0y40MPfQMnydUMMMVSpPqblr4E5eZ2MTfUMnOF1QyZxQMXwAAOwYGJw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="53" template="../obj/enemy.tx" x="285.833" y="184.833">
-   <properties>
-    <property name="enemy" value="Cat"/>
-   </properties>
-  </object>
-  <object id="54" template="../obj/door_down.tx" x="192.322" y="21.4435">
-   <properties>
-    <property name="teleport" value="maps/map/portal_1W2.tmx"/>
-    <property name="teleportObjectId" value="60"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/enemy.tx" x="204" y="70">
-   <properties>
-    <property name="enemy" value="Cat"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/treasure.tx" x="423" y="148"/>
-  <object id="57" template="../obj/gold.tx" x="137" y="176"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_1W4.tmx
deleted file mode 100644
index 051faa1d089..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_1W4.tmx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="52">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFAwGieRkYdvFQD0fxEmevLA91/SFNpHmj9lIGduKId1rbSyygtr213AwMdVgwre2VHqBwHmnpmVh79/JgTwfk4j0DlD8GGwAA7/Apnw==
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy1lFEOgyAQRPlpgniM2saj9SLaeEGvYG08hCRkE9isi2TgY35Y4DFkd5bOmMVrs8b8Iu02rCOavOYLEXN06frb4ewc96r+bexXqv+915fDuE9//rD3uTWYOc/8XcRcH6kQz4MgXieftbilQrlbxXksYdJc8pn49EEtuNRLcX/yXGrxN7xXpFyS/qZGVkn3Slw+Z2hWaUyNi3rWmDFXyjTEs5bNs7IXzcoSbpxpaD7nuCcDYCPB
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYKAPqOGF0NW8pOl7QkD+GRYxmB2vSbOKbOCBQ5xUv+IC6zkYGN5zQvBGDvxqQXbWkWDvBU5Me2B2+ALZflD8jgi7QQBkN7H+fs0JsfMDkh0bkPjY7EZPD1+A4m1A+U943HaeE1MM3Q5cGJ+/yYnfLRzE2QvC/ljcjQvgSoMgsB5LmOLCm4Bq35JgL7o9oLCCpSNq2dkHlNPjwi0fBI0nYu2D4QAy/QkDoPRLSnxSGr6U2E1KWiLG7s0cEPwGzR2boGIwTA2/4gJBaPl0AwdxZRQugC8PIQOY/5H9DUtLhOorYtXgA+j+JsfPABNhYDo=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYCAOVPASqZBMUE6C+aSorcKjtpLGfsIHtrAwMIhTEW9jIc7eQFYI/QqLnA8Z/oCZR6y6RkYGhhYobmJEVcMuxMDAIUQbexWZEGLKTJjqrpAYfsSqkwfadQCKFYD4JZq6s+wMDHqchM37QIK93mhi6HwQOAe014KFMHZmx46x2UsMAPmXmPy7hcrxcRaLm8k1D1SmwNSxIaVXbGyYvYTUwcwjFDYwdfpI/sHGhtlLSB2yf7GV8TAxmLocDgaGyWwQnIuFjU6js/M4MO3FB0Dpnprl5Cci7R0MgNz6iRh9AM+aMOo=
-  </data>
- </layer>
- <layer id="5" name="Rooftops" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFowAVvBZkYHgjONCuGAWjgHjwSpAwmxR1o2AUDGcAAKgTB9w=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="41" template="../obj/shop.tx" x="97" y="193"/>
-  <object id="42" template="../obj/shop.tx" x="304" y="193"/>
-  <object id="43" template="../obj/shop.tx" x="352" y="194"/>
-  <object id="44" template="../obj/shop.tx" x="144" y="194"/>
-  <object id="45" template="../obj/shop.tx" x="255" y="194"/>
-  <object id="46" template="../obj/shop.tx" x="192" y="193"/>
-  <object id="47" template="../obj/inn.tx" x="225" y="99"/>
-  <object id="51" template="../obj/door_left.tx" x="386" y="146">
-   <properties>
-    <property name="teleportObjectId" value="61"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2.tmx
deleted file mode 100644
index f8afefa52be..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2.tmx
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="10" nextobjectid="83">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt10EKgCAQBVAP4BG6/yE8XZsCC2phgqO9B7Nx0feDYKYEAAD8xZbbJpqWPenR19czEuWM9czWI1a2Hn2yyzGnkq/ztH6f0T0ifmtkth6xskf3WOE+r838f1Vbqcfb+2KW9wcAAABz2QFcshV1
-  </data>
- </layer>
- <layer id="1" name="Background" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1zEKhEAMQFELG7HyttbewkPkjhYqSlA0aiITfvFAENb5jNmdHZuqGgEAAACk0tUzqbfrL8gFr44jQ2tj6YnoWJ/1tmO/bn2vpA79eZEd1rVb9iaq48keWGclS4ck6Ni3lDof+t0quSPLexUx5+K8HxHfu+Lcoc8kHh1n58PeYSai5sOj44/fQc8OfcaK6JCl4+jeuuY7/1ciz7sAAAAAgBwmxaCpug==
-  </data>
- </layer>
- <layer id="9" name="Ground" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzNWm1OIzEMHWAkdqa9A3COLtA/iHPBIfhZ7d26nGO3VvtUY2zH8SQVT6qQSibxd+w3XU3D8L4ahs95MDEe1nwon+tJX787fP/k7CfxOtsybOfjfo/zed1fY+/psO5h7Z+1mc+y054bY69/v47n7gwdNaxOtqQPlwM6wF58Xcn2HsaCbFwHzycvyvcrYUu+z+P8fS10sUA2qIkJSwfLJ/tTbGi6cBl2TtwS7ta6T/CsZQPrvKvTWSN79nr6KseG2YbbMhsXlizShpoOlFtkS5zN8w8Yhewc9D/oTPl4vz7+JfB9LZC/n+fzXxm3dN4Nk+dG0QN1gj50NnKer3sO2NbyMXzUomZae7wx+Xkewt5kn61inxJ4TBJa1EzkjJV71v4tYzKKUs208t9Dq5iU2DbIf4pVryZeKfbIxqQE928UMj4Bzy84hz+XjUlt39bxqZ2NeMBH0yV7H/SIT6o/mp/kmR8Vvo+iRXyS/OgtvH7gJXBnZdA6Pj0dIuctwZL4rNEBwP3bQxfsX7t3VA9pI+qPIr7OwPML+iuZw5Eed2k9ysCqmVRjRqVmwg+lHiHSy7WCVy/3p/Nl3a3pceCXnvBqJu6QUs2EvffOmkv6RYLseC/iDf22XBeZ1UiXqcM9WAuvH4O9ZZ5l5/ZeKPEABGlrrveT0V+2QnY2jEByCKVZZikys2EUqN0/CVl7Uh3o1YtY6JWXl6q7GT5NPg9Ysvasu9nZkIM/53HghF49YmY25OjFbWdROxsSarlti6PQsL89yHQbl5+QmQ0j3LbM7U0Ff5jRg5CZFb7dC5BxWn53Z/UAonwaX8O52lK9iNppqR5RPo3nu9TBuvNrfL5UD0KETwNq+YbofSj1aP1OR+uXfs/t50PNH947HYDzaR4ifFp0PpTg73SsuCrx7bV8GnzscdbRmVx7pxPJD34fZfm00nvi6Hxo1TmpR4kzz/Jpozj7j/JsaT4kWH0R1yPCmY+TX+8JXr0cK/wo50MOuTf0qOHML8mnafVO64u4P1r3yK34NG0+lD5fcg/W8GnAa9I/Wt3lWKJHDZ9GIB28d8uoiZFYlLnD9ai9y63fAUEuXi9b/fZJ6oL8l/6I3OUcd8r/NT6t92+ftLjKvP/n0Pi0/97OU/0=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1UEKwyAQBVDtmUqOWnOuNAcqpQslkNABG0x5D9wIA35n0JQAAACuZ7ql9AysUU2Bs93l+Il2ltbA2ZbBZizSgz0j9EaOSo5+5Kjk6Oedo+TPmvP3dY9c60qg7gxX/s9b/5Sj7MzLdn+0WTrS3nmP9wAAAAC2XkvZHoM=
-  </data>
- </layer>
- <layer id="7" name="Ornamental Walls" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1UEKhDAMBVD1TOJRxzmXeiCZVZ2iYBZKlPcgUGgX/SS0TQMAAPA8cxerrIbA3Xo5LrGdjyVwtylZjkgPjmTojRxFhhxn39bsb/Bb+iFHkSHH2Jb1tz0+V/sEzt7tyf/51lty/Gasrr09AAAA4N8K8L4koA==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="50" height="50">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzdmkFuAjEMRdOu2DFSexFQ1YsOV63oEg3SoJEVJ/6OEzu8JWSSH893HCNSynM7MV8wXD+w8VasGZ03ZGxln5I45OadGRq/Ugys9r5qnzOOPecdjksn33Pz0s+R/aM5zUHXRGOmBYn1KE0WIO9wlrPmWA80vuuVV94c398xLl7105stBh57l9abXvmmmddSi2T/ufWkGt41f2v7yp11e8wi3ZFnoeRTGuvfT/m8P2Tsfl/gapU0hhHP8U1TqQbX9l77rjeW/ZwUxEsc1GM9iZbj2n6OMrqOIOt59UGv9RzfeS0/7ueU/s/lMUh+ePVzX0tK3wv2jGU/F+Ue1drPUbg+6F2YpX5YndMjiVbrNjw0tdx3d7T9XNQ+iK4b8T6+0eKXiP6XgvRzo8n1Qd71V+pnNHbaWHN6ZvZkRCzi2ernmgaNRmkd8TgLvPs5CX/eAhywquE9/FyD+tgy/7w56tP2c6P8HKnPQf0M/Z6ATf0E0dPjXG7xuaUeTodXHpbWbfFz7v89rf0coifyufYAPX9Mrw==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="391.333" y="508.832">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/door_down.tx" x="392.5" y="395.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2B.tmx"/>
-    <property name="teleportObjectId" value="69"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/gold.tx" x="384" y="361"/>
-  <object id="80" template="../obj/treasure.tx" x="400" y="361.25"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2B.tmx
deleted file mode 100644
index 68c043839b9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2B.tmx
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="76">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="60" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztlltuAzEIRfNbqUvoerL/JVX9iGS1MOZxwKQJ0kiTxFzu8RAz94/b7f6+/sT6vXSfrZPxJmlQmpZ9ILSjfqx6lHaFbiXvRN0KX2RU7B/pieZd9SmdSXtXrU2fKxVBn39T/FTrT+uTK11iDj0jb6QGPb+7569Xm/JGvvN5NT26Ow3LPeXPk2+tId1nNTO83XWz9aRn5em1LKtXe7fW+r1WJ+orw6npWtZGIuqRZJX0LOszdTK5JKs3p6OWln+CN9OXJ6Oj/iTWbl7iTO0+QyK1J/A+tKJ5Hefc7/xX4V01iH2rrn3Sq6QTrR19P4wEdc539PQ03swz9qydwLtqeWp637vJOUyERUvj3eVqa6P9QTNrmiSvh7uK1+KP5tU0MvW6eDUPVbzWvqB4pbXdvNacCOtuz7TfNB1LZHqN7NErf1eeMzGN9Se+Put4JT1Lf3s0KvzRelHNDlZKd9WmvFE6FaxrnSkaHbyExjPwkmcB5WV6Lz90KC9vXi7+G++aI93TszybT/Fa36Vov6RXT/76WVpDhHVvLQzRtRMiwhxZNz00n5Fe8NbNBrm/1XOJOltJLzveU36r9n7HfOoZdbJKsybqOTMvqYjMs6jnSH70vyU9J83Lq13fuixhjw==
-  </data>
- </layer>
- <layer id="1" name="Lava" width="60" height="60" tintcolor="#ff5500">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7A+8++yOupjJJBeUlVVVVVVVVVVVVVVVVX11QFiAell
-  </data>
- </layer>
- <layer id="2" name="Islands" width="60" height="60" tintcolor="#a15055">
-  <data encoding="base64" compression="zlib">
-   eJztWm1OXDEMfMuepOJc0MPQHmLpYSjngkrdiFoMZuz4q/3VSCu9hX0Tj+04tpPj+D/WuLs5jvvr5+fp7fP15v1v8ix/78yB+FXZ7kEu/L/IGcG+veK83rx/nq7fn0+fn7+cctyR4/PpI77HXTisz7OSDTHw/yLnr41cdw4mmwO573hGcJ/AbmKjqDwWnmWLDraHW8VcOrycj+P7UefLbJHRf4az53+7z8P1/R/nNxy9vqo4Mjp4ni47dkHddWysbdBdHx7flyaWxJqOjNq+XZn+ll2m/FnbdyIeePqsyjrpJ4g16c9TsUHjVG2ycL4RrMchG7M9OCsr01lVb15OUOW95FvvaT1WOVsyXv7MsXAejnc8/Yy/seTJyKbxI5gM15J5l/8tnDWn2Ec/r7HWu5f/MEzRk7aj4Hv29HDRFy7Gc3eIbj1/ZuNF8cwMydmwfsnURNHahs253hMb3xMcrD9Qxkh9weZkeSTWFq8bf5M9Q9cOmpeuV1kNx2KCF/ssHXlyduKnheHtx5of44D1caZOm6ytWN3i1bcyd3ZvwriazV0s/+7IENWX6Ce7p6Nes+8y/67YVq/fiL4qclf06vHu1Lgif2ZNYe8q8o72x2p+u/bKR7JPV/w5I4PMLfPv5tZ8K7n4hM6q8Scbayfq/cx+FtFbNmYKh+i8aJ+ubao+gnqr1LeLQ3TeiR7ERA0tcnRqxui7XRtP9R8qNq7kS8i3G7M6PaGqT2dzDx1zunlW1cbo05G9TWrljH+xOj1ro4k9iWF5OCK31Pwou7UXez0JqXcjOtYYnTWs4+fj+WMuIzJFeh9adu8d0duO90RfzuKs63zs30R6Duxsc1fLMt7S5/B6Hd1zmegZZoavZZ8d78g7mZrF+12HL5Mh07tb4zahczYf5vjYn9O91Sxf6yxf29iLWXfwvmC9JHWOXDz/173V3XrBfhzrV1n5mnX+i309hhXtYyGXqeH149haRRtb9c2u7yW/kTo/w3+KayTm6V7AVG6UiQV6rbFna0yf73f3Tit2490h5ov62bqbk629MD6yNTVxB0b3aiuYLCZWfG/nc1P3N1DeCTmrdtjtPxPn3ThHB7Ors519p+4z4BqeqJW6drDyhSn7dvslWm9Td130mLqfM9XfmbCvlwtme93WPYKJOzlT9vVqm6gtsLfgnfN314c+I5K6P3qO4flyVI87DKxNpup+S1bp2+i6Sr5H8r1Iz4jxw3umnfPZjD8Kb/QvXWNa9wJ2fNlZIvJjdxam7tnifQXJSSN5OvqX5ZdWjY75Q4SH5K0df5aamWGg3fC+Cdb7GD8ye3DFPwX/X/ffn4jPeTHHuguW9c9uziEyTuRAu34Mypc5e7N8onMG1o13u/1Ey9fZ86t59FTeHLEtcsb8ITu31mvlTomOr9HzJHzO3iNEeVmsZHJ4sZ/lCPis5RPObF3p/j+7h9ntE+K+jriY60XWC5PN6r+i3OyeaYXTb1qd58Y=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztmzEOwjAMRbMyAJXgInAFuBMssHAEWOB2IC4AC4ykQogoCrSp49pp/9uTuJHt2D+pMQCAVGzGxmzHzcev7Ng1YXyI+SDtfC5Ha+uJYO/ejj0k/l6fBe/0lSyF198NhQ1g5DqizxHan0vkHCEfOzcxpgqGWCntjP1eny77WAl1f9pa0881N+svd+b8qolhYcyokLbijXTeBwCALiFdy/vMCL1V12umFOS8R5T6X6LeBHFQ6rsYTYZDE6qLr2e14ZchTahJLDWx9ZeeVffcSV3z55IHJH1UYu26uiVHDxhaW2uv+YmbnM/xXNDqA1Ww6KRK8eOA824GAAAAkKIPdZ82TRLki1vDS/X+7puKlDaojRMG7aAPee8fWvoajp6Ys1/tu9+AvMlVg0pJLpo9+JIi71LeAnDyick+6awaaPNeyl2rTv5xa/GHHfck2lnOF7qX4sqFlP8GJoUx08g3oprqsjb7KJzn4B8vWVs5Jg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_right.tx" x="585" y="391">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2C.tmx"/>
-    <property name="teleportObjectId" value="76"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/door_up.tx" x="472.667" y="906.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2.tmx"/>
-    <property name="teleportObjectId" value="78"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/door_up.tx" x="520" y="76">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2C2.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
-  <object id="71" template="../obj/door_down.tx" x="520" y="188">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2D.tmx"/>
-    <property name="teleportObjectId" value="56"/>
-   </properties>
-  </object>
-  <object id="72" template="../obj/enemy.tx" x="167.5" y="638">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
-  <object id="73" template="../obj/enemy.tx" x="837" y="651.667">
-   <properties>
-    <property name="enemy" value="Demon"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/enemy.tx" x="870.75" y="183.75">
-   <properties>
-    <property name="enemy" value="Hellhound"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/enemy.tx" x="153" y="219.667">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2C.tmx
deleted file mode 100644
index 376c3334077..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2C.tmx
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="80">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="40" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztzjENADAIADBejOFf0jIDvITQKmgEAAAAl1ROD3r/5wgAAAAAwBYPMFgBjA==
-  </data>
- </layer>
- <layer id="6" name="Lava" width="40" height="60" tintcolor="#ff5500">
-  <data encoding="base64" compression="zlib">
-   eJzt0LEJACAQBEGN7L8iLU2MFBMTkUdm4PLlUgIAAOCWVuYiWvsiNp76an7ftIv+4RC9DwAAAADgJx22QQ6/
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="60" tintcolor="#f87f85">
-  <data encoding="base64" compression="zlib">
-   eJzt0LENg0AQRcE9qMSmMIoBF0E12H1dwBKQIUeW7mTNSqNNn34dIioAAAA/sUTEml7RvuXOo0Q80zb22bhn25z/vKm07/nW2OuGV+M7fTrdEAAAAADgnxyGF0So
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzNmVFuwjAMhvvYaNxiZ9mGOAk3g8FuBRSOsVqbJc/YbezEWSJZSK3bfrXzO6bZb4bhPf217Wwwdun5XKTtN7JRn9M4DDcHH1z3NcbyUbY1PvA9E4PrLrNdk59zjW9L2GBchGcBFzDcmO/rS957efiQ8YM98zCzPJTcLw3pvWrwTbN9jj9c8Iv5AjszNvC5//rzwd+rBh9lfBBWadDncz8vWw4f17LGuGP3o3F/pOf7RPFJmkE+fh348eORfJpOJb4TqS+gixZ8VMuoF/g9CjmkMS5Zc7x8O6Ibei+Jz1tbcvXLtbGmR6kmvgXFj/vzmEnGa3pJDK18OSbxeWOYM/8snFJucV2JWD+sfFJt9M69CD7UUI25F8EnMUavv1Y+Pgd7yq80B3vKr9avRtXnGvqFEdHfW/mWev2o9cPCNyW9v/bmuJSPnwfG4yhzemLo5cNjmo/GaWWsyadxljB6+Kz+Uj+Tq+cIvhzd5MYwKn78Om9f04JP6wlzegYrn0dLUuwi87t23dr8s/TTtfm051BGyzri5aM1MNcwz9H1z2PenrUVH9WIpd9vwcdj11t+qTZ6zK9Un6PrXwlb5PpRoove4rcUu+j1w8vWi361vPZS/zQ+67eYCL5SzUbzad9Pcd5Z9l1b8mH8IPeWfdfafFPS/5/zPUW6zuH+D+WWYl1DH8CofUfgzMjEewg8Rn2ulfg4J9Rjbe/VOmr3B5z3nmTepf3jVnzaXOX7x3xuHEgOWvIhj1QXoQ5Ia3VrPit3L3w5XP/NF9n/RfF9A0EMcQQ=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1zEOABAMBVCT+9+Bg5olJoSS9/YmHaq/UoI46kJt3tYF9MwW0a3sTrxxALjJHUME7kEAOEv2wnv83eaU2w18bpQnL82qPIT/NGVrBAI=
-  </data>
- </layer>
- <objectgroup id="8" name="Objects">
-  <object id="76" template="../obj/door_left.tx" x="616.667" y="860.667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="77" template="../obj/door_down.tx" x="96" y="20.6667">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2C2.tmx"/>
-    <property name="teleportObjectId" value="74"/>
-   </properties>
-  </object>
-  <object id="78" template="../obj/enemy.tx" x="295.758" y="144.712">
-   <properties>
-    <property name="enemy" value="Hellhound"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/gold.tx" x="106" y="196"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2C2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2C2.tmx
deleted file mode 100644
index 3d5c2a01cd6..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2C2.tmx
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="40" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="75">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="40" height="60">
-  <data encoding="base64" compression="zlib">
-   eJztwTEBAAAAwqD1T20Hb6AAAAAAAAAAAAB4DCWAAAE=
-  </data>
- </layer>
- <layer id="1" name="Background" width="40" height="60" tintcolor="#f87f85">
-  <data encoding="base64" compression="zlib">
-   eJztw7ENAAAMAiDT/0928IbukNBLqqqqqqqqqqqq6vsAVwtNyA==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="40" height="60">
-  <data encoding="base64" compression="zlib">
-   eJzNmWFuwjAMhflJNW6xs7ChnoSbsY3dChgcY43AmvewHTt12CJFSDRtvj47tptsV4vFy/C7b6Ze2jjcX+vZtyu58zEfy8Xi1MBX7vtc9uXjbDW+MnbPernvMPXj0M5Z49swttIOwlyFqzCcYOzz0/V3N12/JOtHjK8wJ86F+kqtvNO+0dY1vq+pvy+v85Rfstdx+LEhZ3+7dboHOaO2tvgkRq2hrvherXp6+NAPJda18Gz0Xc89rXzoh9ikdV001GxNOtY07Mnn4az5pJcPfXB3m4/WhCd+WH6saVnj03xwvM0XjWvZjNKz58TbFkYvHz17DpuHEdd1hC+za+sGNYz4oLdTTvbEYCk2cA0z+bBWqMU4KX9L/p3FJ/mVxYg5Rlt7mfZFRqnm2YPOWhyluTP50GZr45q2ZiO+F+Wzalp+jecgLWZl82n6jMI1Tw7K5tNqqsNwz+351srk89T63LaePJTJJ8WWOWwZfHi9MFo1abS2aOWT4hJq6cmtj+TTOOcwtvBFx0v537tP0oPPs268Gs6xb+Q+KS5mfF9qazfC562hMvkiXdIu0740lmpP2pugOqk2D/pf0e485OqHNuL51KMFZ/T4XXQt1vZSPIybwPtE+Lx539LFqlnn8tW088yJdWlWfZDBJ/luhn0jtrU0wfVb0zrC59XO2ieT3jEj/mnvbrWRMVGMlPTPyh9lTG1vUtKRzj6scVn7z1xDiv1WjVxrmfmD+zg+k/6zzhTmaBfh83TijZ5FzOFrqV+sNd/j+yjKp635ln1hD1+UUYsp5HeRc9cefFo8Iv2K/SNncdl8mn3p3M3aezsCt6R1lg96Yg4/D8Uagv7z7OdH+ZCzxB1P7JFaTz6J9zzIvJRX8B3wW74nn+arPPbg+vKch/TiI0YeF2v7IY/m0zTldr/8Iz7U8C/9T+t4lmux/Rc+YvkGqY5eAg==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="40" height="60">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1jEOgCAMBVAWvf8d9KCOOmiCgELJezNDA+W3KcE49oqza8tC4KK0t/QkI1l6FzARfzuON3sFfOEpL2QynGQ1I7DfQV92ozbM1PlEfdOcP2328jezpl7UTOpt611AgUgZfVdrpF6NdNdAngMVnwYZ
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="70" template="../obj/door_down.tx" x="97" y="18.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2B.tmx"/>
-    <property name="teleportObjectId" value="70"/>
-   </properties>
-  </object>
-  <object id="74" template="../obj/door_up.tx" x="551" y="958.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2C.tmx"/>
-    <property name="teleportObjectId" value="77"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2D.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2D.tmx
deleted file mode 100644
index 20b9ec8d134..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2D.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="58">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4CBwY2TNHFqmE/IbHL0EFJPrH5y9RGrHiQPw5SYQ469pKijpr308O9Axi890jMpZpMjPgpGBgAAySsKzg==
-  </data>
- </layer>
- <layer id="7" name="Lava" width="30" height="17" tintcolor="#ff5500">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AU0Bs8Y0XgUXtHwSgYBfQEADbGCEQ=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17" tintcolor="#8a3440">
-  <data encoding="base64" compression="zlib">
-   eJybx8nAMG8Uj+IRiNvYGBjakXAHG33sVWFnQAFq7KP20gIfAtpzGAkfoZO9o3gUD3YMAOBARC4=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy91G0KgzAMBuD8bz2BHwdzZ3HzWFr1brOMQhb68aaKgSBa4mNM6WKJlgeyE4nUvBoiZ9M5Nve5Yd2b23nNxQrYmn4RE7VRl5uTIRoS/3g+1z6mbCNuzEz1vYI24vagmbLbyn6D2wImtzdWd9VFY7q5X43L6664cm45k++DWvew//szZ0vT3++VbgfYYZ4xM/ZezTkpbSdm70BTe05K20dsz5VMrcvtt/kld8Ozklnjyhruar+f5xdMsOuI
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKBATt5BtoFwxfUcg+0C2gLVBgH2gVDFwAAAAABcw==
-  </data>
- </layer>
- <layer id="8" name="Over Sprites" width="30" height="17" tintcolor="#ffaa00">
-  <data encoding="base64" compression="zlib">
-   eJxjYCAd3GQiQxMVwKi9o/aO2jt07R0Fo2AUDA4AAGT1B7Q=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="55" template="../obj/door_left.tx" x="176.5" y="241">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2E.tmx"/>
-    <property name="teleportObjectId" value="58"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/door_up.tx" x="207.5" y="270.5">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2B.tmx"/>
-    <property name="teleportObjectId" value="71"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="296.5" y="137">
-   <properties>
-    <property name="enemy" value="Devil"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2E.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2E.tmx
deleted file mode 100644
index cd8b564a364..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2E.tmx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="59">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4CBwY2TNHFqmE/IbHL0EFJPrH5y9RGrHiQPw5SYQ469pKijpr208q8MDwIPZPzSIz2TYjY54qQCUJgPBBhp9iLbD8OUAAD9PQw2
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17" tintcolor="#8a3440">
-  <data encoding="base64" compression="zlib">
-   eJybx8nAMG8Uj3jMBMQyPJiYZQDspKXdyHa2sTEwtCPhDjba2Y3sLxV2BhSgxo4qTy970cN7qNprw4XAdlwIcw8B7T2MhJHtdOCirh9BfGS7samlhp3Y7AZhkN313Jji1LQTl93UNn+w2YstrgfCbmq6AwC4xxqv
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzF1F0KwzAIAGDfY0+QbAfbzrKfY7Vdd7dVRkBEG03HKkgJwXzY2owIMP4hi0hPzXUAmNHOy/A7t+6T+VqfWzE57Ei/HtNre11u3hLA2XjHz3Xvkdq2x9VMq+/JaXvck2HK2oK6nTv7rW4WfVputXndXpfHlktxhEvfZK/L55Wfb7lyDnrdN35nRHNkSpPWS6dbmG31WXvVTO3cyD3J7Yz6veExo/ckt+WM8WiZUZfb5N6Tni2zx5U11n8VOYPyA9y87e4=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDDegwjjQLqAfkOVhYNgFxaMAAWq5B9oFtAeqdE7ndcMkTAHHeQMS
-  </data>
- </layer>
- <layer id="8" name="Over Sprites" width="30" height="17" tintcolor="#ffaa00">
-  <data encoding="base64" compression="zlib">
-   eJxjYCAd3GQiQxMVwKi9o/aO2jt07R0Fo2AUDA4AAGT1B7Q=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="56" template="../obj/door_up.tx" x="97" y="143">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2F.tmx"/>
-    <property name="teleportObjectId" value="59"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/door_right.tx" x="192.5" y="238.833">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2D.tmx"/>
-    <property name="teleportObjectId" value="55"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2F.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2F.tmx
deleted file mode 100644
index 6aa8a1288bc..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2F.tmx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="60">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBjcQIZn1F56ADdO0sSpYT4hs8nRg009KExhmFj96OrIsRcZoMcrSB6GSTGHGvYSY+5Q9e9AxS8xZlAjPZNiNr70Ti17RwF9AXJZRgkAAMEHDNY=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17" tintcolor="#8a3440">
-  <data encoding="base64" compression="zlib">
-   eJybx8nAMI8ILMNDnDpqYJhdIJre9iLj4Wgvul0wDALYxFloaC8uO6lpNz4729gYGNqRcAcb9f2NzR0q7AwoQI2ddvGPz15apruBsteOC2HuIaC9h5Ewsp0OXNS1F91ubOFBCzuR7a7nxgxbWtpJb0zPMnmw2Y1eJ1LqHgBPPRY8
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy91F0OwjAIAGDey06w6sHmWfw51tR5NyWGpCMglDSSkGVZ4Bvd2hUB1j9kFRmpOU0A8+f6MHKZxrn8nMwnfl0r7gG7Z142KX65ETvqtib31db4VgCuxbcjrjS9OSN2xD0YpqytqNtzct52HSMu2/y+Wbetj7oUI11eO889l3Gu/G6WS+YR93su475w/3+yrbnSpPst6VbD1mbVTK1vzzkpbe3ciJi956S0rfDMXre1L8VOz8y4ssbazz09KN+IXe73
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBjcYBfPwNmtwjhwdo+CoQ9koWlXegDSsOoISruyA1hGDGZQyz3QLhh+oG6YhCkAzaYCnA==
-  </data>
- </layer>
- <layer id="8" name="Over Sprites" width="30" height="17" tintcolor="#ffaa00">
-  <data encoding="base64" compression="zlib">
-   eJxjYCAd3GQiQxMVwKi9o/aO2jt07R0Fo2AUDA4AAGT1B7Q=
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="58" template="../obj/door_right.tx" x="177.5" y="46.333">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2G.tmx"/>
-    <property name="teleportObjectId" value="63"/>
-   </properties>
-  </object>
-  <object id="59" template="../obj/door_down.tx" x="98" y="144">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2E.tmx"/>
-    <property name="teleportObjectId" value="56"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/portal_2G.tmx b/forge-gui/res/adventure/Shandalar/maps/map/portal_2G.tmx
deleted file mode 100644
index 6cfb2e330b0..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/portal_2G.tmx
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="64">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo4CBwY2TNHFqmE/IbHL0EFJPrH5y9ZGrnlrmjHR70fk7eRgYdmHBtIhfeqRnUswmR3wUjAwAAAl2DPk=
-  </data>
- </layer>
- <layer id="1" name="Background" width="30" height="17" tintcolor="#8a3440">
-  <data encoding="base64" compression="zlib">
-   eJybx8nAMG8Uj+JRPIpH8SgexYMWowNKzAIAu+NKJg==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="30" height="17">
-  <data encoding="base64" compression="zlib">
-   eJy91FEOgzAIBmDeW09Qt4O5s8x5LN3m3bY+kDACzU81IyHWaPmCkq6ZaP1DjiqRPbeB6Jn9nIbzXH5ezdf3ylHEmmMD7Ei/2tTuPRE9EmajrjRr/av4rrLPBbQR1zJ131EbcS+g6dmls192N8Msjbnmd4+6cm6sufLiqFvEWtack51nfufF6FmHnoNed8+/89mytVnv353uCNqeadWNnJPats4NxIyek9pu/d+WGXWl7c3wDJg9rrXHymiND/q+9Gw=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="30" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJxjYBgaQJqH/naqMtLfzlEwCmgNPrEPtAtGwXADA1E+j0R7qQUAoG4BvA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="57" template="../obj/enemy.tx" x="118.656" y="136.04">
-   <properties>
-    <property name="enemy" value="Demon"/>
-   </properties>
-  </object>
-  <object id="58" template="../obj/treasure.tx" x="330.5" y="123"/>
-  <object id="59" template="../obj/treasure.tx" x="330.75" y="169.75"/>
-  <object id="60" template="../obj/gold.tx" x="332" y="137.25"/>
-  <object id="61" template="../obj/gold.tx" x="332" y="149.75"/>
-  <object id="62" template="../obj/entry_up.tx" x="207.5" y="144.5"/>
-  <object id="63" template="../obj/door_left.tx" x="176.5" y="49">
-   <properties>
-    <property name="teleport" value="maps/map/portal_2F.tmx"/>
-    <property name="teleportObjectId" value="58"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4.tmx
deleted file mode 100644
index 943e8b5b842..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4.tmx
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt2LEJwDAMBEC3hnitrJW9Ml3aFC5S2LGw7kD9w4OKLwXouY/VCeK52uoEzKRfAGCEs34/AP7jPwNATO9d1kabh673pFeA3B7QLwrZ
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+8w/VWw37E0gvqaqqqqqqqqqqqu8DFRHS7A==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztmW0OgyAMhvlrhifYdh0PsZ1l7lz7uttMNhJtQFssSps2eX+QUMczKS9I1zjXDTp53eqaqfYejwTea+vc06d1aaf9YJs7b9y3BO950FwcQT/Y5s4b992D9/H/z18+3tbGmxtSeW8H5/pB90O8rY1XW/1+/O99pfROjJuah6370rzUeZAaC+f6UJIX44ex9RnroYEXW/eleW19Nt5aebG1GKsvSbw574ry+zmR4l3ysbGXaeBdo8ALPQMTFP/PCfh8DC88O6Z4JQSGd2kuBN6e4OUhKP6fE/D5nLxBEup3zkOW5r5EXk7/xaz1qfNLad5azkdb8ebkSua189E+vNiah9+vqOsD535SwvcNzv3kFvcLFB9dk2f3C9vy2v0CLqTuN7juFyih4X6hlv0G9p4g9INt7rxa/LcGGa9uGa9uBc4vNVqY7w==
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1jEKgCAYQGHbGmrwEJ2jc4RTF+lm3ai9qIYmwSEoTPu13geCg8JDRFQKwJlWSxcAAAAA+Zn0/YG4TC1d8K6+lC4Ipymu14xV/A58C+8zAABpMs589dg//Ozfb3XOPMcz2KUDEjVLBzy0eeyx93cJWgIAkHAAJosfBA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="65" template="../obj/door_down.tx" x="816.832" y="303.333">
-   <properties>
-    <property name="teleport" value="maps/map/vampirecastle_4B.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="66" template="../obj/enemy.tx" x="304.333" y="513">
-   <properties>
-    <property name="enemy" value="Vampire"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/enemy.tx" x="449" y="97.5">
-   <properties>
-    <property name="enemy" value="Vampire Lord"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/treasure.tx" x="586.167" y="96.5"/>
-  <object id="70" template="../obj/entry_left.tx" x="3.66667" y="305"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4B.tmx b/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4B.tmx
deleted file mode 100644
index e2eb6dba683..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4B.tmx
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt1kEKwCAMBEAfYH/Qv/r1UqT3Fi1GMgO572IglgIA7KwdqxMAwDvRb9ad78kYPetMmbryH3vEaqM7eNY+WezW1/t+k60vefhvAAAQ2QWAnQa5
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztz7ENADAIwDDWiq97BPd24AiE6sF7UieiAAAAAAA+dbNNd/j16xcAAGCnB6xa0lw=
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl20OwiAMhvlrxk6weR0PoWeZXms6vJua2MQ01AGD8rGSvH8WCjw0ZW9nrdTcmE4HWrnPVgvvpVfqocvSuU/He3yrtDEkzC/wTp1SV0K3bn1ODME+HLyfPUZCLnNi6HcfLl5bPS/fOfc/9UbFutZrLt6Qet4Sa4sXXuGtmRfehWUnvLb1WuadMv5/pX7r4qU8AHjy1nipMwzazvvU/r7XrMSu+W+zgRfyifPnypvaF8f2zzgG7hzfsSF4Qzzwmn929d8xeH2+565fyI0J4MV3Sd3xUhDviHLhw8t55li8+O1x4fV9X6GusYfNwcvpN7aMGvsF7GE5eW3rtewnpV8QXuGNw5uiX3CNz8GbU5y8lJfnFOf/t6SRkje05lLKpz9qScIrvC1JePfL+wKwbNP2
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt1rEJgDAURdFYpXILHUOwcQRFEFdxUe3cQhsFCysRJfFFvQcCH5LiFgnEGAAA/itXBzjQXjibeat4XqEOgMyoDvCgVweIDeoAOHf0TueTfbVmXbXd5kla4l8X73NldR2+pJG64L7kpe3lB+8RAAAIC/8NAAAAhGwBNuMKGg==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="798.41" y="304.238">
-   <properties>
-    <property name="teleport" value="maps/map/vampirecastle_4.tmx"/>
-    <property name="teleportObjectId" value="65"/>
-   </properties>
-  </object>
-  <object id="67" template="../obj/door_down.tx" x="48.9816" y="304.041">
-   <properties>
-    <property name="teleport" value="maps/map/vampirecastle_4C.tmx"/>
-    <property name="teleportObjectId" value="66"/>
-   </properties>
-  </object>
-  <object id="68" template="../obj/enemy.tx" x="640.635" y="193.424">
-   <properties>
-    <property name="enemy" value="Vampire"/>
-   </properties>
-  </object>
-  <object id="69" template="../obj/enemy.tx" x="270.833" y="385">
-   <properties>
-    <property name="enemy" value="Vampire Lord"/>
-   </properties>
-  </object>
-  <object id="70" template="../obj/treasure.tx" x="390.083" y="317.167"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4C.tmx b/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4C.tmx
deleted file mode 100644
index 677588e99fb..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/vampirecastle_4C.tmx
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="81">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="7" name="Collision" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJzt1zEKwCAMBVAPUG/Qu3r1Di5OxdQKrb4HmSRm8CMkJSCi5Pn3vDWDfbUZiubpPGrdnY/0w9f5n5lBdtbmfQH+7ekO09NnPwIAAADYwwWcaQal
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztwzEJAAAMA7C+8w/VWw37E0gvqaqqqqqqqqqqqu8DFRHS7A==
-  </data>
- </layer>
- <layer id="2" name="Walls" width="60" height="40">
-  <data encoding="base64" compression="zlib">
-   eJztl1EKwjAQRPdX2p6g9ToeQs9iPZda72ZEAjG4aWzaZkwnMFCY+egLDJvtapGuMB12unL/GxLvqRG51Z86Njielp3KuzfyTwvkaVnykpe8GEzkJe9cvA+jvhK5GJ2r9/eQ2bNyM72XTX1fve62BfFiMmO8Y2+Xu9EVxHMzU3ljuoF4Unn9PoS6kstzM6m8KB1dur8ar+212yd/X1nbC3U8dj/SeBFm7BLz1862YSO8oY7kZiIveclL3l/2o287CIKnZVP3o38TeclbkshL3pJEXvKWJPKStySRd7u8T2lO1+w=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="40">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzt18EJhDAQQNGxAEGsQVvwnDZsxqMdCB6saLcNb1qBJ0Eiu4iwGTFG3P8uGTLDZE6BEQGgMZ3Upz6Y0yiiT9yc1BP3YuzZb+7zdD928UpE3ok+txpikTHWvanR+WuNgMxX3IYawrrifwYA4EpZ9LsGeIrqwC7isufscdl9fO9H+G9GUVv6GgIAAAAAACxmQjETIA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="66" template="../obj/door_up.tx" x="35.2402" y="285.749">
-   <properties>
-    <property name="teleport" value="maps/map/vampirecastle_4B.tmx"/>
-    <property name="teleportObjectId" value="67"/>
-   </properties>
-  </object>
-  <object id="75" template="../obj/treasure.tx" x="784.167" y="63.75"/>
-  <object id="76" template="../obj/treasure.tx" x="704.5" y="64.6667"/>
-  <object id="77" template="../obj/gold.tx" x="744.5" y="62.9167"/>
-  <object id="78" template="../obj/enemy.tx" x="374.417" y="306.667">
-   <properties>
-    <property name="enemy" value="Vampire"/>
-   </properties>
-  </object>
-  <object id="79" template="../obj/enemy.tx" x="744.5" y="193">
-   <properties>
-    <property name="enemy" value="High Vampire"/>
-   </properties>
-  </object>
-  <object id="80" template="../obj/enemy.tx" x="207.833" y="223.917">
-   <properties>
-    <property name="enemy" value="Vampire Lord"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/waste_town.tmx b/forge-gui/res/adventure/Shandalar/maps/map/waste_town.tmx
index 928a5f8f934..2de84cfe5ca 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/waste_town.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="49">
+<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="58">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -7,12 +7,12 @@
  <tileset firstgid="6321" source="../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJyr4GZgqBjFo3gUj+IhiJtIwOh66GUvKW6jt73E2k0Le4mxe7jZS8jugYpfWtg/UHmLXDvxuYOQO2lRrlHbzFF7R/FIw9Y8A++GoYQBIy3Trg==
+   eJyr4GZgqBjFo3gUDzhuwoIr0Ni0tg+XGwarvcSaRYxdA2HvQPl3MNhLjN3DzV5Cdg9U/NLCflqXD9S0F5s+QmZSw6+kuIceeKTZO4qHN7bmGXg3DCUMAHMg1Qw=
   </data>
  </layer>
  <layer id="2" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFl11OwzAMgAM8oCbhCFPhAQ7Bw1CFCkfgAIODbBxhB+iQ+FFvxAMIRNkReCdWYzXJ0sVd086Sla5189mznaRTydihYOxI6Rgy44zd85o5JvdANEzQK1n78cCHY0KsU2lzx4jbjRX1U/nytAduzFjvTjbvFWr+D2nHuRJNrMt4eC97JWzeGDJkTF2kUjX+q/SmZXSv13zzXbxfads1oSfLhLGF+r8TNZ7KRnlSK17DKNSYG6xbXr8Lmhu/cwIbuY+EXKeOPz4fTf+2seeCzqVKSmCjDXCf1Xgc0BeCDehrUs/7lrT7V2puRqgHig3alVuYQ3JDMtc1CLbnE8YuJnG4i0DNYI6/eThv1wQb0B/NNfM78/icOj3h9iquBxm31wtTsXYr3cuwJpzJhgH7UmifT6Xdo+hHZsxp9q/pp4+Je3/XcwbmIvPMic/N9c197u6FwKeyS83ddY1x93/qvg91/9WDWzjcrv72OZ/skxsS96zUl/vnOXtRpIgQ767yLsfnXkb4psLvpC7fJ9T8Ql205fIf9qthZw==
+   eJy9l1FOwzAMhjN4QE2zI4zCAxyCh6EKCkfgAIODbByBAxQkBOqNeACBKD3C3omVRHWzNnHbrJasZl2X7/fsJO5SMHYQM3YofQpbccbuuWJOyZ3FNRP8UigdD3x/TIh1KZrcKeK2YzX+JbW8TMwNzbub797LJeNTNOPE9hRWwg77WfuYWP866hDfr9A4RExxpNxnG0dcJVcabzqu9vhV8o4I/ib9VHRzi0jpiuT1RNTOI+VmDFeIMUUabrn6LXiGPsM49ewHhvtIyHUi1HzcoRHrqxzsdVxzs4Wc+9jN9sWB9WUOdqL1AZeSuytOy+81V/O+O+qv0FxKLJRnzHOFp+b3xfXZGtXgmczx+SIM17V+wUyOfwi5o+b3V3NxflctmhNrTYCOzNo7Kv2flOg+dlO7pV7LkbV3wLnkO+cT0VyjRkeK5sTrF+tsY5qzv2+fkaD9wJ7TfI/3N/t7+ywEPpVdaC5lb2sz+/yn9jhQ998juPnAnmPWU2ebDelzQnF9TLtXGsvdzof1OHmAeIfah5ieexHgncq8J/V5P6HmF+pi29JHg/0Dv4Nh9Q==
   </data>
  </layer>
  <layer id="3" name="Walls" width="30" height="30">
@@ -20,44 +20,54 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDHWwg4WBQZrGeBcLpr2hrLT3GzY7Rrq90yUZGGZIQtjaUgwMOlLYzUqWZWBIkcXPJsVeWgBK7X3PjkoTAhqM2O34SqK95AJS/HsY6NZyYNxWALEeJ6b8SIhfSuydzDEw9hIjRgyApVVy7f3CSl7ZTkp98g3JXvTwnoLGJ+RmcsIJ3c5RMApGAXkAADIWIvI=
+   eJxjYBgFo4B2YAcLA4M0jfEuFkx7Q1lp7zdsdgxFe5NlGRhSZDHZtLaXWDBqL6YYcjxpSzEw6EhhNwtX3GKL58HsX3zgPTsqTQhoMGK34yuJ9pILSPHvYaBby4FxWwHEepyY8iMhfimxdzLHwNhLjBgxAJZWybX3Cyt5dSgp9fY3JHvRw3sKGp+Qm8kJJ3Q7iQHUsJccQIq9hMKOVvZSE5BrL6V+H2r+HSz2AgAoOizU
   </data>
  </layer>
  <layer id="5" name="Overlay" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzt0bENABAARNFr2YDEPOzAJgxPoRQSFcl/1RXXfQkAcKM6qbnzLwYphf3Ge8xoY2ef7KXi1z/6AgB+1gHIEgcY
+   eJxjYBgFo2AUDAbgLsvA4CGLyR4FgxcQG0+44nY0ngc34ATGDRc0fqKlGBhipLCrG43fUTAKRsEoGAVDGQAA8c0ISg==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
   <object id="38" template="../obj/entry_up.tx" x="204" y="368" width="56" height="16"/>
   <object id="41" template="../obj/shop.tx" x="256" y="208">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
    </properties>
   </object>
-  <object id="42" template="../obj/shop.tx" x="304" y="208">
+  <object id="55" template="../obj/shop.tx" x="272" y="144">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
    </properties>
   </object>
-  <object id="43" template="../obj/shop.tx" x="352" y="208">
+  <object id="57" template="../obj/shop.tx" x="320" y="144">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Golem,Sliver"/>
    </properties>
   </object>
-  <object id="44" template="../obj/shop.tx" x="256" y="272">
+  <object id="50" template="../obj/shop.tx" x="304" y="208">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
    </properties>
   </object>
-  <object id="45" template="../obj/shop.tx" x="304" y="272">
+  <object id="51" template="../obj/shop.tx" x="352" y="208">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
    </properties>
   </object>
-  <object id="46" template="../obj/shop.tx" x="352" y="272">
+  <object id="52" template="../obj/shop.tx" x="352" y="272">
    <properties>
-    <property name="shopList" value="Instant,Creature,Land,Colorless,Artefact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic"/>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+   </properties>
+  </object>
+  <object id="53" template="../obj/shop.tx" x="304" y="272">
+   <properties>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
+   </properties>
+  </object>
+  <object id="54" template="../obj/shop.tx" x="256" y="272">
+   <properties>
+    <property name="shopList" value="Instant,Creature,Land,Colorless,Artifact,Multicolor,Azorius,Dimir,Rakdos,Gruul,Selesnya,Orzhov,Izzet,Golgari,Boros,Simic,Golem,Sliver"/>
    </properties>
   </object>
   <object id="47" template="../obj/inn.tx" x="150" y="273"/>
@@ -66,5 +76,6 @@
     <property name="shopList" value="Equipment"/>
    </properties>
   </object>
+  <object id="49" template="../obj/spellsmith.tx" x="96" y="208"/>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_2.tmx
deleted file mode 100644
index e43a665b65c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_2.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="48">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="60" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIKRDaR5UGligSwPKj0KRsEoGDxgDzBf7uXBzR+OgNyybBSMglEwCkbB8AUAqeIEEQ==
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="17">
-  <data encoding="base64" compression="zlib">
-   eJztw7ENAAAMAiD3Puz5/tFAQi+pqqqq+uoAPGAKEw==
-  </data>
- </layer>
- <layer id="2" name="Ground" width="60" height="17">
-  <data encoding="base64" compression="zlib">
-   eJzNV0tSwzAMNW0W2M4dgHMUmGyYnqs9BEsuVzgH8NpoUFXJckOIeTPeZBRZz08fe59DeOjDEZ+3IQwphLd4uVYxnOEjhSI68a/mA8jf3/b5tDyf3L5ki71flYX9I4uhhidw19fF17H/NwVbxHDfn8dSAuxIIwvYjzg+pcv9ua4aR4mac26NzuHxmE5nUQvSuSWg0/NMZ076HQr+Wuks+4wFHjs/m5tCnXoa5lhfe7+F1k+1nHwfdaLYtf+0vCD9ZH+YM4+uAfrOmnFcK3y36Ucn6EC9C3Zd9PNCasfPCpy13PhrWPWzYzy5RrI/89nhQc5Wrw/ODaqzF4OzN6umgPKqFWrvAHPvaZ3xUkB/mRLDdmLcre8dns5abwFXK+cH5sfyueQ80qDFTj2ZFvGm3q1x4fOtZGftuQRqZgNxB/j7hMdMM2el2P2HezPecljefR+1LWPNYlaV7i6cN2FYeAZXvW3G797skrpa4Bpvkn0/m4LDWD+aNjVchzF/KR7SCP6+ANJzZnU=
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="17">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJy1V1FOwzAMzccmWD+Kul/uwBUWGNK4ANokuAncAq7AHSbuQgWcAfpNrdTCM47tZuVJUdw4fbVjx0lDGI+nU1u3c84HPGf0b855GqRvbx18km5L5DjCLst/zq3Np/NwfTz8qwKbJL/2sxDOJ2yvM9sOr1/xyPcl3M59vBYP5aNoh57Hg679t8Gp5d8urxLB7TsWGp93zaZAmxlH+66a1G+aX92q7mNfJ/l6GL87C+G+bxeL9HwzjK+bQz4OK4YcWkx5XcxB2uNWfC8r/ZkiOvg0SH5Qm3NrIPlF1zcSGe07Wcjto0r9C3uWGuUDaPnLbfTUW46x+wO+kYsHz38trhRT1QN6bkl7oeRsB3jtK/WX29UR2Rsf7371AO3bLPvas0zyQ1+jHuvDcfRX0lEZ+EpyE4B+xaEfw0PXpGM6uuboL42fJPM+J0v54r1HTXX/1ID2vVd/axSV11VeB+1T8VdDdM4ryRnpDP7v/TsGuTuCBu1+pZ2/0eBFf63agXy4h+Cb1p2P7zcLUt63io7ia+77BwB/Pf8WnSO+aJOnPmOMSs8fzkORu/NBzMBfLVd5TYoT2AT2/AB50mK/
-  </data>
- </layer>
- <layer id="5" name="Roofs" width="60" height="17">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjALCQJmPgUGFD1XMnp+BwYF/YNwzCkbBKBgFIKAtxMCgIwRhxwPLqAQ+THFS1I2CUTAKRsEoGAXDCQAASpEEow==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="479.68" y="271.375"/>
-  <object id="41" template="../obj/shop.tx" x="352.667" y="175.833"/>
-  <object id="42" template="../obj/shop.tx" x="400.667" y="177.333"/>
-  <object id="43" template="../obj/shop.tx" x="448.5" y="176"/>
-  <object id="44" template="../obj/shop.tx" x="512.167" y="177.167"/>
-  <object id="45" template="../obj/shop.tx" x="560.833" y="176.5"/>
-  <object id="46" template="../obj/shop.tx" x="608.167" y="177.5"/>
-  <object id="47" template="../obj/inn.tx" x="511.833" y="97.1667"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/waste_town_3.tmx
deleted file mode 100644
index 06223a04153..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/waste_town_3.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="60" height="34" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="76">
- <editorsettings>
-  <export target="wastetown..tmx" format="tmx"/>
- </editorsettings>
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
- <layer id="6" name="Collision" width="60" height="34">
-  <data encoding="base64" compression="zlib">
-   eJzt1cENgCAMQNHeCxMYF4NZ0L2M7mYIGi4cTYjtf0kP9NSGNhUBAAAAgP9JUSTH2VV8KxnrB/DuDLMrADBysZsmbdpi1/Yu2nOWrc88L07muu5v/VMvN/YIPQAAeN3Kwgq6
-  </data>
- </layer>
- <layer id="1" name="Background" width="60" height="34">
-  <data encoding="base64" compression="zlib">
-   eJztzzERADAIBDBWroaxgltEdPglQwRkXtUEbGckrr6+vr6+vr6+vr6+vr6+AAAAAL8OPzfNaw==
-  </data>
- </layer>
- <layer id="2" name="Ground" width="60" height="34">
-  <data encoding="base64" compression="zlib">
-   eJy9WVlOw0AMTZcPMukdCucohf60PVfhDv1E/HKulnNArcaKZbxNMsOTRpGyzPiNl7Gdrm2at65pvlOjYnl75yyMeWt/89GPObkCNre1Xvr1un59Swb6ztPqfu/noWl2aVgDx1aYg8/btsM8GkBG5Ahzboz9oZwpR/5s1g7rP67uVw1r9pxznStc4TtPn5b8UbwG5pfki4BytWwMgfYhcd4RWxsDamc588A3s4z9fE55+4V6put5fuDJGPWn6+3eJQ37jd+N1TcA9Xcx5gA9l5QRfHRB7i2EuY5piD3gjxgXPK5gN2gvkh2g/qgOJdSQUYsNJzIHjY+R2LdhepF8Bf2Ux17JR0vJiPu8V55754CFJbPDT0HPPMZT+0XOpWWccgZEQM+5yLtSLC8tY2LygO8fhHHtxyHV2x/0WQngA5qeATlnxpVwojHAGrU4gz4lXpae0Rc0zlFO3tg7uj6O3JNOkVvyV4zJODjnUlwpZ42rFk9oPhC1EzjnLJtFXzgLvl96cJ/GPbVsb0t852pwBp4wvJxUszVaw5Qc7528BtUxckW5uSxc3lD+3d/Xzq5TBa7SOh3LA6y8kPLO4brrfZfXrFSWWjZt+TLXqwaq42htxW0C6lUeN2rZNLdrBMSS58xYHamJornIV0W+sLcXJXZQQAyC2huvPNe2egMUVs1cky/NhyMyeL2nKTWz9BzyyBJ2DfOk9q/PlOw94d55NXPEtpF7VIdrIR5MQaT3RGOsxQc4W7016f2IveZiau+JyhapmaOAfZQ4j+XKezLRb7S80auZc2okCjjD6MjFf/XHeM2c05ctiZr9MW2tmtBqVI4a/bEp8gCm1KhWvKzZHxsjD8CrURHW/yLv30rkTIxgqjxWjUpjjPUeIKInr/fkoYQ8pWrUCCw9Y/6snSUl5SlRo0bPPK33tGiHXJrPVVOeMTUq/kvw8puIDHge5cjDY1RUHnw30htfC3paGuem1XtCX5R6T7+rNW/n
-  </data>
- </layer>
- <layer id="3" name="Clutter" width="60" height="34">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJzdWF1OwzAMzqROXftStEfgADwhwQ1ASHABnuAqnGI9Atxh4jTABXgBnlk0IqVpnNixk5Z9UjWlS21/jn9aK4VHvxquLxe45zar+J4pkGqX6wcuqPKk9XPQe+6l+NV9xicXkh3yR+/Zc4GMWw5K6DCQiIcNX8SoHnBlStjExXdG2SViJCUXOfHEjcWYvRK9hGojVydUy/4zKD5x93JyalspdVLgeq1gG+w6J92L3Rp6v5SVD6GUHo2Qzw6Rrw8mJw6JL6Zf23bcrpW6W+PXMXSdUkfdWM/ITkbOUp+17bhqh//F1hqfNSzb3m/rwdqY4/1D2/HcKFXvrvd2/1tH1i/N8D50fQB8OeD2dm2H79xCoO43eiiI8XLfSbB9bE58Q/VGqi9L8X3Y1aXHv9p03vj1GGDnKli4eR6KDZsvtj5ft/58DSF0viXnGzZfbH0ukb+5oO14a2n1+SYz35zzQarfzxblz1eyD6fYIcEXO7/zgVPvvpa077rTas/3mPg9+DNh/gbnm4jceZrJvDhnntuypflK5WeOGauGyxfysx0rlPy05eXqzRQfzyWeSyHElxNTU8/XoTi1+ab2BpE5sfkFZEE6sLqN3DnHM6c3QzUmxhfyX6xG+M7JyJL+pqJgyvP9BSfHXkM=
-  </data>
- </layer>
- <layer id="5" name="Roofs" width="60" height="34">
-  <data encoding="base64" compression="zlib">
-   eJzt1DENACAAA8E6IMEGeAD/qrAAE5Dcbb91agIAANzQatLrfgP8aJRkltsrzvhnAAAAXrUA3oMDgA==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="463.996" y="404.737"/>
-  <object id="41" template="../obj/shop.tx" x="304.333" y="223.667"/>
-  <object id="42" template="../obj/shop.tx" x="368.333" y="223.667"/>
-  <object id="43" template="../obj/shop.tx" x="433" y="224.333"/>
-  <object id="44" template="../obj/shop.tx" x="304.333" y="320.333"/>
-  <object id="45" template="../obj/shop.tx" x="368.667" y="321.667"/>
-  <object id="46" template="../obj/shop.tx" x="432.333" y="321"/>
-  <object id="47" template="../obj/inn.tx" x="550.667" y="304.333"/>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/obj/scroll.tx b/forge-gui/res/adventure/Shandalar/maps/obj/scroll.tx
index fa68cc562e2..fdab5305ead 100644
--- a/forge-gui/res/adventure/Shandalar/maps/obj/scroll.tx
+++ b/forge-gui/res/adventure/Shandalar/maps/obj/scroll.tx
@@ -3,7 +3,7 @@
  <tileset firstgid="1" source="../tileset/buildings.tsx"/>
  <object name="Scroll" type="reward" gid="1363" width="16" height="16">
   <properties>
-   <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Black Lotus&quot;, &quot;amount&quot;: 1 } ]"/>
+   <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Black Lotus&quot;, &quot;count&quot;: 1 } ]"/>
    <property name="spawn.Easy" type="bool" value="true"/>
    <property name="spawn.Hard" type="bool" value="true"/>
    <property name="spawn.Normal" type="bool" value="true"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/obj/spellsmith.tx b/forge-gui/res/adventure/Shandalar/maps/obj/spellsmith.tx
new file mode 100644
index 00000000000..337087add56
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/obj/spellsmith.tx
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+ <tileset firstgid="1" source="../tileset/buildings.tsx"/>
+ <object name="Inn" type="spellsmith" gid="1391" width="16" height="16"/>
+</template>
diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
index 960067761ce..04d7de9f373 100644
--- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
+++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
@@ -62,7 +62,7 @@ RedShop
   xy: 352, 704
   size: 16, 16    
 WhiteShop
-  xy: 369, 704
+  xy: 368, 704
   size: 16, 16  
 LandShop
   xy: 304, 720
@@ -77,7 +77,7 @@ BlueShop
   xy: 352, 720
   size: 16, 16    
 MultiColorShop
-  xy: 369, 720
+  xy: 368, 720
   size: 16, 16
 SelesnyaShop
   xy: 304, 736
@@ -92,7 +92,7 @@ RakdosShop
   xy: 352, 736
   size: 16, 16    
 GruulShop
-  xy: 369, 736
+  xy: 368, 736
   size: 16, 16 
 SimicShop
   xy: 304, 752
@@ -107,7 +107,7 @@ GolgariShop
   xy: 352, 752
   size: 16, 16    
 BorosShop
-  xy: 369, 752
+  xy: 368, 752
   size: 16, 16
 GoblinShop
   xy: 304, 768
@@ -122,14 +122,23 @@ ElfShop
   xy: 352, 768
   size: 16, 16    
 MerfolkShop
-  xy: 369, 768
+  xy: 368, 768
   size: 16, 16
 EquipmentShop
-  xy: 304, 786   
+  xy: 304, 784   
   size: 16, 16   
-ArtefactShop
-  xy: 320, 786   
-  size: 16, 16  
+ArtifactShop
+  xy: 320, 784   
+  size: 16, 16
+AngelShop
+  xy: 336, 784
+  size: 16, 16
+GolemShop
+  xy: 352, 784
+  size: 16, 16
+SliverShop
+  xy: 368, 784
+  size: 16, 16
 Test
   xy: 128, 48
   size: 32, 32 
diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png
index c590e2df4e9c4830a1e6cf0d1a042c6dde9b0436..d4df15cc7120fd9fdff7f265fe163a113ce4130d 100644
GIT binary patch
delta 50424
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

delta 49491
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%0Ayf29yl$$0Z&j^3)Uh
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
VAAB4~3jx30yjFZwBxUITe*k0+s7n9<

diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.xcf b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.xcf
index a2f068736f6640cfa5509fc0d3fac2906bdc394e..666255ef7542016a832f4dde8f0a40272dc27092 100644
GIT binary patch
delta 5041
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

delta 3814
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

diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx
index fb3ec122819..fec910761a3 100644
--- a/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx
+++ b/forge-gui/res/adventure/Shandalar/maps/tileset/main.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.4" name="main" tilewidth="16" tileheight="16" tilecount="6320" columns="158">
+<tileset version="1.8" tiledversion="1.8.5" name="main" tilewidth="16" tileheight="16" tilecount="6320" columns="158">
  <image source="main.png" width="2528" height="640"/>
  <tile id="105">
   <objectgroup draworder="index" id="2">
@@ -66,6 +66,26 @@
    <object id="1" x="0" y="5" width="12" height="6"/>
   </objectgroup>
  </tile>
+ <tile id="416">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="2" y="6" width="13" height="5"/>
+  </objectgroup>
+ </tile>
+ <tile id="417">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="6" width="11" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="418">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="6" width="16" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="419">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="6" width="10" height="4"/>
+  </objectgroup>
+ </tile>
  <tile id="420">
   <objectgroup draworder="index" id="2">
    <object id="1" x="0" y="0" width="16" height="16"/>
@@ -114,6 +134,29 @@
    <object id="2" x="6" y="11" width="6" height="5"/>
   </objectgroup>
  </tile>
+ <tile id="574">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="6" width="5" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="575">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="6" width="5" height="10"/>
+   <object id="2" x="10" y="6" width="6" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="576">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="6" width="16" height="4"/>
+   <object id="2" x="5" y="10" width="5" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="577">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="6" width="5" height="4"/>
+   <object id="2" x="5" y="6" width="5" height="10"/>
+  </objectgroup>
+ </tile>
  <tile id="579">
   <objectgroup draworder="index" id="2">
    <object id="1" x="2" y="0" width="12" height="15"/>
@@ -142,6 +185,29 @@
    <object id="2" x="6" y="0" width="6" height="16"/>
   </objectgroup>
  </tile>
+ <tile id="732">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="16"/>
+  </objectgroup>
+ </tile>
+ <tile id="733">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="16"/>
+   <object id="2" x="10" y="6" width="6" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="734">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="16"/>
+   <object id="2" x="0" y="6" width="16" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="735">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="16"/>
+   <object id="2" x="0" y="6" width="5" height="4"/>
+  </objectgroup>
+ </tile>
  <tile id="886">
   <objectgroup draworder="index" id="2">
    <object id="1" x="6" y="0" width="6" height="12"/>
@@ -165,6 +231,29 @@
    <object id="2" x="6" y="0" width="6" height="5"/>
   </objectgroup>
  </tile>
+ <tile id="890">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="10"/>
+  </objectgroup>
+ </tile>
+ <tile id="891">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="10"/>
+   <object id="2" x="10" y="6" width="6" height="4"/>
+  </objectgroup>
+ </tile>
+ <tile id="892">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="6" width="16" height="4"/>
+   <object id="2" x="5" y="0" width="5" height="6"/>
+  </objectgroup>
+ </tile>
+ <tile id="893">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="5" y="0" width="5" height="10"/>
+   <object id="2" x="0" y="6" width="5" height="4"/>
+  </objectgroup>
+ </tile>
  <tile id="1045">
   <objectgroup draworder="index" id="2">
    <object id="1" x="6" y="5" width="10" height="4"/>
diff --git a/forge-gui/res/adventure/Shandalar/skin/ui_skin.json b/forge-gui/res/adventure/Shandalar/skin/ui_skin.json
index 3b681e94305..b10e718e2f6 100644
--- a/forge-gui/res/adventure/Shandalar/skin/ui_skin.json
+++ b/forge-gui/res/adventure/Shandalar/skin/ui_skin.json
@@ -379,7 +379,8 @@
 		"overFontColor": "RGBA_0_216_255_255",
 		"disabledFontColor": "RGBA_255_255_255_255",
 		"scrollStyle": "default",
-		"listStyle": "default"
+		"listStyle": "default",
+		"background": "unpressed10patch"
 	}
 },
 "com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle": {
diff --git a/forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.atlas b/forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.atlas
new file mode 100644
index 00000000000..198e770878e
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.atlas
@@ -0,0 +1,32 @@
+wsliver.png
+size: 64,96
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+Avatar
+  xy: 0, 0
+  size: 16, 16
+Idle
+  xy: 0, 16
+  size: 32, 16
+Idle
+  xy: 0, 16
+  size: 32, 16
+Idle
+  xy: 0, 16
+  size: 32, 16
+Idle
+  xy: 32, 16
+  size: 32, 16
+Idle
+  xy: 32, 16
+  size: 32, 16
+Attack
+  xy: 0, 16
+  size: 32, 16
+Attack
+  xy: 0, 16
+  size: 32, 16
+Death
+  xy: 0, 16
+  size: 32, 16
diff --git a/forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.png b/forge-gui/res/adventure/Shandalar/sprites/boss/wsliver.png
new file mode 100644
index 0000000000000000000000000000000000000000..edc364eb70fad68abe625ce4361bf6a1e8becbd6
GIT binary patch
literal 13092
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

literal 0
HcmV?d00001

diff --git a/forge-gui/res/adventure/Shandalar/sprites/heroes/avatar.png b/forge-gui/res/adventure/Shandalar/sprites/heroes/avatar.png
index aaeffdca77480f66a43d1ac0044547527d6ca7b3..a2536b9ea506a33d92335fba74072aa0b8dd79ee 100644
GIT binary patch
literal 70626
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
Vq2wnmrvd-~002ovPDHLkV1mOnT`&Lu

literal 44298
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
Dhf16R

diff --git a/forge-gui/res/adventure/Shandalar/sprites/items.atlas b/forge-gui/res/adventure/Shandalar/sprites/items.atlas
index 3e7b29586bb..684498fdf71 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/items.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/items.atlas
@@ -1,5 +1,5 @@
 items.png
-size: 128,64
+size: 480,1008
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none          
@@ -57,13 +57,13 @@ StrangeKey
 WhiteKey
   xy: 272, 992
   size: 16, 16
-SteelArmor
+IronArmor
   xy: 224, 0
   size: 16, 16     
-SteelShield
+IronShield
   xy: 256, 144
   size: 16, 16
-SteelBoots
+IronBoots
   xy: 48, 160
   size: 16, 16
 SteelSword
@@ -87,13 +87,13 @@ Goose
 SpellBook
   xy: 144, 688
   size: 16, 16  
-MithrilShield
+SteelShield
   xy: 224, 176
   size: 16, 16    
-MithrilArmor
+SteelArmor
   xy: 224, 64
   size: 16, 16       
-MithrilBoots
+SteelBoots
   xy: 96, 176
   size: 16, 16      
 AladdinsRing
@@ -210,8 +210,8 @@ JandorsRing
 JinxedRing
   xy: 48, 976
   size: 16, 16
-Nine-RingedBo
-  xy: 272, 608
+ShellWand
+  xy: 224, 624
   size: 16, 16
 RingofImmortals
   xy: 48, 992
@@ -228,3 +228,6 @@ KiteShield
 DungeonMap
   xy: 176, 848
   size: 16, 16
+FortuneCoin
+  xy: 336,64
+  size: 16, 16
diff --git a/forge-gui/res/adventure/Shandalar/sprites/items.png b/forge-gui/res/adventure/Shandalar/sprites/items.png
index f9308b2e3eeb1670929c4225dc8c4918401e1cd8..99abcbb13fddda6f7eb03e07db106285632a02e5 100644
GIT binary patch
delta 252895
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

delta 256389
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%0ARV}3#GvO*K{iU)hk4OCf`6~ibbo89A4
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

diff --git a/forge-gui/res/adventure/Shandalar/sprites/priest.png b/forge-gui/res/adventure/Shandalar/sprites/priest.png
index e6bdbb07d9fca6cbd00cb64356e37c1518af0e95..007626eb711a7586e04ef64a38ed50103e047d18 100644
GIT binary patch
literal 12401
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

delta 1654
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
ArT_o{

diff --git a/forge-gui/res/adventure/Shandalar/ui/spellsmith.json b/forge-gui/res/adventure/Shandalar/ui/spellsmith.json
new file mode 100644
index 00000000000..0e84c089ed7
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/ui/spellsmith.json
@@ -0,0 +1,280 @@
+{
+  "width": 480,
+  "height": 270,
+  "yDown": true,
+  "elements": [
+    {
+      "type": "Image",
+      "name": "lastScreen",
+      "width": 480,
+      "height": 270
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-6",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 340,
+      "y": 30,
+      "width": 130,
+      "height": 180
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-3",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 90,
+      "width": 330,
+      "height": 53
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-4",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 150,
+      "width": 330,
+      "height": 53
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-5",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 210,
+      "width": 330,
+      "height": 53
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-2",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 30,
+      "width": 330,
+      "height": 53
+    },
+    {
+      "type": "TextButton",
+      "name": "done",
+      "text": "Done",
+      "x": 400,
+      "y": 240,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BBlack",
+      "text": "Black",
+      "x": 15,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BBlue",
+      "text": "Blue",
+      "x": 65,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BGreen",
+      "text": "Green",
+      "x": 115,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BRed",
+      "text": "Red",
+      "x": 165,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BWhite",
+      "text": "White",
+      "x": 215,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BColorless",
+      "text": "Colorless",
+      "x": 265,
+      "y": 120,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "gold",
+      "text": "$",
+      "x": 0,
+      "y": 0,
+      "width": 120,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "pull",
+      "text": "Pull",
+      "x": 360,
+      "y": 180,
+      "width": 90,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "colorLabel",
+      "text": "Colors",
+      "x": 10,
+      "y": 90,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-3",
+      "text": "Plane",
+      "x": 10,
+      "y": 30,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "SelectBox",
+      "name": "BSelectPlane",
+      "text": "Select Plane",
+      "x": 10,
+      "y": 60,
+      "width": 230,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-5",
+      "text": "Mana Cost",
+      "x": 10,
+      "y": 150,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B02",
+      "text": "0-2",
+      "x": 10,
+      "y": 180,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B35",
+      "text": "3-5",
+      "x": 90,
+      "y": 180,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B68",
+      "text": "6-8",
+      "x": 170,
+      "y": 180,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B9X",
+      "text": "9+",
+      "x": 250,
+      "y": 180,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-10",
+      "text": "Rarity",
+      "x": 10,
+      "y": 210,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BCommon",
+      "text": "Common",
+      "x": 10,
+      "y": 240,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BUncommon",
+      "text": "Uncommon",
+      "x": 90,
+      "y": 240,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BRare",
+      "text": "Rare",
+      "x": 170,
+      "y": 240,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BMythic",
+      "text": "Mythic",
+      "x": 250,
+      "y": 240,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BResetEdition",
+      "text": "Reset",
+      "x": 250,
+      "y": 60,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "Scroll",
+      "name": "RewardDummy",
+      "text": "Image",
+      "style": "nobg",
+      "x": 350,
+      "y": 40,
+      "width": 110,
+      "height": 130
+    }
+  ]
+}
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/ui/spellsmith.png b/forge-gui/res/adventure/Shandalar/ui/spellsmith.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c49a3ed017d29b8667d74d4171618250d2e9447
GIT binary patch
literal 2040
zcmeAS@N?(olHy`uVBq!ia0y~yV0-|?d>m{*k-%9;(is?-nyNw~N`ey06$*;-(=u~X
z6-p`#QWa7wGSe6sDsH`<7QN}V0#DohNZ08Nc^*3K%`;!}?fUc2V&mjuzh!gd<eHB$
zo_3n_Rnh;_zsJ9Q?i+Z7OrGVwa%l?B+Nhn0f<Fzv{f;S~m%Vn!i*<`ncU@{{f8M3w
z|EtO_HG^gIoxJrGn`BN-UR-qci<kd5PyO(Ue-i?yXdBtTHn)5yr!04Uj<VW4OWo|;
zsDSxJ^(#M%_KWhEi@5dWvOe0ulWo7mNoo5X;Y_)m&v`Gc6q@|R)2ms^_g4STVE3+5
z*4Amy&K13InxkEQk}1bCWQyAE5J{m!mny{@r>&29(GlHWFqf&3{oo|da~#%up3fh}
zKV7=m^0$`Y+N5jIYbS_*KIE{vYg1h!D~rkb;uQBr|DQGtX8LJmQ!F2BfBN=Wl5y1>
zT~GFm#)XOd9M$B@*);@{q$epdHpY1LaHXb~DP1u<uw1ct+LAqtj59wvOk1PGTF?}p
z^QO=$=jM-PZrqG5o`USNw0PHq_<9FjKOmW<wk$2|jP9B!?Vv3YnnzE+I{NI<t7k{=
z9$vkD!i5bQ4+R4kFFh4{VRe}ISE;Snt_f^8SbX@M7;jgv`OT8eYjgG;4cmULux3};
z>!sEGan;_<?L4w(r#=WS?%Q^`Z}FDbdDS;-`}e-feYC=Nrd95=m&R#x-!3W(@RgrY
ztNJ}Vt7JJ_!pnqZ239K_-`4F~@YQnTQJy0aoJVQ}4>UeIs>8nWlhSmt%`uX(i9I^G
z2PL<3G%k2|#O!6#cZKh*(N6dO>zdc8O&8ns-%(GuME^wX({D|;BJO|R_sih%;cd4H
zL`}JG@v~K%@I`!>fA*!n`5xK5VEFgk#Ut$8|79-uTkolz&eEkf3z#%pGo76SJe{3k
zsS%h4=hRNL^*9_L(&``V?W)E4R^icvg;tRQqJrvcodmU7q85g-PoDnIadMl=(W8L{
zx)wh+N0b&6Ub}iQRDh-4L1yk8k=P|ie$R61me9Akcf9hu%)Q<G0<Th+MaCvKEW4ei
zB`9uuGt}@$7sH_s3;B(WHuqS1dL7!l@7>DDuk?;>-t+t4nmE&R!vpF<=Zy|;=``<H
zZkF5p*{-lfG<E8aITcrya0}TN#TNeTEnaw%>3q+Omse~GTOxEyHe5QmCL`;}<RgKh
zmo?*0>{wHD@6np6tJjqJ|2q`m7a#e|YOSKmh7MH^frSgYgidV`TpX)@)T!&-W4V6^
zm&GehcUmVTVJQ~S$hPw(`~T+qo40-vew-Ji!N(FO^E_FC;~i7)tj9I-)_#v!KG-vd
zSKW?Z$$WYKlIypkzHo5lGmBr(^}WfgSKiR5?ripS*^}j}Pd*>`Em<2Z_F_M4)wMf2
zx1KBf#jqqZ?4<OA2LckB0pE5V-@V)V`L}%k>^l2IlcEK`nnG3qO9{3lZ+91lnG6dV
z79BO`?gff)7I;J!GcfQS0b$0e+I-SLLG}_)Usv{Lto)3k+_vv$Y+_(wPV;ne3;~uP
zR}C2%7&s1ZXskc~psC%(X@1xwPKJV2sz4=dAjBg9LIw#SbfAF|h@cW9Sq>5?*u!OH
v$UzbWdYXXveWb{7qGkwW&qH#`gKpLvTbZTJ(|$SvGa-YgtDnm{r-UW|#WkQt

literal 0
HcmV?d00001

diff --git a/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json b/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json
new file mode 100644
index 00000000000..f9edfcd04b4
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/ui/spellsmith_portrait.json
@@ -0,0 +1,280 @@
+{
+  "width": 270,
+  "height": 480,
+  "yDown": true,
+  "elements": [
+    {
+      "type": "Image",
+      "name": "lastScreen",
+      "width": 270,
+      "height": 480
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-6",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 0,
+      "width": 130,
+      "height": 180
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-3",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 260,
+      "width": 270,
+      "height": 83
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-4",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 360,
+      "width": 270,
+      "height": 53
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-5",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 427,
+      "width": 270,
+      "height": 53
+    },
+    {
+      "type": "Scroll",
+      "name": "xkUkiUhwoi2ll5rrSpk6-2",
+      "text": "Scroll",
+      "style": "paper",
+      "x": 0,
+      "y": 190,
+      "width": 270,
+      "height": 53
+    },
+    {
+      "type": "TextButton",
+      "name": "done",
+      "text": "Done",
+      "x": 175,
+      "y": 150,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BBlack",
+      "text": "Black",
+      "x": 58,
+      "y": 290,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BBlue",
+      "text": "Blue",
+      "x": 113,
+      "y": 290,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BGreen",
+      "text": "Green",
+      "x": 168,
+      "y": 290,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BRed",
+      "text": "Red",
+      "x": 58,
+      "y": 320,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BWhite",
+      "text": "White",
+      "x": 113,
+      "y": 320,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BColorless",
+      "text": "Colorless",
+      "x": 168,
+      "y": 320,
+      "width": 45,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "gold",
+      "text": "$",
+      "x": 150,
+      "y": 0,
+      "width": 120,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "pull",
+      "text": "Pull",
+      "x": 16,
+      "y": 150,
+      "width": 97,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "colorLabel",
+      "text": "Colors",
+      "x": 10,
+      "y": 260,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-3",
+      "text": "Plane",
+      "x": 10,
+      "y": 190,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "SelectBox",
+      "name": "BSelectPlane",
+      "text": "Select Plane",
+      "x": 0,
+      "y": 220,
+      "width": 190,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-5",
+      "text": "Mana Cost",
+      "x": 10,
+      "y": 360,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B02",
+      "text": "0-2",
+      "x": 20,
+      "y": 390,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B35",
+      "text": "3-5",
+      "x": 80,
+      "y": 390,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B68",
+      "text": "6-8",
+      "x": 140,
+      "y": 390,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "B9X",
+      "text": "9+",
+      "x": 200,
+      "y": 390,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "Label",
+      "name": "vnXYKZJw_P5wMnHa1tH7-10",
+      "text": "Rarity",
+      "x": 10,
+      "y": 427,
+      "width": 100,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BCommon",
+      "text": "Common",
+      "x": 20,
+      "y": 450,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BUncommon",
+      "text": "Uncommon",
+      "x": 80,
+      "y": 450,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BRare",
+      "text": "Rare",
+      "x": 140,
+      "y": 450,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BMythic",
+      "text": "Mythic",
+      "x": 200,
+      "y": 450,
+      "width": 50,
+      "height": 20
+    },
+    {
+      "type": "TextButton",
+      "name": "BResetEdition",
+      "text": "Reset",
+      "x": 195,
+      "y": 220,
+      "width": 70,
+      "height": 20
+    },
+    {
+      "type": "Scroll",
+      "name": "RewardDummy",
+      "text": "Image",
+      "style": "nobg",
+      "x": 10,
+      "y": 10,
+      "width": 110,
+      "height": 130
+    }
+  ]
+}
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/base.json b/forge-gui/res/adventure/Shandalar/world/base.json
index 9c613cb005d..96fc87eca0d 100644
--- a/forge-gui/res/adventure/Shandalar/world/base.json
+++ b/forge-gui/res/adventure/Shandalar/world/base.json
@@ -1,27 +1,28 @@
 {
-    "invertHeight": true,
-		"name": "ocean",
-		"startPointX": 0.5,
-		"startPointY": 0.5,
-		"noiseWeight": 0,
-		"distWeight": 0,
-    "tilesetName":"Base",
-    "tilesetAtlas":"world/tilesets/terrain.atlas",
-    "terrain":[
+  "invertHeight": true,
+  "name": "ocean",
+  "startPointX": 0.5,
+  "startPointY": 0.5,
+  "noiseWeight": 0,
+  "distWeight": 0,
+  "tilesetName": "Base",
+  "tilesetAtlas": "world/tilesets/terrain.atlas",
+  "terrain": [
     {
-    "spriteName":"Base_1",
-    "min": 0,           
-    "max": 0.2,           
-    "resolution": 10
-    },    {
-    "spriteName":"Base_2",
-    "min": 0.8,           
-    "max": 1.0,           
-    "resolution": 10
+      "spriteName": "Base_1",
+      "min": 0,
+      "max": 0.2,
+      "resolution": 10
+    },
+    {
+      "spriteName": "Base_2",
+      "min": 0.8,
+      "max": 1.0,
+      "resolution": 10
     }
-    ],
-		"width": 1,
-		"height": 1,
-		"color": "0054a2"      ,
-    "spriteNames":[ ]
+  ],
+  "width": 1,
+  "height": 1,
+  "color": "0054a2",
+  "spriteNames": []
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json
index 732d50b2f07..9a9c1d7f76f 100644
--- a/forge-gui/res/adventure/Shandalar/world/black.json
+++ b/forge-gui/res/adventure/Shandalar/world/black.json
@@ -29,9 +29,9 @@
     "Swamp Town","Swamp Town2",
     "Zombie Town",
     "Graveyard", "Graveyard1", "Graveyard2", "Graveyard3", "Graveyard4",
-    "VampireCastle", "VampireCastle1", "VampireCastle2", "VampireCastle3",
+    "VampireCastle", "VampireCastle1", "VampireCastle2",
     "EvilGrove", "EvilGrove1", "EvilGrove2", "EvilGrove3", "EvilGrove4",
     "SkullCaveB", "SkullCaveB1", "SkullCaveB2",
-    "CaveB", "CaveB1", "CaveB2", "CaveB3", "CaveB4", "CaveB5", "CaveB6", "CaveB7", "CaveB8", "CaveB9", "CaveBA", "CaveBB", "CaveBC"
+    "CaveB", "CaveB1", "CaveB2", "CaveB3", "CaveB4", "CaveB5", "CaveB6", "CaveB8", "CaveBA"
   ]
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json
index 24e176963dd..bb8fc0927ec 100644
--- a/forge-gui/res/adventure/Shandalar/world/blue.json
+++ b/forge-gui/res/adventure/Shandalar/world/blue.json
@@ -28,10 +28,11 @@
     "Blue Castle",
     "Island Town",
     "NestU",
-    "MerfolkPool", "MerfolkPool1", "MerfolkPool2", "MerfolkPool3", "MerfolkPool4", "MerfolkPool5",
-    "DjinnPalace", "DjinnPalace1", "DjinnPalace2",
+    "MerfolkPool", "MerfolkPool1", "MerfolkPool2", "MerfolkPool3", "MerfolkPool4",
+    "DjinnPalace", "DjinnPalace1",
     "Factory", "Factory1",
-    "MageTowerU", "MageTowerU1", "MageTowerU2", "MageTowerU3", "MageTowerU4", "MageTowerU5", "MageTowerU6", "MageTowerU7", "MageTowerU8", "MageTowerU9", "MageTowerUA", "MageTowerUB", "MageTowerUC", "MageTowerUD",
-    "CaveU", "CaveU1", "CaveU2", "CaveU3", "CaveU4", "CaveU5"
+    "MageTowerX",
+    "MageTowerU", "MageTowerU1", "MageTowerU2", "MageTowerU3", "MageTowerU4", "MageTowerU5", "MageTowerU6", "MageTowerU7", "MageTowerUD",
+    "CaveU", "CaveU1", "CaveU2", "CaveU3", "CaveU4"
   ]
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json
index 8dfd4412ec8..a260af39173 100644
--- a/forge-gui/res/adventure/Shandalar/world/enemies.json
+++ b/forge-gui/res/adventure/Shandalar/world/enemies.json
@@ -408,12 +408,11 @@
 			"probability": 1,
 			"count": 4,
 			"addMaxCount": 6
-		},
-		{
+		},{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 10,
-			"addMaxCount": 90
+			"probability": 1.0,
+			"count": 80,
+			"addMaxCount": 40
 		}
 	],
 	"colors": "U"
@@ -425,19 +424,18 @@
 	"spawnRate": 1.0,
 	"difficulty": 0.1,
 	"speed": 31,
-	"life": 10,
+	"life": 14,
 	"rewards": [
 		{
 			"type": "deckCard",
 			"probability": 1,
-			"count": 4,
-			"addMaxCount": 6
+			"count": 2,
+			"addMaxCount": 8
 		},
 		{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 10,
-			"addMaxCount": 90
+			"count": 50,
+			"addMaxCount": 300
 		}
 	],
 	"colors": "U"
@@ -1406,11 +1404,6 @@
 	"speed": 27,
 	"life": 8,
 	"rewards": [
-		{
-			"type": "enemyItems",
-			"probability": 0.2,
-			"count": 1
-		},
 		{
 			"type": "deckCard",
 			"probability": 1,
@@ -2256,32 +2249,31 @@
 	"sprite": "sprites/merfolk.atlas",
 	"deck": "decks/merfolk_lords.dck",
 	"spawnRate": 1.0,
-	"difficulty": 0.1,
+	"difficulty": 0.2,
 	"speed": 22,
-	"life": 13,
+	"life": 16,
 	"rewards": [
 		{
 			"type": "deckCard",
 			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4
-		},
-		{
+			"count": 1
+		},{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 10,
-			"addMaxCount": 90
-		},
-		{
+			"probability": 1,
+			"count": 100,
+			"addMaxCount": 150
+		},{
 			"type": "card",
-			"probability": 0.5,
-			"count": 3,
-			"colors": [
-				"Blue"
-			],
-			"rarity": [
-				"Rare"
-			]
+			"probability": 0.65,
+			"count": 2,
+			"colors": [ "Blue" ],
+			"rarity": [ "Rare" ]
+		},{
+			"type": "card",
+			"probability": 0.0035,
+			"count": 1,
+			"colors": [ "Blue" ],
+			"rarity": [ "Mythic Rare" ]
 		}
 	],
 	"colors": "GU"
@@ -2291,21 +2283,31 @@
 	"sprite": "sprites/merfolk_lord.atlas",
 	"deck": "decks/merfolk_lord2.dck",
 	"spawnRate": 1.0,
-	"difficulty": 0.1,
+	"difficulty": 0.25,
 	"speed": 25,
-	"life": 14,
+	"life": 20,
 	"rewards": [
 		{
 			"type": "deckCard",
 			"probability": 1,
-			"count": 4,
-			"addMaxCount": 6
-		},
-		{
+			"count": 1
+		},{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 10,
-			"addMaxCount": 90
+			"probability": 1,
+			"count": 200,
+			"addMaxCount": 100
+		},{
+			"type": "card",
+			"probability": 0.75,
+			"count": 2,
+			"colors": [ "Blue" ],
+			"rarity": [ "Rare" ]
+		},{
+			"type": "card",
+			"probability": 0.005,
+			"count": 1,
+			"colors": [ "Blue" ],
+			"rarity": [ "Mythic Rare" ]
 		}
 	],
 	"colors": "GU"
@@ -2531,7 +2533,7 @@
 	"spawnRate": 1.0,
 	"difficulty": 0.1,
 	"speed": 24,
-	"life": 10,
+	"life": 8,
 	"rewards": [
 		{
 			"type": "deckCard",
@@ -2565,9 +2567,8 @@
 		},
 		{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 5,
-			"addMaxCount": 95
+			"count": 25,
+			"addMaxCount": 200
 		}
 	],
 	"colors": "R"
@@ -2579,7 +2580,7 @@
 	"spawnRate": 1.0,
 	"difficulty": 0.1,
 	"speed": 24,
-	"life": 10,
+	"life": 14,
 	"rewards": [
 		{
 			"type": "deckCard",
@@ -2589,9 +2590,8 @@
 		},
 		{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 5,
-			"addMaxCount": 95
+			"count": 50,
+			"addMaxCount": 300
 		}
 	],
 	"colors": "R"
@@ -2607,15 +2607,12 @@
 	"rewards": [
 		{
 			"type": "deckCard",
-			"probability": 1,
-			"count": 4,
-			"addMaxCount": 6
+			"count": 2
 		},
 		{
 			"type": "gold",
-			"probability": 0.7,
-			"count": 10,
-			"addMaxCount": 90
+			"count": 250,
+			"addMaxCount": 250
 		}
 	],
 	"colors": "BU"
@@ -2745,18 +2742,15 @@
 	"spawnRate": 1.0,
 	"difficulty": 0.1,
 	"speed": 24,
-	"life": 14,
+	"life": 15,
 	"rewards": [
 		{
 			"type": "deckCard",
-			"count": 4,
-			"addMaxCount": 6
+			"count": 5
 		},
 		{
 			"type": "gold",
-			"probability": 0.6,
-			"count": 10,
-			"addMaxCount": 90
+			"count": 150
 		}
 	],
 	"colors": "GRW"
@@ -3219,7 +3213,7 @@
 		{
 			"type": "gold",
 			"probability": 0.7,
-			"count": 10,
+			"count": 100,
 			"addMaxCount": 90
 		},
 		{
@@ -3236,49 +3230,62 @@
 	],
 	"colors": "B"
 },
+
+
+
+
 {
-	"name": "Sliver Queen",
-	"sprite": "sprites/boss/sliver_queen.atlas",
-	"deck": "decks/boss/sliver_queen.dck",
-	"speed": 1,
-	"life": 100,
+	"name": "Wounded Sliver",
+	"sprite": "sprites/boss/wsliver.atlas",
+	"deck": "decks/miniboss/sliver_shandalar.dck",
+	"speed": 0,
+	"life": 28,
+	"boss": true,
+	"ai": "reckless",
 	"rewards": [
 		{
-			"type": "item",
+			"type": "deckCard",
 			"probability": 1,
-			"count": 1,
-			"itemName": "Black Lotus"
+			"count": 2
 		},
 		{
-			"type": "item",
+			"type": "gold",
 			"probability": 1,
-			"count": 1,
-			"itemName": "Strange Key"
+			"count": 500,
+			"addMaxCount": 150
 		}
 	],
-	"equipment": [
-		"Black Lotus"
-	],
-	"colors": "BGRUW"
+	"colors": "GRW"
 },
+
+
+
+
 {
 	"name": "Griselbrand",
 	"sprite": "sprites/boss/griselbrand.atlas",
 	"deck": "decks/boss/griselbrand.dck",
 	"speed": 1,
 	"life": 80,
+	"boss": true,
 	"rewards": [
 		{
-			"type": "item",
+			"type": "card",
 			"probability": 1,
 			"count": 1,
-			"itemName": "Mox Jet"
+			"cardName": "Mox Jet"
 		},
 		{
 			"type": "item",
 			"probability": 1,
 			"count": 1,
 			"itemName": "Black Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 1000,
+			"addMaxCount": 250
 		}
 	],
 	"equipment": [
@@ -3292,18 +3299,25 @@
 	"deck": "decks/boss/akroma.dck",
 	"speed": 1,
 	"life": 80,
+	"boss": true,
 	"rewards": [
 		{
-			"type": "item",
+			"type": "card",
 			"probability": 1,
 			"count": 1,
-			"itemName": "Mox Pearl"
+			"cardName": "Mox Pearl"
 		},
 		{
 			"type": "item",
 			"probability": 1,
 			"count": 1,
 			"itemName": "White Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 1000,
+			"addMaxCount": 250
 		}
 	],
 	"equipment": [
@@ -3311,43 +3325,31 @@
 	],
 	"colors": "W"
 },
-{
-	"name": "Emrakul",
-	"sprite": "sprites/boss/emrakul.atlas",
-	"deck": "decks/boss/emrakul.dck",
-	"speed": 1,
-	"life": 100,
-	"rewards": [
-		{
-			"type": "item",
-			"probability": 1,
-			"count": 1,
-			"itemName": "Sol Ring"
-		}
-	],
-	"equipment": [
-		"Sol Ring"
-	],
-	"colors": "C"
-},
 {
 	"name": "Ghalta",
 	"sprite": "sprites/boss/ghalta.atlas",
 	"deck": "decks/boss/ghalta.dck",
 	"speed": 1,
 	"life": 80,
+	"boss": true,
 	"rewards": [
 		{
-			"type": "item",
+			"type": "card",
 			"probability": 1,
 			"count": 1,
-			"itemName": "Mox Emerald"
+			"cardName": "Mox Emerald"
 		},
 		{
 			"type": "item",
 			"probability": 1,
 			"count": 1,
 			"itemName": "Green Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 1000,
+			"addMaxCount": 250
 		}
 	],
 	"equipment": [
@@ -3361,18 +3363,25 @@
 	"deck": "decks/boss/lorthos.dck",
 	"speed": 1,
 	"life": 80,
+	"boss": true,
 	"rewards": [
 		{
-			"type": "item",
+			"type": "card",
 			"probability": 1,
 			"count": 1,
-			"itemName": "Mox Sapphire"
+			"cardName": "Mox Sapphire"
 		},
 		{
 			"type": "item",
 			"probability": 1,
 			"count": 1,
 			"itemName": "Blue Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 1000,
+			"addMaxCount": 250
 		}
 	],
 	"equipment": [
@@ -3386,23 +3395,88 @@
 	"deck": "decks/boss/lathliss.dck",
 	"speed": 1,
 	"life": 80,
+	"boss": true,
 	"rewards": [
 		{
-			"type": "item",
+			"type": "card",
 			"probability": 1,
 			"count": 1,
-			"itemName": "Mox Ruby"
+			"cardName": "Mox Ruby"
 		},
 		{
 			"type": "item",
 			"probability": 1,
 			"count": 1,
 			"itemName": "Red Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 1000,
+			"addMaxCount": 250
 		}
 	],
 	"equipment": [
 		"Mox Ruby"
 	],
 	"colors": "R"
+},
+{
+	"name": "Emrakul",
+	"sprite": "sprites/boss/emrakul.atlas",
+	"deck": "decks/boss/emrakul.dck",
+	"speed": 1,
+	"life": 100,
+	"boss": true,
+	"rewards": [
+		{
+			"type": "item",
+			"probability": 1,
+			"count": 1,
+			"itemName": "Sol Ring"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 5000,
+			"addMaxCount": 2500
+		}
+	],
+	"equipment": [
+		"Sol Ring"
+	],
+	"colors": "C"
+},
+{
+	"name": "Sliver Queen",
+	"sprite": "sprites/boss/sliver_queen.atlas",
+	"deck": "decks/boss/sliver_queen.dck",
+	"speed": 1,
+	"life": 100,
+	"boss": true,
+	"rewards": [
+		{
+			"type": "item",
+			"probability": 1,
+			"count": 1,
+			"itemName": "Black Lotus"
+		},
+		{
+			"type": "item",
+			"probability": 1,
+			"count": 1,
+			"itemName": "Strange Key"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 2500,
+			"addMaxCount": 1000
+		}
+	],
+	"equipment": [
+		"Black Lotus"
+	],
+	"colors": "BGRUW"
 }
 ]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/green.json b/forge-gui/res/adventure/Shandalar/world/green.json
index a00a7d4a263..bf0dca678ba 100644
--- a/forge-gui/res/adventure/Shandalar/world/green.json
+++ b/forge-gui/res/adventure/Shandalar/world/green.json
@@ -29,8 +29,8 @@
     "Forest Town",
     "ElfTown",
     "WurmPond",
-    "Grove", "Grove1", "Grove2", "Grove3", "Grove4", "Grove5", "Grove6", "Grove7", "Grove8", "Grove9", "GroveA", "GroveB",
+    "Grove", "Grove1", "Grove2", "Grove3", "Grove4", "Grove5", "Grove6", "Grove7", "Grove8",
     "CatLairG", "CatLairG1", "CatLairG2",
-    "CaveG", "CaveG1", "CaveG2", "CaveG3", "CaveG4", "CaveG5", "CaveG6", "CaveG7", "CaveG8", "CaveG9", "CaveGA", "CaveGB"
+    "CaveG", "CaveG1", "CaveG2", "CaveG3", "CaveG4", "CaveG5", "CaveG6", "CaveG8", "CaveG9", "CaveGB"
   ]
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/items.json b/forge-gui/res/adventure/Shandalar/world/items.json
index e47354443a3..a90530a1674 100644
--- a/forge-gui/res/adventure/Shandalar/world/items.json
+++ b/forge-gui/res/adventure/Shandalar/world/items.json
@@ -1,709 +1,317 @@
 [
-{
-	"name": "Sol Ring",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Sol Ring"
-		]
-	},
-	"iconName": "SolRing"
-},
-{
-	"name": "Mox Emerald",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Mox Emerald"
-		]
-	},
-	"description": "",
-	"iconName": "MoxEmerald"
-},
-{
-	"name": "Black Lotus",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Black Lotus"
-		]
-	},
-	"iconName": "BlackLotus"
-},
-{
-	"name": "Mox Jet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Mox Jet"
-		]
-	},
-	"iconName": "MoxJet"
-},
-{
-	"name": "Mox Pearl",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Mox Pearl"
-		]
-	},
-	"description": "",
-	"iconName": "MoxPearl"
-},
-{
-	"name": "Mox Ruby",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Mox Ruby"
-		]
-	},
-	"iconName": "MoxRuby"
-},
-{
-	"name": "Mox Sapphire",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Mox Sapphire"
-		]
-	},
-	"iconName": "MoxSapphire"
-},
-{
-	"name": "Battle Standard",
-	"equipmentSlot": "Left",
-	"effect": {
-		"lifeModifier": -1,
-		"startBattleWithCard": [
-			"r_1_1_goblin"
-		]
-	},
-	"iconName": "BattleStandard"
-},
-{
-	"name": "Life Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"lifeModifier": 2
-	},
-	"iconName": "LifeAmulet"
-},
-{
-	"name": "Red Key",
-	"description": "A mysterious red key.",
-	"iconName": "RedKey",
-	"questItem": true
-},
-{
-	"name": "White Key",
-	"description": "A mysterious white key.",
-	"iconName": "WhiteKey",
-	"questItem": true
-},
-{
-	"name": "Blue Key",
-	"description": "A mysterious blue key.",
-	"iconName": "BlueKey",
-	"questItem": true
-},
-{
-	"name": "Green Key",
-	"description": "A mysterious green key.",
-	"iconName": "GreenKey",
-	"questItem": true
-},
-{
-	"name": "Black Key",
-	"description": "A mysterious black key.",
-	"iconName": "BlackKey",
-	"questItem": true
-},
-{
-	"name": "Strange Key",
-	"description": "A mysterious key.",
-	"iconName": "StrangeKey",
-	"questItem": true
-},
-{
-	"name": "Steel Sword",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Greatsword"
-		]
-	},
-	"iconName": "SteelSword"
-},
-{
-	"name": "Axt",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Bonesplitter"
-		]
-	},
-	"iconName": "SteelAxt"
-},
-{
-	"name": "Steel Boots",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"lifeModifier": 1,
-		"moveSpeed": 1.2
-	},
-	"iconName": "SteelBoots",
-	"cost": 500
-},
-{
-	"name": "Steel Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"w_0_3_wall_defender"
-		]
-	},
-	"iconName": "SteelShield",
-	"cost": 500
-},
-{
-	"name": "Steel Armor",
-	"equipmentSlot": "Body",
-	"effect": {
-		"lifeModifier": 3
-	},
-	"iconName": "SteelArmor",
-	"cost": 500
-},
-{
-	"name": "Leather Boots",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"moveSpeed": 1.15
-	},
-	"iconName": "LeatherBoots"
-},
-{
-	"name": "Jungle Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"g_0_1_plant"
-		]
-	},
-	"iconName": "JungleShield"
-},
-{
-	"name": "Dagger",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Spare Dagger"
-		]
-	},
-	"iconName": "Dagger"
-},
-{
-	"name": "Cheat",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Blightsteel Colossus",
-			"Lightning Greaves"
-		]
-	},
-	"iconName": "Goose"
-},
-{
-	"name": "Aladdin's Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Aladdin's Ring"
-		]
-	},
-	"iconName": "AladdinsRing"
-},
-{
-	"name": "Spell Book",
-	"equipmentSlot": "Left",
-	"effect": {
-		"changeStartCards": 1
-	},
-	"iconName": "SpellBook"
-},
-{
-	"name": "Cursed Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_0_1_a_goblin_construct_noblock_ping",
-			"c_0_1_a_goblin_construct_noblock_ping",
-			"c_0_1_a_goblin_construct_noblock_ping"
-		]
-	},
-	"iconName": "CursedRing"
-},
-{
-	"name": "Mithril Boots",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"lifeModifier": 2,
-		"moveSpeed": 1.3
-	},
-	"iconName": "MithrilBoots",
-	"cost": 1500
-},
-{
-	"name": "Mithril Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_0_4_a_wall_defender"
-		]
-	},
-	"iconName": "MithrilShield",
-	"cost": 1500
-},
-{
-	"name": "Mithril Armor",
-	"equipmentSlot": "Body",
-	"effect": {
-		"lifeModifier": 5
-	},
-	"iconName": "MithrilArmor",
-	"cost": 1500
-},
-{
-	"name": "Death Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"opponent": {
-			"startBattleWithCard": [
-				"c_0_1_a_goblin_construct_noblock_ping",
-				"c_0_1_a_goblin_construct_noblock_ping",
-				"c_0_1_a_goblin_construct_noblock_ping"
-			]
-		}
-	},
-	"iconName": "DeathRing"
-},
-{
-	"name": "Flame Sword",
-	"equipmentSlot": "Left",
-	"effect": {
-		"opponent": {
-			"lifeModifier": -5
-		}
-	},
-	"iconName": "FlameSword"
-},
-{
-	"name": "Mirror Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Mirror Shield"
-		]
-	},
-	"iconName": "MirrorShield"
-},
-{
-	"name": "Dungeon Map",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Dungeon Map"
-		]
-	},
-	"iconName": "DungeonMap"
-},
-{
-	"name": "Aladdin's Lamp",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Aladdin's Lamp"
-		]
-	},
-	"iconName": "AladdinsLamp"
-},
-{
-	"name": "Heart-Piercer",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Heart-Piercer Bow"
-		]
-	},
-	"iconName": "CompositeBow"
-},
-{
-	"name": "Wood Bow",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Fyndhorn Bow"
-		]
-	},
-	"iconName": "WoodBow"
-},
-{
-	"name": "Sandals",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"moveSpeed": 1.1
-	},
-	"iconName": "Sandals"
-},
-{
-	"name": "Gold Boots",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"lifeModifier": 2,
-		"moveSpeed": 1.3
-	},
-	"iconName": "GoldBoots"
-},
-{
-	"name": "Gold Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"lifeModifier": 3
-	},
-	"iconName": "GoldShield"
-},
-{
-	"name": "Gold Armor",
-	"equipmentSlot": "Body",
-	"effect": {
-		"lifeModifier": 4
-	},
-	"iconName": "GoldArmor"
-},
-{
-	"name": "Dark Boots",
-	"equipmentSlot": "Boots",
-	"effect": {
-		"lifeModifier": -2,
-		"startBattleWithCard": [
-			"Clattering Augur"
-		],
-		"moveSpeed": 1.3
-	},
-	"iconName": "DarkBoots"
-},
-{
-	"name": "Dark Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"lifeModifier": -3,
-		"startBattleWithCard": [
-			"Barrier of Bones"
-		]
-	},
-	"iconName": "DarkShield"
-},
-{
-	"name": "Dark Armor",
-	"equipmentSlot": "Body",
-	"effect": {
-		"lifeModifier": -4,
-		"startBattleWithCard": [
-			"Skeletal Snake"
-		]
-	},
-	"iconName": "DarkArmor"
-},
-{
-	"name": "Blood Vial",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_a_blood_draw"
-		]
-	},
-	"iconName": "Blood"
-},
-{
-	"name": "Charm",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_a_clue_draw"
-		]
-	},
-	"iconName": "Clue"
-},
-{
-	"name": "Snack",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_a_food_sac"
-		]
-	},
-	"iconName": "Cheese"
-},
-{
-	"name": "Change",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_a_gold_sac"
-		]
-	},
-	"iconName": "Gold"
-},
-{
-	"name": "Treasure",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_a_treasure_sac"
-		]
-	},
-	"iconName": "Treasure"
-},
-{
-	"name": "Magic Shard",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"c_e_shard_draw"
-		]
-	},
-	"iconName": "Shard"
-},
-{
-	"name": "Mad Staff",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Power Struggle"
-		]
-	},
-	"iconName": "MadStaff"
-},
-{
-	"name": "Dark Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Necropolis of Azar"
-		]
-	},
-	"iconName": "DarkAmulet"
-},
-{
-	"name": "Pandora's Box",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Pandora's Box"
-		]
-	},
-	"iconName": "PandorasBox"
-},
-{
-	"name": "Disrupting Scepter",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Disrupting Scepter"
-		]
-	},
-	"iconName": "DisruptingScepter"
-},
-{
-	"name": "Entrancing Lyre",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Entrancing Lyre"
-		]
-	},
-	"iconName": "EntrancingLyre"
-},
-{
-	"name": "Heavy Arbalest",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Heavy Arbalest"
-		]
-	},
-	"iconName": "HeavyArbalest"
-},
-{
-	"name": "Ring of Three Wishes",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Ring of Three Wishes"
-		]
-	},
-	"iconName": "RingofThreeWishes"
-},
-{
-	"name": "The Blackstaff of Waterdeep",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"The Blackstaff of Waterdeep"
-		]
-	},
-	"iconName": "TheBlackstaffofWaterdeep"
-},
-{
-	"name": "Unerring Sling",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Unerring Sling"
-		]
-	},
-	"iconName": "UnerringSling"
-},
-{
-	"name": "Jeweled Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Jeweled Amulet"
-		]
-	},
-	"iconName": "JeweledAmulet"
-},
-{
-	"name": "Traveler's Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Traveler's Amulet"
-		]
-	},
-	"iconName": "TravelersAmulet"
-},
-{
-	"name": "Relic Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Relic Amulet"
-		]
-	},
-	"iconName": "RelicAmulet"
-},
-{
-	"name": "Manasight Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"colorView": true
-	},
-	"iconName": "RelicAmulet"
-},
-{
-	"name": "Amulet of Kroog",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Amulet of Kroog"
-		]
-	},
-	"iconName": "AmuletofKroog"
-},
-{
-	"name": "Amulet of Vigor",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Amulet of Vigor"
-		]
-	},
-	"iconName": "AmuletofVigor"
-},
-{
-	"name": "Veilstone Amulet",
-	"equipmentSlot": "Neck",
-	"effect": {
-		"startBattleWithCard": [
-			"Veilstone Amulet"
-		]
-	},
-	"iconName": "VeilstoneAmulet"
-},
-{
-	"name": "Jandor's Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Jandor's Ring"
-		]
-	},
-	"iconName": "JandorsRing"
-},
-{
-	"name": "Jinxed Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"opponent": {
-			"startBattleWithCard": [
-				"Jinxed Ring"
-			]
-		}
-	},
-	"iconName": "JinxedRing"
-},
-{
-	"name": "Nine-Ringed Bo",
-	"equipmentSlot": "Left",
-	"effect": {
-		"startBattleWithCard": [
-			"Nine-Ringed Bo"
-		]
-	},
-	"iconName": "Nine-RingedBo"
-},
-{
-	"name": "Ring of Immortals",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Ring of Immortals"
-		]
-	},
-	"iconName": "RingofImmortals"
-},
-{
-	"name": "Prism Ring",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Prism Ring"
-		]
-	},
-	"iconName": "PrismRing"
-},
-{
-	"name": "Ring of Renewal",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Ring of Renewal"
-		]
-	},
-	"iconName": "RingofRenewal"
-},
-{
-	"name": "Kite Shield",
-	"equipmentSlot": "Right",
-	"effect": {
-		"startBattleWithCard": [
-			"Kite Shield"
-		]
-	},
-	"iconName": "KiteShield"
-}
+  {
+    "name": "Sol Ring",
+    "equipmentSlot": "Left",
+    "effect": {
+      "startBattleWithCard": [
+        "Sol Ring"
+      ]
+    },
+    "iconName": "SolRing"
+  },
+  {
+    "name": "Mox Emerald",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Mox Emerald"
+      ]
+    },
+    "description": "",
+    "iconName": "MoxEmerald"
+  },
+  {
+    "name": "Black Lotus",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "Black Lotus"
+      ]
+    },
+    "iconName": "BlackLotus"
+  },
+  {
+    "name": "Mox Jet",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Mox Jet"
+      ]
+    },
+    "iconName": "MoxJet"
+  },
+  {
+    "name": "Mox Pearl",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Mox Pearl"
+      ]
+    },
+    "description": "",
+    "iconName": "MoxPearl"
+  },
+  {
+    "name": "Mox Ruby",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Mox Ruby"
+      ]
+    },
+    "iconName": "MoxRuby"
+  },
+  {
+    "name": "Mox Sapphire",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Mox Sapphire"
+      ]
+    },
+    "iconName": "MoxSapphire"
+  },
+  {
+    "name": "Life Amulet",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "lifeModifier": 2
+    },
+    "iconName": "LifeAmulet"
+  },
+  {
+    "name": "Red Key",
+    "description": "A mysterious red key.",
+    "iconName": "RedKey",
+    "questItem": true
+  },
+  {
+    "name": "White Key",
+    "description": "A mysterious white key.",
+    "iconName": "WhiteKey",
+    "questItem": true
+  },
+  {
+    "name": "Blue Key",
+    "description": "A mysterious blue key.",
+    "iconName": "BlueKey",
+    "questItem": true
+  },
+  {
+    "name": "Green Key",
+    "description": "A mysterious green key.",
+    "iconName": "GreenKey",
+    "questItem": true
+  },
+  {
+    "name": "Black Key",
+    "description": "A mysterious black key.",
+    "iconName": "BlackKey",
+    "questItem": true
+  },
+  {
+    "name": "Strange Key",
+    "description": "A mysterious key.",
+    "iconName": "StrangeKey",
+    "questItem": true
+  },
+  {
+    "name": "Jungle Shield",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "g_0_1_plant"
+      ]
+    },
+    "iconName": "JungleShield"
+  },
+  {
+    "name": "Iron Shield",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_0_2_a_wall_defender"
+      ]
+    },
+    "iconName": "IronShield",
+    "cost": 500
+  },
+  {
+    "name": "Steel Shield",
+    "equipmentSlot": "Right",
+    "effect": {
+      "lifeModifier": 1,
+      "startBattleWithCard": [
+        "w_0_3_wall_defender"
+      ]
+    },
+    "iconName": "SteelShield",
+    "cost": 1500
+  },
+  {
+    "name": "Spirit Guard",
+    "equipmentSlot": "Right",
+    "effect": {
+      "lifeModifier": 2,
+      "startBattleWithCard": [
+        "Geist of the Archives"
+      ]
+    },
+    "iconName": "SpiritGuard"
+  },
+  {
+    "name": "Iron Armor",
+    "equipmentSlot": "Body",
+    "effect": {
+      "lifeModifier": 3
+    },
+    "iconName": "IronArmor",
+    "cost": 500
+  },
+  {
+    "name": "Steel Armor",
+    "equipmentSlot": "Body",
+    "effect": {
+      "lifeModifier": 5
+    },
+    "iconName": "SteelArmor",
+    "cost": 1500
+  },
+  {
+    "name": "Leather Boots",
+    "equipmentSlot": "Boots",
+    "effect": {
+      "moveSpeed": 1.2
+    },
+    "iconName": "LeatherBoots"
+  },
+  {
+    "name": "Iron Boots",
+    "equipmentSlot": "Boots",
+    "effect": {
+      "lifeModifier": 1,
+      "moveSpeed": 1.35
+    },
+    "iconName": "IronBoots",
+    "cost": 500
+  },
+  {
+    "name": "Steel Boots",
+    "equipmentSlot": "Boots",
+    "effect": {
+      "lifeModifier": 2,
+      "moveSpeed": 1.4
+    },
+    "iconName": "SteelBoots",
+    "cost": 1500
+  },
+  {
+    "name": "Cheat",
+    "equipmentSlot": "Neck",
+    "effect": {
+      "startBattleWithCard": [
+        "Blightsteel Colossus",
+        "Lightning Greaves"
+      ]
+    },
+    "iconName": "Goose"
+  },
+  {
+    "name": "Shell Wand",
+    "equipmentSlot": "Left",
+    "effect": {
+      "opponent": {
+        "lifeModifier": -2
+      }
+    },
+    "iconName": "ShellWand"
+  },
+  {
+    "name": "Flame Sword",
+    "equipmentSlot": "Left",
+    "effect": {
+      "opponent": {
+        "lifeModifier": -5
+      }
+    },
+    "iconName": "FlameSword"
+  },
+  {
+    "name": "Dungeon Map",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "Dungeon Map"
+      ]
+    },
+    "iconName": "DungeonMap"
+  },
+  {
+    "name": "Blood Vial",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_a_blood_draw"
+      ]
+    },
+    "iconName": "Blood"
+  },
+  {
+    "name": "Charm",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_a_clue_draw"
+      ]
+    },
+    "iconName": "Clue"
+  },
+  {
+    "name": "Snack",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_a_food_sac"
+      ]
+    },
+    "iconName": "Cheese"
+  },
+  {
+    "name": "Change",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_a_gold_sac"
+      ]
+    },
+    "iconName": "Gold"
+  },
+  {
+    "name": "Treasure",
+    "equipmentSlot": "Right",
+    "effect": {
+      "startBattleWithCard": [
+        "c_a_treasure_sac"
+      ]
+    },
+    "iconName": "Treasure"
+  },
+  {
+    "name": "Manasight Amulet",
+    "equipmentSlot": "Neck",
+    "description": "Grants Manasight, letting you know the colors used by your adversaries.",
+    "effect": {
+      "colorView": true
+    },
+    "iconName": "RelicAmulet"
+  },
+  {
+    "name": "Fortune Coin",
+    "equipmentSlot": "Left",
+    "effect": {
+      "goldModifier": 0.85,
+      "cardRewardBonus": 1
+    },
+    "iconName": "FortuneCoin"
+  }
 ]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
index d2d54d98205..c7f495d1c44 100644
--- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
+++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
@@ -10,7 +10,7 @@
   {
     "name": "Colorless Castle",
     "count": 1,
-    "radiusFactor": 0.8,
+    "radiusFactor": 0.05,
     "spriteAtlas": "maps/tileset/buildings.atlas",
     "sprite": "colorless_castle",
     "map": "maps/map/main_story/colorless_castle.tmx"
@@ -55,6 +55,14 @@
     "sprite": "blue_castle",
     "map": "maps/map/main_story/blue_castle.tmx"
   },
+  {
+    "name": "Skep",
+    "count": 1,
+    "radiusFactor": 0.5,
+    "spriteAtlas": "maps/tileset/buildings.atlas",
+    "sprite": "blue_castle",
+    "map": "maps/map/main_story/skep.tmx"
+  },
   {
     "name": "Waste Town",
     "type": "town",
@@ -64,22 +72,6 @@
     "sprite": "WasteTown",
     "map": "maps/map/waste_town.tmx"
   },
-  {
-    "name": "Waste Town2",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "WasteTown",
-    "map": "maps/map/waste_town_2.tmx"
-  },
-  {
-    "name": "Waste Town3",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "WasteTown",
-    "map": "maps/map/waste_town_3.tmx"
-  },
   {
     "name": "Forest Town",
     "type": "town",
@@ -141,22 +133,6 @@
     "sprite": "Test",
     "map": "maps/map/vampirecastle_4.tmx"
   },
-  {
-    "name": "Portal",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Portal",
-    "map": "maps/map/portal_1.tmx"
-  },
-  {
-    "name": "Portal1",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Portal",
-    "map": "maps/map/portal_2.tmx"
-  },
   {
     "name": "MageTowerC",
     "count": 3,
@@ -205,14 +181,6 @@
     "sprite": "MageTower",
     "map": "maps/map/magetower_6.tmx"
   },
-  {
-    "name": "MageTowerC7",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_7.tmx"
-  },
   {
     "name": "MageTowerC8",
     "count": 3,
@@ -222,41 +190,9 @@
     "map": "maps/map/magetower_8.tmx"
   },
   {
-    "name": "MageTowerC9",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_9.tmx"
-  },
-  {
-    "name": "MageTowerCA",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_10.tmx"
-  },
-  {
-    "name": "MageTowerCB",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_11.tmx"
-  },
-  {
-    "name": "MageTowerCC",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_12.tmx"
-  },
-  {
-    "name": "MageTowerCD",
-    "count": 3,
-    "radiusFactor": 0.8,
+    "name": "MageTowerX",
+    "count": 1,
+    "radiusFactor": 0.2,
     "spriteAtlas": "maps/tileset/buildings.atlas",
     "sprite": "MageTower",
     "map": "maps/map/magetower_13.tmx"
@@ -365,14 +301,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_20.tmx"
   },
-  {
-    "name": "CaveCC",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_21.tmx"
-  },
   {
     "name": "CaveCD",
     "count": 3,
@@ -381,22 +309,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_22.tmx"
   },
-  {
-    "name": "CaveCE",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_23.tmx"
-  },
-  {
-    "name": "CaveCF",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_24.tmx"
-  },
   {
     "name": "Fort",
     "count": 4,
@@ -477,22 +389,6 @@
     "sprite": "Fort",
     "map": "maps/map/fort_10.tmx"
   },
-  {
-    "name": "FortA",
-    "count": 4,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Fort",
-    "map": "maps/map/fort_11.tmx"
-  },
-  {
-    "name": "FortB",
-    "count": 4,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Fort",
-    "map": "maps/map/fort_12.tmx"
-  },
   {
     "name": "Factory",
     "count": 3,
@@ -725,14 +621,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_20.tmx"
   },
-  {
-    "name": "CaveU5",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_25.tmx"
-  },
   {
     "name": "MageTowerU",
     "count": 2,
@@ -797,46 +685,6 @@
     "sprite": "MageTower",
     "map": "maps/map/magetower_8.tmx"
   },
-  {
-    "name": "MageTowerU8",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_9.tmx"
-  },
-  {
-    "name": "MageTowerU9",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_10.tmx"
-  },
-  {
-    "name": "MageTowerUA",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_11.tmx"
-  },
-  {
-    "name": "MageTowerUB",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_12.tmx"
-  },
-  {
-    "name": "MageTowerUC",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MageTower",
-    "map": "maps/map/magetower_13.tmx"
-  },
   {
     "name": "MageTowerUD",
     "count": 2,
@@ -893,14 +741,6 @@
     "sprite": "MerfolkPool",
     "map": "maps/map/merfolkpool_5.tmx"
   },
-  {
-    "name": "MerfolkPool5",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "MerfolkPool",
-    "map": "maps/map/merfolkpool_6.tmx"
-  },
   {
     "name": "DjinnPalace",
     "count": 3,
@@ -917,14 +757,6 @@
     "sprite": "DjinnPalace",
     "map": "maps/map/djinnpalace_2.tmx"
   },
-  {
-    "name": "DjinnPalace2",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "DjinnPalace",
-    "map": "maps/map/djinnpalace_3.tmx"
-  },
   {
     "name": "CaveB",
     "count": 2,
@@ -981,14 +813,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_12.tmx"
   },
-  {
-    "name": "CaveB7",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_16.tmx"
-  },
   {
     "name": "CaveB8",
     "count": 3,
@@ -997,14 +821,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_20.tmx"
   },
-  {
-    "name": "CaveB9",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_21.tmx"
-  },
   {
     "name": "CaveBA",
     "count": 3,
@@ -1013,22 +829,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_22.tmx"
   },
-  {
-    "name": "CaveBB",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_23.tmx"
-  },
-  {
-    "name": "CaveBC",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_25.tmx"
-  },
   {
     "name": "Graveyard",
     "count": 3,
@@ -1133,14 +933,6 @@
     "sprite": "VampireCastle",
     "map": "maps/map/vampirecastle_3.tmx"
   },
-  {
-    "name": "VampireCastle3",
-    "count": 4,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "VampireCastle",
-    "map": "maps/map/vampirecastle_4.tmx"
-  },
   {
     "name": "SkullCaveB",
     "count": 4,
@@ -1269,14 +1061,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_15.tmx"
   },
-  {
-    "name": "CaveRD",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_16.tmx"
-  },
   {
     "name": "CaveRE",
     "count": 2,
@@ -1285,14 +1069,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_17.tmx"
   },
-  {
-    "name": "CaveRF",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_18.tmx"
-  },
   {
     "name": "CaveRG",
     "count": 2,
@@ -1309,14 +1085,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_20.tmx"
   },
-  {
-    "name": "CaveRI",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_21.tmx"
-  },
   {
     "name": "CaveRJ",
     "count": 2,
@@ -1325,22 +1093,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_22.tmx"
   },
-  {
-    "name": "CaveRK",
-    "count": 2,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_23.tmx"
-  },
-  {
-    "name": "CaveRL",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_24.tmx"
-  },
   {
     "name": "Maze",
     "count": 3,
@@ -1397,14 +1149,6 @@
     "sprite": "BarbarianCamp",
     "map": "maps/map/barbariancamp_3.tmx"
   },
-  {
-    "name": "BarbarianCamp3",
-    "count": 4,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "BarbarianCamp",
-    "map": "maps/map/barbariancamp_4.tmx"
-  },
   {
     "name": "SkullCaveR",
     "count": 4,
@@ -1517,22 +1261,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_15.tmx"
   },
-  {
-    "name": "CaveG7",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_16.tmx"
-  },
-  {
-    "name": "CaveG8",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_18.tmx"
-  },
   {
     "name": "CaveG9",
     "count": 3,
@@ -1541,14 +1269,6 @@
     "sprite": "Cave",
     "map": "maps/map/cave_20.tmx"
   },
-  {
-    "name": "CaveGA",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Cave",
-    "map": "maps/map/cave_21.tmx"
-  },
   {
     "name": "CaveGB",
     "count": 3,
@@ -1637,30 +1357,6 @@
     "sprite": "Grove",
     "map": "maps/map/grove_9.tmx"
   },
-  {
-    "name": "Grove9",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Grove",
-    "map": "maps/map/grove_10.tmx"
-  },
-  {
-    "name": "GroveA",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Grove",
-    "map": "maps/map/grove_11.tmx"
-  },
-  {
-    "name": "GroveB",
-    "count": 3,
-    "radiusFactor": 0.8,
-    "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "Grove",
-    "map": "maps/map/grove_12.tmx"
-  },
   {
     "name": "CatLairG",
     "count": 4,
diff --git a/forge-gui/res/adventure/Shandalar/world/red.json b/forge-gui/res/adventure/Shandalar/world/red.json
index 6e8cefd1dd6..b91c3da9f19 100644
--- a/forge-gui/res/adventure/Shandalar/world/red.json
+++ b/forge-gui/res/adventure/Shandalar/world/red.json
@@ -28,12 +28,12 @@
     "Red Castle",
     "Mountain Town",
     "YuleTown",
-    "BarbarianCamp", "BarbarianCamp1", "BarbarianCamp2", "BarbarianCamp3",
+    "BarbarianCamp", "BarbarianCamp1", "BarbarianCamp2",
     "Maze", "Maze1", "Maze2", "Maze3",
-    "Fort", "Fort5", "FortA",
+    "Fort", "Fort5",
     "Factory", "Factory2", "Factory3",
     "SnowAbbey", "SnowAbbey1", "SnowAbbey2",
     "SkullCaveR", "SkullCaveR1", "SkullCaveR2",
-    "CaveR", "CaveR1", "CaveR2", "CaveR3", "CaveR4", "CaveR5", "CaveR6", "CaveR7", "CaveR8", "CaveR9", "CaveRA", "CaveRB", "CaveRC", "CaveRD", "CaveRE", "CaveRF", "CaveRG", "CaveRH", "CaveRI", "CaveRJ", "CaveRK", "CaveRL"
+    "CaveR", "CaveR1", "CaveR2", "CaveR3", "CaveR4", "CaveR5", "CaveR6", "CaveR7", "CaveR8", "CaveR9", "CaveRA", "CaveRB", "CaveRC", "CaveRE", "CaveRG", "CaveRH", "CaveRJ"
   ]
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/shops.json b/forge-gui/res/adventure/Shandalar/world/shops.json
index 772c7c0f7bd..58df2545cf5 100644
--- a/forge-gui/res/adventure/Shandalar/world/shops.json
+++ b/forge-gui/res/adventure/Shandalar/world/shops.json
@@ -3,12 +3,12 @@
 "spriteAtlas":"maps/tileset/buildings.atlas",   
 "sprite":"EquipmentShop",   
   "rewards": [ 
-    { "type": "item","count":1, "itemName": "Mithril Boots"  },
-    { "type": "item","count":1, "itemName": "Mithril Shield"  },
-    { "type": "item","count":1, "itemName": "Mithril Armor"  },      
     { "type": "item","count":1, "itemName": "Steel Boots"  },
     { "type": "item","count":1, "itemName": "Steel Shield"  },
-    { "type": "item","count":1, "itemName": "Steel Armor"  } 
+    { "type": "item","count":1, "itemName": "Steel Armor"  },
+    { "type": "item","count":1, "itemName": "Iron Boots"  },
+    { "type": "item","count":1, "itemName": "Iron Shield"  },
+    { "type": "item","count":1, "itemName": "Iron Armor"  }
     
     ]
 
@@ -115,9 +115,9 @@
       "colorType": "Colorless"
     }]
 },{                                    
-"name":"Artefact",                  
+"name":"Artifact",
 "spriteAtlas":"maps/tileset/buildings.atlas",   
-"sprite":"ArtefactShop",
+"sprite":"ArtifactShop",
   "rewards": [
     {
       "count":8,
@@ -363,5 +363,32 @@
       "count":8,
       "subTypes": ["Human"]
     }]
+},{
+  "name":"Angel",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"AngelShop",
+  "rewards": [
+    {
+      "count":8,
+      "subTypes": ["Angel"]
+    }]
+},{
+  "name":"Golem",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"GolemShop",
+  "rewards": [
+    {
+      "count":8,
+      "subTypes": ["Golem"]
+    }]
+},{
+  "name":"Sliver",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"SliverShop",
+  "rewards": [
+    {
+      "count":8,
+      "subTypes": ["Sliver"]
+    }]
 }
 ]   
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json
index fe181f9a1a6..750ed106b10 100644
--- a/forge-gui/res/adventure/Shandalar/world/waste.json
+++ b/forge-gui/res/adventure/Shandalar/world/waste.json
@@ -27,11 +27,11 @@
     "pointsOfInterest":[
       "Final Castle",
       "Colorless Castle",
-      "Waste Town", "Waste Town2", "Waste Town3",
-      "Portal", "Portal1",
+      "Skep",
+      "Waste Town", 
       "Fort", "Fort1", "Fort2", "Fort3", "Fort4", "Fort5", "Fort6",
       "Factory", "Factory1", "Factory2", "Factory3",
       "MageTowerC", "MageTowerC1", "MageTowerC2", "MageTowerC3", "MageTowerC4", "MageTowerC5",
-      "CaveC", "CaveC1", "CaveC2", "CaveC3", "CaveC4", "CaveC5", "CaveC6", "CaveC7", "CaveC8", "CaveC9", "CaveCA", "CaveCB", "CaveCC", "CaveCD", "CaveCE", "CaveCF"
+      "CaveC", "CaveC1", "CaveC2", "CaveC3", "CaveC4", "CaveC5", "CaveC6", "CaveC7", "CaveC8", "CaveC9", "CaveCA", "CaveCB", "CaveCD"
     ]
 }
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json
index b8fe2d0ef0b..86b8b226a0a 100644
--- a/forge-gui/res/adventure/Shandalar/world/white.json
+++ b/forge-gui/res/adventure/Shandalar/world/white.json
@@ -29,8 +29,7 @@
     "Plains Town",
     "Monastery", "Monastery1", "Monastery2", "Monastery3", "Monastery4",
     "Castle", "Castle1", "Castle2",
-    "Fort7", "Fort8", "Fort9", "FortA", "FortB",
-    "Aerie",
+    "Fort7", "Fort8", "Fort9",
     "CatLairW", "CatLairW1", "CatLairW2",
     "NestW",
     "CaveW", "CaveW1", "CaveW2", "CaveW3", "CaveW4", "CaveW5", "CaveW6"

From d2fddb3ac5245f3547f97c8695f3e467a89283ff Mon Sep 17 00:00:00 2001
From: Magpie <magpie514@users.noreply.github.com>
Date: Fri, 24 Jun 2022 08:22:04 +0200
Subject: [PATCH 070/309] Adventure mode - Adjustments Reformatted Reward.java
 so it's cleaner to modify.

---
 .../src/forge/adventure/util/Reward.java      | 52 ++++++-------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/util/Reward.java b/forge-gui-mobile/src/forge/adventure/util/Reward.java
index 575a56dd86e..2ca6ff579bc 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Reward.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Reward.java
@@ -7,57 +7,37 @@ import forge.item.PaperCard;
  * Reward class that may contain gold,cards or items
  */
 public class Reward {
-
-
-    public Reward(ItemData item) {
-        type=Type.Item;
-        this.item=item;
-        count = 1;
-    }
-
-    public PaperCard getCard() {
-        return card;
-    }
-    public ItemData getItem() {
-        return item;
-    }
-
-
     public enum Type {
         Card,
         Gold,
         Item,
         Life
-
     }
     Type type;
     PaperCard card;
     ItemData item;
-
     private final int count;
 
-
-    public int getCount() {
-        return count;
-    }
-
-
-    public Type getType() {
-        return type;
+    public Reward(ItemData item) {
+        type      = Type.Item;
+        this.item = item;
+        count     = 1;
     }
     public Reward(int count) {
-        type=Type.Gold;
-        this.count =count;
+        type       = Type.Gold;
+        this.count = count;
     }
-    public Reward(PaperCard card)
-    {
-        type= Type.Card;
-        this.card=card;
-        count = 0;
+    public Reward(PaperCard card) {
+        type      = Type.Card;
+        this.card = card;
+        count     = 0;
     }
     public Reward(Type type, int count) {
-        this.type=type;
-        this.count =count;
+        this.type  = type;
+        this.count = count;
     }
-
+    public PaperCard getCard() { return card;  }
+    public ItemData getItem()  { return item;  }
+    public Type getType()      { return type;  }
+    public int getCount()      { return count; }
 }

From 546d068bae1eb589c3bd02744eadadf6c0e61816 Mon Sep 17 00:00:00 2001
From: Magpie <magpie514@users.noreply.github.com>
Date: Fri, 24 Jun 2022 08:26:46 +0200
Subject: [PATCH 071/309] Adventure mode - Adjustments Reformatted Reward.java
 so it's cleaner to modify.

---
 forge-gui/res/adventure/Shandalar/world/points_of_interest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
index c7f495d1c44..6b590db7ae9 100644
--- a/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
+++ b/forge-gui/res/adventure/Shandalar/world/points_of_interest.json
@@ -60,7 +60,7 @@
     "count": 1,
     "radiusFactor": 0.5,
     "spriteAtlas": "maps/tileset/buildings.atlas",
-    "sprite": "blue_castle",
+    "sprite": "Cave",
     "map": "maps/map/main_story/skep.tmx"
   },
   {

From 7667c4522d4168f4a49f944abd1b89f4adf1ae6f Mon Sep 17 00:00:00 2001
From: Magpie <magpie514@users.noreply.github.com>
Date: Fri, 24 Jun 2022 09:23:01 +0200
Subject: [PATCH 072/309] Adventure mode - Adjustments * Fixed gold display on
 SpellSmithScene.java. * Added Spirit Guard icon.

---
 .../src/forge/adventure/scene/SpellSmithScene.java             | 2 ++
 forge-gui/res/adventure/Shandalar/sprites/items.atlas          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
index d8422f97a14..d56b2c8a3d5 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SpellSmithScene.java
@@ -126,6 +126,7 @@ public class SpellSmithScene extends UIScene {
         cost_low = -1; cost_high = 9999;
         rarity = "";
         currentPrice = (int)basePrice;
+        goldLabel.setText("Gold: "+ Current.player().getGold());
 
         for(Map.Entry<String, TextButton> B : colorButtons.entrySet())  B.getValue().setColor(Color.WHITE);
         for(Map.Entry<String, TextButton> B : costButtons.entrySet())   B.getValue().setColor(Color.WHITE);
@@ -228,6 +229,7 @@ public class SpellSmithScene extends UIScene {
     public void filterResults() {
         RewardData R = new RewardData();
         Iterable<PaperCard> P = R.getAllCards();
+        goldLabel.setText("Gold: "+ Current.player().getGold());
         float totalCost = basePrice * Current.player().goldModifier();
         final List<String> colorFilter = new ArrayList<>();
         for(Map.Entry<String, TextButton> B : colorButtons.entrySet())
diff --git a/forge-gui/res/adventure/Shandalar/sprites/items.atlas b/forge-gui/res/adventure/Shandalar/sprites/items.atlas
index 684498fdf71..ff309abf4b3 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/items.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/items.atlas
@@ -231,3 +231,6 @@ DungeonMap
 FortuneCoin
   xy: 336,64
   size: 16, 16
+SpiritGuard
+  xy: 192,160
+  size: 16, 16
\ No newline at end of file

From f7f1faffed91ca8ed6212a74a0e36fae1ac42f08 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Fri, 24 Jun 2022 11:49:51 +0200
Subject: [PATCH 073/309] only reset castFaceDown when making a full spell copy

---
 forge-game/src/main/java/forge/game/card/CardFactory.java   | 6 ++++++
 .../src/main/java/forge/game/spellability/SpellAbility.java | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

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 062c48892ca..bd6c3dfe073 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -209,6 +209,12 @@ public class CardFactory {
         // 707.10b
         copySA.setOriginalAbility(targetSA);
 
+        // Copied spell is not cast face down
+        if (copySA instanceof Spell) {
+            Spell spell = (Spell) copySA;
+            spell.setCastFaceDown(false);
+        }
+
         if (targetSA.usesTargeting()) {
             // do for SubAbilities too?
             copySA.setTargets(targetSA.getTargets().clone());
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 a19859c37c4..fff1c723c13 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -1096,12 +1096,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             // always set this to false, it is only set in CopyEffect
             clone.mayChooseNewTargets = false;
 
-            // Copied spell is not cast face down
-            if (clone instanceof Spell) {
-                Spell spell = (Spell) clone;
-                spell.setCastFaceDown(false);
-            }
-
             clone.triggeringObjects = AbilityKey.newMap(this.triggeringObjects);
 
             clone.setPayCosts(getPayCosts().copy());

From 03993e3aa06bc8f1a5b270c74fc9523cbdd3f676 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 05:35:35 -0500
Subject: [PATCH 074/309] Update grell_philosopher.txt

---
 forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
index d616117de32..a602139d791 100644
--- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
@@ -5,8 +5,8 @@ PT:1/4
 K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
-SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | RememberObjects$ Targeted
-SVar:STSteal:Mode$ Continuous | Affected$ Creature.Horror+YouCtrl | EffectZone$ Command | GainsAbilitiesOfDefined$ RememberedLKI
+SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | ImprintCards$ Targeted | RememberObjects$ Valid Creature.Horror+YouCtrl | ForgetOnMoved$ Battlefield
+SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI
 AI:RemoveDeck:All
 DeckHints:Type$Horror
 Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities.

From bdfc97a00cb2ce1138e085c144019e029cc0455e Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:55:51 +0100
Subject: [PATCH 075/309] Create ghastly_death_tyrant.txt

---
 .../res/cardsfolder/upcoming/ghastly_death_tyrant.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
new file mode 100644
index 00000000000..84990a67ea5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
@@ -0,0 +1,11 @@
+Name:Ghastly Death Tyrant
+ManaCost:4 B B
+Types:Creature Beholder Skeleton
+PT:6/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+SVar:TrigCharm:DB$ Charm | Choices$ DB$Destroy,DBPumpAll
+SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
+SVar:X:Targeted$CardManaCost
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SpellDescription$ Death Ray — Creatures you control gain deathtouch until end of turn.
+Oracle:When Ghastly Death Tyrant enters the battlefield, choose one —\n• Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.\n• Death Ray — Creatures you control gain Deathtouch until end of turn.

From df15e79d22b77fbe50e1ca21f916fc214d19b3cf Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:59:22 +0100
Subject: [PATCH 076/309] Update ghastly_death_tyrant.txt

---
 forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
index 84990a67ea5..4dbfd362962 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
@@ -4,7 +4,7 @@ Types:Creature Beholder Skeleton
 PT:6/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DB$Destroy,DBPumpAll
-SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target artifact or enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
+SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SpellDescription$ Death Ray — Creatures you control gain deathtouch until end of turn.

From 69c02b104fb51b168cf730bf2de2ae31ba52f071 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Fri, 24 Jun 2022 12:30:55 +0100
Subject: [PATCH 077/309] Update ghastly_death_tyrant.txt

---
 forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
index 4dbfd362962..a5ed260e9a5 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
@@ -4,7 +4,7 @@ Types:Creature Beholder Skeleton
 PT:6/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DB$Destroy,DBPumpAll
-SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
+SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SpellDescription$ Death Ray — Creatures you control gain deathtouch until end of turn.

From f4c4e63ad70618c215ca63a54652ef0dfa8d0682 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Fri, 24 Jun 2022 14:08:27 +0100
Subject: [PATCH 078/309] YCLB Land Gate cycle

---
 .../res/cardsfolder/upcoming/gate_of_the_black_dragon.txt  | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt   | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt    | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt  | 7 +++++++
 5 files changed, 35 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt b/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
new file mode 100644
index 00000000000..b66863dacc2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
@@ -0,0 +1,7 @@
+Name:Gate of the Black Dragon
+ManaCost:no cost
+Types:Land Swamp Gate
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 3 B T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+DeckHints:Type$Gate
+Oracle:Gate of the Black Dragon enters the battlefield tapped.\n{3}{B}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
new file mode 100644
index 00000000000..fdf6e52eb03
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
@@ -0,0 +1,7 @@
+Name:Gate to Manorborn
+ManaCost:no cost
+Types:Land Forest Gate
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+DeckHints:Type$Gate
+Oracle:Gate to Manorborn enters the battlefield tapped.\n{3}{G}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
new file mode 100644
index 00000000000..42d6318fcbc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
@@ -0,0 +1,7 @@
+Name:Gate to Seatower
+ManaCost:no cost
+Types:Land Island Gate
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 3 U T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+DeckHints:Type$Gate
+Oracle:Gate to Seatower enters the battlefield tapped.\n{3}{U}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
new file mode 100644
index 00000000000..0a7a7ada972
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
@@ -0,0 +1,7 @@
+Name:Gate to the Citadel
+ManaCost:no cost
+Types:Land Plains Gate
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 3 W T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+DeckHints:Type$Gate
+Oracle:Gate to the Citadel enters the battlefield tapped.\n{3}{W}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt
new file mode 100644
index 00000000000..6c58919bc14
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt
@@ -0,0 +1,7 @@
+Name:Gate to Tumbledown
+ManaCost:no cost
+Types:Land Mountain Gate
+K:CARDNAME enters the battlefield tapped.
+A:AB$ ChangeZone | Cost$ 3 R T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+DeckHints:Type$Gate
+Oracle:Gate to Tumbledown enters the battlefield tapped.\n{3}{R}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {R}.

From 66349ee05d84cb7f1329e3641e6d186d777a6d5c Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Fri, 24 Jun 2022 15:08:14 +0100
Subject: [PATCH 079/309] add_missing_card_detail

---
 forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt | 1 +
 forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt        | 1 +
 forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt         | 1 +
 forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt      | 1 +
 forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt b/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
index b66863dacc2..d21a5cad9f5 100644
--- a/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gate_of_the_black_dragon.txt
@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land Swamp Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 3 B T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+Text:{T}: Add {B}.
 DeckHints:Type$Gate
 Oracle:Gate of the Black Dragon enters the battlefield tapped.\n{3}{B}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {B}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
index fdf6e52eb03..e490a6a0690 100644
--- a/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_manorborn.txt
@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land Forest Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+Text:{T}: Add {G}.
 DeckHints:Type$Gate
 Oracle:Gate to Manorborn enters the battlefield tapped.\n{3}{G}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {G}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
index 42d6318fcbc..a0a33c0ec23 100644
--- a/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_seatower.txt
@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land Island Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 3 U T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+Text:{T}: Add {U}.
 DeckHints:Type$Gate
 Oracle:Gate to Seatower enters the battlefield tapped.\n{3}{U}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
index 0a7a7ada972..22319bdaf45 100644
--- a/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_the_citadel.txt
@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land Plains Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 3 W T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+Text:{T}: Add {W}.
 DeckHints:Type$Gate
 Oracle:Gate to the Citadel enters the battlefield tapped.\n{3}{W}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt b/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt
index 6c58919bc14..60c3065c7b3 100644
--- a/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gate_to_tumbledown.txt
@@ -3,5 +3,6 @@ ManaCost:no cost
 Types:Land Mountain Gate
 K:CARDNAME enters the battlefield tapped.
 A:AB$ ChangeZone | Cost$ 3 R T | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeNum$ 1 | ChangeType$ Card.nonLand | GameActivationLimit$ 1 | StackDescription$ SpellDescription | SpellDescription$ Seek a nonland card. Activate only once.
+Text:{T}: Add {R}.
 DeckHints:Type$Gate
 Oracle:Gate to Tumbledown enters the battlefield tapped.\n{3}{R}, {T}: Seek a nonland card. Activate only once.\n{T}: Add {R}.

From 9b2a8eeced0113e7547368d778e5477b802cefcc Mon Sep 17 00:00:00 2001
From: t-w-o-s-a-t <103374130+t-w-o-s-a-t@users.noreply.github.com>
Date: Fri, 24 Jun 2022 17:07:26 +0200
Subject: [PATCH 080/309] Update de-DE.properties

corrected translation selectormode
translated changed entries historic -> archived
---
 forge-gui/res/languages/de-DE.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 269b8fab220..b7cb90403d0 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -66,7 +66,7 @@ cbManaBurn=Manabrand
 cbManaLostPrompt=Bestätige Leeren des Manapools
 cbDevMode=Entwicklermodus
 cbLoadCardsLazily=Lade Kartenskripte verzögert
-cbLoadArchivedFormats=Load Archived Formats
+cbLoadArchivedFormats=Aktiviere archivierte Formate
 cbWorkshopSyntax=Workshop Syntax-Checker
 cbEnforceDeckLegality=Deckkonformität
 cbSideboardForAI=Sideboard für Mensch/KI
@@ -182,7 +182,7 @@ nlWorkshopSyntax=Aktiviert den Syntaxcheck für Kartenskripte im Workshop. Hinwe
 nlGameLogEntryType=Steuert den Umfang der Daten in der Protokolldatei. Sortiert vom geringsten zum größten Umfang.
 nlCloseAction=Steuert was passiert, wenn X oben rechts gedrückt wird.
 nlLoadCardsLazily=Wenn aktiviert, lädt Forge Kartenskripte erst wenn sie benötigt werden, nicht bei Programmstart. Warnung: Experimentell!!!
-nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
+nlLoadArchivedFormats=Wenn aktiviert, lädt Forge auch archivierte Spielformate. Verlängert den Programmstart.
 GraphicOptions=Grafik Optionen
 nlDefaultFontSize=Die Standardschriftgröße. Alle Schriftelemente werden relative zu dieser angepaßt. (Erfordert Neustart)
 nlCardArtFormat=Format der Kartenbilder (Full: Bilder ganzen Karte; Crop: nur Bildteil der Karte)
@@ -551,7 +551,7 @@ cbWantReprints=Erlaube passende Drucke aus anderen Sets
 lblChooseFormats=Wähle Format
 lblSanctioned=Sanktioniert
 lblOther=Andere
-lblArchived=Archived
+lblArchived=Archiviert
 lblCancel=Abbrechen
 #DialogChoosePoolDistribution.java
 lblBlack=Schwarz
@@ -1063,7 +1063,7 @@ nlFullScreenMode=Aktiviert Vollbild-Modus
 lblVideoMode=Video-Modus
 nlVideoMode=Verwendet die ausgewählten Video-Optionen.
 lblSelectorMode=Auswahloptionen
-nlSelectorMode=Wendet den ausgewählten Modus beim Start an (Standardeinstellung ermöglicht die Option Selector, Classic oder Adventure den Hauptbildschirm beim Start).
+nlSelectorMode=Wendet den ausgewählten Modus beim Start an (Standardeinstellung ermöglicht die Auswahl des Klassik- oder Adventure-Modus beim Start).
 lblShowFPSDisplay=FPS-Anzeige
 nlShowFPSDisplay=Aktiviert die Frames-per-second-Anzeige (Experimentell).
 lblEnableUnknownCards=Erlaube unbekannte Karten
@@ -2674,7 +2674,7 @@ lblRenameQuestTo=Diese Quest umbenennen in
 lblQuestRename=Quest umbenennen
 #StartingPoolType.java
 lblUnrestricted=Unbeschränkt
-lblCasualOrArchivedFormat=Casual/Archived format
+lblCasualOrArchivedFormat=Gelegenheits-/archiviertes Format
 lblCustomFormat=eigendefiniertes Format
 lblEventOrStartDeck=Event- oder Starter-Deck
 lblMySealedDeck=Mein Sealed-Deck

From 6e7edc3a4b8bf25c5daa087e2dd2e8e27e463cb5 Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Fri, 24 Jun 2022 17:52:01 +0100
Subject: [PATCH 081/309] Update ghastly_death_tyrant.txt

---
 forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
index a5ed260e9a5..fcd0959686d 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
@@ -4,8 +4,8 @@ Types:Creature Beholder Skeleton
 PT:6/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DB$Destroy,DBPumpAll
-SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife |SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
+SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife | PrecostDesc$ Disintegration Ray — | SpellDescription$ Destroy target enchantment an opponent controls. You lose life equal to its mana value.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SpellDescription$ Death Ray — Creatures you control gain deathtouch until end of turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | PrecostDesc$ Death Ray — | SpellDescription$ Creatures you control gain deathtouch until end of turn.
 Oracle:When Ghastly Death Tyrant enters the battlefield, choose one —\n• Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.\n• Death Ray — Creatures you control gain Deathtouch until end of turn.

From 0e26120d3d58447d75015010fede72dd13d6779a Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Fri, 24 Jun 2022 17:56:40 +0100
Subject: [PATCH 082/309] undo

---
 forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
index fcd0959686d..d9bbaf6fc06 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghastly_death_tyrant.txt
@@ -4,8 +4,8 @@ Types:Creature Beholder Skeleton
 PT:6/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DB$Destroy,DBPumpAll
-SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife | PrecostDesc$ Disintegration Ray — | SpellDescription$ Destroy target enchantment an opponent controls. You lose life equal to its mana value.
+SVar:DB$Destroy:DB$ Destroy | ValidTgts$ Enchantment.OppCtrl | TgtPrompt$ Select target enchantment | SubAbility$ DBLoseLife | SpellDescription$ Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
-SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | PrecostDesc$ Death Ray — | SpellDescription$ Creatures you control gain deathtouch until end of turn.
+SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Deathtouch | SpellDescription$ Death Ray — Creatures you control gain deathtouch until end of turn.
 Oracle:When Ghastly Death Tyrant enters the battlefield, choose one —\n• Disintegration Ray — Destroy target enchantment an opponent controls. You lose life equal to its mana value.\n• Death Ray — Creatures you control gain Deathtouch until end of turn.

From bda561f97a441566bb10bf2abb096a619b254c20 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:26:03 -0500
Subject: [PATCH 083/309] Update ghost_lantern_bind_spirit.txt

---
 forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
index 013edf4e70c..3d3222acb40 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
@@ -14,3 +14,4 @@ ManaCost:1 B
 Types:Instant Adventure
 A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand
 Oracle:Return target creature card from your graveyard to your hand.
+DeckHas:Ability$Graveyard

From b5be71b1439ece26473975ea120e829e88db558d Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:29:03 -0500
Subject: [PATCH 084/309] Update green_slime.txt

---
 forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
index b8e75dbc627..80daa8855a1 100644
--- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Ooze
 PT:2/2
 K:Flash
-K:Foretell G
+K:Foretell: G
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.
 SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
 AI:RemoveDeck:All

From 6a35b738394984e68092b66dacd50bff7a826638 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:29:55 -0500
Subject: [PATCH 085/309] Update green_slime.txt

---
 forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
index 80daa8855a1..98f2fcdf8f0 100644
--- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
@@ -5,6 +5,6 @@ PT:2/2
 K:Flash
 K:Foretell: G
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.
-SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source. | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
+SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
 AI:RemoveDeck:All
 Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G}

From 8765ab646e953e17474a7bd938b30b891e599597 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 18:31:50 -0500
Subject: [PATCH 086/309] Update hammers_of_moradin.txt

---
 forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt
index 58e1767a30c..2644a7e25c7 100644
--- a/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt
@@ -6,4 +6,5 @@ K:Myriad
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TapOneEach | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, tap up to one target creature that player controls.
 SVar:TapOneEach:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose one target creature that each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True
 SVar:OneEach:PlayerCountOpponents$Amount
+SVar:HasAttackEffect:TRUE
 Oracle:Myriad\nWhenever Hammers of Moradin attacks, for each opponent, tap up to one target creature that player controls.

From b5fb0a4cc1a7d16fab3422b991df874abbaf85ef Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Fri, 24 Jun 2022 21:04:28 -0500
Subject: [PATCH 087/309] Update ghost_lantern_bind_spirit.txt

---
 .../res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
index 3d3222acb40..8b5f166becb 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt
@@ -13,5 +13,5 @@ Name:Bind Spirit
 ManaCost:1 B
 Types:Instant Adventure
 A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand
-Oracle:Return target creature card from your graveyard to your hand.
 DeckHas:Ability$Graveyard
+Oracle:Return target creature card from your graveyard to your hand.

From 56c6395fcbec6f7c878f9eea87f6960e7fe74d4e Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 25 Jun 2022 12:55:40 +0800
Subject: [PATCH 088/309] Update Double Masters 2022.txt

---
 .../res/editions/Double Masters 2022.txt      | 249 +++++++++++++++++-
 1 file changed, 244 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 56562e253a1..79c6d822721 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -11,50 +11,102 @@ ScryfallCode=2X2
 3 M Ulamog, the Infinite Gyre @Aleksi Briclot
 4 U Abzan Falconer @Steven Belledin
 5 C Ainok Bond-Kin @Chris Rahn
+6 C Anointer of Valor @Antonio José Manzanedo
+7 C Battlefield Promotion @Scott Murphy
 8 M Divine Visitation @Victor Adame Minguez
 9 C Doomed Traveler @Lars Grant-West
+10 M Emiel the Blessed @Antonio José Manzanedo
+11 U Flickerwisp @Jeremy Enecio
 12 C Gods Willing @Mark Winters
+13 C Hyena Umbra @Howard Lyon
+14 C Knightly Valor @Matt Stewart
+15 C Last Breath @Christina Davis
+16 R Leonin Arbiter @Shelly Wan
+17 U Mentor of the Meek @Jana Schirmer & Johannes Voss
 18 R Mikaeus, the Lunarch @Steven Belledin
+19 C Militia Bugler @David Gaillet
 20 C Momentary Blink @Evan Shipard
+21 M Monastery Mentor @Magali Villeneuve
 22 U Myth Realized @Jason Rainville
 23 U Path to Exile @Raf Sarmento
+24 U Relief Captain @Anastasia Ovchinnikova
+25 R Restoration Angel @Jake Murray
+26 R Reveillark @Jim Murray
+27 U Scale Blessing @Matt Stewart
 28 C Seeker of the Way @Craig J Spearing
+29 C Sensor Splicer @Izzy
 30 C Settle Beyond Reality @Anthony Palumbo
+31 R Smothering Tithe @Mark Behm
 32 R Teferi's Protection @Chase Stone
+33 U Wall of Omens @James Paick
 34 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
 35 C Wingsteed Rider @Cynthia Sheppard
 36 C Advanced Stitchwing @Johann Bodin
 37 C Aethersnipe @Zoltan Boros & Gabor Szikszai
 38 M As Foretold @Tommy Arnold
+39 C Aven Initiate @Jakub Kasper
 40 U Body Double @Winona Nelson
+41 U Breakthrough @Raymond Swanland
+42 C Capture Sphere @Mark Behm
 43 M Consecrated Sphinx @Mark Zug
 44 C Deep Analysis @Jesper Ejsing
+45 C Deranged Assistant @Nils Hamm
+46 R Disciple of the Ring @Clint Cearley
 47 U Domestication @Jesper Ejsing
+48 C Eel Umbra @Howard Lyon
+49 U Forbidden Alchemy @David Rapoza
 50 R Force of Negation @Paul Scott Canavan
 51 R Gifts Ungiven @Chris Rallis
 52 C Ingenious Skaab @Jesper Ejsing
+53 C Jeskai Elder @Craig J Spearing
+54 C Kasmina's Transmutation @Uriah Voth
 55 R Kederekt Leviathan @Mark Hyzer
+56 C Makeshift Mauler @James Ryman
 57 M Mana Drain @Raymond Swanland
+58 C Mana Leak @Howard Lyon
 59 U Mistfire Adept @Clint Cearley
 60 U Mulldrifter @Eric Fortune
+61 U Nephalia Smuggler @Matt Stewart
 62 R Pull from Tomorrow @Sara Winters
+63 C Spell Pierce @Vance Kovacs
+64 R Talrand, Sky Summoner @Svetlin Velinov
 65 C Thought Scour @Julie Dillon
 66 R Venser, Shaper Savant @Aleksi Briclot
 67 U Wash Out @Steven Belledin
 68 C Balustrade Spy @Jaime Jones
 69 M Bitterblossom @Rebecca Guay
+70 U Blood Artist @LA Draws
+71 C Bloodflow Connoisseur @Slawomir Maniak
+72 U Carrier Thrall @Lius Lasahido
 73 R Damnation @Kev Walker
+74 C Disfigure @Justin Sweet
 75 C Eyeblight's Ending @Ron Spears
 76 U Go for the Throat @David Rapoza
+77 U Graveblade Marauder @Jason Rainville
+78 R Gravecrawler @Steven Belledin
 79 M Imperial Seal @Milivoj Ćeran
 80 U Inquisition of Kozilek @Tomasz Jedruszek
 81 M Liliana, the Last Hope @Jaime Jones
+82 U Liliana's Elite @Deruchenko Alexander
 83 R Necrotic Ooze @James Ryman
+84 R Ob Nixilis, Unshackled @Karl Kopinski
 85 R Oona's Prowler @Wayne Reynolds
+86 U Scion of Darkness @Mark Zug
 87 C Seekers' Squire @Anthony Palumbo
+88 C Severed Strands @Zack Stella
+89 C Shadowborn Apostle @Lucas Graciano
+90 C Skeleton Archer @Randy Vargas
+91 U Skinrender @David Rapoza
+92 C Strands of Undeath @Dave Allsop
+93 C Supernatural Stamina @Christopher Moeller
+94 R Surgical Extraction @Steven Belledin
+95 U Unburial Rites @Ryan Pancoast
 96 C Unearth @Jehan Choo
 97 C Vampire Sovereign @Volkan Baǵa
+98 U Vampiric Rites @Anastasia Ovchinnikova
 99 R Yahenni, Undying Partisan @Lius Lasahido
+100 R Abbot of Keral Keep @Deruchenko Alexander
+101 R Alesha, Who Smiles at Death @Anastasia Ovchinnikova
 102 R Anger of the Gods @Yigit Koroglu
 103 R Backdraft Hellkite @Rudy Siswanto
 104 R Bedlam Reveler @Jama Jurabaev
@@ -62,100 +114,165 @@ ScryfallCode=2X2
 106 C Dark-Dweller Oracle @Deruchenko Alexander
 107 M Dockside Extortionist @Lie Setiawan
 108 U Dreamshaper Shaman @Steve Prescott
+109 C Fiery Fall @Daarken
+110 U Goblin Banneret @Viktor Titov
 111 R Greater Gargadon @Rob Alexander
 112 C Hero of the Games @Josh Hass
+113 C Hissing Iguanar @Brandon Kitkouski
+114 C Kruin Striker @Christopher Moeller
 115 U Labyrinth Champion @Chase Stone
+116 C Lava Coil @Wesley Burt
 117 U Lightning Bolt @Christopher Moeller
+118 U Living Lightning @Caio Monteiro
+119 C Monastery Swiftspear @Steve Argyle
 120 C Pirate's Pillage @Wayne Reynolds
+121 U Purphoros's Emissary @Sam Burley
 122 C Rift Bolt @Daniel Ljunggren
 123 M Seasoned Pyromancer @Cynthia Sheppard
+124 C Sparkmage's Gambit @Mathias Kollros
+125 U Staggershock @Raymond Swanland
 126 C Storm Fleet Pyromancer @Kieran Yanner
 127 U Surreal Memoir @Jaime Jones
+128 C Titan's Strength @Karl Kopinski
+129 R Twinflame @Chase Stone
+130 M Warrior's Oath @Eric Deschamps
+131 U Young Pyromancer @Cynthia Sheppard
 132 M Allosaurus Shepherd @Randy Vargas
+133 C Ambuscade @Kev Walker
 134 C Annoyed Altisaur @Lars Grant-West
 135 U Arachnus Spinner @Karl Kopinski
 136 C Arachnus Web @Karl Kopinski
+137 U Biogenic Upgrade @Tomasz Jedruszek
 138 R Bloom Tender @Chippy
 139 C Brindle Shoat @Steven Belledin
 140 U Centaur Battlemaster @Kev Walker
+141 M Concordant Crossroads @Alayna Danner
+142 C Deadly Recluse @Warren Mahy
 143 U Devoted Druid @Kimonas Theodossiou
 144 C Elvish Rejuvenator @Winona Nelson
 145 U Eternal Witness @Chris Rahn
 146 C Experiment One @Jack Wang
+147 M Food Chain @Daarken
 148 C Gnarlback Rhino @YW Tang
+149 C Grapple with the Past @Howard Lyon
 150 R Green Sun's Zenith @David Rapoza
 151 R Hardened Scales @Mark Winters
 152 R Impervious Greatwurm @Simon Dominic
+153 U Might of Old Krosa @Lars Grant-West
 154 R Oracle of Mul Daya @Vance Kovacs
 155 C Rampant Growth @Scott M. Fischer
+156 U Rancor @Kev Walker
 157 R Rishkar, Peema Renegade @Todd Lockwood
 158 U Spider Spawning @Daniel Ljunggren
 159 R Splinterfright @Eric Deschamps
+160 U Summer Bloom @Nicola Leonard
 161 C Thrive @Daren Bader
 162 U Travel Preparations @Vincent Proce
 163 C Tuskguard Captain @Aaron Miller
 164 C Webweaver Changeling @Nicholas Gregory
 165 R Abzan Ascendancy @Mark Winters
 166 U Abzan Charm @Mathias Kollros
+167 U Aethermage's Touch @Randy Gallegos
+168 C Agony Warp @Dave Allsop
 169 M Aminatou, the Fateshifter @Seb McKinnon
 170 R Anguished Unmaking @Wesley Burt
 171 M Animar, Soul of Elements @Filip Burburan
 172 R Arjun, the Shifting Flame @Willian Murai
+173 R Ashen Rider @Chris Rahn
 174 R Ashenmoor Liege @Mark Zug
+175 R Assassin's Trophy @Seb McKinnon
 176 R Atarka's Command @Chris Rahn
 177 R Atla Palani, Nest Tender @Ekaterina Burmak
+178 C Auger Spree @Raymond Swanland
+179 M Aurelia, the Warleader @Slawomir Maniak
+180 R Balefire Liege @Ralph Horsley
 181 U Bant Charm @Randy Gallegos
 182 U Bear's Companion @Winona Nelson
 183 U Blazing Hellhound @Eric Velhagen
+184 U Bloodbraid Elf @Raymond Swanland
 185 C Bloodwater Entity @Viktor Titov
 186 R Boartusk Liege @Jesper Ejsing
 187 U Bounty of the Luxa @Jonas De Ro
 188 R Bring to Light @Jonas De Ro
+189 C Burning-Tree Emissary @Izzy
+190 C Call to the Feast @Yongjae Choi
 191 C Cartel Aristocrat @James Ryman
 192 R Child of Alara @Steve Argyle
 193 C Chronicler of Heroes @John Stanko
+194 C Coiling Oracle @Mark Zug
 195 U Conclave Mentor @Raoul Vitale
 196 U Crackling Doom @Yohann Schepacz
 197 R Creakwood Liege @Cole Eastburn
 198 R Dack's Duplicate @Karl Kopinski
 199 R Dauntless Escort @Volkan Baǵa
+200 R Deathbringer Liege @Julie Dillon
+201 R Doran, the Siege Tower @Mark Zug
 202 M Dragonlord Dromoka @Eric Deschamps
+203 M Dragonlord Silumgar @Steven Belledin
 204 C Dreg Mangler @Svetlin Velinov
 205 R Drogskol Reaver @Vincent Proce
 206 R Dromoka's Command @James Ryman
 207 M Elenda, the Dusk Rose @Chris Rahn
+208 R Elsha of the Infinite @G-host Lee
 209 R Empyrial Archangel @Greg Staples
+210 U Extract from Darkness @Dallas Williams
 211 M Ezuri, Claw of Progress @James Ryman
 212 R Fiery Justice @Mathias Kollros
+213 R Figure of Destiny @Scott M. Fischer
 214 C Fireblade Artist @Steve Argyle
+215 R Firesong and Sunspeaker @Zoltan Boros
 216 M Ghave, Guru of Spores @James Paick
 217 R Glen Elendra Liege @Kev Walker
 218 R Glimpse the Unthinkable @Brandon Kitkouski
 219 U Gloryscale Viashino @Volkan Baǵa
+220 C Glowspore Shaman @Lars Grant-West
 221 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
 222 R Grim Flayer @Mathias Kollros
+223 U Ground Assault @Karl Kopinski
 224 R Guided Passage @Alex Horley-Orlandelli
+225 M Hellkite Overlord @Justin Sweet
 226 U Heroic Reinforcements @Scott Murphy
 227 R Hostage Taker @Wayne Reynolds
 228 R Hydroid Krasis @Jason Felix
+229 R Intet, the Dreamer @Dan Scott
+230 C Izzet Charm @Zoltan Boros
+231 R Jeskai Ascendancy @Dan Scott
+232 U Jeskai Charm @Mathias Kollros
+233 R Jodah, Archmage Eternal @Yongjae Choi
+234 R Judith, the Scourge Diva @Wesley Burt
+235 M Kaalia of the Vast @Michael Komarck
 236 R Kaervek the Merciless @rk post
+237 R Kambal, Consul of Allocation @Vincent Proce
 238 M Karador, Ghost Chieftain @Todd Lockwood
+239 R Kolaghan's Command @Daarken
 240 R Lavalanche @Steve Argyle
+241 U League Guildmage @Svetlin Velinov
 242 R Legion's Initiative @Jaime Jones
+243 U Lightning Helix @Raymond Swanland
 244 M Lord of Extinction @Izzy
 245 U Lotleth Troll @Vincent Proce
+246 C Lyev Skyknight @Johannes Voss
 247 R Magister Sphinx @Steven Belledin
+248 R Marchesa, the Black Rose @Matt Stewart
 249 C Martial Glory @Raymond Swanland
 250 R Master Biomancer @Willian Murai
+251 M Master of Cruelties @Chase Stone
+252 R Mathas, Fiend Seeker @Joe Slucher
+253 R Mayael's Aria @Steve Argyle
 254 R The Mimeoplasm @Svetlin Velinov
 255 R Mindwrack Liege @Richard Whitters
+256 U Mistmeadow Witch @Greg Staples
 257 M Mizzix of the Izmagnus @Cliff Childs
 258 M Muldrotha, the Gravetide @Jason Rainville
 259 R Murkfiend Liege @Carl Critchlow
 260 M Nicol Bolas, God-Pharaoh @Raymond Swanland
+261 U Orzhov Pontiff @Adam Rex
 262 R Phyrexian Tyranny @Kev Walker
+263 R Privileged Position @Wayne England
 264 R Prized Amalgam @Karl Kopinski
+265 U Prophetic Bolt @Slawomir Maniak
 266 U Psychic Symbiont @Robbie Trevino
+267 C Qasali Pridemage @Chris Rahn
 268 R Rafiq of the Many @Michael Komarck
 269 U River Hoopoe @Ryan Pancoast
 270 R Roon of the Hidden Realm @Steve Prescott
@@ -164,7 +281,10 @@ ScryfallCode=2X2
 273 U Sedraxis Specter @Cole Eastburn
 274 M Sedris, the Traitor King @Paul Bonner
 275 R Shattergang Brothers @Kev Walker
+276 R Sidisi, Brood Tyrant @Karl Kopinski
+277 R Skullbriar, the Walking Grave @Nils Hamm
 278 U Sprouting Thrinax @Jarreau Wimberly
+279 U Sultai Soothsayer @Cynthia Sheppard
 280 R Supreme Verdict @Sam Burley
 281 R Tariel, Reckoner of Souls @Wayne Reynolds
 282 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
@@ -172,11 +292,19 @@ ScryfallCode=2X2
 284 U Terminate @Lucas Graciano
 285 R Thistledown Liege @Adam Rex
 286 R Thousand-Year Storm @Dimitar Marinski
+287 R Thraximundar @Raymond Swanland
 288 U Tower Gargoyle @Matt Cavotta
+289 R Ulasht, the Hate Seed @Nottsuo
+290 M Uril, the Miststalker @Jaime Jones
+291 R Varina, Lich Queen @Igor Kieryluk
 292 R Villainous Wealth @Erica Yang
+293 R Wasitora, Nekoru Queen @Cynthia Sheppard
+294 R Wilt-Leaf Liege @Jason Chan
+295 C Winged Coatl @Izzy
 296 M Wrenn and Six @Chase Stone
 297 R Zur the Enchanter @Josu Hernaiz
 298 R Aether Vial @Karl Kopinski
+299 R Bloodforged Battle-Axe @Alayna Danner
 300 U Civic Saber @Jung Park
 301 U Coldsteel Heart @Mark Romanoski
 302 R Conqueror's Flail @Franz Vohwinkel
@@ -184,16 +312,21 @@ ScryfallCode=2X2
 304 R Darksteel Plate @Daniel Ljunggren
 305 U Dragon Arch @Dana Knutson
 306 U Firemind Vessel @Daniel Ljunggren
+307 U Livewire Lash @Daniel Ljunggren
 308 M Mana Vault @Christine Choi
+309 R Nim Deathmantle @Karl Kopinski
+310 R Panharmonicon @Volkan Baǵa
 311 R Phyrexian Altar @Yigit Koroglu
 312 R Pithing Needle @Anthony Palumbo
 313 R Planar Bridge @Chase Stone
 314 R Sensei's Divining Top @Michael Sutfin
 315 R Thrumming Stone @Rob Alexander
+316 C Traveler's Amulet @Franz Vohwinkel
 317 R Vedalken Orrery @John Avon
 318 U Azorius Chancery @John Avon
 319 U Boros Garrison @John Avon
 320 M Cavern of Souls @Richard Wright
+321 R City of Brass @Kirsten Zirngibl
 322 U Dimir Aqueduct @John Avon
 323 R Forbidden Orchard @Daniel Ljunggren
 324 U Golgari Rot Farm @John Avon
@@ -210,42 +343,64 @@ ScryfallCode=2X2
 335 M Emrakul, the Aeons Torn @Kev Walker
 336 M Kozilek, Butcher of Truth @Ian Miller
 337 M Ulamog, the Infinite Gyre @Thomas M. Baxa
+338 M Emiel the Blessed @Martina Pilcerova
+339 U Flickerwisp @Thomas M. Baxa
+340 U Mentor of the Meek @Alex Horley-Orlandelli
 341 C Seeker of the Way @Douglas Shuler
+342 R Smothering Tithe @Pete Venters
 343 R Teferi's Protection @Greg Staples
+344 U Wall of Omens @Dan Frazier
 345 M Consecrated Sphinx @Mark Zug
 346 R Force of Negation @Greg Hildebrandt
 347 R Gifts Ungiven @David O'Connor
 348 M Mana Drain @Chuck Lukacs
 349 U Mulldrifter @Jeff Miracola
+350 C Spell Pierce @Dermot Power
 351 C Thought Scour @Jeff Miracola
+352 U Blood Artist @Carl Critchlow
 353 R Damnation @Ian Miller
 354 M Imperial Seal @Mark Tedin
 355 U Inquisition of Kozilek @rk post
-357 C Unearth
+356 R Surgical Extraction @Thomas M. Baxa
+357 C Unearth @Jeff Miracola
 358 R Anger of the Gods @Dermot Power
 359 R Chaos Warp @Phil Foglio
 360 M Dockside Extortionist @Douglas Shuler
 361 U Lightning Bolt @Chuck Lukacs
+362 C Monastery Swiftspear @Eric Velhagen
 363 M Seasoned Pyromancer @Steve Prescott
+364 U Young Pyromancer @Steve Prescott
 365 M Allosaurus Shepherd @Douglas Shuler
 366 R Bloom Tender @Scott M. Fischer
+367 M Concordant Crossroads @Mark Poole
 368 U Eternal Witness @Keith Garletts
 369 R Hardened Scales @Jim Nelson
-370 R Oracle of Mul Daya
+370 R Oracle of Mul Daya @Darrell Riche
 371 C Rampant Growth @Jeff Miracola
+372 R Assassin's Trophy @Ron Spears
+373 U Bloodbraid Elf @Paolo Parente
+374 C Burning-Tree Emissary @Scott M. Fischer
+375 C Coiling Oracle @Richard Kane Ferguson
 376 M Dragonlord Dromoka @Richard Kane Ferguson
+377 M Elenda, the Dusk Rose @Richard Kane Ferguson
 378 R Glimpse the Unthinkable @Drew Tucker
 379 R Grand Arbiter Augustin IV @Greg Hildebrandt
 380 R Grim Flayer @Richard Kane Ferguson
+381 R Kolaghan's Command @Alex Horley-Orlandelli
+382 R Marchesa, the Black Rose @Richard Kane Ferguson
 383 R The Mimeoplasm @Mark Tedin
 384 M Muldrotha, the Gravetide @Eric Velhagen
-387 M Sedris, the Traitor King
+385 R Privileged Position @Donato Giancola
+386 C Qasali Pridemage @David O'Connor
+387 M Sedris, the Traitor King @Ian Miller
 388 R Supreme Verdict @Ron Spears
 389 U Terminate @Paolo Parente
 390 R Thousand-Year Storm @Donato Giancola
-391 R Aether Vial
+391 R Aether Vial @Greg Staples
+392 R Bloodforged Battle-Axe @Ron Spencer
 393 M Crucible of Worlds @Mark Zug
 394 M Mana Vault @Steve Prescott
+395 R Panharmonicon @Mark Poole
 396 R Phyrexian Altar @Pete Venters
 397 R Pithing Needle @Ron Spencer
 398 R Sensei's Divining Top @Greg Staples
@@ -253,12 +408,13 @@ ScryfallCode=2X2
 400 U Azorius Chancery @Carl Critchlow
 401 U Boros Garrison @Darrell Riche
 402 M Cavern of Souls @Drew Tucker
+403 R City of Brass @Mark Poole
 404 U Dimir Aqueduct @Mark Poole
 405 R Forbidden Orchard @Drew Tucker
 406 U Golgari Rot Farm @Donato Giancola
 407 U Gruul Turf @Ron Spencer
 408 U Izzet Boilerworks @Keith Garletts
-409 U Orzhov Basilica
+409 U Orzhov Basilica @Jim Nelson
 410 U Rakdos Carnarium @Thomas M. Baxa
 411 U Selesnya Sanctuary @Ron Spears
 412 U Simic Growth Chamber @Pete Venters
@@ -266,24 +422,37 @@ ScryfallCode=2X2
 414 M Kozilek, Butcher of Truth @Michael Komarck
 415 M Ulamog, the Infinite Gyre @Aleksi Briclot
 416 M Divine Visitation @Victor Adame Minguez
+417 M Emiel the Blessed @Antonio José Manzanedo
+418 R Leonin Arbiter @Shelly Wan
 419 R Mikaeus, the Lunarch @Steven Belledin
+420 M Monastery Mentor @Magali Villeneuve
+421 R Restoration Angel @Jake Murray
+422 R Reveillark @Jim Murray
+423 R Smothering Tithe @Mark Behm
 424 R Teferi's Protection @Chase Stone
 425 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
 426 M As Foretold @Tommy Arnold
 427 M Consecrated Sphinx @Mark Zug
+428 R Disciple of the Ring @Clint Cearley
 429 R Force of Negation @Paul Scott Canavan
 430 R Gifts Ungiven @Chris Rallis
 431 R Kederekt Leviathan @Mark Hyzer
 432 M Mana Drain @Raymond Swanland
 433 R Pull from Tomorrow @Sara Winters
+434 R Talrand, Sky Summoner @Svetlin Velinov
 435 R Venser, Shaper Savant @Aleksi Briclot
 436 M Bitterblossom @Rebecca Guay
 437 R Damnation @Kev Walker
+438 R Gravecrawler @Steven Belledin
 439 M Imperial Seal @Milivoj Ćeran
 440 M Liliana, the Last Hope @Jaime Jones
 441 R Necrotic Ooze @James Ryman
+442 R Ob Nixilis, Unshackled @Karl Kopinski
 443 R Oona's Prowler @Wayne Reynolds
+444 R Surgical Extraction @Steven Belledin
 445 R Yahenni, Undying Partisan @Lius Lasahido
+446 R Abbot of Keral Keep @Deruchenko Alexander
+447 R Alesha, Who Smiles at Death @Anastasia Ovchinnikova
 448 R Anger of the Gods @Yigit Koroglu
 449 R Backdraft Hellkite @Rudy Siswanto
 450 R Bedlam Reveler @Jama Jurabaev
@@ -291,8 +460,12 @@ ScryfallCode=2X2
 452 M Dockside Extortionist @Lie Setiawan
 453 R Greater Gargadon @Rob Alexander
 454 M Seasoned Pyromancer @Cynthia Sheppard
+455 R Twinflame @Chase Stone
+456 M Warrior's Oath @Eric Deschamps
 457 M Allosaurus Shepherd @Randy Vargas
 458 R Bloom Tender @Chippy
+459 M Concordant Crossroads @Alayna Danner
+460 M Food Chain @Daarken
 461 R Green Sun's Zenith @David Rapoza
 462 R Hardened Scales @Mark Winters
 463 R Impervious Greatwurm @Simon Dominic
@@ -304,33 +477,59 @@ ScryfallCode=2X2
 469 R Anguished Unmaking @Wesley Burt
 470 M Animar, Soul of Elements @Filip Burburan
 471 R Arjun, the Shifting Flame @Willian Murai
+472 R Ashen Rider @Chris Rahn
 473 R Ashenmoor Liege @Mark Zug
+474 R Assassin's Trophy @Seb McKinnon
 475 R Atarka's Command @Chris Rahn
 476 R Atla Palani, Nest Tender @Ekaterina Burmak
+477 M Aurelia, the Warleader @Slawomir Maniak
+478 R Balefire Liege @Ralph Horsley
 479 R Boartusk Liege @Jesper Ejsing
 480 R Bring to Light @Jonas De Ro
 481 R Child of Alara @Steve Argyle
 482 R Creakwood Liege @Cole Eastburn
 483 R Dack's Duplicate @Karl Kopinski
+484 R Dauntless Escort @Volkan Baǵa
+485 R Deathbringer Liege @Julie Dillon
+486 R Doran, the Siege Tower @Mark Zug
 487 M Dragonlord Dromoka @Eric Deschamps
+488 M Dragonlord Silumgar @Steven Belledin
+489 R Drogskol Reaver @Vincent Proce
 490 R Dromoka's Command @James Ryman
 491 M Elenda, the Dusk Rose @Chris Rahn
+492 R Elsha of the Infinite @G-host Lee
 493 R Empyrial Archangel @Greg Staples
 494 M Ezuri, Claw of Progress @James Ryman
 495 R Fiery Justice @Mathias Kollros
 496 R Figure of Destiny @Scott M. Fischer
+497 R Firesong and Sunspeaker @Zoltan Boros
 498 M Ghave, Guru of Spores @James Paick
 499 R Glen Elendra Liege @Kev Walker
 500 R Glimpse the Unthinkable @Brandon Kitkouski
 501 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
+502 R Grim Flayer @Mathias Kollros
+503 R Guided Passage @Alex Horley-Orlandelli
+504 M Hellkite Overlord @Justin Sweet
 505 R Hostage Taker @Wayne Reynolds
 506 R Hydroid Krasis @Jason Felix
+507 R Intet, the Dreamer @Dan Scott
+508 R Jeskai Ascendancy @Dan Scott
+509 R Jodah, Archmage Eternal @Yongjae Choi
+510 R Judith, the Scourge Diva @Wesley Burt
+511 M Kaalia of the Vast @Michael Komarck
 512 R Kaervek the Merciless @rk post
+513 R Kambal, Consul of Allocation @Vincent Proce
+514 M Karador, Ghost Chieftain @Todd Lockwood
+515 R Kolaghan's Command @Daarken
 516 R Lavalanche @Steve Argyle
 517 R Legion's Initiative @Jaime Jones
 518 M Lord of Extinction @Izzy
 519 R Magister Sphinx @Steven Belledin
+520 R Marchesa, the Black Rose @Matt Stewart
 521 R Master Biomancer @Willian Murai
+522 M Master of Cruelties @Chase Stone
+523 R Mathas, Fiend Seeker @Joe Slucher
+524 R Mayael's Aria @Steve Argyle
 525 R The Mimeoplasm @Svetlin Velinov
 526 R Mindwrack Liege @Richard Whitters
 527 M Mizzix of the Izmagnus @Cliff Childs
@@ -338,30 +537,47 @@ ScryfallCode=2X2
 529 R Murkfiend Liege @Carl Critchlow
 530 M Nicol Bolas, God-Pharaoh @Raymond Swanland
 531 R Phyrexian Tyranny @Kev Walker
+532 R Privileged Position @Wayne England
 533 R Prized Amalgam @Karl Kopinski
 534 R Rafiq of the Many @Michael Komarck
 535 R Roon of the Hidden Realm @Steve Prescott
 536 R Ruric Thar, the Unbowed @Tyler Jacobson
 537 M Sedris, the Traitor King @Paul Bonner
 538 R Shattergang Brothers @Kev Walker
+539 R Sidisi, Brood Tyrant @Karl Kopinski
+540 R Skullbriar, the Walking Grave @Nils Hamm
 541 R Supreme Verdict @Sam Burley
+542 R Tariel, Reckoner of Souls @Wayne Reynolds
 543 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
 544 R Thistledown Liege @Adam Rex
 545 R Thousand-Year Storm @Dimitar Marinski
+546 R Thraximundar @Raymond Swanland
+547 R Ulasht, the Hate Seed @Nottsuo
+548 M Uril, the Miststalker @Jaime Jones
+549 R Varina, Lich Queen @Igor Kieryluk
+550 R Villainous Wealth @Erica Yang
+551 R Wasitora, Nekoru Queen @Cynthia Sheppard
+552 R Wilt-Leaf Liege @Jason Chan
 553 M Wrenn and Six @Chase Stone
 554 R Zur the Enchanter @Josu Hernaiz
 555 R Aether Vial @Karl Kopinski
+556 R Bloodforged Battle-Axe @Alayna Danner
 557 R Conqueror's Flail @Franz Vohwinkel
 558 M Crucible of Worlds @Ron Spencer
 559 R Darksteel Plate @Daniel Ljunggren
 560 M Mana Vault @Christine Choi
+561 R Nim Deathmantle @Karl Kopinski
+562 R Panharmonicon @Volkan Baǵa
 563 R Phyrexian Altar @Yigit Koroglu
 564 R Pithing Needle @Anthony Palumbo
+565 R Planar Bridge @Chase Stone
 566 R Sensei's Divining Top @Michael Sutfin
 567 R Thrumming Stone @Rob Alexander
 568 R Vedalken Orrery @John Avon
 569 M Cavern of Souls @Richard Wright
+570 R City of Brass @Kirsten Zirngibl
 571 R Forbidden Orchard @Daniel Ljunggren
+572 R Pillar of the Paruns @Dany Orizio
 573 M Liliana, the Last Hope @Scott M. Fischer
 574 M Wrenn and Six @Donato Giancola
 575 M Emrakul, the Aeons Torn @Kev Walker
@@ -369,3 +585,26 @@ ScryfallCode=2X2
 577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
 578 R Weathered Wayfarer @Dermot Power
 579 R Bring to Light @Mark Poole
+
+[tokens]
+c_1_1_eldrazi_scion_sac
+c_1_1_spirit
+w_4_4_angel_flying_vigilance
+w_2_2_knight_vigilance
+w_1_1_monk_prowess
+w_1_1_soldier
+w_1_1_spirit_flying
+w_1_1_vampire_lifelink
+u_2_2_drake_flying
+b_1_1_faerie_rogue_flying
+b_2_2_zombie
+r_1_1_elemental
+g_4_4_bear
+g_3_3_boar
+g_0_1_egg_defender
+g_1_1_saproling
+g_1_2_spider_reach
+brg_3_3_cat_dragon_flying
+bg_1_1_worm
+c_3_3_a_phyrexian_golem
+c_a_treasure_sac

From b415f0781c06556c5f29e2e05b639c60d1c7c6b2 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 08:33:33 +0100
Subject: [PATCH 089/309] 2X2 edition update

---
 .../res/editions/Double Masters 2022.txt      | 239 ++++++++++++++++++
 1 file changed, 239 insertions(+)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 56562e253a1..9c951db2ff3 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -11,50 +11,102 @@ ScryfallCode=2X2
 3 M Ulamog, the Infinite Gyre @Aleksi Briclot
 4 U Abzan Falconer @Steven Belledin
 5 C Ainok Bond-Kin @Chris Rahn
+6 C Anointer of Valor @Antonio José Manzanedo
+7 C Battlefield Promotion @Scott Murphy
 8 M Divine Visitation @Victor Adame Minguez
 9 C Doomed Traveler @Lars Grant-West
+10 M Emiel the Blessed @Antonio José Manzanedo
+11 U Flickerwisp @Jeremy Enecio
 12 C Gods Willing @Mark Winters
+13 C Hyena Umbra @Howard Lyon
+14 C Knightly Valor @Matt Stewart
+15 C Last Breath @Christina Davis
+16 R Leonin Arbiter @Shelly Wan
+17 U Mentor of the Meek @Jana Schirmer & Johannes Voss
 18 R Mikaeus, the Lunarch @Steven Belledin
+19 C Militia Bugler @David Gaillet
 20 C Momentary Blink @Evan Shipard
+21 M Monastery Mentor @Magali Villeneuve
 22 U Myth Realized @Jason Rainville
 23 U Path to Exile @Raf Sarmento
+24 C Relief Captain @Anastasia Ovchinnikova
+25 R Restoration Angel @Jake Murray
+26 R Reveillark @Jim Murray
+27 U Scale Blessing @Matt Stewart
 28 C Seeker of the Way @Craig J Spearing
+29 C Sensor Splicer @Izzy
 30 C Settle Beyond Reality @Anthony Palumbo
+31 R Smothering Tithe @Mark Behm
 32 R Teferi's Protection @Chase Stone
+33 U Wall of Omens @James Paick
 34 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
 35 C Wingsteed Rider @Cynthia Sheppard
 36 C Advanced Stitchwing @Johann Bodin
 37 C Aethersnipe @Zoltan Boros & Gabor Szikszai
 38 M As Foretold @Tommy Arnold
+39 C Aven Initiate @Jakub Kasper
 40 U Body Double @Winona Nelson
+41 U Breakthrough @Raymond Swanland
+42 C Capture Sphere @Mark Behm
 43 M Consecrated Sphinx @Mark Zug
 44 C Deep Analysis @Jesper Ejsing
+45 C Deranged Assistant @Nils Hamm
+46 R Disciple of the Ring @Clint Cearley
 47 U Domestication @Jesper Ejsing
+48 C Eel Umbra @Howard Lyon
+49 C Forbidden Alchemy @David Rapoza
 50 R Force of Negation @Paul Scott Canavan
 51 R Gifts Ungiven @Chris Rallis
 52 C Ingenious Skaab @Jesper Ejsing
+53 C Jeskai Elder @Craig J Spearing
+54 C Kasmina's Transmutation @Uriah Voth
 55 R Kederekt Leviathan @Mark Hyzer
+56 C Makeshift Mauler @James Ryman
 57 M Mana Drain @Raymond Swanland
+58 C Mana Leak @Howard Lyon
 59 U Mistfire Adept @Clint Cearley
 60 U Mulldrifter @Eric Fortune
+61 U Nephalia Smuggler @Matt Stewart
 62 R Pull from Tomorrow @Sara Winters
+63 C Spell Pierce @Vance Kovacs
+64 R Talrand, Sky Summoner @Svetlin Velinov
 65 C Thought Scour @Julie Dillon
 66 R Venser, Shaper Savant @Aleksi Briclot
 67 U Wash Out @Steven Belledin
 68 C Balustrade Spy @Jaime Jones
 69 M Bitterblossom @Rebecca Guay
+70 U Blood Artist @LA Draws
+71 C Bloodflow Connoisseur @Slawomir Maniak
+72 U Carrier Thrall @Lius Lasahido
 73 R Damnation @Kev Walker
+74 C Disfigure @Justin Sweet
 75 C Eyeblight's Ending @Ron Spears
 76 U Go for the Throat @David Rapoza
+77 U Graveblade Marauder @Jason Rainville
+78 R Gravecrawler @Steven Belledin
 79 M Imperial Seal @Milivoj Ćeran
 80 U Inquisition of Kozilek @Tomasz Jedruszek
 81 M Liliana, the Last Hope @Jaime Jones
+82 C Liliana's Elite @Deruchenko Alexander
 83 R Necrotic Ooze @James Ryman
+84 R Ob Nixilis, Unshackled @Karl Kopinski
 85 R Oona's Prowler @Wayne Reynolds
+86 U Scion of Darkness @Mark Zug
 87 C Seekers' Squire @Anthony Palumbo
+88 C Severed Strands @Zack Stella
+89 C Shadowborn Apostle @Lucas Graciano
+90 C Skeleton Archer @Randy Vargas
+91 U Skinrender @David Rapoza
+92 C Strands of Undeath @Dave Allsop
+93 C Supernatural Stamina @Christopher Moeller
+94 R Surgical Extraction @Steven Belledin
+95 U Unburial Rites @Ryan Pancoast
 96 C Unearth @Jehan Choo
 97 C Vampire Sovereign @Volkan Baǵa
+98 U Vampiric Rites @Anastasia Ovchinnikova
 99 R Yahenni, Undying Partisan @Lius Lasahido
+100 R Abbot of Keral Keep @Deruchenko Alexander
+101 R Alesha, Who Smiles at Death @Anastasia Ovchinnikova
 102 R Anger of the Gods @Yigit Koroglu
 103 R Backdraft Hellkite @Rudy Siswanto
 104 R Bedlam Reveler @Jama Jurabaev
@@ -62,100 +114,165 @@ ScryfallCode=2X2
 106 C Dark-Dweller Oracle @Deruchenko Alexander
 107 M Dockside Extortionist @Lie Setiawan
 108 U Dreamshaper Shaman @Steve Prescott
+109 C Fiery Fall @Daarken
+110 U Goblin Banneret @Viktor Titov
 111 R Greater Gargadon @Rob Alexander
 112 C Hero of the Games @Josh Hass
+113 C Hissing Iguanar @Brandon Kitkouski
+114 C Kruin Striker @Christopher Moeller
 115 U Labyrinth Champion @Chase Stone
+116 C Lava Coil @Wesley Burt
 117 U Lightning Bolt @Christopher Moeller
+118 U Living Lightning @Caio Monteiro
+119 C Monastery Swiftspear @Steve Argyle
 120 C Pirate's Pillage @Wayne Reynolds
+121 C Purphoros's Emissary @Sam Burley
 122 C Rift Bolt @Daniel Ljunggren
 123 M Seasoned Pyromancer @Cynthia Sheppard
+124 C Sparkmage's Gambit @Mathias Kollros
+125 U Staggershock @Raymond Swanland
 126 C Storm Fleet Pyromancer @Kieran Yanner
 127 U Surreal Memoir @Jaime Jones
+128 C Titan's Strength @Karl Kopinski
+129 R Twinflame @Chase Stone
+130 M Warrior's Oath @Eric Deschamps
+131 U Young Pyromancer @Cynthia Sheppard
 132 M Allosaurus Shepherd @Randy Vargas
+133 C Ambuscade @Kev Walker
 134 C Annoyed Altisaur @Lars Grant-West
 135 U Arachnus Spinner @Karl Kopinski
 136 C Arachnus Web @Karl Kopinski
+137 U Biogenic Upgrade @Tomasz Jedruszek
 138 R Bloom Tender @Chippy
 139 C Brindle Shoat @Steven Belledin
 140 U Centaur Battlemaster @Kev Walker
+141 M Concordant Crossroads @Alayna Danner
+142 C Deadly Recluse @Warren Mahy
 143 U Devoted Druid @Kimonas Theodossiou
 144 C Elvish Rejuvenator @Winona Nelson
 145 U Eternal Witness @Chris Rahn
 146 C Experiment One @Jack Wang
+147 M Food Chain @Daarken
 148 C Gnarlback Rhino @YW Tang
+149 C Grapple with the Past @Howard Lyon
 150 R Green Sun's Zenith @David Rapoza
 151 R Hardened Scales @Mark Winters
 152 R Impervious Greatwurm @Simon Dominic
+153 C Might of Old Krosa @Lars Grant-West
 154 R Oracle of Mul Daya @Vance Kovacs
 155 C Rampant Growth @Scott M. Fischer
+156 U Rancor @Kev Walker
 157 R Rishkar, Peema Renegade @Todd Lockwood
 158 U Spider Spawning @Daniel Ljunggren
 159 R Splinterfright @Eric Deschamps
+160 U Summer Bloom @Ernanda Souza
 161 C Thrive @Daren Bader
 162 U Travel Preparations @Vincent Proce
 163 C Tuskguard Captain @Aaron Miller
 164 C Webweaver Changeling @Nicholas Gregory
 165 R Abzan Ascendancy @Mark Winters
 166 U Abzan Charm @Mathias Kollros
+167 U Aethermage's Touch @Randy Gallegos
+168 C Agony Warp @Dave Allsop
 169 M Aminatou, the Fateshifter @Seb McKinnon
 170 R Anguished Unmaking @Wesley Burt
 171 M Animar, Soul of Elements @Filip Burburan
 172 R Arjun, the Shifting Flame @Willian Murai
+173 R Ashen Rider @Chris Rahn
 174 R Ashenmoor Liege @Mark Zug
+175 R Assassin's Trophy @Seb McKinnon
 176 R Atarka's Command @Chris Rahn
 177 R Atla Palani, Nest Tender @Ekaterina Burmak
+178 C Auger Spree @Raymond Swanland
+179 M Aurelia, the Warleader @Slawomir Maniak
+180 R Balefire Liege @Ralph Horsley
 181 U Bant Charm @Randy Gallegos
 182 U Bear's Companion @Winona Nelson
 183 U Blazing Hellhound @Eric Velhagen
+184 U Bloodbraid Elf @Raymond Swanland
 185 C Bloodwater Entity @Viktor Titov
 186 R Boartusk Liege @Jesper Ejsing
 187 U Bounty of the Luxa @Jonas De Ro
 188 R Bring to Light @Jonas De Ro
+189 C Burning-Tree Emissary @Izzy
+190 C Call to the Feast @Yongjae Choi
 191 C Cartel Aristocrat @James Ryman
 192 R Child of Alara @Steve Argyle
 193 C Chronicler of Heroes @John Stanko
+194 C Coiling Oracle @Mark Zug
 195 U Conclave Mentor @Raoul Vitale
 196 U Crackling Doom @Yohann Schepacz
 197 R Creakwood Liege @Cole Eastburn
 198 R Dack's Duplicate @Karl Kopinski
 199 R Dauntless Escort @Volkan Baǵa
+200 R Deathbringer Liege @Julie Dillon
+201 R Doran, the Siege Tower @Mark Zug
 202 M Dragonlord Dromoka @Eric Deschamps
+203 M Dragonlord Silumgar @Steven Belledin
 204 C Dreg Mangler @Svetlin Velinov
 205 R Drogskol Reaver @Vincent Proce
 206 R Dromoka's Command @James Ryman
 207 M Elenda, the Dusk Rose @Chris Rahn
+208 R Elsha of the Infinite @G-host Lee
 209 R Empyrial Archangel @Greg Staples
+210 U Extract from Darkness @Dallas Williams
 211 M Ezuri, Claw of Progress @James Ryman
 212 R Fiery Justice @Mathias Kollros
+213 R Figure of Destiny @Scott M. Fischer
 214 C Fireblade Artist @Steve Argyle
+215 R Firesong and Sunspeaker @Zoltan Boros
 216 M Ghave, Guru of Spores @James Paick
 217 R Glen Elendra Liege @Kev Walker
 218 R Glimpse the Unthinkable @Brandon Kitkouski
 219 U Gloryscale Viashino @Volkan Baǵa
+220 C Glowspore Shaman @Lars Grant-West
 221 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
 222 R Grim Flayer @Mathias Kollros
+223 C Ground Assault @Karl Kopinski
 224 R Guided Passage @Alex Horley-Orlandelli
+225 M Hellkite Overlord @Justin Sweet
 226 U Heroic Reinforcements @Scott Murphy
 227 R Hostage Taker @Wayne Reynolds
 228 R Hydroid Krasis @Jason Felix
+229 R Intet, the Dreamer @Dan Scott
+230 C Izzet Charm @Zoltan Boros
+231 R Jeskai Ascendancy @Dan Scott
+232 U Jeskai Charm @Mathias Kollros
+233 R Jodah, Archmage Eternal @Yongjae Choi
+234 R Judith, the Scourge Diva @Wesley Burt
+235 M Kaalia of the Vast @Michael Komarck
 236 R Kaervek the Merciless @rk post
+237 R Kambal, Consul of Allocation @Vincent Proce
 238 M Karador, Ghost Chieftain @Todd Lockwood
+239 R Kolaghan's Command @Daarken
 240 R Lavalanche @Steve Argyle
+241 U League Guildmage @Svetlin Velinov
 242 R Legion's Initiative @Jaime Jones
+243 U Lightning Helix @Raymond Swanland
 244 M Lord of Extinction @Izzy
 245 U Lotleth Troll @Vincent Proce
+246 U Lyev Skyknight @Johannes Voss
 247 R Magister Sphinx @Steven Belledin
+248 R Marchesa, the Black Rose @Matt Stewart
 249 C Martial Glory @Raymond Swanland
 250 R Master Biomancer @Willian Murai
+251 M Master of Cruelties @Chase Stone
+252 R Mathas, Fiend Seeker @Joe Slucher
+253 R Mayael's Aria @Steve Argyle
 254 R The Mimeoplasm @Svetlin Velinov
 255 R Mindwrack Liege @Richard Whitters
+256 U Mistmeadow Witch @Greg Staples
 257 M Mizzix of the Izmagnus @Cliff Childs
 258 M Muldrotha, the Gravetide @Jason Rainville
 259 R Murkfiend Liege @Carl Critchlow
 260 M Nicol Bolas, God-Pharaoh @Raymond Swanland
+261 U Orzhov Pontiff @Adam Rex
 262 R Phyrexian Tyranny @Kev Walker
+263 R Privileged Position @Wayne England
 264 R Prized Amalgam @Karl Kopinski
+265 U Prophetic Bolt @Slawomir Maniak
 266 U Psychic Symbiont @Robbie Trevino
+267 C Qasali Pridemage @Chris Rahn
 268 R Rafiq of the Many @Michael Komarck
 269 U River Hoopoe @Ryan Pancoast
 270 R Roon of the Hidden Realm @Steve Prescott
@@ -164,7 +281,10 @@ ScryfallCode=2X2
 273 U Sedraxis Specter @Cole Eastburn
 274 M Sedris, the Traitor King @Paul Bonner
 275 R Shattergang Brothers @Kev Walker
+276 R Sidisi, Brood Tyrant @Karl Kopinski
+277 R Skullbriar, the Walking Grave @Nils Hamm
 278 U Sprouting Thrinax @Jarreau Wimberly
+279 U Sultai Soothsayer @Cynthia Sheppard
 280 R Supreme Verdict @Sam Burley
 281 R Tariel, Reckoner of Souls @Wayne Reynolds
 282 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
@@ -172,11 +292,19 @@ ScryfallCode=2X2
 284 U Terminate @Lucas Graciano
 285 R Thistledown Liege @Adam Rex
 286 R Thousand-Year Storm @Dimitar Marinski
+287 R Thraximundar @Raymond Swanland
 288 U Tower Gargoyle @Matt Cavotta
+289 R Ulasht, the Hate Seed @Nottsuo
+290 M Uril, the Miststalker @Jaime Jones
+291 R Varina, Lich Queen @Igor Kieryluk
 292 R Villainous Wealth @Erica Yang
+293 R Wasitora, Nekoru Queen @Cynthia Sheppard
+294 R Wilt-Leaf Liege @Jason Chan
+295 C Winged Coatl @Izzy
 296 M Wrenn and Six @Chase Stone
 297 R Zur the Enchanter @Josu Hernaiz
 298 R Aether Vial @Karl Kopinski
+299 R Bloodforged Battle-Axe @Alayna Danner
 300 U Civic Saber @Jung Park
 301 U Coldsteel Heart @Mark Romanoski
 302 R Conqueror's Flail @Franz Vohwinkel
@@ -184,16 +312,21 @@ ScryfallCode=2X2
 304 R Darksteel Plate @Daniel Ljunggren
 305 U Dragon Arch @Dana Knutson
 306 U Firemind Vessel @Daniel Ljunggren
+307 U Livewire Lash @Daniel Ljunggren
 308 M Mana Vault @Christine Choi
+309 R Nim Deathmantle @Karl Kopinski
+310 R Panharmonicon @Volkan Baǵa
 311 R Phyrexian Altar @Yigit Koroglu
 312 R Pithing Needle @Anthony Palumbo
 313 R Planar Bridge @Chase Stone
 314 R Sensei's Divining Top @Michael Sutfin
 315 R Thrumming Stone @Rob Alexander
+316 C Traveler's Amulet @Franz Vohwinkel
 317 R Vedalken Orrery @John Avon
 318 U Azorius Chancery @John Avon
 319 U Boros Garrison @John Avon
 320 M Cavern of Souls @Richard Wright
+321 R City of Brass @Kirsten Zirngibl
 322 U Dimir Aqueduct @John Avon
 323 R Forbidden Orchard @Daniel Ljunggren
 324 U Golgari Rot Farm @John Avon
@@ -210,42 +343,64 @@ ScryfallCode=2X2
 335 M Emrakul, the Aeons Torn @Kev Walker
 336 M Kozilek, Butcher of Truth @Ian Miller
 337 M Ulamog, the Infinite Gyre @Thomas M. Baxa
+338 M Emiel the Blessed @Martina Pilcerova
+339 U Flickerwisp @Thomas M. Baxa
+340 U Mentor of the Meek
 341 C Seeker of the Way @Douglas Shuler
+342 R Smothering Tithe
 343 R Teferi's Protection @Greg Staples
+344 U Wall of Omens @Dan Frazier
 345 M Consecrated Sphinx @Mark Zug
 346 R Force of Negation @Greg Hildebrandt
 347 R Gifts Ungiven @David O'Connor
 348 M Mana Drain @Chuck Lukacs
 349 U Mulldrifter @Jeff Miracola
+350 C Spell Pierce @Dermot Power
 351 C Thought Scour @Jeff Miracola
+352 U Blood Artist @Carl Critchlow
 353 R Damnation @Ian Miller
 354 M Imperial Seal @Mark Tedin
 355 U Inquisition of Kozilek @rk post
+356 R Surgical Extraction @Thomas M. Baxa
 357 C Unearth
 358 R Anger of the Gods @Dermot Power
 359 R Chaos Warp @Phil Foglio
 360 M Dockside Extortionist @Douglas Shuler
 361 U Lightning Bolt @Chuck Lukacs
+362 C Monastery Swiftspear @Eric Velhagen
 363 M Seasoned Pyromancer @Steve Prescott
+364 U Young Pyromancer @Steve Prescott
 365 M Allosaurus Shepherd @Douglas Shuler
 366 R Bloom Tender @Scott M. Fischer
+367 M Concordant Crossroads @Mark Poole
 368 U Eternal Witness @Keith Garletts
 369 R Hardened Scales @Jim Nelson
 370 R Oracle of Mul Daya
 371 C Rampant Growth @Jeff Miracola
+372 R Assassin's Trophy @Ron Spears
+373 U Bloodbraid Elf @Paolo Parente
+374 C Burning-Tree Emissary
+375 C Coiling Oracle @Richard Kane Ferguson
 376 M Dragonlord Dromoka @Richard Kane Ferguson
+377 M Elenda, the Dusk Rose @Richard Kane Ferguson
 378 R Glimpse the Unthinkable @Drew Tucker
 379 R Grand Arbiter Augustin IV @Greg Hildebrandt
 380 R Grim Flayer @Richard Kane Ferguson
+381 R Kolaghan's Command @Alex Horley-Orlandelli
+382 R Marchesa, the Black Rose @Richard Kane Ferguson
 383 R The Mimeoplasm @Mark Tedin
 384 M Muldrotha, the Gravetide @Eric Velhagen
+385 R Privileged Position @Donato Giancola
+386 C Qasali Pridemage
 387 M Sedris, the Traitor King
 388 R Supreme Verdict @Ron Spears
 389 U Terminate @Paolo Parente
 390 R Thousand-Year Storm @Donato Giancola
 391 R Aether Vial
+392 R Bloodforged Battle-Axe @Ron Spencer
 393 M Crucible of Worlds @Mark Zug
 394 M Mana Vault @Steve Prescott
+395 R Panharmonicon
 396 R Phyrexian Altar @Pete Venters
 397 R Pithing Needle @Ron Spencer
 398 R Sensei's Divining Top @Greg Staples
@@ -253,6 +408,7 @@ ScryfallCode=2X2
 400 U Azorius Chancery @Carl Critchlow
 401 U Boros Garrison @Darrell Riche
 402 M Cavern of Souls @Drew Tucker
+403 R City of Brass
 404 U Dimir Aqueduct @Mark Poole
 405 R Forbidden Orchard @Drew Tucker
 406 U Golgari Rot Farm @Donato Giancola
@@ -266,24 +422,37 @@ ScryfallCode=2X2
 414 M Kozilek, Butcher of Truth @Michael Komarck
 415 M Ulamog, the Infinite Gyre @Aleksi Briclot
 416 M Divine Visitation @Victor Adame Minguez
+417 M Emiel the Blessed @Antonio José Manzanedo
+418 R Leonin Arbiter @Shelly Wan
 419 R Mikaeus, the Lunarch @Steven Belledin
+420 M Monastery Mentor @Magali Villeneuve
+421 R Restoration Angel @Jake Murray
+422 R Reveillark @Jim Murray
+423 R Smothering Tithe @Mark Behm
 424 R Teferi's Protection @Chase Stone
 425 R Weathered Wayfarer @Greg Hildebrandt & Tim Hildebrandt
 426 M As Foretold @Tommy Arnold
 427 M Consecrated Sphinx @Mark Zug
+428 R Disciple of the Ring @Clint Cearley
 429 R Force of Negation @Paul Scott Canavan
 430 R Gifts Ungiven @Chris Rallis
 431 R Kederekt Leviathan @Mark Hyzer
 432 M Mana Drain @Raymond Swanland
 433 R Pull from Tomorrow @Sara Winters
+434 R Talrand, Sky Summoner @Svetlin Velinov
 435 R Venser, Shaper Savant @Aleksi Briclot
 436 M Bitterblossom @Rebecca Guay
 437 R Damnation @Kev Walker
+438 R Gravecrawler @Steven Belledin
 439 M Imperial Seal @Milivoj Ćeran
 440 M Liliana, the Last Hope @Jaime Jones
 441 R Necrotic Ooze @James Ryman
+442 R Ob Nixilis, Unshackled @Karl Kopinski
 443 R Oona's Prowler @Wayne Reynolds
+444 R Surgical Extraction @Steven Belledin
 445 R Yahenni, Undying Partisan @Lius Lasahido
+446 R Abbot of Keral Keep @Deruchenko Alexander
+447 R Alesha, Who Smiles at Death @Anastasia Ovchinnikova
 448 R Anger of the Gods @Yigit Koroglu
 449 R Backdraft Hellkite @Rudy Siswanto
 450 R Bedlam Reveler @Jama Jurabaev
@@ -291,8 +460,12 @@ ScryfallCode=2X2
 452 M Dockside Extortionist @Lie Setiawan
 453 R Greater Gargadon @Rob Alexander
 454 M Seasoned Pyromancer @Cynthia Sheppard
+455 R Twinflame @Chase Stone
+456 M Warrior's Oath @Eric Deschamps
 457 M Allosaurus Shepherd @Randy Vargas
 458 R Bloom Tender @Chippy
+459 M Concordant Crossroads @Alayna Danner
+460 M Food Chain @Daarken
 461 R Green Sun's Zenith @David Rapoza
 462 R Hardened Scales @Mark Winters
 463 R Impervious Greatwurm @Simon Dominic
@@ -304,33 +477,59 @@ ScryfallCode=2X2
 469 R Anguished Unmaking @Wesley Burt
 470 M Animar, Soul of Elements @Filip Burburan
 471 R Arjun, the Shifting Flame @Willian Murai
+472 R Ashen Rider @Chris Rahn
 473 R Ashenmoor Liege @Mark Zug
+474 R Assassin's Trophy @Seb McKinnon
 475 R Atarka's Command @Chris Rahn
 476 R Atla Palani, Nest Tender @Ekaterina Burmak
+477 M Aurelia, the Warleader @Slawomir Maniak
+478 R Balefire Liege @Ralph Horsley
 479 R Boartusk Liege @Jesper Ejsing
 480 R Bring to Light @Jonas De Ro
 481 R Child of Alara @Steve Argyle
 482 R Creakwood Liege @Cole Eastburn
 483 R Dack's Duplicate @Karl Kopinski
+484 R Dauntless Escort @Volkan Baǵa
+485 R Deathbringer Liege @Julie Dillon
+486 R Doran, the Siege Tower @Mark Zug
 487 M Dragonlord Dromoka @Eric Deschamps
+488 M Dragonlord Silumgar @Steven Belledin
+489 R Drogskol Reaver @Vincent Proce
 490 R Dromoka's Command @James Ryman
 491 M Elenda, the Dusk Rose @Chris Rahn
+492 R Elsha of the Infinite @G-host Lee
 493 R Empyrial Archangel @Greg Staples
 494 M Ezuri, Claw of Progress @James Ryman
 495 R Fiery Justice @Mathias Kollros
 496 R Figure of Destiny @Scott M. Fischer
+497 R Firesong and Sunspeaker @Zoltan Boros
 498 M Ghave, Guru of Spores @James Paick
 499 R Glen Elendra Liege @Kev Walker
 500 R Glimpse the Unthinkable @Brandon Kitkouski
 501 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
+502 R Grim Flayer @Mathias Kollros
+503 R Guided Passage @Alex Horley-Orlandelli
+504 M Hellkite Overlord @Justin Sweet
 505 R Hostage Taker @Wayne Reynolds
 506 R Hydroid Krasis @Jason Felix
+507 R Intet, the Dreamer @Dan Scott
+508 R Jeskai Ascendancy @Dan Scott
+509 R Jodah, Archmage Eternal @Yongjae Choi
+510 R Judith, the Scourge Diva @Wesley Burt
+511 M Kaalia of the Vast @Michael Komarck
 512 R Kaervek the Merciless @rk post
+513 R Kambal, Consul of Allocation @Vincent Proce
+514 M Karador, Ghost Chieftain @Todd Lockwood
+515 R Kolaghan's Command @Daarken
 516 R Lavalanche @Steve Argyle
 517 R Legion's Initiative @Jaime Jones
 518 M Lord of Extinction @Izzy
 519 R Magister Sphinx @Steven Belledin
+520 R Marchesa, the Black Rose @Matt Stewart
 521 R Master Biomancer @Willian Murai
+522 M Master of Cruelties @Chase Stone
+523 R Mathas, Fiend Seeker @Joe Slucher
+524 R Mayael's Aria @Steve Argyle
 525 R The Mimeoplasm @Svetlin Velinov
 526 R Mindwrack Liege @Richard Whitters
 527 M Mizzix of the Izmagnus @Cliff Childs
@@ -338,30 +537,47 @@ ScryfallCode=2X2
 529 R Murkfiend Liege @Carl Critchlow
 530 M Nicol Bolas, God-Pharaoh @Raymond Swanland
 531 R Phyrexian Tyranny @Kev Walker
+532 R Privileged Position @Wayne England
 533 R Prized Amalgam @Karl Kopinski
 534 R Rafiq of the Many @Michael Komarck
 535 R Roon of the Hidden Realm @Steve Prescott
 536 R Ruric Thar, the Unbowed @Tyler Jacobson
 537 M Sedris, the Traitor King @Paul Bonner
 538 R Shattergang Brothers @Kev Walker
+539 R Sidisi, Brood Tyrant @Karl Kopinski
+540 R Skullbriar, the Walking Grave @Nils Hamm
 541 R Supreme Verdict @Sam Burley
+542 R Tariel, Reckoner of Souls @Wayne Reynolds
 543 R Teneb, the Harvester @Zoltan Boros & Gabor Szikszai
 544 R Thistledown Liege @Adam Rex
 545 R Thousand-Year Storm @Dimitar Marinski
+546 R Thraximundar @Raymond Swanland
+547 R Ulasht, the Hate Seed @Nottsuo
+548 M Uril, the Miststalker @Jaime Jones
+549 R Varina, Lich Queen @Igor Kieryluk
+550 R Villainous Wealth @Erica Yang
+551 R Wasitora, Nekoru Queen @Cynthia Sheppard
+552 R Wilt-Leaf Liege @Jason Chan
 553 M Wrenn and Six @Chase Stone
 554 R Zur the Enchanter @Josu Hernaiz
 555 R Aether Vial @Karl Kopinski
+556 R Bloodforged Battle-Axe @Alayna Danner
 557 R Conqueror's Flail @Franz Vohwinkel
 558 M Crucible of Worlds @Ron Spencer
 559 R Darksteel Plate @Daniel Ljunggren
 560 M Mana Vault @Christine Choi
+561 R Nim Deathmantle @Karl Kopinski
+562 R Panharmonicon @Volkan Baǵa
 563 R Phyrexian Altar @Yigit Koroglu
 564 R Pithing Needle @Anthony Palumbo
+565 R Planar Bridge @Chase Stone
 566 R Sensei's Divining Top @Michael Sutfin
 567 R Thrumming Stone @Rob Alexander
 568 R Vedalken Orrery @John Avon
 569 M Cavern of Souls @Richard Wright
+570 R City of Brass @Kirsten Zirngibl
 571 R Forbidden Orchard @Daniel Ljunggren
+572 R Pillar of the Paruns @Dany Orizio
 573 M Liliana, the Last Hope @Scott M. Fischer
 574 M Wrenn and Six @Donato Giancola
 575 M Emrakul, the Aeons Torn @Kev Walker
@@ -369,3 +585,26 @@ ScryfallCode=2X2
 577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
 578 R Weathered Wayfarer @Dermot Power
 579 R Bring to Light @Mark Poole
+
+[tokens]
+b_1_1_faerie_rogue_flying
+b_2_2_zombie
+bg_1_1_worm
+brg_3_3_cat_dragon_flying
+c_1_1_eldrazi_scion_sac
+c_1_1_spirit
+c_3_3_a_phyrexian_golem
+c_a_treasure_sac
+g_0_1_egg_defender
+g_1_1_saproling
+g_1_2_spider_reach
+g_3_3_boar
+g_4_4_bear
+r_1_1_elemental
+u_2_2_drake_flying
+w_1_1_monk_prowess
+w_1_1_soldier
+w_1_1_spirit_flying
+w_1_1_vampire_lifelink
+w_2_2_knight_vigilance
+w_4_4_angel_flying_vigilance

From 14fcb1107925230704e66583fa0466b9fe0f0317 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 08:49:35 +0100
Subject: [PATCH 090/309] 2X2 edition rarity fixes

---
 forge-gui/res/editions/Double Masters 2022.txt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 79c6d822721..37132457fee 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -29,7 +29,7 @@ ScryfallCode=2X2
 21 M Monastery Mentor @Magali Villeneuve
 22 U Myth Realized @Jason Rainville
 23 U Path to Exile @Raf Sarmento
-24 U Relief Captain @Anastasia Ovchinnikova
+24 C Relief Captain @Anastasia Ovchinnikova
 25 R Restoration Angel @Jake Murray
 26 R Reveillark @Jim Murray
 27 U Scale Blessing @Matt Stewart
@@ -54,7 +54,7 @@ ScryfallCode=2X2
 46 R Disciple of the Ring @Clint Cearley
 47 U Domestication @Jesper Ejsing
 48 C Eel Umbra @Howard Lyon
-49 U Forbidden Alchemy @David Rapoza
+49 C Forbidden Alchemy @David Rapoza
 50 R Force of Negation @Paul Scott Canavan
 51 R Gifts Ungiven @Chris Rallis
 52 C Ingenious Skaab @Jesper Ejsing
@@ -87,7 +87,7 @@ ScryfallCode=2X2
 79 M Imperial Seal @Milivoj Ćeran
 80 U Inquisition of Kozilek @Tomasz Jedruszek
 81 M Liliana, the Last Hope @Jaime Jones
-82 U Liliana's Elite @Deruchenko Alexander
+82 C Liliana's Elite @Deruchenko Alexander
 83 R Necrotic Ooze @James Ryman
 84 R Ob Nixilis, Unshackled @Karl Kopinski
 85 R Oona's Prowler @Wayne Reynolds
@@ -126,7 +126,7 @@ ScryfallCode=2X2
 118 U Living Lightning @Caio Monteiro
 119 C Monastery Swiftspear @Steve Argyle
 120 C Pirate's Pillage @Wayne Reynolds
-121 U Purphoros's Emissary @Sam Burley
+121 C Purphoros's Emissary @Sam Burley
 122 C Rift Bolt @Daniel Ljunggren
 123 M Seasoned Pyromancer @Cynthia Sheppard
 124 C Sparkmage's Gambit @Mathias Kollros
@@ -158,14 +158,14 @@ ScryfallCode=2X2
 150 R Green Sun's Zenith @David Rapoza
 151 R Hardened Scales @Mark Winters
 152 R Impervious Greatwurm @Simon Dominic
-153 U Might of Old Krosa @Lars Grant-West
+153 C Might of Old Krosa @Lars Grant-West
 154 R Oracle of Mul Daya @Vance Kovacs
 155 C Rampant Growth @Scott M. Fischer
 156 U Rancor @Kev Walker
 157 R Rishkar, Peema Renegade @Todd Lockwood
 158 U Spider Spawning @Daniel Ljunggren
 159 R Splinterfright @Eric Deschamps
-160 U Summer Bloom @Nicola Leonard
+160 U Summer Bloom @Ernanda Souza
 161 C Thrive @Daren Bader
 162 U Travel Preparations @Vincent Proce
 163 C Tuskguard Captain @Aaron Miller
@@ -228,7 +228,7 @@ ScryfallCode=2X2
 220 C Glowspore Shaman @Lars Grant-West
 221 R Grand Arbiter Augustin IV @Zoltan Boros & Gabor Szikszai
 222 R Grim Flayer @Mathias Kollros
-223 U Ground Assault @Karl Kopinski
+223 C Ground Assault @Karl Kopinski
 224 R Guided Passage @Alex Horley-Orlandelli
 225 M Hellkite Overlord @Justin Sweet
 226 U Heroic Reinforcements @Scott Murphy

From b601b106fcd5e37b86ca604a658ba24855bbaf45 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 13:56:00 +0100
Subject: [PATCH 091/309] 2X2 Booster Draft

---
 forge-gui/res/blockdata/blocks.txt            |   1 +
 forge-gui/res/draft/rankings.txt              | 332 +++++++++++++++++
 .../res/editions/Double Masters 2022.txt      | 352 ++++++++++++++++++
 3 files changed, 685 insertions(+)

diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt
index 22b4a41212d..5c43e3d2545 100644
--- a/forge-gui/res/blockdata/blocks.txt
+++ b/forge-gui/res/blockdata/blocks.txt
@@ -103,3 +103,4 @@ Innistrad: Crimson Vow, 3/6/VOW, VOW
 Innistrad: Double Feature, 3/6/MID, DBL
 Kamigawa: Neon Dynasty, 3/6/NEO, NEO
 Streets of New Capenna, 3/6/SNC, SNC
+Double Masters 2022, 3/6/2X2, 2X2
diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt
index 0b07b5683d2..8cd330b6202 100644
--- a/forge-gui/res/draft/rankings.txt
+++ b/forge-gui/res/draft/rankings.txt
@@ -1,4 +1,336 @@
 //Rank|Name|Rarity|Set
+#1|Consecrated Sphinx|M|2X2
+#2|Hydroid Krasis|R|2X2
+#3|Mana Drain|M|2X2
+#4|Liliana, the Last Hope|M|2X2
+#5|Dragonlord Dromoka|M|2X2
+#6|Dragonlord Silumgar|M|2X2
+#7|Emiel the Blessed|M|2X2
+#8|Restoration Angel|R|2X2
+#9|Hostage Taker|R|2X2
+#10|Bitterblossom|M|2X2
+#11|Supreme Verdict|R|2X2
+#12|Monastery Mentor|M|2X2
+#13|Mulldrifter|U|2X2
+#14|Damnation|R|2X2
+#15|Backdraft Hellkite|R|2X2
+#16|Seasoned Pyromancer|M|2X2
+#17|Oracle of Mul Daya|R|2X2
+#18|Ruric Thar, the Unbowed|R|2X2
+#19|Wasitora, Nekoru Queen|R|2X2
+#20|Mikaeus, the Lunarch|R|2X2
+#21|Unburial Rites|U|2X2
+#22|Lightning Bolt|U|2X2
+#23|Drogskol Reaver|R|2X2
+#24|Marchesa, the Black Rose|R|2X2
+#25|Mathas, Fiend Seeker|R|2X2
+#26|Rafiq of the Many|R|2X2
+#27|Roon of the Hidden Realm|R|2X2
+#28|Sidisi, Brood Tyrant|R|2X2
+#29|Intet, the Dreamer|R|2X2
+#30|Domestication|U|2X2
+#31|Talrand, Sky Summoner|R|2X2
+#32|Skinrender|U|2X2
+#33|Eternal Witness|U|2X2
+#34|Aminatou, the Fateshifter|M|2X2
+#35|Elsha of the Infinite|R|2X2
+#36|Lightning Helix|U|2X2
+#37|Varina, Lich Queen|R|2X2
+#38|Wilt-Leaf Liege|R|2X2
+#39|Mentor of the Meek|U|2X2
+#40|Disciple of the Ring|R|2X2
+#41|Rancor|U|2X2
+#42|Rishkar, Peema Renegade|R|2X2
+#43|Crackling Doom|U|2X2
+#44|Elenda, the Dusk Rose|M|2X2
+#45|Kolaghan's Command|R|2X2
+#46|Master Biomancer|R|2X2
+#47|Prophetic Bolt|U|2X2
+#48|Sedris, the Traitor King|M|2X2
+#49|Venser, Shaper Savant|R|2X2
+#50|Vampire Sovereign|C|2X2
+#51|Abbot of Keral Keep|R|2X2
+#52|Abzan Charm|U|2X2
+#53|Bloodbraid Elf|U|2X2
+#54|Fiery Justice|R|2X2
+#55|Grim Flayer|R|2X2
+#56|Judith, the Scourge Diva|R|2X2
+#57|Muldrotha, the Gravetide|M|2X2
+#58|Sedraxis Specter|U|2X2
+#59|Sprouting Thrinax|U|2X2
+#60|Teneb, the Harvester|R|2X2
+#61|Terminate|U|2X2
+#62|Militia Bugler|C|2X2
+#63|Reveillark|R|2X2
+#64|Go for the Throat|U|2X2
+#65|Bedlam Reveler|R|2X2
+#66|Young Pyromancer|U|2X2
+#67|Travel Preparations|U|2X2
+#68|Anguished Unmaking|R|2X2
+#69|Ashen Rider|R|2X2
+#70|Aurelia, the Warleader|M|2X2
+#71|Conclave Mentor|U|2X2
+#72|Creakwood Liege|R|2X2
+#73|Dromoka's Command|R|2X2
+#74|Figure of Destiny|R|2X2
+#75|Grand Arbiter Augustin IV|R|2X2
+#76|Heroic Reinforcements|U|2X2
+#77|Kaervek the Merciless|R|2X2
+#78|Kambal, Consul of Allocation|R|2X2
+#79|Lotleth Troll|U|2X2
+#80|Nicol Bolas, God-Pharaoh|M|2X2
+#81|Psychic Symbiont|U|2X2
+#82|Scab-Clan Giant|U|2X2
+#83|Uril, the Miststalker|M|2X2
+#84|Panharmonicon|R|2X2
+#85|Lava Coil|C|2X2
+#86|Coiling Oracle|C|2X2
+#87|Sultai Soothsayer|U|2X2
+#88|Flickerwisp|U|2X2
+#89|Path to Exile|U|2X2
+#90|Seeker of the Way|C|2X2
+#91|Wall of Omens|U|2X2
+#92|Graveblade Marauder|U|2X2
+#93|Yahenni, Undying Partisan|R|2X2
+#94|Alesha, Who Smiles at Death|R|2X2
+#95|Anger of the Gods|R|2X2
+#96|Bear's Companion|U|2X2
+#97|Bounty of the Luxa|U|2X2
+#98|Dack's Duplicate|R|2X2
+#99|Deathbringer Liege|R|2X2
+#100|Doran, the Siege Tower|R|2X2
+#101|Ezuri, Claw of Progress|M|2X2
+#102|Ghave, Guru of Spores|M|2X2
+#103|Jeskai Ascendancy|R|2X2
+#104|Lord of Extinction|M|2X2
+#105|Master of Cruelties|M|2X2
+#106|Tariel, Reckoner of Souls|R|2X2
+#107|Thraximundar|R|2X2
+#108|Tower Gargoyle|U|2X2
+#109|Mana Vault|M|2X2
+#110|Azorius Chancery|U|2X2
+#111|Boros Garrison|U|2X2
+#112|Dimir Aqueduct|U|2X2
+#113|Golgari Rot Farm|U|2X2
+#114|Gruul Turf|U|2X2
+#115|Izzet Boilerworks|U|2X2
+#116|Orzhov Basilica|U|2X2
+#117|Rakdos Carnarium|U|2X2
+#118|Selesnya Sanctuary|U|2X2
+#119|Simic Growth Chamber|U|2X2
+#120|Ground Assault|C|2X2
+#121|Abzan Falconer|U|2X2
+#122|Mana Leak|C|2X2
+#123|Mistfire Adept|U|2X2
+#124|Pull from Tomorrow|R|2X2
+#125|Oona's Prowler|R|2X2
+#126|Bloom Tender|R|2X2
+#127|Devoted Druid|U|2X2
+#128|Experiment One|C|2X2
+#129|Assassin's Trophy|R|2X2
+#130|Boartusk Liege|R|2X2
+#131|Dauntless Escort|R|2X2
+#132|Jeskai Charm|U|2X2
+#133|Lavalanche|R|2X2
+#134|Mistmeadow Witch|U|2X2
+#135|River Hoopoe|U|2X2
+#136|Shattergang Brothers|R|2X2
+#137|Wrenn and Six|M|2X2
+#138|Qasali Pridemage|C|2X2
+#139|Agony Warp|C|2X2
+#140|Settle Beyond Reality|C|2X2
+#141|Deep Analysis|C|2X2
+#142|Gifts Ungiven|R|2X2
+#143|Jeskai Elder|C|2X2
+#144|Eyeblight's Ending|C|2X2
+#145|Seekers' Squire|C|2X2
+#146|Dark-Dweller Oracle|C|2X2
+#147|Rift Bolt|C|2X2
+#148|Rampant Growth|C|2X2
+#149|Arjun, the Shifting Flame|R|2X2
+#150|Ashenmoor Liege|R|2X2
+#151|Atla Palani, Nest Tender|R|2X2
+#152|Blazing Hellhound|U|2X2
+#153|Bloodwater Entity|C|2X2
+#154|Chronicler of Heroes|C|2X2
+#155|Dreg Mangler|C|2X2
+#156|Extract from Darkness|U|2X2
+#157|Fireblade Artist|C|2X2
+#158|Glen Elendra Liege|R|2X2
+#159|Karador, Ghost Chieftain|M|2X2
+#160|Legion's Initiative|R|2X2
+#161|Murkfiend Liege|R|2X2
+#162|Skullbriar, the Walking Grave|R|2X2
+#163|Tenth District Legionnaire|C|2X2
+#164|Ulasht, the Hate Seed|R|2X2
+#165|Coldsteel Heart|U|2X2
+#166|Sensei's Divining Top|R|2X2
+#167|League Guildmage|U|2X2
+#168|Fiery Fall|C|2X2
+#169|Ambuscade|C|2X2
+#170|Lyev Skyknight|C|2X2
+#171|Relief Captain|C|2X2
+#172|Staggershock|U|2X2
+#173|Auger Spree|C|2X2
+#174|Kozilek, Butcher of Truth|M|2X2
+#175|Smothering Tithe|R|2X2
+#176|Advanced Stitchwing|C|2X2
+#177|Aethersnipe|C|2X2
+#178|Kederekt Leviathan|R|2X2
+#179|Thought Scour|C|2X2
+#180|Ob Nixilis, Unshackled|R|2X2
+#181|Scion of Darkness|U|2X2
+#182|Goblin Banneret|U|2X2
+#183|Labyrinth Champion|U|2X2
+#184|Annoyed Altisaur|C|2X2
+#185|Elvish Rejuvenator|C|2X2
+#186|Gnarlback Rhino|C|2X2
+#187|Impervious Greatwurm|R|2X2
+#188|Splinterfright|R|2X2
+#189|Tuskguard Captain|C|2X2
+#190|Webweaver Changeling|C|2X2
+#191|Animar, Soul of Elements|M|2X2
+#192|Balefire Liege|R|2X2
+#193|Bant Charm|U|2X2
+#194|Burning-Tree Emissary|C|2X2
+#195|Cartel Aristocrat|C|2X2
+#196|Gloryscale Viashino|U|2X2
+#197|Guided Passage|R|2X2
+#198|Izzet Charm|C|2X2
+#199|Magister Sphinx|R|2X2
+#200|Villainous Wealth|R|2X2
+#201|Bloodforged Battle-Axe|R|2X2
+#202|Knightly Valor|C|2X2
+#203|Glowspore Shaman|C|2X2
+#204|Call to the Feast|C|2X2
+#205|Disfigure|C|2X2
+#206|Ulamog, the Infinite Gyre|M|2X2
+#207|Ainok Bond-Kin|C|2X2
+#208|Gods Willing|C|2X2
+#209|Momentary Blink|C|2X2
+#210|Myth Realized|U|2X2
+#211|Wingsteed Rider|C|2X2
+#212|Ingenious Skaab|C|2X2
+#213|Blood Artist|U|2X2
+#214|Unearth|C|2X2
+#215|Greater Gargadon|R|2X2
+#216|Allosaurus Shepherd|M|2X2
+#217|Arachnus Spinner|U|2X2
+#218|Arachnus Web|C|2X2
+#219|Brindle Shoat|C|2X2
+#220|Centaur Battlemaster|U|2X2
+#221|Green Sun's Zenith|R|2X2
+#222|Hardened Scales|R|2X2
+#223|Spider Spawning|U|2X2
+#224|Aethermage's Touch|U|2X2
+#225|Empyrial Archangel|R|2X2
+#226|Firesong and Sunspeaker|R|2X2
+#227|Glimpse the Unthinkable|R|2X2
+#228|Hellkite Overlord|M|2X2
+#229|Jodah, Archmage Eternal|R|2X2
+#230|The Mimeoplasm|R|2X2
+#231|Mindwrack Liege|R|2X2
+#232|Mizzix of the Izmagnus|M|2X2
+#233|Orzhov Pontiff|U|2X2
+#234|Prized Amalgam|R|2X2
+#235|Thistledown Liege|R|2X2
+#236|Aether Vial|R|2X2
+#237|Civic Saber|U|2X2
+#238|Nim Deathmantle|R|2X2
+#239|Bloodflow Connoisseur|C|2X2
+#240|Forbidden Alchemy|C|2X2
+#241|Carrier Thrall|C|2X2
+#242|Capture Sphere|C|2X2
+#243|Deranged Assistant|C|2X2
+#244|Biogenic Upgrade|U|2X2
+#245|Mayael's Aria|R|2X2
+#246|Privileged Position|R|2X2
+#247|Emrakul, the Aeons Torn|M|2X2
+#248|Leonin Arbiter|R|2X2
+#249|Body Double|U|2X2
+#250|Spell Pierce|C|2X2
+#251|Wash Out|U|2X2
+#252|Gravecrawler|R|2X2
+#253|Imperial Seal|M|2X2
+#254|Inquisition of Kozilek|U|2X2
+#255|Necrotic Ooze|R|2X2
+#256|Vampiric Rites|U|2X2
+#257|Chaos Warp|R|2X2
+#258|Dreamshaper Shaman|U|2X2
+#259|Hero of the Games|C|2X2
+#260|Pirate's Pillage|C|2X2
+#261|Storm Fleet Pyromancer|C|2X2
+#262|Twinflame|R|2X2
+#263|Abzan Ascendancy|R|2X2
+#264|Atarka's Command|R|2X2
+#265|Kaalia of the Vast|M|2X2
+#266|Martial Glory|C|2X2
+#267|Thousand-Year Storm|R|2X2
+#268|Conqueror's Flail|R|2X2
+#269|Firemind Vessel|U|2X2
+#270|Phyrexian Altar|R|2X2
+#271|Hissing Iguanar|C|2X2
+#272|Anointer of Valor|C|2X2
+#273|Last Breath|C|2X2
+#274|Purphoros's Emissary|C|2X2
+#275|Scale Blessing|U|2X2
+#276|Sensor Splicer|C|2X2
+#277|Winged Coatl|C|2X2
+#278|Severed Strands|C|2X2
+#279|Kruin Striker|C|2X2
+#280|Nephalia Smuggler|U|2X2
+#281|Doomed Traveler|C|2X2
+#282|Teferi's Protection|R|2X2
+#283|Weathered Wayfarer|R|2X2
+#284|Force of Negation|R|2X2
+#285|Balustrade Spy|C|2X2
+#286|Monastery Swiftspear|C|2X2
+#287|Surreal Memoir|U|2X2
+#288|Thrive|C|2X2
+#289|Bring to Light|R|2X2
+#290|Child of Alara|R|2X2
+#291|Phyrexian Tyranny|R|2X2
+#292|Zur the Enchanter|R|2X2
+#293|Crucible of Worlds|M|2X2
+#294|Darksteel Plate|R|2X2
+#295|Cavern of Souls|M|2X2
+#296|City of Brass|R|2X2
+#297|Pillar of the Paruns|R|2X2
+#298|Eel Umbra|C|2X2
+#299|Grapple with the Past|C|2X2
+#300|Hyena Umbra|C|2X2
+#301|Aven Initiate|C|2X2
+#302|Battlefield Promotion|C|2X2
+#303|Liliana's Elite|C|2X2
+#304|Living Lightning|C|2X2
+#305|Skeleton Archer|C|2X2
+#306|Livewire Lash|U|2X2
+#307|Breakthrough|U|2X2
+#308|Warrior's Oath|M|2X2
+#309|Concordant Crossroads|M|2X2
+#310|Dragon Arch|U|2X2
+#311|Planar Bridge|R|2X2
+#312|Vedalken Orrery|R|2X2
+#313|Makeshift Mauler|C|2X2
+#314|Might of Old Krosa|C|2X2
+#315|Traveler's Amulet|C|2X2
+#316|Sparkmage's Gambit|C|2X2
+#317|Supernatural Stamina|C|2X2
+#318|Deadly Recluse|C|2X2
+#319|Strands of Undeath|C|2X2
+#320|Divine Visitation|M|2X2
+#321|As Foretold|M|2X2
+#322|Dockside Extortionist|M|2X2
+#323|Pithing Needle|R|2X2
+#324|Titan's Strength|C|2X2
+#325|Surgical Extraction|R|2X2
+#326|Food Chain|M|2X2
+#327|Thrumming Stone|R|2X2
+#328|Kasmina's Transmutation|C|2X2
+#329|Forbidden Orchard|R|2X2
+#330|Summer Bloom|U|2X2
+#331|Shadowborn Apostle|C|2X2
+//Rank|Name|Rarity|Set
 #1|Sanctuary Warden|M|SNC
 #2|All-Seeing Arbiter|M|SNC
 #3|Ziatora, the Incinerator|M|SNC
diff --git a/forge-gui/res/editions/Double Masters 2022.txt b/forge-gui/res/editions/Double Masters 2022.txt
index 37132457fee..111953a5528 100644
--- a/forge-gui/res/editions/Double Masters 2022.txt	
+++ b/forge-gui/res/editions/Double Masters 2022.txt	
@@ -3,6 +3,11 @@ Code=2X2
 Date=2022-07-08
 Name=Double Masters 2022
 Type=Reprint
+BoosterCovers=3
+Booster=8 Common:fromSheet("2X2 cards"), 3 Uncommon:fromSheet("2X2 cards"), 2 RareMythic:fromSheet("2X2 cards"), 2 fromSheet("2X2 foils"), 1 fromSheet("2X2 spire")
+Foil=NotSupported
+DoublePick=FirstPick
+ChaosDraftThemes=MASTERS_SET
 ScryfallCode=2X2
 
 [cards]
@@ -338,6 +343,8 @@ ScryfallCode=2X2
 330 U Selesnya Sanctuary @John Avon
 331 U Simic Growth Chamber @John Avon
 332 C Cryptic Spires @Sam Burley
+
+[borderless]
 333 M Liliana, the Last Hope @Scott M. Fischer
 334 M Wrenn and Six @Donato Giancola
 335 M Emrakul, the Aeons Torn @Kev Walker
@@ -418,6 +425,8 @@ ScryfallCode=2X2
 410 U Rakdos Carnarium @Thomas M. Baxa
 411 U Selesnya Sanctuary @Ron Spears
 412 U Simic Growth Chamber @Pete Venters
+
+[showcase]
 413 M Emrakul, the Aeons Torn @Mark Tedin
 414 M Kozilek, Butcher of Truth @Michael Komarck
 415 M Ulamog, the Infinite Gyre @Aleksi Briclot
@@ -583,9 +592,352 @@ ScryfallCode=2X2
 575 M Emrakul, the Aeons Torn @Kev Walker
 576 M Kozilek, Butcher of Truth @Ian Miller
 577 M Ulamog, the Infinite Gyre @Thomas M. Baxa
+
+[promo]
 578 R Weathered Wayfarer @Dermot Power
 579 R Bring to Light @Mark Poole
 
+[spire]
+1 Cryptic Spires|2X2
+
+[foils]
+# Commons
+21 Advanced Stitchwing+|2X2
+21 Aethersnipe+|2X2
+21 Agony Warp+|2X2
+21 Ainok Bond-Kin+|2X2
+21 Ambuscade+|2X2
+21 Annoyed Altisaur+|2X2
+21 Anointer of Valor+|2X2
+21 Arachnus Web+|2X2
+21 Auger Spree+|2X2
+21 Aven Initiate+|2X2
+21 Balustrade Spy+|2X2
+21 Battlefield Promotion+|2X2
+21 Bloodflow Connoisseur+|2X2
+21 Bloodwater Entity+|2X2
+21 Brindle Shoat+|2X2
+21 Burning-Tree Emissary+|2X2
+21 Call to the Feast+|2X2
+21 Capture Sphere+|2X2
+21 Cartel Aristocrat+|2X2
+21 Chronicler of Heroes+|2X2
+21 Coiling Oracle+|2X2
+21 Cryptic Spires+|2X2
+21 Dark-Dweller Oracle+|2X2
+21 Deadly Recluse+|2X2
+21 Deep Analysis+|2X2
+21 Deranged Assistant+|2X2
+21 Disfigure+|2X2
+21 Doomed Traveler+|2X2
+21 Dreg Mangler+|2X2
+21 Eel Umbra+|2X2
+21 Elvish Rejuvenator+|2X2
+21 Experiment One+|2X2
+21 Eyeblight's Ending+|2X2
+21 Fiery Fall+|2X2
+21 Fireblade Artist+|2X2
+21 Forbidden Alchemy+|2X2
+21 Glowspore Shaman+|2X2
+21 Gnarlback Rhino+|2X2
+21 Gods Willing+|2X2
+21 Grapple with the Past+|2X2
+21 Ground Assault+|2X2
+21 Hero of the Games+|2X2
+21 Hissing Iguanar+|2X2
+21 Hyena Umbra+|2X2
+21 Ingenious Skaab+|2X2
+21 Izzet Charm+|2X2
+21 Jeskai Elder+|2X2
+21 Kasmina's Transmutation+|2X2
+21 Knightly Valor+|2X2
+21 Kruin Striker+|2X2
+21 Last Breath+|2X2
+21 Lava Coil+|2X2
+21 Liliana's Elite+|2X2
+21 Lyev Skyknight+|2X2
+21 Makeshift Mauler+|2X2
+21 Mana Leak+|2X2
+21 Martial Glory+|2X2
+21 Might of Old Krosa+|2X2
+21 Militia Bugler+|2X2
+21 Momentary Blink+|2X2
+21 Monastery Swiftspear+|2X2
+21 Pirate's Pillage+|2X2
+21 Purphoros's Emissary+|2X2
+21 Qasali Pridemage+|2X2
+21 Rampant Growth+|2X2
+21 Relief Captain+|2X2
+21 Rift Bolt+|2X2
+21 Seeker of the Way+|2X2
+21 Seekers' Squire+|2X2
+21 Sensor Splicer+|2X2
+21 Settle Beyond Reality+|2X2
+21 Severed Strands+|2X2
+21 Shadowborn Apostle+|2X2
+21 Skeleton Archer+|2X2
+21 Sparkmage's Gambit+|2X2
+21 Spell Pierce+|2X2
+21 Storm Fleet Pyromancer+|2X2
+21 Strands of Undeath+|2X2
+21 Supernatural Stamina+|2X2
+21 Tenth District Legionnaire+|2X2
+21 Thought Scour+|2X2
+21 Thrive+|2X2
+21 Titan's Strength+|2X2
+21 Traveler's Amulet+|2X2
+21 Tuskguard Captain+|2X2
+21 Unearth+|2X2
+21 Vampire Sovereign+|2X2
+21 Webweaver Changeling+|2X2
+21 Winged Coatl+|2X2
+21 Wingsteed Rider+|2X2
+# Uncommons
+7 Abzan Charm+|2X2
+7 Abzan Falconer+|2X2
+7 Aethermage's Touch+|2X2
+7 Arachnus Spinner+|2X2
+7 Azorius Chancery+|2X2
+7 Bant Charm+|2X2
+7 Bear's Companion+|2X2
+7 Biogenic Upgrade+|2X2
+7 Blazing Hellhound+|2X2
+7 Blood Artist+|2X2
+7 Bloodbraid Elf+|2X2
+7 Body Double+|2X2
+7 Boros Garrison+|2X2
+7 Bounty of the Luxa+|2X2
+7 Breakthrough+|2X2
+7 Carrier Thrall+|2X2
+7 Centaur Battlemaster+|2X2
+7 Civic Saber+|2X2
+7 Coldsteel Heart+|2X2
+7 Conclave Mentor+|2X2
+7 Crackling Doom+|2X2
+7 Devoted Druid+|2X2
+7 Dimir Aqueduct+|2X2
+7 Domestication+|2X2
+7 Dragon Arch+|2X2
+7 Dreamshaper Shaman+|2X2
+7 Eternal Witness+|2X2
+7 Extract from Darkness+|2X2
+7 Firemind Vessel+|2X2
+7 Flickerwisp+|2X2
+7 Gloryscale Viashino+|2X2
+7 Go for the Throat+|2X2
+7 Goblin Banneret+|2X2
+7 Golgari Rot Farm+|2X2
+7 Graveblade Marauder+|2X2
+7 Gruul Turf+|2X2
+7 Heroic Reinforcements+|2X2
+7 Inquisition of Kozilek+|2X2
+7 Izzet Boilerworks+|2X2
+7 Jeskai Charm+|2X2
+7 Labyrinth Champion+|2X2
+7 League Guildmage+|2X2
+7 Lightning Bolt+|2X2
+7 Lightning Helix+|2X2
+7 Livewire Lash+|2X2
+7 Living Lightning+|2X2
+7 Lotleth Troll+|2X2
+7 Mentor of the Meek+|2X2
+7 Mistfire Adept+|2X2
+7 Mistmeadow Witch+|2X2
+7 Mulldrifter+|2X2
+7 Myth Realized+|2X2
+7 Nephalia Smuggler+|2X2
+7 Orzhov Basilica+|2X2
+7 Orzhov Pontiff+|2X2
+7 Path to Exile+|2X2
+7 Prophetic Bolt+|2X2
+7 Psychic Symbiont+|2X2
+7 Rakdos Carnarium+|2X2
+7 Rancor+|2X2
+7 River Hoopoe+|2X2
+7 Scab-Clan Giant+|2X2
+7 Scale Blessing+|2X2
+7 Scion of Darkness+|2X2
+7 Sedraxis Specter+|2X2
+7 Selesnya Sanctuary+|2X2
+7 Simic Growth Chamber+|2X2
+7 Skinrender+|2X2
+7 Spider Spawning+|2X2
+7 Sprouting Thrinax+|2X2
+7 Staggershock+|2X2
+7 Sultai Soothsayer+|2X2
+7 Summer Bloom+|2X2
+7 Surreal Memoir+|2X2
+7 Terminate+|2X2
+7 Tower Gargoyle+|2X2
+7 Travel Preparations+|2X2
+7 Unburial Rites+|2X2
+7 Vampiric Rites+|2X2
+7 Wall of Omens+|2X2
+7 Wash Out+|2X2
+7 Young Pyromancer+|2X2
+# Rares
+2 Abbot of Keral Keep+|2X2
+2 Abzan Ascendancy+|2X2
+2 Aether Vial+|2X2
+2 Alesha, Who Smiles at Death+|2X2
+2 Anger of the Gods+|2X2
+2 Anguished Unmaking+|2X2
+2 Arjun, the Shifting Flame+|2X2
+2 Ashen Rider+|2X2
+2 Ashenmoor Liege+|2X2
+2 Assassin's Trophy+|2X2
+2 Atarka's Command+|2X2
+2 Atla Palani, Nest Tender+|2X2
+2 Backdraft Hellkite+|2X2
+2 Balefire Liege+|2X2
+2 Bedlam Reveler+|2X2
+2 Bloodforged Battle-Axe+|2X2
+2 Bloom Tender+|2X2
+2 Boartusk Liege+|2X2
+2 Bring to Light+|2X2
+2 Chaos Warp+|2X2
+2 Child of Alara+|2X2
+2 City of Brass+|2X2
+2 Conqueror's Flail+|2X2
+2 Creakwood Liege+|2X2
+2 Dack's Duplicate+|2X2
+2 Damnation+|2X2
+2 Darksteel Plate+|2X2
+2 Dauntless Escort+|2X2
+2 Deathbringer Liege+|2X2
+2 Disciple of the Ring+|2X2
+2 Doran, the Siege Tower+|2X2
+2 Drogskol Reaver+|2X2
+2 Dromoka's Command+|2X2
+2 Elsha of the Infinite+|2X2
+2 Empyrial Archangel+|2X2
+2 Fiery Justice+|2X2
+2 Figure of Destiny+|2X2
+2 Firesong and Sunspeaker+|2X2
+2 Forbidden Orchard+|2X2
+2 Force of Negation+|2X2
+2 Gifts Ungiven+|2X2
+2 Glen Elendra Liege+|2X2
+2 Glimpse the Unthinkable+|2X2
+2 Grand Arbiter Augustin IV+|2X2
+2 Gravecrawler+|2X2
+2 Greater Gargadon+|2X2
+2 Green Sun's Zenith+|2X2
+2 Grim Flayer+|2X2
+2 Guided Passage+|2X2
+2 Hardened Scales+|2X2
+2 Hostage Taker+|2X2
+2 Hydroid Krasis+|2X2
+2 Impervious Greatwurm+|2X2
+2 Intet, the Dreamer+|2X2
+2 Jeskai Ascendancy+|2X2
+2 Jodah, Archmage Eternal+|2X2
+2 Judith, the Scourge Diva+|2X2
+2 Kaervek the Merciless+|2X2
+2 Kambal, Consul of Allocation+|2X2
+2 Kederekt Leviathan+|2X2
+2 Kolaghan's Command+|2X2
+2 Lavalanche+|2X2
+2 Legion's Initiative+|2X2
+2 Leonin Arbiter+|2X2
+2 Magister Sphinx+|2X2
+2 Marchesa, the Black Rose+|2X2
+2 Master Biomancer+|2X2
+2 Mathas, Fiend Seeker+|2X2
+2 Mayael's Aria+|2X2
+2 Mikaeus, the Lunarch+|2X2
+2 Mindwrack Liege+|2X2
+2 Murkfiend Liege+|2X2
+2 Necrotic Ooze+|2X2
+2 Nim Deathmantle+|2X2
+2 Ob Nixilis, Unshackled+|2X2
+2 Oona's Prowler+|2X2
+2 Oracle of Mul Daya+|2X2
+2 Panharmonicon+|2X2
+2 Phyrexian Altar+|2X2
+2 Phyrexian Tyranny+|2X2
+2 Pillar of the Paruns+|2X2
+2 Pithing Needle+|2X2
+2 Planar Bridge+|2X2
+2 Privileged Position+|2X2
+2 Prized Amalgam+|2X2
+2 Pull from Tomorrow+|2X2
+2 Rafiq of the Many+|2X2
+2 Restoration Angel+|2X2
+2 Reveillark+|2X2
+2 Rishkar, Peema Renegade+|2X2
+2 Roon of the Hidden Realm+|2X2
+2 Ruric Thar, the Unbowed+|2X2
+2 Sensei's Divining Top+|2X2
+2 Shattergang Brothers+|2X2
+2 Sidisi, Brood Tyrant+|2X2
+2 Skullbriar, the Walking Grave+|2X2
+2 Smothering Tithe+|2X2
+2 Splinterfright+|2X2
+2 Supreme Verdict+|2X2
+2 Surgical Extraction+|2X2
+2 Talrand, Sky Summoner+|2X2
+2 Tariel, Reckoner of Souls+|2X2
+2 Teferi's Protection+|2X2
+2 Teneb, the Harvester+|2X2
+2 The Mimeoplasm+|2X2
+2 Thistledown Liege+|2X2
+2 Thousand-Year Storm+|2X2
+2 Thraximundar+|2X2
+2 Thrumming Stone+|2X2
+2 Twinflame+|2X2
+2 Ulasht, the Hate Seed+|2X2
+2 Varina, Lich Queen+|2X2
+2 Vedalken Orrery+|2X2
+2 Venser, Shaper Savant+|2X2
+2 Villainous Wealth+|2X2
+2 Wasitora, Nekoru Queen+|2X2
+2 Weathered Wayfarer+|2X2
+2 Wilt-Leaf Liege+|2X2
+2 Yahenni, Undying Partisan+|2X2
+2 Zur the Enchanter+|2X2
+# Mythics
+1 Allosaurus Shepherd+|2X2
+1 Aminatou, the Fateshifter+|2X2
+1 Animar, Soul of Elements+|2X2
+1 As Foretold+|2X2
+1 Aurelia, the Warleader+|2X2
+1 Bitterblossom+|2X2
+1 Cavern of Souls+|2X2
+1 Concordant Crossroads+|2X2
+1 Consecrated Sphinx+|2X2
+1 Crucible of Worlds+|2X2
+1 Divine Visitation+|2X2
+1 Dockside Extortionist+|2X2
+1 Dragonlord Dromoka+|2X2
+1 Dragonlord Silumgar+|2X2
+1 Elenda, the Dusk Rose+|2X2
+1 Emiel the Blessed+|2X2
+1 Emrakul, the Aeons Torn+|2X2
+1 Ezuri, Claw of Progress+|2X2
+1 Food Chain+|2X2
+1 Ghave, Guru of Spores+|2X2
+1 Hellkite Overlord+|2X2
+1 Imperial Seal+|2X2
+1 Kaalia of the Vast+|2X2
+1 Karador, Ghost Chieftain+|2X2
+1 Kozilek, Butcher of Truth+|2X2
+1 Liliana, the Last Hope+|2X2
+1 Lord of Extinction+|2X2
+1 Mana Drain+|2X2
+1 Mana Vault+|2X2
+1 Master of Cruelties+|2X2
+1 Mizzix of the Izmagnus+|2X2
+1 Monastery Mentor+|2X2
+1 Muldrotha, the Gravetide+|2X2
+1 Nicol Bolas, God-Pharaoh+|2X2
+1 Seasoned Pyromancer+|2X2
+1 Sedris, the Traitor King+|2X2
+1 Ulamog, the Infinite Gyre+|2X2
+1 Uril, the Miststalker+|2X2
+1 Warrior's Oath+|2X2
+1 Wrenn and Six+|2X2
+
 [tokens]
 c_1_1_eldrazi_scion_sac
 c_1_1_spirit

From 49dead9a14306fb1b629cacc55ee615b78e5395b Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 14:08:31 +0100
Subject: [PATCH 092/309] burakos_commander_fix

---
 forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
index 4af47605213..c2de3fd6083 100644
--- a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
@@ -1,6 +1,6 @@
 Name:Burakos, Party Leader
 ManaCost:3 B
-Types:Creature Orc
+Types:Legendary Creature Orc
 PT:2/4
 K:Choose a Background
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ Cleric & Rogue & Warrior & Wizard | Description$ CARDNAME is also a Cleric, Rogue, Warrior, and Wizard.

From c019d2b21ea99928f399c46b058cba9891d54fc9 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 14:09:25 +0100
Subject: [PATCH 093/309] undo

---
 forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
index c2de3fd6083..4af47605213 100644
--- a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
@@ -1,6 +1,6 @@
 Name:Burakos, Party Leader
 ManaCost:3 B
-Types:Legendary Creature Orc
+Types:Creature Orc
 PT:2/4
 K:Choose a Background
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ Cleric & Rogue & Warrior & Wizard | Description$ CARDNAME is also a Cleric, Rogue, Warrior, and Wizard.

From 82c71016054793a7d900f42e782f1e55e5c1045d Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 25 Jun 2022 14:11:26 +0100
Subject: [PATCH 094/309] Burakos Type fix

---
 forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
index 4af47605213..c2de3fd6083 100644
--- a/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
+++ b/forge-gui/res/cardsfolder/upcoming/burakos_party_leader.txt
@@ -1,6 +1,6 @@
 Name:Burakos, Party Leader
 ManaCost:3 B
-Types:Creature Orc
+Types:Legendary Creature Orc
 PT:2/4
 K:Choose a Background
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ Cleric & Rogue & Warrior & Wizard | Description$ CARDNAME is also a Cleric, Rogue, Warrior, and Wizard.

From c93487e0484784f3f29dbb985f04c5ff627dfa8f Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sat, 25 Jun 2022 21:01:59 +0200
Subject: [PATCH 095/309] Support for Grell

---
 .../forge/game/staticability/StaticAbilityContinuous.java  | 2 +-
 forge-gui/res/cardsfolder/s/scheming_fence.txt             | 2 +-
 forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt   | 7 +++----
 .../src/main/java/forge/player/HumanPlaySpellAbility.java  | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

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 1a32a81b354..b9f957a509f 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -843,7 +843,7 @@ public final class StaticAbilityContinuous {
                                     newSA.getRestrictions().setLimitToCheck(params.get("GainsAbilitiesLimitPerTurn"));
                                 }
                                 if (params.containsKey("GainsAbilitiesActivateIgnoreColor")) {
-                                    newSA.putParam("ActivateIgnoreColor","True");
+                                    newSA.putParam("ActivateIgnoreColor", params.get("GainsAbilitiesActivateIgnoreColor"));
                                 }
                                 newSA.setOriginalAbility(sa); // need to be set to get the Once Per turn Clause correct
                                 newSA.setGrantorStatic(stAb);
diff --git a/forge-gui/res/cardsfolder/s/scheming_fence.txt b/forge-gui/res/cardsfolder/s/scheming_fence.txt
index 00662c7831a..49b7ec45357 100644
--- a/forge-gui/res/cardsfolder/s/scheming_fence.txt
+++ b/forge-gui/res/cardsfolder/s/scheming_fence.txt
@@ -5,7 +5,7 @@ PT:2/3
 K:ETBReplacement:Other:ChooseCard
 SVar:ChooseCard:DB$ ChooseCard | Choices$ Permanent.nonLand | MinAmount$ 0 | ChoiceTitle$ You may choose a nonland permanent | AILogic$ OppPreferred | SpellDescription$ As CARDNAME enters the battlefield, you may choose a nonland permanent.
 S:Mode$ Continuous | Affected$ Card.ChosenCard | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of the chosen permanent can't be activated.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ True | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.ChosenCard | Execute$ TrigCleanup
 SVar:TrigCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:As Scheming Fence enters the battlefield, you may choose a nonland permanent.\nActivated abilities of the chosen permanent can't be activated.\nScheming Fence has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
diff --git a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
index a602139d791..faae3e8fef4 100644
--- a/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
+++ b/forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt
@@ -2,11 +2,10 @@ Name:Grell Philosopher
 ManaCost:2 U
 Types:Creature Horror Wizard
 PT:1/4
-K:ManaConvert:U->AnyColor:You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
 SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | ImprintCards$ Targeted | RememberObjects$ Valid Creature.Horror+YouCtrl | ForgetOnMoved$ Battlefield
-SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI
+SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI | GainsAbilitiesActivateIgnoreColor$ U->AnyColor
 AI:RemoveDeck:All
 DeckHints:Type$Horror
 Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities.
diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
index bf5eebeeea2..74fa086002a 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
@@ -139,11 +139,11 @@ public class HumanPlaySpellAbility {
                 }
             }
             if (ability.hasParam("ActivateIgnoreColor")) {
-                AbilityUtils.applyManaColorConversion(payment, MagicColor.Constant.ANY_COLOR_CONVERSION);
+                params.put("ManaConversion", ability.getParam("ActivateIgnoreColor"));
                 manaColorConversion = true;
             }
 
-            if (keywordColor) {
+            if (keywordColor || manaColorConversion) {
                 AbilityUtils.applyManaColorConversion(payment, params);
             }
         }

From 51034b18c225235a700ab013a766570ac3ef69fb Mon Sep 17 00:00:00 2001
From: Magpie <323651+magpie514@users.noreply.github.com>
Date: Sun, 26 Jun 2022 07:44:53 +0200
Subject: [PATCH 096/309] Adventure mode - Adjustments (#1002)

* Goblin fixes.

Co-authored-by: Magpie <magpie514@users.noreply.github.com>
---
 forge-gui/res/adventure/Shandalar/world/enemies.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json
index a260af39173..da825159683 100644
--- a/forge-gui/res/adventure/Shandalar/world/enemies.json
+++ b/forge-gui/res/adventure/Shandalar/world/enemies.json
@@ -1428,9 +1428,6 @@
 			]
 		}
 	],
-	"equipment": [
-		"Battle Standard"
-	],
 	"colors": "R"
 },
 {

From a852a36e813ca57a7e92db46d571b12e32c2fb13 Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Sun, 26 Jun 2022 01:45:33 -0400
Subject: [PATCH 097/309] fix ganax_astral_hunter.txt PT (#1000)

---
 forge-gui/res/cardsfolder/upcoming/ganax_astral_hunter.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/ganax_astral_hunter.txt b/forge-gui/res/cardsfolder/upcoming/ganax_astral_hunter.txt
index 18a403b6853..ca3f1fa5a5a 100644
--- a/forge-gui/res/cardsfolder/upcoming/ganax_astral_hunter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ganax_astral_hunter.txt
@@ -1,7 +1,7 @@
 Name:Ganax, Astral Hunter
 ManaCost:4 R
 Types:Legendary Creature Dragon
-PT:3/3
+PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Dragon.Other+YouCtrl | Execute$ TrigTreasure | TriggerDescription$ Whenever CARDNAME or another Dragon enters the battlefield under your control, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigTreasure:DB$ Token | TokenScript$ c_a_treasure_sac

From 21906e62f3c2ab88d4857c2f9f1202b9eddd48c1 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sun, 26 Jun 2022 09:27:06 +0100
Subject: [PATCH 098/309] Baeloth Type fix

---
 forge-gui/res/cardsfolder/b/bennie_bracks_zoologist.txt         | 2 +-
 forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt         | 2 +-
 .../res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt   | 2 +-
 .../res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/cardsfolder/b/bennie_bracks_zoologist.txt b/forge-gui/res/cardsfolder/b/bennie_bracks_zoologist.txt
index 2f96c15aaa0..a9422a54495 100644
--- a/forge-gui/res/cardsfolder/b/bennie_bracks_zoologist.txt
+++ b/forge-gui/res/cardsfolder/b/bennie_bracks_zoologist.txt
@@ -7,4 +7,4 @@ T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE1 | TriggerZo
 SVar:TrigDraw:DB$ Draw
 SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouCtrl
 DeckHints:Ability$Token
-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 each end step, if you created a token this turn, draw a card.
+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 each end step, if you created a token this turn, draw a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt b/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
index 644f42fb065..825701460ff 100644
--- a/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/upcoming/armor_of_shadows.txt
@@ -2,4 +2,4 @@ Name:Armor of Shadows
 ManaCost:B
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | AILogic$ Pump | NumAtt$ +1 | KW$ Indestructible | SpellDescription$ Until end of turn, target creature gets +1/+0 and gains indestructible. 
-Oracle:Until end of turn, target creature gets +1/+0 and gains indestructible. (Damage and effects that say "destroy" don’t destroy it.)
+Oracle:Until end of turn, target creature gets +1/+0 and gains indestructible. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
index dc424d78c78..065e6fe446d 100644
--- a/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/baeloth_barrityl_entertainer.txt
@@ -1,6 +1,6 @@
 Name:Baeloth Barrityl, Entertainer
 ManaCost:4 R
-Types:Creature Elf Shaman
+Types:Legendary Creature Elf Shaman
 PT:2/5
 K:Choose a Background
 S:Mode$ Continuous | Affected$ Creature.powerLTY+OppCtrl | Goad$ True | SubAbility$ TrigChangesZone | Description$ Creatures your opponents control with power less than CARDNAME power are goaded. (They attacks each combat if able and attack a player other than you if able.)
diff --git a/forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt b/forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt
index 48ff1e1e3cc..6c6afd56b03 100644
--- a/forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt
+++ b/forge-gui/res/cardsfolder/upcoming/young_red_dragon_bathe_in_gold.txt
@@ -4,7 +4,7 @@ Types:Creature Dragon
 PT:3/2
 K:Flying
 K:CARDNAME can't block.
-Oracle:Flying\nYoung Red Dragon can’t block.
+Oracle:Flying\nYoung Red Dragon can't block.
 AlternateMode:Adventure
 
 ALTERNATE

From aade9289c1c8a0a576f219873e6275b21820ad2c Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Sun, 26 Jun 2022 07:03:55 -0500
Subject: [PATCH 099/309] Update green_slime.txt

---
 forge-gui/res/cardsfolder/upcoming/green_slime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/green_slime.txt b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
index 98f2fcdf8f0..0d33e2c3a2d 100644
--- a/forge-gui/res/cardsfolder/upcoming/green_slime.txt
+++ b/forge-gui/res/cardsfolder/upcoming/green_slime.txt
@@ -6,5 +6,5 @@ K:Flash
 K:Foretell: G
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.
 SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
-AI:RemoveDeck:All
+AI:RemoveDeck:Random
 Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G}

From 7420900ad681a954bc02ed56478f130d08f2b142 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sun, 26 Jun 2022 15:01:02 +0200
Subject: [PATCH 100/309] Fix cards (#1004)

---
 forge-gui/res/cardsfolder/b/bloodvial_purveyor.txt       | 4 ++--
 forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt | 2 +-
 forge-gui/res/cardsfolder/h/hive_of_the_eye_tyrant.txt   | 2 +-
 forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forge-gui/res/cardsfolder/b/bloodvial_purveyor.txt b/forge-gui/res/cardsfolder/b/bloodvial_purveyor.txt
index 86f4b915622..9a3c7a1f02f 100644
--- a/forge-gui/res/cardsfolder/b/bloodvial_purveyor.txt
+++ b/forge-gui/res/cardsfolder/b/bloodvial_purveyor.txt
@@ -6,8 +6,8 @@ K:Flying
 K:Trample
 T:Mode$ SpellCast | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent casts a spell, that player creates a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_blood_draw | TokenOwner$ TriggeredActivator
-T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Blood.token+DefendingPlayerCtrl | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each Blood token defending player controls.
+T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Blood.token+DefenderCtrl | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each Blood token defending player controls.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X
-SVar:X:Count$Valid Blood.token+DefendingPlayerCtrl
+SVar:X:Count$Valid Blood.token+DefenderCtrl
 SVar:HasAttackEffect:TRUE
 Oracle:Flying, trample\nWhenever an opponent casts a spell, that player creates a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")\nWhenever Bloodvial Purveyor attacks, it gets +1/+0 until end of turn for each Blood token defending player controls.
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 0c6a1040c17..e060e06e065 100644
--- a/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt
+++ b/forge-gui/res/cardsfolder/g/grasp_of_the_hieromancer.txt
@@ -5,6 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ 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.DefendingPlayerCtrl | TgtPrompt$ Select target creature defending player controls
+SVar:HieroTap:DB$ Tap | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Select target creature defending player controls
 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/h/hive_of_the_eye_tyrant.txt b/forge-gui/res/cardsfolder/h/hive_of_the_eye_tyrant.txt
index 47d3be72b32..7d96eca5154 100644
--- a/forge-gui/res/cardsfolder/h/hive_of_the_eye_tyrant.txt
+++ b/forge-gui/res/cardsfolder/h/hive_of_the_eye_tyrant.txt
@@ -7,5 +7,5 @@ SVar:ETBCheckSVar2:Count$Valid Land.YouCtrl
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Animate | Cost$ 3 B | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Beholder | Colors$ Black | Keywords$ Menace | Triggers$ TrigAttack | SpellDescription$ Until end of turn, CARDNAME becomes a 3/3 black Beholder creature with menace and "Whenever this creature attacks, exile target card from defending player's graveyard." It's still a land.
 SVar:TrigAttack:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever this creature attacks, exile target card from defending player's graveyard.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.DefendingPlayerCtrl | TgtPrompt$ Select target card in defending player's graveyard
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.DefenderCtrl | TgtPrompt$ Select target card in defending player's graveyard
 Oracle:If you control two or more other lands, Hive of the Eye Tyrant enters the battlefield tapped.\n{T}: Add {B}.\n{3}{B}: Until end of turn, Hive of the Eye Tyrant becomes a 3/3 black Beholder creature with menace and "Whenever this creature attacks, exile target card from defending player's graveyard." It's still a land.
diff --git a/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt b/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
index d84e01c2af3..da3d8d71731 100644
--- a/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
+++ b/forge-gui/res/cardsfolder/upcoming/elturel_survivors.txt
@@ -5,8 +5,8 @@ PT:0/4
 K:Trample
 K:Myriad
 S:Mode$ Continuous | Affected$ Creature.Self+attacking | AddPower$ X | Description$ As long as CARDNAME is attacking, it gets +X/+0, where X is the number of lands defending player controls.
-SVar:X:Count$Valid Land.ControlledBy DefendingPlayer
+SVar:X:Count$Valid Land.DefenderCtrl
 AI:RemoveDeck:All
-SVar:BuffedBy:Land.ControlledBy DefendingPlayer
+SVar:BuffedBy:Land.OppCtrl
 SVar:HasAttackEffect:TRUE
 Oracle:Trample, myriad\nAs long as Elturel Survivors is attacking, it gets +X/+0, where X is the number of lands defending player controls.

From 5b6f54b6dd3230b836d63becf24804a86006cfdd Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Sun, 26 Jun 2022 22:41:44 +0200
Subject: [PATCH 101/309] Fix for Ertai's Meddling

---
 .../java/forge/game/ability/effects/ChangeZoneEffect.java | 4 ----
 .../java/forge/game/ability/effects/EffectEffect.java     | 7 +++++++
 .../main/java/forge/game/spellability/SpellAbility.java   | 8 --------
 forge-gui/res/cardsfolder/e/ertais_meddling.txt           | 6 +++---
 4 files changed, 10 insertions(+), 15 deletions(-)

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 1381502eaea..e58bdca369f 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
@@ -1555,7 +1555,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
         Card movedCard = null;
         if (srcSA.hasParam("Destination")) {
             final boolean remember = srcSA.hasParam("RememberChanged");
-            final boolean rememberSpell = srcSA.hasParam("RememberSpell");
             final boolean imprint = srcSA.hasParam("Imprint");
             if (tgtSA.isAbility()) {
                 // Shouldn't be able to target Abilities but leaving this in for now
@@ -1591,9 +1590,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 srcSA.getHostCard().addRemembered(tgtHost);
                 // TODO or remember moved?
             }
-            if (rememberSpell) {
-                srcSA.getHostCard().addRemembered(tgtSA);
-            }
             if (imprint) {
                 srcSA.getHostCard().addImprintedCard(tgtHost);
             }
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 a33e668fecd..80b567426df 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
@@ -88,6 +88,13 @@ public class EffectEffect extends SpellAbilityEffect {
             effectKeywords = sa.getParam("Keywords").split(",");
         }
 
+        if (sa.hasParam("RememberSpell")) {
+            rememberList = new FCollection<>();
+            for (final String rem : sa.getParam("RememberSpell").split(",")) {
+                rememberList.addAll(AbilityUtils.getDefinedSpellAbilities(hostCard, rem, sa));
+            }
+        }
+
         if (sa.hasParam("RememberObjects")) {
             rememberList = new FCollection<>();
             for (final String rem : sa.getParam("RememberObjects").split(",")) {
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 fff1c723c13..9528878c710 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -1155,14 +1155,6 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         }
         newSA.setDescription(newSA.getDescription() + " (without paying its mana cost)");
 
-        //Normal copied spell will not copy castFaceDown flag
-        //But copyWithNoManaCost is used to get SA without mana cost
-        //So it need to copy the castFaceDown flag too
-        if (newSA instanceof Spell) {
-            Spell spell = (Spell) newSA;
-            spell.setCastFaceDown(this.isCastFaceDown());
-        }
-
         return newSA;
     }
 
diff --git a/forge-gui/res/cardsfolder/e/ertais_meddling.txt b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
index 30f17cd271e..896657769d1 100644
--- a/forge-gui/res/cardsfolder/e/ertais_meddling.txt
+++ b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
@@ -2,11 +2,11 @@ Name:Ertai's Meddling
 ManaCost:X U
 Types:Instant
 Text:X can't be 0.\r\n
-A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | RememberSpell$ True | SubAbility$ DBPutCounter | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
+A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | WithCountersType$ DELAY | WithCountersAmount$ X | SubAbility$ DBPutCounter | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
 SVar:X:Count$xPaid
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Imprinted | CounterType$ DELAY | CounterNum$ X | SubAbility$ DBDelayEffect
-SVar:DBDelayEffect:DB$ Effect | EffectOwner$ TargetedController | RememberObjects$ Remembered | ImprintCards$ Imprinted | Triggers$ TrigDelay,TrigExile | Duration$ Permanent | SubAbility$ DBForget
-SVar:DBForget:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+SVar:DBDelayEffect:DB$ Effect | EffectOwner$ TargetedController | RememberSpell$ Targeted | ImprintCards$ Imprinted | ConditionDefined$ Imprinted | ConditionPresent$ Card.inZoneExile | Triggers$ TrigDelay,TrigExile | Duration$ Permanent | SubAbility$ DBForget
+SVar:DBForget:DB$ Cleanup | ClearImprinted$ True
 # Add a fake trigger to display spell ability text ingame
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigLoseDelay | TriggerDescription$ At the beginning of each of that player's upkeeps, if that card is exiled, remove a delay counter from it. If the card has no delay counters on it, the player puts it onto the stack as a copy of the original spell.
 SVar:TrigDelay:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigLoseDelay | TriggerDescription$ At the beginning of each of that player's upkeeps, if that card is exiled, remove a delay counter from it. If the card has no delay counters on it, the player puts it onto the stack as a copy of the original spell.

From 8a201afb2780b13382ca74956abf99ef79f24e52 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 27 Jun 2022 18:18:03 +0100
Subject: [PATCH 102/309] WIP: The Hourglass Coven and spellbook cards

---
 .../res/cardsfolder/rebalanced/a-armory_veteran.txt  |  2 +-
 .../upcoming/hag_of_ceaseless_torment.txt            | 12 ++++++++++++
 .../res/cardsfolder/upcoming/hag_of_dark_duress.txt  |  8 ++++++++
 .../cardsfolder/upcoming/hag_of_deaths_legion.txt    |  8 ++++++++
 .../res/cardsfolder/upcoming/hag_of_mages_doom.txt   |  7 +++++++
 .../upcoming/hag_of_noxious_nightmares.txt           |  8 ++++++++
 .../cardsfolder/upcoming/hag_of_twisted_visions.txt  |  7 +++++++
 forge-gui/res/editions/Warhammer 40,000.txt          |  2 +-
 8 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_deaths_legion.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_twisted_visions.txt

diff --git a/forge-gui/res/cardsfolder/rebalanced/a-armory_veteran.txt b/forge-gui/res/cardsfolder/rebalanced/a-armory_veteran.txt
index cfbe12ce0ac..951637ba75a 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-armory_veteran.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-armory_veteran.txt
@@ -5,4 +5,4 @@ PT:2/2
 K:Ward:PayLife<2>
 S:Mode$ Continuous | Affected$ Card.Self+equipped | AddKeyword$ Menace | Description$ As long as CARDNAME is equipped, it has menace.
 SVar:EquipMe:Once
-Oracle:Ward—Pay 2 life.\nAs long as Armory Veteran is equipped, it has menace.
+Oracle:Ward — Pay 2 life.\nAs long as Armory Veteran is equipped, it has menace.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
new file mode 100644
index 00000000000..abcda42e12b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
@@ -0,0 +1,12 @@
+Name:Hag of Ceaseless Torment
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRepeat | TriggerDescription$ At the beginning of your upkeep, each opponent loses 3 life unless that player sacrifices a nonland permanent or discards a card.
+SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBChoose
+SVar:DBChoose:DB$ GenericChoice | Defined$ Player.IsRemembered | Choices$ SacNonland,Discard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
+SVar:SacNonland:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3 | UnlessCost$ Sac<1/Permanent.nonLand/nonland permanent> | UnlessPayer$ Player.IsRemembered | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
+SVar:Discard:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3 | UnlessCost$ Discard<1/Card> | UnlessPayer$ Player.IsRemembered | SpellDescription$ You lose 3 life unless you discard a card
+SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3
+DeckHas:Ability$Sacrifice|Discard
+Oracle:At the beginning of your upkeep, each opponent loses 3 life unless that player sacrifices a nonland permanent or discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
new file mode 100644
index 00000000000..da7bb73f8b5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
@@ -0,0 +1,8 @@
+Name:Hag of Dark Duress
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ At the beginning of your upkeep, each opponent discards a card.
+SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose
+DeckHas:Ability$Discard
+Oracle:At the beginning of your upkeep, each opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_deaths_legion.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_deaths_legion.txt
new file mode 100644
index 00000000000..f2ff49ba5b5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_deaths_legion.txt
@@ -0,0 +1,8 @@
+Name:Hag of Death's Legion
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create a 1/1 black Skeleton creature token.
+SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_skeleton
+DeckHas:Ability$Token & Type$Skeleton
+Oracle:At the beginning of your upkeep, create a 1/1 black Skeleton creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
new file mode 100644
index 00000000000..af0cc540fd6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
@@ -0,0 +1,7 @@
+Name:Hag of Mage's Doom
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+S:Mode$ Continuous | Affected$ Warlock+YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Warlocks you control have "Ward — Pay 2 life."
+DeckHints:Type$Warlock
+Oracle:Warlocks you control have "Ward — Pay 2 life."
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
new file mode 100644
index 00000000000..2d2a00999b0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
@@ -0,0 +1,8 @@
+Name:Hag of Noxious Nightmares
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+S:Mode$ Continuous | Affected$ Warlock+YouCtrl | AddKeyword$ Menace | Description$ Warlocks you control have menace.
+SVar:PlayMain1:TRUE
+DeckHints:Type$Warlock
+Oracle:Warlocks you control have menace.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_twisted_visions.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_twisted_visions.txt
new file mode 100644
index 00000000000..5f426869a17
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_twisted_visions.txt
@@ -0,0 +1,7 @@
+Name:Hag of Twisted Visions
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ At the beginning of your upkeep, scry 2.
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+Oracle:At the beginning of your upkeep, scry 2.
diff --git a/forge-gui/res/editions/Warhammer 40,000.txt b/forge-gui/res/editions/Warhammer 40,000.txt
index 539cb19dd24..a2d668fa8ac 100644
--- a/forge-gui/res/editions/Warhammer 40,000.txt	
+++ b/forge-gui/res/editions/Warhammer 40,000.txt	
@@ -1,6 +1,6 @@
 [metadata]
 Code=40K
-Date=2022-08-12
+Date=2022-10-07
 Name=Warhammer 40,000
 Type=Commander
 ScryfallCode=40K

From 127e5b1a66bc0b56a455e90d9ec6a8f36ca5c49e Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 27 Jun 2022 18:53:59 +0100
Subject: [PATCH 103/309] 2 more hags

---
 .../res/cardsfolder/upcoming/hag_of_dark_duress.txt      | 2 +-
 .../res/cardsfolder/upcoming/hag_of_inner_weakness.txt   | 8 ++++++++
 .../res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt | 9 +++++++++
 .../res/cardsfolder/upcoming/hag_of_syphoned_breath.txt  | 9 +++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
index da7bb73f8b5..33aa7eb6415 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ At the beginning of your upkeep, each opponent discards a card.
-SVar:TrigDiscard:DB$ Discard | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose
+SVar:TrigDiscard:DB$ Discard | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
 DeckHas:Ability$Discard
 Oracle:At the beginning of your upkeep, each opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
new file mode 100644
index 00000000000..f6895e91fbe
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
@@ -0,0 +1,8 @@
+Name:Hag of Inner Weakness
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of your upkeep, target creature an opponent controls gets -2/-1 until your next turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | NumAtt$ -2 | NumDef$ -1 | Duration$ UntilYourNextTurn
+SVar:PlayMain1:TRUE
+Oracle:At the beginning of your upkeep, target creature an opponent controls gets -2/-1 until your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
new file mode 100644
index 00000000000..c25432bc658
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
@@ -0,0 +1,9 @@
+Name:Hag of Scoured Thoughts
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your upkeep, each opponent mills five cards. Then exile each opponent's graveyard.
+SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ Player.Opponent | SubAbility$ DBExileGrave
+SVar:DBExileGrave:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | Defined$ Opponent | ChangeType$ Card
+DeckHas:Ability$Mill|Graveyard
+Oracle:At the beginning of your upkeep, each opponent mills five cards. Then exile each opponent's graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt
new file mode 100644
index 00000000000..e4223146620
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt
@@ -0,0 +1,9 @@
+Name:Hag of Syphoned Breath
+ManaCost:2 B
+Types:Creature Hag Warlock
+PT:2/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+DeckHas:Ability$LifeGain
+Oracle:At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life.

From 69a46da4c1bd57c3060045a5b31481ac866e2a22 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:45:40 -0400
Subject: [PATCH 104/309] ApiType add DraftEffect

---
 forge-game/src/main/java/forge/game/ability/ApiType.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-game/src/main/java/forge/game/ability/ApiType.java b/forge-game/src/main/java/forge/game/ability/ApiType.java
index 9016ad5f03b..1d1e13a525b 100644
--- a/forge-game/src/main/java/forge/game/ability/ApiType.java
+++ b/forge-game/src/main/java/forge/game/ability/ApiType.java
@@ -71,6 +71,7 @@ public enum ApiType {
     DigUntil (DigUntilEffect.class),
     Discard (DiscardEffect.class),
     DrainMana (DrainManaEffect.class),
+    Draft (DraftEffect.class),
     Draw (DrawEffect.class),
     EachDamage (DamageEachEffect.class),
     Effect (EffectEffect.class),

From e61e251026b2c04917c74394160802a89241d044 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:46:06 -0400
Subject: [PATCH 105/309] ChooseCardNameEffect.resolve remove Draft support

---
 .../game/ability/effects/ChooseCardNameEffect.java   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
index c55979fe7aa..a435520bf40 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java
@@ -54,7 +54,6 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
         }
 
         boolean randomChoice = sa.hasParam("AtRandom");
-        boolean draft = sa.hasParam("Draft"); //for digital "draft from spellbook" mechanic
         boolean chooseFromDefined = sa.hasParam("ChooseFromDefinedCards");
         boolean chooseFromList = sa.hasParam("ChooseFromList");
         boolean chooseFromOneTimeList = sa.hasParam("ChooseFromOneTimeList");
@@ -62,8 +61,6 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
         if (!randomChoice) {
             if (sa.hasParam("SelectPrompt")) {
                 message = sa.getParam("SelectPrompt");
-            } else if (draft) {
-                message = Localizer.getInstance().getMessage("lblChooseCardDraft");
             } else if (null == validDesc) {
                 message = Localizer.getInstance().getMessage("lblChooseACardName");
             } else {
@@ -108,12 +105,6 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
                     chosen = p.getController().chooseCardName(sa, faces, message);
                 } else if (chooseFromList) {
                     String [] names = sa.getParam("ChooseFromList").split(",");
-                    if (sa.hasParam("Draft")) {
-                        List<String> options = Arrays.asList(names);
-                        Collections.shuffle(options);
-                        List<String> draftChoices = options.subList(0,3);
-                        names = draftChoices.toArray(new String[0]);
-                    }
                     List<ICardFace> faces = new ArrayList<>();
                     for (String name : names) {
                         // Cardnames that include "," must use ";" instead in ChooseFromList$ (i.e. Tovolar; Dire Overlord)
@@ -169,9 +160,6 @@ public class ChooseCardNameEffect extends SpellAbilityEffect {
                 host.setNamedCard(chosen);
                 if (!randomChoice) {
                     p.setNamedCard(chosen);
-                    if (!draft) { //drafting is secret
-                        p.getGame().getAction().notifyOfValue(sa, host, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p);
-                    }
                 }
                 if (sa.hasParam("NoteFor")) {
                     p.addNoteForName(sa.getParam("NoteFor"), "Name:" + chosen);

From 2b67c8c49768bbabb5bf2c150f9ce78bc3237d10 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:46:15 -0400
Subject: [PATCH 106/309] DraftEffect.java

---
 .../game/ability/effects/DraftEffect.java     | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java

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
new file mode 100644
index 00000000000..fce1683f45e
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/ability/effects/DraftEffect.java
@@ -0,0 +1,83 @@
+package forge.game.ability.effects;
+
+import forge.StaticData;
+import forge.card.ICardFace;
+import forge.game.Game;
+import forge.game.ability.AbilityKey;
+import forge.game.ability.AbilityUtils;
+import forge.game.ability.SpellAbilityEffect;
+import forge.game.card.Card;
+import forge.game.card.CardCollection;
+import forge.game.player.Player;
+import forge.game.spellability.SpellAbility;
+import forge.game.zone.ZoneType;
+import forge.util.Localizer;
+
+import java.util.*;
+
+ public class DraftEffect extends SpellAbilityEffect {
+     @Override
+     protected String getStackDescription(SpellAbility sa) {
+         final Card source = sa.getHostCard();
+         final Player player = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa).get(0);
+         final ZoneType zone = ZoneType.smartValueOf(sa.getParamOrDefault("Zone", "Hand"));
+
+         final StringBuilder sb = new StringBuilder();
+
+         sb.append(player).append(" drafts a card from ").append(source.getName()).append("'s spellbook");
+         if (zone.equals("Hand")) {
+             sb.append(".");
+         } else if (zone.equals("Battlefield")) {
+             sb.append(" and puts it onto the battlefield.");
+         } else if (zone.equals("Exile")) {
+             sb.append(", then exiles it.");
+         }
+
+         return sb.toString();
+     }
+
+     @Override
+     public void resolve(SpellAbility sa) {
+        Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
+        moveParams.put(AbilityKey.LastStateBattlefield, sa.getLastStateBattlefield());
+        moveParams.put(AbilityKey.LastStateGraveyard, sa.getLastStateGraveyard());
+        final Card source = sa.getHostCard();
+        final Player player = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa).get(0);
+        final Game game = player.getGame();
+        final ZoneType zone = ZoneType.smartValueOf(sa.getParamOrDefault("Zone", "Hand"));
+        List<String> spellbook = Arrays.asList(sa.getParam("Spellbook").split(","));
+        String [] names = sa.getParam("Spellbook").split(",");
+        final int numToDraft = AbilityUtils.calculateAmount(source,
+                sa.getParamOrDefault("DraftNum", "1"), sa);
+        CardCollection drafted = new CardCollection();
+
+        for (int i = 0; i < numToDraft; i++) {
+            String chosen = "";
+            Collections.shuffle(spellbook);
+            List<ICardFace> faces = new ArrayList<>();
+            for (String name : spellbook.subList(0, 3)) {
+                // Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord)
+                name = name.replace(";", ",");
+                faces.add(StaticData.instance().getCommonCards().getFaceByName(name));
+            }
+            chosen = player.getController().chooseCardName(sa, faces,
+                    Localizer.getInstance().getMessage("lblChooseCardDraft"));
+            if (!chosen.equals("")) {
+                Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(chosen), player);
+                card.setTokenCard(true);
+                game.getAction().moveTo(ZoneType.None, card, sa, moveParams);
+                drafted.add(card);
+            }
+        }
+
+        for (final Card c : drafted) {
+            game.getAction().moveTo(zone, c, sa, moveParams);
+            if (sa.hasParam("RememberDrafted")) {
+                source.addRemembered(c);
+            }
+        }
+        if (zone.equals(ZoneType.Library)) {
+            player.shuffle(sa);
+        }
+    }
+ }
\ No newline at end of file

From 902706afd4f0c58a7144133fb30d8df51b4f8b77 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:46:42 -0400
Subject: [PATCH 107/309] SpellApiToAi.apiToClass handle DraftEffect

---
 forge-ai/src/main/java/forge/ai/SpellApiToAi.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-ai/src/main/java/forge/ai/SpellApiToAi.java b/forge-ai/src/main/java/forge/ai/SpellApiToAi.java
index 28d0ced5046..18742c0de7e 100644
--- a/forge-ai/src/main/java/forge/ai/SpellApiToAi.java
+++ b/forge-ai/src/main/java/forge/ai/SpellApiToAi.java
@@ -71,6 +71,7 @@ public enum SpellApiToAi {
             .put(ApiType.DigMultiple, DigMultipleAi.class)
             .put(ApiType.DigUntil, DigUntilAi.class)
             .put(ApiType.Discard, DiscardAi.class)
+            .put(ApiType.Draft, ChooseCardNameAi.class)
             .put(ApiType.DrainMana, DrainManaAi.class)
             .put(ApiType.Draw, DrawAi.class)
             .put(ApiType.EachDamage, DamageEachAi.class)

From 156b988c0dddc3a5d15ace135a0b76abeab49cb6 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:47:07 -0400
Subject: [PATCH 108/309] update existing cards

---
 forge-gui/res/cardsfolder/a/arms_scavenger.txt            | 6 +++---
 forge-gui/res/cardsfolder/b/boseiju_pathlighter.txt       | 4 +---
 forge-gui/res/cardsfolder/c/cursebound_witch.txt          | 4 +---
 forge-gui/res/cardsfolder/e/experimental_pilot.txt        | 4 +---
 forge-gui/res/cardsfolder/f/faithful_disciple.txt         | 4 +---
 forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt | 4 +---
 forge-gui/res/cardsfolder/h/hinterland_chef.txt           | 4 +---
 forge-gui/res/cardsfolder/i/imperial_blademaster.txt      | 4 +---
 forge-gui/res/cardsfolder/i/ishkanah_broodmother.txt      | 4 +---
 forge-gui/res/cardsfolder/k/key_to_the_archive.txt        | 6 ++----
 forge-gui/res/cardsfolder/o/ominous_traveler.txt          | 4 +---
 forge-gui/res/cardsfolder/s/slayers_bounty.txt            | 6 ++----
 forge-gui/res/cardsfolder/t/tibalt_wicked_tormentor.txt   | 7 +++----
 forge-gui/res/cardsfolder/t/tireless_angler.txt           | 4 +---
 forge-gui/res/cardsfolder/upcoming/bind_to_secrecy.txt    | 8 +++-----
 15 files changed, 23 insertions(+), 50 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/arms_scavenger.txt b/forge-gui/res/cardsfolder/a/arms_scavenger.txt
index 2058ae8b2e8..51b74afdb3c 100644
--- a/forge-gui/res/cardsfolder/a/arms_scavenger.txt
+++ b/forge-gui/res/cardsfolder/a/arms_scavenger.txt
@@ -3,10 +3,10 @@ ManaCost:1 R
 Types:Creature Human Warrior
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraft | TriggerDescription$ At the beginning of your upkeep, draft a card from CARDNAME's spellbook, then exile it. Until end of turn, you may play that card.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Boots of Speed,Cliffhaven Kitesail,Colossus Hammer,Dueling Rapier,Spare Dagger,Tormentor's Helm,Goldvein Pick,Jousting Lance,Mask of Immolation,Mirror Shield,Relic Axe,Rogue's Gloves,Scavenged Blade,Shield of the Realm,Ceremonial Knife | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Exile | RememberMade$ True | SubAbility$ DBEffect
+SVar:TrigDraft:DB$ Draft | Spellbook$ Boots of Speed,Cliffhaven Kitesail,Colossus Hammer,Dueling Rapier,Spare Dagger,Tormentor's Helm,Goldvein Pick,Jousting Lance,Mask of Immolation,Mirror Shield,Relic Axe,Rogue's Gloves,Scavenged Blade,Shield of the Realm,Ceremonial Knife | Zone$ Exile | RememberDrafted$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | ExileOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of turn, you may play that card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearNamedCard$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 S:Mode$ ReduceCost | ValidCard$ Card | ValidSpell$ Activated.Equip | Activator$ You | Amount$ 1 | Condition$ PlayerTurn | Description$ Equip abilities you activate cost {1} less to activate.
+DeckHints:Type$Equipment
 Oracle:At the beginning of your upkeep, draft a card from Arms Scavenger's spellbook, then exile it. Until end of turn, you may play that card.\nEquip abilities you activate cost {1} less to activate.
diff --git a/forge-gui/res/cardsfolder/b/boseiju_pathlighter.txt b/forge-gui/res/cardsfolder/b/boseiju_pathlighter.txt
index 6d9cad18a75..1ed21c37561 100644
--- a/forge-gui/res/cardsfolder/b/boseiju_pathlighter.txt
+++ b/forge-gui/res/cardsfolder/b/boseiju_pathlighter.txt
@@ -3,7 +3,5 @@ ManaCost:2 G
 Types:Creature Human Rogue
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME enters the battlefield, draft a card from CARDNAME's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Emergence Zone,Radiant Fountain,Scavenger Grounds,Boseiju; Who Endures,Gingerbread Cabin,Khalni Garden,Memorial to Unity,Thriving Grove,Hall of Oracles,Secluded Courtyard,Treasure Vault,Mobilized District,Bonders' Enclave,Roadside Reliquary,Field of Ruin | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | Spellbook$ Emergence Zone,Radiant Fountain,Scavenger Grounds,Boseiju; Who Endures,Gingerbread Cabin,Khalni Garden,Memorial to Unity,Thriving Grove,Hall of Oracles,Secluded Courtyard,Treasure Vault,Mobilized District,Bonders' Enclave,Roadside Reliquary,Field of Ruin
 Oracle:When Boseiju Pathlighter enters the battlefield, draft a card from Boseiju Pathlighter's spellbook.
diff --git a/forge-gui/res/cardsfolder/c/cursebound_witch.txt b/forge-gui/res/cardsfolder/c/cursebound_witch.txt
index b29d312128f..b87cc9b37ea 100644
--- a/forge-gui/res/cardsfolder/c/cursebound_witch.txt
+++ b/forge-gui/res/cardsfolder/c/cursebound_witch.txt
@@ -3,8 +3,6 @@ ManaCost:B
 Types:Creature Human Warlock
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME dies, draft a card from CARDNAME's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Witch's Cauldron,Witch's Vengeance,Witch's Oven,Witch's Cottage,Witch's Familiar,Curse of Leeches,Cauldron Familiar,Black Cat,Sorcerer's Broom,Bloodhunter Bat,Unwilling Ingredient,Expanded Anatomy,Cruel Reality,Torment of Scarabs,Trespasser's Curse | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | Spellbook$ Witch's Cauldron,Witch's Vengeance,Witch's Oven,Witch's Cottage,Witch's Familiar,Curse of Leeches,Cauldron Familiar,Black Cat,Sorcerer's Broom,Bloodhunter Bat,Unwilling Ingredient,Expanded Anatomy,Cruel Reality,Torment of Scarabs,Trespasser's Curse
 SVar:SacMe:2
 Oracle:When Cursebound Witch dies, draft a card from Cursebound Witch's spellbook.
diff --git a/forge-gui/res/cardsfolder/e/experimental_pilot.txt b/forge-gui/res/cardsfolder/e/experimental_pilot.txt
index 77395ecff08..802a401aec1 100644
--- a/forge-gui/res/cardsfolder/e/experimental_pilot.txt
+++ b/forge-gui/res/cardsfolder/e/experimental_pilot.txt
@@ -3,9 +3,7 @@ ManaCost:U
 Types:Creature Human Pilot
 PT:1/2
 K:Ward:2
-A:AB$ NameCard | Cost$ U Discard<2/Card> | Draft$ True | Defined$ You | ChooseFromList$ Cultivator's Caravan,Bomat Bazaar Barge,Raiders' Karve,Demolition Stomper,Futurist Sentinel,Mechtitan Core,Reckoner Bankbuster,High-Speed Hoverbike,Mindlink Mech,Silent Submersible,Mobile Garrison,Untethered Express,Ovalchase Dragster,Daredevil Dragster,Thundering Chariot | SubAbility$ DBMakeCard | SpellDescription$ Draft a card from CARDNAME's spellbook.
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+A:AB$ Draft | Cost$ U Discard<2/Card> | Spellbook$ Cultivator's Caravan,Bomat Bazaar Barge,Raiders' Karve,Demolition Stomper,Futurist Sentinel,Mechtitan Core,Reckoner Bankbuster,High-Speed Hoverbike,Mindlink Mech,Silent Submersible,Mobile Garrison,Untethered Express,Ovalchase Dragster,Daredevil Dragster,Thundering Chariot | SpellDescription$ Draft a card from CARDNAME's spellbook.
 S:Mode$ CrewValue | ValidCard$ Card.Self | Value$ 2 | Description$ CARDNAME crews Vehicles as though its power were 2 greater.
 DeckHints:Type$Vehicle
 Oracle:Ward {2}\n{U}, Discard two cards: Draft a card from Experimental Pilot's spellbook.\nExperimental Pilot crews Vehicles as though its power were 2 greater.
diff --git a/forge-gui/res/cardsfolder/f/faithful_disciple.txt b/forge-gui/res/cardsfolder/f/faithful_disciple.txt
index e0168859b52..d38ce905b3a 100644
--- a/forge-gui/res/cardsfolder/f/faithful_disciple.txt
+++ b/forge-gui/res/cardsfolder/f/faithful_disciple.txt
@@ -4,8 +4,6 @@ Types:Creature Human Cleric
 PT:2/2
 K:Vigilance
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME dies, draft a card from CARDNAME's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Anointed Procession,Cathars' Crusade,Authority of the Consuls,Sigil of the Empty Throne,All That Glitters,Banishing Light,Divine Visitation,Duelist's Heritage,Glorious Anthem,Gauntlets of Light,Teleportation Circle,Angelic Gift,Spectral Steel,Cleric Class,Angelic Exaltation | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | Spellbook$ Anointed Procession,Cathars' Crusade,Authority of the Consuls,Sigil of the Empty Throne,All That Glitters,Banishing Light,Divine Visitation,Duelist's Heritage,Glorious Anthem,Gauntlets of Light,Teleportation Circle,Angelic Gift,Spectral Steel,Cleric Class,Angelic Exaltation
 SVar:SacMe:2
 Oracle:Vigilance\nWhen Faithful Disciple dies, draft a card from Faithful Disciple's spellbook.
diff --git a/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt b/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt
index cce1747690e..eec1d3c1c43 100644
--- a/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_wrath_of_the_wilds.txt
@@ -7,8 +7,6 @@ SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualAbility,PerpetualP1P1 | Dur
 SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.ChosenCard | AddStaticAbility$ ReduceCost | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The chosen card perpetually gets +1/+1 and perpetually gains "This spell costs {1} less to cast."
 SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.ChosenCard | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Secondary$ True
 SVar:ReduceCost:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | Description$ This spell costs {1} less to cast.
-A:AB$ NameCard | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Draft$ True | Defined$ You | ChooseFromList$ Mosscoat Goriak,Sylvan Brushstrider,Murasa Rootgrazer,Dire Wolf Prowler,Ferocious Pup,Pestilent Wolf,Garruk's Uprising,Dawntreader Elk,Nessian Hornbeetle,Territorial Scythecat,Trufflesnout,Wary Okapi,Scurrid Colony,Barkhide Troll,Underdark Basilisk | SubAbility$ DBMakeCard | StackDescription$ SpellDescription | SpellDescription$ Draft a card from CARDNAME's spellbook and put it onto the battlefield.
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Battlefield | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True | ClearChosenCard$ True
+A:AB$ Draft | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Spellbook$ Mosscoat Goriak,Sylvan Brushstrider,Murasa Rootgrazer,Dire Wolf Prowler,Ferocious Pup,Pestilent Wolf,Garruk's Uprising,Dawntreader Elk,Nessian Hornbeetle,Territorial Scythecat,Trufflesnout,Wary Okapi,Scurrid Colony,Barkhide Troll,Underdark Basilisk | Zone$ Battlefield | SpellDescription$ Draft a card from CARDNAME's spellbook and put it onto the battlefield.
 A:AB$ PumpAll | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Until end of turn, creatures you control get +3/+3 and gain trample.
 Oracle:[+1]: Choose a creature card in your hand. It perpetually gets +1/+1 and perpetually gains "This spell costs {1} less to cast."\n[-1]: Draft a card from Garruk, Wrath of the Wild's spellbook and put it onto the battlefield.\n[-6]: Until end of turn, creatures you control get +3/+3 and gain trample.
diff --git a/forge-gui/res/cardsfolder/h/hinterland_chef.txt b/forge-gui/res/cardsfolder/h/hinterland_chef.txt
index 3318cd8febf..6636e361df0 100644
--- a/forge-gui/res/cardsfolder/h/hinterland_chef.txt
+++ b/forge-gui/res/cardsfolder/h/hinterland_chef.txt
@@ -3,9 +3,7 @@ ManaCost:2 G
 Types:Creature Human Scout
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME enters the battlefield, draft a card from CARDNAME's spellbook. It perpetually becomes a Food artifact in addition to its other types and perpetually gains "{2}, {T}, Sacrifice this creature: You gain 3 life."
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Almighty Brushwagg,Frilled Sandwalla,Moss Viper,Brushstrider,Highland Game,Ironshell Beetle,Lotus Cobra,Kazandu Nectarpot,Gilded Goose,Nessian Hornbeetle,Scurrid Colony,Territorial Boar,Deathbonnet Sprout,Spore Crawler,Moldgraf Millipede | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | RememberMade$ True | SubAbility$ DBClearName
-SVar:DBClearName:DB$ Cleanup | ClearNamedCard$ True | SubAbility$ DBEffect
+SVar:TrigDraft:DB$ Draft | Spellbook$ Almighty Brushwagg,Frilled Sandwalla,Moss Viper,Brushstrider,Highland Game,Ironshell Beetle,Lotus Cobra,Kazandu Nectarpot,Gilded Goose,Nessian Hornbeetle,Scurrid Colony,Territorial Boar,Deathbonnet Sprout,Spore Crawler,Moldgraf Millipede | RememberDrafted$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Hinterland Chef's Perpetual Effect | SubAbility$ DBCleanup
 SVar:PerpetualAbility:Mode$ Continuous | AddAbility$ FoodSac | AddType$ Food & Artifact | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually becomes a Food artifact in addition to its other types and perpetually gains "{2}, {T}, Sacrifice this creature: You gain 3 life."
 SVar:FoodSac:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME/this creature> | Defined$ You | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/i/imperial_blademaster.txt b/forge-gui/res/cardsfolder/i/imperial_blademaster.txt
index cf26d2bad85..b5568763781 100644
--- a/forge-gui/res/cardsfolder/i/imperial_blademaster.txt
+++ b/forge-gui/res/cardsfolder/i/imperial_blademaster.txt
@@ -4,8 +4,6 @@ Types:Creature Human Samurai
 PT:2/2
 K:Double Strike
 T:Mode$ Attacks | ValidCard$ Samurai.YouCtrl,Warrior.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigDraft | TriggerDescription$ Whenever a Samurai or Warrior you control attacks alone, draft a card from Imperial Blademaster's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Eiganjo Exemplar,Imperial Subduer,Ancestral Katana,Selfless Samurai,Norika Yamazaki; the Poet,Akki Ronin,Peerless Samurai,Heiko Yamazaki; the General,Asari Captain,Eiganjo Uprising,Eater of Virtue,Sunblade Samurai,Reinforced Ronin,Adamant Will,Tempered in Solitude | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | Spellbook$ Eiganjo Exemplar,Imperial Subduer,Ancestral Katana,Selfless Samurai,Norika Yamazaki; the Poet,Akki Ronin,Peerless Samurai,Heiko Yamazaki; the General,Asari Captain,Eiganjo Uprising,Eater of Virtue,Sunblade Samurai,Reinforced Ronin,Adamant Will,Tempered in Solitude
 DeckHints:Type$Samurai|Warrior
 Oracle:Double strike\nWhenever a Samurai or Warrior you control attacks alone, draft a card from Imperial Blademaster's spellbook.
diff --git a/forge-gui/res/cardsfolder/i/ishkanah_broodmother.txt b/forge-gui/res/cardsfolder/i/ishkanah_broodmother.txt
index ec9d3b3e41d..2f1d6d18a79 100644
--- a/forge-gui/res/cardsfolder/i/ishkanah_broodmother.txt
+++ b/forge-gui/res/cardsfolder/i/ishkanah_broodmother.txt
@@ -4,8 +4,6 @@ Types:Legendary Creature Spider
 PT:3/5
 K:Reach
 S:Mode$ Continuous | Affected$ Creature.Spider+Other+YouCtrl | AddPower$ 1 | AddToughness$ 2 | Description$ Other Spiders you control get +1/+2.
-A:AB$ NameCard | Cost$ 1 BG ExileFromGrave<2/card> | Draft$ True | Defined$ You | ChooseFromList$ Twin-Silk Spider,Drider,Brood Weaver,Glowstone Recluse,Gnottvold Recluse,Hatchery Spider,Mammoth Spider,Netcaster Spider,Sentinel Spider,Snarespinner,Sporecap Spider,Spidery Grasp,Spider Spawning,Prey Upon,Arachnoform | SubAbility$ DBMakeCard | SpellDescription$ Draft a card from CARDNAME's spellbook.
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+A:AB$ Draft | Cost$ 1 BG ExileFromGrave<2/Card> | Spellbook$ Twin-Silk Spider,Drider,Brood Weaver,Glowstone Recluse,Gnottvold Recluse,Hatchery Spider,Mammoth Spider,Netcaster Spider,Sentinel Spider,Snarespinner,Sporecap Spider,Spidery Grasp,Spider Spawning,Prey Upon,Arachnoform | SpellDescription$ Draft a card from CARDNAME's spellbook.
 DeckHints:Type$Spider
 Oracle:Reach\nOther Spiders you control get +1/+2.\n{1}{B/G}, Exile two cards from your graveyard: Draft a card from Ishkanah, Broodmother's spellbook.
diff --git a/forge-gui/res/cardsfolder/k/key_to_the_archive.txt b/forge-gui/res/cardsfolder/k/key_to_the_archive.txt
index 6ac413f2aae..97d95f596c8 100644
--- a/forge-gui/res/cardsfolder/k/key_to_the_archive.txt
+++ b/forge-gui/res/cardsfolder/k/key_to_the_archive.txt
@@ -3,9 +3,7 @@ ManaCost:4
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME enters the battlefield, draft a card from CARDNAME's spellbook, then discard a card.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Approach of the Second Sun,Day of Judgment,Time Warp,Counterspell,Demonic Tutor,Doom Blade,Lightning Bolt,Claim the Firstborn,Krosan Grip,Regrowth,Despark,Electrolyze,Growth Spiral,Lightning Helix,Putrefy | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+SVar:TrigDraft:DB$ Draft | Spellbook$ Approach of the Second Sun,Day of Judgment,Time Warp,Counterspell,Demonic Tutor,Doom Blade,Lightning Bolt,Claim the Firstborn,Krosan Grip,Regrowth,Despark,Electrolyze,Growth Spiral,Lightning Helix,Putrefy | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose
 A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | SpellDescription$ Add two mana in any combination of colors.
 Oracle:Key to the Archive enters the battlefield tapped.\nWhen Key to the Archive enters the battlefield, draft a card from Key to the Archive's spellbook, then discard a card.\n{T}: Add two mana in any combination of colors.
diff --git a/forge-gui/res/cardsfolder/o/ominous_traveler.txt b/forge-gui/res/cardsfolder/o/ominous_traveler.txt
index 882c60ab9f4..0d25c6e2684 100644
--- a/forge-gui/res/cardsfolder/o/ominous_traveler.txt
+++ b/forge-gui/res/cardsfolder/o/ominous_traveler.txt
@@ -3,9 +3,7 @@ ManaCost:2
 Types:Creature Human
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME enters the battlefield, draft a card from CARDNAME's spellbook. That card perpetually gains "You may spend mana as though it were mana of any color to cast this spell" and "When you cast this spell, return a card named Ominous Traveler you control to its owner's hand."
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Dominating Vampire,Vampire Socialite,Stromkirk Bloodthief,Falkenrath Pit Fighter,Wolfkin Outcast,Howlpack Piper,Tovolar; Dire Overlord,Patrician Geist,Shipwreck Sifters,Steelclad Spirit,Heron-Blessed Geist,Archghoul of Thraben,Champion of the Perished,Headless Rider,Bladestitched Skaab | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | RememberMade$ True | SubAbility$ DBClearName
-SVar:DBClearName:DB$ Cleanup | ClearNamedCard$ True | SubAbility$ DBEffect
+SVar:TrigDraft:DB$ Draft | Spellbook$ Dominating Vampire,Vampire Socialite,Stromkirk Bloodthief,Falkenrath Pit Fighter,Wolfkin Outcast,Howlpack Piper,Tovolar; Dire Overlord,Patrician Geist,Shipwreck Sifters,Steelclad Spirit,Heron-Blessed Geist,Archghoul of Thraben,Champion of the Perished,Headless Rider,Bladestitched Skaab | RememberDrafted$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | Triggers$ Update | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Name$ Ominous Traveler's Perpetual Effect | SubAbility$ DBCleanup
 SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | AddTrigger$ CastTrigger | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell" and "When you cast this spell, return a card named Ominous Traveler you control to its owner's hand."
 SVar:SpendAnyMana:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AffectedZone$ Stack | AddHiddenKeyword$ May spend mana as though it were mana of any color to cast CARDNAME | Description$ You may spend mana as though it were mana of any color to cast this spell.
diff --git a/forge-gui/res/cardsfolder/s/slayers_bounty.txt b/forge-gui/res/cardsfolder/s/slayers_bounty.txt
index b83857f730b..de071ea0892 100644
--- a/forge-gui/res/cardsfolder/s/slayers_bounty.txt
+++ b/forge-gui/res/cardsfolder/s/slayers_bounty.txt
@@ -3,10 +3,8 @@ ManaCost:W
 Types:Legendary Artifact Clue
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ When CARDNAME enters the battlefield, look at the creature cards in target opponent's hand.
 SVar:TrigPeek:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Look$ True | RevealType$ Creature
-T:Mode$ Sacrificed | ValidCard$ Clue.YouCtrl | Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever you CARDNAME or another Clue, draft a card from CARDNAME's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Bounty Agent,Outflank,Bound in Gold,Bring to Trial,Glass Casket,Reprobation,Collar the Culprit,Compulsory Rest,Expel,Fairgrounds Warden,Iron Verdict,Luminous Bonds,Raise the Alarm,Seal Away,Summary Judgment | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+T:Mode$ Sacrificed | ValidCard$ Card.Self,Clue.Other+YouCtrl | Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice CARDNAME or another Clue, draft a card from CARDNAME's spellbook.
+SVar:TrigDraft:DB$ Draft | Spellbook$ Bounty Agent,Outflank,Bound in Gold,Bring to Trial,Glass Casket,Reprobation,Collar the Culprit,Compulsory Rest,Expel,Fairgrounds Warden,Iron Verdict,Luminous Bonds,Raise the Alarm,Seal Away,Summary Judgment
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 DeckHas:Ability$Sacrifice
 DeckHints:Ability$Investigate & Type$Clue
diff --git a/forge-gui/res/cardsfolder/t/tibalt_wicked_tormentor.txt b/forge-gui/res/cardsfolder/t/tibalt_wicked_tormentor.txt
index e01e9e20c4a..91414c41a27 100644
--- a/forge-gui/res/cardsfolder/t/tibalt_wicked_tormentor.txt
+++ b/forge-gui/res/cardsfolder/t/tibalt_wicked_tormentor.txt
@@ -3,14 +3,13 @@ ManaCost:3 R R
 Types:Legendary Planeswalker Tibalt
 Loyalty:3
 A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 2 | SubAbility$ DBDraft | SpellDescription$ Add {R}{R}.
-SVar:DBDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Chained Brute,Charmbreaker Devils,Festival Crasher,Forge Devil,Frenzied Devils,Havoc Jester,Hellrider,Hobblefiend,Pitchburn Devils,Sin Prodder,Spiteful Prankster,Tibalt's Rager,Torch Fiend,Brimstone Vandal,Devil's Play | SubAbility$ DBMakeCard | StackDescription$ SpellDescription | SpellDescription$ Draft a card from CARDNAME's spellbook, then exile it.
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Exile | RememberMade$ True | SubAbility$ DBEffect
+SVar:DBDraft:DB$ Draft | Spellbook$ Chained Brute,Charmbreaker Devils,Festival Crasher,Forge Devil,Frenzied Devils,Havoc Jester,Hellrider,Hobblefiend,Pitchburn Devils,Sin Prodder,Spiteful Prankster,Tibalt's Rager,Torch Fiend,Brimstone Vandal,Devil's Play | Zone$ Exile | RememberDrafted$ True | SubAbility$ DBEffect | SpellDescription$ Draft a card from CARDNAME's spellbook, then exile it.
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | ExileOnMoved$ Exile | SubAbility$ DBCleanup | SpellDescription$ Until end of turn, you may cast that card.
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of turn, you may cast that card.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearNamedCard$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ 4 | UnlessCost$ DamageYou<4> | UnlessPayer$ TargetedController | UnlessResolveSubs$ WhenPaid | SubAbility$ DBDiscardDraw | StackDescription$ CARDNAME deals 4 damage to {c:Targeted} unless {p:TargetedController} has NICKNAME deal 4 damage to them. | SpellDescription$ CARDNAME deals 4 damage to target creature or planeswalker unless its controller has NICKNAME deal 4 damage to them.
 SVar:DBDiscardDraw:DB$ Draw | NumCards$ 1 | UnlessCost$ Discard<1/Card> | UnlessPayer$ You | UnlessSwitched$ True | OrString$ Draw a card. | StackDescription$ SpellDescription | SpellDescription$ If they do, you may discard a card. If you do, draw card.
 A:AB$ Token | Cost$ SubCounter<X/LOYALTY> | Planeswalker$ True | TokenAmount$ X | TokenScript$ r_1_1_devil_burn | SpellDescription$ Create X 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."
 SVar:X:Count$xPaid
-DeckHas:Ability$Discard|Token
+DeckHas:Ability$Discard|Token & Type$Devil
 Oracle:[+1]: Add {R}{R}. Draft a card from Tibalt, Wicked Tormentor's spellbook, then exile it. Until end of turn, you may cast that card.\n[+1]: Tibalt, Wicked Tormentor deals 4 damage to target creature or planeswalker unless its controller has Tibalt deal 4 damage to them. If they do, you may discard a card. If you do, draw card.\n[-X]: Create X 1/1 red Devil creature tokens with "When this creature dies, it deals 1 damage to any target."
diff --git a/forge-gui/res/cardsfolder/t/tireless_angler.txt b/forge-gui/res/cardsfolder/t/tireless_angler.txt
index ed35ecb56d8..7efaab8884a 100644
--- a/forge-gui/res/cardsfolder/t/tireless_angler.txt
+++ b/forge-gui/res/cardsfolder/t/tireless_angler.txt
@@ -3,8 +3,6 @@ ManaCost:2 U
 Types:Creature Human Rogue
 PT:2/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Island.YouCtrl,Swamp.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraft | TriggerDescription$ Whenever an Island or Swamp enters the battlefield under your control, draft a card from CARDNAME's spellbook.
-SVar:TrigDraft:DB$ NameCard | Draft$ True | Defined$ You | ChooseFromList$ Fleet Swallower,Moat Piranhas,Mystic Skyfish,Nadir Kraken,Pouncing Shoreshark,Sea-Dasher Octopus,Spined Megalodon,Stinging Lionfish,Voracious Greatshark,Archipelagore,Serpent of Yawning Depths,Wormhole Serpent,Sigiled Starfish,Riptide Turtle,Ruin Crab | SubAbility$ DBMakeCard
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | Spellbook$ Fleet Swallower,Moat Piranhas,Mystic Skyfish,Nadir Kraken,Pouncing Shoreshark,Sea-Dasher Octopus,Spined Megalodon,Stinging Lionfish,Voracious Greatshark,Archipelagore,Serpent of Yawning Depths,Wormhole Serpent,Sigiled Starfish,Riptide Turtle,Ruin Crab
 SVar:BuffedBy:Island
 Oracle:Whenever an Island or Swamp enters the battlefield under your control, draft a card from Tireless Angler's spellbook.
diff --git a/forge-gui/res/cardsfolder/upcoming/bind_to_secrecy.txt b/forge-gui/res/cardsfolder/upcoming/bind_to_secrecy.txt
index ae8ebff1463..006c5fa2d22 100644
--- a/forge-gui/res/cardsfolder/upcoming/bind_to_secrecy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/bind_to_secrecy.txt
@@ -4,14 +4,12 @@ Types:Instant
 A:SP$ Charm | Choices$ CounterNonCreature,DBConjure | CharmNum$ 1
 SVar:CounterNonCreature:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target noncreature spell | ValidTgts$ Card.nonCreature | SubAbility$ TrigDraft | SpellDescription$ Counter target noncreature spell.
 SVar:DBConjure:DB$ MakeCard | TgtPrompt$ Select target creature card in an opponent's graveyard | ValidTgts$ Creature.OppOwn+inZoneGraveyard | TgtZone$ Graveyard | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBEffect | SpellDescription$ Conjure a duplicate of target creature card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
-SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Bind to Secrecy's Perpetual Effect | SubAbility$ DBCleanup | SubAbility$ TrigDraft | SpellDescription$ It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+SVar:DBEffect:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Bind to Secrecy's Perpetual Effect | SubAbility$ DBCleanup | SpellDescription$ It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:PerpetualAbility:Mode$ Continuous | AddStaticAbility$ SpendAnyMana | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ The conjured card perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:SpendAnyMana:Mode$ Continuous | Affected$ Card.Self | EffectZone$ All | AffectedZone$ Stack | AddHiddenKeyword$ May spend mana as though it were mana of any color to cast CARDNAME | Description$ You may spend mana as though it were mana of any color to cast this spell.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ TrigDraft
 SVar:Update:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBUpdate
 SVar:DBUpdate:DB$ UpdateRemember
-SVar:TrigDraft:DB$ NameCard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Draft$ True | Defined$ You | ChooseFromList$ Corpse Churn,Corpse Hauler,Courier Bat,Durable Coilbug,Fear of Death,Gorging Vulture,Locked in the Cemetery,Naga Oracle,Necrotic Wound,Obsessive Stitcher,Reassembling Skeleton,Strategic Planning,Unmarked Grave,Wonder | SubAbility$ DBMakeCard | SpellDescription$ If there are five or more mana values among cards in your graveyard, draft a card from CARDNAME's spellbook.
-SVar:DBMakeCard:DB$ MakeCard | Name$ ChosenName | Zone$ Hand | SubAbility$ DBCleanupName
-SVar:DBCleanupName:DB$ Cleanup | ClearNamedCard$ True
+SVar:TrigDraft:DB$ Draft | ConditionCheckSVar$ X | ConditionSVarCompare$ GE5 | Spellbook$ Corpse Churn,Corpse Hauler,Courier Bat,Durable Coilbug,Fear of Death,Gorging Vulture,Locked in the Cemetery,Naga Oracle,Necrotic Wound,Obsessive Stitcher,Reassembling Skeleton,Strategic Planning,Unmarked Grave,Wonder | SpellDescription$ If there are five or more mana values among cards in your graveyard, draft a card from CARDNAME's spellbook.
 SVar:X:Count$ValidGraveyard Card.YouOwn$DifferentCMC
 Oracle:Choose one —\n• Counter target noncreature spell.\n• Conjure a duplicate of target creature card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."\nIf there are five or more mana values among cards in your graveyard, draft a card from Bind to Secrecy's spellbook.

From 92f3298366baa78b2fece875da0fc16bef48f73a Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 27 Jun 2022 23:50:26 -0400
Subject: [PATCH 109/309] DraftEffect newline at file end

---
 .../src/main/java/forge/game/ability/effects/DraftEffect.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fce1683f45e..653a8f85b86 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
@@ -80,4 +80,4 @@ import java.util.*;
             player.shuffle(sa);
         }
     }
- }
\ No newline at end of file
+ }

From 1975cb11315773d038c3add8ebf6918810cfd232 Mon Sep 17 00:00:00 2001
From: Magpie <323651+magpie514@users.noreply.github.com>
Date: Tue, 28 Jun 2022 08:52:33 +0200
Subject: [PATCH 110/309] Adventure mode - Adjustments (#1006)

* Fix incorrect card name.

Co-authored-by: Magpie <magpie514@users.noreply.github.com>
---
 forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
index bab8a5c600f..667c80f2a83 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/skep.tmx
@@ -81,7 +81,7 @@
   </object>
   <object id="63" template="../../obj/scroll.tx" x="144" y="48">
    <properties>
-    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Terraforming Expanse&quot;, &quot;count&quot;: 1 } ]"/>
+    <property name="reward" value="[ { &quot;type&quot;: &quot;card&quot;, &quot;cardName&quot;: &quot;Terramorphic Expanse&quot;, &quot;count&quot;: 1 } ]"/>
    </properties>
   </object>
  </objectgroup>

From 3fea3fae5a771896fcef25bb59015ddd5c410862 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 28 Jun 2022 09:05:14 +0100
Subject: [PATCH 111/309] hourglass_coven

---
 .../res/cardsfolder/upcoming/hag_of_mages_doom.txt     |  2 +-
 .../cardsfolder/upcoming/hag_of_noxious_nightmares.txt |  2 +-
 .../res/cardsfolder/upcoming/the_hourglass_coven.txt   | 10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/the_hourglass_coven.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
index af0cc540fd6..cd8f0aef00e 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_mages_doom.txt
@@ -2,6 +2,6 @@ Name:Hag of Mage's Doom
 ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
-S:Mode$ Continuous | Affected$ Warlock+YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Warlocks you control have "Ward — Pay 2 life."
+S:Mode$ Continuous | Affected$ Warlock.YouCtrl | AddKeyword$ Ward:PayLife<2> | Description$ Warlocks you control have "Ward — Pay 2 life."
 DeckHints:Type$Warlock
 Oracle:Warlocks you control have "Ward — Pay 2 life."
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
index 2d2a00999b0..f7fede0ba3b 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_noxious_nightmares.txt
@@ -2,7 +2,7 @@ Name:Hag of Noxious Nightmares
 ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
-S:Mode$ Continuous | Affected$ Warlock+YouCtrl | AddKeyword$ Menace | Description$ Warlocks you control have menace.
+S:Mode$ Continuous | Affected$ Warlock.YouCtrl | AddKeyword$ Menace | Description$ Warlocks you control have menace.
 SVar:PlayMain1:TRUE
 DeckHints:Type$Warlock
 Oracle:Warlocks you control have menace.
diff --git a/forge-gui/res/cardsfolder/upcoming/the_hourglass_coven.txt b/forge-gui/res/cardsfolder/upcoming/the_hourglass_coven.txt
new file mode 100644
index 00000000000..f6ca0ed4750
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/the_hourglass_coven.txt
@@ -0,0 +1,10 @@
+Name:The Hourglass Coven
+ManaCost:4 B B
+Types:Legendary Creature Hag Warlock
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraft | TriggerDescription$ When CARDNAME enters the battlefield, draft a card from CARDNAME's spellbook twice, then put those cards onto the battlefield.
+SVar:TrigDraft:DB$ Draft | DraftNum$ 2 | Spellbook$ Hag of Syphoned Breath,Hag of Dark Duress,Hag of Ceaseless Torment,Hag of Inner Weakness,Hag of Death's Legion,Hag of Scoured Thoughts,Hag of Twisted Visions,Hag of Mage's Doom,Hag of Noxious Nightmares | Zone$ Battlefield
+S:Mode$ Continuous | Affected$ Warlock.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Warlocks you control get +1/+1.
+SVar:PlayMain1:TRUE
+DeckHints:Type$Warlock
+Oracle:When The Hourglass Coven enters the battlefield, draft a card from The Hourglass Coven's spellbook twice, then put those cards onto the battlefield.\nOther Warlocks you control get +1/+1.

From f05b0e0d9ea1d71897bffd80680d100da44e5b44 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Tue, 28 Jun 2022 09:54:21 +0100
Subject: [PATCH 112/309] CLB Banishment&Wyll Blade of Frontiers (#728)

* CLB Banishment

* Create wyll_blade_of_frontiers.txt

* Update wyll_blade_of_frontiers.txt

* Update banishment.txt

* Update banishment.txt

* Update wyll_blade_of_frontiers.txt
---
 forge-gui/res/cardsfolder/upcoming/banishment.txt     |  8 ++++++++
 .../cardsfolder/upcoming/wyll_blade_of_frontiers.txt  | 11 +++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/banishment.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/wyll_blade_of_frontiers.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/banishment.txt b/forge-gui/res/cardsfolder/upcoming/banishment.txt
new file mode 100644
index 00000000000..afa09aa2693
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/banishment.txt
@@ -0,0 +1,8 @@
+Name:Banishment
+ManaCost:3 W
+Types:Enchantment
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target nonland permanent an opponent controls and all other nonland permanents that player controls with the same name as that permanent until CARDNAME leaves the battlefield.
+SVar:TrigExile:DB$ Pump | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | SubAbility$ DBChangeZoneAll
+SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Exile | ChangeType$ TargetedCard.Self,Permanent.nonLand+NotDefinedTargeted+sharesNameWith Targeted+ControlledBy TargetedController | Duration$ UntilHostLeavesPlay
+Oracle:When Banishment enters the battlefield, exile target nonland permanent an opponent controls and all other nonland permanents your opponents control with the same name as that permanent until Banishment leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/wyll_blade_of_frontiers.txt b/forge-gui/res/cardsfolder/upcoming/wyll_blade_of_frontiers.txt
new file mode 100644
index 00000000000..801e553ece8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/wyll_blade_of_frontiers.txt
@@ -0,0 +1,11 @@
+Name:Wyll, Blade of Frontiers
+ManaCost:1 R
+Types:Legendary Creature Human Warlock
+PT:1/1
+S:Mode$ Continuous | Affected$ You | AddKeyword$ If you would roll one or more dice, instead roll that many dice plus one and ignore the lowest roll. | Description$ If you would roll one or more dice, instead roll that many dice plus one and ignore the lowest roll.
+T:Mode$ RolledDieOnce | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPut | TriggerDescription$ Whenever you roll one or more dice, put a +1/+1 counter on CARDNAME.
+SVar:TrigPut:DB$ PutCounter |  CounterType$ P1P1 
+K:Choose a Background
+AI:RemoveDeck:Random
+DeckHas:Ability$Counters
+Oracle:If you would roll one or more dice, instead roll that many dice plus one and ignore the lowest roll.\nWhenever you roll one or more dice, put a +1/+1 counter on Wyll, Blade of Frontiers.\nChoose a Background (You can have a Background as a second commander.)

From fb3ff290921065927f1b94330b0871e4afd13498 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Tue, 28 Jun 2022 11:07:04 +0200
Subject: [PATCH 113/309] Update ertais_meddling.txt

---
 forge-gui/res/cardsfolder/e/ertais_meddling.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/e/ertais_meddling.txt b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
index 896657769d1..3aa6a679c9a 100644
--- a/forge-gui/res/cardsfolder/e/ertais_meddling.txt
+++ b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
@@ -2,7 +2,7 @@ Name:Ertai's Meddling
 ManaCost:X U
 Types:Instant
 Text:X can't be 0.\r\n
-A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | WithCountersType$ DELAY | WithCountersAmount$ X | SubAbility$ DBPutCounter | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
+A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | SubAbility$ DBPutCounter | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
 SVar:X:Count$xPaid
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Imprinted | CounterType$ DELAY | CounterNum$ X | SubAbility$ DBDelayEffect
 SVar:DBDelayEffect:DB$ Effect | EffectOwner$ TargetedController | RememberSpell$ Targeted | ImprintCards$ Imprinted | ConditionDefined$ Imprinted | ConditionPresent$ Card.inZoneExile | Triggers$ TrigDelay,TrigExile | Duration$ Permanent | SubAbility$ DBForget

From 4d52b495ebd5f8c934e66399fd2c0e6e2edd9357 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Tue, 28 Jun 2022 17:16:59 +0200
Subject: [PATCH 114/309] With counters added directly

---
 .../forge/game/ability/effects/ChangeZoneEffect.java   | 10 ++++++++--
 forge-gui/res/cardsfolder/e/ertais_meddling.txt        |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

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 e58bdca369f..7cd41ae5634 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
@@ -511,7 +511,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 continue;
             }
 
-            removeFromStack(tgtSA, sa, si, game, triggerList);
+            removeFromStack(tgtSA, sa, si, game, triggerList, counterTable);
         } // End of change from stack
 
         final String remember = sa.getParam("RememberChanged");
@@ -1543,7 +1543,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
      *            object.
      * @param game
      */
-    private static void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbilityStackInstance si, final Game game, CardZoneTable triggerList) {
+    private static void removeFromStack(final SpellAbility tgtSA, final SpellAbility srcSA, final SpellAbilityStackInstance si, final Game game, CardZoneTable triggerList, GameEntityCounterTable counterTable) {
         final Card tgtHost = tgtSA.getHostCard();
         final Zone originZone = tgtHost.getZone();
         game.getStack().remove(si);
@@ -1586,6 +1586,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                         + srcSA.getHostCard().getName());
             }
 
+            if (srcSA.hasParam("WithCountersType")) {
+                CounterType cType = CounterType.getType(srcSA.getParam("WithCountersType"));
+                int cAmount = AbilityUtils.calculateAmount(srcSA.getHostCard(), srcSA.getParamOrDefault("WithCountersAmount", "1"), srcSA);
+                movedCard.addCounter(cType, cAmount, srcSA.getActivatingPlayer(), counterTable);
+            }
+
             if (remember) {
                 srcSA.getHostCard().addRemembered(tgtHost);
                 // TODO or remember moved?
diff --git a/forge-gui/res/cardsfolder/e/ertais_meddling.txt b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
index 3aa6a679c9a..1bd69da78ac 100644
--- a/forge-gui/res/cardsfolder/e/ertais_meddling.txt
+++ b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
@@ -2,9 +2,8 @@ Name:Ertai's Meddling
 ManaCost:X U
 Types:Instant
 Text:X can't be 0.\r\n
-A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | SubAbility$ DBPutCounter | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
+A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | WithCountersType$ DELAY | WithCountersAmount$ X | SubAbility$ DBDelayEffect | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
 SVar:X:Count$xPaid
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Imprinted | CounterType$ DELAY | CounterNum$ X | SubAbility$ DBDelayEffect
 SVar:DBDelayEffect:DB$ Effect | EffectOwner$ TargetedController | RememberSpell$ Targeted | ImprintCards$ Imprinted | ConditionDefined$ Imprinted | ConditionPresent$ Card.inZoneExile | Triggers$ TrigDelay,TrigExile | Duration$ Permanent | SubAbility$ DBForget
 SVar:DBForget:DB$ Cleanup | ClearImprinted$ True
 # Add a fake trigger to display spell ability text ingame

From bfd421bf988ec7f7d3f298600bec528da7df36c2 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 28 Jun 2022 12:03:27 -0400
Subject: [PATCH 115/309] MakeCardEffect.resolve add ChangesZoneAll trigger

---
 .../main/java/forge/game/ability/effects/MakeCardEffect.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
index 1d4a92e7d7e..5f746118833 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
@@ -9,6 +9,7 @@ import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
+import forge.game.card.CardZoneTable;
 import forge.game.player.Player;
 import forge.game.player.PlayerCollection;
 import forge.game.spellability.SpellAbility;
@@ -60,8 +61,10 @@ public class MakeCardEffect extends SpellAbilityEffect {
                     amount--;
                 }
 
+                final CardZoneTable triggerList = new CardZoneTable();
                 for (final Card c : cards) {
                     game.getAction().moveTo(zone, c, sa, moveParams);
+                    triggerList.put(ZoneType.None, c.getZone().getZoneType(), c);
                     if (sa.hasParam("RememberMade")) {
                         sa.getHostCard().addRemembered(c);
                     }
@@ -69,6 +72,7 @@ public class MakeCardEffect extends SpellAbilityEffect {
                         sa.getHostCard().addImprintedCard(c);
                     }
                 }
+                triggerList.triggerChangesZoneAll(game, sa);
                 if (zone.equals(ZoneType.Library)) {
                     player.shuffle(sa);
                 }

From 4613b76bfa9821688b694e5ba3f92b897553f978 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 28 Jun 2022 12:03:45 -0400
Subject: [PATCH 116/309] DraftEffect.resolve add ChangesZoneAll trigger

---
 .../game/ability/effects/DraftEffect.java     | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

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 653a8f85b86..d0b3007de1c 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
@@ -8,6 +8,7 @@ import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
+import forge.game.card.CardZoneTable;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
@@ -38,46 +39,50 @@ import java.util.*;
 
      @Override
      public void resolve(SpellAbility sa) {
-        Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
-        moveParams.put(AbilityKey.LastStateBattlefield, sa.getLastStateBattlefield());
-        moveParams.put(AbilityKey.LastStateGraveyard, sa.getLastStateGraveyard());
-        final Card source = sa.getHostCard();
-        final Player player = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa).get(0);
-        final Game game = player.getGame();
-        final ZoneType zone = ZoneType.smartValueOf(sa.getParamOrDefault("Zone", "Hand"));
-        List<String> spellbook = Arrays.asList(sa.getParam("Spellbook").split(","));
-        String [] names = sa.getParam("Spellbook").split(",");
-        final int numToDraft = AbilityUtils.calculateAmount(source,
-                sa.getParamOrDefault("DraftNum", "1"), sa);
-        CardCollection drafted = new CardCollection();
+         Map<AbilityKey, Object> moveParams = AbilityKey.newMap();
+         moveParams.put(AbilityKey.LastStateBattlefield, sa.getLastStateBattlefield());
+         moveParams.put(AbilityKey.LastStateGraveyard, sa.getLastStateGraveyard());
+         final Card source = sa.getHostCard();
+         final Player player = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa).get(0);
+         final Game game = player.getGame();
+         final ZoneType zone = ZoneType.smartValueOf(sa.getParamOrDefault("Zone", "Hand"));
+         List<String> spellbook = Arrays.asList(sa.getParam("Spellbook").split(","));
+         final int numToDraft = AbilityUtils.calculateAmount(source,
+                 sa.getParamOrDefault("DraftNum", "1"), sa);
+         CardCollection drafted = new CardCollection();
 
-        for (int i = 0; i < numToDraft; i++) {
-            String chosen = "";
-            Collections.shuffle(spellbook);
-            List<ICardFace> faces = new ArrayList<>();
-            for (String name : spellbook.subList(0, 3)) {
-                // Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord)
-                name = name.replace(";", ",");
-                faces.add(StaticData.instance().getCommonCards().getFaceByName(name));
-            }
-            chosen = player.getController().chooseCardName(sa, faces,
-                    Localizer.getInstance().getMessage("lblChooseCardDraft"));
-            if (!chosen.equals("")) {
-                Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(chosen), player);
-                card.setTokenCard(true);
-                game.getAction().moveTo(ZoneType.None, card, sa, moveParams);
-                drafted.add(card);
-            }
-        }
+         for (int i = 0; i < numToDraft; i++) {
+             String chosen = "";
+             Collections.shuffle(spellbook);
+             List<ICardFace> faces = new ArrayList<>();
+             for (String name : spellbook.subList(0, 3)) {
+                 // Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord)
+                 // name = name.replace(";", ",");
+                 // faces.add(StaticData.instance().getCommonCards().getFaceByName(name));
+             }
+             chosen = player.getController().chooseCardName(sa, faces,
+                     Localizer.getInstance().getMessage("lblChooseCardDraft"));
+             if (!chosen.equals("")) {
+                 Card card = Card.fromPaperCard(StaticData.instance().getCommonCards().getUniqueByName(chosen), player);
+                 card.setTokenCard(true);
+                 game.getAction().moveTo(ZoneType.None, card, sa, moveParams);
+                 drafted.add(card);
+             }
+         }
 
-        for (final Card c : drafted) {
-            game.getAction().moveTo(zone, c, sa, moveParams);
-            if (sa.hasParam("RememberDrafted")) {
-                source.addRemembered(c);
-            }
-        }
-        if (zone.equals(ZoneType.Library)) {
-            player.shuffle(sa);
-        }
-    }
+         final CardZoneTable triggerList = new CardZoneTable();
+         for (final Card c : drafted) {
+             game.getAction().moveTo(zone, c, sa, moveParams);
+             if (c != null) {
+                 triggerList.put(ZoneType.None, c.getZone().getZoneType(), c);
+             }
+             if (sa.hasParam("RememberDrafted")) {
+                 source.addRemembered(c);
+             }
+         }
+         triggerList.triggerChangesZoneAll(game, sa);
+         if (zone.equals(ZoneType.Library)) {
+             player.shuffle(sa);
+         }
+     }
  }

From fe8175169a190a98f3a2f1eb7da9bde13dfcff40 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 28 Jun 2022 17:50:33 +0100
Subject: [PATCH 117/309] fixes

---
 .../res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt | 8 ++++----
 forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt | 2 +-
 .../res/cardsfolder/upcoming/hag_of_inner_weakness.txt    | 1 -
 .../res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt  | 2 +-
 .../res/cardsfolder/upcoming/hag_of_syphoned_breath.txt   | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
index abcda42e12b..8d5980791c0 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_ceaseless_torment.txt
@@ -4,9 +4,9 @@ Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRepeat | TriggerDescription$ At the beginning of your upkeep, each opponent loses 3 life unless that player sacrifices a nonland permanent or discards a card.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBChoose
-SVar:DBChoose:DB$ GenericChoice | Defined$ Player.IsRemembered | Choices$ SacNonland,Discard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
-SVar:SacNonland:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3 | UnlessCost$ Sac<1/Permanent.nonLand/nonland permanent> | UnlessPayer$ Player.IsRemembered | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
-SVar:Discard:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3 | UnlessCost$ Discard<1/Card> | UnlessPayer$ Player.IsRemembered | SpellDescription$ You lose 3 life unless you discard a card
-SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ 3
+SVar:DBChoose:DB$ GenericChoice | Defined$ Remembered | Choices$ SacNonland,Discard | FallbackAbility$ LoseLifeFallback | AILogic$ PayUnlessCost
+SVar:SacNonland:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 3 | UnlessCost$ Sac<1/Permanent.nonLand/nonland permanent> | UnlessPayer$ Remembered | SpellDescription$ You lose 3 life unless you sacrifice a nonland permanent
+SVar:Discard:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 3 | UnlessCost$ Discard<1/Card> | UnlessPayer$ Remembered | SpellDescription$ You lose 3 life unless you discard a card
+SVar:LoseLifeFallback:DB$ LoseLife | Defined$ Remembered | LifeAmount$ 3
 DeckHas:Ability$Sacrifice|Discard
 Oracle:At the beginning of your upkeep, each opponent loses 3 life unless that player sacrifices a nonland permanent or discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
index 33aa7eb6415..7877186b0a0 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_dark_duress.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ At the beginning of your upkeep, each opponent discards a card.
-SVar:TrigDiscard:DB$ Discard | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
+SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose
 DeckHas:Ability$Discard
 Oracle:At the beginning of your upkeep, each opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
index f6895e91fbe..8b45644d160 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_inner_weakness.txt
@@ -4,5 +4,4 @@ Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ At the beginning of your upkeep, target creature an opponent controls gets -2/-1 until your next turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls | NumAtt$ -2 | NumDef$ -1 | Duration$ UntilYourNextTurn
-SVar:PlayMain1:TRUE
 Oracle:At the beginning of your upkeep, target creature an opponent controls gets -2/-1 until your next turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
index c25432bc658..62ca386a7b0 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_scoured_thoughts.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ At the beginning of your upkeep, each opponent mills five cards. Then exile each opponent's graveyard.
-SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ Player.Opponent | SubAbility$ DBExileGrave
+SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ Opponent | SubAbility$ DBExileGrave
 SVar:DBExileGrave:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | Defined$ Opponent | ChangeType$ Card
 DeckHas:Ability$Mill|Graveyard
 Oracle:At the beginning of your upkeep, each opponent mills five cards. Then exile each opponent's graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt b/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt
index e4223146620..9e21e96ecba 100644
--- a/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt
+++ b/forge-gui/res/cardsfolder/upcoming/hag_of_syphoned_breath.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Hag Warlock
 PT:2/2
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
 DeckHas:Ability$LifeGain
 Oracle:At the beginning of your upkeep, each opponent loses 2 life and you gain 2 life.

From 7ed781f3d28ba1cb6aab4b0be1609a72edbf6e6b Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Wed, 29 Jun 2022 08:48:51 +0200
Subject: [PATCH 118/309] Cleanup some cards (#1011)

Co-authored-by: TRT <>
---
 .../main/java/forge/game/card/CardProperty.java   | 15 ---------------
 .../c/curious_homunculus_voracious_reader.txt     |  2 +-
 forge-gui/res/cardsfolder/g/galazeth_prismari.txt |  2 +-
 forge-gui/res/cardsfolder/j/jaya_ballard.txt      |  2 +-
 forge-gui/res/cardsfolder/k/karfell_harbinger.txt |  2 +-
 .../life_of_toshiro_umezawa_memory_of_toshiro.txt |  2 +-
 ...ezumi_graverobber_nighteyes_the_desecrator.txt |  2 +-
 forge-gui/res/cardsfolder/s/skulking_killer.txt   |  2 +-
 .../res/cardsfolder/u/unblinking_observer.txt     |  2 +-
 forge-gui/res/cardsfolder/u/unified_will.txt      |  2 +-
 forge-gui/res/cardsfolder/v/vodalian_arcanist.txt |  2 +-
 forge-gui/res/cardsfolder/w/weight_of_spires.txt  |  2 +-
 12 files changed, 11 insertions(+), 26 deletions(-)

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 562c4bf0fa2..058c45b80c7 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -255,21 +255,6 @@ public class CardProperty {
             if (!AbilityUtils.getDefinedPlayers(source, "TargetedPlayer", spellAbility).contains(controller)) {
                 return false;
             }
-        } else if (property.equals("TargetedControllerCtrl")) {
-            final CardCollectionView cards = AbilityUtils.getDefinedCards(source, "Targeted", spellAbility);
-            final List<SpellAbility> sas = AbilityUtils.getDefinedSpellAbilities(source, "Targeted", spellAbility);
-            for (final Card c : cards) {
-                final Player p = c.getController();
-                if (!controller.equals(p)) {
-                    return false;
-                }
-            }
-            for (final SpellAbility s : sas) {
-                final Player p = s.getHostCard().getController();
-                if (!controller.equals(p)) {
-                    return false;
-                }
-            }
         } else if (property.startsWith("ActivePlayerCtrl")) {
             if (!game.getPhaseHandler().isPlayerTurn(controller)) {
                 return false;
diff --git a/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt b/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
index 914e80b9d2b..8d0094bf978 100644
--- a/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
+++ b/forge-gui/res/cardsfolder/c/curious_homunculus_voracious_reader.txt
@@ -2,7 +2,7 @@ Name:Curious Homunculus
 ManaCost:1 U
 Types:Creature Homunculus
 PT:1/1
-A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Instant,Sorcery | SpellDescription$ Add {C}. Spend this mana only to cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add {C}. Spend this mana only to cast an instant or sorcery spell.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Instant.YouOwn,Sorcery.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE3 | Execute$ TrigTransform | TriggerDescription$ At the beginning of your upkeep, if there are three or more instant and/or sorcery cards in your graveyard, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 DeckHints:Type$Instant|Sorcery & Ability$Graveyard
diff --git a/forge-gui/res/cardsfolder/g/galazeth_prismari.txt b/forge-gui/res/cardsfolder/g/galazeth_prismari.txt
index 401df28a1aa..682e530ed32 100644
--- a/forge-gui/res/cardsfolder/g/galazeth_prismari.txt
+++ b/forge-gui/res/cardsfolder/g/galazeth_prismari.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 S:Mode$ Continuous | Affected$ Artifact.YouCtrl | AddAbility$ AnyMana | Description$ Artifacts you control have "{T}: Add one mana of any color. Spend this mana only to cast an instant or sorcery spell."
-SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Instant,Sorcery | SpellDescription$ Add one mana of any color. Spend this mana only to cast instant or sorcery spells.
+SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add one mana of any color. Spend this mana only to cast instant or sorcery spells.
 DeckHas:Ability$Token
 DeckNeeds:Type$Instant|Sorcery
 Oracle:Flying\nWhen Galazeth Prismari enters the battlefield, create a Treasure token.\nArtifacts you control have "{T}: Add one mana of any color. Spend this mana only to cast an instant or sorcery spell."
diff --git a/forge-gui/res/cardsfolder/j/jaya_ballard.txt b/forge-gui/res/cardsfolder/j/jaya_ballard.txt
index 68306a84d04..5daec05743e 100644
--- a/forge-gui/res/cardsfolder/j/jaya_ballard.txt
+++ b/forge-gui/res/cardsfolder/j/jaya_ballard.txt
@@ -2,7 +2,7 @@ Name:Jaya Ballard
 ManaCost:2 R R R
 Types:Legendary Planeswalker Jaya
 Loyalty:5
-A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 3 | RestrictValid$ Instant,Sorcery | AILogic$ ManaRitual | SpellDescription$ Add {R}{R}{R}. Spend this mana only to cast instant or sorcery spells.
+A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 3 | RestrictValid$ Spell.Instant,Spell.Sorcery | AILogic$ ManaRitual | SpellDescription$ Add {R}{R}{R}. Spend this mana only to cast instant or sorcery spells.
 A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 3 | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ Discard up to three cards, then draw that many cards.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/k/karfell_harbinger.txt b/forge-gui/res/cardsfolder/k/karfell_harbinger.txt
index 9070bdc8bc1..6bc8c9006f9 100644
--- a/forge-gui/res/cardsfolder/k/karfell_harbinger.txt
+++ b/forge-gui/res/cardsfolder/k/karfell_harbinger.txt
@@ -2,6 +2,6 @@ Name:Karfell Harbinger
 ManaCost:1 U
 Types:Creature Zombie Wizard
 PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Static.Foretelling,Instant,Sorcery | SpellDescription$ Add {U}. Spend this mana only to foretell a card from your hand or cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Static.Foretelling,Spell.Instant,Spell.Sorcery | SpellDescription$ Add {U}. Spend this mana only to foretell a card from your hand or cast an instant or sorcery spell.
 DeckHints:Type$Instant|Sorcery
 Oracle:{T}: Add {U}. Spend this mana only to foretell a card from your hand or cast an instant or sorcery spell.
diff --git a/forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt b/forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt
index 94c7dd18e6e..cc9a78b6f43 100644
--- a/forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt
+++ b/forge-gui/res/cardsfolder/l/life_of_toshiro_umezawa_memory_of_toshiro.txt
@@ -20,6 +20,6 @@ ManaCost:no cost
 Colors:black
 Types:Enchantment Creature Human Samurai
 PT:2/3
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | RestrictValid$ Instant,Sorcery | SpellDescription$ Add {B}. Spend this mana only to cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ B | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add {B}. Spend this mana only to cast an instant or sorcery spell.
 DeckHints:Type$Instant|Sorcery
 Oracle:{T}, Pay 1 life: Add {B}. Spend this mana only to cast an instant or sorcery spell.
diff --git a/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt b/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
index f53192013cc..cc58d720381 100644
--- a/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
+++ b/forge-gui/res/cardsfolder/n/nezumi_graverobber_nighteyes_the_desecrator.txt
@@ -4,7 +4,7 @@ Types:Creature Rat Rogue
 PT:2/1
 A:AB$ ChangeZone | Cost$ 1 B | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.OppOwn | TgtPrompt$ Select target card in an opponent's graveyard | SubAbility$ DBFlip | SpellDescription$ Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip CARDNAME.
 SVar:DBFlip:DB$ SetState | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | Mode$ Flip
-SVar:X:Count$ValidGraveyard Card.TargetedControllerCtrl
+SVar:X:Count$ValidGraveyard Card.OwnedBy TargetedController
 AlternateMode:Flip
 Oracle:{1}{B}: Exile target card from an opponent's graveyard. If no cards are in that graveyard, flip Nezumi Graverobber.
 
diff --git a/forge-gui/res/cardsfolder/s/skulking_killer.txt b/forge-gui/res/cardsfolder/s/skulking_killer.txt
index 0ee86cbf421..eca3bb5c03c 100644
--- a/forge-gui/res/cardsfolder/s/skulking_killer.txt
+++ b/forge-gui/res/cardsfolder/s/skulking_killer.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire Assassin
 PT:4/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature an opponent controls gets -2/-2 until end of turn if that opponent controls no other creatures.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumAtt$ -2 | NumDef$ -2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1
-SVar:X:Count$Valid Creature.TargetedControllerCtrl
+SVar:X:Count$Valid Creature.ControlledBy TargetedController
 AI:RemoveDeck:Random
 Oracle:When Skulking Killer enters the battlefield, target creature an opponent controls gets -2/-2 until end of turn if that opponent controls no other creatures.
diff --git a/forge-gui/res/cardsfolder/u/unblinking_observer.txt b/forge-gui/res/cardsfolder/u/unblinking_observer.txt
index ed40196a69c..d85d793d93d 100644
--- a/forge-gui/res/cardsfolder/u/unblinking_observer.txt
+++ b/forge-gui/res/cardsfolder/u/unblinking_observer.txt
@@ -2,7 +2,7 @@ Name:Unblinking Observer
 ManaCost:1 U
 Types:Creature Homunculus
 PT:2/1
-A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Disturb,Instant,Sorcery | SpellDescription$ Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Disturb,Spell.Instant,Spell.Sorcery | SpellDescription$ Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
 DeckNeeds:Type$Instant|Sorcery
 DeckHints:Keyword$Disturb
 Oracle:{T}: Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
diff --git a/forge-gui/res/cardsfolder/u/unified_will.txt b/forge-gui/res/cardsfolder/u/unified_will.txt
index 2a872d07670..7e49fa383d5 100644
--- a/forge-gui/res/cardsfolder/u/unified_will.txt
+++ b/forge-gui/res/cardsfolder/u/unified_will.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U | TargetType$ Spell | ValidTgts$ Card | ConditionCheckSVar$ YourPeerGroup | ConditionSVarCompare$ GTY | SpellDescription$ Counter target spell if you control more creatures than that spell's controller.
 SVar:YourPeerGroup:Count$Valid Creature.YouCtrl
-SVar:Y:Count$Valid Creature.TargetedControllerCtrl
+SVar:Y:Count$Valid Creature.ControlledBy TargetedController
 SVar:NeedsToPlayVar:YourPeerGroup GTY
 Oracle:Counter target spell if you control more creatures than that spell's controller.
diff --git a/forge-gui/res/cardsfolder/v/vodalian_arcanist.txt b/forge-gui/res/cardsfolder/v/vodalian_arcanist.txt
index fca65c471eb..aedc0d4c39f 100644
--- a/forge-gui/res/cardsfolder/v/vodalian_arcanist.txt
+++ b/forge-gui/res/cardsfolder/v/vodalian_arcanist.txt
@@ -2,6 +2,6 @@ Name:Vodalian Arcanist
 ManaCost:1 U
 Types:Creature Merfolk Wizard
 PT:1/3
-A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Instant,Sorcery | SpellDescription$ Add {C}. Spend this mana only to cast an instant or sorcery spell.
+A:AB$ Mana | Cost$ T | Produced$ C | RestrictValid$ Spell.Instant,Spell.Sorcery | SpellDescription$ Add {C}. Spend this mana only to cast an instant or sorcery spell.
 DeckHints:Type$Instant|Sorcery
 Oracle:{T}: Add {C}. Spend this mana only to cast an instant or sorcery spell.
diff --git a/forge-gui/res/cardsfolder/w/weight_of_spires.txt b/forge-gui/res/cardsfolder/w/weight_of_spires.txt
index 65a23647f4c..2863189272c 100644
--- a/forge-gui/res/cardsfolder/w/weight_of_spires.txt
+++ b/forge-gui/res/cardsfolder/w/weight_of_spires.txt
@@ -2,6 +2,6 @@ Name:Weight of Spires
 ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target creature equal to the number of nonbasic lands that creature's controller controls.
-SVar:X:Count$Valid Land.nonBasic+TargetedControllerCtrl
+SVar:X:Count$Valid Land.nonBasic+ControlledBy TargetedController
 AI:RemoveDeck:All
 Oracle:Weight of Spires deals damage to target creature equal to the number of nonbasic lands that creature's controller controls.

From e029bc1a54976a710c8fbae0403c08dbf6e64539 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Wed, 29 Jun 2022 17:41:25 +0200
Subject: [PATCH 119/309] WithCountersPlacer

---
 .../java/forge/game/ability/effects/ChangeZoneEffect.java   | 6 +++++-
 forge-gui/res/cardsfolder/e/ertais_meddling.txt             | 2 +-
 forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt         | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

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 7cd41ae5634..3e9b0b92176 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
@@ -1587,9 +1587,13 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             }
 
             if (srcSA.hasParam("WithCountersType")) {
+                Player placer = srcSA.getActivatingPlayer();
+                if (srcSA.hasParam("WithCountersPlacer")) {
+                    placer = AbilityUtils.getDefinedPlayers(srcSA.getHostCard(), srcSA.getParam("WithCountersPlacer"), srcSA).get(0);
+                }
                 CounterType cType = CounterType.getType(srcSA.getParam("WithCountersType"));
                 int cAmount = AbilityUtils.calculateAmount(srcSA.getHostCard(), srcSA.getParamOrDefault("WithCountersAmount", "1"), srcSA);
-                movedCard.addCounter(cType, cAmount, srcSA.getActivatingPlayer(), counterTable);
+                movedCard.addCounter(cType, cAmount, placer, counterTable);
             }
 
             if (remember) {
diff --git a/forge-gui/res/cardsfolder/e/ertais_meddling.txt b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
index 1bd69da78ac..1b9ef4ef0c1 100644
--- a/forge-gui/res/cardsfolder/e/ertais_meddling.txt
+++ b/forge-gui/res/cardsfolder/e/ertais_meddling.txt
@@ -2,7 +2,7 @@ Name:Ertai's Meddling
 ManaCost:X U
 Types:Instant
 Text:X can't be 0.\r\n
-A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | WithCountersType$ DELAY | WithCountersAmount$ X | SubAbility$ DBDelayEffect | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
+A:SP$ ChangeZone | Cost$ XCantBe0 X U | TgtZone$ Stack | TargetType$ Spell | ValidTgts$ Card | Origin$ Stack | Destination$ Exile | Imprint$ True | WithCountersType$ DELAY | WithCountersAmount$ X | WithCountersPlacer$ TargetedController | SubAbility$ DBDelayEffect | SpellDescription$ Target spell's controller exiles it with X delay counters on it.
 SVar:X:Count$xPaid
 SVar:DBDelayEffect:DB$ Effect | EffectOwner$ TargetedController | RememberSpell$ Targeted | ImprintCards$ Imprinted | ConditionDefined$ Imprinted | ConditionPresent$ Card.inZoneExile | Triggers$ TrigDelay,TrigExile | Duration$ Permanent | SubAbility$ DBForget
 SVar:DBForget:DB$ Cleanup | ClearImprinted$ True
diff --git a/forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt b/forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt
index fe2ed00ce97..1293ff019d9 100644
--- a/forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt
+++ b/forge-gui/res/cardsfolder/e/evelyn_the_covetous.txt
@@ -8,3 +8,4 @@ SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | Defined$ Player | Destinat
 S:Mode$ Continuous | MayPlayLimit$ 1 | Affected$ Card.ExiledByYou+counters_GE1_COLLECTION | AffectedZone$ Exile | MayPlay$ True | MayPlayIgnoreColor$ True | Description$ Once each turn, you may play a card from exile with a collection counter on it if it was exiled by an ability you controlled, and you may spend mana as though it were any color to cast it.
 DeckHints:Type$Vampire
 Oracle:Flash\nWhenever Evelyn, the Covetous or another Vampire enters the battlefield under your control, exile the top card of each player's library with a collection counter on it.
+\nOnce each turn, you may play a card from exile with a collection counter on it if it was exiled by an ability you controlled, and you may spend mana as though it were mana of any color to cast it.
\ No newline at end of file

From 23a820527bd485dac6e9ade5dbc1d08d86849563 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Wed, 29 Jun 2022 10:55:26 -0500
Subject: [PATCH 120/309] Create kagha_shadow_archdruid.txt (#1009)

* Create kagha_shadow_archdruid.txt

-closes #884

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt

* Update kagha_shadow_archdruid.txt
---
 .../cardsfolder/upcoming/kagha_shadow_archdruid.txt   | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/kagha_shadow_archdruid.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/kagha_shadow_archdruid.txt b/forge-gui/res/cardsfolder/upcoming/kagha_shadow_archdruid.txt
new file mode 100644
index 00000000000..28338c2b94f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kagha_shadow_archdruid.txt
@@ -0,0 +1,11 @@
+Name:Kagha, Shadow Archdruid
+ManaCost:2 B G
+Types:Legendary Creature Elf Druid
+PT:1/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | Subability$ TrigMill | TriggerDescription$ Whenever CARDNAME attacks, it gains deathtouch until end of turn. Mill two cards. (Put the top two cards of your library into your graveyard.)
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Deathtouch
+SVar:TrigMill:DB$ Mill | NumCards$ 2
+S:Mode$ Continuous | Affected$ Land.YouOwn+ThisTurnEnteredFrom_Library,Spell.Permanent+YouOwn+ThisTurnEnteredFrom_Library | Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may play a land or cast a permanent spell from among cards in your graveyard that were put there from your library this turn.
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Mill & Ability$Graveyard
+Oracle:Whenever Kagha, Shadow Archdruid attacks, it gains deathtouch until end of turn. Mill two cards. (Put the top two cards of your library into your graveyard.)\nOnce during each of your turns, you may play a land or cast a permanent spell from among cards in your graveyard that were put there from your library this turn.

From 8b7fbd63cc86316e309f4f324bbd37154cce604f Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Wed, 29 Jun 2022 21:02:05 +0200
Subject: [PATCH 121/309] Fix unmorphing being prevented by invalid static

---
 .../java/forge/game/spellability/SpellAbilityRestriction.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
index 25a41f579c4..99e347d2e02 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -499,6 +499,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
 
             // check static abilities
             game.getTracker().freeze();
+            cp.clearStaticChangedCardKeywords(false);
             CardCollection preList = new CardCollection(cp);
             game.getAction().checkStaticAbilities(false, Sets.newHashSet(cp), preList);
 

From 85ddcb8ff63d3cc17c00fca8296bd9256bcbf8a0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 30 Jun 2022 15:31:27 +0800
Subject: [PATCH 122/309] handle 301.5c

closes #1012
---
 .../main/java/forge/game/card/CardFactoryUtil.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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 673af59f78f..9bfbb1da957 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -2794,7 +2794,18 @@ public class CardFactoryUtil {
             abilityStr.append(equipCost);
             abilityStr.append("| ValidTgts$ ").append(valid);
             abilityStr.append(" | TgtPrompt$ Select target ").append(vstr).append(" you control ");
-            abilityStr.append("| SorcerySpeed$ True | Equip$ True | AILogic$ Pump | IsPresent$ Equipment.Self+nonCreature ");
+            if (card.hasKeyword(Keyword.RECONFIGURE)) {
+                /*
+                * 301.5c An Equipment that’s also a creature can’t equip a creature unless that Equipment has reconfigure (see rule 702.151, “Reconfigure”).
+                * An Equipment that loses the subtype “Equipment” can’t equip a creature. An Equipment can’t equip itself. An Equipment that equips an illegal
+                * or nonexistent permanent becomes unattached from that permanent but remains on the battlefield. (This is a state-based action. See rule 704.)
+                * An Equipment can’t equip more than one creature. If a spell or ability would cause an Equipment to equip more than one creature,
+                * the Equipment’s controller chooses which creature it equips.
+                */
+                abilityStr.append("| SorcerySpeed$ True | Equip$ True | AILogic$ Pump | IsPresent$ Equipment.Self ");
+            } else {
+                abilityStr.append("| SorcerySpeed$ True | Equip$ True | AILogic$ Pump | IsPresent$ Equipment.Self+nonCreature ");
+            }
             // add AttachAi for some special cards
             if (card.hasSVar("AttachAi")) {
                 abilityStr.append("| ").append(card.getSVar("AttachAi"));

From 5aa69712459b359b0e461e87d394a1e462bcb228 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 1 Jul 2022 20:36:36 +0800
Subject: [PATCH 123/309] Update token-images.txt

---
 forge-gui/res/lists/token-images.txt | 1533 +++++++++++++-------------
 1 file changed, 786 insertions(+), 747 deletions(-)

diff --git a/forge-gui/res/lists/token-images.txt b/forge-gui/res/lists/token-images.txt
index 8bec5af7ebc..565def55a53 100644
--- a/forge-gui/res/lists/token-images.txt
+++ b/forge-gui/res/lists/token-images.txt
@@ -1,7 +1,9 @@
-# Tokens
+ajanis_pridemate.jpg https://downloads.cardforge.org/images/tokens/ajanis_pridemate.jpg
 ajanis_pridemate_m20.jpg https://downloads.cardforge.org/images/tokens/ajanis_pridemate_m20.jpg
+all_2_2_citizen.jpg https://downloads.cardforge.org/images/tokens/all_2_2_citizen.jpg
+all_2_2_citizen_war.jpg https://downloads.cardforge.org/images/tokens/all_2_2_citizen_war.jpg
+ashaya_the_awoken_world.jpg https://downloads.cardforge.org/images/tokens/ashaya_the_awoken_world.jpg
 ashaya_the_awoken_world_ori.jpg https://downloads.cardforge.org/images/tokens/ashaya_the_awoken_world_ori.jpg
-ashaya_the_awoken_world_v17.jpg https://downloads.cardforge.org/images/tokens/ashaya_the_awoken_world_v17.jpg
 b_0_0_germ.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ.jpg
 b_0_0_germ_2xm.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_2xm.jpg
 b_0_0_germ_c14.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_c14.jpg
@@ -10,144 +12,153 @@ b_0_0_germ_c16.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_c16.
 b_0_0_germ_cm2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_cm2.jpg
 b_0_0_germ_cma.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_cma.jpg
 b_0_0_germ_mbs.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_mbs.jpg
+b_0_0_germ_mh2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_mh2.jpg
 b_0_0_germ_mm2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_mm2.jpg
 b_0_0_germ_nph.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_nph.jpg
-b_0_0_germ_pc2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_pc2.jpg
 b_0_0_germ_pca.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_pca.jpg
-b_0_0_germ_pz1.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_pz1.jpg
-b_0_0_germ_td2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_td2.jpg
 b_0_0_germ_znc.jpg https://downloads.cardforge.org/images/tokens/b_0_0_germ_znc.jpg
+b_0_0_phyrexian_germ.jpg https://downloads.cardforge.org/images/tokens/b_0_0_phyrexian_germ.jpg
+b_0_0_phyrexian_germ_nec.jpg https://downloads.cardforge.org/images/tokens/b_0_0_phyrexian_germ_nec.jpg
 b_0_0_zombie_army.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army.jpg
 b_0_0_zombie_army2_war.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army2_war.jpg
 b_0_0_zombie_army3_war.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army3_war.jpg
+b_0_0_zombie_army_mh2.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army_mh2.jpg
+b_0_0_zombie_army_mic.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army_mic.jpg
 b_0_0_zombie_army_war.jpg https://downloads.cardforge.org/images/tokens/b_0_0_zombie_army_war.jpg
+b_0_1_cleric.jpg https://downloads.cardforge.org/images/tokens/b_0_1_cleric.jpg
 b_0_1_cleric_dom.jpg https://downloads.cardforge.org/images/tokens/b_0_1_cleric_dom.jpg
-b_0_1_insect_mir.jpg https://downloads.cardforge.org/images/tokens/b_0_1_insect_mir.jpg
-b_0_1_serf_5ed.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf_5ed.jpg
-b_0_1_serf_6ed.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf_6ed.jpg
+b_0_1_insect.jpg https://downloads.cardforge.org/images/tokens/b_0_1_insect.jpg
+b_0_1_serf.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf.jpg
 b_0_1_serf_ema.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf_ema.jpg
-b_0_1_serf_hml.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf_hml.jpg
-b_0_1_serf_tsb.jpg https://downloads.cardforge.org/images/tokens/b_0_1_serf_tsb.jpg
 b_0_1_thrull.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull.jpg
-b_0_1_thrull_5ed.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_5ed.jpg
 b_0_1_thrull_cmr.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_cmr.jpg
 b_0_1_thrull_ddc.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_ddc.jpg
-b_0_1_thrull_dvd.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_dvd.jpg
-b_0_1_thrull_fem.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_fem.jpg
-b_0_1_thrull_me1.jpg https://downloads.cardforge.org/images/tokens/b_0_1_thrull_me1.jpg
-b_1_1_assassin_ddm.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_ddm.jpg
+b_1_1_assassin_deathtouch.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch.jpg
+b_1_1_assassin_deathtouch_haste.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch_haste.jpg
 b_1_1_assassin_deathtouch_haste_cn2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch_haste_cn2.jpg
 b_1_1_assassin_deathtouch_pwdestroy.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch_pwdestroy.jpg
-b_1_1_assassin_deathtouch_pwdestroy_war.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch_pwdestroy_war.jpg
+b_1_1_assassin_deathtouch_war.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_deathtouch_war.jpg
+b_1_1_assassin_lose_con.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_lose_con.jpg
+b_1_1_assassin_lose_con_c19.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_lose_con_c19.jpg
 b_1_1_assassin_lose_con_ddm.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_lose_con_ddm.jpg
 b_1_1_assassin_lose_con_rtr.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_lose_con_rtr.jpg
-b_1_1_assassin_rtr.jpg https://downloads.cardforge.org/images/tokens/b_1_1_assassin_rtr.jpg
+b_1_1_bat_flying.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying.jpg
 b_1_1_bat_flying_c17.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_c17.jpg
 b_1_1_bat_flying_ddd.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_ddd.jpg
 b_1_1_bat_flying_gk2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_gk2.jpg
-b_1_1_bat_flying_gpt.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_gpt.jpg
-b_1_1_bat_flying_gvl.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_gvl.jpg
 b_1_1_bat_flying_m19.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_m19.jpg
+b_1_1_bat_flying_mid.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_mid.jpg
 b_1_1_bat_flying_mma.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_mma.jpg
-b_1_1_bat_m19.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_m19.jpg
-b_1_1_bird_illusion_flying_c20.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bird_illusion_flying_c20.jpg
+b_1_1_bat_flying_voc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_bat_flying_voc.jpg
 b_1_1_faerie_rogue_flying.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying.jpg
+b_1_1_faerie_rogue_flying_2x2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_2x2.jpg
 b_1_1_faerie_rogue_flying_mm2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_mm2.jpg
 b_1_1_faerie_rogue_flying_mor.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_mor.jpg
 b_1_1_faerie_rogue_flying_uma.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_uma.jpg
-b_1_1_faerie_rogue_flying_uma_bt.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_uma_bt.jpg
 b_1_1_faerie_rogue_flying_znc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_faerie_rogue_flying_znc.jpg
 b_1_1_goblin_rogue.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue.jpg
-b_1_1_goblin_rogue_ddl.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue_ddl.jpg
 b_1_1_goblin_rogue_lrw.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue_lrw.jpg
 b_1_1_goblin_rogue_mma.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue_mma.jpg
 b_1_1_goblin_rogue_mor.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue_mor.jpg
 b_1_1_goblin_rogue_znc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_goblin_rogue_znc.jpg
 b_1_1_harpy_flying_ths.jpg https://downloads.cardforge.org/images/tokens/b_1_1_harpy_flying_ths.jpg
+b_1_1_horror_clb.jpg https://downloads.cardforge.org/images/tokens/b_1_1_horror_clb.jpg
+b_1_1_insect.jpg https://downloads.cardforge.org/images/tokens/b_1_1_insect.jpg
 b_1_1_insect_akh.jpg https://downloads.cardforge.org/images/tokens/b_1_1_insect_akh.jpg
-b_1_1_minion_pcy.jpg https://downloads.cardforge.org/images/tokens/b_1_1_minion_pcy.jpg
+b_1_1_minion.jpg https://downloads.cardforge.org/images/tokens/b_1_1_minion.jpg
 b_1_1_rat.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat.jpg
-b_1_1_rat_chk.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_chk.jpg
+b_1_1_rat_afc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_afc.jpg
+b_1_1_rat_deathtouch.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_deathtouch.jpg
 b_1_1_rat_deathtouch_c17.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_deathtouch_c17.jpg
 b_1_1_rat_eld.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_eld.jpg
 b_1_1_rat_gtc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_gtc.jpg
+b_1_1_rat_rogue_neo.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_rogue_neo.jpg
 b_1_1_rat_shm.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_shm.jpg
-b_1_1_rat_sth.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_sth.jpg
-b_1_1_rat_tmp.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_tmp.jpg
-b_1_1_rat_tpr.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_tpr.jpg
 b_1_1_rat_znc.jpg https://downloads.cardforge.org/images/tokens/b_1_1_rat_znc.jpg
+b_1_1_skeleton_afr.jpg https://downloads.cardforge.org/images/tokens/b_1_1_skeleton_afr.jpg
+b_1_1_skeleton_regenerate.jpg https://downloads.cardforge.org/images/tokens/b_1_1_skeleton_regenerate.jpg
 b_1_1_skeleton_regenerate_a25.jpg https://downloads.cardforge.org/images/tokens/b_1_1_skeleton_regenerate_a25.jpg
 b_1_1_skeleton_regenerate_ala.jpg https://downloads.cardforge.org/images/tokens/b_1_1_skeleton_regenerate_ala.jpg
-b_1_1_skeleton_regenerate_hml.jpg https://downloads.cardforge.org/images/tokens/b_1_1_skeleton_regenerate_hml.jpg
-b_1_1_snake_deathtouch_c13.jpg https://downloads.cardforge.org/images/tokens/b_1_1_snake_deathtouch_c13.jpg
-b_1_1_thrull_c13.jpg https://downloads.cardforge.org/images/tokens/b_1_1_thrull_c13.jpg
+b_1_1_slug_vow.jpg https://downloads.cardforge.org/images/tokens/b_1_1_slug_vow.jpg
+b_1_1_snake_deathtouch.jpg https://downloads.cardforge.org/images/tokens/b_1_1_snake_deathtouch.jpg
+b_1_1_snake_deathtouch_cc2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_snake_deathtouch_cc2.jpg
+b_1_1_thrull.jpg https://downloads.cardforge.org/images/tokens/b_1_1_thrull.jpg
 b_1_1_thrull_mm2.jpg https://downloads.cardforge.org/images/tokens/b_1_1_thrull_mm2.jpg
-b_1_1_thrull_tsp.jpg https://downloads.cardforge.org/images/tokens/b_1_1_thrull_tsp.jpg
+b_1_1_vampire.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire.jpg
 b_1_1_vampire_c17.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_c17.jpg
+b_1_1_vampire_knight_lifelink.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_knight_lifelink.jpg
 b_1_1_vampire_knight_lifelink_soi.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_knight_lifelink_soi.jpg
+b_1_1_vampire_lifelink.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_lifelink.jpg
 b_1_1_vampire_lifelink_ddk.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_lifelink_ddk.jpg
 b_1_1_vampire_lifelink_dka.jpg https://downloads.cardforge.org/images/tokens/b_1_1_vampire_lifelink_dka.jpg
+b_1_1_wolf_deathtouch.jpg https://downloads.cardforge.org/images/tokens/b_1_1_wolf_deathtouch.jpg
 b_1_1_wolf_deathtouch_isd.jpg https://downloads.cardforge.org/images/tokens/b_1_1_wolf_deathtouch_isd.jpg
-b_1_1_wolf_deathtouch_v17.jpg https://downloads.cardforge.org/images/tokens/b_1_1_wolf_deathtouch_v17.jpg
-b_1_2_bat_flying_nosferatu_tsp.jpg https://downloads.cardforge.org/images/tokens/b_1_2_bat_flying_nosferatu_tsp.jpg
-b_2_1_cat_apc.jpg https://downloads.cardforge.org/images/tokens/b_2_1_cat_apc.jpg
-b_2_1_cat_td0.jpg https://downloads.cardforge.org/images/tokens/b_2_1_cat_td0.jpg
+b_1_2_bat_flying_nosferatu.jpg https://downloads.cardforge.org/images/tokens/b_1_2_bat_flying_nosferatu.jpg
+b_1_2_bat_flying_nosferatu_tsr.jpg https://downloads.cardforge.org/images/tokens/b_1_2_bat_flying_nosferatu_tsr.jpg
+b_2_1_cat.jpg https://downloads.cardforge.org/images/tokens/b_2_1_cat.jpg
+b_2_1_spider_menace_reach_afr.jpg https://downloads.cardforge.org/images/tokens/b_2_1_spider_menace_reach_afr.jpg
+b_2_1_warrior.jpg https://downloads.cardforge.org/images/tokens/b_2_1_warrior.jpg
+b_2_1_warrior_clb.jpg https://downloads.cardforge.org/images/tokens/b_2_1_warrior_clb.jpg
 b_2_1_warrior_frf.jpg https://downloads.cardforge.org/images/tokens/b_2_1_warrior_frf.jpg
-b_2_2_drake_flying_c20.jpg https://downloads.cardforge.org/images/tokens/b_2_2_drake_flying_c20.jpg
+b_2_2_e_zombie.jpg https://downloads.cardforge.org/images/tokens/b_2_2_e_zombie.jpg
 b_2_2_e_zombie_bng.jpg https://downloads.cardforge.org/images/tokens/b_2_2_e_zombie_bng.jpg
-b_2_2_knight_flanking_pro_white_haste_plc.jpg https://downloads.cardforge.org/images/tokens/b_2_2_knight_flanking_pro_white_haste_plc.jpg
+b_2_2_knight_flanking_pro_white_haste.jpg https://downloads.cardforge.org/images/tokens/b_2_2_knight_flanking_pro_white_haste.jpg
+b_2_2_knight_flanking_pro_white_haste_tsr.jpg https://downloads.cardforge.org/images/tokens/b_2_2_knight_flanking_pro_white_haste_tsr.jpg
+b_2_2_phyrexian_zombie.jpg https://downloads.cardforge.org/images/tokens/b_2_2_phyrexian_zombie.jpg
 b_2_2_pirate_menace.jpg https://downloads.cardforge.org/images/tokens/b_2_2_pirate_menace.jpg
 b_2_2_pirate_menace_xln.jpg https://downloads.cardforge.org/images/tokens/b_2_2_pirate_menace_xln.jpg
+b_2_2_rogue_menace.jpg https://downloads.cardforge.org/images/tokens/b_2_2_rogue_menace.jpg
+b_2_2_rogue_snc.jpg https://downloads.cardforge.org/images/tokens/b_2_2_rogue_snc.jpg
+b_2_2_vampire_flying.jpg https://downloads.cardforge.org/images/tokens/b_2_2_vampire_flying.jpg
+b_2_2_vampire_flying2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_vampire_flying2.jpg
 b_2_2_vampire_flying_isd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_vampire_flying_isd.jpg
 b_2_2_vampire_flying_ktk.jpg https://downloads.cardforge.org/images/tokens/b_2_2_vampire_flying_ktk.jpg
-b_2_2_vampire_flying_v17.jpg https://downloads.cardforge.org/images/tokens/b_2_2_vampire_flying_v17.jpg
 b_2_2_zombie.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie.jpg
+b_2_2_zombie2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2.jpg
+b_2_2_zombie2_c19.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2_c19.jpg
 b_2_2_zombie2_dka.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2_dka.jpg
 b_2_2_zombie2_emn.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2_emn.jpg
 b_2_2_zombie2_isd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2_isd.jpg
-b_2_2_zombie2_ust.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie2_ust.jpg
+b_2_2_zombie3.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie3.jpg
 b_2_2_zombie3_dka.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie3_dka.jpg
 b_2_2_zombie3_emn.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie3_emn.jpg
 b_2_2_zombie3_isd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie3_isd.jpg
 b_2_2_zombie_10e.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_10e.jpg
-b_2_2_zombie_SOI.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_SOI.jpg
+b_2_2_zombie_2x2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_2x2.jpg
+b_2_2_zombie_afr.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_afr.jpg
 b_2_2_zombie_akh.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_akh.jpg
 b_2_2_zombie_ala.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ala.jpg
-b_2_2_zombie_all.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_all.jpg
 b_2_2_zombie_arb.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_arb.jpg
-b_2_2_zombie_arc.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_arc.jpg
 b_2_2_zombie_avr.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_avr.jpg
 b_2_2_zombie_bbd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_bbd.jpg
+b_2_2_zombie_berserker.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_berserker.jpg
 b_2_2_zombie_berserker_khm.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_berserker_khm.jpg
 b_2_2_zombie_bng.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_bng.jpg
-b_2_2_zombie_c13.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c13.jpg
 b_2_2_zombie_c14.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c14.jpg
 b_2_2_zombie_c15.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c15.jpg
 b_2_2_zombie_c16.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c16.jpg
 b_2_2_zombie_c17.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c17.jpg
 b_2_2_zombie_c18.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c18.jpg
+b_2_2_zombie_c19.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c19.jpg
 b_2_2_zombie_c20.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c20.jpg
-b_2_2_zombie_cfx.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cfx.jpg
+b_2_2_zombie_c21.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_c21.jpg
+b_2_2_zombie_cc2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cc2.jpg
 b_2_2_zombie_cm2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cm2.jpg
 b_2_2_zombie_cma.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cma.jpg
-b_2_2_zombie_cmd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cmd.jpg
 b_2_2_zombie_cmr.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cmr.jpg
 b_2_2_zombie_cn2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cn2.jpg
 b_2_2_zombie_cns.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_cns.jpg
 b_2_2_zombie_ddj.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ddj.jpg
-b_2_2_zombie_ddl.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ddl.jpg
-b_2_2_zombie_ddq.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ddq.jpg
-b_2_2_zombie_designated_arc.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_designated_arc.jpg
+b_2_2_zombie_decayed_mic.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_decayed_mic.jpg
+b_2_2_zombie_decayed_mid.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_decayed_mid.jpg
 b_2_2_zombie_dka.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_dka.jpg
 b_2_2_zombie_dtk.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_dtk.jpg
 b_2_2_zombie_e01.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_e01.jpg
 b_2_2_zombie_ema.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ema.jpg
 b_2_2_zombie_emn.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_emn.jpg
-b_2_2_zombie_fut.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_fut.jpg
-b_2_2_zombie_gnt.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_gnt.jpg
-b_2_2_zombie_hop.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_hop.jpg
 b_2_2_zombie_hou.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_hou.jpg
 b_2_2_zombie_isd.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_isd.jpg
+b_2_2_zombie_knight_menace.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_knight_menace.jpg
 b_2_2_zombie_knight_menace_dom.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_knight_menace_dom.jpg
 b_2_2_zombie_ktk.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ktk.jpg
 b_2_2_zombie_m10.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_m10.jpg
@@ -158,162 +169,181 @@ b_2_2_zombie_m14.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_
 b_2_2_zombie_m15.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_m15.jpg
 b_2_2_zombie_m19.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_m19.jpg
 b_2_2_zombie_m20.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_m20.jpg
+b_2_2_zombie_m21.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_m21.jpg
 b_2_2_zombie_mbs.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mbs.jpg
-b_2_2_zombie_me1.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_me1.jpg
 b_2_2_zombie_mh1.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mh1.jpg
+b_2_2_zombie_mh2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mh2.jpg
+b_2_2_zombie_mic.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mic.jpg
 b_2_2_zombie_mm3.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mm3.jpg
 b_2_2_zombie_mma.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mma.jpg
-b_2_2_zombie_mmq.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mmq.jpg
+b_2_2_zombie_mps.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mps.jpg
 b_2_2_zombie_mps_grn.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_mps_grn.jpg
-b_2_2_zombie_ody.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ody.jpg
+b_2_2_zombie_ncc.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ncc.jpg
 b_2_2_zombie_ogw.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ogw.jpg
-b_2_2_zombie_ons.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ons.jpg
 b_2_2_zombie_ori.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ori.jpg
-b_2_2_zombie_pc2.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_pc2.jpg
 b_2_2_zombie_pca.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_pca.jpg
-b_2_2_zombie_pd3.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_pd3.jpg
-b_2_2_zombie_pz1.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_pz1.jpg
 b_2_2_zombie_rna.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_rna.jpg
 b_2_2_zombie_soi.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_soi.jpg
 b_2_2_zombie_thb.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_thb.jpg
-b_2_2_zombie_tmp.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_tmp.jpg
-b_2_2_zombie_tpr.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_tpr.jpg
-b_2_2_zombie_ugl.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ugl.jpg
 b_2_2_zombie_uma.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_uma.jpg
-b_2_2_zombie_ust.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_ust.jpg
-b_2_2_zombie_v17.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_v17.jpg
-b_2_2_zombie_vma.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_vma.jpg
+b_2_2_zombie_vow.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_vow.jpg
 b_2_2_zombie_war.jpg https://downloads.cardforge.org/images/tokens/b_2_2_zombie_war.jpg
-b_2_4_spider_reach_cmd.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_cmd.jpg
+b_2_3_vampire_flying_lifelink_vow.jpg https://downloads.cardforge.org/images/tokens/b_2_3_vampire_flying_lifelink_vow.jpg
+b_2_4_spider_reach.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach.jpg
 b_2_4_spider_reach_mm3.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_mm3.jpg
 b_2_4_spider_reach_mma.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_mma.jpg
-b_2_4_spider_reach_pc2.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_pc2.jpg
 b_2_4_spider_reach_pca.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_pca.jpg
-b_2_4_spider_reach_tsp.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_tsp.jpg
-b_3_3_angel_flying_apc.jpg https://downloads.cardforge.org/images/tokens/b_3_3_angel_flying_apc.jpg
+b_2_4_spider_reach_tsr.jpg https://downloads.cardforge.org/images/tokens/b_2_4_spider_reach_tsr.jpg
+b_3_3_angel_flying.jpg https://downloads.cardforge.org/images/tokens/b_3_3_angel_flying.jpg
+b_3_3_beast_deathtouch.jpg https://downloads.cardforge.org/images/tokens/b_3_3_beast_deathtouch.jpg
 b_3_3_beast_deathtouch_m15.jpg https://downloads.cardforge.org/images/tokens/b_3_3_beast_deathtouch_m15.jpg
+b_3_3_beast_deathtouch_mps.jpg https://downloads.cardforge.org/images/tokens/b_3_3_beast_deathtouch_mps.jpg
 b_3_3_beast_deathtouch_mps_war.jpg https://downloads.cardforge.org/images/tokens/b_3_3_beast_deathtouch_mps_war.jpg
-b_3_3_horror_designated_e01.jpg https://downloads.cardforge.org/images/tokens/b_3_3_horror_designated_e01.jpg
+b_3_3_demon_clb.jpg https://downloads.cardforge.org/images/tokens/b_3_3_demon_clb.jpg
+b_3_3_horror.jpg https://downloads.cardforge.org/images/tokens/b_3_3_horror.jpg
 b_3_3_horror_e01.jpg https://downloads.cardforge.org/images/tokens/b_3_3_horror_e01.jpg
-b_3_3_kavu_apc.jpg https://downloads.cardforge.org/images/tokens/b_3_3_kavu_apc.jpg
-b_4_4_horror_rav.jpg https://downloads.cardforge.org/images/tokens/b_4_4_horror_rav.jpg
+b_3_3_kavu.jpg https://downloads.cardforge.org/images/tokens/b_3_3_kavu.jpg
+b_4_1_skeleton_menace_clb.jpg https://downloads.cardforge.org/images/tokens/b_4_1_skeleton_menace_clb.jpg
+b_4_3_ogre_warrior_snc.jpg https://downloads.cardforge.org/images/tokens/b_4_3_ogre_warrior_snc.jpg
+b_4_4_horror.jpg https://downloads.cardforge.org/images/tokens/b_4_4_horror.jpg
+b_4_4_horror_c21.jpg https://downloads.cardforge.org/images/tokens/b_4_4_horror_c21.jpg
 b_4_4_zombie_warrior_vigilance.jpg https://downloads.cardforge.org/images/tokens/b_4_4_zombie_warrior_vigilance.jpg
 b_4_4_zombie_warrior_vigilance_war.jpg https://downloads.cardforge.org/images/tokens/b_4_4_zombie_warrior_vigilance_war.jpg
+b_5_5_demon_flying.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying.jpg
 b_5_5_demon_flying2_avr.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying2_avr.jpg
 b_5_5_demon_flying_2xm.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_2xm.jpg
 b_5_5_demon_flying_avr.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_avr.jpg
 b_5_5_demon_flying_c14.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_c14.jpg
-b_5_5_demon_flying_ddr.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_ddr.jpg
 b_5_5_demon_flying_isd.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_isd.jpg
 b_5_5_demon_flying_m20.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_m20.jpg
+b_5_5_demon_flying_m21.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_m21.jpg
 b_5_5_demon_flying_ori.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_ori.jpg
-b_5_5_demon_flying_pz1.jpg https://downloads.cardforge.org/images/tokens/b_5_5_demon_flying_pz1.jpg
+b_5_5_zombie_giant.jpg https://downloads.cardforge.org/images/tokens/b_5_5_zombie_giant.jpg
 b_5_5_zombie_giant_bbd.jpg https://downloads.cardforge.org/images/tokens/b_5_5_zombie_giant_bbd.jpg
-b_5_5_zombie_giant_ddr.jpg https://downloads.cardforge.org/images/tokens/b_5_5_zombie_giant_ddr.jpg
 b_5_5_zombie_giant_zen.jpg https://downloads.cardforge.org/images/tokens/b_5_5_zombie_giant_zen.jpg
+b_6_6_demon_flying_trample_aristocrat.jpg https://downloads.cardforge.org/images/tokens/b_6_6_demon_flying_trample_aristocrat.jpg
 b_6_6_demon_flying_trample_aristocrat_dom.jpg https://downloads.cardforge.org/images/tokens/b_6_6_demon_flying_trample_aristocrat_dom.jpg
-b_6_6_wurm_trample_apc.jpg https://downloads.cardforge.org/images/tokens/b_6_6_wurm_trample_apc.jpg
+b_6_6_wurm_trample.jpg https://downloads.cardforge.org/images/tokens/b_6_6_wurm_trample.jpg
 b_6_6_wurm_trample_uma.jpg https://downloads.cardforge.org/images/tokens/b_6_6_wurm_trample_uma.jpg
-b_6_6_wurm_trample_vma.jpg https://downloads.cardforge.org/images/tokens/b_6_6_wurm_trample_vma.jpg
+b_x_x_demon_flying.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying.jpg
 b_x_x_demon_flying_c14.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_c14.jpg
+b_x_x_demon_flying_c21.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_c21.jpg
 b_x_x_demon_flying_cns.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_cns.jpg
 b_x_x_demon_flying_ddc.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_ddc.jpg
-b_x_x_demon_flying_dvd.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_dvd.jpg
-b_x_x_demon_flying_mrd.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_mrd.jpg
-b_x_x_demon_flying_vma.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_vma.jpg
+b_x_x_demon_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/b_x_x_demon_flying_ncc.jpg
 b_x_x_horror.jpg https://downloads.cardforge.org/images/tokens/b_x_x_horror.jpg
 b_x_x_horror_c14.jpg https://downloads.cardforge.org/images/tokens/b_x_x_horror_c14.jpg
 b_x_x_horror_cmr.jpg https://downloads.cardforge.org/images/tokens/b_x_x_horror_cmr.jpg
+b_x_x_minion.jpg https://downloads.cardforge.org/images/tokens/b_x_x_minion.jpg
 b_x_x_minion_dde.jpg https://downloads.cardforge.org/images/tokens/b_x_x_minion_dde.jpg
-b_x_x_minion_usg.jpg https://downloads.cardforge.org/images/tokens/b_x_x_minion_usg.jpg
-b_x_x_minion_v16.jpg https://downloads.cardforge.org/images/tokens/b_x_x_minion_v16.jpg
+b_x_x_nightmare_horror.jpg https://downloads.cardforge.org/images/tokens/b_x_x_nightmare_horror.jpg
 b_x_x_nightmare_horror_dom.jpg https://downloads.cardforge.org/images/tokens/b_x_x_nightmare_horror_dom.jpg
-b_x_x_spirit_5ed.jpg https://downloads.cardforge.org/images/tokens/b_x_x_spirit_5ed.jpg
-b_x_x_spirit_hml.jpg https://downloads.cardforge.org/images/tokens/b_x_x_spirit_hml.jpg
-b_x_x_spirit_me2.jpg https://downloads.cardforge.org/images/tokens/b_x_x_spirit_me2.jpg
+b_x_x_phyrexian_minion.jpg https://downloads.cardforge.org/images/tokens/b_x_x_phyrexian_minion.jpg
+b_x_x_spirit.jpg https://downloads.cardforge.org/images/tokens/b_x_x_spirit.jpg
+b_x_x_vampire.jpg https://downloads.cardforge.org/images/tokens/b_x_x_vampire.jpg
 b_x_x_vampire_zen.jpg https://downloads.cardforge.org/images/tokens/b_x_x_vampire_zen.jpg
+b_x_x_zombie.jpg https://downloads.cardforge.org/images/tokens/b_x_x_zombie.jpg
 b_x_x_zombie_emn.jpg https://downloads.cardforge.org/images/tokens/b_x_x_zombie_emn.jpg
+b_x_x_zombie_horror.jpg https://downloads.cardforge.org/images/tokens/b_x_x_zombie_horror.jpg
 b_x_x_zombie_horror_dtk.jpg https://downloads.cardforge.org/images/tokens/b_x_x_zombie_horror_dtk.jpg
 b_x_x_zombie_jou.jpg https://downloads.cardforge.org/images/tokens/b_x_x_zombie_jou.jpg
+bg_1_1_e_snake_deathtouch.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_e_snake_deathtouch.jpg
 bg_1_1_e_snake_deathtouch_jou.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_e_snake_deathtouch_jou.jpg
+bg_1_1_insect.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_insect.jpg
 bg_1_1_insect_gk1.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_insect_gk1.jpg
 bg_1_1_insect_grn.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_insect_grn.jpg
+bg_1_1_insect_mh2.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_insect_mh2.jpg
+bg_1_1_pest_lifegain_stx.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_pest_lifegain_stx.jpg
+bg_1_1_worm.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm.jpg
+bg_1_1_worm_2x2.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_2x2.jpg
 bg_1_1_worm_c16.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_c16.jpg
 bg_1_1_worm_c18.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_c18.jpg
 bg_1_1_worm_eve.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_eve.jpg
 bg_1_1_worm_mm2.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_mm2.jpg
 bg_1_1_worm_mma.jpg https://downloads.cardforge.org/images/tokens/bg_1_1_worm_mma.jpg
+bg_2_2_wolf_garruk.jpg https://downloads.cardforge.org/images/tokens/bg_2_2_wolf_garruk.jpg
+bg_2_2_wolf_garruk_eld.jpg https://downloads.cardforge.org/images/tokens/bg_2_2_wolf_garruk_eld.jpg
 bg_x_x_hydra.jpg https://downloads.cardforge.org/images/tokens/bg_x_x_hydra.jpg
 bg_x_x_hydra_znr.jpg https://downloads.cardforge.org/images/tokens/bg_x_x_hydra_znr.jpg
+bg_x_x_spirit_warrior.jpg https://downloads.cardforge.org/images/tokens/bg_x_x_spirit_warrior.jpg
 bg_x_x_spirit_warrior_ktk.jpg https://downloads.cardforge.org/images/tokens/bg_x_x_spirit_warrior_ktk.jpg
-br_3_1_graveborn_haste_all.jpg https://downloads.cardforge.org/images/tokens/br_3_1_graveborn_haste_all.jpg
-br_3_1_graveborn_haste_c13.jpg https://downloads.cardforge.org/images/tokens/br_3_1_graveborn_haste_c13.jpg
-br_3_1_graveborn_haste_csp.jpg https://downloads.cardforge.org/images/tokens/br_3_1_graveborn_haste_csp.jpg
-br_3_1_graveborn_haste_cst.jpg https://downloads.cardforge.org/images/tokens/br_3_1_graveborn_haste_cst.jpg
+boo_afr.jpg https://downloads.cardforge.org/images/tokens/boo_afr.jpg
+boo_clb.jpg https://downloads.cardforge.org/images/tokens/boo_clb.jpg
+br_3_1_graveborn_haste.jpg https://downloads.cardforge.org/images/tokens/br_3_1_graveborn_haste.jpg
+br_3_1_vampire_trample_lifelink_haste_mid.jpg https://downloads.cardforge.org/images/tokens/br_3_1_vampire_trample_lifelink_haste_mid.jpg
+br_3_6_avatar_haste_bolt_stx.jpg https://downloads.cardforge.org/images/tokens/br_3_6_avatar_haste_bolt_stx.jpg
+br_5_5_elemental.jpg https://downloads.cardforge.org/images/tokens/br_5_5_elemental.jpg
 br_5_5_elemental_shm.jpg https://downloads.cardforge.org/images/tokens/br_5_5_elemental_shm.jpg
+brg_3_3_cat_dragon_flying.jpg https://downloads.cardforge.org/images/tokens/brg_3_3_cat_dragon_flying.jpg
+brg_3_3_cat_dragon_flying_2x2.jpg https://downloads.cardforge.org/images/tokens/brg_3_3_cat_dragon_flying_2x2.jpg
 brg_3_3_cat_dragon_flying_c17.jpg https://downloads.cardforge.org/images/tokens/brg_3_3_cat_dragon_flying_c17.jpg
-butterfly_mmq.jpg https://downloads.cardforge.org/images/tokens/butterfly_mmq.jpg
-butterfly_vis.jpg https://downloads.cardforge.org/images/tokens/butterfly_vis.jpg
+butterfly.jpg https://downloads.cardforge.org/images/tokens/butterfly.jpg
+c_0_0_a_construct_total_artifacts.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts.jpg
+c_0_0_a_construct_total_artifacts_c21.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_c21.jpg
 c_0_0_a_construct_total_artifacts_dom.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_dom.jpg
 c_0_0_a_construct_total_artifacts_mh1.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_mh1.jpg
+c_0_0_a_construct_total_artifacts_mh2.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_mh2.jpg
+c_0_0_a_construct_total_artifacts_mps.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_mps.jpg
 c_0_0_a_construct_total_artifacts_mps_rna.jpg https://downloads.cardforge.org/images/tokens/c_0_0_a_construct_total_artifacts_mps_rna.jpg
 c_0_1_a_goblin_construct_noblock_ping.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_goblin_construct_noblock_ping.jpg
 c_0_1_a_goblin_construct_noblock_ping_znr.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_goblin_construct_noblock_ping_znr.jpg
-c_0_1_a_pest_hop.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_pest_hop.jpg
-c_0_1_a_pest_mrd.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_pest_mrd.jpg
-c_0_1_a_prism_vis.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_prism_vis.jpg
+c_0_1_a_pest.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_pest.jpg
+c_0_1_a_prism.jpg https://downloads.cardforge.org/images/tokens/c_0_1_a_prism.jpg
 c_0_1_eldrazi_spawn_sac.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac.jpg
-c_0_1_eldrazi_spawn_sac2_cmd.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac2_cmd.jpg
-c_0_1_eldrazi_spawn_sac2_ddp.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac2_ddp.jpg
 c_0_1_eldrazi_spawn_sac2_mm2.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac2_mm2.jpg
 c_0_1_eldrazi_spawn_sac2_pca.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac2_pca.jpg
 c_0_1_eldrazi_spawn_sac2_roe.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac2_roe.jpg
-c_0_1_eldrazi_spawn_sac3_ddp.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac3_ddp.jpg
 c_0_1_eldrazi_spawn_sac3_mm2.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac3_mm2.jpg
 c_0_1_eldrazi_spawn_sac3_pca.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac3_pca.jpg
 c_0_1_eldrazi_spawn_sac3_roe.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac3_roe.jpg
 c_0_1_eldrazi_spawn_sac_2xm.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_2xm.jpg
 c_0_1_eldrazi_spawn_sac_c17.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_c17.jpg
-c_0_1_eldrazi_spawn_sac_cmd.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_cmd.jpg
-c_0_1_eldrazi_spawn_sac_ddp.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_ddp.jpg
+c_0_1_eldrazi_spawn_sac_mic.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_mic.jpg
 c_0_1_eldrazi_spawn_sac_mm2.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_mm2.jpg
-c_0_1_eldrazi_spawn_sac_pc2.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_pc2.jpg
+c_0_1_eldrazi_spawn_sac_ncc.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_ncc.jpg
 c_0_1_eldrazi_spawn_sac_pca.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_pca.jpg
-c_0_1_eldrazi_spawn_sac_pz1.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_pz1.jpg
 c_0_1_eldrazi_spawn_sac_roe.jpg https://downloads.cardforge.org/images/tokens/c_0_1_eldrazi_spawn_sac_roe.jpg
-c_0_2_a_wall_defender_mir.jpg https://downloads.cardforge.org/images/tokens/c_0_2_a_wall_defender_mir.jpg
+c_0_2_a_wall_defender.jpg https://downloads.cardforge.org/images/tokens/c_0_2_a_wall_defender.jpg
 c_0_4_a_wall_defender.jpg https://downloads.cardforge.org/images/tokens/c_0_4_a_wall_defender.jpg
-c_0_4_a_wall_defender_thb.jpg https://downloads.cardforge.org/images/tokens/c_0_4_a_wall_defender_thb.jpg
+c_0_4_wall_defender.jpg https://downloads.cardforge.org/images/tokens/c_0_4_wall_defender.jpg
+c_0_4_wall_defender_thb.jpg https://downloads.cardforge.org/images/tokens/c_0_4_wall_defender_thb.jpg
+c_10_10_eldrazi.jpg https://downloads.cardforge.org/images/tokens/c_10_10_eldrazi.jpg
 c_10_10_eldrazi_bfz.jpg https://downloads.cardforge.org/images/tokens/c_10_10_eldrazi_bfz.jpg
+c_10_10_eldrazi_c19.jpg https://downloads.cardforge.org/images/tokens/c_10_10_eldrazi_c19.jpg
+c_10_10_eldrazi_c21.jpg https://downloads.cardforge.org/images/tokens/c_10_10_eldrazi_c21.jpg
+c_10_10_eldrazi_ncc.jpg https://downloads.cardforge.org/images/tokens/c_10_10_eldrazi_ncc.jpg
 c_1_1_a_construct.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct.jpg
+c_1_1_a_construct_clb.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_clb.jpg
+c_1_1_a_construct_defender.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_defender.jpg
 c_1_1_a_construct_defender_cn2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_defender_cn2.jpg
 c_1_1_a_construct_defender_cns.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_defender_cns.jpg
+c_1_1_a_construct_defender_mps.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_defender_mps.jpg
 c_1_1_a_construct_defender_mps_grn.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_defender_mps_grn.jpg
+c_1_1_a_construct_neo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_neo.jpg
 c_1_1_a_construct_znr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_construct_znr.jpg
-c_1_1_a_gnome_usg.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_gnome_usg.jpg
+c_1_1_a_gnome.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_gnome.jpg
+c_1_1_a_myr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr.jpg
 c_1_1_a_myr_2xm.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_2xm.jpg
 c_1_1_a_myr_bbd.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_bbd.jpg
-c_1_1_a_myr_c13.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_c13.jpg
 c_1_1_a_myr_c14.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_c14.jpg
 c_1_1_a_myr_c16.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_c16.jpg
 c_1_1_a_myr_c18.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_c18.jpg
+c_1_1_a_myr_c21.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_c21.jpg
 c_1_1_a_myr_cm2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_cm2.jpg
 c_1_1_a_myr_ddu.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_ddu.jpg
-c_1_1_a_myr_dst.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_dst.jpg
 c_1_1_a_myr_mbs.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_mbs.jpg
-c_1_1_a_myr_med.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_med.jpg
+c_1_1_a_myr_md1.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_md1.jpg
 c_1_1_a_myr_mh1.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_mh1.jpg
 c_1_1_a_myr_mm2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_mm2.jpg
-c_1_1_a_myr_mrd.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_mrd.jpg
+c_1_1_a_myr_nec.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_nec.jpg
 c_1_1_a_myr_nph.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_nph.jpg
 c_1_1_a_myr_som.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_som.jpg
-c_1_1_a_myr_td2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_myr_td2.jpg
+c_1_1_a_pentavite_flying.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying.jpg
 c_1_1_a_pentavite_flying_c14.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_c14.jpg
 c_1_1_a_pentavite_flying_cm2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_cm2.jpg
 c_1_1_a_pentavite_flying_ddf.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_ddf.jpg
-c_1_1_a_pentavite_flying_hop.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_hop.jpg
 c_1_1_a_pentavite_flying_m12.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_m12.jpg
-c_1_1_a_pentavite_flying_mrd.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_pentavite_flying_mrd.jpg
+c_1_1_a_phyrexian_myr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_phyrexian_myr.jpg
 c_1_1_a_servo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo.jpg
 c_1_1_a_servo2_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo2_aer.jpg
 c_1_1_a_servo2_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo2_kld.jpg
@@ -321,48 +351,43 @@ c_1_1_a_servo3_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_ser
 c_1_1_a_servo3_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo3_kld.jpg
 c_1_1_a_servo_2xm.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_2xm.jpg
 c_1_1_a_servo_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_aer.jpg
+c_1_1_a_servo_afc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_afc.jpg
 c_1_1_a_servo_c18.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_c18.jpg
 c_1_1_a_servo_khc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_khc.jpg
 c_1_1_a_servo_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_kld.jpg
 c_1_1_a_servo_war.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_servo_war.jpg
-c_1_1_a_snake_poison_5ed.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison_5ed.jpg
-c_1_1_a_snake_poison_chr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison_chr.jpg
-c_1_1_a_snake_poison_leg.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison_leg.jpg
-c_1_1_a_snake_poison_me1.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison_me1.jpg
-c_1_1_a_snake_poison_med.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison_med.jpg
-c_1_1_a_tetravite_flying_noenchant_4ed.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_tetravite_flying_noenchant_4ed.jpg
-c_1_1_a_tetravite_flying_noenchant_atq.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_tetravite_flying_noenchant_atq.jpg
-c_1_1_a_tetravite_flying_noenchant_me4.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_tetravite_flying_noenchant_me4.jpg
+c_1_1_a_snake_poison.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_snake_poison.jpg
+c_1_1_a_tetravite_flying_noenchant.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_tetravite_flying_noenchant.jpg
 c_1_1_a_thopter_flying.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying.jpg
 c_1_1_a_thopter_flying2_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_aer.jpg
 c_1_1_a_thopter_flying2_c18.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_c18.jpg
 c_1_1_a_thopter_flying2_ddu.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_ddu.jpg
 c_1_1_a_thopter_flying2_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_kld.jpg
-c_1_1_a_thopter_flying2_mps_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_mps_kld.jpg
 c_1_1_a_thopter_flying2_ori.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying2_ori.jpg
 c_1_1_a_thopter_flying3_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying3_aer.jpg
 c_1_1_a_thopter_flying3_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying3_kld.jpg
-c_1_1_a_thopter_flying3_mps_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying3_mps_kld.jpg
 c_1_1_a_thopter_flying_2xm.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_2xm.jpg
 c_1_1_a_thopter_flying_aer.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_aer.jpg
+c_1_1_a_thopter_flying_afc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_afc.jpg
 c_1_1_a_thopter_flying_c18.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_c18.jpg
+c_1_1_a_thopter_flying_c21.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_c21.jpg
 c_1_1_a_thopter_flying_ddu.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_ddu.jpg
-c_1_1_a_thopter_flying_exo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_exo.jpg
-c_1_1_a_thopter_flying_gnt.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_gnt.jpg
 c_1_1_a_thopter_flying_khc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_khc.jpg
 c_1_1_a_thopter_flying_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_kld.jpg
 c_1_1_a_thopter_flying_m19.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_m19.jpg
 c_1_1_a_thopter_flying_mbs.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_mbs.jpg
-c_1_1_a_thopter_flying_mps_kld.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_mps_kld.jpg
+c_1_1_a_thopter_flying_mh2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_mh2.jpg
+c_1_1_a_thopter_flying_mps.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_mps.jpg
+c_1_1_a_thopter_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_ncc.jpg
+c_1_1_a_thopter_flying_nec.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_nec.jpg
 c_1_1_a_thopter_flying_ori.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_ori.jpg
 c_1_1_a_thopter_flying_rna.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_rna.jpg
-c_1_1_a_thopter_flying_tpr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_tpr.jpg
-c_1_1_a_thopter_flying_vma.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_vma.jpg
+c_1_1_a_thopter_flying_voc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_voc.jpg
 c_1_1_a_thopter_flying_znc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_thopter_flying_znc.jpg
+c_1_1_a_triskelavite_flying_ammo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_triskelavite_flying_ammo.jpg
 c_1_1_a_triskelavite_flying_ammo_cm2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_triskelavite_flying_ammo_cm2.jpg
-c_1_1_a_triskelavite_flying_ammo_cmd.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_triskelavite_flying_ammo_cmd.jpg
-c_1_1_a_triskelavite_flying_ammo_tsp.jpg https://downloads.cardforge.org/images/tokens/c_1_1_a_triskelavite_flying_ammo_tsp.jpg
-c_1_1_cat_lifelink_iko.jpg https://downloads.cardforge.org/images/tokens/c_1_1_cat_lifelink_iko.jpg
+c_1_1_e_shrine_nec.jpg https://downloads.cardforge.org/images/tokens/c_1_1_e_shrine_nec.jpg
+c_1_1_eldrazi_scion_sac.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac.jpg
 c_1_1_eldrazi_scion_sac2_bfz.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac2_bfz.jpg
 c_1_1_eldrazi_scion_sac2_ogw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac2_ogw.jpg
 c_1_1_eldrazi_scion_sac3_bfz.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac3_bfz.jpg
@@ -370,461 +395,431 @@ c_1_1_eldrazi_scion_sac3_ogw.jpg https://downloads.cardforge.org/images/tokens/c
 c_1_1_eldrazi_scion_sac4_ogw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac4_ogw.jpg
 c_1_1_eldrazi_scion_sac5_ogw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac5_ogw.jpg
 c_1_1_eldrazi_scion_sac6_ogw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac6_ogw.jpg
+c_1_1_eldrazi_scion_sac_2x2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac_2x2.jpg
 c_1_1_eldrazi_scion_sac_bfz.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac_bfz.jpg
-c_1_1_eldrazi_scion_sac_ddr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac_ddr.jpg
 c_1_1_eldrazi_scion_sac_ogw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_eldrazi_scion_sac_ogw.jpg
-c_1_1_expansion_symbol_unh.jpg https://downloads.cardforge.org/images/tokens/c_1_1_expansion_symbol_unh.jpg
-c_1_1_sand_gpt.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sand_gpt.jpg
+c_1_1_pilot_crewbuff_neo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_pilot_crewbuff_neo.jpg
+c_1_1_sand.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sand.jpg
+c_1_1_shapeshifter_changeling.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling.jpg
 c_1_1_shapeshifter_changeling_2xm.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_2xm.jpg
 c_1_1_shapeshifter_changeling_c15.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_c15.jpg
 c_1_1_shapeshifter_changeling_c18.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_c18.jpg
+c_1_1_shapeshifter_changeling_clb.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_clb.jpg
 c_1_1_shapeshifter_changeling_cm2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_cm2.jpg
 c_1_1_shapeshifter_changeling_lrw.jpg https://downloads.cardforge.org/images/tokens/c_1_1_shapeshifter_changeling_lrw.jpg
+c_1_1_sliver.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver.jpg
 c_1_1_sliver2_m14.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver2_m14.jpg
-c_1_1_sliver_cm1.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_cm1.jpg
-c_1_1_sliver_lgn.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_lgn.jpg
 c_1_1_sliver_m14.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_m14.jpg
 c_1_1_sliver_m15.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_m15.jpg
-c_1_1_sliver_pds.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_pds.jpg
-c_1_1_sliver_sth.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_sth.jpg
-c_1_1_sliver_tpr.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_tpr.jpg
-c_1_1_sliver_van.jpg https://downloads.cardforge.org/images/tokens/c_1_1_sliver_van.jpg
+c_1_1_spirit.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit.jpg
+c_1_1_spirit_2x2.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_2x2.jpg
 c_1_1_spirit_a25.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_a25.jpg
-c_1_1_spirit_bok.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_bok.jpg
 c_1_1_spirit_c16.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_c16.jpg
-c_1_1_spirit_chk.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_chk.jpg
 c_1_1_spirit_ema.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_ema.jpg
-c_1_1_spirit_exp.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_exp.jpg
-c_1_1_spirit_sok.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_sok.jpg
-c_1_1_spirit_v12.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_v12.jpg
-c_1_1_thopter_m19.jpg https://downloads.cardforge.org/images/tokens/c_1_1_thopter_m19.jpg
-c_2_2_a_assembly_worker_c13.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_assembly_worker_c13.jpg
-c_2_2_a_assembly_worker_tsp.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_assembly_worker_tsp.jpg
-c_2_2_a_spawn_dst.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_spawn_dst.jpg
-c_2_2_a_spawn_td2.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_spawn_td2.jpg
-c_2_2_pincher_5dn.jpg https://downloads.cardforge.org/images/tokens/c_2_2_pincher_5dn.jpg
+c_1_1_spirit_neo.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_neo.jpg
+c_1_1_spirit_voc.jpg https://downloads.cardforge.org/images/tokens/c_1_1_spirit_voc.jpg
+c_2_2_a_assembly_worker.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_assembly_worker.jpg
+c_2_2_a_assembly_worker_tsr.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_assembly_worker_tsr.jpg
+c_2_2_a_spawn.jpg https://downloads.cardforge.org/images/tokens/c_2_2_a_spawn.jpg
+c_2_2_pincher.jpg https://downloads.cardforge.org/images/tokens/c_2_2_pincher.jpg
+c_2_2_shapeshifter_changeling.jpg https://downloads.cardforge.org/images/tokens/c_2_2_shapeshifter_changeling.jpg
+c_2_2_shapeshifter_changeling_clb.jpg https://downloads.cardforge.org/images/tokens/c_2_2_shapeshifter_changeling_clb.jpg
 c_2_2_shapeshifter_changeling_mh1.jpg https://downloads.cardforge.org/images/tokens/c_2_2_shapeshifter_changeling_mh1.jpg
 c_2_2_spirit.jpg https://downloads.cardforge.org/images/tokens/c_2_2_spirit.jpg
 c_2_2_spirit_war.jpg https://downloads.cardforge.org/images/tokens/c_2_2_spirit_war.jpg
+c_3_2_eldrazi_horror.jpg https://downloads.cardforge.org/images/tokens/c_3_2_eldrazi_horror.jpg
+c_3_2_eldrazi_horror_clb.jpg https://downloads.cardforge.org/images/tokens/c_3_2_eldrazi_horror_clb.jpg
 c_3_2_eldrazi_horror_emn.jpg https://downloads.cardforge.org/images/tokens/c_3_2_eldrazi_horror_emn.jpg
+c_3_2_shapeshifter_changeling_clb.jpg https://downloads.cardforge.org/images/tokens/c_3_2_shapeshifter_changeling_clb.jpg
+c_3_3_a_golem.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem.jpg
 c_3_3_a_golem_2xm.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_2xm.jpg
 c_3_3_a_golem_cmr.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_cmr.jpg
+c_3_3_a_golem_flying_c21.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_flying_c21.jpg
 c_3_3_a_golem_m20.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_m20.jpg
 c_3_3_a_golem_mh1.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_mh1.jpg
 c_3_3_a_golem_mm2.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_mm2.jpg
 c_3_3_a_golem_mm3.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_mm3.jpg
 c_3_3_a_golem_nph.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_nph.jpg
 c_3_3_a_golem_som.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_som.jpg
+c_3_3_a_golem_trample_c21.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_trample_c21.jpg
+c_3_3_a_golem_vigilance_c21.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_golem_vigilance_c21.jpg
+c_3_3_a_phyrexian_golem.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_golem.jpg
+c_3_3_a_phyrexian_golem_2x2.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_golem_2x2.jpg
+c_3_3_a_phyrexian_wurm_deathtouch.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_wurm_deathtouch.jpg
+c_3_3_a_phyrexian_wurm_deathtouch_mps.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_wurm_deathtouch_mps.jpg
+c_3_3_a_phyrexian_wurm_lifelink.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_wurm_lifelink.jpg
+c_3_3_a_phyrexian_wurm_lifelink_mps.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_phyrexian_wurm_lifelink_mps.jpg
+c_3_3_a_wurm_deathtouch.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch.jpg
 c_3_3_a_wurm_deathtouch_2xm.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_2xm.jpg
 c_3_3_a_wurm_deathtouch_c14.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_c14.jpg
 c_3_3_a_wurm_deathtouch_cm2.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_cm2.jpg
-c_3_3_a_wurm_deathtouch_mps_kld.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_mps_kld.jpg
+c_3_3_a_wurm_deathtouch_mps.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_mps.jpg
 c_3_3_a_wurm_deathtouch_som.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_deathtouch_som.jpg
+c_3_3_a_wurm_lifelink.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink.jpg
 c_3_3_a_wurm_lifelink_2xm.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_2xm.jpg
 c_3_3_a_wurm_lifelink_c14.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_c14.jpg
 c_3_3_a_wurm_lifelink_cm2.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_cm2.jpg
-c_3_3_a_wurm_lifelink_mps_kld.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_mps_kld.jpg
+c_3_3_a_wurm_lifelink_mps.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_mps.jpg
 c_3_3_a_wurm_lifelink_som.jpg https://downloads.cardforge.org/images/tokens/c_3_3_a_wurm_lifelink_som.jpg
 c_3_3_e_a_golem.jpg https://downloads.cardforge.org/images/tokens/c_3_3_e_a_golem.jpg
 c_3_3_e_a_golem_ths.jpg https://downloads.cardforge.org/images/tokens/c_3_3_e_a_golem_ths.jpg
-c_3_3_golem_m20.jpg https://downloads.cardforge.org/images/tokens/c_3_3_golem_m20.jpg
-c_3_3_golem_nph.jpg https://downloads.cardforge.org/images/tokens/c_3_3_golem_nph.jpg
-c_3_3_golem_ths.jpg https://downloads.cardforge.org/images/tokens/c_3_3_golem_ths.jpg
+c_3_4_a_gargoyle_flying.jpg https://downloads.cardforge.org/images/tokens/c_3_4_a_gargoyle_flying.jpg
 c_3_4_a_gargoyle_flying_c14.jpg https://downloads.cardforge.org/images/tokens/c_3_4_a_gargoyle_flying_c14.jpg
+c_3_4_a_gargoyle_flying_c19.jpg https://downloads.cardforge.org/images/tokens/c_3_4_a_gargoyle_flying_c19.jpg
 c_3_4_a_gargoyle_flying_cma.jpg https://downloads.cardforge.org/images/tokens/c_3_4_a_gargoyle_flying_cma.jpg
 c_3_4_a_gargoyle_flying_m10.jpg https://downloads.cardforge.org/images/tokens/c_3_4_a_gargoyle_flying_m10.jpg
+c_4_4_a_construct.jpg https://downloads.cardforge.org/images/tokens/c_4_4_a_construct.jpg
 c_4_4_a_construct_c18.jpg https://downloads.cardforge.org/images/tokens/c_4_4_a_construct_c18.jpg
+c_4_4_a_construct_m21.jpg https://downloads.cardforge.org/images/tokens/c_4_4_a_construct_m21.jpg
+c_4_4_a_golem.jpg https://downloads.cardforge.org/images/tokens/c_4_4_a_golem.jpg
 c_4_4_a_golem_rix.jpg https://downloads.cardforge.org/images/tokens/c_4_4_a_golem_rix.jpg
-c_4_4_golem_rix.jpg https://downloads.cardforge.org/images/tokens/c_4_4_golem_rix.jpg
-c_4_6_a_golem_arc.jpg https://downloads.cardforge.org/images/tokens/c_4_6_a_golem_arc.jpg
-c_5_5_a_djinn_flying_3ed.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_3ed.jpg
-c_5_5_a_djinn_flying_4ed.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_4ed.jpg
-c_5_5_a_djinn_flying_5ed.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_5ed.jpg
-c_5_5_a_djinn_flying_6ed.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_6ed.jpg
-c_5_5_a_djinn_flying_arn.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_arn.jpg
-c_5_5_a_djinn_flying_leg.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_leg.jpg
-c_5_5_a_djinn_flying_me4.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_me4.jpg
-c_5_5_a_djinn_flying_td0.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying_td0.jpg
-c_5_5_giant_teddy_bear_unh.jpg https://downloads.cardforge.org/images/tokens/c_5_5_giant_teddy_bear_unh.jpg
+c_4_6_a_golem.jpg https://downloads.cardforge.org/images/tokens/c_4_6_a_golem.jpg
+c_5_5_a_djinn_flying.jpg https://downloads.cardforge.org/images/tokens/c_5_5_a_djinn_flying.jpg
+c_6_12_a_construct_trample.jpg https://downloads.cardforge.org/images/tokens/c_6_12_a_construct_trample.jpg
 c_6_12_a_construct_trample_c18.jpg https://downloads.cardforge.org/images/tokens/c_6_12_a_construct_trample_c18.jpg
 c_6_12_a_construct_trample_wwk.jpg https://downloads.cardforge.org/images/tokens/c_6_12_a_construct_trample_wwk.jpg
+c_6_6_a_beast.jpg https://downloads.cardforge.org/images/tokens/c_6_6_a_beast.jpg
 c_6_6_a_beast_kld.jpg https://downloads.cardforge.org/images/tokens/c_6_6_a_beast_kld.jpg
-c_7_7_eldrazi_annihilator_pc2.jpg https://downloads.cardforge.org/images/tokens/c_7_7_eldrazi_annihilator_pc2.jpg
+c_7_7_eldrazi_annihilator.jpg https://downloads.cardforge.org/images/tokens/c_7_7_eldrazi_annihilator.jpg
 c_7_7_eldrazi_annihilator_pca.jpg https://downloads.cardforge.org/images/tokens/c_7_7_eldrazi_annihilator_pca.jpg
+c_9_9_a_golem.jpg https://downloads.cardforge.org/images/tokens/c_9_9_a_golem.jpg
 c_9_9_a_golem_mbs.jpg https://downloads.cardforge.org/images/tokens/c_9_9_a_golem_mbs.jpg
-c_a_a_feather_sac_iko.jpg https://downloads.cardforge.org/images/tokens/c_a_a_feather_sac_iko.jpg
+c_a_blood_draw_voc.jpg https://downloads.cardforge.org/images/tokens/c_a_blood_draw_voc.jpg
+c_a_blood_draw_vow.jpg https://downloads.cardforge.org/images/tokens/c_a_blood_draw_vow.jpg
+c_a_clue_draw.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw.jpg
+c_a_clue_draw2.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw2.jpg
+c_a_clue_draw2_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw2_mh2.jpg
 c_a_clue_draw2_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw2_soi.jpg
 c_a_clue_draw3_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw3_soi.jpg
 c_a_clue_draw4_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw4_soi.jpg
 c_a_clue_draw5_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw5_soi.jpg
 c_a_clue_draw6_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw6_soi.jpg
 c_a_clue_draw_2xm.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_2xm.jpg
+c_a_clue_draw_afc.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_afc.jpg
 c_a_clue_draw_c18.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_c18.jpg
+c_a_clue_draw_clb.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_clb.jpg
+c_a_clue_draw_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_mh2.jpg
+c_a_clue_draw_mid.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_mid.jpg
+c_a_clue_draw_ncc.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_ncc.jpg
+c_a_clue_draw_sld.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_sld.jpg
 c_a_clue_draw_soi.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_soi.jpg
-c_a_food_sac1_eld.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac1_eld.jpg
+c_a_clue_draw_voc.jpg https://downloads.cardforge.org/images/tokens/c_a_clue_draw_voc.jpg
+c_a_feather_sac.jpg https://downloads.cardforge.org/images/tokens/c_a_feather_sac.jpg
+c_a_feather_sac_iko.jpg https://downloads.cardforge.org/images/tokens/c_a_feather_sac_iko.jpg
+c_a_food_sac.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac.jpg
 c_a_food_sac2_eld.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac2_eld.jpg
+c_a_food_sac2_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac2_mh2.jpg
 c_a_food_sac3_eld.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac3_eld.jpg
 c_a_food_sac4_eld.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac4_eld.jpg
+c_a_food_sac_c21.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac_c21.jpg
+c_a_food_sac_eld.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac_eld.jpg
+c_a_food_sac_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac_mh2.jpg
+c_a_food_sac_ncc.jpg https://downloads.cardforge.org/images/tokens/c_a_food_sac_ncc.jpg
+c_a_gold_sac.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac.jpg
+c_a_gold_sac_bng.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_bng.jpg
+c_a_gold_sac_c15.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_c15.jpg
+c_a_gold_sac_c17.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_c17.jpg
+c_a_gold_sac_clb.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_clb.jpg
+c_a_gold_sac_jou.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_jou.jpg
+c_a_gold_sac_thb.jpg https://downloads.cardforge.org/images/tokens/c_a_gold_sac_thb.jpg
 c_a_treasure_sac.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac.jpg
+c_a_treasure_sac2_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac2_mh2.jpg
 c_a_treasure_sac2_rix.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac2_rix.jpg
+c_a_treasure_sac2_snc.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac2_snc.jpg
 c_a_treasure_sac2_xln.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac2_xln.jpg
 c_a_treasure_sac3_rix.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac3_rix.jpg
+c_a_treasure_sac3_snc.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac3_snc.jpg
 c_a_treasure_sac3_xln.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac3_xln.jpg
 c_a_treasure_sac4_rix.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac4_rix.jpg
+c_a_treasure_sac4_snc.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac4_snc.jpg
 c_a_treasure_sac4_xln.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac4_xln.jpg
 c_a_treasure_sac5_rix.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac5_rix.jpg
+c_a_treasure_sac5_snc.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac5_snc.jpg
 c_a_treasure_sac5_xln.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac5_xln.jpg
+c_a_treasure_sac_2x2.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_2x2.jpg
 c_a_treasure_sac_2xm.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_2xm.jpg
+c_a_treasure_sac_afr.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_afr.jpg
+c_a_treasure_sac_c19.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_c19.jpg
 c_a_treasure_sac_c20.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_c20.jpg
+c_a_treasure_sac_clb.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_clb.jpg
 c_a_treasure_sac_cmr.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_cmr.jpg
 c_a_treasure_sac_khm.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_khm.jpg
 c_a_treasure_sac_m20.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_m20.jpg
+c_a_treasure_sac_m21.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_m21.jpg
+c_a_treasure_sac_mh2.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_mh2.jpg
+c_a_treasure_sac_neo.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_neo.jpg
 c_a_treasure_sac_rix.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_rix.jpg
 c_a_treasure_sac_rna.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_rna.jpg
+c_a_treasure_sac_snc.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_snc.jpg
+c_a_treasure_sac_stx.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_stx.jpg
+c_a_treasure_sac_vow.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_vow.jpg
 c_a_treasure_sac_xln.jpg https://downloads.cardforge.org/images/tokens/c_a_treasure_sac_xln.jpg
+c_e_shard_draw.jpg https://downloads.cardforge.org/images/tokens/c_e_shard_draw.jpg
+c_e_shard_draw_khm.jpg https://downloads.cardforge.org/images/tokens/c_e_shard_draw_khm.jpg
+c_x_x_a_construct.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_construct.jpg
 c_x_x_a_construct2_kld.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_construct2_kld.jpg
+c_x_x_a_construct_c21.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_construct_c21.jpg
 c_x_x_a_construct_kld.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_construct_kld.jpg
 c_x_x_a_horror.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_horror.jpg
 c_x_x_a_horror_c16.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_horror_c16.jpg
 c_x_x_a_horror_c18.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_horror_c18.jpg
+c_x_x_a_horror_c19.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_horror_c19.jpg
 c_x_x_a_horror_mbs.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_horror_mbs.jpg
-carnivore_c13.jpg https://downloads.cardforge.org/images/tokens/carnivore_c13.jpg
+c_x_x_a_phyrexian_horror.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_phyrexian_horror.jpg
+c_x_x_a_sculpture_total_sculptures.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_sculpture_total_sculptures.jpg
+c_x_x_a_sculpture_total_sculptures_c19.jpg https://downloads.cardforge.org/images/tokens/c_x_x_a_sculpture_total_sculptures_c19.jpg
+carnivore.jpg https://downloads.cardforge.org/images/tokens/carnivore.jpg
 carnivore_ema.jpg https://downloads.cardforge.org/images/tokens/carnivore_ema.jpg
-carnivore_tmp.jpg https://downloads.cardforge.org/images/tokens/carnivore_tmp.jpg
-cloud_sprite_fut.jpg https://downloads.cardforge.org/images/tokens/cloud_sprite_fut.jpg
+champion_of_wits_afc.jpg https://downloads.cardforge.org/images/tokens/champion_of_wits_afc.jpg
+champion_of_wits_ncc.jpg https://downloads.cardforge.org/images/tokens/champion_of_wits_ncc.jpg
+cloud_sprite.jpg https://downloads.cardforge.org/images/tokens/cloud_sprite.jpg
+cloud_sprite_tsr.jpg https://downloads.cardforge.org/images/tokens/cloud_sprite_tsr.jpg
+dragon.jpg https://downloads.cardforge.org/images/tokens/dragon.jpg
+etherium_cell.jpg https://downloads.cardforge.org/images/tokens/etherium_cell.jpg
 etherium_cell_aer.jpg https://downloads.cardforge.org/images/tokens/etherium_cell_aer.jpg
-festering_goblin_fut.jpg https://downloads.cardforge.org/images/tokens/festering_goblin_fut.jpg
+feather.jpg https://downloads.cardforge.org/images/tokens/feather.jpg
+festering_goblin.jpg https://downloads.cardforge.org/images/tokens/festering_goblin.jpg
+g_0_0_hydra.jpg https://downloads.cardforge.org/images/tokens/g_0_0_hydra.jpg
 g_0_0_hydra_c20.jpg https://downloads.cardforge.org/images/tokens/g_0_0_hydra_c20.jpg
-g_0_1_butterfly.jpg https://downloads.cardforge.org/images/tokens/g_0_1_butterfly.jpg
+g_0_1_egg_defender.jpg https://downloads.cardforge.org/images/tokens/g_0_1_egg_defender.jpg
+g_0_1_egg_defender_2x2.jpg https://downloads.cardforge.org/images/tokens/g_0_1_egg_defender_2x2.jpg
+g_0_1_egg_defender_c19.jpg https://downloads.cardforge.org/images/tokens/g_0_1_egg_defender_c19.jpg
 g_0_1_plant.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant.jpg
 g_0_1_plant_2xm.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_2xm.jpg
-g_0_1_plant_arc.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_arc.jpg
-g_0_1_plant_c13.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_c13.jpg
 g_0_1_plant_c18.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_c18.jpg
 g_0_1_plant_cmr.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_cmr.jpg
-g_0_1_plant_ddp.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_ddp.jpg
-g_0_1_plant_ddr.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_ddr.jpg
+g_0_1_plant_ncc.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_ncc.jpg
+g_0_1_plant_nec.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_nec.jpg
 g_0_1_plant_ogw.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_ogw.jpg
-g_0_1_plant_pc2.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_pc2.jpg
 g_0_1_plant_pca.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_pca.jpg
-g_0_1_plant_pz1.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_pz1.jpg
-g_0_1_plant_wall.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_wall.jpg
 g_0_1_plant_wwk.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_wwk.jpg
 g_0_1_plant_znr.jpg https://downloads.cardforge.org/images/tokens/g_0_1_plant_znr.jpg
 g_0_1_sheep.jpg https://downloads.cardforge.org/images/tokens/g_0_1_sheep.jpg
-g_0_1_sheep_tsb.jpg https://downloads.cardforge.org/images/tokens/g_0_1_sheep_tsb.jpg
-g_0_1_sheep_tsp.jpg https://downloads.cardforge.org/images/tokens/g_0_1_sheep_tsp.jpg
-g_0_1_sheep_ugl.jpg https://downloads.cardforge.org/images/tokens/g_0_1_sheep_ugl.jpg
-g_0_1_sheep_vis.jpg https://downloads.cardforge.org/images/tokens/g_0_1_sheep_vis.jpg
-g_0_1_wood.jpg https://downloads.cardforge.org/images/tokens/g_0_1_wood.jpg
-g_0_2_plant.jpg https://downloads.cardforge.org/images/tokens/g_0_2_plant.jpg
+g_0_2_plant_defender.jpg https://downloads.cardforge.org/images/tokens/g_0_2_plant_defender.jpg
 g_0_2_plant_defender_xln.jpg https://downloads.cardforge.org/images/tokens/g_0_2_plant_defender_xln.jpg
-g_0_2_plant_wall.jpg https://downloads.cardforge.org/images/tokens/g_0_2_plant_wall.jpg
-g_0_3_plant_wall.jpg https://downloads.cardforge.org/images/tokens/g_0_3_plant_wall.jpg
-g_1_1_ape.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ape.jpg
+g_1_1_boar_food.jpg https://downloads.cardforge.org/images/tokens/g_1_1_boar_food.jpg
 g_1_1_boar_food_eld.jpg https://downloads.cardforge.org/images/tokens/g_1_1_boar_food_eld.jpg
-g_1_1_butterfly.jpg https://downloads.cardforge.org/images/tokens/g_1_1_butterfly.jpg
-g_1_1_butterfly_vis.jpg https://downloads.cardforge.org/images/tokens/g_1_1_butterfly_vis.jpg
 g_1_1_cat.jpg https://downloads.cardforge.org/images/tokens/g_1_1_cat.jpg
-g_1_1_cat_6ed.jpg https://downloads.cardforge.org/images/tokens/g_1_1_cat_6ed.jpg
-g_1_1_cat_mir.jpg https://downloads.cardforge.org/images/tokens/g_1_1_cat_mir.jpg
+g_1_1_cat_m21.jpg https://downloads.cardforge.org/images/tokens/g_1_1_cat_m21.jpg
 g_1_1_dog.jpg https://downloads.cardforge.org/images/tokens/g_1_1_dog.jpg
-g_1_1_dog_tmp.jpg https://downloads.cardforge.org/images/tokens/g_1_1_dog_tmp.jpg
 g_1_1_elf_druid_g.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_druid_g.jpg
 g_1_1_elf_druid_g_c14.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_druid_g_c14.jpg
 g_1_1_elf_druid_g_cma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_druid_g_cma.jpg
-g_1_1_elf_druid_g_pz1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_druid_g_pz1.jpg
 g_1_1_elf_g.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_g.jpg
 g_1_1_elf_warrior.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior.jpg
 g_1_1_elf_warrior_a25.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_a25.jpg
-g_1_1_elf_warrior_c13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_c13.jpg
 g_1_1_elf_warrior_c14.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_c14.jpg
 g_1_1_elf_warrior_c16.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_c16.jpg
 g_1_1_elf_warrior_cma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_cma.jpg
 g_1_1_elf_warrior_cmr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_cmr.jpg
 g_1_1_elf_warrior_dd1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_dd1.jpg
-g_1_1_elf_warrior_dds.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_dds.jpg
 g_1_1_elf_warrior_ddu.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_ddu.jpg
-g_1_1_elf_warrior_dpa.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_dpa.jpg
 g_1_1_elf_warrior_ema.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_ema.jpg
-g_1_1_elf_warrior_evg.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_evg.jpg
 g_1_1_elf_warrior_khm.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_khm.jpg
 g_1_1_elf_warrior_lrw.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_lrw.jpg
 g_1_1_elf_warrior_m19.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_m19.jpg
 g_1_1_elf_warrior_mor.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_mor.jpg
+g_1_1_elf_warrior_mvm.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_mvm.jpg
+g_1_1_elf_warrior_ncc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_ncc.jpg
 g_1_1_elf_warrior_ori.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_ori.jpg
 g_1_1_elf_warrior_shm.jpg https://downloads.cardforge.org/images/tokens/g_1_1_elf_warrior_shm.jpg
 g_1_1_hippo.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hippo.jpg
-g_1_1_hippo_all.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hippo_all.jpg
-g_1_1_hippo_me1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hippo_me1.jpg
-g_1_1_hippo_pls.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hippo_pls.jpg
-g_1_1_hippo_td0.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hippo_td0.jpg
+g_1_1_hound.jpg https://downloads.cardforge.org/images/tokens/g_1_1_hound.jpg
+g_1_1_human_monk_g_neo.jpg https://downloads.cardforge.org/images/tokens/g_1_1_human_monk_g_neo.jpg
 g_1_1_insect.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect.jpg
-g_1_1_insect_5dn.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_5dn.jpg
 g_1_1_insect_a25.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_a25.jpg
-g_1_1_insect_c13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_c13.jpg
-g_1_1_insect_cm1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_cm1.jpg
-g_1_1_insect_cmd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_cmd.jpg
 g_1_1_insect_cn2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_cn2.jpg
-g_1_1_insect_deathtouch.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_deathtouch.jpg
-g_1_1_insect_dst.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_dst.jpg
 g_1_1_insect_emn.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_emn.jpg
+g_1_1_insect_flying_deathtouch.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch.jpg
 g_1_1_insect_flying_deathtouch_c20.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch_c20.jpg
-g_1_1_insect_flying_deathtouch_cmd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch_cmd.jpg
+g_1_1_insect_flying_deathtouch_c21.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch_c21.jpg
+g_1_1_insect_flying_deathtouch_clb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch_clb.jpg
 g_1_1_insect_flying_deathtouch_m15.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_flying_deathtouch_m15.jpg
-g_1_1_insect_hop.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_hop.jpg
 g_1_1_insect_infect.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_infect.jpg
 g_1_1_insect_infect_nph.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_infect_nph.jpg
 g_1_1_insect_infect_som.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_infect_som.jpg
-g_1_1_insect_lgn.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_lgn.jpg
 g_1_1_insect_m10.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_m10.jpg
-g_1_1_insect_m15.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_m15.jpg
 g_1_1_insect_mm2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_mm2.jpg
-g_1_1_insect_mmq.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_mmq.jpg
-g_1_1_insect_mrd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_mrd.jpg
-g_1_1_insect_ons.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_ons.jpg
-g_1_1_insect_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_pc2.jpg
+g_1_1_insect_ncc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_ncc.jpg
 g_1_1_insect_pca.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_pca.jpg
-g_1_1_insect_pz1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_pz1.jpg
 g_1_1_insect_soi.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_soi.jpg
-g_1_1_insect_td2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_td2.jpg
-g_1_1_insect_vma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_vma.jpg
+g_1_1_insect_vow.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_vow.jpg
 g_1_1_insect_znr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_insect_znr.jpg
-g_1_1_llanowar_elves.jpg https://downloads.cardforge.org/images/tokens/g_1_1_llanowar_elves.jpg
 g_1_1_ooze.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze.jpg
 g_1_1_ooze_m11.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze_m11.jpg
-g_1_1_ooze_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze_pc2.jpg
+g_1_1_ooze_ncc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze_ncc.jpg
 g_1_1_ooze_pca.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze_pca.jpg
-g_1_1_ooze_td2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_ooze_td2.jpg
+g_1_1_phyrexian_insect_infect.jpg https://downloads.cardforge.org/images/tokens/g_1_1_phyrexian_insect_infect.jpg
 g_1_1_plant.jpg https://downloads.cardforge.org/images/tokens/g_1_1_plant.jpg
 g_1_1_plant_bfz.jpg https://downloads.cardforge.org/images/tokens/g_1_1_plant_bfz.jpg
+g_1_1_plant_c19.jpg https://downloads.cardforge.org/images/tokens/g_1_1_plant_c19.jpg
 g_1_1_saproling.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling.jpg
 g_1_1_saproling2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2.jpg
-g_1_1_saproling2_c13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_c13.jpg
 g_1_1_saproling2_c16.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_c16.jpg
 g_1_1_saproling2_dom.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_dom.jpg
 g_1_1_saproling2_gk1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_gk1.jpg
-g_1_1_saproling2_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_pc2.jpg
-g_1_1_saproling2_ust.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling2_ust.jpg
-g_1_1_saproling3.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling3.jpg
-g_1_1_saproling3_c13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling3_c13.jpg
 g_1_1_saproling3_dom.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling3_dom.jpg
-g_1_1_saproling3_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling3_pc2.jpg
-g_1_1_saproling4_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling4_pc2.jpg
 g_1_1_saproling_10e.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_10e.jpg
+g_1_1_saproling_2x2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_2x2.jpg
 g_1_1_saproling_2xm.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_2xm.jpg
-g_1_1_saproling_9ed.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_9ed.jpg
+g_1_1_saproling_afc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_afc.jpg
 g_1_1_saproling_ala.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ala.jpg
-g_1_1_saproling_apc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_apc.jpg
 g_1_1_saproling_arb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_arb.jpg
-g_1_1_saproling_arc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_arc.jpg
-g_1_1_saproling_c13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c13.jpg
 g_1_1_saproling_c15.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c15.jpg
 g_1_1_saproling_c16.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c16.jpg
+g_1_1_saproling_c19.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c19.jpg
 g_1_1_saproling_c20.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c20.jpg
-g_1_1_saproling_cfx.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_cfx.jpg
+g_1_1_saproling_c21.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_c21.jpg
+g_1_1_saproling_clb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_clb.jpg
 g_1_1_saproling_cm2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_cm2.jpg
 g_1_1_saproling_cma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_cma.jpg
-g_1_1_saproling_cmd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_cmd.jpg
 g_1_1_saproling_cmr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_cmr.jpg
 g_1_1_saproling_dde.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_dde.jpg
-g_1_1_saproling_ddf.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ddf.jpg
 g_1_1_saproling_ddh.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ddh.jpg
 g_1_1_saproling_ddj.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ddj.jpg
-g_1_1_saproling_ddl.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ddl.jpg
-g_1_1_saproling_dis.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_dis.jpg
 g_1_1_saproling_dom.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_dom.jpg
-g_1_1_saproling_dpa.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_dpa.jpg
-g_1_1_saproling_drb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_drb.jpg
-g_1_1_saproling_e02.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_e02.jpg
-g_1_1_saproling_fem.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_fem.jpg
-g_1_1_saproling_fut.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_fut.jpg
 g_1_1_saproling_gk1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_gk1.jpg
 g_1_1_saproling_gk2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_gk2.jpg
-g_1_1_saproling_gpt.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_gpt.jpg
-g_1_1_saproling_hop.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_hop.jpg
-g_1_1_saproling_inv.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_inv.jpg
 g_1_1_saproling_m12.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_m12.jpg
 g_1_1_saproling_m13.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_m13.jpg
 g_1_1_saproling_m14.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_m14.jpg
-g_1_1_saproling_me2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_me2.jpg
+g_1_1_saproling_m21.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_m21.jpg
 g_1_1_saproling_mm2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_mm2.jpg
 g_1_1_saproling_mm3.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_mm3.jpg
 g_1_1_saproling_mma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_mma.jpg
-g_1_1_saproling_mmq.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_mmq.jpg
-g_1_1_saproling_nms.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_nms.jpg
-g_1_1_saproling_pc2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_pc2.jpg
+g_1_1_saproling_ncc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ncc.jpg
+g_1_1_saproling_nec.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_nec.jpg
 g_1_1_saproling_pca.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_pca.jpg
-g_1_1_saproling_pd3.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_pd3.jpg
-g_1_1_saproling_plc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_plc.jpg
-g_1_1_saproling_pls.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_pls.jpg
-g_1_1_saproling_pz1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_pz1.jpg
-g_1_1_saproling_rav.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_rav.jpg
 g_1_1_saproling_rix.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_rix.jpg
 g_1_1_saproling_rtr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_rtr.jpg
-g_1_1_saproling_tmp.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_tmp.jpg
-g_1_1_saproling_tpr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_tpr.jpg
-g_1_1_saproling_tsb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_tsb.jpg
-g_1_1_saproling_tsp.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_tsp.jpg
-g_1_1_saproling_usg.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_usg.jpg
-g_1_1_saproling_ust.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_ust.jpg
-g_1_1_saproling_vintage.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_vintage.jpg
-g_1_1_saproling_vma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_vma.jpg
+g_1_1_saproling_tsr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_tsr.jpg
 g_1_1_saproling_znc.jpg https://downloads.cardforge.org/images/tokens/g_1_1_saproling_znc.jpg
 g_1_1_snake.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake.jpg
-g_1_1_snake_6ed.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_6ed.jpg
-g_1_1_snake_akh.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_akh.jpg
-g_1_1_snake_bok.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_bok.jpg
 g_1_1_snake_c15.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_c15.jpg
+g_1_1_snake_c19.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_c19.jpg
 g_1_1_snake_c20.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_c20.jpg
-g_1_1_snake_chk.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_chk.jpg
-g_1_1_snake_cmd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_cmd.jpg
+g_1_1_snake_deathtouch.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_deathtouch.jpg
 g_1_1_snake_deathtouch_akh.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_deathtouch_akh.jpg
 g_1_1_snake_ktk.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_ktk.jpg
+g_1_1_snake_mic.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_mic.jpg
 g_1_1_snake_mm2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_mm2.jpg
-g_1_1_snake_mmq.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_mmq.jpg
-g_1_1_snake_sok.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_sok.jpg
-g_1_1_snake_vis.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_vis.jpg
 g_1_1_snake_wwk.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_wwk.jpg
 g_1_1_snake_zen.jpg https://downloads.cardforge.org/images/tokens/g_1_1_snake_zen.jpg
 g_1_1_spike.jpg https://downloads.cardforge.org/images/tokens/g_1_1_spike.jpg
-g_1_1_spike_sth.jpg https://downloads.cardforge.org/images/tokens/g_1_1_spike_sth.jpg
-g_1_1_spike_tpr.jpg https://downloads.cardforge.org/images/tokens/g_1_1_spike_tpr.jpg
-g_1_1_splinter.jpg https://downloads.cardforge.org/images/tokens/g_1_1_splinter.jpg
 g_1_1_splinter_flying_cum.jpg https://downloads.cardforge.org/images/tokens/g_1_1_splinter_flying_cum.jpg
-g_1_1_splinter_flying_cum_all.jpg https://downloads.cardforge.org/images/tokens/g_1_1_splinter_flying_cum_all.jpg
 g_1_1_squirrel.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel.jpg
+g_1_1_squirrel2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel2.jpg
 g_1_1_squirrel_2xm.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_2xm.jpg
-g_1_1_squirrel_cmd.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_cmd.jpg
+g_1_1_squirrel_clb.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_clb.jpg
 g_1_1_squirrel_cns.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_cns.jpg
 g_1_1_squirrel_mh1.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_mh1.jpg
-g_1_1_squirrel_ody.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_ody.jpg
-g_1_1_squirrel_pcy.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_pcy.jpg
-g_1_1_squirrel_tor.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_tor.jpg
-g_1_1_squirrel_ugl.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_ugl.jpg
-g_1_1_squirrel_ulg.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_ulg.jpg
-g_1_1_squirrel_ust.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_ust.jpg
-g_1_1_squirrel_vma.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_vma.jpg
-g_1_1_squirrel_wth.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_wth.jpg
-g_1_1_wolf.jpg https://downloads.cardforge.org/images/tokens/g_1_1_wolf.jpg
-g_1_1_wolf_sound_the_call_csp.jpg https://downloads.cardforge.org/images/tokens/g_1_1_wolf_sound_the_call_csp.jpg
-g_1_1_wolves_of_the_hunt.jpg https://downloads.cardforge.org/images/tokens/g_1_1_wolves_of_the_hunt.jpg
-g_1_2_spider.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider.jpg
-g_1_2_spider_isd.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_isd.jpg
-g_1_2_spider_reac.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reac.jpg
+g_1_1_squirrel_mh2.jpg https://downloads.cardforge.org/images/tokens/g_1_1_squirrel_mh2.jpg
+g_1_1_wolf_sound_the_call.jpg https://downloads.cardforge.org/images/tokens/g_1_1_wolf_sound_the_call.jpg
+g_1_2_spider_reach.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach.jpg
+g_1_2_spider_reach_2x2.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_2x2.jpg
 g_1_2_spider_reach_c15.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_c15.jpg
+g_1_2_spider_reach_clb.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_clb.jpg
 g_1_2_spider_reach_cma.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_cma.jpg
 g_1_2_spider_reach_emn.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_emn.jpg
 g_1_2_spider_reach_isd.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_isd.jpg
-g_1_2_spider_reach_pz1.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_pz1.jpg
+g_1_2_spider_reach_mh1.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_mh1.jpg
+g_1_2_spider_reach_mid.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_mid.jpg
+g_1_2_spider_reach_ncc.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_ncc.jpg
 g_1_2_spider_reach_shm.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_shm.jpg
 g_1_2_spider_reach_thb.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_thb.jpg
 g_1_2_spider_reach_uma.jpg https://downloads.cardforge.org/images/tokens/g_1_2_spider_reach_uma.jpg
+g_1_3_e_spider_reach.jpg https://downloads.cardforge.org/images/tokens/g_1_3_e_spider_reach.jpg
 g_1_3_e_spider_reach_jou.jpg https://downloads.cardforge.org/images/tokens/g_1_3_e_spider_reach_jou.jpg
-g_1_3_plant_wall.jpg https://downloads.cardforge.org/images/tokens/g_1_3_plant_wall.jpg
-g_1_3_plant_wall_deathtouch.jpg https://downloads.cardforge.org/images/tokens/g_1_3_plant_wall_deathtouch.jpg
-g_1_4_plant_wall.jpg https://downloads.cardforge.org/images/tokens/g_1_4_plant_wall.jpg
-g_2_2_ape.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ape.jpg
 g_2_2_bear.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear.jpg
-g_2_2_bear2.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear2.jpg
 g_2_2_bear_c15.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_c15.jpg
 g_2_2_bear_eld.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_eld.jpg
-g_2_2_bear_jud.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_jud.jpg
 g_2_2_bear_khm.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_khm.jpg
-g_2_2_bear_lgn.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_lgn.jpg
 g_2_2_bear_mh1.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_mh1.jpg
-g_2_2_bear_ody.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_ody.jpg
-g_2_2_bear_ons.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_ons.jpg
-g_2_2_bear_vma.jpg https://downloads.cardforge.org/images/tokens/g_2_2_bear_vma.jpg
 g_2_2_beast.jpg https://downloads.cardforge.org/images/tokens/g_2_2_beast.jpg
-g_2_2_beast_exo.jpg https://downloads.cardforge.org/images/tokens/g_2_2_beast_exo.jpg
 g_2_2_boar.jpg https://downloads.cardforge.org/images/tokens/g_2_2_boar.jpg
+g_2_2_boar_c21.jpg https://downloads.cardforge.org/images/tokens/g_2_2_boar_c21.jpg
+g_2_2_boar_clb.jpg https://downloads.cardforge.org/images/tokens/g_2_2_boar_clb.jpg
 g_2_2_boar_khc.jpg https://downloads.cardforge.org/images/tokens/g_2_2_boar_khc.jpg
 g_2_2_boar_ths.jpg https://downloads.cardforge.org/images/tokens/g_2_2_boar_ths.jpg
+g_2_2_cat.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat.jpg
+g_2_2_cat_haste_snc.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_haste_snc.jpg
 g_2_2_cat_khm.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_khm.jpg
-g_2_2_cat_warrior.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_warrior.jpg
+g_2_2_cat_m21.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_m21.jpg
 g_2_2_cat_warrior_forestwalk.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_warrior_forestwalk.jpg
 g_2_2_cat_warrior_forestwalk_c17.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_warrior_forestwalk_c17.jpg
 g_2_2_cat_warrior_forestwalk_c18.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_warrior_forestwalk_c18.jpg
-g_2_2_cat_warrior_forestwalk_plc.jpg https://downloads.cardforge.org/images/tokens/g_2_2_cat_warrior_forestwalk_plc.jpg
 g_2_2_elemental.jpg https://downloads.cardforge.org/images/tokens/g_2_2_elemental.jpg
 g_2_2_elemental_ori.jpg https://downloads.cardforge.org/images/tokens/g_2_2_elemental_ori.jpg
 g_2_2_elemental_znc.jpg https://downloads.cardforge.org/images/tokens/g_2_2_elemental_znc.jpg
 g_2_2_lizard.jpg https://downloads.cardforge.org/images/tokens/g_2_2_lizard.jpg
 g_2_2_lizard_arb.jpg https://downloads.cardforge.org/images/tokens/g_2_2_lizard_arb.jpg
-g_2_2_monkey_mmq.jpg https://downloads.cardforge.org/images/tokens/g_2_2_monkey_mmq.jpg
+g_2_2_monkey.jpg https://downloads.cardforge.org/images/tokens/g_2_2_monkey.jpg
 g_2_2_ooze.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze.jpg
 g_2_2_ooze_mitotic.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic.jpg
 g_2_2_ooze_mitotic_m11.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic_m11.jpg
-g_2_2_ooze_mitotic_pc2.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic_pc2.jpg
+g_2_2_ooze_mitotic_ncc.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic_ncc.jpg
 g_2_2_ooze_mitotic_pca.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic_pca.jpg
-g_2_2_ooze_mitotic_td2.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_mitotic_td2.jpg
 g_2_2_ooze_rna.jpg https://downloads.cardforge.org/images/tokens/g_2_2_ooze_rna.jpg
-g_2_2_rabid_sheep.jpg https://downloads.cardforge.org/images/tokens/g_2_2_rabid_sheep.jpg
-g_2_2_rabid_sheep_ugl.jpg https://downloads.cardforge.org/images/tokens/g_2_2_rabid_sheep_ugl.jpg
 g_2_2_wolf.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf.jpg
-g_2_2_wolf1.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf1.jpg
-g_2_2_wolf2.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf2.jpg
 g_2_2_wolf2_cma.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf2_cma.jpg
-g_2_2_wolf2_v17.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf2_v17.jpg
 g_2_2_wolf_2xm.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_2xm.jpg
-g_2_2_wolf_SOI.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_SOI.jpg
 g_2_2_wolf_a25.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_a25.jpg
+g_2_2_wolf_afr.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_afr.jpg
 g_2_2_wolf_bng.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_bng.jpg
 g_2_2_wolf_c14.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_c14.jpg
 g_2_2_wolf_c15.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_c15.jpg
+g_2_2_wolf_clb.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_clb.jpg
 g_2_2_wolf_cma.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_cma.jpg
-g_2_2_wolf_cmd.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_cmd.jpg
 g_2_2_wolf_cns.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_cns.jpg
 g_2_2_wolf_dka.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_dka.jpg
-g_2_2_wolf_dpa.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_dpa.jpg
-g_2_2_wolf_eld.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_eld.jpg
 g_2_2_wolf_emn.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_emn.jpg
 g_2_2_wolf_eve.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_eve.jpg
-g_2_2_wolf_fvr.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_fvr.jpg
 g_2_2_wolf_isd.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_isd.jpg
 g_2_2_wolf_lrw.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_lrw.jpg
 g_2_2_wolf_m10.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_m10.jpg
 g_2_2_wolf_m14.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_m14.jpg
 g_2_2_wolf_m15.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_m15.jpg
 g_2_2_wolf_m20.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_m20.jpg
+g_2_2_wolf_mid.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_mid.jpg
 g_2_2_wolf_mm2.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_mm2.jpg
 g_2_2_wolf_mor.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_mor.jpg
-g_2_2_wolf_mps_kld.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_mps_kld.jpg
+g_2_2_wolf_mps.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_mps.jpg
 g_2_2_wolf_shm.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_shm.jpg
 g_2_2_wolf_soi.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_soi.jpg
 g_2_2_wolf_som.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_som.jpg
 g_2_2_wolf_thb.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_thb.jpg
-g_2_2_wolf_v17.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_v17.jpg
+g_2_2_wolf_vow.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_vow.jpg
 g_2_2_wolf_war.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_war.jpg
 g_2_2_wolf_wwk.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_wwk.jpg
 g_2_2_wolf_zen.jpg https://downloads.cardforge.org/images/tokens/g_2_2_wolf_zen.jpg
-g_2_3_antelope.jpg https://downloads.cardforge.org/images/tokens/g_2_3_antelope.jpg
+g_2_3_antelope_forestwalk.jpg https://downloads.cardforge.org/images/tokens/g_2_3_antelope_forestwalk.jpg
 g_2_5_treefolk_shaman.jpg https://downloads.cardforge.org/images/tokens/g_2_5_treefolk_shaman.jpg
 g_2_5_treefolk_shaman_mma.jpg https://downloads.cardforge.org/images/tokens/g_2_5_treefolk_shaman_mma.jpg
 g_2_5_treefolk_shaman_mor.jpg https://downloads.cardforge.org/images/tokens/g_2_5_treefolk_shaman_mor.jpg
-g_3_2_cat.jpg https://downloads.cardforge.org/images/tokens/g_3_2_cat.jpg
+g_3_1_boar_vow.jpg https://downloads.cardforge.org/images/tokens/g_3_1_boar_vow.jpg
+g_3_1_dog_vigilance_snc.jpg https://downloads.cardforge.org/images/tokens/g_3_1_dog_vigilance_snc.jpg
+g_3_2_cat_shroud.jpg https://downloads.cardforge.org/images/tokens/g_3_2_cat_shroud.jpg
 g_3_3_ape.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ape.jpg
 g_3_3_ape_2xm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ape_2xm.jpg
 g_3_3_ape_c14.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ape_c14.jpg
-g_3_3_ape_plc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ape_plc.jpg
+g_3_3_ape_tsr.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ape_tsr.jpg
 g_3_3_beast.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast.jpg
-g_3_3_beast2_ust.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast2_ust.jpg
+g_3_3_beast2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast2.jpg
 g_3_3_beast_2xm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_2xm.jpg
-g_3_3_beast_5dn.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_5dn.jpg
+g_3_3_beast_afc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_afc.jpg
 g_3_3_beast_bbd.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_bbd.jpg
 g_3_3_beast_c14.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_c14.jpg
 g_3_3_beast_c16.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_c16.jpg
+g_3_3_beast_c19.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_c19.jpg
+g_3_3_beast_c21.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_c21.jpg
+g_3_3_beast_clb.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_clb.jpg
 g_3_3_beast_cma.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_cma.jpg
-g_3_3_beast_cmd.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_cmd.jpg
 g_3_3_beast_cmr.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_cmr.jpg
 g_3_3_beast_cn2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_cn2.jpg
 g_3_3_beast_ddd.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_ddd.jpg
 g_3_3_beast_ddl.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_ddl.jpg
-g_3_3_beast_dst.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_dst.jpg
 g_3_3_beast_e01.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_e01.jpg
 g_3_3_beast_eve.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_eve.jpg
-g_3_3_beast_gvl.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_gvl.jpg
 g_3_3_beast_iko.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_iko.jpg
 g_3_3_beast_lrw.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_lrw.jpg
 g_3_3_beast_m10.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m10.jpg
@@ -834,231 +829,236 @@ g_3_3_beast_m13.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m1
 g_3_3_beast_m14.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m14.jpg
 g_3_3_beast_m15.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m15.jpg
 g_3_3_beast_m19.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m19.jpg
+g_3_3_beast_m21.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_m21.jpg
+g_3_3_beast_mic.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_mic.jpg
 g_3_3_beast_mm3.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_mm3.jpg
+g_3_3_beast_ncc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_ncc.jpg
+g_3_3_beast_nec.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_nec.jpg
 g_3_3_beast_nph.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_nph.jpg
-g_3_3_beast_pc2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_pc2.jpg
 g_3_3_beast_pca.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_pca.jpg
-g_3_3_beast_usg.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_usg.jpg
-g_3_3_beast_ust.jpg https://downloads.cardforge.org/images/tokens/g_3_3_beast_ust.jpg
 g_3_3_boar.jpg https://downloads.cardforge.org/images/tokens/g_3_3_boar.jpg
-g_3_3_boar_pc2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_boar_pc2.jpg
+g_3_3_boar_2x2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_boar_2x2.jpg
 g_3_3_boar_pca.jpg https://downloads.cardforge.org/images/tokens/g_3_3_boar_pca.jpg
-g_3_3_boar_vma.jpg https://downloads.cardforge.org/images/tokens/g_3_3_boar_vma.jpg
 g_3_3_centaur.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur.jpg
 g_3_3_centaur2_dgm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur2_dgm.jpg
 g_3_3_centaur2_rtr.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur2_rtr.jpg
 g_3_3_centaur_bng.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_bng.jpg
+g_3_3_centaur_c19.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_c19.jpg
 g_3_3_centaur_dgm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_dgm.jpg
 g_3_3_centaur_gk1.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_gk1.jpg
+g_3_3_centaur_mic.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_mic.jpg
 g_3_3_centaur_mm3.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_mm3.jpg
-g_3_3_centaur_ons.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_ons.jpg
 g_3_3_centaur_pro_black.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_pro_black.jpg
-g_3_3_centaur_pro_black_rav.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_pro_black_rav.jpg
+g_3_3_centaur_pro_black_clb.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_pro_black_clb.jpg
 g_3_3_centaur_rna.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_rna.jpg
 g_3_3_centaur_rtr.jpg https://downloads.cardforge.org/images/tokens/g_3_3_centaur_rtr.jpg
-g_3_3_dinosaur.jpg https://downloads.cardforge.org/images/tokens/g_3_3_dinosaur.jpg
+g_3_3_dinosaur_trample.jpg https://downloads.cardforge.org/images/tokens/g_3_3_dinosaur_trample.jpg
 g_3_3_dinosaur_trample_rix.jpg https://downloads.cardforge.org/images/tokens/g_3_3_dinosaur_trample_rix.jpg
 g_3_3_dinosaur_trample_xln.jpg https://downloads.cardforge.org/images/tokens/g_3_3_dinosaur_trample_xln.jpg
+g_3_3_e_centaur.jpg https://downloads.cardforge.org/images/tokens/g_3_3_e_centaur.jpg
 g_3_3_e_centaur_bng.jpg https://downloads.cardforge.org/images/tokens/g_3_3_e_centaur_bng.jpg
-g_3_3_e_centaur_cp1.jpg https://downloads.cardforge.org/images/tokens/g_3_3_e_centaur_cp1.jpg
-g_3_3_elemental_arc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elemental_arc.jpg
+g_3_3_elemental.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elemental.jpg
 g_3_3_elephant.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant.jpg
 g_3_3_elephant_2xm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_2xm.jpg
-g_3_3_elephant_c13.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_c13.jpg
 g_3_3_elephant_c14.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_c14.jpg
 g_3_3_elephant_c15.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_c15.jpg
+g_3_3_elephant_c21.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_c21.jpg
 g_3_3_elephant_cma.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_cma.jpg
-g_3_3_elephant_cmd.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_cmd.jpg
 g_3_3_elephant_cmr.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_cmr.jpg
 g_3_3_elephant_cns.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_cns.jpg
 g_3_3_elephant_ddd.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_ddd.jpg
-g_3_3_elephant_dds.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_dds.jpg
 g_3_3_elephant_ema.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_ema.jpg
-g_3_3_elephant_gvl.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_gvl.jpg
-g_3_3_elephant_hop.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_hop.jpg
-g_3_3_elephant_inv.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_inv.jpg
-g_3_3_elephant_jud.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_jud.jpg
 g_3_3_elephant_mh1.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_mh1.jpg
+g_3_3_elephant_mic.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_mic.jpg
 g_3_3_elephant_mm2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_mm2.jpg
 g_3_3_elephant_mm3.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_mm3.jpg
-g_3_3_elephant_ody.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_ody.jpg
-g_3_3_elephant_pd3.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_pd3.jpg
+g_3_3_elephant_mvm.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_mvm.jpg
+g_3_3_elephant_ncc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_ncc.jpg
+g_3_3_elephant_nec.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_nec.jpg
 g_3_3_elephant_roe.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_roe.jpg
-g_3_3_elephant_tsb.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_tsb.jpg
-g_3_3_elephant_vma.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_vma.jpg
 g_3_3_elephant_wwk.jpg https://downloads.cardforge.org/images/tokens/g_3_3_elephant_wwk.jpg
 g_3_3_frog_lizard.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard.jpg
 g_3_3_frog_lizard_c15.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard_c15.jpg
+g_3_3_frog_lizard_c21.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard_c21.jpg
 g_3_3_frog_lizard_gk2.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard_gk2.jpg
 g_3_3_frog_lizard_gtc.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard_gtc.jpg
 g_3_3_frog_lizard_rna.jpg https://downloads.cardforge.org/images/tokens/g_3_3_frog_lizard_rna.jpg
+g_3_3_hippo.jpg https://downloads.cardforge.org/images/tokens/g_3_3_hippo.jpg
 g_3_3_hippo_akh.jpg https://downloads.cardforge.org/images/tokens/g_3_3_hippo_akh.jpg
+g_3_3_insect_mid.jpg https://downloads.cardforge.org/images/tokens/g_3_3_insect_mid.jpg
 g_3_3_ooze.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ooze.jpg
 g_3_3_ooze_soi.jpg https://downloads.cardforge.org/images/tokens/g_3_3_ooze_soi.jpg
+g_4_2_beast.jpg https://downloads.cardforge.org/images/tokens/g_4_2_beast.jpg
 g_4_2_beast_akh.jpg https://downloads.cardforge.org/images/tokens/g_4_2_beast_akh.jpg
+g_4_4_bear.jpg https://downloads.cardforge.org/images/tokens/g_4_4_bear.jpg
+g_4_4_bear_2x2.jpg https://downloads.cardforge.org/images/tokens/g_4_4_bear_2x2.jpg
 g_4_4_bear_ktk.jpg https://downloads.cardforge.org/images/tokens/g_4_4_bear_ktk.jpg
 g_4_4_beast.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast.jpg
-g_4_4_beast_c13.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c13.jpg
 g_4_4_beast_c14.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c14.jpg
 g_4_4_beast_c15.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c15.jpg
 g_4_4_beast_c18.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c18.jpg
+g_4_4_beast_c19.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c19.jpg
 g_4_4_beast_c20.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c20.jpg
+g_4_4_beast_c21.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_c21.jpg
 g_4_4_beast_cma.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_cma.jpg
-g_4_4_beast_cmd.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_cmd.jpg
 g_4_4_beast_cmr.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_cmr.jpg
 g_4_4_beast_ddd.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_ddd.jpg
-g_4_4_beast_dds.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_dds.jpg
 g_4_4_beast_e01.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_e01.jpg
-g_4_4_beast_gvl.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_gvl.jpg
 g_4_4_beast_ima.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_ima.jpg
+g_4_4_beast_mh2.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_mh2.jpg
+g_4_4_beast_mid.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_mid.jpg
 g_4_4_beast_mm3.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_mm3.jpg
-g_4_4_beast_ody.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_ody.jpg
-g_4_4_beast_pz1.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_pz1.jpg
-g_4_4_beast_scg.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_scg.jpg
+g_4_4_beast_mvm.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_mvm.jpg
 g_4_4_beast_zen.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_zen.jpg
 g_4_4_beast_znc.jpg https://downloads.cardforge.org/images/tokens/g_4_4_beast_znc.jpg
-g_4_4_cat_beast.jpg https://downloads.cardforge.org/images/tokens/g_4_4_cat_beast.jpg
 g_4_4_elemental.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental.jpg
-g_4_4_elemental_c13.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_c13.jpg
-g_4_4_elemental_ddr.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_ddr.jpg
 g_4_4_elemental_lrw.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_lrw.jpg
 g_4_4_elemental_mma.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_mma.jpg
 g_4_4_elemental_mor.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_mor.jpg
 g_4_4_elemental_uma.jpg https://downloads.cardforge.org/images/tokens/g_4_4_elemental_uma.jpg
-g_4_4_rhino.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino.jpg
-g_4_4_rhino_rtr.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_rtr.jpg
+g_4_4_fungus_beast_trample_c21.jpg https://downloads.cardforge.org/images/tokens/g_4_4_fungus_beast_trample_c21.jpg
+g_4_4_ox_clb.jpg https://downloads.cardforge.org/images/tokens/g_4_4_ox_clb.jpg
+g_4_4_phyrexian_beast.jpg https://downloads.cardforge.org/images/tokens/g_4_4_phyrexian_beast.jpg
+g_4_4_phyrexian_beast_clb.jpg https://downloads.cardforge.org/images/tokens/g_4_4_phyrexian_beast_clb.jpg
+g_4_4_rhino_trample.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample.jpg
+g_4_4_rhino_trample_c19.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample_c19.jpg
 g_4_4_rhino_trample_dgm.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample_dgm.jpg
 g_4_4_rhino_trample_mh1.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample_mh1.jpg
+g_4_4_rhino_trample_mic.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample_mic.jpg
 g_4_4_rhino_trample_rtr.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_trample_rtr.jpg
+g_4_4_rhino_warrior_snc.jpg https://downloads.cardforge.org/images/tokens/g_4_4_rhino_warrior_snc.jpg
+g_4_4_troll_warrior_trample.jpg https://downloads.cardforge.org/images/tokens/g_4_4_troll_warrior_trample.jpg
 g_4_4_troll_warrior_trample_khm.jpg https://downloads.cardforge.org/images/tokens/g_4_4_troll_warrior_trample_khm.jpg
+g_4_5_spirit_neo.jpg https://downloads.cardforge.org/images/tokens/g_4_5_spirit_neo.jpg
+g_5_3_elemental.jpg https://downloads.cardforge.org/images/tokens/g_5_3_elemental.jpg
 g_5_3_elemental_c14.jpg https://downloads.cardforge.org/images/tokens/g_5_3_elemental_c14.jpg
 g_5_3_elemental_cma.jpg https://downloads.cardforge.org/images/tokens/g_5_3_elemental_cma.jpg
-g_5_3_elemental_pz1.jpg https://downloads.cardforge.org/images/tokens/g_5_3_elemental_pz1.jpg
+g_5_3_elemental_mh2.jpg https://downloads.cardforge.org/images/tokens/g_5_3_elemental_mh2.jpg
+g_5_4_snake.jpg https://downloads.cardforge.org/images/tokens/g_5_4_snake.jpg
 g_5_4_snake_hou.jpg https://downloads.cardforge.org/images/tokens/g_5_4_snake_hou.jpg
 g_5_5_beast.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast.jpg
-g_5_5_beast_c13.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_c13.jpg
-g_5_5_beast_mrd.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_mrd.jpg
-g_5_5_beast_td2.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_td2.jpg
-g_5_5_beast_trample_c13.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_trample_c13.jpg
+g_5_5_beast_trample.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_trample.jpg
 g_5_5_beast_trample_c18.jpg https://downloads.cardforge.org/images/tokens/g_5_5_beast_trample_c18.jpg
-g_5_5_snake.jpg https://downloads.cardforge.org/images/tokens/g_5_5_snake.jpg
+g_5_5_wurm.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm.jpg
 g_5_5_wurm_akh.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_akh.jpg
-g_5_5_wurm_rtr.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_rtr.jpg
+g_5_5_wurm_clb.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_clb.jpg
+g_5_5_wurm_ncc.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_ncc.jpg
+g_5_5_wurm_trample.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_trample.jpg
 g_5_5_wurm_trample_dgm.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_trample_dgm.jpg
 g_5_5_wurm_trample_gk1.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_trample_gk1.jpg
 g_5_5_wurm_trample_mm3.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_trample_mm3.jpg
 g_5_5_wurm_trample_rtr.jpg https://downloads.cardforge.org/images/tokens/g_5_5_wurm_trample_rtr.jpg
-g_6_1_insect.jpg https://downloads.cardforge.org/images/tokens/g_6_1_insect.jpg
-g_6_1_insect2.jpg https://downloads.cardforge.org/images/tokens/g_6_1_insect2.jpg
-g_6_1_insect_shroud_plc.jpg https://downloads.cardforge.org/images/tokens/g_6_1_insect_shroud_plc.jpg
+g_6_1_insect_shroud.jpg https://downloads.cardforge.org/images/tokens/g_6_1_insect_shroud.jpg
+g_6_1_insect_shroud_tsr.jpg https://downloads.cardforge.org/images/tokens/g_6_1_insect_shroud_tsr.jpg
 g_6_6_wurm.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm.jpg
-g_6_6_wurm_dds.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_dds.jpg
+g_6_6_wurm_c19.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_c19.jpg
+g_6_6_wurm_c21.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_c21.jpg
 g_6_6_wurm_ema.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_ema.jpg
 g_6_6_wurm_gk2.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_gk2.jpg
-g_6_6_wurm_gpt.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_gpt.jpg
-g_6_6_wurm_jud.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_jud.jpg
 g_6_6_wurm_m12.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_m12.jpg
 g_6_6_wurm_m13.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_m13.jpg
-g_6_6_wurm_ody.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_ody.jpg
-g_6_6_wurm_vma.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_vma.jpg
-g_7_7_elemental.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental.jpg
+g_6_6_wurm_mvm.jpg https://downloads.cardforge.org/images/tokens/g_6_6_wurm_mvm.jpg
+g_7_7_elemental_trample.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental_trample.jpg
 g_7_7_elemental_trample_dd1.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental_trample_dd1.jpg
-g_7_7_elemental_trample_evg.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental_trample_evg.jpg
 g_7_7_elemental_trample_khc.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental_trample_khc.jpg
-g_7_7_elemental_trample_ons.jpg https://downloads.cardforge.org/images/tokens/g_7_7_elemental_trample_ons.jpg
+g_7_7_giant.jpg https://downloads.cardforge.org/images/tokens/g_7_7_giant.jpg
 g_7_7_giant_eld.jpg https://downloads.cardforge.org/images/tokens/g_7_7_giant_eld.jpg
-g_8_8_elemental_vigilance_gk1.jpg https://downloads.cardforge.org/images/tokens/g_8_8_elemental_vigilance_gk1.jpg
+g_x_x_dinosaur_beast_trample.jpg https://downloads.cardforge.org/images/tokens/g_x_x_dinosaur_beast_trample.jpg
 g_x_x_dinosaur_beast_trample_iko.jpg https://downloads.cardforge.org/images/tokens/g_x_x_dinosaur_beast_trample_iko.jpg
 g_x_x_elemental.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elemental.jpg
-g_x_x_elemental_c13.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elemental_c13.jpg
 g_x_x_elemental_c18.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elemental_c18.jpg
-g_x_x_elemental_chk.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elemental_chk.jpg
 g_x_x_elemental_ogw.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elemental_ogw.jpg
-g_x_x_elephant.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elephant.jpg
-g_x_x_elephant_resurgence_pcy.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elephant_resurgence_pcy.jpg
-g_x_x_hydra_cp1.jpg https://downloads.cardforge.org/images/tokens/g_x_x_hydra_cp1.jpg
+g_x_x_elephant_resurgence.jpg https://downloads.cardforge.org/images/tokens/g_x_x_elephant_resurgence.jpg
+g_x_x_hydra.jpg https://downloads.cardforge.org/images/tokens/g_x_x_hydra.jpg
+g_x_x_hydra_c21.jpg https://downloads.cardforge.org/images/tokens/g_x_x_hydra_c21.jpg
 g_x_x_hydra_jou.jpg https://downloads.cardforge.org/images/tokens/g_x_x_hydra_jou.jpg
 g_x_x_ooze.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze.jpg
-g_x_x_ooze1.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze1.jpg
 g_x_x_ooze_2xm.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_2xm.jpg
 g_x_x_ooze_ala.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_ala.jpg
 g_x_x_ooze_gk2.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_gk2.jpg
 g_x_x_ooze_gtc.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_gtc.jpg
+g_x_x_ooze_gutter_grime.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_gutter_grime.jpg
 g_x_x_ooze_gutter_grime_isd.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_gutter_grime_isd.jpg
-g_x_x_ooze_isd.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_isd.jpg
 g_x_x_ooze_mm3.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_mm3.jpg
 g_x_x_ooze_roe.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_roe.jpg
 g_x_x_ooze_rtr.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_rtr.jpg
 g_x_x_ooze_uma.jpg https://downloads.cardforge.org/images/tokens/g_x_x_ooze_uma.jpg
-g_x_x_saproling.jpg https://downloads.cardforge.org/images/tokens/g_x_x_saproling.jpg
-g_x_x_saproling_burst_nms.jpg https://downloads.cardforge.org/images/tokens/g_x_x_saproling_burst_nms.jpg
-g_x_x_saproling_burst_vma.jpg https://downloads.cardforge.org/images/tokens/g_x_x_saproling_burst_vma.jpg
+g_x_x_saproling_burst.jpg https://downloads.cardforge.org/images/tokens/g_x_x_saproling_burst.jpg
+g_x_x_spirit_total_lands_neo.jpg https://downloads.cardforge.org/images/tokens/g_x_x_spirit_total_lands_neo.jpg
+g_x_x_treefolk.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk.jpg
 g_x_x_treefolk_c14.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_c14.jpg
 g_x_x_treefolk_cma.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_cma.jpg
-g_x_x_treefolk_warrior.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_warrior.jpg
+g_x_x_treefolk_ncc.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_ncc.jpg
+g_x_x_treefolk_reach_total_lands_mid.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_reach_total_lands_mid.jpg
+g_x_x_treefolk_warrior_total_forests.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_warrior_total_forests.jpg
 g_x_x_treefolk_warrior_total_forests_m15.jpg https://downloads.cardforge.org/images/tokens/g_x_x_treefolk_warrior_total_forests_m15.jpg
 g_x_x_wurm.jpg https://downloads.cardforge.org/images/tokens/g_x_x_wurm.jpg
-g_x_x_wurm_fut.jpg https://downloads.cardforge.org/images/tokens/g_x_x_wurm_fut.jpg
-g_x_x_wurm_tsp.jpg https://downloads.cardforge.org/images/tokens/g_x_x_wurm_tsp.jpg
+g_x_y_ooze_types_graveyard_mid.jpg https://downloads.cardforge.org/images/tokens/g_x_y_ooze_types_graveyard_mid.jpg
+gold.jpg https://downloads.cardforge.org/images/tokens/gold.jpg
 gold_bng.jpg https://downloads.cardforge.org/images/tokens/gold_bng.jpg
 gold_c15.jpg https://downloads.cardforge.org/images/tokens/gold_c15.jpg
 gold_c17.jpg https://downloads.cardforge.org/images/tokens/gold_c17.jpg
 gold_jou.jpg https://downloads.cardforge.org/images/tokens/gold_jou.jpg
 gold_thb.jpg https://downloads.cardforge.org/images/tokens/gold_thb.jpg
-goldmeadow_harrier_fut.jpg https://downloads.cardforge.org/images/tokens/goldmeadow_harrier_fut.jpg
-gr_1_1_dragon.jpg https://downloads.cardforge.org/images/tokens/gr_1_1_dragon.jpg
-grw_1_1_sand_warrior.jpg https://downloads.cardforge.org/images/tokens/grw_1_1_sand_warrior.jpg
+goldmeadow_harrier.jpg https://downloads.cardforge.org/images/tokens/goldmeadow_harrier.jpg
+gu_0_0_fractal_stx.jpg https://downloads.cardforge.org/images/tokens/gu_0_0_fractal_stx.jpg
 gu_1_1_snake.jpg https://downloads.cardforge.org/images/tokens/gu_1_1_snake.jpg
 gu_1_1_snake_c15.jpg https://downloads.cardforge.org/images/tokens/gu_1_1_snake_c15.jpg
-gu_1_1_snake_dis.jpg https://downloads.cardforge.org/images/tokens/gu_1_1_snake_dis.jpg
-gu_2_2_drake.jpg https://downloads.cardforge.org/images/tokens/gu_2_2_drake.jpg
-gu_2_2_drake_flying_c13.jpg https://downloads.cardforge.org/images/tokens/gu_2_2_drake_flying_c13.jpg
+gu_2_2_drake_flying.jpg https://downloads.cardforge.org/images/tokens/gu_2_2_drake_flying.jpg
 gu_2_2_drake_flying_cma.jpg https://downloads.cardforge.org/images/tokens/gu_2_2_drake_flying_cma.jpg
-gu_2_2_drake_flying_dis.jpg https://downloads.cardforge.org/images/tokens/gu_2_2_drake_flying_dis.jpg
+guenhwyvar_afr.jpg https://downloads.cardforge.org/images/tokens/guenhwyvar_afr.jpg
+gw_1_1_citizen_snc.jpg https://downloads.cardforge.org/images/tokens/gw_1_1_citizen_snc.jpg
 gw_1_1_elf_warrior.jpg https://downloads.cardforge.org/images/tokens/gw_1_1_elf_warrior.jpg
 gw_1_1_elf_warrior_2xm.jpg https://downloads.cardforge.org/images/tokens/gw_1_1_elf_warrior_2xm.jpg
 gw_1_1_elf_warrior_shm.jpg https://downloads.cardforge.org/images/tokens/gw_1_1_elf_warrior_shm.jpg
+gw_1_1_human_soldier_training_vow.jpg https://downloads.cardforge.org/images/tokens/gw_1_1_human_soldier_training_vow.jpg
+gw_2_2_elf_knight_vigilance.jpg https://downloads.cardforge.org/images/tokens/gw_2_2_elf_knight_vigilance.jpg
+gw_2_2_elf_knight_vigilance_gk1.jpg https://downloads.cardforge.org/images/tokens/gw_2_2_elf_knight_vigilance_gk1.jpg
 gw_2_2_elf_knight_vigilance_grn.jpg https://downloads.cardforge.org/images/tokens/gw_2_2_elf_knight_vigilance_grn.jpg
-gw_2_2_voja.jpg https://downloads.cardforge.org/images/tokens/gw_2_2_voja.jpg
 gw_8_8_elemental_vigilance.jpg https://downloads.cardforge.org/images/tokens/gw_8_8_elemental_vigilance.jpg
 gw_8_8_elemental_vigilance_gk1.jpg https://downloads.cardforge.org/images/tokens/gw_8_8_elemental_vigilance_gk1.jpg
 gw_8_8_elemental_vigilance_rtr.jpg https://downloads.cardforge.org/images/tokens/gw_8_8_elemental_vigilance_rtr.jpg
-gw_x_x_elemental.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental.jpg
+gw_x_x_elemental_total_creatures.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental_total_creatures.jpg
+gw_x_x_elemental_total_creatures2.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental_total_creatures2.jpg
 gw_x_x_elemental_total_creatures_2xm.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental_total_creatures_2xm.jpg
 gw_x_x_elemental_total_creatures_dgm.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental_total_creatures_dgm.jpg
 gw_x_x_elemental_total_creatures_mm3.jpg https://downloads.cardforge.org/images/tokens/gw_x_x_elemental_total_creatures_mm3.jpg
 hornet.jpg https://downloads.cardforge.org/images/tokens/hornet.jpg
 hornet_dde.jpg https://downloads.cardforge.org/images/tokens/hornet_dde.jpg
-hornet_sth.jpg https://downloads.cardforge.org/images/tokens/hornet_sth.jpg
+icingdeath_frost_tongue_afr.jpg https://downloads.cardforge.org/images/tokens/icingdeath_frost_tongue_afr.jpg
 icy_manalith.jpg https://downloads.cardforge.org/images/tokens/icy_manalith.jpg
 icy_manalith_khm.jpg https://downloads.cardforge.org/images/tokens/icy_manalith_khm.jpg
-kaldra_5dn.jpg https://downloads.cardforge.org/images/tokens/kaldra_5dn.jpg
+kaldra.jpg https://downloads.cardforge.org/images/tokens/kaldra.jpg
+karox_bladewing.jpg https://downloads.cardforge.org/images/tokens/karox_bladewing.jpg
 karox_bladewing_dom.jpg https://downloads.cardforge.org/images/tokens/karox_bladewing_dom.jpg
+keimi_neo.jpg https://downloads.cardforge.org/images/tokens/keimi_neo.jpg
 kelp.jpg https://downloads.cardforge.org/images/tokens/kelp.jpg
-kelp_hml.jpg https://downloads.cardforge.org/images/tokens/kelp_hml.jpg
-kelp_me2.jpg https://downloads.cardforge.org/images/tokens/kelp_me2.jpg
+kobolds_of_kher_keep.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep.jpg
 kobolds_of_kher_keep_a25.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep_a25.jpg
-kobolds_of_kher_keep_c13.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep_c13.jpg
-kobolds_of_kher_keep_tsp.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep_tsp.jpg
+kobolds_of_kher_keep_clb.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep_clb.jpg
+kobolds_of_kher_keep_tsr.jpg https://downloads.cardforge.org/images/tokens/kobolds_of_kher_keep_tsr.jpg
 komas_coil.jpg https://downloads.cardforge.org/images/tokens/komas_coil.jpg
 komas_coil_khm.jpg https://downloads.cardforge.org/images/tokens/komas_coil_khm.jpg
-land_mine_m15.jpg https://downloads.cardforge.org/images/tokens/land_mine_m15.jpg
+land_mine.jpg https://downloads.cardforge.org/images/tokens/land_mine.jpg
 lightning_rager.jpg https://downloads.cardforge.org/images/tokens/lightning_rager.jpg
 lightning_rager_c15.jpg https://downloads.cardforge.org/images/tokens/lightning_rager_c15.jpg
 lightning_rager_cm2.jpg https://downloads.cardforge.org/images/tokens/lightning_rager_cm2.jpg
-lightning_rager_pz1.jpg https://downloads.cardforge.org/images/tokens/lightning_rager_pz1.jpg
-llanowar_elves_fut.jpg https://downloads.cardforge.org/images/tokens/llanowar_elves_fut.jpg
+lightning_rager_ncc.jpg https://downloads.cardforge.org/images/tokens/lightning_rager_ncc.jpg
+llanowar_elves.jpg https://downloads.cardforge.org/images/tokens/llanowar_elves.jpg
+llanowar_elves_tsr.jpg https://downloads.cardforge.org/images/tokens/llanowar_elves_tsr.jpg
+marit_lage.jpg https://downloads.cardforge.org/images/tokens/marit_lage.jpg
 marit_lage_2xm.jpg https://downloads.cardforge.org/images/tokens/marit_lage_2xm.jpg
-marit_lage_csp.jpg https://downloads.cardforge.org/images/tokens/marit_lage_csp.jpg
+marit_lage_cs.jpg https://downloads.cardforge.org/images/tokens/marit_lage_cs.jpg
 marit_lage_mh1.jpg https://downloads.cardforge.org/images/tokens/marit_lage_mh1.jpg
 marit_lage_uma.jpg https://downloads.cardforge.org/images/tokens/marit_lage_uma.jpg
-marit_lage_uma_bt.jpg https://downloads.cardforge.org/images/tokens/marit_lage_uma_bt.jpg
-marit_lage_v16.jpg https://downloads.cardforge.org/images/tokens/marit_lage_v16.jpg
+mask.jpg https://downloads.cardforge.org/images/tokens/mask.jpg
 mask_c18.jpg https://downloads.cardforge.org/images/tokens/mask_c18.jpg
+mechtitan_neo.jpg https://downloads.cardforge.org/images/tokens/mechtitan_neo.jpg
+mechtitan_neomechtitan_neo.jpg https://downloads.cardforge.org/images/tokens/mechtitan_neomechtitan_neo.jpg
 metallic_sliver.jpg https://downloads.cardforge.org/images/tokens/metallic_sliver.jpg
+metallic_sliver_tsr.jpg https://downloads.cardforge.org/images/tokens/metallic_sliver_tsr.jpg
 minor_demon.jpg https://downloads.cardforge.org/images/tokens/minor_demon.jpg
-minor_demon_leg.jpg https://downloads.cardforge.org/images/tokens/minor_demon_leg.jpg
-minor_demon_me3.jpg https://downloads.cardforge.org/images/tokens/minor_demon_me3.jpg
+mowu.jpg https://downloads.cardforge.org/images/tokens/mowu.jpg
 mowu2_gs1.jpg https://downloads.cardforge.org/images/tokens/mowu2_gs1.jpg
 mowu_gs1.jpg https://downloads.cardforge.org/images/tokens/mowu_gs1.jpg
 plantwall_lvl1.jpg https://downloads.cardforge.org/images/tokens/plantwall_lvl1.jpg
@@ -1067,66 +1067,60 @@ plantwall_lvl3.jpg https://downloads.cardforge.org/images/tokens/plantwall_lvl3.
 plantwall_lvl4.jpg https://downloads.cardforge.org/images/tokens/plantwall_lvl4.jpg
 plantwall_lvl5.jpg https://downloads.cardforge.org/images/tokens/plantwall_lvl5.jpg
 plantwall_lvl6.jpg https://downloads.cardforge.org/images/tokens/plantwall_lvl6.jpg
+r_0_1_elemental_rekindling_phoenix.jpg https://downloads.cardforge.org/images/tokens/r_0_1_elemental_rekindling_phoenix.jpg
+r_0_1_elemental_rekindling_phoenix_ncc.jpg https://downloads.cardforge.org/images/tokens/r_0_1_elemental_rekindling_phoenix_ncc.jpg
 r_0_1_elemental_rekindling_phoenix_rix.jpg https://downloads.cardforge.org/images/tokens/r_0_1_elemental_rekindling_phoenix_rix.jpg
-r_0_1_elemental_rix.jpg https://downloads.cardforge.org/images/tokens/r_0_1_elemental_rix.jpg
-r_0_1_kobolds_of_kher_keep.jpg https://downloads.cardforge.org/images/tokens/r_0_1_kobolds_of_kher_keep.jpg
+r_0_2_dragon_egg_defender_hatches_dragon.jpg https://downloads.cardforge.org/images/tokens/r_0_2_dragon_egg_defender_hatches_dragon.jpg
 r_0_2_dragon_egg_defender_hatches_dragon_c18.jpg https://downloads.cardforge.org/images/tokens/r_0_2_dragon_egg_defender_hatches_dragon_c18.jpg
+r_1_1_brainiac.jpg https://downloads.cardforge.org/images/tokens/r_1_1_brainiac.jpg
 r_1_1_devil_burn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn.jpg
+r_1_1_devil_burn_afr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_afr.jpg
+r_1_1_devil_burn_clb.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_clb.jpg
 r_1_1_devil_burn_emn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_emn.jpg
+r_1_1_devil_burn_mid.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_mid.jpg
+r_1_1_devil_burn_ncc.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_ncc.jpg
+r_1_1_devil_burn_snc.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_snc.jpg
 r_1_1_devil_burn_soi.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_soi.jpg
 r_1_1_devil_burn_war.jpg https://downloads.cardforge.org/images/tokens/r_1_1_devil_burn_war.jpg
+r_1_1_dinosaur_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_dinosaur_haste.jpg
 r_1_1_dinosaur_haste_iko.jpg https://downloads.cardforge.org/images/tokens/r_1_1_dinosaur_haste_iko.jpg
 r_1_1_dwarf_eld.jpg https://downloads.cardforge.org/images/tokens/r_1_1_dwarf_eld.jpg
 r_1_1_elemental.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental.jpg
 r_1_1_elemental2_m14.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental2_m14.jpg
 r_1_1_elemental2_uma.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental2_uma.jpg
-r_1_1_elemental_cat.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_cat.jpg
+r_1_1_elemental_2x2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_2x2.jpg
 r_1_1_elemental_cat_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_cat_haste.jpg
-r_1_1_elemental_cat_haste_jud.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_cat_haste_jud.jpg
-r_1_1_elemental_dds.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_dds.jpg
 r_1_1_elemental_ema.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_ema.jpg
 r_1_1_elemental_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_haste.jpg
-r_1_1_elemental_haste_c13.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_haste_c13.jpg
 r_1_1_elemental_haste_shm.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_haste_shm.jpg
 r_1_1_elemental_m14.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_m14.jpg
 r_1_1_elemental_m20.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_m20.jpg
 r_1_1_elemental_mh1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_mh1.jpg
+r_1_1_elemental_mvm.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_mvm.jpg
+r_1_1_elemental_nec.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_nec.jpg
 r_1_1_elemental_rix.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_rix.jpg
 r_1_1_elemental_uma.jpg https://downloads.cardforge.org/images/tokens/r_1_1_elemental_uma.jpg
 r_1_1_goblin.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin.jpg
 r_1_1_goblin2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin2.jpg
+r_1_1_goblin2_gk1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin2_gk1.jpg
 r_1_1_goblin2_m13.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin2_m13.jpg
-r_1_1_goblin2_pc2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin2_pc2.jpg
-r_1_1_goblin3.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin3.jpg
-r_1_1_goblin4.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin4.jpg
-r_1_1_goblin5.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin5.jpg
 r_1_1_goblin_10e.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_10e.jpg
-r_1_1_goblin_5ed.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_5ed.jpg
-r_1_1_goblin_6ed.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_6ed.jpg
 r_1_1_goblin_a25.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_a25.jpg
-r_1_1_goblin_a25.png https://downloads.cardforge.org/images/tokens/r_1_1_goblin_a25.png
+r_1_1_goblin_afr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_afr.jpg
 r_1_1_goblin_ala.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ala.jpg
+r_1_1_goblin_all_attack.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_all_attack.jpg
 r_1_1_goblin_all_attack_c16.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_all_attack_c16.jpg
-r_1_1_goblin_ana.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ana.jpg
+r_1_1_goblin_all_attack_clb.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_all_attack_clb.jpg
 r_1_1_goblin_arb.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_arb.jpg
-r_1_1_goblin_arc.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_arc.jpg
-r_1_1_goblin_ath.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ath.jpg
 r_1_1_goblin_c14.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_c14.jpg
-r_1_1_goblin_c16.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_c16.jpg
 r_1_1_goblin_cm2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_cm2.jpg
 r_1_1_goblin_dd1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_dd1.jpg
 r_1_1_goblin_ddg.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ddg.jpg
-r_1_1_goblin_ddl.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ddl.jpg
-r_1_1_goblin_ddn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ddn.jpg
-r_1_1_goblin_dds.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_dds.jpg
 r_1_1_goblin_ddt.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ddt.jpg
 r_1_1_goblin_dom.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_dom.jpg
 r_1_1_goblin_dtk.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_dtk.jpg
 r_1_1_goblin_ema.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ema.jpg
-r_1_1_goblin_evg.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_evg.jpg
-r_1_1_goblin_fem.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_fem.jpg
 r_1_1_goblin_gk1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_gk1.jpg
-r_1_1_goblin_gnt.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_gnt.jpg
 r_1_1_goblin_grn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_grn.jpg
 r_1_1_goblin_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_haste.jpg
 r_1_1_goblin_haste_ala.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_haste_ala.jpg
@@ -1135,60 +1129,49 @@ r_1_1_goblin_haste_ktk.jpg https://downloads.cardforge.org/images/tokens/r_1_1_g
 r_1_1_goblin_haste_m15.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_haste_m15.jpg
 r_1_1_goblin_haste_mm3.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_haste_mm3.jpg
 r_1_1_goblin_haste_nph.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_haste_nph.jpg
-r_1_1_goblin_hop.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_hop.jpg
 r_1_1_goblin_ktk.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ktk.jpg
-r_1_1_goblin_lgn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_lgn.jpg
 r_1_1_goblin_m10.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_m10.jpg
 r_1_1_goblin_m13.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_m13.jpg
-r_1_1_goblin_m15.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_m15.jpg
 r_1_1_goblin_m19.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_m19.jpg
-r_1_1_goblin_me4.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_me4.jpg
 r_1_1_goblin_mh1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_mh1.jpg
+r_1_1_goblin_mh2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_mh2.jpg
 r_1_1_goblin_mm3.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_mm3.jpg
 r_1_1_goblin_mma.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_mma.jpg
-r_1_1_goblin_nms.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_nms.jpg
+r_1_1_goblin_mvm.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_mvm.jpg
+r_1_1_goblin_nec.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_nec.jpg
+r_1_1_goblin_noblock.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_noblock.jpg
 r_1_1_goblin_noblock_cn2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_noblock_cn2.jpg
 r_1_1_goblin_nph.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_nph.jpg
 r_1_1_goblin_ori.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ori.jpg
-r_1_1_goblin_pc2.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_pc2.jpg
 r_1_1_goblin_pca.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_pca.jpg
-r_1_1_goblin_rav.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_rav.jpg
 r_1_1_goblin_rna.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_rna.jpg
 r_1_1_goblin_rtr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_rtr.jpg
-r_1_1_goblin_scg.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_scg.jpg
-r_1_1_goblin_scout.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_scout.jpg
 r_1_1_goblin_scout_mountainwalk.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_scout_mountainwalk.jpg
-r_1_1_goblin_scout_mountainwalk_mir.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_scout_mountainwalk_mir.jpg
 r_1_1_goblin_som.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_som.jpg
-r_1_1_goblin_sth.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_sth.jpg
-r_1_1_goblin_td0.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_td0.jpg
-r_1_1_goblin_tpr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_tpr.jpg
-r_1_1_goblin_tsp.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_tsp.jpg
-r_1_1_goblin_uds.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_uds.jpg
-r_1_1_goblin_ugl.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ugl.jpg
-r_1_1_goblin_usg.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_usg.jpg
-r_1_1_goblin_ust.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_ust.jpg
-r_1_1_goblin_vintage.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_vintage.jpg
-r_1_1_goblin_vma.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_vma.jpg
+r_1_1_goblin_tsr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_tsr.jpg
 r_1_1_goblin_war.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_war.jpg
+r_1_1_goblin_wizard_prowess.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_wizard_prowess.jpg
+r_1_1_goblin_wizard_prowess_m21.jpg https://downloads.cardforge.org/images/tokens/r_1_1_goblin_wizard_prowess_m21.jpg
 r_1_1_human.jpg https://downloads.cardforge.org/images/tokens/r_1_1_human.jpg
 r_1_1_human_emn.jpg https://downloads.cardforge.org/images/tokens/r_1_1_human_emn.jpg
+r_1_1_human_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_human_haste.jpg
 r_1_1_human_haste_avr.jpg https://downloads.cardforge.org/images/tokens/r_1_1_human_haste_avr.jpg
+r_1_1_human_vow.jpg https://downloads.cardforge.org/images/tokens/r_1_1_human_vow.jpg
+r_1_1_phyrexian_goblin_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_phyrexian_goblin_haste.jpg
+r_1_1_pirate_noblock_all_attack.jpg https://downloads.cardforge.org/images/tokens/r_1_1_pirate_noblock_all_attack.jpg
+r_1_1_pirate_noblock_all_attack_clb.jpg https://downloads.cardforge.org/images/tokens/r_1_1_pirate_noblock_all_attack_clb.jpg
+r_1_1_pirate_noblock_all_attack_m21.jpg https://downloads.cardforge.org/images/tokens/r_1_1_pirate_noblock_all_attack_m21.jpg
+r_1_1_satyr_noblock.jpg https://downloads.cardforge.org/images/tokens/r_1_1_satyr_noblock.jpg
 r_1_1_satyr_noblock_thb.jpg https://downloads.cardforge.org/images/tokens/r_1_1_satyr_noblock_thb.jpg
-r_1_1_soldier.jpg https://downloads.cardforge.org/images/tokens/r_1_1_soldier.jpg
+r_1_1_soldier_haste.jpg https://downloads.cardforge.org/images/tokens/r_1_1_soldier_haste.jpg
 r_1_1_soldier_haste_ths.jpg https://downloads.cardforge.org/images/tokens/r_1_1_soldier_haste_ths.jpg
 r_1_1_soldier_haste_uma.jpg https://downloads.cardforge.org/images/tokens/r_1_1_soldier_haste_uma.jpg
 r_1_1_survivor.jpg https://downloads.cardforge.org/images/tokens/r_1_1_survivor.jpg
-r_1_1_survivor_all.jpg https://downloads.cardforge.org/images/tokens/r_1_1_survivor_all.jpg
 r_1_1_survivor_c18.jpg https://downloads.cardforge.org/images/tokens/r_1_1_survivor_c18.jpg
-r_1_1_survivor_me1.jpg https://downloads.cardforge.org/images/tokens/r_1_1_survivor_me1.jpg
 r_1_1_warrior.jpg https://downloads.cardforge.org/images/tokens/r_1_1_warrior.jpg
-r_1_1_warrior_sok.jpg https://downloads.cardforge.org/images/tokens/r_1_1_warrior_sok.jpg
+r_2_1_dwarf_berserker.jpg https://downloads.cardforge.org/images/tokens/r_2_1_dwarf_berserker.jpg
 r_2_1_dwarf_berserker_khm.jpg https://downloads.cardforge.org/images/tokens/r_2_1_dwarf_berserker_khm.jpg
-r_2_1_goblin.jpg https://downloads.cardforge.org/images/tokens/r_2_1_goblin.jpg
 r_2_1_goblin_haste.jpg https://downloads.cardforge.org/images/tokens/r_2_1_goblin_haste.jpg
-r_2_1_goblin_haste_arc.jpg https://downloads.cardforge.org/images/tokens/r_2_1_goblin_haste_arc.jpg
-r_2_1_goblin_haste_dis.jpg https://downloads.cardforge.org/images/tokens/r_2_1_goblin_haste_dis.jpg
 r_2_1_goblin_haste_gk2.jpg https://downloads.cardforge.org/images/tokens/r_2_1_goblin_haste_gk2.jpg
 r_2_2_dragon_flying_firebreathing.jpg https://downloads.cardforge.org/images/tokens/r_2_2_dragon_flying_firebreathing.jpg
 r_2_2_dragon_flying_firebreathing_c18.jpg https://downloads.cardforge.org/images/tokens/r_2_2_dragon_flying_firebreathing_c18.jpg
@@ -1198,289 +1181,294 @@ r_2_2_dragon_flying_firebreathing_ima.jpg https://downloads.cardforge.org/images
 r_2_2_dragon_flying_firebreathing_m14.jpg https://downloads.cardforge.org/images/tokens/r_2_2_dragon_flying_firebreathing_m14.jpg
 r_2_2_dragon_flying_firebreathing_m15.jpg https://downloads.cardforge.org/images/tokens/r_2_2_dragon_flying_firebreathing_m15.jpg
 r_2_2_dragon_flying_firebreathing_m19.jpg https://downloads.cardforge.org/images/tokens/r_2_2_dragon_flying_firebreathing_m19.jpg
+r_2_2_goblin_shaman_treasure_neo.jpg https://downloads.cardforge.org/images/tokens/r_2_2_goblin_shaman_treasure_neo.jpg
 r_2_2_gremlin.jpg https://downloads.cardforge.org/images/tokens/r_2_2_gremlin.jpg
 r_2_2_gremlin_aer.jpg https://downloads.cardforge.org/images/tokens/r_2_2_gremlin_aer.jpg
+r_2_2_spirit_menace_neo.jpg https://downloads.cardforge.org/images/tokens/r_2_2_spirit_menace_neo.jpg
+r_2_3_demon_berserker_menace.jpg https://downloads.cardforge.org/images/tokens/r_2_3_demon_berserker_menace.jpg
 r_2_3_demon_berserker_menace_khm.jpg https://downloads.cardforge.org/images/tokens/r_2_3_demon_berserker_menace_khm.jpg
+r_2_3_minotaur.jpg https://downloads.cardforge.org/images/tokens/r_2_3_minotaur.jpg
 r_2_3_minotaur_haste.jpg https://downloads.cardforge.org/images/tokens/r_2_3_minotaur_haste.jpg
 r_2_3_minotaur_haste2_jou.jpg https://downloads.cardforge.org/images/tokens/r_2_3_minotaur_haste2_jou.jpg
 r_2_3_minotaur_haste_jou.jpg https://downloads.cardforge.org/images/tokens/r_2_3_minotaur_haste_jou.jpg
-r_3_1_carnivore.jpg https://downloads.cardforge.org/images/tokens/r_3_1_carnivore.jpg
+r_3_1_a_construct_haste_neo.jpg https://downloads.cardforge.org/images/tokens/r_3_1_a_construct_haste_neo.jpg
+r_3_1_e_elemental_haste.jpg https://downloads.cardforge.org/images/tokens/r_3_1_e_elemental_haste.jpg
 r_3_1_e_elemental_haste_bng.jpg https://downloads.cardforge.org/images/tokens/r_3_1_e_elemental_haste_bng.jpg
 r_3_1_elemental.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental.jpg
-r_3_1_elemental_bfz.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_bfz.jpg
 r_3_1_elemental_bng.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_bng.jpg
 r_3_1_elemental_c20.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_c20.jpg
-r_3_1_elemental_dis.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_dis.jpg
-r_3_1_elemental_dom.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_dom.jpg
 r_3_1_elemental_haste.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste.jpg
-r_3_1_elemental_haste_cfx.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste_cfx.jpg
-r_3_1_elemental_haste_mrd.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste_mrd.jpg
+r_3_1_elemental_haste2.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste2.jpg
 r_3_1_elemental_haste_ogw.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste_ogw.jpg
-r_3_1_elemental_haste_sok.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_haste_sok.jpg
-r_3_1_elemental_mrd.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_mrd.jpg
 r_3_1_elemental_shaman.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman.jpg
+r_3_1_elemental_shaman_haste.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste.jpg
 r_3_1_elemental_shaman_haste_c15.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste_c15.jpg
 r_3_1_elemental_shaman_haste_cm2.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste_cm2.jpg
 r_3_1_elemental_shaman_haste_dd2.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste_dd2.jpg
-r_3_1_elemental_shaman_haste_jvc.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste_jvc.jpg
 r_3_1_elemental_shaman_haste_lrw.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_haste_lrw.jpg
 r_3_1_elemental_shaman_lrw.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_shaman_lrw.jpg
-r_3_1_elemental_sok.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_sok.jpg
+r_3_1_elemental_trample_haste.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_trample_haste.jpg
 r_3_1_elemental_trample_haste_bfz.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_trample_haste_bfz.jpg
 r_3_1_elemental_trample_haste_dom.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_trample_haste_dom.jpg
 r_3_1_elemental_trample_haste_mh1.jpg https://downloads.cardforge.org/images/tokens/r_3_1_elemental_trample_haste_mh1.jpg
-r_3_1_spark_elemental.jpg https://downloads.cardforge.org/images/tokens/r_3_1_spark_elemental.jpg
+r_3_2_wolf_vow.jpg https://downloads.cardforge.org/images/tokens/r_3_2_wolf_vow.jpg
 r_3_3_elemental.jpg https://downloads.cardforge.org/images/tokens/r_3_3_elemental.jpg
-r_3_3_elemental_dst.jpg https://downloads.cardforge.org/images/tokens/r_3_3_elemental_dst.jpg
 r_3_3_ogre.jpg https://downloads.cardforge.org/images/tokens/r_3_3_ogre.jpg
 r_3_3_ogre_c16.jpg https://downloads.cardforge.org/images/tokens/r_3_3_ogre_c16.jpg
+r_3_3_ogre_clb.jpg https://downloads.cardforge.org/images/tokens/r_3_3_ogre_clb.jpg
+r_3_3_ogre_ncc.jpg https://downloads.cardforge.org/images/tokens/r_3_3_ogre_ncc.jpg
 r_3_3_ogre_wwk.jpg https://downloads.cardforge.org/images/tokens/r_3_3_ogre_wwk.jpg
-r_4_4_bird.jpg https://downloads.cardforge.org/images/tokens/r_4_4_bird.jpg
 r_4_4_bird_flying.jpg https://downloads.cardforge.org/images/tokens/r_4_4_bird_flying.jpg
-r_4_4_bird_flying_8ed.jpg https://downloads.cardforge.org/images/tokens/r_4_4_bird_flying_8ed.jpg
-r_4_4_bird_flying_9ed.jpg https://downloads.cardforge.org/images/tokens/r_4_4_bird_flying_9ed.jpg
-r_4_4_bird_flying_arn.jpg https://downloads.cardforge.org/images/tokens/r_4_4_bird_flying_arn.jpg
 r_4_4_dragon_flying.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying.jpg
 r_4_4_dragon_flying_ala.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_ala.jpg
 r_4_4_dragon_flying_c17.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_c17.jpg
+r_4_4_dragon_flying_clb.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_clb.jpg
 r_4_4_dragon_flying_dtk.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_dtk.jpg
 r_4_4_dragon_flying_mm3.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_mm3.jpg
 r_4_4_dragon_flying_mma.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_mma.jpg
+r_4_4_dragon_flying_mps.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_mps.jpg
 r_4_4_dragon_flying_mps_war.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_mps_war.jpg
 r_4_4_dragon_flying_war.jpg https://downloads.cardforge.org/images/tokens/r_4_4_dragon_flying_war.jpg
 r_4_4_giant.jpg https://downloads.cardforge.org/images/tokens/r_4_4_giant.jpg
-r_4_4_giant_chicken.jpg https://downloads.cardforge.org/images/tokens/r_4_4_giant_chicken.jpg
-r_4_4_giant_chicken_ugl.jpg https://downloads.cardforge.org/images/tokens/r_4_4_giant_chicken_ugl.jpg
-r_4_4_giant_fut.jpg https://downloads.cardforge.org/images/tokens/r_4_4_giant_fut.jpg
+r_4_4_giant_tsr.jpg https://downloads.cardforge.org/images/tokens/r_4_4_giant_tsr.jpg
 r_4_4_hellion.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion.jpg
-r_4_4_hellion_ddp.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_ddp.jpg
+r_4_4_hellion_haste.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_haste.jpg
 r_4_4_hellion_haste_m13.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_haste_m13.jpg
 r_4_4_hellion_m13.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_m13.jpg
-r_4_4_hellion_pc2.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_pc2.jpg
 r_4_4_hellion_pca.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_pca.jpg
 r_4_4_hellion_roe.jpg https://downloads.cardforge.org/images/tokens/r_4_4_hellion_roe.jpg
-r_4_4_karox_bladewing.jpg https://downloads.cardforge.org/images/tokens/r_4_4_karox_bladewing.jpg
+r_4_4_ogre.jpg https://downloads.cardforge.org/images/tokens/r_4_4_ogre.jpg
 r_4_4_ogre_cns.jpg https://downloads.cardforge.org/images/tokens/r_4_4_ogre_cns.jpg
-r_4_4_rukh.jpg https://downloads.cardforge.org/images/tokens/r_4_4_rukh.jpg
-r_5_5_dragon.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon.jpg
-r_5_5_dragon2.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon2.jpg
-r_5_5_dragon3.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon3.jpg
-r_5_5_dragon_10e.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_10e.jpg
-r_5_5_dragon_arc.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_arc.jpg
-r_5_5_dragon_bfz.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_bfz.jpg
+r_5_5_dragon_flying.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying.jpg
 r_5_5_dragon_flying_10e.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_10e.jpg
+r_5_5_dragon_flying_afc.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_afc.jpg
 r_5_5_dragon_flying_bfz.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_bfz.jpg
 r_5_5_dragon_flying_c15.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_c15.jpg
+r_5_5_dragon_flying_c19.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_c19.jpg
+r_5_5_dragon_flying_clb.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_clb.jpg
 r_5_5_dragon_flying_cma.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_cma.jpg
-r_5_5_dragon_flying_cmd.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_cmd.jpg
 r_5_5_dragon_flying_cn2.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_cn2.jpg
-r_5_5_dragon_flying_hop.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_hop.jpg
 r_5_5_dragon_flying_ima.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_ima.jpg
 r_5_5_dragon_flying_khm.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_khm.jpg
 r_5_5_dragon_flying_m19.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_m19.jpg
-r_5_5_dragon_flying_ons.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_ons.jpg
 r_5_5_dragon_flying_pca.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_pca.jpg
-r_5_5_dragon_flying_pz1.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_pz1.jpg
 r_5_5_dragon_flying_roe.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_roe.jpg
-r_5_5_dragon_flying_scg.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_scg.jpg
 r_5_5_dragon_flying_wwk.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_flying_wwk.jpg
-r_5_5_dragon_m19.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_m19.jpg
-r_5_5_dragon_wwk.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_wwk.jpg
+r_5_5_dragon_spirit_flying_neo.jpg https://downloads.cardforge.org/images/tokens/r_5_5_dragon_spirit_flying_neo.jpg
+r_6_6_dragon_flying.jpg https://downloads.cardforge.org/images/tokens/r_6_6_dragon_flying.jpg
 r_6_6_dragon_flying_c17.jpg https://downloads.cardforge.org/images/tokens/r_6_6_dragon_flying_c17.jpg
 r_6_6_dragon_flying_gk2.jpg https://downloads.cardforge.org/images/tokens/r_6_6_dragon_flying_gk2.jpg
 r_6_6_dragon_flying_rtr.jpg https://downloads.cardforge.org/images/tokens/r_6_6_dragon_flying_rtr.jpg
-r_6_6_dragon_rtr.jpg https://downloads.cardforge.org/images/tokens/r_6_6_dragon_rtr.jpg
-r_7_1_elemental.jpg https://downloads.cardforge.org/images/tokens/r_7_1_elemental.jpg
 r_7_1_elemental_trample_haste.jpg https://downloads.cardforge.org/images/tokens/r_7_1_elemental_trample_haste.jpg
 r_7_1_elemental_trample_haste_zen.jpg https://downloads.cardforge.org/images/tokens/r_7_1_elemental_trample_haste_zen.jpg
+r_8_8_lizard.jpg https://downloads.cardforge.org/images/tokens/r_8_8_lizard.jpg
 r_8_8_lizard_cn2.jpg https://downloads.cardforge.org/images/tokens/r_8_8_lizard_cn2.jpg
-r_a_feather_sac_iko.jpg https://downloads.cardforge.org/images/tokens/r_a_feather_sac_iko.jpg
+r_x_1_elemental_trample_haste.jpg https://downloads.cardforge.org/images/tokens/r_x_1_elemental_trample_haste.jpg
 r_x_1_elemental_trample_haste_thb.jpg https://downloads.cardforge.org/images/tokens/r_x_1_elemental_trample_haste_thb.jpg
+r_x_x_dragon_illusion_flying_haste_vow.jpg https://downloads.cardforge.org/images/tokens/r_x_x_dragon_illusion_flying_haste_vow.jpg
 r_x_x_elemental.jpg https://downloads.cardforge.org/images/tokens/r_x_x_elemental.jpg
 r_x_x_elemental_roe.jpg https://downloads.cardforge.org/images/tokens/r_x_x_elemental_roe.jpg
-rabid_sheep_ugl.jpg https://downloads.cardforge.org/images/tokens/rabid_sheep_ugl.jpg
+r_x_x_elemental_trample_grave_exile_mid.jpg https://downloads.cardforge.org/images/tokens/r_x_x_elemental_trample_grave_exile_mid.jpg
 ragavan.jpg https://downloads.cardforge.org/images/tokens/ragavan.jpg
 ragavan_aer.jpg https://downloads.cardforge.org/images/tokens/ragavan_aer.jpg
 replicated_ring.jpg https://downloads.cardforge.org/images/tokens/replicated_ring.jpg
 replicated_ring_khm.jpg https://downloads.cardforge.org/images/tokens/replicated_ring_khm.jpg
-rg_1_1_dragon.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_dragon.jpg
+rg_1_1_dragon_flying_devour.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_dragon_flying_devour.jpg
 rg_1_1_dragon_flying_devour_arb.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_dragon_flying_devour_arb.jpg
 rg_1_1_goblin_warrior.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_goblin_warrior.jpg
 rg_1_1_goblin_warrior_c20.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_goblin_warrior_c20.jpg
 rg_1_1_goblin_warrior_mm3.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_goblin_warrior_mm3.jpg
 rg_1_1_goblin_warrior_shm.jpg https://downloads.cardforge.org/images/tokens/rg_1_1_goblin_warrior_shm.jpg
 rg_2_2_satyr_haste.jpg https://downloads.cardforge.org/images/tokens/rg_2_2_satyr_haste.jpg
+rg_2_2_satyr_haste_clb.jpg https://downloads.cardforge.org/images/tokens/rg_2_2_satyr_haste_clb.jpg
+rg_2_2_satyr_haste_jou.jpg https://downloads.cardforge.org/images/tokens/rg_2_2_satyr_haste_jou.jpg
 rg_2_2_satyr_haste_ths.jpg https://downloads.cardforge.org/images/tokens/rg_2_2_satyr_haste_ths.jpg
-rg_3_4_stangg_twin.jpg https://downloads.cardforge.org/images/tokens/rg_3_4_stangg_twin.jpg
-rg_4_4_beast_trample_med.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_beast_trample_med.jpg
+rg_4_4_beast_trample.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_beast_trample.jpg
+rg_4_4_beast_trample_mps.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_beast_trample_mps.jpg
 rg_4_4_beast_trample_mps_rna.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_beast_trample_mps_rna.jpg
 rg_4_4_beast_trample_rna.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_beast_trample_rna.jpg
-rg_4_4_giant_warrior.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_giant_warrior.jpg
 rg_4_4_giant_warrior_haste.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_giant_warrior_haste.jpg
 rg_4_4_giant_warrior_haste_mm3.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_giant_warrior_haste_mm3.jpg
 rg_4_4_giant_warrior_haste_shm.jpg https://downloads.cardforge.org/images/tokens/rg_4_4_giant_warrior_haste_shm.jpg
+rg_5_4_dragon_spirit_damagesac.jpg https://downloads.cardforge.org/images/tokens/rg_5_4_dragon_spirit_damagesac.jpg
 rg_5_5_elemental.jpg https://downloads.cardforge.org/images/tokens/rg_5_5_elemental.jpg
 rg_5_5_elemental_bfz.jpg https://downloads.cardforge.org/images/tokens/rg_5_5_elemental_bfz.jpg
 rg_5_5_elemental_znc.jpg https://downloads.cardforge.org/images/tokens/rg_5_5_elemental_znc.jpg
 rgw_1_1_sand_warrior.jpg https://downloads.cardforge.org/images/tokens/rgw_1_1_sand_warrior.jpg
-rgw_1_1_sand_warrior_leg.jpg https://downloads.cardforge.org/images/tokens/rgw_1_1_sand_warrior_leg.jpg
-rgw_1_1_sand_warrior_me3.jpg https://downloads.cardforge.org/images/tokens/rgw_1_1_sand_warrior_me3.jpg
 rgw_8_8_beast.jpg https://downloads.cardforge.org/images/tokens/rgw_8_8_beast.jpg
 rgw_8_8_beast_ala.jpg https://downloads.cardforge.org/images/tokens/rgw_8_8_beast_ala.jpg
-rgw_sand_warrior_me3.jpg https://downloads.cardforge.org/images/tokens/rgw_sand_warrior_me3.jpg
 rock.jpg https://downloads.cardforge.org/images/tokens/rock.jpg
 rock_cmr.jpg https://downloads.cardforge.org/images/tokens/rock_cmr.jpg
 rw_1_1_goblin_soldier.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier.jpg
-rw_1_1_goblin_soldier2.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier2.jpg
-rw_1_1_goblin_soldier_apc.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier_apc.jpg
 rw_1_1_goblin_soldier_ema.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier_ema.jpg
 rw_1_1_goblin_soldier_eve.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier_eve.jpg
-rw_1_1_goblin_soldier_vma.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_goblin_soldier_vma.jpg
-rw_1_1_soldier.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier.jpg
+rw_1_1_soldier_haste.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste.jpg
 rw_1_1_soldier_haste2_dgm.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste2_dgm.jpg
 rw_1_1_soldier_haste2_gtc.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste2_gtc.jpg
 rw_1_1_soldier_haste_dgm.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste_dgm.jpg
 rw_1_1_soldier_haste_gk1.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste_gk1.jpg
 rw_1_1_soldier_haste_gtc.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste_gtc.jpg
 rw_1_1_soldier_haste_mm3.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste_mm3.jpg
+rw_1_1_soldier_haste_ncc.jpg https://downloads.cardforge.org/images/tokens/rw_1_1_soldier_haste_ncc.jpg
+rw_1_2_human_rogue_haste_damage.jpg https://downloads.cardforge.org/images/tokens/rw_1_2_human_rogue_haste_damage.jpg
+rw_1_2_human_rogue_haste_damage_eld.jpg https://downloads.cardforge.org/images/tokens/rw_1_2_human_rogue_haste_damage_eld.jpg
+rw_2_1_human_cleric_lifelink_haste.jpg https://downloads.cardforge.org/images/tokens/rw_2_1_human_cleric_lifelink_haste.jpg
 rw_2_1_human_cleric_lifelink_haste_eld.jpg https://downloads.cardforge.org/images/tokens/rw_2_1_human_cleric_lifelink_haste_eld.jpg
-rw_2_1_human_rogue_haste_damage_eld.jpg https://downloads.cardforge.org/images/tokens/rw_2_1_human_rogue_haste_damage_eld.jpg
+rw_2_2_dinosaur_cat.jpg https://downloads.cardforge.org/images/tokens/rw_2_2_dinosaur_cat.jpg
 rw_2_2_dinosaur_cat_c20.jpg https://downloads.cardforge.org/images/tokens/rw_2_2_dinosaur_cat_c20.jpg
+rw_3_1_human_warrior_trample_haste.jpg https://downloads.cardforge.org/images/tokens/rw_3_1_human_warrior_trample_haste.jpg
 rw_3_1_human_warrior_trample_haste_eld.jpg https://downloads.cardforge.org/images/tokens/rw_3_1_human_warrior_trample_haste_eld.jpg
+rw_3_2_spirit_stx.jpg https://downloads.cardforge.org/images/tokens/rw_3_2_spirit_stx.jpg
+rw_4_4_a_golem_mh2.jpg https://downloads.cardforge.org/images/tokens/rw_4_4_a_golem_mh2.jpg
 shard.jpg https://downloads.cardforge.org/images/tokens/shard.jpg
 shard_khm.jpg https://downloads.cardforge.org/images/tokens/shard_khm.jpg
+smoke_blessing_nec.jpg https://downloads.cardforge.org/images/tokens/smoke_blessing_nec.jpg
 spark_elemental.jpg https://downloads.cardforge.org/images/tokens/spark_elemental.jpg
-spark_elemental_fut.jpg https://downloads.cardforge.org/images/tokens/spark_elemental_fut.jpg
 spark_elemental_uma.jpg https://downloads.cardforge.org/images/tokens/spark_elemental_uma.jpg
-stangg_twin.png https://downloads.cardforge.org/images/tokens/stangg_twin.png
+stangg_twin.jpg https://downloads.cardforge.org/images/tokens/stangg_twin.jpg
 stangg_twin_a25.jpg https://downloads.cardforge.org/images/tokens/stangg_twin_a25.jpg
-stangg_twin_a25.png https://downloads.cardforge.org/images/tokens/stangg_twin_a25.png
-stangg_twin_chr.jpg https://downloads.cardforge.org/images/tokens/stangg_twin_chr.jpg
-stangg_twin_leg.jpg https://downloads.cardforge.org/images/tokens/stangg_twin_leg.jpg
-stangg_twin_me3.jpg https://downloads.cardforge.org/images/tokens/stangg_twin_me3.jpg
+stoneforged_blade.jpg https://downloads.cardforge.org/images/tokens/stoneforged_blade.jpg
 stoneforged_blade_c14.jpg https://downloads.cardforge.org/images/tokens/stoneforged_blade_c14.jpg
-stoneforged_blade_pz1.jpg https://downloads.cardforge.org/images/tokens/stoneforged_blade_pz1.jpg
+storm_crow.jpg https://downloads.cardforge.org/images/tokens/storm_crow.jpg
+tamiyos_notebook_neo.jpg https://downloads.cardforge.org/images/tokens/tamiyos_notebook_neo.jpg
+the_atropal_afr.jpg https://downloads.cardforge.org/images/tokens/the_atropal_afr.jpg
+tiko-1-cat.jpg https://downloads.cardforge.org/images/tokens/tiko-1-cat.jpg
 tombspawn.jpg https://downloads.cardforge.org/images/tokens/tombspawn.jpg
-tombspawn_mir.jpg https://downloads.cardforge.org/images/tokens/tombspawn_mir.jpg
-tombspawn_vintage.jpg https://downloads.cardforge.org/images/tokens/tombspawn_vintage.jpg
+tuktuk_the_returned.jpg https://downloads.cardforge.org/images/tokens/tuktuk_the_returned.jpg
 tuktuk_the_returned_2xm.jpg https://downloads.cardforge.org/images/tokens/tuktuk_the_returned_2xm.jpg
 tuktuk_the_returned_c14.jpg https://downloads.cardforge.org/images/tokens/tuktuk_the_returned_c14.jpg
 tuktuk_the_returned_cm2.jpg https://downloads.cardforge.org/images/tokens/tuktuk_the_returned_cm2.jpg
 tuktuk_the_returned_roe.jpg https://downloads.cardforge.org/images/tokens/tuktuk_the_returned_roe.jpg
-twin_dst.jpg https://downloads.cardforge.org/images/tokens/twin_dst.jpg
+tust-1-angel.jpg https://downloads.cardforge.org/images/tokens/tust-1-angel.jpg
+twin.jpg https://downloads.cardforge.org/images/tokens/twin.jpg
+u_0_1_a_homunculus.jpg https://downloads.cardforge.org/images/tokens/u_0_1_a_homunculus.jpg
 u_0_1_a_homunculus_ala.jpg https://downloads.cardforge.org/images/tokens/u_0_1_a_homunculus_ala.jpg
-u_0_1_homunculus.jpg https://downloads.cardforge.org/images/tokens/u_0_1_homunculus.jpg
-u_0_1_kelp.jpg https://downloads.cardforge.org/images/tokens/u_0_1_kelp.jpg
-u_0_1_plant_wall.jpg https://downloads.cardforge.org/images/tokens/u_0_1_plant_wall.jpg
 u_0_1_starfish.jpg https://downloads.cardforge.org/images/tokens/u_0_1_starfish.jpg
-u_0_1_starfish_all.jpg https://downloads.cardforge.org/images/tokens/u_0_1_starfish_all.jpg
-u_0_1_starfish_me3.jpg https://downloads.cardforge.org/images/tokens/u_0_1_starfish_me3.jpg
+u_0_2_illusion_mesmerize.jpg https://downloads.cardforge.org/images/tokens/u_0_2_illusion_mesmerize.jpg
 u_0_2_illusion_mesmerize_rna.jpg https://downloads.cardforge.org/images/tokens/u_0_2_illusion_mesmerize_rna.jpg
+u_0_3_crab_mh2.jpg https://downloads.cardforge.org/images/tokens/u_0_3_crab_mh2.jpg
 u_1_0_elemental.jpg https://downloads.cardforge.org/images/tokens/u_1_0_elemental.jpg
 u_1_0_elemental_ddt.jpg https://downloads.cardforge.org/images/tokens/u_1_0_elemental_ddt.jpg
 u_1_0_elemental_ths.jpg https://downloads.cardforge.org/images/tokens/u_1_0_elemental_ths.jpg
 u_1_1_a_thopter_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying.jpg
+u_1_1_a_thopter_flying2.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying2.jpg
 u_1_1_a_thopter_flying_2xm.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_2xm.jpg
 u_1_1_a_thopter_flying_ala.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_ala.jpg
-u_1_1_a_thopter_flying_c13.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_c13.jpg
+u_1_1_a_thopter_flying_arb.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_arb.jpg
 u_1_1_a_thopter_flying_c16.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_c16.jpg
 u_1_1_a_thopter_flying_c18.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_c18.jpg
-u_1_1_a_thopter_flying_cfx.jpg https://downloads.cardforge.org/images/tokens/u_1_1_a_thopter_flying_cfx.jpg
-u_1_1_bird.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird.jpg
-u_1_1_bird2.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird2.jpg
-u_1_1_bird_eve.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_eve.jpg
+u_1_1_bird_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying.jpg
+u_1_1_bird_flying_blockflying_mid.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying_blockflying_mid.jpg
 u_1_1_bird_flying_eve.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying_eve.jpg
-u_1_1_bird_flying_inv.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying_inv.jpg
 u_1_1_bird_flying_khm.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying_khm.jpg
+u_1_1_bird_flying_mh2.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_flying_mh2.jpg
+u_1_1_bird_illusion_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_illusion_flying.jpg
+u_1_1_bird_illusion_flying_c20.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_illusion_flying_c20.jpg
 u_1_1_bird_illusion_flying_grn.jpg https://downloads.cardforge.org/images/tokens/u_1_1_bird_illusion_flying_grn.jpg
 u_1_1_camarid.jpg https://downloads.cardforge.org/images/tokens/u_1_1_camarid.jpg
-u_1_1_camarid_fem.jpg https://downloads.cardforge.org/images/tokens/u_1_1_camarid_fem.jpg
-u_1_1_camarid_me1.jpg https://downloads.cardforge.org/images/tokens/u_1_1_camarid_me1.jpg
-u_1_1_camarid_tsp.jpg https://downloads.cardforge.org/images/tokens/u_1_1_camarid_tsp.jpg
-u_1_1_cloud_sprite.jpg https://downloads.cardforge.org/images/tokens/u_1_1_cloud_sprite.jpg
-u_1_1_faerie.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie.jpg
-u_1_1_faerie_flying_c13.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_flying_c13.jpg
+u_1_1_faerie_dragon_flying_afr.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_dragon_flying_afr.jpg
+u_1_1_faerie_dragon_flying_clb.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_dragon_flying_clb.jpg
+u_1_1_faerie_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_flying.jpg
 u_1_1_faerie_flying_eld.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_flying_eld.jpg
-u_1_1_faerie_flying_rav.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_flying_rav.jpg
+u_1_1_faerie_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_flying_ncc.jpg
+u_1_1_faerie_spy_flying_haste_draw.jpg https://downloads.cardforge.org/images/tokens/u_1_1_faerie_spy_flying_haste_draw.jpg
+u_1_1_fish_unblockable_snc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_fish_unblockable_snc.jpg
+u_1_1_human_wizard.jpg https://downloads.cardforge.org/images/tokens/u_1_1_human_wizard.jpg
 u_1_1_human_wizard_emn.jpg https://downloads.cardforge.org/images/tokens/u_1_1_human_wizard_emn.jpg
+u_1_1_illusion_afc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_afc.jpg
 u_1_1_illusion_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_flying.jpg
-u_1_1_illusion_flying_chk.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_flying_chk.jpg
 u_1_1_illusion_flying_cmr.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_flying_cmr.jpg
 u_1_1_illusion_flying_mh1.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_flying_mh1.jpg
 u_1_1_illusion_flying_mma.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_flying_mma.jpg
+u_1_1_illusion_other_illusions_afc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_illusion_other_illusions_afc.jpg
 u_1_1_merfolk.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk.jpg
-u_1_1_merfolk_XLN.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_XLN.jpg
+u_1_1_merfolk_hexproof.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_hexproof.jpg
 u_1_1_merfolk_hexproof_rix.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_hexproof_rix.jpg
 u_1_1_merfolk_hexproof_xln.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_hexproof_xln.jpg
 u_1_1_merfolk_wizard.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_wizard.jpg
 u_1_1_merfolk_wizard_lrw.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_wizard_lrw.jpg
 u_1_1_merfolk_wizard_mor.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_wizard_mor.jpg
 u_1_1_merfolk_zen.jpg https://downloads.cardforge.org/images/tokens/u_1_1_merfolk_zen.jpg
-u_1_1_spirit.jpg https://downloads.cardforge.org/images/tokens/u_1_1_spirit.jpg
+u_1_1_ninja_unblockable_neo.jpg https://downloads.cardforge.org/images/tokens/u_1_1_ninja_unblockable_neo.jpg
+u_1_1_spirit_flying.jpg https://downloads.cardforge.org/images/tokens/u_1_1_spirit_flying.jpg
 u_1_1_spirit_flying_avr.jpg https://downloads.cardforge.org/images/tokens/u_1_1_spirit_flying_avr.jpg
+u_1_1_squid_islandwalk.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk.jpg
 u_1_1_squid_islandwalk2_m15.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk2_m15.jpg
 u_1_1_squid_islandwalk_c16.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk_c16.jpg
+u_1_1_squid_islandwalk_clb.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk_clb.jpg
 u_1_1_squid_islandwalk_m15.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk_m15.jpg
+u_1_1_squid_islandwalk_ncc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_squid_islandwalk_ncc.jpg
+u_1_1_tentacle.jpg https://downloads.cardforge.org/images/tokens/u_1_1_tentacle.jpg
+u_1_1_tentacle_ncc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_tentacle_ncc.jpg
 u_1_1_tentacle_thb.jpg https://downloads.cardforge.org/images/tokens/u_1_1_tentacle_thb.jpg
-u_1_1_thopter.jpg https://downloads.cardforge.org/images/tokens/u_1_1_thopter.jpg
+u_1_1_wizard_countersac_clb.jpg https://downloads.cardforge.org/images/tokens/u_1_1_wizard_countersac_clb.jpg
+u_1_1_wizard_countersac_snc.jpg https://downloads.cardforge.org/images/tokens/u_1_1_wizard_countersac_snc.jpg
 u_2_1_a_myr.jpg https://downloads.cardforge.org/images/tokens/u_2_1_a_myr.jpg
 u_2_1_a_myr_2xm.jpg https://downloads.cardforge.org/images/tokens/u_2_1_a_myr_2xm.jpg
 u_2_1_a_myr_c18.jpg https://downloads.cardforge.org/images/tokens/u_2_1_a_myr_c18.jpg
-u_2_2_bird.jpg https://downloads.cardforge.org/images/tokens/u_2_2_bird.jpg
-u_2_2_bird_bng.jpg https://downloads.cardforge.org/images/tokens/u_2_2_bird_bng.jpg
+u_2_1_a_phyrexian_myr.jpg https://downloads.cardforge.org/images/tokens/u_2_1_a_phyrexian_myr.jpg
+u_2_2_bird_flying.jpg https://downloads.cardforge.org/images/tokens/u_2_2_bird_flying.jpg
 u_2_2_bird_flying_c16.jpg https://downloads.cardforge.org/images/tokens/u_2_2_bird_flying_c16.jpg
 u_2_2_bird_flying_ths.jpg https://downloads.cardforge.org/images/tokens/u_2_2_bird_flying_ths.jpg
+u_2_2_djinn_monk_flying.jpg https://downloads.cardforge.org/images/tokens/u_2_2_djinn_monk_flying.jpg
 u_2_2_djinn_monk_flying_dtk.jpg https://downloads.cardforge.org/images/tokens/u_2_2_djinn_monk_flying_dtk.jpg
 u_2_2_djinn_monk_flying_ima.jpg https://downloads.cardforge.org/images/tokens/u_2_2_djinn_monk_flying_ima.jpg
 u_2_2_drake_flying.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying.jpg
+u_2_2_drake_flying_2x2.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_2x2.jpg
 u_2_2_drake_flying_akh.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_akh.jpg
 u_2_2_drake_flying_c15.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_c15.jpg
-u_2_2_drake_flying_dds.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_dds.jpg
+u_2_2_drake_flying_c19.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_c19.jpg
+u_2_2_drake_flying_c20.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_c20.jpg
+u_2_2_drake_flying_c21.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_c21.jpg
 u_2_2_drake_flying_m13.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_m13.jpg
+u_2_2_drake_flying_mvm.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_mvm.jpg
+u_2_2_drake_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_ncc.jpg
 u_2_2_drake_flying_uma.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_uma.jpg
 u_2_2_drake_flying_znr.jpg https://downloads.cardforge.org/images/tokens/u_2_2_drake_flying_znr.jpg
+u_2_2_e_bird_flying.jpg https://downloads.cardforge.org/images/tokens/u_2_2_e_bird_flying.jpg
 u_2_2_e_bird_flying_bng.jpg https://downloads.cardforge.org/images/tokens/u_2_2_e_bird_flying_bng.jpg
 u_2_2_e_bird_flying_jou.jpg https://downloads.cardforge.org/images/tokens/u_2_2_e_bird_flying_jou.jpg
 u_2_2_elemental_flying.jpg https://downloads.cardforge.org/images/tokens/u_2_2_elemental_flying.jpg
-u_2_2_elemental_flying_dst.jpg https://downloads.cardforge.org/images/tokens/u_2_2_elemental_flying_dst.jpg
 u_2_2_homunculus.jpg https://downloads.cardforge.org/images/tokens/u_2_2_homunculus.jpg
 u_2_2_homunculus_isd.jpg https://downloads.cardforge.org/images/tokens/u_2_2_homunculus_isd.jpg
 u_2_2_homunculus_uma.jpg https://downloads.cardforge.org/images/tokens/u_2_2_homunculus_uma.jpg
 u_2_2_illusion.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion.jpg
-u_2_2_illusion_XLN.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion_XLN.jpg
 u_2_2_illusion_ddm.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion_ddm.jpg
+u_2_2_illusion_illusory.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion_illusory.jpg
 u_2_2_illusion_illusory_xln.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion_illusory_xln.jpg
 u_2_2_illusion_zen.jpg https://downloads.cardforge.org/images/tokens/u_2_2_illusion_zen.jpg
+u_2_2_shapeshifter_changeling.jpg https://downloads.cardforge.org/images/tokens/u_2_2_shapeshifter_changeling.jpg
+u_2_2_shapeshifter_changeling_clb.jpg https://downloads.cardforge.org/images/tokens/u_2_2_shapeshifter_changeling_clb.jpg
 u_2_2_shapeshifter_changeling_khm.jpg https://downloads.cardforge.org/images/tokens/u_2_2_shapeshifter_changeling_khm.jpg
 u_2_2_wizard.jpg https://downloads.cardforge.org/images/tokens/u_2_2_wizard.jpg
 u_2_2_wizard_war.jpg https://downloads.cardforge.org/images/tokens/u_2_2_wizard_war.jpg
+u_3_2_reflection.jpg https://downloads.cardforge.org/images/tokens/u_3_2_reflection.jpg
 u_3_2_reflection_thb.jpg https://downloads.cardforge.org/images/tokens/u_3_2_reflection_thb.jpg
 u_3_3_fish_hatches_whale.jpg https://downloads.cardforge.org/images/tokens/u_3_3_fish_hatches_whale.jpg
 u_3_3_fish_hatches_whale_a25.jpg https://downloads.cardforge.org/images/tokens/u_3_3_fish_hatches_whale_a25.jpg
-u_3_3_fish_hatches_whale_a25.png https://downloads.cardforge.org/images/tokens/u_3_3_fish_hatches_whale_a25.png
 u_3_3_fish_hatches_whale_c14.jpg https://downloads.cardforge.org/images/tokens/u_3_3_fish_hatches_whale_c14.jpg
-u_3_3_weird.jpg https://downloads.cardforge.org/images/tokens/u_3_3_weird.jpg
+u_3_3_fish_hatches_whale_c21.jpg https://downloads.cardforge.org/images/tokens/u_3_3_fish_hatches_whale_c21.jpg
 u_3_3_weird_defender_flying.jpg https://downloads.cardforge.org/images/tokens/u_3_3_weird_defender_flying.jpg
 u_3_3_weird_defender_flying_ddj.jpg https://downloads.cardforge.org/images/tokens/u_3_3_weird_defender_flying_ddj.jpg
 u_3_3_weird_defender_flying_gk1.jpg https://downloads.cardforge.org/images/tokens/u_3_3_weird_defender_flying_gk1.jpg
-u_3_3_weird_defender_flying_gpt.jpg https://downloads.cardforge.org/images/tokens/u_3_3_weird_defender_flying_gpt.jpg
 u_4_3_salamander_warrior.jpg https://downloads.cardforge.org/images/tokens/u_4_3_salamander_warrior.jpg
 u_4_3_salamander_warrior_cmr.jpg https://downloads.cardforge.org/images/tokens/u_4_3_salamander_warrior_cmr.jpg
-u_4_4_bird_flying_m20.jpg https://downloads.cardforge.org/images/tokens/u_4_4_bird_flying_m20.jpg
+u_4_4_elemental_bird_flying.jpg https://downloads.cardforge.org/images/tokens/u_4_4_elemental_bird_flying.jpg
 u_4_4_elemental_bird_flying_m20.jpg https://downloads.cardforge.org/images/tokens/u_4_4_elemental_bird_flying_m20.jpg
+u_4_4_giant_wizard.jpg https://downloads.cardforge.org/images/tokens/u_4_4_giant_wizard.jpg
 u_4_4_giant_wizard_khm.jpg https://downloads.cardforge.org/images/tokens/u_4_4_giant_wizard_khm.jpg
+u_4_4_sphinx_flying.jpg https://downloads.cardforge.org/images/tokens/u_4_4_sphinx_flying.jpg
 u_4_4_sphinx_flying_jou.jpg https://downloads.cardforge.org/images/tokens/u_4_4_sphinx_flying_jou.jpg
-u_5_5_dragon_spirit.jpg https://downloads.cardforge.org/images/tokens/u_5_5_dragon_spirit.jpg
-u_5_5_dragon_spirit_flying_chk.jpg https://downloads.cardforge.org/images/tokens/u_5_5_dragon_spirit_flying_chk.jpg
-u_5_5_wall.jpg https://downloads.cardforge.org/images/tokens/u_5_5_wall.jpg
+u_5_5_dragon_spirit_flying.jpg https://downloads.cardforge.org/images/tokens/u_5_5_dragon_spirit_flying.jpg
 u_5_5_wall_defender.jpg https://downloads.cardforge.org/images/tokens/u_5_5_wall_defender.jpg
 u_5_5_wall_defender_ddt.jpg https://downloads.cardforge.org/images/tokens/u_5_5_wall_defender_ddt.jpg
 u_5_5_wall_defender_ema.jpg https://downloads.cardforge.org/images/tokens/u_5_5_wall_defender_ema.jpg
-u_5_5_wall_defender_mir.jpg https://downloads.cardforge.org/images/tokens/u_5_5_wall_defender_mir.jpg
 u_6_6_whale_hatches_kraken.jpg https://downloads.cardforge.org/images/tokens/u_6_6_whale_hatches_kraken.jpg
 u_6_6_whale_hatches_kraken_a25.jpg https://downloads.cardforge.org/images/tokens/u_6_6_whale_hatches_kraken_a25.jpg
-u_6_6_whale_hatches_kraken_a25.png https://downloads.cardforge.org/images/tokens/u_6_6_whale_hatches_kraken_a25.png
 u_6_6_whale_hatches_kraken_c14.jpg https://downloads.cardforge.org/images/tokens/u_6_6_whale_hatches_kraken_c14.jpg
+u_6_6_whale_hatches_kraken_c21.jpg https://downloads.cardforge.org/images/tokens/u_6_6_whale_hatches_kraken_c21.jpg
+u_8_8_kraken.jpg https://downloads.cardforge.org/images/tokens/u_8_8_kraken.jpg
+u_8_8_kraken_hexproof.jpg https://downloads.cardforge.org/images/tokens/u_8_8_kraken_hexproof.jpg
 u_8_8_kraken_hexproof_thb.jpg https://downloads.cardforge.org/images/tokens/u_8_8_kraken_hexproof_thb.jpg
 u_8_8_kraken_iko.jpg https://downloads.cardforge.org/images/tokens/u_8_8_kraken_iko.jpg
 u_8_8_octopus.jpg https://downloads.cardforge.org/images/tokens/u_8_8_octopus.jpg
@@ -1488,163 +1476,156 @@ u_8_8_octopus_bfz.jpg https://downloads.cardforge.org/images/tokens/u_8_8_octopu
 u_8_8_octopus_ogw.jpg https://downloads.cardforge.org/images/tokens/u_8_8_octopus_ogw.jpg
 u_9_9_kraken.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken.jpg
 u_9_9_kraken_a25.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken_a25.jpg
-u_9_9_kraken_a25.png https://downloads.cardforge.org/images/tokens/u_9_9_kraken_a25.png
 u_9_9_kraken_bng.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken_bng.jpg
 u_9_9_kraken_c14.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken_c14.jpg
-u_9_9_kraken_ddo.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken_ddo.jpg
+u_9_9_kraken_c21.jpg https://downloads.cardforge.org/images/tokens/u_9_9_kraken_c21.jpg
+u_x_x_dog_illusion_cardsinhand_afr.jpg https://downloads.cardforge.org/images/tokens/u_x_x_dog_illusion_cardsinhand_afr.jpg
 u_x_x_illusion.jpg https://downloads.cardforge.org/images/tokens/u_x_x_illusion.jpg
 u_x_x_illusion_znr.jpg https://downloads.cardforge.org/images/tokens/u_x_x_illusion_znr.jpg
-u_x_x_orb.jpg https://downloads.cardforge.org/images/tokens/u_x_x_orb.jpg
-u_x_x_orb_all.jpg https://downloads.cardforge.org/images/tokens/u_x_x_orb_all.jpg
-u_x_x_orb_flying_all.jpg https://downloads.cardforge.org/images/tokens/u_x_x_orb_flying_all.jpg
+u_x_x_orb_flying.jpg https://downloads.cardforge.org/images/tokens/u_x_x_orb_flying.jpg
+u_x_x_shark_flying.jpg https://downloads.cardforge.org/images/tokens/u_x_x_shark_flying.jpg
 u_x_x_shark_flying_iko.jpg https://downloads.cardforge.org/images/tokens/u_x_x_shark_flying_iko.jpg
+u_x_x_zombie.jpg https://downloads.cardforge.org/images/tokens/u_x_x_zombie.jpg
 u_x_x_zombie_c14.jpg https://downloads.cardforge.org/images/tokens/u_x_x_zombie_c14.jpg
-ub_1_1_faerie_rogue.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_faerie_rogue.jpg
-ub_1_1_faerie_rogue_flying_fvl.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_faerie_rogue_flying_fvl.jpg
+u_x_x_zombie_mic.jpg https://downloads.cardforge.org/images/tokens/u_x_x_zombie_mic.jpg
+u_x_x_zombie_vow.jpg https://downloads.cardforge.org/images/tokens/u_x_x_zombie_vow.jpg
+ub_1_1_faerie_rogue_flying.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_faerie_rogue_flying.jpg
 ub_1_1_faerie_rogue_flying_mma.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_faerie_rogue_flying_mma.jpg
 ub_1_1_faerie_rogue_flying_shm.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_faerie_rogue_flying_shm.jpg
-ub_1_1_horror.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_horror.jpg
+ub_1_1_horror_flying.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_horror_flying.jpg
 ub_1_1_horror_flying_gk1.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_horror_flying_gk1.jpg
 ub_1_1_horror_flying_gtc.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_horror_flying_gtc.jpg
 ub_1_1_zombie_wizard.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_zombie_wizard.jpg
 ub_1_1_zombie_wizard_arb.jpg https://downloads.cardforge.org/images/tokens/ub_1_1_zombie_wizard_arb.jpg
+ub_2_3_nightmare_mill.jpg https://downloads.cardforge.org/images/tokens/ub_2_3_nightmare_mill.jpg
 ub_2_3_nightmare_mill_thb.jpg https://downloads.cardforge.org/images/tokens/ub_2_3_nightmare_mill_thb.jpg
-ug_1_1_snake.jpg https://downloads.cardforge.org/images/tokens/ug_1_1_snake.jpg
-ur_1_1_insect.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect.jpg
+ub_x_x_zombie_menace_mid.jpg https://downloads.cardforge.org/images/tokens/ub_x_x_zombie_menace_mid.jpg
+ur_1_1_insect_flying_haste.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect_flying_haste.jpg
+ur_1_1_insect_flying_haste_c20.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect_flying_haste_c20.jpg
 ur_1_1_insect_flying_haste_hou.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect_flying_haste_hou.jpg
-ur_1_1_insect_flying_haste_mps_akh.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect_flying_haste_mps_akh.jpg
-ur_5_5_elemental.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental.jpg
+ur_1_1_insect_flying_haste_mps.jpg https://downloads.cardforge.org/images/tokens/ur_1_1_insect_flying_haste_mps.jpg
+ur_4_4_elemental_stx.jpg https://downloads.cardforge.org/images/tokens/ur_4_4_elemental_stx.jpg
+ur_5_5_elemental_flying.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying.jpg
 ur_5_5_elemental_flying_c15.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_c15.jpg
-ur_5_5_elemental_flying_cmd.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_cmd.jpg
+ur_5_5_elemental_flying_c21.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_c21.jpg
 ur_5_5_elemental_flying_ema.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_ema.jpg
 ur_5_5_elemental_flying_eve.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_eve.jpg
-ur_insect_flying_haste_c20.jpg https://downloads.cardforge.org/images/tokens/ur_insect_flying_haste_c20.jpg
-urami_sok.jpg https://downloads.cardforge.org/images/tokens/urami_sok.jpg
+ur_5_5_elemental_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/ur_5_5_elemental_flying_ncc.jpg
+ur_x_x_weird.jpg https://downloads.cardforge.org/images/tokens/ur_x_x_weird.jpg
+ur_x_x_weird_m21.jpg https://downloads.cardforge.org/images/tokens/ur_x_x_weird_m21.jpg
+urami.jpg https://downloads.cardforge.org/images/tokens/urami.jpg
+vecna_afr.jpg https://downloads.cardforge.org/images/tokens/vecna_afr.jpg
 voja.jpg https://downloads.cardforge.org/images/tokens/voja.jpg
 voja_friend_to_elves.jpg https://downloads.cardforge.org/images/tokens/voja_friend_to_elves.jpg
 voja_friend_to_elves_war.jpg https://downloads.cardforge.org/images/tokens/voja_friend_to_elves_war.jpg
 voja_gk1.jpg https://downloads.cardforge.org/images/tokens/voja_gk1.jpg
-voja_rav.jpg https://downloads.cardforge.org/images/tokens/voja_rav.jpg
-volrath's_laboratory_sth.jpg https://downloads.cardforge.org/images/tokens/volrath%27s_laboratory_sth.jpg
+volos_journal_clb.jpg https://downloads.cardforge.org/images/tokens/volos_journal_clb.jpg
 w_0_1_caribou.jpg https://downloads.cardforge.org/images/tokens/w_0_1_caribou.jpg
-w_0_1_caribou_5ed.jpg https://downloads.cardforge.org/images/tokens/w_0_1_caribou_5ed.jpg
-w_0_1_caribou_ice.jpg https://downloads.cardforge.org/images/tokens/w_0_1_caribou_ice.jpg
-w_0_1_caribou_me2.jpg https://downloads.cardforge.org/images/tokens/w_0_1_caribou_me2.jpg
 w_0_1_deserter.jpg https://downloads.cardforge.org/images/tokens/w_0_1_deserter.jpg
-w_0_1_deserter_all.jpg https://downloads.cardforge.org/images/tokens/w_0_1_deserter_all.jpg
-w_0_1_deserter_cst.jpg https://downloads.cardforge.org/images/tokens/w_0_1_deserter_cst.jpg
-w_0_1_deserter_me2.jpg https://downloads.cardforge.org/images/tokens/w_0_1_deserter_me2.jpg
 w_0_1_goat.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat.jpg
-w_0_1_goat_c13.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_c13.jpg
 w_0_1_goat_c14.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_c14.jpg
 w_0_1_goat_c16.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_c16.jpg
+w_0_1_goat_clb.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_clb.jpg
 w_0_1_goat_cm2.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_cm2.jpg
 w_0_1_goat_eld.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_eld.jpg
 w_0_1_goat_eve.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_eve.jpg
-w_0_1_goat_hop.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_hop.jpg
 w_0_1_goat_m13.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_m13.jpg
 w_0_1_goat_m14.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_m14.jpg
+w_0_1_goat_ncc.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_ncc.jpg
 w_0_1_goat_pca.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_pca.jpg
 w_0_1_goat_thb.jpg https://downloads.cardforge.org/images/tokens/w_0_1_goat_thb.jpg
 w_0_3_wall_defender.jpg https://downloads.cardforge.org/images/tokens/w_0_3_wall_defender.jpg
 w_0_3_wall_defender_war.jpg https://downloads.cardforge.org/images/tokens/w_0_3_wall_defender_war.jpg
-w_1_1_bird_bng.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_bng.jpg
-w_1_1_bird_csp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_csp.jpg
 w_1_1_bird_flying.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying.jpg
 w_1_1_bird_flying_bng.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_bng.jpg
 w_1_1_bird_flying_c16.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_c16.jpg
 w_1_1_bird_flying_c20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_c20.jpg
 w_1_1_bird_flying_cm2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_cm2.jpg
-w_1_1_bird_flying_csp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_csp.jpg
 w_1_1_bird_flying_dgm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_dgm.jpg
 w_1_1_bird_flying_ima.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_ima.jpg
-w_1_1_bird_flying_jud.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_jud.jpg
 w_1_1_bird_flying_khc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_khc.jpg
+w_1_1_bird_flying_m21.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_m21.jpg
 w_1_1_bird_flying_mh1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_mh1.jpg
 w_1_1_bird_flying_mm3.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_mm3.jpg
 w_1_1_bird_flying_rtr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_rtr.jpg
-w_1_1_bird_flying_vma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_vma.jpg
 w_1_1_bird_flying_zen.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_zen.jpg
 w_1_1_bird_flying_znc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_flying_znc.jpg
-w_1_1_bird_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_soldier.jpg
+w_1_1_bird_soldier_flying.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_soldier_flying.jpg
 w_1_1_bird_soldier_flying_arb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_bird_soldier_flying_arb.jpg
 w_1_1_cat.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat.jpg
+w_1_1_cat_bird_flying.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_bird_flying.jpg
 w_1_1_cat_bird_flying_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_bird_flying_iko.jpg
 w_1_1_cat_lifelink.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_lifelink.jpg
 w_1_1_cat_lifelink_akh.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_lifelink_akh.jpg
 w_1_1_cat_lifelink_hou.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_lifelink_hou.jpg
+w_1_1_cat_lifelink_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_lifelink_iko.jpg
 w_1_1_cat_lifelink_m19.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_lifelink_m19.jpg
-w_1_1_cat_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_soldier.jpg
+w_1_1_cat_soldier_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_soldier_vigilance.jpg
 w_1_1_cat_soldier_vigilance_bng.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_soldier_vigilance_bng.jpg
 w_1_1_cat_znr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_cat_znr.jpg
 w_1_1_citizen.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen.jpg
-w_1_1_citizen_5ed.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_5ed.jpg
-w_1_1_citizen_6ed.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_6ed.jpg
-w_1_1_citizen_fem.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_fem.jpg
-w_1_1_citizen_me1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_me1.jpg
-w_1_1_citizen_tsp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_tsp.jpg
 w_1_1_citizen_uma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_citizen_uma.jpg
+w_1_1_dog.jpg https://downloads.cardforge.org/images/tokens/w_1_1_dog.jpg
+w_1_1_dog_m21.jpg https://downloads.cardforge.org/images/tokens/w_1_1_dog_m21.jpg
+w_1_1_e_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_e_soldier.jpg
 w_1_1_e_soldier2_bng.jpg https://downloads.cardforge.org/images/tokens/w_1_1_e_soldier2_bng.jpg
 w_1_1_e_soldier_bng.jpg https://downloads.cardforge.org/images/tokens/w_1_1_e_soldier_bng.jpg
-w_1_1_goldmeadow_harrier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_goldmeadow_harrier.jpg
 w_1_1_human.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human.jpg
 w_1_1_human2_dka.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human2_dka.jpg
 w_1_1_human_avr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_avr.jpg
+w_1_1_human_c19.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_c19.jpg
 w_1_1_human_c20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_c20.jpg
-w_1_1_human_ddq.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_ddq.jpg
+w_1_1_human_clb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_clb.jpg
 w_1_1_human_dka.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_dka.jpg
 w_1_1_human_eld.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_eld.jpg
+w_1_1_human_mid.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_mid.jpg
+w_1_1_human_ncc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_ncc.jpg
 w_1_1_human_rna.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_rna.jpg
 w_1_1_human_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier.jpg
-w_1_1_human_soldier1_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier1_iko.jpg
 w_1_1_human_soldier2_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier2_iko.jpg
 w_1_1_human_soldier3_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier3_iko.jpg
 w_1_1_human_soldier_2xm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_2xm.jpg
 w_1_1_human_soldier_emn.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_emn.jpg
+w_1_1_human_soldier_iko.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_iko.jpg
+w_1_1_human_soldier_mic.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_mic.jpg
+w_1_1_human_soldier_ncc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_ncc.jpg
 w_1_1_human_soldier_soi.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_soi.jpg
 w_1_1_human_soldier_thb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_soldier_thb.jpg
+w_1_1_human_vow.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_vow.jpg
+w_1_1_human_warrior.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_warrior.jpg
 w_1_1_human_warrior_khm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_human_warrior_khm.jpg
 w_1_1_kithkin_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier.jpg
-w_1_1_kithkin_soldier2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier2.jpg
 w_1_1_kithkin_soldier_cma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_cma.jpg
-w_1_1_kithkin_soldier_cmd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_cmd.jpg
 w_1_1_kithkin_soldier_eve.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_eve.jpg
 w_1_1_kithkin_soldier_khc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_khc.jpg
 w_1_1_kithkin_soldier_lrw.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_lrw.jpg
 w_1_1_kithkin_soldier_mma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_mma.jpg
 w_1_1_kithkin_soldier_mor.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_mor.jpg
 w_1_1_kithkin_soldier_shm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kithkin_soldier_shm.jpg
-w_1_1_knight.jpg https://downloads.cardforge.org/images/tokens/w_1_1_knight.jpg
-w_1_1_knight_banding_all.jpg https://downloads.cardforge.org/images/tokens/w_1_1_knight_banding_all.jpg
-w_1_1_knight_banding_me2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_knight_banding_me2.jpg
+w_1_1_knight_banding.jpg https://downloads.cardforge.org/images/tokens/w_1_1_knight_banding.jpg
 w_1_1_kor_ally.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_ally.jpg
 w_1_1_kor_ally_bfz.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_ally_bfz.jpg
 w_1_1_kor_ally_ogw.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_ally_ogw.jpg
 w_1_1_kor_ally_znc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_ally_znc.jpg
 w_1_1_kor_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_soldier.jpg
 w_1_1_kor_soldier_c14.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_soldier_c14.jpg
-w_1_1_kor_soldier_pz1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_soldier_pz1.jpg
 w_1_1_kor_soldier_roe.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_soldier_roe.jpg
 w_1_1_kor_soldier_zen.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_soldier_zen.jpg
 w_1_1_kor_warrior.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_warrior.jpg
+w_1_1_kor_warrior_clb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_warrior_clb.jpg
 w_1_1_kor_warrior_znr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_kor_warrior_znr.jpg
+w_1_1_monk_prowess.jpg https://downloads.cardforge.org/images/tokens/w_1_1_monk_prowess.jpg
 w_1_1_monk_prowess2_frf.jpg https://downloads.cardforge.org/images/tokens/w_1_1_monk_prowess2_frf.jpg
+w_1_1_monk_prowess_2x2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_monk_prowess_2x2.jpg
 w_1_1_monk_prowess_frf.jpg https://downloads.cardforge.org/images/tokens/w_1_1_monk_prowess_frf.jpg
+w_1_1_mouse.jpg https://downloads.cardforge.org/images/tokens/w_1_1_mouse.jpg
 w_1_1_mouse_eld.jpg https://downloads.cardforge.org/images/tokens/w_1_1_mouse_eld.jpg
-w_1_1_pegasus.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus.jpg
-w_1_1_pegasus2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus2.jpg
 w_1_1_pegasus_flying.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying.jpg
-w_1_1_pegasus_flying_ath.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_ath.jpg
 w_1_1_pegasus_flying_c14.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_c14.jpg
-w_1_1_pegasus_flying_cmd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_cmd.jpg
-w_1_1_pegasus_flying_exo.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_exo.jpg
-w_1_1_pegasus_flying_gpt.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_gpt.jpg
+w_1_1_pegasus_flying_c19.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_c19.jpg
+w_1_1_pegasus_flying_clb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_clb.jpg
 w_1_1_pegasus_flying_khc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_khc.jpg
-w_1_1_pegasus_flying_mir.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_mir.jpg
-w_1_1_pegasus_flying_tmp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_tmp.jpg
-w_1_1_pegasus_flying_tpr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_tpr.jpg
-w_1_1_pegasus_flying_tsb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_tsb.jpg
-w_1_1_pegasus_flying_ugl.jpg https://downloads.cardforge.org/images/tokens/w_1_1_pegasus_flying_ugl.jpg
+w_1_1_rabbit_clb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_rabbit_clb.jpg
 w_1_1_soldier.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier.jpg
 w_1_1_soldier2_cmr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier2_cmr.jpg
 w_1_1_soldier2_jou.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier2_jou.jpg
@@ -1652,10 +1633,10 @@ w_1_1_soldier2_ths.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldi
 w_1_1_soldier3_jou.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier3_jou.jpg
 w_1_1_soldier3_ths.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier3_ths.jpg
 w_1_1_soldier_10e.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_10e.jpg
+w_1_1_soldier_2x2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_2x2.jpg
 w_1_1_soldier_2xm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_2xm.jpg
 w_1_1_soldier_a25.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_a25.jpg
 w_1_1_soldier_ala.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ala.jpg
-w_1_1_soldier_all.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_all.jpg
 w_1_1_soldier_ally.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ally.jpg
 w_1_1_soldier_ally_wwk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ally_wwk.jpg
 w_1_1_soldier_arb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_arb.jpg
@@ -1664,116 +1645,100 @@ w_1_1_soldier_c14.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldie
 w_1_1_soldier_c16.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_c16.jpg
 w_1_1_soldier_c18.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_c18.jpg
 w_1_1_soldier_c20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_c20.jpg
-w_1_1_soldier_cfx.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_cfx.jpg
-w_1_1_soldier_cmd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_cmd.jpg
+w_1_1_soldier_clb.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_clb.jpg
 w_1_1_soldier_cmr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_cmr.jpg
 w_1_1_soldier_cn2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_cn2.jpg
-w_1_1_soldier_csp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_csp.jpg
 w_1_1_soldier_ddf.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ddf.jpg
-w_1_1_soldier_ddo.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ddo.jpg
 w_1_1_soldier_dom.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_dom.jpg
 w_1_1_soldier_e01.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_e01.jpg
 w_1_1_soldier_ema.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ema.jpg
-w_1_1_soldier_fut.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_fut.jpg
-w_1_1_soldier_fva.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_fva.jpg
 w_1_1_soldier_gtc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_gtc.jpg
 w_1_1_soldier_jou.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_jou.jpg
 w_1_1_soldier_khc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_khc.jpg
+w_1_1_soldier_lifelink.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_lifelink.jpg
+w_1_1_soldier_lifelink_gk1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_lifelink_gk1.jpg
 w_1_1_soldier_lifelink_grn.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_lifelink_grn.jpg
+w_1_1_soldier_lifelink_ncc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_lifelink_ncc.jpg
 w_1_1_soldier_m10.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m10.jpg
 w_1_1_soldier_m12.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m12.jpg
 w_1_1_soldier_m13.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m13.jpg
 w_1_1_soldier_m15.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m15.jpg
 w_1_1_soldier_m19.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m19.jpg
 w_1_1_soldier_m20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m20.jpg
+w_1_1_soldier_m21.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_m21.jpg
 w_1_1_soldier_mbs.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mbs.jpg
-w_1_1_soldier_me2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_me2.jpg
-w_1_1_soldier_med.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_med.jpg
+w_1_1_soldier_md1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_md1.jpg
 w_1_1_soldier_mh1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mh1.jpg
 w_1_1_soldier_mm2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mm2.jpg
 w_1_1_soldier_mm3.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mm3.jpg
 w_1_1_soldier_mma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mma.jpg
-w_1_1_soldier_mmq.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mmq.jpg
+w_1_1_soldier_mps.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mps.jpg
 w_1_1_soldier_mps_grn.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mps_grn.jpg
-w_1_1_soldier_mrd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_mrd.jpg
-w_1_1_soldier_ons.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ons.jpg
 w_1_1_soldier_ori.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ori.jpg
-w_1_1_soldier_plc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_plc.jpg
 w_1_1_soldier_rtr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_rtr.jpg
-w_1_1_soldier_scg.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_scg.jpg
 w_1_1_soldier_som.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_som.jpg
-w_1_1_soldier_td0.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_td0.jpg
 w_1_1_soldier_ths.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ths.jpg
-w_1_1_soldier_ugl.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_ugl.jpg
-w_1_1_soldier_vma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_vma.jpg
+w_1_1_soldier_tsr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_soldier_tsr.jpg
 w_1_1_spirit_flying.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying.jpg
-w_1_1_spirit_flying2_ust.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying2_ust.jpg
+w_1_1_spirit_flying2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying2.jpg
+w_1_1_spirit_flying_2x2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_2x2.jpg
 w_1_1_spirit_flying_a25.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_a25.jpg
-w_1_1_spirit_flying_ana.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ana.jpg
 w_1_1_spirit_flying_avr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_avr.jpg
 w_1_1_spirit_flying_bbd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_bbd.jpg
-w_1_1_spirit_flying_c13.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_c13.jpg
 w_1_1_spirit_flying_c14.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_c14.jpg
 w_1_1_spirit_flying_c16.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_c16.jpg
+w_1_1_spirit_flying_c19.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_c19.jpg
 w_1_1_spirit_flying_c20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_c20.jpg
 w_1_1_spirit_flying_cm2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cm2.jpg
 w_1_1_spirit_flying_cma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cma.jpg
-w_1_1_spirit_flying_cmd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cmd.jpg
 w_1_1_spirit_flying_cmr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cmr.jpg
 w_1_1_spirit_flying_cn2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cn2.jpg
 w_1_1_spirit_flying_cns.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_cns.jpg
 w_1_1_spirit_flying_ddc.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ddc.jpg
 w_1_1_spirit_flying_ddk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ddk.jpg
-w_1_1_spirit_flying_ddq.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ddq.jpg
 w_1_1_spirit_flying_dka.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_dka.jpg
-w_1_1_spirit_flying_dvd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_dvd.jpg
 w_1_1_spirit_flying_e01.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_e01.jpg
 w_1_1_spirit_flying_ema.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ema.jpg
 w_1_1_spirit_flying_emn.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_emn.jpg
 w_1_1_spirit_flying_frf.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_frf.jpg
 w_1_1_spirit_flying_gk2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_gk2.jpg
-w_1_1_spirit_flying_gpt.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_gpt.jpg
 w_1_1_spirit_flying_ima.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ima.jpg
 w_1_1_spirit_flying_isd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_isd.jpg
-w_1_1_spirit_flying_jud.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_jud.jpg
 w_1_1_spirit_flying_khm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_khm.jpg
 w_1_1_spirit_flying_ktk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ktk.jpg
 w_1_1_spirit_flying_m15.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_m15.jpg
 w_1_1_spirit_flying_m20.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_m20.jpg
-w_1_1_spirit_flying_med.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_med.jpg
-w_1_1_spirit_flying_mir.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mir.jpg
+w_1_1_spirit_flying_md1.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_md1.jpg
+w_1_1_spirit_flying_mid.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mid.jpg
 w_1_1_spirit_flying_mm2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mm2.jpg
 w_1_1_spirit_flying_mm3.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mm3.jpg
-w_1_1_spirit_flying_mmq.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mmq.jpg
-w_1_1_spirit_flying_mrd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_mrd.jpg
-w_1_1_spirit_flying_ody.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ody.jpg
-w_1_1_spirit_flying_pls.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_pls.jpg
-w_1_1_spirit_flying_rav.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_rav.jpg
 w_1_1_spirit_flying_shm.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_shm.jpg
 w_1_1_spirit_flying_soi.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_soi.jpg
-w_1_1_spirit_flying_tmp.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_tmp.jpg
-w_1_1_spirit_flying_tpr.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_tpr.jpg
 w_1_1_spirit_flying_uma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_uma.jpg
-w_1_1_spirit_flying_ust.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_ust.jpg
-w_1_1_spirit_flying_vintage.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_vintage.jpg
-w_1_1_spirit_flying_vma.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_vma.jpg
-w_1_1_vampire.jpg https://downloads.cardforge.org/images/tokens/w_1_1_vampire.jpg
+w_1_1_spirit_flying_vow.jpg https://downloads.cardforge.org/images/tokens/w_1_1_spirit_flying_vow.jpg
+w_1_1_vampire_lifelink.jpg https://downloads.cardforge.org/images/tokens/w_1_1_vampire_lifelink.jpg
+w_1_1_vampire_lifelink_2x2.jpg https://downloads.cardforge.org/images/tokens/w_1_1_vampire_lifelink_2x2.jpg
 w_1_1_vampire_lifelink_rix.jpg https://downloads.cardforge.org/images/tokens/w_1_1_vampire_lifelink_rix.jpg
 w_1_1_vampire_lifelink_xln.jpg https://downloads.cardforge.org/images/tokens/w_1_1_vampire_lifelink_xln.jpg
+w_1_1_warrior.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior.jpg
 w_1_1_warrior2_ktk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior2_ktk.jpg
 w_1_1_warrior3_ktk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior3_ktk.jpg
 w_1_1_warrior_bbd.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_bbd.jpg
 w_1_1_warrior_dtk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_dtk.jpg
 w_1_1_warrior_ktk.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_ktk.jpg
+w_1_1_warrior_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_vigilance.jpg
 w_1_1_warrior_vigilance_akh.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_vigilance_akh.jpg
 w_1_1_warrior_vigilance_hou.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_vigilance_hou.jpg
-w_1_1_warrior_vigilance_mps_akh.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_vigilance_mps_akh.jpg
+w_1_1_warrior_vigilance_mps.jpg https://downloads.cardforge.org/images/tokens/w_1_1_warrior_vigilance_mps.jpg
+w_1_2_soldier_defender.jpg https://downloads.cardforge.org/images/tokens/w_1_2_soldier_defender.jpg
 w_1_2_soldier_defender_cn2.jpg https://downloads.cardforge.org/images/tokens/w_1_2_soldier_defender_cn2.jpg
-w_2_1_cleric.jpg https://downloads.cardforge.org/images/tokens/w_2_1_cleric.jpg
+w_2_1_e_cleric.jpg https://downloads.cardforge.org/images/tokens/w_2_1_e_cleric.jpg
 w_2_1_e_cleric_ths.jpg https://downloads.cardforge.org/images/tokens/w_2_1_e_cleric_ths.jpg
+w_2_2 knight_vigilance_afc.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_afc.jpg
 w_2_2_cat.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat.jpg
 w_2_2_cat_2xm.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_2xm.jpg
 w_2_2_cat_beast.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_beast.jpg
+w_2_2_cat_beast_ncc.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_beast_ncc.jpg
 w_2_2_cat_beast_znr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_beast_znr.jpg
 w_2_2_cat_c14.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_c14.jpg
 w_2_2_cat_c15.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_c15.jpg
@@ -1784,164 +1749,150 @@ w_2_2_cat_m13.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_m13.jp
 w_2_2_cat_m14.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_m14.jpg
 w_2_2_cat_mbs.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_mbs.jpg
 w_2_2_cat_som.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_som.jpg
-w_2_2_cat_td2.jpg https://downloads.cardforge.org/images/tokens/w_2_2_cat_td2.jpg
-w_2_2_griffin.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin.jpg
+w_2_2_griffin_flying.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying.jpg
 w_2_2_griffin_flying_ddg.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_ddg.jpg
 w_2_2_griffin_flying_ddh.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_ddh.jpg
 w_2_2_griffin_flying_ddl.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_ddl.jpg
-w_2_2_griffin_flying_tsp.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_tsp.jpg
+w_2_2_griffin_flying_m21.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_m21.jpg
+w_2_2_griffin_flying_tsr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_griffin_flying_tsr.jpg
 w_2_2_knight.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight.jpg
-w_2_2_knight2_dom.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight2_dom.jpg
 w_2_2_knight_ally.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_ally.jpg
 w_2_2_knight_ally_bfz.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_ally_bfz.jpg
 w_2_2_knight_ally_ogw.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_ally_ogw.jpg
-w_2_2_knight_dom.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_dom.jpg
+w_2_2_knight_clb.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_clb.jpg
 w_2_2_knight_first_strike.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_first_strike.jpg
 w_2_2_knight_first_strike_c15.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_first_strike_c15.jpg
 w_2_2_knight_first_strike_cm2.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_first_strike_cm2.jpg
-w_2_2_knight_first_strike_rav.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_first_strike_rav.jpg
-w_2_2_knight_m19.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_m19.jpg
 w_2_2_knight_rtr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_rtr.jpg
-w_2_2_knight_usg.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_usg.jpg
 w_2_2_knight_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance.jpg
 w_2_2_knight_vigilance2_dgm.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance2_dgm.jpg
 w_2_2_knight_vigilance2_dom.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance2_dom.jpg
 w_2_2_knight_vigilance2_gtc.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance2_gtc.jpg
 w_2_2_knight_vigilance2_rtr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance2_rtr.jpg
-w_2_2_knight_vigilance_c13.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_c13.jpg
+w_2_2_knight_vigilance_2x2.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_2x2.jpg
 w_2_2_knight_vigilance_c15.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_c15.jpg
 w_2_2_knight_vigilance_cma.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_cma.jpg
 w_2_2_knight_vigilance_dgm.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_dgm.jpg
 w_2_2_knight_vigilance_dom.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_dom.jpg
 w_2_2_knight_vigilance_eld.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_eld.jpg
-w_2_2_knight_vigilance_gk1.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_gk1.jpg
-w_2_2_knight_vigilance_gnt.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_gnt.jpg
 w_2_2_knight_vigilance_gtc.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_gtc.jpg
 w_2_2_knight_vigilance_m19.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_m19.jpg
+w_2_2_knight_vigilance_m21.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_m21.jpg
+w_2_2_knight_vigilance_mic.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_mic.jpg
 w_2_2_knight_vigilance_ori.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_ori.jpg
-w_2_2_knight_vigilance_pz1.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_pz1.jpg
 w_2_2_knight_vigilance_rtr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_knight_vigilance_rtr.jpg
+w_2_2_pegasus_flying.jpg https://downloads.cardforge.org/images/tokens/w_2_2_pegasus_flying.jpg
 w_2_2_pegasus_flying_thb.jpg https://downloads.cardforge.org/images/tokens/w_2_2_pegasus_flying_thb.jpg
 w_2_2_reflection.jpg https://downloads.cardforge.org/images/tokens/w_2_2_reflection.jpg
-w_2_2_reflection_tmp.jpg https://downloads.cardforge.org/images/tokens/w_2_2_reflection_tmp.jpg
-w_2_2_reflection_tpr.jpg https://downloads.cardforge.org/images/tokens/w_2_2_reflection_tpr.jpg
-w_2_2_reflection_vma.jpg https://downloads.cardforge.org/images/tokens/w_2_2_reflection_vma.jpg
+w_2_2_samurai_vigilance_neo.jpg https://downloads.cardforge.org/images/tokens/w_2_2_samurai_vigilance_neo.jpg
 w_2_2_soldier_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_2_2_soldier_vigilance.jpg
 w_2_2_soldier_vigilance_war.jpg https://downloads.cardforge.org/images/tokens/w_2_2_soldier_vigilance_war.jpg
+w_2_2_spirit_flying_snc.jpg https://downloads.cardforge.org/images/tokens/w_2_2_spirit_flying_snc.jpg
+w_2_4_ox.jpg https://downloads.cardforge.org/images/tokens/w_2_4_ox.jpg
 w_2_4_ox_m19.jpg https://downloads.cardforge.org/images/tokens/w_2_4_ox_m19.jpg
-w_3_3_angel_flying_ogw.jpg https://downloads.cardforge.org/images/tokens/w_3_3_angel_flying_ogw.jpg
-w_3_3_bird.jpg https://downloads.cardforge.org/images/tokens/w_3_3_bird.jpg
+w_3_3_angel_flying.jpg https://downloads.cardforge.org/images/tokens/w_3_3_angel_flying.jpg
+w_3_3_angel_flying_afr.jpg https://downloads.cardforge.org/images/tokens/w_3_3_angel_flying_afr.jpg
+w_3_3_angel_flying_snc.jpg https://downloads.cardforge.org/images/tokens/w_3_3_angel_flying_snc.jpg
+w_3_3_bird_flying.jpg https://downloads.cardforge.org/images/tokens/w_3_3_bird_flying.jpg
+w_3_3_bird_flying_c19.jpg https://downloads.cardforge.org/images/tokens/w_3_3_bird_flying_c19.jpg
 w_3_3_bird_flying_m11.jpg https://downloads.cardforge.org/images/tokens/w_3_3_bird_flying_m11.jpg
 w_3_3_bird_flying_m12.jpg https://downloads.cardforge.org/images/tokens/w_3_3_bird_flying_m12.jpg
 w_3_3_spirit_flying.jpg https://downloads.cardforge.org/images/tokens/w_3_3_spirit_flying.jpg
-w_3_3_spirit_flying_bok.jpg https://downloads.cardforge.org/images/tokens/w_3_3_spirit_flying_bok.jpg
+w_3_3_spirit_flying_voc.jpg https://downloads.cardforge.org/images/tokens/w_3_3_spirit_flying_voc.jpg
+w_3_4_bird_flying.jpg https://downloads.cardforge.org/images/tokens/w_3_4_bird_flying.jpg
+w_3_4_bird_flying_c19.jpg https://downloads.cardforge.org/images/tokens/w_3_4_bird_flying_c19.jpg
 w_3_4_bird_flying_ktk.jpg https://downloads.cardforge.org/images/tokens/w_3_4_bird_flying_ktk.jpg
 w_4_4_angel_flying.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying.jpg
 w_4_4_angel_flying2_avr.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying2_avr.jpg
-w_4_4_angel_flying2_ust.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying2_ust.jpg
 w_4_4_angel_flying_2xm.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_2xm.jpg
 w_4_4_angel_flying_a25.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_a25.jpg
-w_4_4_angel_flying_a25.png https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_a25.png
+w_4_4_angel_flying_afc.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_afc.jpg
 w_4_4_angel_flying_avr.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_avr.jpg
 w_4_4_angel_flying_c14.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_c14.jpg
 w_4_4_angel_flying_c15.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_c15.jpg
 w_4_4_angel_flying_c18.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_c18.jpg
 w_4_4_angel_flying_c20.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_c20.jpg
-w_4_4_angel_flying_cfx.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_cfx.jpg
 w_4_4_angel_flying_cmr.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_cmr.jpg
-w_4_4_angel_flying_ddq.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ddq.jpg
 w_4_4_angel_flying_gtc.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_gtc.jpg
 w_4_4_angel_flying_ima.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ima.jpg
 w_4_4_angel_flying_isd.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_isd.jpg
 w_4_4_angel_flying_m14.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_m14.jpg
-w_4_4_angel_flying_m19.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_m19.jpg
+w_4_4_angel_flying_m21.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_m21.jpg
 w_4_4_angel_flying_mm3.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_mm3.jpg
-w_4_4_angel_flying_nms.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_nms.jpg
-w_4_4_angel_flying_ons.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ons.jpg
+w_4_4_angel_flying_ogw.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ogw.jpg
 w_4_4_angel_flying_ori.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ori.jpg
-w_4_4_angel_flying_pc2.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_pc2.jpg
 w_4_4_angel_flying_pca.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_pca.jpg
-w_4_4_angel_flying_scg.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_scg.jpg
 w_4_4_angel_flying_soi.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_soi.jpg
-w_4_4_angel_flying_td0.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_td0.jpg
-w_4_4_angel_flying_ust.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_ust.jpg
-w_4_4_angel_flying_v15.png https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_v15.png
 w_4_4_angel_flying_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance.jpg
+w_4_4_angel_flying_vigilance_2x2.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_2x2.jpg
+w_4_4_angel_flying_vigilance_clb.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_clb.jpg
 w_4_4_angel_flying_vigilance_grn.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_grn.jpg
 w_4_4_angel_flying_vigilance_m19.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_m19.jpg
 w_4_4_angel_flying_vigilance_mh1.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_mh1.jpg
+w_4_4_angel_flying_vigilance_nec.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_nec.jpg
 w_4_4_angel_flying_vigilance_war.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vigilance_war.jpg
-w_4_4_angel_flying_vintage.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vintage.jpg
-w_4_4_angel_flying_vma.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_vma.jpg
+w_4_4_angel_flying_voc.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_voc.jpg
 w_4_4_angel_flying_zen.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_flying_zen.jpg
 w_4_4_angel_warrior_flying.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_warrior_flying.jpg
+w_4_4_angel_warrior_flying_vigilance.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_warrior_flying_vigilance.jpg
 w_4_4_angel_warrior_flying_vigilance_khm.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_warrior_flying_vigilance_khm.jpg
 w_4_4_angel_warrior_flying_znr.jpg https://downloads.cardforge.org/images/tokens/w_4_4_angel_warrior_flying_znr.jpg
-w_4_4_avatar.jpg https://downloads.cardforge.org/images/tokens/w_4_4_avatar.jpg
 w_4_4_avatar_flying.jpg https://downloads.cardforge.org/images/tokens/w_4_4_avatar_flying.jpg
 w_4_4_avatar_flying_m19.jpg https://downloads.cardforge.org/images/tokens/w_4_4_avatar_flying_m19.jpg
-w_4_4_elemental.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental.jpg
+w_4_4_elemental_flying.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental_flying.jpg
 w_4_4_elemental_flying_c16.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental_flying_c16.jpg
 w_4_4_elemental_flying_c20.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental_flying_c20.jpg
 w_4_4_elemental_flying_lrw.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental_flying_lrw.jpg
-w_4_4_mirror_sigil_sergeant.jpg https://downloads.cardforge.org/images/tokens/w_4_4_mirror_sigil_sergeant.jpg
+w_4_4_elemental_flying_ncc.jpg https://downloads.cardforge.org/images/tokens/w_4_4_elemental_flying_ncc.jpg
+w_4_4_spirit_flying_vow.jpg https://downloads.cardforge.org/images/tokens/w_4_4_spirit_flying_vow.jpg
 w_5_5_giant_warrior.jpg https://downloads.cardforge.org/images/tokens/w_5_5_giant_warrior.jpg
 w_5_5_giant_warrior_mma.jpg https://downloads.cardforge.org/images/tokens/w_5_5_giant_warrior_mma.jpg
 w_5_5_giant_warrior_mor.jpg https://downloads.cardforge.org/images/tokens/w_5_5_giant_warrior_mor.jpg
 w_5_5_horse.jpg https://downloads.cardforge.org/images/tokens/w_5_5_horse.jpg
 w_5_5_horse_hou.jpg https://downloads.cardforge.org/images/tokens/w_5_5_horse_hou.jpg
-w_n_n_avatar.jpg https://downloads.cardforge.org/images/tokens/w_n_n_avatar.jpg
+w_x_x_avatar_life_total.jpg https://downloads.cardforge.org/images/tokens/w_x_x_avatar_life_total.jpg
 w_x_x_avatar_life_total_lrw.jpg https://downloads.cardforge.org/images/tokens/w_x_x_avatar_life_total_lrw.jpg
 w_x_x_avatar_life_total_m10.jpg https://downloads.cardforge.org/images/tokens/w_x_x_avatar_life_total_m10.jpg
 w_x_x_avatar_life_total_m11.jpg https://downloads.cardforge.org/images/tokens/w_x_x_avatar_life_total_m11.jpg
 w_x_x_reflection.jpg https://downloads.cardforge.org/images/tokens/w_x_x_reflection.jpg
-w_x_x_reflection_inv.jpg https://downloads.cardforge.org/images/tokens/w_x_x_reflection_inv.jpg
+w_x_x_spirit_cleric_total_spirits_vow.jpg https://downloads.cardforge.org/images/tokens/w_x_x_spirit_cleric_total_spirits_vow.jpg
+walker.jpg https://downloads.cardforge.org/images/tokens/walker.jpg
 wasp.jpg https://downloads.cardforge.org/images/tokens/wasp.jpg
 wasp_10e.jpg https://downloads.cardforge.org/images/tokens/wasp_10e.jpg
-wasp_2ed.jpg https://downloads.cardforge.org/images/tokens/wasp_2ed.jpg
-wasp_3ed.jpg https://downloads.cardforge.org/images/tokens/wasp_3ed.jpg
-wasp_4ed.jpg https://downloads.cardforge.org/images/tokens/wasp_4ed.jpg
-wasp_5ed.jpg https://downloads.cardforge.org/images/tokens/wasp_5ed.jpg
-wasp_6ed.jpg https://downloads.cardforge.org/images/tokens/wasp_6ed.jpg
-wasp_lea.jpg https://downloads.cardforge.org/images/tokens/wasp_lea.jpg
-wasp_leb.jpg https://downloads.cardforge.org/images/tokens/wasp_leb.jpg
-wasp_leg.jpg https://downloads.cardforge.org/images/tokens/wasp_leg.jpg
-wb_1_1_cleric.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_cleric.jpg
+wb_1_1_cleric_deathpact.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_cleric_deathpact.jpg
 wb_1_1_cleric_deathpact_gk2.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_cleric_deathpact_gk2.jpg
 wb_1_1_cleric_deathpact_gtc.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_cleric_deathpact_gtc.jpg
 wb_1_1_human_cleric.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_human_cleric.jpg
 wb_1_1_human_cleric_soi.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_human_cleric_soi.jpg
-wb_1_1_spirit.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit.jpg
 wb_1_1_spirit_flying.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying.jpg
 wb_1_1_spirit_flying_c15.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_c15.jpg
+wb_1_1_spirit_flying_c21.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_c21.jpg
 wb_1_1_spirit_flying_dgm.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_dgm.jpg
 wb_1_1_spirit_flying_eve.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_eve.jpg
 wb_1_1_spirit_flying_gtc.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_gtc.jpg
 wb_1_1_spirit_flying_mh1.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_mh1.jpg
 wb_1_1_spirit_flying_rna.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_rna.jpg
 wb_1_1_spirit_flying_uma.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_flying_uma.jpg
-wb_1_1_spirit_gtc.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_spirit_gtc.jpg
+wb_1_1_vampire_lifelink_voc.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_vampire_lifelink_voc.jpg
+wb_1_1_vampire_lifelink_vow.jpg https://downloads.cardforge.org/images/tokens/wb_1_1_vampire_lifelink_vow.jpg
+wb_2_1_inkling_flying.jpg https://downloads.cardforge.org/images/tokens/wb_2_1_inkling_flying.jpg
+wb_2_1_inkling_flying_stx.jpg https://downloads.cardforge.org/images/tokens/wb_2_1_inkling_flying_stx.jpg
+wb_x_x_e_spirit_experience.jpg https://downloads.cardforge.org/images/tokens/wb_x_x_e_spirit_experience.jpg
 wb_x_x_e_spirit_experience_c15.jpg https://downloads.cardforge.org/images/tokens/wb_x_x_e_spirit_experience_c15.jpg
-wb_x_x_e_spirit_experience_pz1.jpg https://downloads.cardforge.org/images/tokens/wb_x_x_e_spirit_experience_pz1.jpg
-wg_2_2_elf_knight_vigilance_grn.jpg https://downloads.cardforge.org/images/tokens/wg_2_2_elf_knight_vigilance_grn.jpg
-wg_2_2_voja.jpg https://downloads.cardforge.org/images/tokens/wg_2_2_voja.jpg
-wirefly_dst.jpg https://downloads.cardforge.org/images/tokens/wirefly_dst.jpg
+wirefly.jpg https://downloads.cardforge.org/images/tokens/wirefly.jpg
 wolves_of_the_hunt.jpg https://downloads.cardforge.org/images/tokens/wolves_of_the_hunt.jpg
-wolves_of_the_hunt_leg.jpg https://downloads.cardforge.org/images/tokens/wolves_of_the_hunt_leg.jpg
 wood.jpg https://downloads.cardforge.org/images/tokens/wood.jpg
-wood_mir.jpg https://downloads.cardforge.org/images/tokens/wood_mir.jpg
-wrg_8_8_beast.jpg https://downloads.cardforge.org/images/tokens/wrg_8_8_beast.jpg
-wu_1_1_bird.jpg https://downloads.cardforge.org/images/tokens/wu_1_1_bird.jpg
-wu_1_1_bird_flying_dis.jpg https://downloads.cardforge.org/images/tokens/wu_1_1_bird_flying_dis.jpg
+wu_1_1_bird_flying.jpg https://downloads.cardforge.org/images/tokens/wu_1_1_bird_flying.jpg
 wu_1_1_bird_flying_gk2.jpg https://downloads.cardforge.org/images/tokens/wu_1_1_bird_flying_gk2.jpg
+wu_4_4_sphinx_flying_vigilance.jpg https://downloads.cardforge.org/images/tokens/wu_4_4_sphinx_flying_vigilance.jpg
 wu_4_4_sphinx_flying_vigilance_rna.jpg https://downloads.cardforge.org/images/tokens/wu_4_4_sphinx_flying_vigilance_rna.jpg
-wubrg_2_2_citizen.jpg https://downloads.cardforge.org/images/tokens/wubrg_2_2_citizen.jpg
 wubrg_2_2_citizen_war.jpg https://downloads.cardforge.org/images/tokens/wubrg_2_2_citizen_war.jpg
 
 #Copies
 embalm_angel_of_sanctions_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_angel_of_sanctions_akh.jpg
 embalm_angel_of_sanctions_c19.jpg https://downloads.cardforge.org/images/tokens/embalm_angel_of_sanctions_c19.jpg
 embalm_anointer_priest_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_anointer_priest_akh.jpg
+embalm_aven_initiate_2x2.jpg https://downloads.cardforge.org/images/tokens/embalm_aven_initiate_2x2.jpg
 embalm_aven_initiate_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_aven_initiate_akh.jpg
 embalm_aven_wind_guide_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_aven_wind_guide_akh.jpg
 embalm_glyph_keeper_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_glyph_keeper_akh.jpg
@@ -1949,84 +1900,172 @@ embalm_heart-piercer_manticore_akh.jpg https://downloads.cardforge.org/images/to
 embalm_heart-piercer_manticore_c19.jpg https://downloads.cardforge.org/images/tokens/embalm_heart-piercer_manticore_c19.jpg
 embalm_honored_hydra_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_honored_hydra_akh.jpg
 embalm_labyrinth_guardian_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_labyrinth_guardian_akh.jpg
-embalm_oketra's_attendant_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_oketra%27s_attendant_akh.jpg
+embalm_oketra's_attendant_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_oketra's_attendant_akh.jpg
 embalm_sacred_cat_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_sacred_cat_akh.jpg
 embalm_tah-crop_skirmisher_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_tah-crop_skirmisher_akh.jpg
-embalm_temmet_vizier_of_naktamun_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_temmet_vizier_of_naktamun_akh.jpg
+embalm_temmet,_vizier_of_naktamun_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_temmet,_vizier_of_naktamun_akh.jpg
 embalm_trueheart_duelist_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_trueheart_duelist_akh.jpg
 embalm_unwavering_initiate_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_unwavering_initiate_akh.jpg
 embalm_vizier_of_many_faces_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_vizier_of_many_faces_akh.jpg
-eternalize_adorned_pouncer_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_adorned_pouncer_hou.jpg
-eternalize_champion_of_wits_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_champion_of_wits_hou.jpg
-eternalize_dreamstealer_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_dreamstealer_hou.jpg
-eternalize_earthshaker_khenra_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_earthshaker_khenra_hou.jpg
-eternalize_proven_combatant_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_proven_combatant_hou.jpg
-eternalize_resilient_khenra_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_resilient_khenra_hou.jpg
-eternalize_sinuous_striker_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_sinuous_striker_hou.jpg
-eternalize_steadfast_sentinel_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_steadfast_sentinel_hou.jpg
-eternalize_sunscourge_champion_hou.jpg https://downloads.cardforge.org/images/tokens/eternalize_sunscourge_champion_hou.jpg
+eternalize_adorned_pouncer.jpg https://downloads.cardforge.org/images/tokens/eternalize_adorned_pouncer.jpg
+eternalize_champion_of_wits.jpg https://downloads.cardforge.org/images/tokens/eternalize_champion_of_wits.jpg
+eternalize_champion_of_wits_c21.jpg https://downloads.cardforge.org/images/tokens/eternalize_champion_of_wits_c21.jpg
+eternalize_dreamstealer.jpg https://downloads.cardforge.org/images/tokens/eternalize_dreamstealer.jpg
+eternalize_earthshaker_khenra.jpg https://downloads.cardforge.org/images/tokens/eternalize_earthshaker_khenra.jpg
+eternalize_proven_combatant.jpg https://downloads.cardforge.org/images/tokens/eternalize_proven_combatant.jpg
+eternalize_resilient_khenra.jpg https://downloads.cardforge.org/images/tokens/eternalize_resilient_khenra.jpg
+eternalize_sinuous_striker.jpg https://downloads.cardforge.org/images/tokens/eternalize_sinuous_striker.jpg
+eternalize_steadfast_sentinel.jpg https://downloads.cardforge.org/images/tokens/eternalize_steadfast_sentinel.jpg
+eternalize_sunscourge_champion.jpg https://downloads.cardforge.org/images/tokens/eternalize_sunscourge_champion.jpg
+eternalize_timeless_dragon_mh2.jpg https://downloads.cardforge.org/images/tokens/eternalize_timeless_dragon_mh2.jpg
+eternalize_timeless_witness_mh2.jpg https://downloads.cardforge.org/images/tokens/eternalize_timeless_witness_mh2.jpg
 
-# Emblems
-chandra_the_firebrand_effect.jpg https://downloads.cardforge.org/images/tokens/chandra_the_firebrand_effect.jpg
+#Emblem
 emblem_ajani_adversary_of_tyrants.jpg https://downloads.cardforge.org/images/tokens/emblem_ajani_adversary_of_tyrants.jpg
-emblem_arlinn_embraced_by_the_moon.jpg https://downloads.cardforge.org/images/tokens/emblem_arlinn_embraced_by_the_moon.jpg
+emblem_ajani_steadfast.jpg https://downloads.cardforge.org/images/tokens/emblem_ajani_steadfast.jpg
+emblem_arlinn_kord.jpg https://downloads.cardforge.org/images/tokens/emblem_arlinn_kord.jpg
+emblem_basri_ket.jpg https://downloads.cardforge.org/images/tokens/emblem_basri_ket.jpg
 emblem_chandra_awakened_inferno.jpg https://downloads.cardforge.org/images/tokens/emblem_chandra_awakened_inferno.jpg
-emblem_chandra_awakened_inferno_m20.jpg https://downloads.cardforge.org/images/tokens/emblem_chandra_awakened_inferno_m20.jpg
+emblem_chandra_dressed_to_kill_vow.jpg https://downloads.cardforge.org/images/tokens/emblem_chandra_dressed_to_kill_vow.jpg
+emblem_chandra_roaring_flame.jpg https://downloads.cardforge.org/images/tokens/emblem_chandra_roaring_flame.jpg
+emblem_chandra_torch_of_defiance.jpg https://downloads.cardforge.org/images/tokens/emblem_chandra_torch_of_defiance.jpg
+emblem_dack_fayden.jpg https://downloads.cardforge.org/images/tokens/emblem_dack_fayden.jpg
+emblem_dack_fayden_ema.jpg https://downloads.cardforge.org/images/tokens/emblem_dack_fayden_ema.jpg
+emblem_dack_fayden_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_dack_fayden_mps.jpg
 emblem_dack_fayden_mps_rna.jpg https://downloads.cardforge.org/images/tokens/emblem_dack_fayden_mps_rna.jpg
+emblem_daretti_scrap_savant.jpg https://downloads.cardforge.org/images/tokens/emblem_daretti_scrap_savant.jpg
+emblem_daretti_scrap_savant_c16.jpg https://downloads.cardforge.org/images/tokens/emblem_daretti_scrap_savant_c16.jpg
+emblem_daretti_scrap_savant_cm2.jpg https://downloads.cardforge.org/images/tokens/emblem_daretti_scrap_savant_cm2.jpg
+emblem_domri_chaos_bringer.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_chaos_bringer.jpg
+emblem_domri_chaos_bringer_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_chaos_bringer_mps.jpg
 emblem_domri_chaos_bringer_mps_rna.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_chaos_bringer_mps_rna.jpg
 emblem_domri_chaos_bringer_rna.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_chaos_bringer_rna.jpg
 emblem_domri_rade.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_rade.jpg
+emblem_domri_rade_mm3.jpg https://downloads.cardforge.org/images/tokens/emblem_domri_rade_mm3.jpg
+emblem_dovin_baan.jpg https://downloads.cardforge.org/images/tokens/emblem_dovin_baan.jpg
+emblem_ellywick_tumblestrum_afr.jpg https://downloads.cardforge.org/images/tokens/emblem_ellywick_tumblestrum_afr.jpg
 emblem_elspeth_knight_errant.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_knight_errant.jpg
+emblem_elspeth_knight_errant_mma.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_knight_errant_mma.jpg
+emblem_elspeth_knight_errant_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_knight_errant_mps.jpg
 emblem_elspeth_knight_errant_mps_grn.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_knight_errant_mps_grn.jpg
 emblem_elspeth_suns_champion.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_suns_champion.jpg
+emblem_elspeth_suns_champion_ths.jpg https://downloads.cardforge.org/images/tokens/emblem_elspeth_suns_champion_ths.jpg
+emblem_garruk_apex_predator.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_apex_predator.jpg
+emblem_garruk_apex_predator_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_apex_predator_mps.jpg
 emblem_garruk_apex_predator_mps_war.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_apex_predator_mps_war.jpg
 emblem_garruk_caller_of_beasts.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_caller_of_beasts.jpg
-emblem_garruk_cursed_huntsman_eld.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_cursed_huntsman_eld.jpg
+emblem_garruk_cursed_hunstman.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_cursed_hunstman.jpg
+emblem_garruk_cursed_huntsman.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_cursed_huntsman.jpg
+emblem_garruk_unleashed.jpg https://downloads.cardforge.org/images/tokens/emblem_garruk_unleashed.jpg
 emblem_gideon_ally_of_zendikar.jpg https://downloads.cardforge.org/images/tokens/emblem_gideon_ally_of_zendikar.jpg
+emblem_gideon_of_the_trials.jpg https://downloads.cardforge.org/images/tokens/emblem_gideon_of_the_trials.jpg
 emblem_huatli_radiant_champion.jpg https://downloads.cardforge.org/images/tokens/emblem_huatli_radiant_champion.jpg
+emblem_jace_telepath_unbound.jpg https://downloads.cardforge.org/images/tokens/emblem_jace_telepath_unbound.jpg
 emblem_jace_unraveler_of_secrets.jpg https://downloads.cardforge.org/images/tokens/emblem_jace_unraveler_of_secrets.jpg
 emblem_jaya_ballard.jpg https://downloads.cardforge.org/images/tokens/emblem_jaya_ballard.jpg
+emblem_jaya_ballard_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_jaya_ballard_mps.jpg
 emblem_jaya_ballard_mps_rna.jpg https://downloads.cardforge.org/images/tokens/emblem_jaya_ballard_mps_rna.jpg
+emblem_kaito_shizuki_neo.jpg https://downloads.cardforge.org/images/tokens/emblem_kaito_shizuki_neo.jpg
 emblem_kaya_the_inexorable.jpg https://downloads.cardforge.org/images/tokens/emblem_kaya_the_inexorable.jpg
 emblem_kiora_master_of_the_depths.jpg https://downloads.cardforge.org/images/tokens/emblem_kiora_master_of_the_depths.jpg
 emblem_kiora_the_crashing_wave.jpg https://downloads.cardforge.org/images/tokens/emblem_kiora_the_crashing_wave.jpg
 emblem_koth_of_the_hammer.jpg https://downloads.cardforge.org/images/tokens/emblem_koth_of_the_hammer.jpg
+emblem_liliana_defiant_necromancer.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_defiant_necromancer.jpg
 emblem_liliana_of_the_dark_realms.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_of_the_dark_realms.jpg
+emblem_liliana_of_the_dark_realms_m14.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_of_the_dark_realms_m14.jpg
+emblem_liliana_the_last_hope.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_the_last_hope.jpg
+emblem_liliana_the_last_hope_2x2.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_the_last_hope_2x2.jpg
+emblem_liliana_the_last_hope_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_the_last_hope_mps.jpg
 emblem_liliana_the_last_hope_mps_grn.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_the_last_hope_mps_grn.jpg
+emblem_liliana_waker_of_the_dead.jpg https://downloads.cardforge.org/images/tokens/emblem_liliana_waker_of_the_dead.jpg
+emblem_lolth_spider_queen_afr.jpg https://downloads.cardforge.org/images/tokens/emblem_lolth_spider_queen_afr.jpg
+emblem_lukka_wayward_bonder_stx.jpg https://downloads.cardforge.org/images/tokens/emblem_lukka_wayward_bonder_stx.jpg
+emblem_mordenkainen_afr.jpg https://downloads.cardforge.org/images/tokens/emblem_mordenkainen_afr.jpg
 emblem_mu_yanling_sky_dancer.jpg https://downloads.cardforge.org/images/tokens/emblem_mu_yanling_sky_dancer.jpg
-emblem_mu_yanling_sky_dancer_m20.jpg https://downloads.cardforge.org/images/tokens/emblem_mu_yanling_sky_dancer_m20.jpg
 emblem_narset_of_the_ancient_way.jpg https://downloads.cardforge.org/images/tokens/emblem_narset_of_the_ancient_way.jpg
+emblem_narset_transcendent.jpg https://downloads.cardforge.org/images/tokens/emblem_narset_transcendent.jpg
+emblem_nissa_vital_force.jpg https://downloads.cardforge.org/images/tokens/emblem_nissa_vital_force.jpg
 emblem_nissa_who_shakes_the_world.jpg https://downloads.cardforge.org/images/tokens/emblem_nissa_who_shakes_the_world.jpg
+emblem_ob_nixilis_of_the_black_oath.jpg https://downloads.cardforge.org/images/tokens/emblem_ob_nixilis_of_the_black_oath.jpg
 emblem_ob_nixilis_reignited.jpg https://downloads.cardforge.org/images/tokens/emblem_ob_nixilis_reignited.jpg
+emblem_ob_nixilis_reignited_c19.jpg https://downloads.cardforge.org/images/tokens/emblem_ob_nixilis_reignited_c19.jpg
+emblem_ral_izzet_viceroy.jpg https://downloads.cardforge.org/images/tokens/emblem_ral_izzet_viceroy.jpg
+emblem_ral_izzet_viceroy_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_ral_izzet_viceroy_mps.jpg
 emblem_ral_izzet_viceroy_mps_grn.jpg https://downloads.cardforge.org/images/tokens/emblem_ral_izzet_viceroy_mps_grn.jpg
-emblem_serra_mh1.jpg https://downloads.cardforge.org/images/tokens/emblem_serra_mh1.jpg
+emblem_rowan_kenrith.jpg https://downloads.cardforge.org/images/tokens/emblem_rowan_kenrith.jpg
+emblem_rowan_kenrith_clb.jpg https://downloads.cardforge.org/images/tokens/emblem_rowan_kenrith_clb.jpg
+emblem_rowan_scholar_of_sparks_stx.jpg https://downloads.cardforge.org/images/tokens/emblem_rowan_scholar_of_sparks_stx.jpg
+emblem_sarkhan_the_dragonspeaker.jpg https://downloads.cardforge.org/images/tokens/emblem_sarkhan_the_dragonspeaker.jpg
+emblem_serra_the_benevolent.jpg https://downloads.cardforge.org/images/tokens/emblem_serra_the_benevolent.jpg
 emblem_sorin_lord_of_innistrad.jpg https://downloads.cardforge.org/images/tokens/emblem_sorin_lord_of_innistrad.jpg
+emblem_sorin_solemn_visitor.jpg https://downloads.cardforge.org/images/tokens/emblem_sorin_solemn_visitor.jpg
+emblem_tamiyo_field_researcher.jpg https://downloads.cardforge.org/images/tokens/emblem_tamiyo_field_researcher.jpg
 emblem_tamiyo_the_moon_sage.jpg https://downloads.cardforge.org/images/tokens/emblem_tamiyo_the_moon_sage.jpg
+emblem_tamiyo_the_moon_sage_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_tamiyo_the_moon_sage_mps.jpg
 emblem_tamiyo_the_moon_sage_mps_rna.jpg https://downloads.cardforge.org/images/tokens/emblem_tamiyo_the_moon_sage_mps_rna.jpg
 emblem_teferi_hero_of_dominaria.jpg https://downloads.cardforge.org/images/tokens/emblem_teferi_hero_of_dominaria.jpg
+emblem_teferi_hero_of_dominaria_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_teferi_hero_of_dominaria_mps.jpg
 emblem_teferi_hero_of_dominaria_mps_grn.jpg https://downloads.cardforge.org/images/tokens/emblem_teferi_hero_of_dominaria_mps_grn.jpg
+emblem_teferi_temporal_archmage.jpg https://downloads.cardforge.org/images/tokens/emblem_teferi_temporal_archmage.jpg
+emblem_teferi_who_slows_the_sunset_mid.jpg https://downloads.cardforge.org/images/tokens/emblem_teferi_who_slows_the_sunset_mid.jpg
 emblem_tezzeret_artifice_master.jpg https://downloads.cardforge.org/images/tokens/emblem_tezzeret_artifice_master.jpg
-emblem_tibalt_cosmic_impostor.jpg https://downloads.cardforge.org/images/tokens/emblem_tibalt_cosmic_impostor.jpg
+emblem_tezzeret_betrayer_of_flesh_neo.jpg https://downloads.cardforge.org/images/tokens/emblem_tezzeret_betrayer_of_flesh_neo.jpg
+emblem_tezzeret_the_schemer.jpg https://downloads.cardforge.org/images/tokens/emblem_tezzeret_the_schemer.jpg
+emblem_tibalt_cosmic_imposter.jpg https://downloads.cardforge.org/images/tokens/emblem_tibalt_cosmic_imposter.jpg
 emblem_tyvar_kell.jpg https://downloads.cardforge.org/images/tokens/emblem_tyvar_kell.jpg
 emblem_venser_the_sojourner.jpg https://downloads.cardforge.org/images/tokens/emblem_venser_the_sojourner.jpg
 emblem_vivien_reid.jpg https://downloads.cardforge.org/images/tokens/emblem_vivien_reid.jpg
+emblem_vraska_golgari_queen.jpg https://downloads.cardforge.org/images/tokens/emblem_vraska_golgari_queen.jpg
+emblem_vraska_golgari_queen_mps.jpg https://downloads.cardforge.org/images/tokens/emblem_vraska_golgari_queen_mps.jpg
 emblem_vraska_golgari_queen_mps_grn.jpg https://downloads.cardforge.org/images/tokens/emblem_vraska_golgari_queen_mps_grn.jpg
-emblem_wrenn_mh1.jpg https://downloads.cardforge.org/images/tokens/emblem_wrenn_mh1.jpg
+emblem_will_kenrith.jpg https://downloads.cardforge.org/images/tokens/emblem_will_kenrith.jpg
+emblem_will_kenrith_clb.jpg https://downloads.cardforge.org/images/tokens/emblem_will_kenrith_clb.jpg
+emblem_wrenn_and_seven_mid.jpg https://downloads.cardforge.org/images/tokens/emblem_wrenn_and_seven_mid.jpg
+emblem_wrenn_and_six.jpg https://downloads.cardforge.org/images/tokens/emblem_wrenn_and_six.jpg
+emblem_wrenn_and_six_2x2.jpg https://downloads.cardforge.org/images/tokens/emblem_wrenn_and_six_2x2.jpg
+emblem_zariel_archduke_of_avernus_afr.jpg https://downloads.cardforge.org/images/tokens/emblem_zariel_archduke_of_avernus_afr.jpg
 
-# Others
-adventure.jpg https://downloads.cardforge.org/images/tokens/adventure.jpg
-citys_blessing.jpg https://downloads.cardforge.org/images/tokens/citys_blessing.jpg
-companion.jpg https://downloads.cardforge.org/images/tokens/companion.jpg
-copy.jpg https://downloads.cardforge.org/images/tokens/copy.jpg
+#Others
+blessing.jpg https://downloads.cardforge.org/images/tokens/blessing.jpg
 copy_2xm.jpg https://downloads.cardforge.org/images/tokens/copy_2xm.jpg
-copy_drk.jpg https://downloads.cardforge.org/images/tokens/copy_drk.jpg
-copy_tmp.jpg https://downloads.cardforge.org/images/tokens/copy_tmp.jpg
+copy_voc.jpg https://downloads.cardforge.org/images/tokens/copy_voc.jpg
+copy_vow.jpg https://downloads.cardforge.org/images/tokens/copy_vow.jpg
 copy_znr.jpg https://downloads.cardforge.org/images/tokens/copy_znr.jpg
+day_mid.jpg https://downloads.cardforge.org/images/tokens/day_mid.jpg
 foretell.jpg https://downloads.cardforge.org/images/tokens/foretell.jpg
 foretell_khm.jpg https://downloads.cardforge.org/images/tokens/foretell_khm.jpg
 hidden.jpg https://downloads.cardforge.org/images/tokens/hidden.jpg
+initiative.jpg https://downloads.cardforge.org/images/tokens/initiative.jpg
 manifest.jpg https://downloads.cardforge.org/images/tokens/manifest.jpg
+manifest_ncc.jpg https://downloads.cardforge.org/images/tokens/manifest_ncc.jpg
 monarch.jpg https://downloads.cardforge.org/images/tokens/monarch.jpg
+monarch_afc.jpg https://downloads.cardforge.org/images/tokens/monarch_afc.jpg
 monarch_cmr.jpg https://downloads.cardforge.org/images/tokens/monarch_cmr.jpg
-monarch_cn2.jpg https://downloads.cardforge.org/images/tokens/monarch_cn2.jpg
 morph.jpg https://downloads.cardforge.org/images/tokens/morph.jpg
+night_mid.jpg https://downloads.cardforge.org/images/tokens/night_mid.jpg
+
+#Pets
+petape_lvl1.jpg https://downloads.cardforge.org/images/tokens/petape_lvl1.jpg
+petape_lvl2.jpg https://downloads.cardforge.org/images/tokens/petape_lvl2.jpg
+petape_lvl3.jpg https://downloads.cardforge.org/images/tokens/petape_lvl3.jpg
+petape_lvl4.jpg https://downloads.cardforge.org/images/tokens/petape_lvl4.jpg
+petbird_lvl1.jpg https://downloads.cardforge.org/images/tokens/petbird_lvl1.jpg
+petbird_lvl2.jpg https://downloads.cardforge.org/images/tokens/petbird_lvl2.jpg
+petbird_lvl3.jpg https://downloads.cardforge.org/images/tokens/petbird_lvl3.jpg
+petbird_lvl4.jpg https://downloads.cardforge.org/images/tokens/petbird_lvl4.jpg
+petbird_lvl4_r1.jpg https://downloads.cardforge.org/images/tokens/petbird_lvl4_r1.jpg
+petcrocodile_lvl1.jpg https://downloads.cardforge.org/images/tokens/petcrocodile_lvl1.jpg
+petcrocodile_lvl2.jpg https://downloads.cardforge.org/images/tokens/petcrocodile_lvl2.jpg
+petcrocodile_lvl3.jpg https://downloads.cardforge.org/images/tokens/petcrocodile_lvl3.jpg
+petcrocodile_lvl4.jpg https://downloads.cardforge.org/images/tokens/petcrocodile_lvl4.jpg
+pethound_lvl1.jpg https://downloads.cardforge.org/images/tokens/pethound_lvl1.jpg
+pethound_lvl2.jpg https://downloads.cardforge.org/images/tokens/pethound_lvl2.jpg
+pethound_lvl3.jpg https://downloads.cardforge.org/images/tokens/pethound_lvl3.jpg
+pethound_lvl4.jpg https://downloads.cardforge.org/images/tokens/pethound_lvl4.jpg
+petwolf_lvl1.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl1.jpg
+petwolf_lvl2.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl2.jpg
+petwolf_lvl2_r1.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl2_r1.jpg
+petwolf_lvl3.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl3.jpg
+petwolf_lvl3_r1.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl3_r1.jpg
+petwolf_lvl4.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl4.jpg
+petwolf_lvl4_r1.jpg https://downloads.cardforge.org/images/tokens/petwolf_lvl4_r1.jpg

From b174178d32437f442e4806b06594bf581b049b25 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 1 Jul 2022 20:39:51 +0800
Subject: [PATCH 124/309] Update token-images.txt

---
 forge-gui/res/lists/token-images.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/lists/token-images.txt b/forge-gui/res/lists/token-images.txt
index 565def55a53..65184ffa11a 100644
--- a/forge-gui/res/lists/token-images.txt
+++ b/forge-gui/res/lists/token-images.txt
@@ -1,3 +1,4 @@
+#Tokens
 ajanis_pridemate.jpg https://downloads.cardforge.org/images/tokens/ajanis_pridemate.jpg
 ajanis_pridemate_m20.jpg https://downloads.cardforge.org/images/tokens/ajanis_pridemate_m20.jpg
 all_2_2_citizen.jpg https://downloads.cardforge.org/images/tokens/all_2_2_citizen.jpg

From 75ba4665d683b8852d6302517d2d7b16fe396411 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 1 Jul 2022 20:47:09 +0800
Subject: [PATCH 125/309] Update token-images.txt

---
 forge-gui/res/lists/token-images.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/lists/token-images.txt b/forge-gui/res/lists/token-images.txt
index 65184ffa11a..5f8921abfd1 100644
--- a/forge-gui/res/lists/token-images.txt
+++ b/forge-gui/res/lists/token-images.txt
@@ -1901,7 +1901,7 @@ embalm_heart-piercer_manticore_akh.jpg https://downloads.cardforge.org/images/to
 embalm_heart-piercer_manticore_c19.jpg https://downloads.cardforge.org/images/tokens/embalm_heart-piercer_manticore_c19.jpg
 embalm_honored_hydra_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_honored_hydra_akh.jpg
 embalm_labyrinth_guardian_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_labyrinth_guardian_akh.jpg
-embalm_oketra's_attendant_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_oketra's_attendant_akh.jpg
+embalm_oketra's_attendant_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_oketra%27s_attendant_akh.jpg
 embalm_sacred_cat_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_sacred_cat_akh.jpg
 embalm_tah-crop_skirmisher_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_tah-crop_skirmisher_akh.jpg
 embalm_temmet,_vizier_of_naktamun_akh.jpg https://downloads.cardforge.org/images/tokens/embalm_temmet,_vizier_of_naktamun_akh.jpg

From b994e362975357ce000d3e91d0fc49b060723181 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:12:33 +0100
Subject: [PATCH 126/309] Update Secret Lair Drop Series.txt

---
 forge-gui/res/editions/Secret Lair Drop Series.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/editions/Secret Lair Drop Series.txt b/forge-gui/res/editions/Secret Lair Drop Series.txt
index bc449b84f16..00f51473af8 100644
--- a/forge-gui/res/editions/Secret Lair Drop Series.txt	
+++ b/forge-gui/res/editions/Secret Lair Drop Series.txt	
@@ -372,6 +372,7 @@ ScryfallCode=SLD
 387 R Mountain @Jeanne D'Angelo
 388 R Forest @Jeanne D'Angelo
 389 R Mountain @Jeanne D'Angelo
+390 R Plains @Jeanne D'Angelo
 396 M Tamiyo, the Moon Sage @Uta Natsume
 397 M Ajani, Mentor of Heroes @Uta Natsume
 398 M Angrath, the Flame-Chained @Uta Natsume

From f7ec3bc5b50b2c4f7924254ce869aa8d0cc571d4 Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Sun, 3 Jul 2022 00:12:37 -0500
Subject: [PATCH 127/309] 5 more from Squee (#1015)

* 5 more from Squee

-closes #885
-closes #692
-closes #481
-closes #694
-closes #402

* Delete Mold Folk.txt

* Update kenku_artificer.txt

* edited

* readded

* Update wrathful_red_dragon.txt

* Update kenku_artificer.txt

* Update venture_forth.txt

* Update wrathful_red_dragon.txt

* Update wrathful_red_dragon.txt

* Update kenku_artificer.txt

* Update mold_folk.txt

* Update robe_of_the_archmagi.txt

* Update wrathful_red_dragon.txt
---
 forge-gui/res/cardsfolder/upcoming/kenku_artificer.txt | 10 ++++++++++
 forge-gui/res/cardsfolder/upcoming/mold_folk.txt       | 10 ++++++++++
 .../res/cardsfolder/upcoming/robe_of_the_archmagi.txt  | 10 ++++++++++
 forge-gui/res/cardsfolder/upcoming/venture_forth.txt   |  7 +++++++
 .../res/cardsfolder/upcoming/wrathful_red_dragon.txt   | 10 ++++++++++
 5 files changed, 47 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/kenku_artificer.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/mold_folk.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/robe_of_the_archmagi.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/venture_forth.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/wrathful_red_dragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/kenku_artificer.txt b/forge-gui/res/cardsfolder/upcoming/kenku_artificer.txt
new file mode 100644
index 00000000000..fbc6977cb62
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/kenku_artificer.txt
@@ -0,0 +1,10 @@
+Name:Kenku Artificer
+ManaCost:2 G
+Types:Creature Bird Artificer
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Homunculus Servant — When CARDNAME enters the battlefield, put three +1/+1 counters on up to one target noncreature artifact. That artifact becomes a 0/0 Homunculus artifact creature with flying.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Artifact.nonCreature+YouCtrl | TgtPrompt$ Select up to one noncreature artifact | CounterType$ P1P1 | CounterNum$ 3 | MinTarget$ 0 | MaxTarget$ 1 | SubAbility$ TrigAnimate
+SVar:TrigAnimate:DB$ Animate | Defined$ Targeted | Keywords$ Flying | Power$ 0 | Toughness$ 0 | Types$ Artifact,Creature,Homunculus | RemoveCreatureTypes$ True | Duration$ Permanent
+DeckHas:Ability$Counters & Type$Homunculus
+DeckNeeds:Type$Artifact
+Oracle:Homunculus Servant — When Kenku Artificer enters the battlefield, put three +1/+1 counters on up to one target noncreature artifact. That artifact becomes a 0/0 Homunculus artifact creature with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/mold_folk.txt b/forge-gui/res/cardsfolder/upcoming/mold_folk.txt
new file mode 100644
index 00000000000..b99c76cfa8f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mold_folk.txt
@@ -0,0 +1,10 @@
+Name:Mold Folk
+ManaCost:1 B
+Types:Creature Fungus Warrior
+PT:1/1
+K:Lifelink
+A:AB$ PutCounter | Cost$ 1 Sac<1/Creature.Other;Artifact/another creature or an artifact> | CounterType$ P1P1 | CounterNum$ 1 | PrecostDesc$ Mold Harvest — | SpellDescription$ Mold Harvest — {1}, Sacrifice another creature or an artifact: Put a +1/+1 counter on CARDNAME.
+SVar:AIPreference:SacCost$Artifact.Token,Creature.Other+cmcLE2,Artifact.cmcEQ1
+DeckHints:Type$Artifact
+DeckHas:Ability$Counters|Sacrifice
+Oracle:Lifelink\nMold Harvest — {1}, Sacrifice another creature or an artifact: Put a +1/+1 counter on Mold Folk.
diff --git a/forge-gui/res/cardsfolder/upcoming/robe_of_the_archmagi.txt b/forge-gui/res/cardsfolder/upcoming/robe_of_the_archmagi.txt
new file mode 100644
index 00000000000..49b03ea2002
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/robe_of_the_archmagi.txt
@@ -0,0 +1,10 @@
+Name:Robe of the Archmagi
+ManaCost:2 U
+Types:Artifact Equipment
+K:Equip:1:Creature.YouCtrl+Shaman,Creature.YouCtrl+Warlock,Creature.YouCtrl+Wizard:Shaman, Warlock, or Wizard
+K:Equip:4
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature deals combat damage to a player, draw that many cards.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
+SVar:X:TriggerCount$DamageAmount
+DeckHints:Type$Shaman|Warlock|Wizard
+Oracle:Whenever equipped creature deals combat damage to a player, draw that many cards.\nEquip {4}\nEquip Shaman, Warlock, or Wizard {1}
diff --git a/forge-gui/res/cardsfolder/upcoming/venture_forth.txt b/forge-gui/res/cardsfolder/upcoming/venture_forth.txt
new file mode 100644
index 00000000000..d2eaab74e11
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/venture_forth.txt
@@ -0,0 +1,7 @@
+Name:Venture Forth
+ManaCost:3 G
+Types:Sorcery
+K:Suspend:3:1 G
+A:SP$ DigUntil | Defined$ You | Valid$ Permanent.Land | ValidDescription$ land | FoundDestination$ Battlefield | RevealedDestination$ Exile | SubAbility$ DBChange | SpellDescription$ Exile cards from the top of your library until you exile a land card. Put that card onto the battlefield and the rest on the bottom of your library in a random order. 
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | WithCountersType$ TIME | WithCountersAmount$ 3 | SpellDescription$ Exile CARDNAME with three time counters on it.
+Oracle:Exile cards from the top of your library until you exile a land card. Put that card onto the battlefield and the rest on the bottom of your library in a random order. Exile Venture Forth with three time counters on it.\nSuspend 3—{1}{G} (Rather than cast this card from your hand, you may pay {1}{G} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/upcoming/wrathful_red_dragon.txt b/forge-gui/res/cardsfolder/upcoming/wrathful_red_dragon.txt
new file mode 100644
index 00000000000..0afd0926c7d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/wrathful_red_dragon.txt
@@ -0,0 +1,10 @@
+Name:Wrathful Red Dragon
+ManaCost:3 R R
+Types:Creature Dragon
+PT:5/5
+K:Flying
+T:Mode$ DamageDone | Execute$ TrigDamage | ValidTarget$ Dragon+YouCtrl | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Dragon you control is dealt damage, it deals that much damage to any target that isn't a Dragon.
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Creature.nonDragon,Player,Planeswalker.nonDragon | TgtPrompt$ Select any target that isn't a Dragon
+SVar:X:TriggerCount$DamageAmount
+DeckHints:Type$Dragon
+Oracle:Flying\nWhenever a Dragon you control is dealt damage, it deals that much damage to any target that isn't a Dragon.

From 0a5610b029d7245f08c18a0dabc9dd3ab7cd9474 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 09:41:49 +0100
Subject: [PATCH 128/309] Create flaming_fist_officer.txt

---
 .../res/cardsfolder/upcoming/flaming_fist_officer.txt      | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt b/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt
new file mode 100644
index 00000000000..8722b5d0db1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt
@@ -0,0 +1,7 @@
+Name:Flaming Fist Officer
+ManaCost:2 W
+Types:Creature Gnome Soldier
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control leaves the battlefield, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+Oracle:Whenever another creature you control leaves the battlefield, put a +1/+1 counter on Flaming Fist Officer.

From c18c44f580a086d35758cf1fbaf70a23784d04eb Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 09:43:51 +0100
Subject: [PATCH 129/309] Create vogar_necropolis_tyrant.txt

---
 .../cardsfolder/upcoming/vogar_necropolis_tyrant.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt
new file mode 100644
index 00000000000..868801df1b7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt
@@ -0,0 +1,12 @@
+Name:Vogar, Necropolis Tyrant
+ManaCost:3 B B
+Types:Legendary Creature Zombie Giant
+PT:4/4
+K:Menace
+T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | PlayerTurn$ True | TriggerDescription$ Whenever another creature you control dies during your turn, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When Vogar dies, draw a card for each +1+1 counter on it.
+SVar:TrigDraw:DB$ Draw | NumCards$ XLKI
+SVar:XLKI:TriggeredCard$CardCounters.P1P1 
+DeckHas:Ability$Counters
+Oracle:Menace\nWhenever another creature you control dies during your turn, put a +1/+1 counter on Vogar Necropolis Tyrant.\nWhen Vogar dies, draw a card for each +1+1 counter on it.

From cea0e73c2b62abbd68cb4e191a6467138b9f1445 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 09:44:27 +0100
Subject: [PATCH 130/309] Create zamriel_seraph_of_steel.txt

---
 .../res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt  | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
new file mode 100644
index 00000000000..8450281fb7d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
@@ -0,0 +1,8 @@
+Name:Zamriel, Seraph of Steel
+ManaCost:2 W W
+Types:Legendary Creature Angel
+K:Flying
+PT:3/4
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, creatures your control have indestructible.
+DeckHints:Type$Artifact|Equipment
+Oracle:Flying.\nAs long as it's your turn, equipped creatures you control have indestructible.

From b1c6e00ec592e5d0a6396d0d4b5dd48aea523922 Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Sun, 3 Jul 2022 10:36:07 +0100
Subject: [PATCH 131/309] HBG Rebalancd cards (#1018)

---
 .../rebalanced/a-baba_lysaga_night_witch.txt    | 11 +++++++++++
 .../rebalanced/a-earthquake_dragon.txt          | 13 +++++++++++++
 .../rebalanced/a-minsc_boo_timeless_heroes.txt  | 17 +++++++++++++++++
 .../a-monster_manual_zoological_study.txt       | 17 +++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-baba_lysaga_night_witch.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-minsc_boo_timeless_heroes.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-monster_manual_zoological_study.txt

diff --git a/forge-gui/res/cardsfolder/rebalanced/a-baba_lysaga_night_witch.txt b/forge-gui/res/cardsfolder/rebalanced/a-baba_lysaga_night_witch.txt
new file mode 100644
index 00000000000..7619468e127
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-baba_lysaga_night_witch.txt
@@ -0,0 +1,11 @@
+Name:A-Baba Lysaga, Night Witch
+ManaCost:2 B G
+Types:Legendary Creature Human Warlock
+PT:4/4
+A:AB$ LoseLife | Cost$ T Sac<X/Permanent> | Defined$ Player.Opponent | LifeAmount$ 3 | AnnounceType$ ChooseNumber | Min$ 0 | Max$ 3 | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3 | NumCards$ 3 | SubAbility$DBGainThree | SpellDescription$ If there were three or more card types among the sacrificed permanents, each opponent loses 3 life, you gain 3 life, and you draw three cards.
+SVar:DBGainThree:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDrawThree | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3
+SVar:DBDrawThree:DB$ Draw | NumCards$ 3 | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE3
+SVar:X:Count$ChosenNumber
+SVar:Y:Count$CardTypes.Sacrificed
+DeckHas:Ability$Sacrifice
+Oracle:{T}, Sacrifice up to three permanents: If there were three or more card types among the sacrificed permanents, each opponent loses 3 life, you gain 3 life, and you draw three cards.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt b/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
new file mode 100644
index 00000000000..6c09f1916a2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-earthquake_dragon.txt
@@ -0,0 +1,13 @@
+Name:A-Earthquake Dragon
+ManaCost:14 G
+Types:Creature Elemental Dragon
+PT:10/10
+K:Flying
+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 mana value of Dragons you control not named CARDNAME.
+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
+DeckHints:Type$Dragon
+SVar:X:Count$Valid Creature.Dragon+notnamedEarthquake Dragon+notnamedA-Earthquake Dragon+YouCtrl$SumCMC
+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-minsc_boo_timeless_heroes.txt b/forge-gui/res/cardsfolder/rebalanced/a-minsc_boo_timeless_heroes.txt
new file mode 100644
index 00000000000..0bc0eb270d1
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-minsc_boo_timeless_heroes.txt
@@ -0,0 +1,17 @@
+Name:A-Minsc & Boo, Timeless Heroes
+ManaCost:3 R G
+Types:Legendary Planeswalker Minsc
+Loyalty: 3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | IsPresent$ Creature.YouCtrl+namedBoo | PresentCompare$ EQ0 | TriggerDescription$ When CARDNAME enters the battlefield and at the beginning of your upkeep, if you don't control a creature named Boo, create Boo, a legendary 1/1 red Hamster creature token with trample and haste.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | Secondary$ True | IsPresent$ Creature.YouCtrl+namedBoo | PresentCompare$ EQ0 | TriggerDescription$ When CARDNAME enters the battlefield and at the beginning of your upkeep, if you don't control a creature named Boo, create Boo, a legendary 1/1 red Hamster creature token with trample and haste.
+SVar:TrigToken:DB$ Token | TokenScript$ boo
+A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.withTrample,Creature.withHaste | TgtPrompt$ Select target creature with trample or haste | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 3 | SpellDescription$ Put three +1/+1 counters on up to one target creature with trample or haste.
+A:AB$ Sacrifice | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger | SpellDescription$ Sacrifice a creature. When you do, CARDNAME deals X damage to any target, where X is that creature's power. If the sacrificed creature was a Hamster, draw X cards.
+SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigDamage | ConditionDefined$ RememberedLKI | ConditionPresent$ Creature | RememberObjects$ RememberedLKI | TriggerDescription$ When you do, CARDNAME deals X damage to any target, where X is that creature's power. If the sacrificed creature was a Hamster, draw X cards.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | ConditionDefined$ DelayTriggerRememberedLKI | ConditionPresent$ Hamster | NumCards$ X
+SVar:X:TriggerRemembered$CardPower
+K:CARDNAME can be your commander.
+DeckHas:Ability$Sacrifice|Counters|Token
+DeckHints:Keyword$Trample|Haste
+Oracle:When Minsc & Boo, Timeless Heroes enters the battlefield and at the beginning of your upkeep, if you don't control a creature named Boo, create Boo, a legendary 1/1 red Hamster creature token with trample and haste.\n[+1]: Put three +1/+1 counters on up to one target creature with trample or haste.\n[−2]: Sacrifice a creature. When you do, Minsc & Boo, Timeless Heroes deals X damage to any target, where X is that creature's power. If the sacrificed creature was a Hamster, draw X cards.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-monster_manual_zoological_study.txt b/forge-gui/res/cardsfolder/rebalanced/a-monster_manual_zoological_study.txt
new file mode 100644
index 00000000000..a26c7cbe48a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-monster_manual_zoological_study.txt
@@ -0,0 +1,17 @@
+Name:A-Monster Manual
+ManaCost:3 G
+Types:Artifact
+A:AB$ ChangeZone | Cost$ 1 G T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1 | SorcerySpeed$ True | SpellDescription$ You may put a creature card from your hand onto the battlefield. Activate only as a sorcery.
+AlternateMode:Adventure
+Oracle:{1}{G}, {T}: You may put a creature card from your hand onto the battlefield. Activate only as a sorcery.
+
+ALTERNATE
+
+Name:A-Zoological Study
+ManaCost:2 G
+Types:Sorcery Adventure
+A:SP$ Mill | NumCards$ 5 | RememberMilled$ True | SubAbility$ DBChangeZone | SpellDescription$ Mill five cards, then return a creature card milled this way to your hand.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.IsRemembered | ChangeTypeDesc$ creature cards milled this way | ChangeNum$ 1 | SelectPrompt$ Choose a creature card milled this way | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Mill|Graveyard
+Oracle:Mill five cards, then return a creature card milled this way to your hand.

From e1fce28cfed5c4a6f07c3059524ea1c2b31bf040 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 12:50:52 +0100
Subject: [PATCH 132/309] Update vogar_necropolis_tyrant.txt

---
 forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt b/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt
index 868801df1b7..4501e7231a8 100644
--- a/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt
+++ b/forge-gui/res/cardsfolder/upcoming/vogar_necropolis_tyrant.txt
@@ -5,7 +5,7 @@ PT:4/4
 K:Menace
 T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigPutCounter | PlayerTurn$ True | TriggerDescription$ Whenever another creature you control dies during your turn, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When Vogar dies, draw a card for each +1+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When NICKNAME dies, draw a card for each +1+1 counter on it.
 SVar:TrigDraw:DB$ Draw | NumCards$ XLKI
 SVar:XLKI:TriggeredCard$CardCounters.P1P1 
 DeckHas:Ability$Counters

From 4c2814c191734a3b31baf8454d2eed70e5844bf2 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 12:51:28 +0100
Subject: [PATCH 133/309] Update zamriel_seraph_of_steel.txt

---
 forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
index 8450281fb7d..ba2623d3fb7 100644
--- a/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
@@ -3,6 +3,6 @@ ManaCost:2 W W
 Types:Legendary Creature Angel
 K:Flying
 PT:3/4
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, creatures your control have indestructible.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creatures your control have indestructible.
 DeckHints:Type$Artifact|Equipment
 Oracle:Flying.\nAs long as it's your turn, equipped creatures you control have indestructible.

From 9126287814f2bc248d243d6e23e1993a27bb25b7 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 23:24:24 +0100
Subject: [PATCH 134/309] Update flaming_fist_officer.txt

---
 forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt b/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt
index 8722b5d0db1..efd9f3154f4 100644
--- a/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/flaming_fist_officer.txt
@@ -4,4 +4,5 @@ Types:Creature Gnome Soldier
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control leaves the battlefield, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 Oracle:Whenever another creature you control leaves the battlefield, put a +1/+1 counter on Flaming Fist Officer.

From 878fb42c529631effd86081e12ec786ab4b03e7c Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sun, 3 Jul 2022 23:25:10 +0100
Subject: [PATCH 135/309] Update zamriel_seraph_of_steel.txt

---
 .../res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
index ba2623d3fb7..438dc5e0b95 100644
--- a/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zamriel_seraph_of_steel.txt
@@ -3,6 +3,6 @@ ManaCost:2 W W
 Types:Legendary Creature Angel
 K:Flying
 PT:3/4
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creatures your control have indestructible.
-DeckHints:Type$Artifact|Equipment
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+equipped | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ As long as it's your turn, equipped creatures you control have indestructible.
+DeckHints:Type$Equipment
 Oracle:Flying.\nAs long as it's your turn, equipped creatures you control have indestructible.

From ace7f5adb72972554f2993aaa1bb8466bc16b757 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 3 Jul 2022 20:15:26 -0400
Subject: [PATCH 136/309] mold_folk.txt fix desc

---
 forge-gui/res/cardsfolder/upcoming/mold_folk.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/mold_folk.txt b/forge-gui/res/cardsfolder/upcoming/mold_folk.txt
index b99c76cfa8f..59142327b13 100644
--- a/forge-gui/res/cardsfolder/upcoming/mold_folk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mold_folk.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Fungus Warrior
 PT:1/1
 K:Lifelink
-A:AB$ PutCounter | Cost$ 1 Sac<1/Creature.Other;Artifact/another creature or an artifact> | CounterType$ P1P1 | CounterNum$ 1 | PrecostDesc$ Mold Harvest — | SpellDescription$ Mold Harvest — {1}, Sacrifice another creature or an artifact: Put a +1/+1 counter on CARDNAME.
+A:AB$ PutCounter | Cost$ 1 Sac<1/Creature.Other;Artifact/another creature or an artifact> | CounterType$ P1P1 | CounterNum$ 1 | PrecostDesc$ Mold Harvest — | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 SVar:AIPreference:SacCost$Artifact.Token,Creature.Other+cmcLE2,Artifact.cmcEQ1
 DeckHints:Type$Artifact
 DeckHas:Ability$Counters|Sacrifice

From e86904c62cec4f7ec518b36e1541e98019c3e54c Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 3 Jul 2022 20:20:27 -0400
Subject: [PATCH 137/309] shadowheart_dark_justiciar.txt

---
 .../cardsfolder/upcoming/shadowheart_dark_justiciar.txt  | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt b/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt
new file mode 100644
index 00000000000..bd7729a1270
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt
@@ -0,0 +1,9 @@
+Name:Shadowheart, Dark Justiciar
+ManaCost:3 B
+Types:Legendary Creature Human Elf Cleric
+PT:3/4
+A:AB$ Draw | Cost$ 1 B T Sac<1/Creature.Other/another creature> | RememberCostCards$ True | NumCards$ X | IfDesc$ True | SpellDescription$ Draw X cards, where X is that creature's power.
+SVar:X:RememberedLKI$CardPower
+K:Choose a Background
+DeckHas:Ability$Sacrifice
+Oracle:{1}{B}, {T}, Sacrifice another creature: Draw X cards, where X is that creature's power.\nChoose a Background (You can have a Background as a second commander.)

From 80000dc5ba357c3451e4101ebe26bbc1c9a7f613 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 3 Jul 2022 20:20:33 -0400
Subject: [PATCH 138/309] sivriss_nightmare_speaker.txt

---
 .../upcoming/sivriss_nightmare_speaker.txt          | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sivriss_nightmare_speaker.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/sivriss_nightmare_speaker.txt b/forge-gui/res/cardsfolder/upcoming/sivriss_nightmare_speaker.txt
new file mode 100644
index 00000000000..95310bce4c5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sivriss_nightmare_speaker.txt
@@ -0,0 +1,13 @@
+Name:Sivriss, Nightmare Speaker
+ManaCost:3 B
+Types:Legendary Creature Snake Cleric Warlock
+PT:3/3
+A:AB$ RepeatEach | Cost$ T Sac<1/Creature.Other;Artifact/another creature or an artifact> | RepeatPlayers$ Opponent | RepeatSubAbility$ DBMill | SpellDescription$ For each opponent, you mill a card, then return that card from your graveyard to your hand unless that player pays 3 life. (To mill a card, put the top card of your library into your graveyard.)
+SVar:DBMill:DB$ Mill | Imprint$ True | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Imprinted | Origin$ Graveyard | Destination$ Hand | UnlessCost$ PayLife<3> | UnlessPayer$ Remembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
+K:Choose a Background
+SVar:AIPreference:SacCost$Artifact.Token,Creature.Other+cmcLE2,Artifact.cmcLE1
+DeckHints:Type$Artifact
+DeckHas:Ability$Sacrifice|Mill|Graveyard
+Oracle:{T}, Sacrifice another creature or an artifact: For each opponent, you mill a card, then return that card from your graveyard to your hand unless that player pays 3 life. (To mill a card, put the top card of your library into your graveyard.)\nChoose a Background (You can have a Background as a second commander.)

From d9a18269d63bae7d7662d973af603b02a39c262d Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sun, 3 Jul 2022 20:20:42 -0400
Subject: [PATCH 139/309] skanos_dragonheart.txt

---
 .../res/cardsfolder/upcoming/skanos_dragonheart.txt  | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/skanos_dragonheart.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/skanos_dragonheart.txt b/forge-gui/res/cardsfolder/upcoming/skanos_dragonheart.txt
new file mode 100644
index 00000000000..1b38d6d9369
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/skanos_dragonheart.txt
@@ -0,0 +1,12 @@
+Name:Skanos Dragonheart
+ManaCost:4 G
+Types:Legendary Creature Dragon Ranger
+PT:4/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+X until end of turn, where X is the greatest power among other Dragons you control and Dragon cards in your graveyard.
+SVar:TrigPump:DB$ Pump | NumAtt$ X | NumDef$ X
+SVar:X:Count$ValidGraveyard,Battlefield Dragon.YouCtrl+Other$GreatestPower
+K:Choose a Background
+SVar:HasAttackEffect:TRUE
+DeckNeeds:Type$Dragon
+DeckHas:Ability$Graveyard|Counters
+Oracle:Whenever Skanos Dragonheart attacks, it gets +X/+X until end of turn, where X is the greatest power among other Dragons you control and Dragon cards in your graveyard.\nChoose a Background (You can have a Background as a second commander.)

From 584c7680391759eddfe4e89a13e559a48258890c Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Mon, 4 Jul 2022 09:14:37 -0400
Subject: [PATCH 140/309] TokenEffect stackDesc improve X parsing (#370)

---
 .../src/main/java/forge/game/ability/effects/TokenEffect.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
index 13c4646e42c..2d3658dc705 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
@@ -64,7 +64,8 @@ public class TokenEffect extends TokenEffectBase {
                     if (numTokens != 0) { //0 probably means calculation isn't ready in time for stack
                         if (numTokens != 1) { //if we are making more than one, substitute the numeral for a/an
                             String numeral = " " + Lang.getNumeral(numTokens) + " ";
-                            String target = " " + words.get(words.indexOf(verb) + 1) + " ";
+                            List<String> words2 = Arrays.asList(desc.split(" "));
+                            String target = " " + words2.get(words2.indexOf(verb) + 1) + " ";
                             desc = desc.replaceFirst(target, numeral);
                         }
                         //try to cut out unneeded description, which would now be confusing

From 3d634b6dac7326263fa4ae31cf53f4df81a8acc0 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Mon, 4 Jul 2022 15:27:44 +0200
Subject: [PATCH 141/309] Global DamageHistory (#622)

* Global DamageHistory

* Add new cards

* Improve Ogre Enforcer

* Clean up

* Minor fixes
---
 .../src/main/java/forge/ai/GameState.java     |   4 +-
 .../java/forge/ai/simulation/GameCopier.java  |   9 ++
 forge-game/src/main/java/forge/game/Game.java |  51 ++++++++-
 .../src/main/java/forge/game/GameAction.java  |  36 ++----
 .../main/java/forge/game/GameActionUtil.java  |   1 -
 .../src/main/java/forge/game/GameEntity.java  |  29 +++++
 .../forge/game/ability/AbilityFactory.java    |   4 +-
 .../java/forge/game/ability/AbilityUtils.java |  46 ++++----
 .../game/ability/effects/CounterEffect.java   |   5 +-
 .../game/ability/effects/PlayEffect.java      |   1 +
 .../src/main/java/forge/game/card/Card.java   | 103 ++++--------------
 .../forge/game/card/CardDamageHistory.java    |  98 +++++++----------
 .../java/forge/game/card/CardProperty.java    |  91 +++++++++-------
 .../main/java/forge/game/card/CardUtil.java   |   3 +-
 .../main/java/forge/game/player/Player.java   |  90 +++------------
 .../forge/game/player/PlayerProperty.java     |  96 +++++++---------
 .../game/spellability/AbilityManaPart.java    |   4 +-
 .../spellability/SpellAbilityRestriction.java |   8 +-
 .../game/trigger/TriggerChangesZone.java      |   2 +-
 .../forge/game/trigger/TriggerDamageDone.java |   2 +-
 .../cardsfolder/a/admiral_beckett_brass.txt   |   2 +-
 .../res/cardsfolder/b/blazing_sunsteel.txt    |   2 +-
 forge-gui/res/cardsfolder/b/blinding_beam.txt |   2 +-
 .../res/cardsfolder/b/bloodcrazed_goblin.txt  |   2 +-
 .../res/cardsfolder/d/discordant_spirit.txt   |   2 +-
 .../res/cardsfolder/g/gales_redirection.txt   |   4 +-
 forge-gui/res/cardsfolder/g/glen_elendra.txt  |   2 +-
 .../cardsfolder/g/grothama_all_devouring.txt  |   2 +-
 .../res/cardsfolder/h/hope_of_ghirapur.txt    |   2 +-
 forge-gui/res/cardsfolder/i/inferno_trap.txt  |   4 +-
 ...umano_faces_kakkazan_etching_of_kumano.txt |   2 +-
 .../res/cardsfolder/k/kumanos_blessing.txt    |   2 +-
 .../res/cardsfolder/l/loxodon_lifechanter.txt |   2 +-
 .../cardsfolder/n/nothing_can_stop_me_now.txt |   2 +-
 .../res/cardsfolder/n/notorious_throng.txt    |   2 +-
 forge-gui/res/cardsfolder/r/runesword.txt     |   2 +-
 forge-gui/res/cardsfolder/s/simulacrum.txt    |   2 +-
 .../res/cardsfolder/s/skarrgan_firebird.txt   |   2 +-
 .../res/cardsfolder/s/skirk_alarmist.txt      |   2 +-
 .../res/cardsfolder/t/touch_of_moonglove.txt  |   2 +-
 .../u/unscythe_killer_of_kings.txt            |   2 +-
 .../cardsfolder/upcoming/dragon_cultist.txt   |   9 ++
 .../cardsfolder/upcoming/gnoll_war_band.txt   |   9 ++
 .../cardsfolder/upcoming/indulge_excess.txt   |  22 ++++
 forge-gui/res/cardsfolder/w/war_elemental.txt |   2 +-
 forge-gui/res/cardsfolder/w/wicked_akuba.txt  |   2 +-
 46 files changed, 359 insertions(+), 414 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/dragon_cultist.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gnoll_war_band.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/indulge_excess.txt

diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index b7336ca66e8..40c0d4127ec 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -206,7 +206,7 @@ public abstract class GameState {
                     cardsReferencedByID.add(card.getExiledWith());
                 }
                 if (zone == ZoneType.Battlefield) {
-                    if (!card.getAttachedCards().isEmpty()) {
+                    if (card.hasCardAttachments()) {
                         // Remember the ID of cards that have attachments
                         cardsReferencedByID.add(card);
                     }
@@ -375,7 +375,7 @@ public abstract class GameState {
                 newText.append("|Imprinting:").append(TextUtil.join(imprintedCardIds, ","));
             }
 
-            if (!c.getMergedCards().isEmpty()) {
+            if (c.hasMergedCard()) {
                 List<String> mergedCardNames = new ArrayList<>();
                 for (Card merged : c.getMergedCards()) {
                     if (c.getTopMergedCard() == merged) {
diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
index 4e4b73fdb58..0ab07f2b306 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
@@ -91,6 +91,7 @@ public class GameCopier {
             newPlayer.setLifeLostLastTurn(origPlayer.getLifeLostLastTurn());
             newPlayer.setLifeLostThisTurn(origPlayer.getLifeLostThisTurn());
             newPlayer.setLifeGainedThisTurn(origPlayer.getLifeGainedThisTurn());
+            // TODO creatureAttackedThisTurn
             for (Mana m : origPlayer.getManaPool()) {
                 newPlayer.getManaPool().addMana(m, false);
             }
@@ -207,6 +208,13 @@ public class GameCopier {
 
     private void copyGameState(Game newGame) {
         newGame.setAge(origGame.getAge());
+
+        // TODO countersAddedThisTurn
+
+        if (origGame.getMonarch() != null) {
+            newGame.setMonarch(playerMap.get(origGame.getMonarch()));
+        }
+
         for (ZoneType zone : ZONES) {
             for (Card card : origGame.getCardsIn(zone)) {
                 addCard(newGame, zone, card);
@@ -300,6 +308,7 @@ public class GameCopier {
             newCard.setPTCharacterDefiningTable(c.getSetPTCharacterDefiningTable());
 
             newCard.setPTBoost(c.getPTBoostTable());
+            // TODO copy by map
             newCard.setDamage(c.getDamage());
 
             newCard.setChangedCardColors(c.getChangedCardColorsTable());
diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java
index 2c0e6295e0c..a8fda242d85 100644
--- a/forge-game/src/main/java/forge/game/Game.java
+++ b/forge-game/src/main/java/forge/game/Game.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -47,6 +48,7 @@ import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
+import forge.game.card.CardDamageHistory;
 import forge.game.card.CardLists;
 import forge.game.card.CardPredicates;
 import forge.game.card.CardUtil;
@@ -78,6 +80,7 @@ import forge.trackable.Tracker;
 import forge.util.Aggregates;
 import forge.util.MyRandom;
 import forge.util.Visitor;
+import forge.util.collect.FCollection;
 
 /**
  * Represents the state of a <i>single game</i>, a new instance is created for each game.
@@ -119,6 +122,9 @@ public class Game {
 
     private Table<CounterType, Player, List<Pair<Card, Integer>>> countersAddedThisTurn = HashBasedTable.create();
 
+    private FCollection<CardDamageHistory> globalDamageHistory = new FCollection<>();
+    private IdentityHashMap<Pair<Integer, Boolean>, Pair<Card, GameEntity>> damageThisTurnLKI = new IdentityHashMap<>();
+
     private Map<Player, Card> topLibsCast = Maps.newHashMap();
     private Map<Card, Integer>  facedownWhileCasting = Maps.newHashMap();
 
@@ -251,7 +257,7 @@ public class Game {
         if (c == null) {
             return null;
         }
-        return changeZoneLKIInfo.containsKey(c.getId()) ? changeZoneLKIInfo.get(c.getId()) : c;
+        return changeZoneLKIInfo.getOrDefault(c.getId(), c);
     }
     public final void clearChangeZoneLKIInfo() {
         changeZoneLKIInfo.clear();
@@ -1088,6 +1094,7 @@ public class Game {
 
     public void onCleanupPhase() {
         clearCounterAddedThisTurn();
+        clearGlobalDamageHistory();
         // some cards need this info updated even after a player lost, so don't skip them
         for (Player player : getRegisteredPlayers()) {
             player.onCleanupPhase();
@@ -1129,6 +1136,48 @@ public class Game {
         countersAddedThisTurn.clear();
     }
 
+    /**
+     * Gets the damage instances done this turn.
+     * @param isCombat if true only combat damage matters, pass null for both
+     * @param anyIsEnough if true returns early once result has an entry
+     * @param validSourceCard
+     * @param validTargetEntity
+     * @param source
+     * @param sourceController
+     * @param ctb
+     * @return List<Integer> for each source
+     */
+    public List<Integer> getDamageDoneThisTurn(Boolean isCombat, boolean anyIsEnough, String validSourceCard, String validTargetEntity, Card source, Player sourceController, CardTraitBase ctb) {
+        final List<Integer> dmgList = Lists.newArrayList();
+        for (CardDamageHistory cdh : globalDamageHistory) {
+            int dmg = cdh.getDamageDoneThisTurn(isCombat, anyIsEnough, validSourceCard, validTargetEntity, source, sourceController, ctb);
+            if (dmg == 0) {
+                continue;
+            }
+
+            dmgList.add(dmg);
+
+            if (anyIsEnough) {
+                break;
+            }
+        }
+
+        return dmgList;
+    }
+
+    public void addGlobalDamageHistory(CardDamageHistory cdh, Pair<Integer, Boolean> dmg, Card source, GameEntity target) {
+        globalDamageHistory.add(cdh);
+        damageThisTurnLKI.put(dmg, Pair.of(source, target));
+    }
+    public void clearGlobalDamageHistory() {
+        globalDamageHistory.clear();
+        damageThisTurnLKI.clear();
+    }
+
+    public Pair<Card, GameEntity> getDamageLKI(Pair<Integer, Boolean> dmg) {
+        return damageThisTurnLKI.get(dmg);
+    }
+
     public Card getTopLibForPlayer(Player P) {
         return topLibsCast.get(P);
     }
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 3ed875b4cde..d889c460c84 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import forge.util.*;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ComparisonChain;
@@ -1323,33 +1322,13 @@ public class GameAction {
                         noRegCreats.add(c);
                         checkAgain = true;
                     } else if (c.hasKeyword("CARDNAME can't be destroyed by lethal damage unless lethal damage dealt by a single source is marked on it.")) {
-                        // merge entries with same source
-                        List<Integer> dmgList = Lists.newArrayList();
-                        List<Pair<Card, Integer>> remainingDamaged = Lists.newArrayList(c.getReceivedDamageFromThisTurn());
-                        while (!remainingDamaged.isEmpty()) {
-                            Pair <Card, Integer> damaged = remainingDamaged.get(0);
-                            int sum = damaged.getRight();
-                            remainingDamaged.remove(damaged);
-                            for (Pair<Card, Integer> other : Lists.newArrayList(remainingDamaged)) {
-                                if (other.getLeft().equalsWithTimestamp(damaged.getLeft())) {
-                                    sum += other.getRight();
-                                    // once it got counted keep it out
-                                    remainingDamaged.remove(other);
-                                }
-                            }
-                            dmgList.add(sum);
-                        }
-
-                        for (final Integer dmg : dmgList) {
-                            if (c.getLethal() <= dmg.intValue() || c.hasBeenDealtDeathtouchDamage()) {
-                                if (desCreats == null) {
-                                    desCreats = new CardCollection();
-                                }
-                                desCreats.add(c);
-                                c.setHasBeenDealtDeathtouchDamage(false);
-                                checkAgain = true;
-                                break;
+                        if (c.getLethal() <= c.getMaxDamageFromSource() || c.hasBeenDealtDeathtouchDamage()) {
+                            if (desCreats == null) {
+                                desCreats = new CardCollection();
                             }
+                            desCreats.add(c);
+                            c.setHasBeenDealtDeathtouchDamage(false);
+                            checkAgain = true;
                         }
                     }
                     // Rule 704.5g - Destroy due to lethal damage
@@ -2364,6 +2343,7 @@ public class GameAction {
         game.getReplacementHandler().runReplaceDamage(isCombat, damageMap, preventMap, counterTable, cause);
 
         Map<Card, Integer> lethalDamage = Maps.newHashMap();
+        Map<Integer, Card> lkiCache = Maps.newHashMap();
 
         // Actually deal damage according to replaced damage map
         for (Map.Entry<Card, Map<GameEntity, Integer>> et : damageMap.rowMap().entrySet()) {
@@ -2390,6 +2370,8 @@ public class GameAction {
 
                 e.setValue(Integer.valueOf(e.getKey().addDamageAfterPrevention(e.getValue(), sourceLKI, isCombat, counterTable)));
                 sum += e.getValue();
+
+                sourceLKI.getDamageHistory().registerDamage(e.getValue(), isCombat, sourceLKI, e.getKey(), lkiCache);
             }
 
             if (sum > 0 && sourceLKI.hasKeyword(Keyword.LIFELINK)) {
diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index 4711d9fb34f..f7574571163 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -210,7 +210,6 @@ public final class GameActionUtil {
                         final Cost escapeCost = new Cost(k[1], true);
 
                         final SpellAbility newSA = sa.copyWithManaCostReplaced(activator, escapeCost);
-                        newSA.setActivatingPlayer(activator);
 
                         newSA.putParam("PrecostDesc", "Escape—");
                         newSA.putParam("CostDesc", escapeCost.toString());
diff --git a/forge-game/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java
index 531bc6e6ecf..f7ba73ef30b 100644
--- a/forge-game/src/main/java/forge/game/GameEntity.java
+++ b/forge-game/src/main/java/forge/game/GameEntity.java
@@ -17,9 +17,13 @@
  */
 package forge.game;
 
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import forge.game.ability.AbilityUtils;
@@ -46,6 +50,7 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
     private String name = "";
     protected CardCollection attachedCards = new CardCollection();
     protected Map<CounterType, Integer> counters = Maps.newHashMap();
+    protected List<Pair<Integer, Boolean>> damageReceivedThisTurn = Lists.newArrayList();
 
     protected GameEntity(int id0) {
         id = id0;
@@ -330,6 +335,30 @@ public abstract class GameEntity extends GameObject implements IIdentifiable {
         addCounterInternal(CounterType.get(counterType), n, source, fireEvents, table);
     }
 
+    public void receiveDamage(Pair<Integer, Boolean> dmg) {
+        damageReceivedThisTurn.add(dmg);
+    }
+
+    public final int getAssignedDamage() {
+        return getAssignedDamage(null, null);
+    }
+    public final int getAssignedCombatDamage() {
+        return getAssignedDamage(true, null);
+    }
+    public final int getAssignedDamage(Boolean isCombat, final Card source) {
+        int num = 0;
+        for (Pair<Integer, Boolean> dmg : damageReceivedThisTurn) {
+            if (isCombat != null && dmg.getRight() != isCombat) {
+                continue;
+            }
+            if (source != null && !getGame().getDamageLKI(dmg).getLeft().equalsWithTimestamp(source)) {
+                continue;
+            }
+            num += dmg.getLeft();
+        }
+        return num;
+    }
+
     @Override
     public final boolean equals(Object o) {
         if (o == null) { return false; }
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 cfb843b4e3f..a34a1019d38 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
@@ -327,8 +327,8 @@ public final class AbilityFactory {
     }
 
     private static final TargetRestrictions readTarget(Map<String, String> mapParams) {
-        final String min = mapParams.containsKey("TargetMin") ? mapParams.get("TargetMin") : "1";
-        final String max = mapParams.containsKey("TargetMax") ? mapParams.get("TargetMax") : "1";
+        final String min = mapParams.getOrDefault("TargetMin", "1");
+        final String max = mapParams.getOrDefault("TargetMax", "1");
 
         // TgtPrompt should only be needed for more complicated ValidTgts
         String tgtWhat = mapParams.get("ValidTgts");
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 18190a19b1c..79bfd9181f8 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -14,6 +14,7 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableList;
@@ -2030,7 +2031,7 @@ public class AbilityUtils {
             return doXMath(c.getTotalDamageDoneBy(), expr, c, ctb);
         }
         if (sq[0].equals("TotalDamageReceivedThisTurn")) {
-            return doXMath(c.getTotalDamageReceivedThisTurn(), expr, c, ctb);
+            return doXMath(c.getAssignedDamage(), expr, c, ctb);
         }
 
         if (sq[0].contains("CardPower")) {
@@ -2091,13 +2092,6 @@ public class AbilityUtils {
             return doXMath(c.getTimesMutated(), expr, c, ctb);
         }
 
-        if (sq[0].startsWith("DamageDoneByPlayerThisTurn")) {
-            int sum = 0;
-            for (Player p : getDefinedPlayers(c, sq[1], ctb)) {
-                sum += c.getReceivedDamageByPlayerThisTurn(p);
-            }
-            return doXMath(sum, expr, c, ctb);
-        }
         if (sq[0].equals("RegeneratedThisTurn")) {
             return doXMath(c.getRegeneratedThisTurn(), expr, c, ctb);
         }
@@ -2359,20 +2353,28 @@ public class AbilityUtils {
             return doXMath(player.getOpponentsTotalPoisonCounters(), expr, c, ctb);
         }
 
-        if (sq[0].equals("YourDamageThisTurn")) {
-            return doXMath(player.getAssignedDamage(), expr, c, ctb);
-        }
-        if (sq[0].equals("TotalOppDamageThisTurn")) {
-            return doXMath(player.getOpponentsAssignedDamage(), expr, c, ctb);
-        }
         if (sq[0].equals("MaxOppDamageThisTurn")) {
             return doXMath(player.getMaxOpponentAssignedDamage(), expr, c, ctb);
         }
 
-        if (sq[0].startsWith("YourDamageSourcesThisTurn")) {
-            Iterable<Card> allSrc = player.getAssignedDamageSources();
-            String restriction = sq[0].split(" ")[1];
-            return doXMath(CardLists.getValidCardCount(allSrc, restriction, player, c, ctb), expr, c, ctb);
+        if (sq[0].contains("TotalDamageThisTurn")) {
+            String[] props = l[0].split(" ");
+            int sum = 0;
+            for (Pair<Integer, Boolean> p : c.getDamageReceivedThisTurn()) {
+                if (game.getDamageLKI(p).getLeft().isValid(props[1], player, c, ctb)) {
+                    sum += p.getLeft();
+                }
+            }
+            return doXMath(sum, expr, c, ctb);
+        }
+
+        if (sq[0].contains("DamageThisTurn")) {
+            String[] props = l[0].split(" ");
+            Boolean isCombat = null;
+            if (sq[0].contains("CombatDamage")) {
+                isCombat = true;
+            }
+            return doXMath(game.getDamageDoneThisTurn(isCombat, false, props[1], props[2], c, player, ctb).size(), expr, c, ctb);
         }
 
         if (sq[0].equals("YourTurns")) {
@@ -3325,12 +3327,6 @@ public class AbilityUtils {
                 totDmg += p.getAssignedDamage();
             }
             return doXMath(totDmg, m, source, ctb);
-        } else if (sq[0].contains("LifeLostThisTurn")) {
-            int totDmg = 0;
-            for (Player p : players) {
-                totDmg += p.getLifeLostThisTurn();
-            }
-            return doXMath(totDmg, m, source, ctb);
         }
 
         if (players.size() > 0) {
@@ -3387,7 +3383,7 @@ public class AbilityUtils {
 
         if (value.contains("DomainPlayer")) {
             int n = 0;
-            final CardCollectionView someCards = player.getCardsIn(ZoneType.Battlefield);
+            final CardCollectionView someCards = player.getLandsInPlay();
             final List<String> basic = MagicColor.Constant.BASIC_LANDS;
 
             for (int i = 0; i < basic.size(); i++) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
index 4efbf6744cd..c0fe67d0440 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java
@@ -123,6 +123,7 @@ public class CounterEffect extends SpellAbilityEffect {
         for (final SpellAbility tgtSA : sas) {
             final Card tgtSACard = tgtSA.getHostCard();
             // should remember even that spell cannot be countered, e.g. Dovescape
+            // TODO use LKI in case the spell gets countered before (else X amounts would be missing)
             if (sa.hasParam("RememberCounteredCMC")) {
                 sa.getHostCard().addRemembered(Integer.valueOf(tgtSACard.getCMC()));
             }
@@ -152,9 +153,7 @@ public class CounterEffect extends SpellAbilityEffect {
             }
 
             if (sa.hasParam("RememberCountered")) {
-                if (sa.getParam("RememberCountered").equals("True")) {
-                    sa.getHostCard().addRemembered(tgtSACard);
-                }
+                sa.getHostCard().addRemembered(tgtSACard);
             }
 
             if (sa.hasParam("RememberSplicedOntoCounteredSpell")) {
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 e7d280ae7e2..2778b62f446 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
@@ -285,6 +285,7 @@ public class PlayEffect extends SpellAbilityEffect {
                 }
             }
 
+            // TODO if cost isn't replaced should include alternative ones
             // get basic spells (no flashback, etc.)
             List<SpellAbility> sas = AbilityUtils.getBasicSpellsFromPlayEffect(tgtCard, controller);
             if (sa.hasParam("ValidSA")) {
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 7b2390b7a00..801e02076dc 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -180,9 +180,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
     private final Set<Object> rememberedObjects = Sets.newLinkedHashSet();
     private Map<Player, String> flipResult;
 
-    private List<Pair<Card, Integer>> receivedDamageFromThisTurn = Lists.newArrayList();
-    private Map<Player, Integer> receivedDamageFromPlayerThisTurn = Maps.newHashMap();
-
     private final Map<Card, Integer> assignedDamageMap = Maps.newTreeMap();
 
     private boolean isCommander = false;
@@ -257,7 +254,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
 
     private String oracleText = "";
 
-    private int damage;
+    private Map<Integer, Integer> damage = Maps.newHashMap();
     private boolean hasBeenDealtDeathtouchDamage;
 
     // regeneration
@@ -951,7 +948,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         }
         devouredCards.add(c);
     }
-
     public final void clearDevoured() {
         devouredCards = null;
     }
@@ -982,7 +978,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         delvedCards = null;
     }
 
-
     public final CardCollectionView getConvoked() {
         return CardCollection.getView(convokedCards);
     }
@@ -5292,62 +5287,15 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         damageHistory = history;
     }
 
-    public final List<Pair<Card, Integer>> getReceivedDamageFromThisTurn() {
-        return receivedDamageFromThisTurn;
+    public List<Pair<Integer, Boolean>> getDamageReceivedThisTurn() {
+        return damageReceivedThisTurn;
     }
-    public final void setReceivedDamageFromThisTurn(final List<Pair<Card, Integer>> receivedDamageList) {
-        receivedDamageFromThisTurn = Lists.newArrayList(receivedDamageList);
-    }
-    public final Map<Player, Integer> getReceivedDamageFromPlayerThisTurn() {
-        return receivedDamageFromPlayerThisTurn;
-    }
-    public final void setReceivedDamageFromPlayerThisTurn(final Map<Player, Integer> receivedDamageMap) {
-        receivedDamageFromPlayerThisTurn = Maps.newHashMap(receivedDamageMap);
-    }
-
-    public int getReceivedDamageByPlayerThisTurn(final Player p) {
-        if (receivedDamageFromPlayerThisTurn.containsKey(p)) {
-            return receivedDamageFromPlayerThisTurn.get(p);
-        }
-        return 0;
-    }
-
-    public final void addReceivedDamageFromThisTurn(Card c, final int damage) {
-        int currentDamage = 0;
-        // because Aegar cares about the past state we need to keep all LKI instances
-        receivedDamageFromThisTurn.add(Pair.of(c.isLKI() ? c : CardUtil.getLKICopy(c), damage));
-
-        Player p = c.getController();
-        if (p != null) {
-            if (receivedDamageFromPlayerThisTurn.containsKey(p)) {
-                currentDamage = receivedDamageFromPlayerThisTurn.get(p);
-            }
-            receivedDamageFromPlayerThisTurn.put(p, damage+currentDamage);
-        }
-    }
-    public final void resetReceivedDamageFromThisTurn() {
-        receivedDamageFromThisTurn.clear();
-        receivedDamageFromPlayerThisTurn.clear();
-    }
-
-    public final int getTotalDamageReceivedThisTurn() {
-        int total = 0;
-        for (Integer i : receivedDamageFromPlayerThisTurn.values()) {
-            total += i;
-        }
-        return total;
+    public void setDamageReceivedThisTurn(List<Pair<Integer, Boolean>> dmg) {
+        damageReceivedThisTurn.addAll(dmg);
     }
 
     public final boolean hasDealtDamageToOpponentThisTurn() {
-        for (final GameEntity e : getDamageHistory().getThisTurnDamaged().keySet()) {
-            if (e instanceof Player) {
-                final Player p = (Player) e;
-                if (getController().isOpponentOf(p)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return getDamageHistory().getDamageDoneThisTurn(null, true, null, "Player.Opponent", this, getController(), null) > 0;
     }
 
     /**
@@ -5356,11 +5304,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
      * @return the damage done to player p this turn
      */
     public final int getTotalDamageDoneBy() {
-        int sum = 0;
-        for (final GameEntity e : getDamageHistory().getThisTurnDamaged().keySet()) {
-            sum += getDamageHistory().getThisTurnDamaged().get(e);
-        }
-        return sum;
+        return getDamageHistory().getDamageDoneThisTurn(null, false, null, null, this, getController(), null);
     }
 
     // this is the amount of damage a creature needs to receive before it dies
@@ -5383,15 +5327,26 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
     }
 
     public final int getDamage() {
-        return damage;
+        int sum = 0;
+        for (int i : damage.values()) {
+            sum += i;
+        }
+        return sum;
     }
     public final void setDamage(int damage0) {
-        if (damage == damage0) { return; }
-        damage = damage0;
+        if (getDamage() == damage0) { return; }
+        damage.clear();
+        if (damage0 != 0) {
+            damage.put(0, damage0);
+        }
         view.updateDamage(this);
         getGame().fireEvent(new GameEventCardStatsChanged(this));
     }
 
+    public int getMaxDamageFromSource() {
+        return damage.isEmpty() ? 0 : Collections.max(damage.values());
+    }
+
     public final boolean hasBeenDealtDeathtouchDamage() {
         return hasBeenDealtDeathtouchDamage;
     }
@@ -5542,14 +5497,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         // Run replacement effects
         getGame().getReplacementHandler().run(ReplacementType.DealtDamage, AbilityKey.mapFromAffected(this));
 
-        addReceivedDamageFromThisTurn(source, damageIn);
-        source.getDamageHistory().registerDamage(this, damageIn);
-        if (isCombat) {
-            source.getDamageHistory().registerCombatDamage(this, damageIn);
-        } else {
-            getDamageHistory().setHasBeenDealtNonCombatDamageThisTurn(true);
-        }
-
         // Run triggers
         Map<AbilityKey, Object> runParams = AbilityKey.newMap();
         runParams.put(AbilityKey.DamageSource, source);
@@ -5576,7 +5523,8 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                 damageType = DamageType.M1M1Counters;
             }
             else { // 120.3e
-                damage += damageIn;
+                int old = damage.getOrDefault(Objects.hash(source.getId(), source.getTimestamp()), 0);
+                damage.put(Objects.hash(source.getId(), source.getTimestamp()), old + damageIn);
                 view.updateDamage(this);
             }
 
@@ -5714,7 +5662,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         }
         return false;
     }
-
     public final void setForetold(final boolean foretold) {
         this.foretold = foretold;
     }
@@ -5732,7 +5679,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
     public final void setForetoldThisTurn(final boolean foretoldThisTurn) {
         this.foretoldThisTurn = foretoldThisTurn;
     }
-
     public void resetForetoldThisTurn() {
         foretoldThisTurn = false;
     }
@@ -5803,7 +5749,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
     public final long getBestowTimestamp() {
         return bestowTimestamp;
     }
-
     public final void setBestowTimestamp(final long t) {
         bestowTimestamp = t;
     }
@@ -6206,7 +6151,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
             setDamage(0);
         }
         setHasBeenDealtDeathtouchDamage(false);
-        resetReceivedDamageFromThisTurn();
         setRegeneratedThisTurn(0);
         resetShield();
         setBecameTargetThisTurn(false);
@@ -6214,6 +6158,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         clearMustBlockCards();
         getDamageHistory().setCreatureAttackedLastTurnOf(turn, getDamageHistory().getCreatureAttacksThisTurn() > 0);
         getDamageHistory().newTurn();
+        damageReceivedThisTurn.clear();
         clearBlockedByThisTurn();
         clearBlockedThisTurn();
         resetMayPlayTurn();
diff --git a/forge-game/src/main/java/forge/game/card/CardDamageHistory.java b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java
index 9337293bedc..105bb992bc8 100644
--- a/forge-game/src/main/java/forge/game/card/CardDamageHistory.java
+++ b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java
@@ -4,9 +4,11 @@ package forge.game.card;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.commons.lang3.tuple.Pair;
 
+import com.google.common.collect.Lists;
+
+import forge.game.CardTraitBase;
 import forge.game.GameEntity;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
@@ -22,7 +24,6 @@ public class CardDamageHistory {
     private boolean creatureBlockedThisCombat = false;
     private boolean creatureGotBlockedThisCombat = false;
 
-    boolean hasdealtDamagetoAny = false;
     private List<GameEntity> attackedThisTurn = Lists.newArrayList();
 
     private final List<Player> creatureAttackedLastTurnOf = Lists.newArrayList();
@@ -30,14 +31,13 @@ public class CardDamageHistory {
     private final List<Player> NotBlockedSinceLastUpkeepOf = Lists.newArrayList();
     private final List<Player> NotBeenBlockedSinceLastUpkeepOf = Lists.newArrayList();
 
+    private List<Pair<Integer, Boolean>> damageDoneThisTurn = Lists.newArrayList();
+
     // only needed for Glen Elendra (Plane)
     private final List<Player> damagedThisCombat = Lists.newArrayList();
     // only needed for The Fallen
     private final FCollection<GameEntity> damagedThisGame = new FCollection<>();
-
-    private final Map<GameEntity, Integer> damagedThisTurn = Maps.newHashMap();
-    private final Map<GameEntity, Integer> damagedThisTurnInCombat = Maps.newHashMap();
-    private boolean receivedNonCombatDamageThisTurn = false;
+    boolean hasdealtDamagetoAny = false;
 
     public final boolean getHasdealtDamagetoAny() {
         return hasdealtDamagetoAny;
@@ -225,38 +225,9 @@ public class CardDamageHistory {
         return this.creatureGotBlockedThisCombat;
     }
 
-    /**
-     * <p>
-     * Getter for the field <code>receivedNonCombatDamageThisTurn</code>.
-     * </p>
-     *
-     * @return a boolean.
-     */
-    public boolean hasBeenDealtNonCombatDamageThisTurn() {
-        return this.receivedNonCombatDamageThisTurn;
-    }
-
-    /**
-     * <p>
-     * Setter for the field <code>receivedNonCombatDamageThisTurn</code>.
-     * </p>
-     *
-     * @param b
-     *            a boolean.
-     */
-    public void setHasBeenDealtNonCombatDamageThisTurn(boolean b) {
-        this.receivedNonCombatDamageThisTurn = b;
-    }
-
     public final List<Player> getThisCombatDamaged() {
         return damagedThisCombat;
     }
-    public final Map<GameEntity, Integer> getThisTurnDamaged() {
-        return damagedThisTurn;
-    }
-    public final Map<GameEntity, Integer> getThisTurnCombatDamaged() {
-        return damagedThisTurnInCombat;
-    }
     public final FCollection<GameEntity> getThisGameDamaged() {
         return damagedThisGame;
     }
@@ -264,38 +235,44 @@ public class CardDamageHistory {
      * TODO: Write javadoc for this method.
      * @param player
      */
-    public void registerCombatDamage(GameEntity entity, int amount) {
-        int old = 0;
-        if (entity instanceof Player) {
-            damagedThisCombat.add((Player) entity);
-        }
-        old = 0;
-        if (damagedThisTurnInCombat.containsKey(entity)) {
-            old = damagedThisTurnInCombat.get(entity);
-        }
-        damagedThisTurnInCombat.put(entity, old + amount);
+    public void registerDamage(int damage, boolean isCombat, Card sourceLKI, GameEntity target, Map<Integer, Card> lkiCache) {
+        damagedThisGame.add(target);
         hasdealtDamagetoAny = true;
+        if (isCombat && target instanceof Player) {
+            damagedThisCombat.add((Player) target);
+        }
+        Pair<Integer, Boolean> dmg = Pair.of(damage, isCombat);
+        damageDoneThisTurn.add(dmg);
+        target.receiveDamage(dmg);
+        sourceLKI.getGame().addGlobalDamageHistory(this, dmg, sourceLKI.isLKI() ? sourceLKI : CardUtil.getLKICopy(sourceLKI, lkiCache), CardUtil.getLKICopy(target, lkiCache));
     }
 
-    /**
-     * TODO: Write javadoc for this method.
-     * @param player
-     */
-    public void registerDamage(GameEntity entity, int amount) {
-        int old = 0;
-        if (damagedThisTurn.containsKey(entity)) {
-            old = damagedThisTurn.get(entity);
+    public int getDamageDoneThisTurn(Boolean isCombat, boolean anyIsEnough, String validSourceCard, String validTargetEntity, Card source, Player sourceController, CardTraitBase ctb) {
+        int sum = 0;
+        for (Pair<Integer, Boolean> damage : damageDoneThisTurn) {
+            Pair<Card, GameEntity> sourceToTarget = sourceController.getGame().getDamageLKI(damage);
+
+            if (isCombat != null && damage.getRight() != isCombat) {
+                continue;
+            }
+            if (validSourceCard != null && !sourceToTarget.getLeft().isValid(validSourceCard.split(","), sourceController, source == null ? sourceToTarget.getLeft() : source, ctb)) {
+                continue;
+            }
+            if (validTargetEntity != null && !sourceToTarget.getRight().isValid(validTargetEntity.split(","), sourceController, source, ctb)) {
+                continue;
+            }
+            sum += damage.getLeft();
+            if (anyIsEnough) {
+                break;
+            }
         }
-        damagedThisTurn.put(entity, old + amount);
-        damagedThisGame.add(entity);
-        hasdealtDamagetoAny = true;
+        return sum;
     }
 
     public void newTurn() {
-        damagedThisCombat.clear();
-        damagedThisTurnInCombat.clear();
-        damagedThisTurn.clear();
         attackedThisTurn.clear();
+        damagedThisCombat.clear();
+        damageDoneThisTurn.clear();
 
         // if card already LTB we can safely dereference (allows quite a few objects to be cleaned up earlier for bigger boardstates)
         CardCollection toRemove = new CardCollection();
@@ -307,7 +284,6 @@ public class CardDamageHistory {
             }
         }
         damagedThisGame.removeAll(toRemove);
-        setHasBeenDealtNonCombatDamageThisTurn(false);
     }
 
     public void endCombat() {
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 058c45b80c7..b4398108a2a 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -608,35 +608,6 @@ public class CardProperty {
             if ((card.getCloneOrigin() == null) || !card.getCloneOrigin().equals(source)) {
                 return false;
             }
-        } else if (property.startsWith("DamagedBy")) {
-            List<Card> damaged = Lists.newArrayList();
-            for (Pair<Card, Integer> pair : card.getReceivedDamageFromThisTurn()) {
-                damaged.add(pair.getLeft());
-            }
-            if (property.endsWith("Source") || property.equals("DamagedBy")) {
-                if (!damaged.contains(source)) {
-                    return false;
-                }
-            } else {
-                String prop = property.substring("DamagedBy".length());
-                boolean found = Iterables.any(damaged, CardPredicates.restriction(prop, sourceController, source, spellAbility));
-
-                if (!found) {
-                    for (Card d : AbilityUtils.getDefinedCards(source, prop, spellAbility)) {
-                        if (damaged.contains(d)) {
-                            found = true;
-                            break;
-                        }
-                    }
-                }
-                if (!found) {
-                    return false;
-                }
-            }
-        } else if (property.startsWith("Damaged")) {
-            if (!card.getDamageHistory().getThisTurnDamaged().containsKey(source)) {
-                return false;
-            }
         } else if (property.startsWith("SharesCMCWith")) {
             if (property.equals("SharesCMCWith")) {
                 if (!card.sharesCMCWith(source)) {
@@ -1133,38 +1104,78 @@ public class CardProperty {
                     && !card.getDamageHistory().hasBlockedSinceLastUpkeepOf(sourceController)) {
                 return false;
             }
+        } else if (property.startsWith("DamagedBy")) {
+            String prop = property.substring("DamagedBy".length());
+            CardCollection def = null;
+            if (prop.startsWith(" ")) {
+                def = AbilityUtils.getDefinedCards(source, prop.substring(1), spellAbility);
+            }
+            boolean found = false;
+            for (Pair<Integer, Boolean> p : card.getDamageReceivedThisTurn()) {
+                Card dmgSource = game.getDamageLKI(p).getLeft();
+                if (def != null) {
+                    for (Card c : def) {
+                        if (dmgSource.equalsWithTimestamp(c)) {
+                            found = true;
+                        }
+                    }
+                }
+                else if (prop.isEmpty() && dmgSource.equalsWithTimestamp(source)) {
+                    found = true;
+                } else if (dmgSource.isValid(prop.split(","), sourceController, source, spellAbility)) {
+                    found = true;
+                }
+                if (found) {
+                    break;
+                }
+            }
+            if (!found) {
+                return false;
+            }
+        } else if (property.startsWith("Damaged")) {
+            for (Pair<Integer, Boolean> p : source.getDamageReceivedThisTurn()) {
+                boolean found = false;
+                if (game.getDamageLKI(p).getLeft().equalsWithTimestamp(card)) {
+                    found = true;
+                    break;
+                }
+                if (!found) {
+                    return false;
+                }
+            }
+        } else if (property.startsWith("dealtCombatDamageThisCombat")) {
+            if (card.getDamageHistory().getThisCombatDamaged().isEmpty()) {
+                return false;
+            }
         } else if (property.startsWith("dealtDamageToYouThisTurn")) {
-            if (!card.getDamageHistory().getThisTurnDamaged().containsKey(sourceController)) {
+            if (card.getDamageHistory().getDamageDoneThisTurn(null, true, null, "You", card, sourceController, spellAbility) == 0) {
                 return false;
             }
         } else if (property.startsWith("dealtDamageToOppThisTurn")) {
             if (!card.hasDealtDamageToOpponentThisTurn()) {
                 return false;
             }
-        //dealtCombatDamageThisCombat <valid>, dealtCombatDamageThisTurn <valid>, and notDealt versions
         } else if (property.startsWith("dealtCombatDamage") || property.startsWith("notDealtCombatDamage")) {
-            final String[] v = property.split(" ")[1].split(",");
-            final Iterable<GameEntity> list = property.contains("ThisCombat") ?
-                    Lists.newArrayList(card.getDamageHistory().getThisCombatDamaged()) :
-                    card.getDamageHistory().getThisTurnCombatDamaged().keySet();
-            boolean found = Iterables.any(list, GameObjectPredicates.restriction(v, sourceController, source, spellAbility));
+            final String v = property.split(" ")[1];
+            boolean found = card.getDamageHistory().getDamageDoneThisTurn(true, true, null, v, card, sourceController, spellAbility) > 0;
+
             if (found == property.startsWith("not")) {
                 return false;
             }
         } else if (property.startsWith("controllerWasDealtCombatDamageByThisTurn")) {
-            if (!source.getDamageHistory().getThisTurnCombatDamaged().containsKey(controller)) {
+            if (source.getDamageHistory().getDamageDoneThisTurn(true, true, null, "You", card, controller, spellAbility) == 0) {
                 return false;
             }
         } else if (property.startsWith("controllerWasDealtDamageByThisTurn")) {
-            if (!source.getDamageHistory().getThisTurnDamaged().containsKey(controller)) {
+            if (source.getDamageHistory().getDamageDoneThisTurn(null, true, null, "You", card, controller, spellAbility) == 0) {
                 return false;
             }
         } else if (property.startsWith("wasDealtDamageThisTurn")) {
-            if (card.getReceivedDamageFromPlayerThisTurn().isEmpty()) {
+            if (card.getAssignedDamage() == 0) {
                 return false;
             }
         } else if (property.equals("wasDealtNonCombatDamageThisTurn")) {
-            if (!card.getDamageHistory().hasBeenDealtNonCombatDamageThisTurn()) {
+            if (card.getAssignedDamage(false, null) == 0) {
                 return false;
             }
         } else if (property.startsWith("wasDealtDamageByThisGame")) {
diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java
index abd1fe3a069..7699689d798 100644
--- a/forge-game/src/main/java/forge/game/card/CardUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardUtil.java
@@ -250,9 +250,8 @@ public final class CardUtil {
         newCopy.setColor(in.getColor().getColor());
         newCopy.setPhasedOut(in.isPhasedOut());
 
-        newCopy.setReceivedDamageFromThisTurn(in.getReceivedDamageFromThisTurn());
-        newCopy.setReceivedDamageFromPlayerThisTurn(in.getReceivedDamageFromPlayerThisTurn());
         newCopy.setDamageHistory(in.getDamageHistory());
+        newCopy.setDamageReceivedThisTurn(in.getDamageReceivedThisTurn());
         for (Card c : in.getBlockedThisTurn()) {
             newCopy.addBlockedThisTurn(c);
         }
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 6689bcdd50f..3e3a90e74f0 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -147,8 +147,6 @@ public class Player extends GameEntity implements Comparable<Player> {
     private int life = 20;
     private int startingLife = 20;
     private int lifeStartedThisTurnWith = startingLife;
-    private final Map<Card, Integer> assignedDamage = Maps.newHashMap();
-    private final Map<Card, Integer> assignedCombatDamage = Maps.newHashMap();
     private int spellsCastThisTurn;
     private int spellsCastThisGame;
     private int spellsCastLastTurn;
@@ -219,7 +217,6 @@ public class Player extends GameEntity implements Comparable<Player> {
     private Map<Card, Card> maingameCardsMap = Maps.newHashMap();
 
     private CardCollection currentPlanes = new CardCollection();
-    private Set<String> prowl = Sets.newHashSet();
 
     private PlayerStatistics stats = new PlayerStatistics();
     private PlayerController controller;
@@ -704,19 +701,6 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
         }
 
-        int old = assignedDamage.containsKey(source) ? assignedDamage.get(source) : 0;
-        assignedDamage.put(source, old + amount);
-        source.getDamageHistory().registerDamage(this, amount);
-
-        if (isCombat) {
-            old = assignedCombatDamage.containsKey(source) ? assignedCombatDamage.get(source) : 0;
-            assignedCombatDamage.put(source, old + amount);
-            for (final String type : source.getType().getCreatureTypes()) {
-                source.getController().addProwlType(type);
-            }
-            source.getDamageHistory().registerCombatDamage(this, amount);
-        }
-
         // Run triggers
         final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
         runParams.put(AbilityKey.DamageSource, source);
@@ -830,49 +814,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         simultaneousDamage = 0;
     }
 
-    public final void clearAssignedDamage() {
-        assignedDamage.clear();
-        assignedCombatDamage.clear();
-    }
-
-    public final int getAssignedDamage() {
-        int num = 0;
-        for (final Integer value : assignedDamage.values()) {
-            num += value;
-        }
-        return num;
-    }
-
-    public final int getAssignedCombatDamage() {
-        int num = 0;
-        for (final Integer value : assignedCombatDamage.values()) {
-            num += value;
-        }
-        return num;
-    }
-
-    public final Iterable<Card> getAssignedDamageSources() {
-        return assignedDamage.keySet();
-    }
-
-    public final int getAssignedDamage(final Card c) {
-        return assignedDamage.get(c);
-    }
-
-    public final int getAssignedDamage(final String type) {
-        final Map<Card, Integer> valueMap = Maps.newHashMap();
-        for (final Card c : assignedDamage.keySet()) {
-            if (c.getType().hasStringType(type)) {
-                valueMap.put(c, assignedDamage.get(c));
-            }
-        }
-        int num = 0;
-        for (final Integer value : valueMap.values()) {
-            num += value;
-        }
-        return num;
-    }
-
     /**
      * Get the total damage assigned to this player's opponents this turn.
      */
@@ -2082,8 +2023,8 @@ public class Player extends GameEntity implements Comparable<Player> {
     }
 
     public final boolean hasBloodthirst() {
-        for (Player p : game.getRegisteredPlayers()) {
-            if (p.isOpponentOf(this) && p.getAssignedDamage() > 0) {
+        for (Player p : getRegisteredOpponents()) {
+            if (p.getAssignedDamage() > 0) {
                 return true;
             }
         }
@@ -2102,14 +2043,12 @@ public class Player extends GameEntity implements Comparable<Player> {
         return lost;
     }
 
-    public final boolean hasProwl(final String type) {
-        return prowl.contains(type);
-    }
-    public final void addProwlType(final String type) {
-        prowl.add(type);
-    }
-    public final void resetProwl() {
-        prowl.clear();
+    public final boolean hasProwl(final Set<String> types) {
+        StringBuilder sb = new StringBuilder();
+        for (String type : types) {
+            sb.append("Card.YouCtrl+").append(type).append(",");
+        }
+        return !game.getDamageDoneThisTurn(true, true, sb.toString(), "Player", null, this, null).isEmpty();
     }
 
     public final void setLibrarySearched(final int l) {
@@ -2150,7 +2089,7 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
         } else if (incR[0].equals("EnchantedController")) {
             final GameEntity enchanted = source.getEntityAttachedTo();
-            if ((enchanted == null) || !(enchanted instanceof Card)) {
+            if (enchanted == null || !(enchanted instanceof Card)) {
                 return false;
             }
             final Card enchantedCard = (Card) enchanted;
@@ -2239,10 +2178,6 @@ public class Player extends GameEntity implements Comparable<Player> {
         investigatedThisTurn = 0;
     }
 
-    public final List<Card> getSacrificedThisTurn() {
-        return sacrificedThisTurn;
-    }
-
     public final void addSacrificedThisTurn(final Card c, final SpellAbility source) {
         // Play the Sacrifice sound
         game.fireEvent(new GameEventCardSacrificed());
@@ -2260,6 +2195,9 @@ public class Player extends GameEntity implements Comparable<Player> {
         game.getTriggerHandler().runTrigger(TriggerType.Sacrificed, runParams, false);
     }
 
+    public final List<Card> getSacrificedThisTurn() {
+        return sacrificedThisTurn;
+    }
     public final void resetSacrificedThisTurn() {
         sacrificedThisTurn.clear();
     }
@@ -2452,10 +2390,8 @@ public class Player extends GameEntity implements Comparable<Player> {
         resetCycledThisTurn();
         resetEquippedThisTurn();
         resetSacrificedThisTurn();
-        clearAssignedDamage();
         resetVenturedThisTurn();
         setRevolt(false);
-        resetProwl();
         setSpellsCastLastTurn(getSpellsCastThisTurn());
         resetSpellsCastThisTurn();
         setLifeLostLastTurn(getLifeLostThisTurn());
@@ -2467,6 +2403,8 @@ public class Player extends GameEntity implements Comparable<Player> {
         setLibrarySearched(0);
         setNumManaConversion(0);
 
+        damageReceivedThisTurn.clear();
+
         // set last turn nr
         if (game.getPhaseHandler().isPlayerTurn(this)) {
             setAttackedPlayersMyLastTurn(attackedPlayersThisTurn);
diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
index f9b591391c7..887af2cd51c 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
@@ -1,6 +1,7 @@
 package forge.game.player;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import forge.game.CardTraitBase;
@@ -86,81 +87,66 @@ public class PlayerProperty {
             if (!player.hasBlessing()) {
                 return false;
             }
+        } else if (property.startsWith("damageDoneSingleSource")) {
+            String props = property.split(" ")[1];
+            List<Integer> sourceDmg = game.getDamageDoneThisTurn(null, false, "Card.YouCtrl", null, source, sourceController, spellAbility);
+            int maxDmg = sourceDmg.isEmpty() ? 0 : Collections.max(sourceDmg);
+            if (!Expressions.compare(maxDmg, props.substring(0, 2), AbilityUtils.calculateAmount(source, props.substring(2), spellAbility))) {
+                return false;
+            }
         } else if (property.startsWith("wasDealtCombatDamageThisCombatBy ")) {
             String v = property.split(" ")[1];
-
-            int count = 1;
-            if (v.contains("_AtLeast")) {
-                count = Integer.parseInt(v.substring(v.indexOf("_AtLeast") + 8));
-                v = v.substring(0, v.indexOf("_AtLeast")).replace("Valid:", "Valid ");
-            }
+            boolean found = true;
 
             final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
-            int found = 0;
             for (final Card card : cards) {
                 if (card.getDamageHistory().getThisCombatDamaged().contains(player)) {
-                    found++;
+                    found = true;
                 }
             }
-            if (found < count) {
+            if (!found) {
                 return false;
             }
         } else if (property.startsWith("wasDealtDamageThisGameBy ")) {
             String v = property.split(" ")[1];
-
-            int count = 1;
-            if (v.contains("_AtLeast")) {
-                count = Integer.parseInt(v.substring(v.indexOf("_AtLeast") + 8));
-                v = TextUtil.fastReplace(v.substring(0, v.indexOf("_AtLeast")), "Valid:", "Valid ");
-            }
+            boolean found = true;
 
             final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
-            int found = 0;
             for (final Card card : cards) {
                 if (card.getDamageHistory().getThisGameDamaged().contains(player)) {
-                    found++;
+                    found = true;
                 }
             }
-            if (found < count) {
+            if (!found) {
                 return false;
             }
-        } else if (property.startsWith("wasDealtDamageThisTurnBy ")) {
-            String v = property.split(" ")[1];
-            int count = 1;
-
-            if (v.contains("_AtLeast")) {
-                count = Integer.parseInt(v.substring(v.indexOf("_AtLeast") + 8));
-                v = TextUtil.fastReplace(v.substring(0, v.indexOf("_AtLeast")), "Valid:", "Valid ");
+        } else if (property.startsWith("wasDealt")) {
+            boolean found = false;
+            String validCard = null;
+            Boolean combat = null;
+            if (property.contains("CombatDamage")) {
+                combat = true;
             }
+            if (property.contains("ThisTurnBySource")) {
+                found = source.getDamageHistory().getDamageDoneThisTurn(combat, validCard == null, validCard, "You", source, player, spellAbility) > 0;
+            } else {
+                String comp = "GE";
+                int right = 1;
+                int numValid = 0;
 
-            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
-            int found = 0;
-            for (final Card card : cards) {
-                if (card.getDamageHistory().getThisTurnDamaged().containsKey(player)) {
-                    found++;
+                if (property.contains("ThisTurnBy")) {
+                    String[] props = property.split(" ");
+                    validCard = props[1];
+                    if (props.length > 2) {
+                        comp = props[2].substring(0, 2);
+                        right = AbilityUtils.calculateAmount(source, props[2].substring(2), spellAbility);
+                    }
                 }
-            }
-            if (found < count) {
-                return false;
-            }
-        } else if (property.startsWith("wasDealtCombatDamageThisTurnBy ")) {
-            String v = property.split(" ")[1];
 
-            int count = 1;
-            if (v.contains("_AtLeast")) {
-                count = Integer.parseInt(v.substring(v.indexOf("_AtLeast") + 8));
-                v = TextUtil.fastReplace(v.substring(0, v.indexOf("_AtLeast")), "Valid:", "Valid ");
+                numValid = game.getDamageDoneThisTurn(combat, validCard == null, validCard, "You", source, player, spellAbility).size();
+                found = Expressions.compare(numValid, comp, right);
             }
-
-            final List<Card> cards = AbilityUtils.getDefinedCards(source, v, spellAbility);
-
-            int found = 0;
-            for (final Card card : cards) {
-                if (card.getDamageHistory().getThisTurnCombatDamaged().containsKey(player)) {
-                    found++;
-                }
-            }
-            if (found < count) {
+            if (!found) {
                 return false;
             }
         } else if (property.equals("attackedBySourceThisCombat")) {
@@ -171,18 +157,10 @@ public class PlayerProperty {
             if (!source.getDamageHistory().hasAttackedThisTurn(player)) {
                 return false;
             }
-        } else if (property.equals("wasDealtDamageThisTurn")) {
-            if (player.getAssignedDamage() == 0) {
-                return false;
-            }
-        }  else if (property.equals("Defending")) {
+        } else if (property.equals("Defending")) {
             if (!game.getCombat().getAttackersAndDefenders().values().contains(player)) {
                 return false;
             }
-        } else if (property.equals("wasDealtCombatDamageThisTurn")) {
-            if (player.getAssignedCombatDamage() == 0) {
-                return false;
-            }
         } else if (property.equals("LostLifeThisTurn")) {
             if (player.getLifeLostThisTurn() <= 0) {
                 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 c767b4e36c9..2261081fc6d 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -87,8 +87,8 @@ public class AbilityManaPart implements java.io.Serializable {
     public AbilityManaPart(final Card sourceCard, final Map<String, String> params) {
         this.sourceCard = sourceCard;
 
-        origProduced = params.containsKey("Produced") ? params.get("Produced") : "1";
-        this.manaRestrictions = params.containsKey("RestrictValid") ? params.get("RestrictValid") : "";
+        origProduced = params.getOrDefault("Produced", "1");
+        this.manaRestrictions = params.getOrDefault("RestrictValid", "");
         this.cannotCounterSpell = params.get("AddsNoCounter");
         this.addsKeywords = params.get("AddsKeywords");
         this.addsKeywordsType = params.get("AddsKeywordsType");
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
index 99e347d2e02..8f72ba69673 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -434,13 +434,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
             }
         }
         if (sa.isProwl()) {
-            boolean prowlFlag = false;
-            for (final String type : c.getType().getCreatureTypes()) {
-                if (activator.hasProwl(type)) {
-                    prowlFlag = true;
-                }
-            }
-            if (!prowlFlag) {
+            if (!activator.hasProwl(c.getType().getCreatureTypes())) {
                 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 627f763531d..d1a2c9ac8e7 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
@@ -166,7 +166,7 @@ public class TriggerChangesZone extends Trigger {
             // need to check the ChangeZone LKI copy for damage, otherwise it'll return 0 for a new object in the new zone
             Card lkiCard = card.getGame().getChangeZoneLKIInfo(card);
 
-            final boolean expr = Expressions.compare(lkiCard.getTotalDamageReceivedThisTurn(), cond, rightSide);
+            final boolean expr = Expressions.compare(lkiCard.getAssignedDamage(), cond, rightSide);
             if (!expr) {
                 return false;
             }
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
index 3df9d4ffc39..55061cbe6f0 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
@@ -101,7 +101,7 @@ public class TriggerDamageDone extends Trigger {
 
             if (target instanceof Player) {
                 final Player trigTgt = (Player) target;
-                if (!Expressions.compare(trigTgt.getAssignedDamage(source), operator, operand)) {
+                if (!Expressions.compare(trigTgt.getAssignedDamage(null, source), operator, operand)) {
                     return false;
                 }
             } else {
diff --git a/forge-gui/res/cardsfolder/a/admiral_beckett_brass.txt b/forge-gui/res/cardsfolder/a/admiral_beckett_brass.txt
index 59bb5e60214..f17d1c259b7 100644
--- a/forge-gui/res/cardsfolder/a/admiral_beckett_brass.txt
+++ b/forge-gui/res/cardsfolder/a/admiral_beckett_brass.txt
@@ -4,6 +4,6 @@ Types:Legendary Creature Human Pirate
 PT:3/3
 S:Mode$ Continuous | Affected$ Creature.Pirate+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Pirates you control get +1/+1.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainCtrl | TriggerDescription$ At the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn.
-SVar:TrigGainCtrl:DB$ GainControl | ValidTgts$ Permanent.nonLand+ControlledBy Player.wasDealtCombatDamageThisTurnBy Valid:Creature.Pirate_AtLeast3 | TgtPrompt$ Select target creature controlled by a player who was dealt damage by three or more Pirates this turn | SpellDescription$ Gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn.
+SVar:TrigGainCtrl:DB$ GainControl | ValidTgts$ Permanent.nonLand+ControlledBy Player.wasDealtCombatDamageThisTurnBy Creature.Pirate GE3 | TgtPrompt$ Select target creature controlled by a player who was dealt damage by three or more Pirates this turn | SpellDescription$ Gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn.
 DeckHints:Type$Pirate
 Oracle:Other Pirates you control get +1/+1.\nAt the beginning of your end step, gain control of target nonland permanent controlled by a player who was dealt combat damage by three or more Pirates this turn.
diff --git a/forge-gui/res/cardsfolder/b/blazing_sunsteel.txt b/forge-gui/res/cardsfolder/b/blazing_sunsteel.txt
index 7bdc9153c9b..f8f5350af9c 100644
--- a/forge-gui/res/cardsfolder/b/blazing_sunsteel.txt
+++ b/forge-gui/res/cardsfolder/b/blazing_sunsteel.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ Y | Description$ Equipped creature gets +1/+0 for each opponent you have.
 SVar:Y:PlayerCountOpponents$Amount
 T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Creature.EquippedBy | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature is dealt damage, it deals that much damage to any target.
-SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target
+SVar:TrigDamage:DB$ DealDamage | NumDmg$ X | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | DamageSource$ TriggeredTargetLKICopy
 SVar:X:TriggerCount$DamageAmount
 K:Equip:4
 Oracle:Equipped creature gets +1/+0 for each opponent you have.\nWhenever equipped creature is dealt damage, it deals that much damage to any target.\nEquip {4}
diff --git a/forge-gui/res/cardsfolder/b/blinding_beam.txt b/forge-gui/res/cardsfolder/b/blinding_beam.txt
index e1006f83348..ed426a6ec83 100644
--- a/forge-gui/res/cardsfolder/b/blinding_beam.txt
+++ b/forge-gui/res/cardsfolder/b/blinding_beam.txt
@@ -5,7 +5,7 @@ K:Entwine:1
 A:SP$ Charm | Cost$ 2 W | Choices$ DBTap,DBEffect | CharmNum$ 1
 SVar:DBTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target creatures | SpellDescription$ Tap two target creatures.
 SVar:DBEffect:DB$ Effect | ValidTgts$ Player | TgtPrompt$ Select target player | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RestoreSight | RememberObjects$ Targeted | Duration$ Permanent | SpellDescription$ Creatures don't untap during target player's next untap step.
-SVar:DontUntap:Mode$ Continuous | ValidPlayer$ Player.IsRemembered | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ This card doesn't untap.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap.
 SVar:RestoreSight:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/b/bloodcrazed_goblin.txt b/forge-gui/res/cardsfolder/b/bloodcrazed_goblin.txt
index 9e93e010db3..23bf1b34831 100644
--- a/forge-gui/res/cardsfolder/b/bloodcrazed_goblin.txt
+++ b/forge-gui/res/cardsfolder/b/bloodcrazed_goblin.txt
@@ -3,5 +3,5 @@ ManaCost:R
 Types:Creature Goblin Berserker
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT1 | Description$ CARDNAME can't attack unless an opponent has been dealt damage this turn.
-SVar:X:Count$TotalOppDamageThisTurn
+SVar:X:PlayerCountPropertyYou$DamageToOppsThisTurn
 Oracle:Bloodcrazed Goblin can't attack unless an opponent has been dealt damage this turn.
diff --git a/forge-gui/res/cardsfolder/d/discordant_spirit.txt b/forge-gui/res/cardsfolder/d/discordant_spirit.txt
index d91bc57573f..b0c03b19749 100644
--- a/forge-gui/res/cardsfolder/d/discordant_spirit.txt
+++ b/forge-gui/res/cardsfolder/d/discordant_spirit.txt
@@ -6,5 +6,5 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player.Opponent | TriggerZones
 SVar:GhostCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ GhostClear | TriggerDescription$ At the beginning of your end step, remove all +1/+1 counters from CARDNAME.
 SVar:GhostClear:DB$ RemoveCounter | CounterType$ P1P1 | CounterNum$ All
-SVar:X:Count$YourDamageThisTurn
+SVar:X:PlayerCountPropertyYou$DamageThisTurn
 Oracle:At the beginning of each end step, if it's an opponent's turn, put a +1/+1 counter on Discordant Spirit for each 1 damage dealt to you this turn.\nAt the beginning of your end step, remove all +1/+1 counters from Discordant Spirit.
diff --git a/forge-gui/res/cardsfolder/g/gales_redirection.txt b/forge-gui/res/cardsfolder/g/gales_redirection.txt
index 5386ec8ba23..bd90f32dd46 100644
--- a/forge-gui/res/cardsfolder/g/gales_redirection.txt
+++ b/forge-gui/res/cardsfolder/g/gales_redirection.txt
@@ -5,8 +5,8 @@ A:SP$ ChangeZone | ValidTgts$ Card | TgtZone$ Stack | Origin$ Stack | Fizzle$ Tr
 SVar:DBRoll:DB$ RollDice | Sides$ 20 | Modifier$ Y | ResultSubAbilities$ 1-14:DBMayPlay,Else:DBMayPlayWithoutCost | StackDescription$ SpellDescription | SpellDescription$ Roll a d20 and add that spell's mana value.
 SVar:DBMayPlay:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | Duration$ Permanent | ExileOnMoved$ Exile | SubAbility$ DBCleanup | SpellDescription$ 1—14 VERT You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast it.
 SVar:DBMayPlayWithoutCost:DB$ Effect | StaticAbilities$ STPlayWithoutCost | RememberObjects$ Remembered | Duration$ Permanent | ExileOnMoved$ Exile | SubAbility$ DBCleanup | SpellDescription$ 15+ VERT You may cast that card without paying its mana cost for as long as it remains exiled.
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast it.
-SVar:STPlayWithoutCost:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may cast that card without paying its mana cost for as long as it remains exiled.
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast it.
+SVar:STPlayWithoutCost:Mode$ Continuous | MayPlay$ True | MayPlayWithoutManaCost$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | Description$ You may cast that card without paying its mana cost for as long as it remains exiled.
 SVar:Y:RememberedLKI$CardManaCost
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/g/glen_elendra.txt b/forge-gui/res/cardsfolder/g/glen_elendra.txt
index 55c2617f398..f4c0254ef80 100644
--- a/forge-gui/res/cardsfolder/g/glen_elendra.txt
+++ b/forge-gui/res/cardsfolder/g/glen_elendra.txt
@@ -2,7 +2,7 @@ Name:Glen Elendra
 ManaCost:no cost
 Types:Plane Lorwyn
 T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ You | TriggerZones$ Command | OptionalDecider$ You | Execute$ TrigExchange | TriggerDescription$ At end of combat, you may exchange control of target creature you control that dealt combat damage to a player this combat and target creature that player controls.
-SVar:TrigExchange:DB$ Pump | ValidTgts$ Creature.YouCtrl+dealtCombatDamageThisCombat Player | TgtPrompt$ Select target creature you control that dealt combat damage to a player | SubAbility$ DBExchange
+SVar:TrigExchange:DB$ Pump | ValidTgts$ Creature.YouCtrl+dealtCombatDamageThisCombat | TgtPrompt$ Select target creature you control that dealt combat damage to a player | SubAbility$ DBExchange
 SVar:DBExchange:DB$ ExchangeControl | Defined$ ParentTarget | ValidTgts$ Creature.ControlledBy Player.wasDealtCombatDamageThisCombatBy ParentTarget | TgtPrompt$ Select target creature that player controls.
 T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, gain control of target creature you own.
 SVar:RolledChaos:DB$ GainControl | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature you own to gain control of
diff --git a/forge-gui/res/cardsfolder/g/grothama_all_devouring.txt b/forge-gui/res/cardsfolder/g/grothama_all_devouring.txt
index 29f7ae03ed3..96c6f1854f4 100644
--- a/forge-gui/res/cardsfolder/g/grothama_all_devouring.txt
+++ b/forge-gui/res/cardsfolder/g/grothama_all_devouring.txt
@@ -8,6 +8,6 @@ SVar:GrothamaFight:DB$ Fight | Defined$ TriggeredAttackerLKICopy | ExtraDefined$
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ When CARDNAME leaves the battlefield, each player draws cards equal to the amount of damage dealt to Grothama this turn by sources they controlled.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ TrigDraw
 SVar:TrigDraw:DB$ Draw | Defined$ Remembered | NumCards$ X
-SVar:X:TriggeredCard$DamageDoneByPlayerThisTurn.Remembered
+SVar:X:TriggeredCard$TotalDamageThisTurn Card.RememberedPlayerCtrl
 SVar:HasAttackEffect:TRUE
 Oracle:Other creatures have "Whenever this creature attacks, you may have it fight Grothama, All-Devouring."\nWhen Grothama leaves the battlefield, each player draws cards equal to the amount of damage dealt to Grothama this turn by sources they controlled.
diff --git a/forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt b/forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt
index 18929ce60bc..9c2836da5f3 100644
--- a/forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt
+++ b/forge-gui/res/cardsfolder/h/hope_of_ghirapur.txt
@@ -3,6 +3,6 @@ ManaCost:1
 Types:Legendary Artifact Creature Thopter
 PT:1/1
 K:Flying
-A:AB$ Effect | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player.wasDealtCombatDamageThisTurnBy Self | Name$ Hope of Ghirapur Effect | StaticAbilities$ STCantBeCast | RememberObjects$ Targeted | Duration$ UntilYourNextTurn | SpellDescription$ Until your next turn, target player who was dealt combat damage by Hope of Ghirapur can't cast noncreature spells.
+A:AB$ Effect | Cost$ Sac<1/CARDNAME> | ValidTgts$ Player.wasDealtCombatDamageThisTurnBySource | Name$ Hope of Ghirapur Effect | StaticAbilities$ STCantBeCast | RememberObjects$ Targeted | Duration$ UntilYourNextTurn | SpellDescription$ Until your next turn, target player who was dealt combat damage by Hope of Ghirapur can't cast noncreature spells.
 SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card.nonCreature | Caster$ Player.IsRemembered | Description$ Until your next turn, target player who was dealt combat damage by Hope of Ghirapur this turn can't cast noncreature spells.
 Oracle:Flying\nSacrifice Hope of Ghirapur: Until your next turn, target player who was dealt combat damage by Hope of Ghirapur this turn can't cast noncreature spells.
diff --git a/forge-gui/res/cardsfolder/i/inferno_trap.txt b/forge-gui/res/cardsfolder/i/inferno_trap.txt
index f170117162a..002e2bed393 100644
--- a/forge-gui/res/cardsfolder/i/inferno_trap.txt
+++ b/forge-gui/res/cardsfolder/i/inferno_trap.txt
@@ -1,8 +1,8 @@
 Name:Inferno Trap
 ManaCost:3 R
 Types:Instant Trap
-SVar:AltCost:Cost$ R | CheckSVar$ CreaturesAttacked | SVarCompare$ GE2 | Description$ If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay this spell's mana cost.
+SVar:AltCost:Cost$ R | CheckSVar$ CreaturesDmg | SVarCompare$ GE2 | Description$ If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay this spell's mana cost.
 A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-SVar:CreaturesAttacked:Count$YourDamageSourcesThisTurn Creature
+SVar:CreaturesDmg:Count$NumDamageThisTurn Creature You
 AI:RemoveDeck:All
 Oracle:If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay this spell's mana cost.\nInferno Trap deals 4 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt b/forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt
index 8b84bf7276c..db5a149d522 100644
--- a/forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt
+++ b/forge-gui/res/cardsfolder/k/kumano_faces_kakkazan_etching_of_kumano.txt
@@ -25,6 +25,6 @@ Colors:red
 Types:Enchantment Creature Human Shaman
 PT:2/2
 K:Haste
-R:Event$ Moved | ValidLKI$ Creature.DamagedByCard.YouCtrl,Creature.DamagedByEmblem.YouCtrl | Destination$ Graveyard | ReplaceWith$ DBExile | ActiveZones$ Battlefield | Description$ If a creature dealt damage this turn by a source you controlled would die, exile it instead.
+R:Event$ Moved | ValidLKI$ Creature.DamagedByCard.YouCtrl,Emblem.YouCtrl | Destination$ Graveyard | ReplaceWith$ DBExile | ActiveZones$ Battlefield | Description$ If a creature dealt damage this turn by a source you controlled would die, exile it instead.
 SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile
 Oracle:Haste\nIf a creature dealt damage this turn by a source you controlled would die, exile it instead.
diff --git a/forge-gui/res/cardsfolder/k/kumanos_blessing.txt b/forge-gui/res/cardsfolder/k/kumanos_blessing.txt
index 0a00052704b..694e9a2add7 100644
--- a/forge-gui/res/cardsfolder/k/kumanos_blessing.txt
+++ b/forge-gui/res/cardsfolder/k/kumanos_blessing.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 K:Flash
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
-R:Event$ Moved | ValidLKI$ Creature.DamagedByEnchanted | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by enchanted creature this turn would die, exile it instead.
+R:Event$ Moved | ValidLKI$ Creature.DamagedBy Enchanted | Destination$ Graveyard | ActiveZones$ Battlefield | ReplaceWith$ DBExile | Description$ If a creature dealt damage by enchanted creature this turn would die, exile it instead.
 SVar:DBExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile
 AI:RemoveDeck:Random
 SVar:NonStackingAttachEffect:True
diff --git a/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt b/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
index 705631e0df3..d2fc646edba 100644
--- a/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
+++ b/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt
@@ -3,7 +3,7 @@ ManaCost:5 W
 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 the battlefield, you may have your life total become the total toughness of creatures you control.
-SVar:TrigLife:DB$ SetLife | Defined$ You | LifeAmount$ Y | SubAbility$ DBCleanup
+SVar:TrigLife:DB$ SetLife | Defined$ You | LifeAmount$ Y
 SVar:Y:Count$Valid Creature.YouCtrl$SumToughness
 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
diff --git a/forge-gui/res/cardsfolder/n/nothing_can_stop_me_now.txt b/forge-gui/res/cardsfolder/n/nothing_can_stop_me_now.txt
index b8e0046aa6d..19c4cca2f6b 100644
--- a/forge-gui/res/cardsfolder/n/nothing_can_stop_me_now.txt
+++ b/forge-gui/res/cardsfolder/n/nothing_can_stop_me_now.txt
@@ -6,5 +6,5 @@ R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card.OppCtrl,Emblem.Op
 SVar:DBReplace:DB$ ReplaceDamage | Amount$ 1
 T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE5 | TriggerZones$ Command | Execute$ Abandon | TriggerDescription$ At the beginning of each end step, if you've been dealt 5 or more damage this turn, abandon this scheme.
 SVar:Abandon:AB$ Abandon | Cost$ 0
-SVar:X:Count$YourDamageThisTurn
+SVar:X:PlayerCountPropertyYou$DamageThisTurn
 Oracle:(An ongoing scheme remains face up until it's abandoned.)\nIf a source an opponent controls would deal damage to you, prevent 1 of that damage.\nAt the beginning of each end step, if you've been dealt 5 or more damage this turn, abandon this scheme.
diff --git a/forge-gui/res/cardsfolder/n/notorious_throng.txt b/forge-gui/res/cardsfolder/n/notorious_throng.txt
index 227c90761ce..da2a0930a3b 100644
--- a/forge-gui/res/cardsfolder/n/notorious_throng.txt
+++ b/forge-gui/res/cardsfolder/n/notorious_throng.txt
@@ -4,6 +4,6 @@ Types:Tribal Sorcery Rogue
 K:Prowl:5 U
 A:SP$ Token | Cost$ 3 U | TokenAmount$ X | TokenScript$ b_1_1_faerie_rogue_flying | TokenOwner$ You | SubAbility$ DBTakeTurn | SpellDescription$ Create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. If CARDNAME's prowl cost was paid, take an extra turn after this one.
 SVar:DBTakeTurn:DB$ AddTurn | NumTurns$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.prowled
-SVar:X:Count$TotalOppDamageThisTurn
+SVar:X:PlayerCountPropertyYou$DamageToOppsThisTurn
 DeckNeeds:Type$Rogue
 Oracle:Prowl {5}{U} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)\nCreate X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. If this spell's prowl cost was paid, take an extra turn after this one.
diff --git a/forge-gui/res/cardsfolder/r/runesword.txt b/forge-gui/res/cardsfolder/r/runesword.txt
index 6d588d4b594..017f9c53a96 100644
--- a/forge-gui/res/cardsfolder/r/runesword.txt
+++ b/forge-gui/res/cardsfolder/r/runesword.txt
@@ -8,6 +8,6 @@ SVar:RuneswordSac:DB$ SacrificeAll | Defined$ Imprinted | SubAbility$ ExileEffec
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:TrigNoregen:Mode$ DamageDone | ValidSource$ Card.IsRemembered | ValidTarget$ Creature | Execute$ PumpNogen | Static$ True | TriggerDescription$ If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn.
 SVar:PumpNogen:DB$ Pump | KW$ HIDDEN CARDNAME can't be regenerated. | Defined$ TriggeredTarget
-SVar:RuneswordRep:Event$ Moved | ValidLKI$ Creature.DamagedByRemembered | Destination$ Graveyard | ReplaceWith$ RuneswordExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead.
+SVar:RuneswordRep:Event$ Moved | ValidLKI$ Creature.DamagedBy Remembered | Destination$ Graveyard | ReplaceWith$ RuneswordExile | Description$ If a creature dealt damage by CARDNAME this turn would die, exile it instead.
 SVar:RuneswordExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Battlefield | Destination$ Exile
 Oracle:{3}, {T}: Target attacking creature gets +2/+0 until end of turn. When that creature leaves the battlefield this turn, sacrifice Runesword. If the creature deals damage to a creature this turn, the creature dealt damage can't be regenerated this turn. If a creature dealt damage by the targeted creature would die this turn, exile that creature instead.
diff --git a/forge-gui/res/cardsfolder/s/simulacrum.txt b/forge-gui/res/cardsfolder/s/simulacrum.txt
index c7c3b7c9850..ca9060d1cc4 100644
--- a/forge-gui/res/cardsfolder/s/simulacrum.txt
+++ b/forge-gui/res/cardsfolder/s/simulacrum.txt
@@ -3,6 +3,6 @@ ManaCost:1 B
 Types:Instant
 A:SP$ GainLife | Cost$ 1 B | Defined$ You | LifeAmount$ X | SubAbility$ Dmg | SpellDescription$ You gain life equal to the damage dealt to you this turn. CARDNAME deals damage to target creature you control equal to the damage dealt to you this turn.
 SVar:Dmg:DB$ DealDamage | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumDmg$ X
-SVar:X:Count$YourDamageThisTurn
+SVar:X:PlayerCountPropertyYou$DamageThisTurn
 AI:RemoveDeck:All
 Oracle:You gain life equal to the damage dealt to you this turn. Simulacrum deals damage to target creature you control equal to the damage dealt to you this turn.
diff --git a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt
index 2eb26dbf159..11b683a753c 100644
--- a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt
+++ b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt
@@ -5,5 +5,5 @@ PT:3/3
 K:Bloodthirst:3
 K:Flying
 A:AB$ ChangeZone | Cost$ R R R | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ OppDamaged | SVarCompare$ GE1 | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate only if an opponent was dealt damage this turn.
-SVar:OppDamaged:Count$TotalOppDamageThisTurn
+SVar:OppDamaged:PlayerCountPropertyYou$DamageToOppsThisTurn
 Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)\nFlying\n{R}{R}{R}: Return Skarrgan Firebird from your graveyard to your hand. Activate only if an opponent was dealt damage this turn.
diff --git a/forge-gui/res/cardsfolder/s/skirk_alarmist.txt b/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
index ba869be08e9..c1bd2d5f393 100644
--- a/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
+++ b/forge-gui/res/cardsfolder/s/skirk_alarmist.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Human Wizard
 PT:1/2
 K:Haste
-A:AB$ SetState | Cost$ T | ValidTgts$ Creature.YouCtrl+faceDown | Mode$ TurnFace | SubAbility$ DBDelTrig | SpellDescription$ Turn target face-down creature you control face up. At the beginning of the next end step, sacrifice it.
+A:AB$ SetState | Cost$ T | ValidTgts$ Creature.YouCtrl+faceDown | Mode$ TurnFace | SubAbility$ DBPump | SpellDescription$ Turn target face-down creature you control face up. At the beginning of the next end step, sacrifice it.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | AtEOT$ Sacrifice
 AI:RemoveDeck:All
 Oracle:Haste\n{T}: Turn target face-down creature you control face up. At the beginning of the next end step, sacrifice it.
diff --git a/forge-gui/res/cardsfolder/t/touch_of_moonglove.txt b/forge-gui/res/cardsfolder/t/touch_of_moonglove.txt
index 7640f86d04a..016b2c55151 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_moonglove.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_moonglove.txt
@@ -3,6 +3,6 @@ ManaCost:B
 Types:Instant
 A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ Deathtouch | RememberObjects$ Targeted | SubAbility$ DBMoonglove | SpellDescription$ Target creature you control gets +1/+0 and gains deathtouch until end of turn. Whenever a creature dealt damage by that creature dies this turn, its controller loses 2 life. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
 SVar:DBMoonglove:DB$ Effect | Triggers$ MoongloveTrigger | RememberObjects$ Remembered | StackDescription$ Whenever a creature dealt damage by that creature dies this turn, its controller loses 2 life.
-SVar:MoongloveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedByRemembered | TriggerZones$ Command | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature dealt damage by that creature dies this turn, its controller loses 2 life.
+SVar:MoongloveTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy Remembered | TriggerZones$ Command | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature dealt damage by that creature dies this turn, its controller loses 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
 Oracle:Target creature you control gets +1/+0 and gains deathtouch until end of turn. Whenever a creature dealt damage by that creature dies this turn, its controller loses 2 life. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/u/unscythe_killer_of_kings.txt b/forge-gui/res/cardsfolder/u/unscythe_killer_of_kings.txt
index d58f6850bc9..df4df4ba31d 100644
--- a/forge-gui/res/cardsfolder/u/unscythe_killer_of_kings.txt
+++ b/forge-gui/res/cardsfolder/u/unscythe_killer_of_kings.txt
@@ -3,7 +3,7 @@ ManaCost:U B B R
 Types:Legendary Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ First Strike | Description$ Equipped creature gets +3/+3 and has first strike.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedByEquipped | Execute$ UnscytheTrigExile | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a creature dealt damage by equipped creature this turn dies, you may exile that card. If you do, create a 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy Equipped | Execute$ UnscytheTrigExile | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a creature dealt damage by equipped creature this turn dies, you may exile that card. If you do, create a 2/2 black Zombie creature token.
 SVar:UnscytheTrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ UnscytheDBToken
 SVar:UnscytheDBToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ UnscytheDBCleanup
 SVar:UnscytheDBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/dragon_cultist.txt b/forge-gui/res/cardsfolder/upcoming/dragon_cultist.txt
new file mode 100644
index 00000000000..e46bd1c639d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/dragon_cultist.txt
@@ -0,0 +1,9 @@
+Name:Dragon Cultist
+ManaCost:4 R
+Types:Legendary Enchantment Background
+S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ TrigDragon | Description$ Commander creatures you own have "At the beginning of your end step, if a source you controlled dealt 5 or more damage this turn, create a 4/4 red Dragon creature token with flying."
+SVar:TrigDragon:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckDefinedPlayer$ You.damageDoneSingleSource GE5 | Execute$ DBDragon | TriggerDescription$ At the beginning of your end step, if a source you controlled dealt 5 or more damage this turn, create a 4/4 red Dragon creature token with flying.
+SVar:DBDragon:DB$ Token | TokenScript$ r_4_4_dragon_flying
+DeckHas:Ability$Token & Type$Dragon
+AI:RemoveDeck:NonCommander
+Oracle:Commander creatures you own have "At the beginning of your end step, if a source you controlled dealt 5 or more damage this turn, create a 4/4 red Dragon creature token with flying."
diff --git a/forge-gui/res/cardsfolder/upcoming/gnoll_war_band.txt b/forge-gui/res/cardsfolder/upcoming/gnoll_war_band.txt
new file mode 100644
index 00000000000..ca21162fc94
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gnoll_war_band.txt
@@ -0,0 +1,9 @@
+Name:Gnoll War Band
+ManaCost:5 R
+Types:Creature Gnoll
+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 opponent who was dealt damage this turn.
+SVar:X:PlayerCountOpponents$HasPropertywasDealtDamageThisTurn
+K:Menace
+K:Myriad
+Oracle:This spell costs {1} less to cast for each opponent who was dealt damage this turn.\nMenace\nMyriad
diff --git a/forge-gui/res/cardsfolder/upcoming/indulge_excess.txt b/forge-gui/res/cardsfolder/upcoming/indulge_excess.txt
new file mode 100644
index 00000000000..2358538d66a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/indulge_excess.txt
@@ -0,0 +1,22 @@
+Name:Indulge
+ManaCost:2 R
+Types:Sorcery
+A:SP$ Effect | CounterType$ P1P1 | CounterNum$ 3 | Triggers$ TriggerAttacks | AddSVar$ AE | SpellDescription$ Whenever a creature you control attacks this turn, create a 1/1 green and white Citizen creature token that's tapped and attacking.
+SVar:TriggerAttacks:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a creature you control attacks this turn, create a 1/1 green and white Citizen creature token that's tapped and attacking.
+SVar:TrigToken:DB$ Token | TokenScript$ gw_1_1_citizen | TokenTapped$ True | TokenAttacking$ True
+SVar:AE:SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Token & Type$Citizen
+AlternateMode:Split
+Oracle:Whenever a creature you control attacks this turn, create a 1/1 green and white Citizen creature token that's tapped and attacking.
+
+ALTERNATE
+
+Name:Excess
+ManaCost:1 R
+Types:Sorcery
+K:Aftermath
+A:SP$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac | SpellDescription$ Create a Treasure token for each creature you controlled that dealt combat damage to a player this turn.
+SVar:X:Count$NumCombatDamageThisTurn Creature.YouCtrl Player
+DeckHas:Ability$Token|Sacrifice|Graveyard & Type$Artifact|Treasure
+SVar:NeedsToPlayVar:X GE3
+Oracle:Aftermath (Cast this spell only from your graveyard. Then exile it.)\nCreate a Treasure token for each creature you controlled that dealt combat damage to a player this turn.
diff --git a/forge-gui/res/cardsfolder/w/war_elemental.txt b/forge-gui/res/cardsfolder/w/war_elemental.txt
index 5a840ab8e8b..509d4f84f54 100644
--- a/forge-gui/res/cardsfolder/w/war_elemental.txt
+++ b/forge-gui/res/cardsfolder/w/war_elemental.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless an opponent was dealt damage this turn.
 SVar:TrigSac:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ WarElementalX | ConditionSVarCompare$ EQ0
-SVar:WarElementalX:Count$TotalOppDamageThisTurn
+SVar:WarElementalX:PlayerCountPropertyYou$DamageToOppsThisTurn
 T:Mode$ DamageDoneOnce | ValidSource$ Card | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent is dealt damage, put that many +1/+1 counters on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ WarElementalY
 SVar:WarElementalY:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/w/wicked_akuba.txt b/forge-gui/res/cardsfolder/w/wicked_akuba.txt
index 66af74d7b07..4f3783e1e35 100644
--- a/forge-gui/res/cardsfolder/w/wicked_akuba.txt
+++ b/forge-gui/res/cardsfolder/w/wicked_akuba.txt
@@ -2,5 +2,5 @@ Name:Wicked Akuba
 ManaCost:B B
 Types:Creature Spirit
 PT:2/2
-A:AB$ LoseLife | Cost$ B | ValidTgts$ Player.wasDealtDamageThisTurnBy Self | TgtPrompt$ Select target player that was dealt damage this turn | LifeAmount$ 1 | SpellDescription$ Target player dealt damage by CARDNAME this turn loses 1 life.
+A:AB$ LoseLife | Cost$ B | ValidTgts$ Player.wasDealtDamageThisTurnBySource | TgtPrompt$ Select target player that was dealt damage this turn | LifeAmount$ 1 | SpellDescription$ Target player dealt damage by CARDNAME this turn loses 1 life.
 Oracle:{B}: Target player dealt damage by Wicked Akuba this turn loses 1 life.

From a536a340d21601782c38314842ce50ee67a18e49 Mon Sep 17 00:00:00 2001
From: Hans Mackowiak <hanmac@gmx.de>
Date: Mon, 4 Jul 2022 17:13:34 +0200
Subject: [PATCH 142/309] Blitz Again (#1001)

---
 .../main/java/forge/game/CardTraitBase.java   | 11 ++++++++
 .../src/main/java/forge/game/GameAction.java  |  9 ++++++
 .../src/main/java/forge/game/card/Card.java   |  7 +++++
 .../java/forge/game/card/CardFactory.java     |  8 ++++++
 .../java/forge/game/card/CardFactoryUtil.java | 20 ++++++++++---
 .../java/forge/game/card/CardProperty.java    | 16 +++++++++++
 .../forge/game/keyword/KeywordInstance.java   | 28 ++++++++++++++++---
 .../forge/game/keyword/KeywordInterface.java  |  2 ++
 8 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index c10cc1a01d2..b393a4d389c 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -20,6 +20,7 @@ import forge.game.card.CardPredicates;
 import forge.game.card.CardState;
 import forge.game.card.CardView;
 import forge.game.card.IHasCardView;
+import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
@@ -34,6 +35,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
     /** The host card. */
     protected Card hostCard;
     protected CardState cardState = null;
+    protected KeywordInterface keyword = null;
 
     /** The map params. */
     protected Map<String, String> originalMapParams = Maps.newHashMap(),
@@ -138,6 +140,14 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
         this.hostCard = c;
     }
 
+    public KeywordInterface getKeyword() {
+        return this.keyword;
+    }
+    
+    public void setKeyword(final KeywordInterface kw) {
+        this.keyword = kw;
+    }
+    
     /**
      * <p>
      * isSecondary.
@@ -667,6 +677,7 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView,
         copy.setCardState(cardState);
         // dont use setHostCard to not trigger the not copied parts yet
         copy.hostCard = host;
+        copy.keyword = this.keyword;
     }
 
     abstract public List<Object> getTriggerRemembered();
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index d889c460c84..2d8b14adc96 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -296,6 +296,14 @@ public class GameAction {
 
                 // copy bestow timestamp
                 copied.setBestowTimestamp(c.getBestowTimestamp());
+
+                if (cause != null && cause.isSpell() && c.equals(cause.getHostCard())) {
+                    copied.setCastSA(cause);
+                    KeywordInterface kw = cause.getKeyword();
+                    if (kw != null) {
+                        copied.addKeywordForStaticAbility(kw);
+                    }
+                }
             } else {
                 // when a card leaves the battlefield, ensure it's in its original state
                 // (we need to do this on the object before copying it, or it won't work correctly e.g.
@@ -504,6 +512,7 @@ public class GameAction {
                             }
                         }
                         if (keepKeyword) {
+                            ki.setHostCard(copied);
                             newKw.add(ki);
                         }
                     }
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 801e02076dc..ef63ba39d97 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -4458,6 +4458,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         KeywordInterface result;
         if (staticId < 1 || !storedKeywords.contains(staticId, kw)) {
             result = Keyword.getInstance(kw);
+            result.setStaticId(staticId);
             result.createTraits(this, false);
             if (staticId > 0) {
                 storedKeywords.put(staticId, kw, result);
@@ -4467,6 +4468,12 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         }
         return result;
     }
+    
+    public final void addKeywordForStaticAbility(KeywordInterface kw) {
+        if (kw.getStaticId() > 0) {
+            storedKeywords.put(kw.getStaticId(), kw.getOriginal(), kw);
+        }
+    }
 
     public final void addChangedCardKeywordsByText(final List<KeywordInterface> keywords, final long timestamp, final long staticId, final boolean updateView) {
         // keywords should already created for Card, so no addKeywordsToCard
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 bd6c3dfe073..257d9c0c3c4 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -29,6 +29,7 @@ import forge.game.Game;
 import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.cost.Cost;
+import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
 import forge.game.replacement.ReplacementHandler;
 import forge.game.spellability.*;
@@ -203,6 +204,13 @@ public class CardFactory {
         } else {
             copySA = targetSA.copy(c, controller, false);
             c.setCastSA(copySA);
+            // need to copy keyword
+            if (targetSA.getKeyword() != null) {
+                KeywordInterface kw = targetSA.getKeyword().copy(c, false);
+                copySA.setKeyword(kw);
+                // need to add the keyword to so static doesn't make new keyword
+                c.addKeywordForStaticAbility(kw);
+            }
         }
 
         copySA.setCopied(true);
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 9bfbb1da957..3f454c027cf 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3448,9 +3448,21 @@ public class CardFactoryUtil {
             st.setSVar("AffinityX", "Count$Valid " + t + ".YouCtrl");
             inst.addStaticAbility(st);
         } else if (keyword.startsWith("Blitz")) {
-            String effect = "Mode$ Continuous | Affected$ Card.Self+blitzed | AddKeyword$ Haste | AddTrigger$ Dies";
-            String trig = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | " +
-                    "Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card.";
+            final String[] k = keyword.split(":");
+            final String manacost = k[1];
+            final Cost cost = new Cost(manacost, false);
+
+            StringBuilder sb = new StringBuilder("Blitz");
+            if (!cost.isOnlyManaCost()) {
+                sb.append("—");
+            } else {
+                sb.append(" ");
+            }
+            sb.append(cost.toSimpleString());
+            String effect = "Mode$ Continuous | Affected$ Card.Self+blitzed+castKeyword | AddKeyword$ Haste | AddTrigger$ Dies"
+                    + " | Secondary$ True | Description$ " + sb.toString() + " (" + inst.getReminderText() + ")";
+            String trig = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self" +
+                    " | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ When this creature dies, draw a card.";
             String ab = "DB$ Draw | NumCards$ 1";
 
             StaticAbility st = StaticAbility.create(effect, state.getCard(), state, intrinsic);
@@ -3524,7 +3536,7 @@ public class CardFactoryUtil {
 
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
         } else if (keyword.startsWith("Dash")) {
-            String effect = "Mode$ Continuous | Affected$ Card.Self+dashed | AddKeyword$ Haste";
+            String effect = "Mode$ Continuous | Affected$ Card.Self+dashed+castKeyword | AddKeyword$ Haste";
             inst.addStaticAbility(StaticAbility.create(effect, state.getCard(), state, intrinsic));
         } else if (keyword.equals("Daybound")) {
             String effect = "Mode$ CantTransform | ValidCard$ Creature.Self | ExceptCause$ SpellAbility.Daybound | Secondary$ True | Description$ This permanent can't be transformed except by its daybound ability.";
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 b4398108a2a..5458a62bff5 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -34,6 +34,7 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 public class CardProperty {
@@ -1808,6 +1809,21 @@ public class CardProperty {
             if (card.hasCounters()) {
                 return false;
             }
+        } else if (property.equals("castKeyword")) {
+            SpellAbility castSA = card.getCastSA();
+            if (castSA == null) {
+                return false;
+            }
+            // intrinsic keyword might be a new one when the zone changes
+            if (castSA.isIntrinsic()) {
+                // so just check if the static is intrinsic too
+                if (!spellAbility.isIntrinsic()) {
+                    return false;
+                }
+            } else {
+                // otherwise check for keyword object
+                return Objects.equals(castSA.getKeyword(), spellAbility.getKeyword());
+            }
         } else if (property.startsWith("CastSa"))  {
             SpellAbility castSA = card.getCastSA();
             if (castSA == null) {
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java b/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
index 8bc119f91f3..7b37656fb64 100644
--- a/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
+++ b/forge-game/src/main/java/forge/game/keyword/KeywordInstance.java
@@ -22,6 +22,7 @@ import io.sentry.Sentry;
 public abstract class KeywordInstance<T extends KeywordInstance<?>> implements KeywordInterface {
     private Keyword keyword;
     private String original;
+    private long staticId = 0;
 
     private List<Trigger> triggers = Lists.newArrayList();
     private List<ReplacementEffect> replacements = Lists.newArrayList();
@@ -181,6 +182,7 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
      * @see forge.game.keyword.KeywordInterface#addTrigger(forge.game.trigger.Trigger)
      */
     public final void addTrigger(final Trigger trg) {
+        trg.setKeyword(this);
         triggers.add(trg);
     }
 
@@ -189,6 +191,7 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
      * @see forge.game.keyword.KeywordInterface#addReplacement(forge.game.replacement.ReplacementEffect)
      */
     public final void addReplacement(final ReplacementEffect trg) {
+        trg.setKeyword(this);
         replacements.add(trg);
     }
 
@@ -197,6 +200,7 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
      * @see forge.game.keyword.KeywordInterface#addSpellAbility(forge.game.spellability.SpellAbility)
      */
     public final void addSpellAbility(final SpellAbility s) {
+        s.setKeyword(this);
         abilities.add(s);
     }
 
@@ -205,6 +209,7 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
      * @see forge.game.keyword.KeywordInterface#addStaticAbility(forge.game.staticability.StaticAbility)
      */
     public final void addStaticAbility(final StaticAbility st) {
+        st.setKeyword(this);
         staticAbilities.add(st);
     }
 
@@ -247,22 +252,30 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
 
             result.abilities = Lists.newArrayList();
             for (SpellAbility sa : this.abilities) {
-                result.abilities.add(sa.copy(host, lki));
+                SpellAbility copy = sa.copy(host, lki);
+                copy.setKeyword(result);
+                result.abilities.add(copy);
             }
 
             result.triggers = Lists.newArrayList();
             for (Trigger tr : this.triggers) {
-                result.triggers.add(tr.copy(host, lki));
+                Trigger copy = tr.copy(host, lki);
+                copy.setKeyword(result);
+                result.triggers.add(copy);
             }
 
             result.replacements = Lists.newArrayList();
             for (ReplacementEffect re : this.replacements) {
-                result.replacements.add(re.copy(host, lki));
+                ReplacementEffect copy = re.copy(host, lki);
+                copy.setKeyword(result);
+                result.replacements.add(copy);
             }
 
             result.staticAbilities = Lists.newArrayList();
             for (StaticAbility sa : this.staticAbilities) {
-                result.staticAbilities.add(sa.copy(host, lki));
+                StaticAbility copy = sa.copy(host, lki);
+                copy.setKeyword(result);
+                result.staticAbilities.add(copy);
             }
 
             return result;
@@ -327,4 +340,11 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
             sa.setIntrinsic(value);
         }
     }
+    
+    public long getStaticId() {
+        return this.staticId;
+    }
+    public void setStaticId(long v) {
+        this.staticId = v;
+    }
 }
diff --git a/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java b/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java
index a46a555fd3c..43620f225ca 100644
--- a/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java
+++ b/forge-game/src/main/java/forge/game/keyword/KeywordInterface.java
@@ -18,6 +18,8 @@ public interface KeywordInterface extends Cloneable {
     String getReminderText();
 
     int getAmount();
+    long getStaticId();
+    void setStaticId(long v);
 
     void createTraits(final Card host, final boolean intrinsic);
     void createTraits(final Card host, final boolean intrinsic, final boolean clear);

From ebc92dc90f4b78754250dd85f3f145af3e73e99a Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Mon, 4 Jul 2022 11:14:14 -0400
Subject: [PATCH 143/309] CLB: Vhal, Candlekeep Researcher and support (#1022)

* AbilityManaPart.meetsManaRestrictions add zone restrictions

* vhal_candelkeep_researcher.txt

* AbilityManaPart.meetsManaRestrictions tidier

* AbilityManaPart.meetsManaRestrictions fix for AI
---
 .../game/spellability/AbilityManaPart.java     | 18 ++++++++++++++++++
 .../upcoming/vhal_candelkeep_researcher.txt    | 10 ++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/vhal_candelkeep_researcher.txt

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 2261081fc6d..bf31cc6a915 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -42,6 +42,8 @@ import forge.game.replacement.ReplacementType;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerHandler;
 import forge.game.trigger.TriggerType;
+import forge.game.zone.ZoneType;
+import forge.game.zone.Zone;
 import forge.util.TextUtil;
 
 /**
@@ -339,10 +341,26 @@ public class AbilityManaPart implements java.io.Serializable {
                 continue;
             }
 
+            //handled in meetsManaShardRestrictions
             if (restriction.equals("CantPayGenericCosts")) {
                 return true;
             }
 
+            // "can't" zone restriction – shouldn't be mixed with other restrictions
+            if (restriction.startsWith("CantCastSpellFrom")) {
+                if (!sa.isSpell()) { //
+                    return true;
+                }
+                final ZoneType badZone = ZoneType.smartValueOf(restriction.substring(17));
+                final Card host = sa.getHostCard();
+                final Zone castFrom = host.getCastFrom();
+                //ComputerUtilMana looks at this to see if AI can cast things, so need a fallback zone
+                final ZoneType zone = castFrom == null ? host.getZone().getZoneType() : castFrom.getZoneType();
+                if (!badZone.equals(zone)) {
+                    return true;
+                }
+            }
+
             // the payment is for a resolving SA, currently no other restrictions would allow that
             if (getSourceCard().getGame().getStack().getInstanceFromSpellAbility(sa.getRootAbility()) != null) {
                 return false;
diff --git a/forge-gui/res/cardsfolder/upcoming/vhal_candelkeep_researcher.txt b/forge-gui/res/cardsfolder/upcoming/vhal_candelkeep_researcher.txt
new file mode 100644
index 00000000000..cf44ac5a66d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/vhal_candelkeep_researcher.txt
@@ -0,0 +1,10 @@
+Name:Vhal, Candlekeep Researcher
+ManaCost:3 U
+Types:Legendary Creature Human Wizard
+PT:2/3
+K:Vigilance
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | RestrictValid$ CantCastSpellFromHand | SpellDescription$ Add an amount of {C} equal to CARDNAME's toughness. This mana can't be spent to cast spells from your hand.
+SVar:X:Count$CardToughness
+K:Choose a Background
+AI:RemoveDeck:Random
+Oracle:Vigilance\n{T}: Add an amount of {C} equal to Vhal, Candlekeep Researcher's toughness. This mana can't be spent to cast spells from your hand.\nChoose a Background (You can have a Background as a second commander.)

From 2ee5755085213d0af58656bf59dffe8ed84ca0fe Mon Sep 17 00:00:00 2001
From: Xavier Morin Duchesne <xmorinduchesne@gmail.com>
Date: Mon, 4 Jul 2022 11:58:26 -0400
Subject: [PATCH 144/309] Created card script for Jon Irenicus, Shattered One.

---
 .../upcoming/jon_irenicus_shattered_one.txt   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
new file mode 100644
index 00000000000..361bb403975
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
@@ -0,0 +1,26 @@
+Name:Jon Irenicus, Shattered One
+ManaCost:2 U B
+Types:Legendary Creature Elf Wizard
+PT:3/3
+Oracle:At the beginning of your end step, target opponent gains control of up to one target creature you control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains "This creature can't be sacrificed." (It attacks each combat if able and attacks a player other than you if able.)\nWhenever a creature you own but don't control attacks, you draw a card.
+#
+#########################################################################################################
+# At the beginning of your end step, target opponent gains control of up to one target creature you	#
+# control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains	#
+# "This creature can't be sacrificed." 									#
+#########################################################################################################
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control (This is a test #29).
+SVar:DBSelectRecipient:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDonate
+SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters | StackDescription$ Test {p:Targeted}
+SVar:DBPutCounters:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 2 | RememberCards$ True | SubAbility$ DBTap
+SVar:DBTap:DB$ Tap | Defined$ Targeted | SubAbility$ DBGoad
+SVar:DBGoad:DB$ Goad | Defined$ Targeted | SubAbility$ DBDisableSacing
+SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent | SubAbility$ DBCleanUp
+SVar:SCantSac:Mode$ CantSacrifice | ValidCard$ Card.Self | Description$ This creature cannot be sacrificed.
+SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
+#
+#########################################################################################################
+# Whenever a creature you own but don't control attacks, you draw a card.				# 
+#########################################################################################################
+T:Mode$ Attacks | ValidCard$ Creature.OppCtrl | ValidCard$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ DrawACard | TriggerDescription$ Whenever a creature you own but don't control attacks, you draw a card.
+SVar:DrawACard:DB$ Draw | Defined$ You | NumCards$ 1

From 321516f6919361142d94d8d293ff947ecfe6d241 Mon Sep 17 00:00:00 2001
From: Xavier Morin Duchesne <xmorinduchesne@gmail.com>
Date: Mon, 4 Jul 2022 12:04:45 -0400
Subject: [PATCH 145/309] Cleaning up card script.

---
 .../upcoming/jon_irenicus_shattered_one.txt          | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
index 361bb403975..b72a4c1b8f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
@@ -2,13 +2,6 @@ Name:Jon Irenicus, Shattered One
 ManaCost:2 U B
 Types:Legendary Creature Elf Wizard
 PT:3/3
-Oracle:At the beginning of your end step, target opponent gains control of up to one target creature you control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains "This creature can't be sacrificed." (It attacks each combat if able and attacks a player other than you if able.)\nWhenever a creature you own but don't control attacks, you draw a card.
-#
-#########################################################################################################
-# At the beginning of your end step, target opponent gains control of up to one target creature you	#
-# control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains	#
-# "This creature can't be sacrificed." 									#
-#########################################################################################################
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control (This is a test #29).
 SVar:DBSelectRecipient:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDonate
 SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters | StackDescription$ Test {p:Targeted}
@@ -18,9 +11,6 @@ SVar:DBGoad:DB$ Goad | Defined$ Targeted | SubAbility$ DBDisableSacing
 SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent | SubAbility$ DBCleanUp
 SVar:SCantSac:Mode$ CantSacrifice | ValidCard$ Card.Self | Description$ This creature cannot be sacrificed.
 SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
-#
-#########################################################################################################
-# Whenever a creature you own but don't control attacks, you draw a card.				# 
-#########################################################################################################
 T:Mode$ Attacks | ValidCard$ Creature.OppCtrl | ValidCard$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ DrawACard | TriggerDescription$ Whenever a creature you own but don't control attacks, you draw a card.
 SVar:DrawACard:DB$ Draw | Defined$ You | NumCards$ 1
+Oracle:At the beginning of your end step, target opponent gains control of up to one target creature you control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains "This creature can't be sacrificed." (It attacks each combat if able and attacks a player other than you if able.)\nWhenever a creature you own but don't control attacks, you draw a card.

From d1e1adf46dc0feeac4cf1ad7990d87c96b2b3c20 Mon Sep 17 00:00:00 2001
From: Xavier Morin Duchesne <xmorinduchesne@gmail.com>
Date: Mon, 4 Jul 2022 13:25:57 -0400
Subject: [PATCH 146/309] Cleaned up descriptions, added Duration$ Permanent to
 goaded, and fixed ValidCard$ for Attacks trigger.

---
 .../upcoming/jon_irenicus_shattered_one.txt         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
index b72a4c1b8f9..7a9686af9e8 100644
--- a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
@@ -2,15 +2,14 @@ Name:Jon Irenicus, Shattered One
 ManaCost:2 U B
 Types:Legendary Creature Elf Wizard
 PT:3/3
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control (This is a test #29).
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control.
 SVar:DBSelectRecipient:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDonate
-SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters | StackDescription$ Test {p:Targeted}
-SVar:DBPutCounters:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 2 | RememberCards$ True | SubAbility$ DBTap
+SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters
+SVar:DBPutCounters:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBTap
 SVar:DBTap:DB$ Tap | Defined$ Targeted | SubAbility$ DBGoad
-SVar:DBGoad:DB$ Goad | Defined$ Targeted | SubAbility$ DBDisableSacing
-SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent | SubAbility$ DBCleanUp
+SVar:DBGoad:DB$ Goad | Defined$ Targeted | Duration$ Permanent | SubAbility$ DBDisableSacing
+SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent
 SVar:SCantSac:Mode$ CantSacrifice | ValidCard$ Card.Self | Description$ This creature cannot be sacrificed.
-SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
-T:Mode$ Attacks | ValidCard$ Creature.OppCtrl | ValidCard$ Creature.YouOwn | TriggerZones$ Battlefield | Execute$ DrawACard | TriggerDescription$ Whenever a creature you own but don't control attacks, you draw a card.
+T:Mode$ Attacks | ValidCard$ Creature.YouDontCtrl+YouOwn | TriggerZones$ Battlefield | Execute$ DrawACard | TriggerDescription$ Whenever a creature you own but don't control attacks, you draw a card.
 SVar:DrawACard:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:At the beginning of your end step, target opponent gains control of up to one target creature you control. Put two +1/+1 counters on it and tap it. It's goaded for the rest of the game and it gains "This creature can't be sacrificed." (It attacks each combat if able and attacks a player other than you if able.)\nWhenever a creature you own but don't control attacks, you draw a card.

From 4333d95f5beaa3287ab1f546381fd44379f13bd0 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 4 Jul 2022 15:21:59 -0400
Subject: [PATCH 147/309] shadowheart_dark_justiciar.txt use X:Sacrificed

---
 .../res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt b/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt
index bd7729a1270..8921ca88bc2 100644
--- a/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shadowheart_dark_justiciar.txt
@@ -2,8 +2,8 @@ Name:Shadowheart, Dark Justiciar
 ManaCost:3 B
 Types:Legendary Creature Human Elf Cleric
 PT:3/4
-A:AB$ Draw | Cost$ 1 B T Sac<1/Creature.Other/another creature> | RememberCostCards$ True | NumCards$ X | IfDesc$ True | SpellDescription$ Draw X cards, where X is that creature's power.
-SVar:X:RememberedLKI$CardPower
+A:AB$ Draw | Cost$ 1 B T Sac<1/Creature.Other/another creature> | NumCards$ X | IfDesc$ True | SpellDescription$ Draw X cards, where X is that creature's power.
+SVar:X:Sacrificed$CardPower
 K:Choose a Background
 DeckHas:Ability$Sacrifice
 Oracle:{1}{B}, {T}, Sacrifice another creature: Draw X cards, where X is that creature's power.\nChoose a Background (You can have a Background as a second commander.)

From a9043a193ab7c8490cf3d28dc2037f7474993ee0 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 4 Jul 2022 22:06:19 +0100
Subject: [PATCH 148/309] Game Night 2022 edition file

---
 forge-gui/res/editions/Game Night 2022.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 forge-gui/res/editions/Game Night 2022.txt

diff --git a/forge-gui/res/editions/Game Night 2022.txt b/forge-gui/res/editions/Game Night 2022.txt
new file mode 100644
index 00000000000..c276b56609c
--- /dev/null
+++ b/forge-gui/res/editions/Game Night 2022.txt	
@@ -0,0 +1,13 @@
+[metadata]
+Code=GN3
+Date=2022-10-14
+Name=Game Night 2022
+Type=Multiplayer
+ScryfallCode=GN3
+
+[cards]
+1 M Zamriel, Seraph of Steel @Chris Rallis
+2 M Maeve, Insidious Singer @Jason Rainville
+3 M Vogar, Necropolis Tyrant @Jason A. Engle
+4 M Nogi, Draco-Zealot @Dmitry Burmak
+6 M Imaryll, Elfhame Elite @Ryan Pancoast

From 8ecec15f0a91aeec468fc7d44c4206f1b7d51e37 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 4 Jul 2022 22:09:05 +0100
Subject: [PATCH 149/309] number fix

---
 forge-gui/res/editions/Game Night 2022.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/editions/Game Night 2022.txt b/forge-gui/res/editions/Game Night 2022.txt
index c276b56609c..b784d57ac9b 100644
--- a/forge-gui/res/editions/Game Night 2022.txt	
+++ b/forge-gui/res/editions/Game Night 2022.txt	
@@ -10,4 +10,4 @@ ScryfallCode=GN3
 2 M Maeve, Insidious Singer @Jason Rainville
 3 M Vogar, Necropolis Tyrant @Jason A. Engle
 4 M Nogi, Draco-Zealot @Dmitry Burmak
-6 M Imaryll, Elfhame Elite @Ryan Pancoast
+5 M Imaryll, Elfhame Elite @Ryan Pancoast

From e1c08ef5af3da2840b409df6e7e213e5b3fc536d Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 5 Jul 2022 00:17:47 -0500
Subject: [PATCH 150/309] Add Mirror of Life Trapping

Add Mirror of Life Trapping
---
 .../cardsfolder/upcoming/mirror_of_life_trapping.txt   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/mirror_of_life_trapping.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/mirror_of_life_trapping.txt b/forge-gui/res/cardsfolder/upcoming/mirror_of_life_trapping.txt
new file mode 100644
index 00000000000..f618de10b09
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mirror_of_life_trapping.txt
@@ -0,0 +1,10 @@
+Name:Mirror of Life Trapping
+ManaCost:4
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.wasCast | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature enters the battlefield, if it was cast, exile it, then return all other permanent cards exiled with CARDNAME to the battlefield under their owners' control.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ TriggeredCardLKICopy | Imprint$ True | SubAbility$ TrigReturn
+SVar:TrigReturn:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Battlefield | ChangeType$ Permanent.ExiledWithSource+IsNotImprinted | SubAbility$ DBCleanup
+T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
+AI:RemoveDeck:Random
+Oracle:Whenever a creature enters the battlefield, if it was cast, exile it, then return all other permanent cards exiled with Mirror of Life Trapping to the battlefield under their owners' control.

From 1df114d6940e11fd095ca7df38c6f90cc4443250 Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Tue, 5 Jul 2022 01:28:01 -0400
Subject: [PATCH 151/309] GN3: Maeve, Insidious Singer (+implement
 GoadEffect.getStackDescription) (#1034)

* maeve_insidious_singer.txt

* GoadEffect.getStackDescription
---
 .../forge/game/ability/effects/GoadEffect.java   | 16 ++++++++++++++++
 .../upcoming/maeve_insidious_singer.txt          |  9 +++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/maeve_insidious_singer.txt

diff --git a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
index be2e7579c3d..69efb0dfe33 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
@@ -7,9 +7,25 @@ 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 java.util.List;
 
 public class GoadEffect extends SpellAbilityEffect {
 
+    @Override
+    protected String getStackDescription(SpellAbility sa) {
+        final Player player = sa.getActivatingPlayer();
+        List<Card> tgt = getTargetCards(sa);
+        if (tgt.size() <= 0) {
+            return "";
+        } else {
+            final StringBuilder sb = new StringBuilder();
+            sb.append(player).append(" goads ").append(Lang.joinHomogenous(tgt)).append(".");
+            return sb.toString();
+        }
+    }
+
     @Override
     public void resolve(SpellAbility sa) {
         final Player player = sa.getActivatingPlayer();
diff --git a/forge-gui/res/cardsfolder/upcoming/maeve_insidious_singer.txt b/forge-gui/res/cardsfolder/upcoming/maeve_insidious_singer.txt
new file mode 100644
index 00000000000..26cf9ca628e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/maeve_insidious_singer.txt
@@ -0,0 +1,9 @@
+Name:Maeve, Insidious Singer
+ManaCost:2 U U
+Types:Legendary Creature Siren
+PT:3/4
+A:AB$ Goad | Cost$ 2 U | ValidTgts$ Creature | SubAbility$ DBEffect | SpellDescription$ Goad target creature.
+SVar:DBEffect:DB$ Effect | Triggers$ TrigAttacks | RememberObjects$ Targeted | SpellDescription$ Whenever that creature attacks one of your opponents this turn, you draw a card. (A goaded creature attacks each combat if able and attacks a player other than you if able, until your next turn.)
+SVar:TrigAttacks:Mode$ Attacks | ValidCard$ Creature.IsRemembered | Attacked$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever that creature attacks one of your opponents this turn, you draw a card. (A goaded creature attacks each combat if able and attacks a player other than you if able, until your next turn.)
+SVar:TrigDraw:DB$ Draw
+Oracle:{2}{U}: Goad target creature. Whenever that creature attacks one of your opponents this turn, you draw a card. (A goaded creature attacks each combat if able and attacks a player other than you if able, until your next turn.)

From dee309a9a7765adeb2176aa9a4fa95c4443ec39d Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Tue, 5 Jul 2022 06:29:48 +0100
Subject: [PATCH 152/309] GN 22 Nogi, Draco Zealot (#1025)

* Create nogi_draco_zealot.txt
---
 forge-gui/res/cardsfolder/upcoming/nogi_draco_zealot.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/nogi_draco_zealot.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/nogi_draco_zealot.txt b/forge-gui/res/cardsfolder/upcoming/nogi_draco_zealot.txt
new file mode 100644
index 00000000000..a5d7a7f23bc
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/nogi_draco_zealot.txt
@@ -0,0 +1,9 @@
+Name:Nogi, Draco-Zealot
+ManaCost:1 R R
+Types:Legendary Creature Kobold Shaman
+PT:3/3
+S:Mode$ ReduceCost | ValidCard$ Dragon | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Dragon spells you cast cost {1} less to cast.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigAnimate | IsPresent$ Permanent.dragon+YouCtrl | PresentCompare$ GE3 | TriggerDescription$ Whenever CARDNAME attacks, if you control three or more Dragons, until end of turn, NICKNAME becomes a Dragon with base power and toughness 5/5 and gains flying.
+SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Dragon | RemoveCreatureTypes$ True | Keywords$ Flying  | SpellDescription$ Until end of turn, CARDNAME becomes a Dragon with base power and toughness 5/5 and gains flying.
+DeckNeeds:Type$Dragon
+Oracle:Dragon spells you cast cost {1} less to cast.\nWhenever Nogi, Draco-Zealot attacks, if you control three or more Dragons, until end of turn, Nogi becomes a Dragon with base power and toughness 5/5 and gains flying.

From 3decca4752d88414d6689e159ae0c897b879620a Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Tue, 5 Jul 2022 10:23:49 +0200
Subject: [PATCH 153/309] Fix 2 NPE (#1036)

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
---
 .../game/ability/effects/CountersPutEffect.java  |  4 +++-
 .../java/forge/game/player/PlayerProperty.java   | 16 ++++++++++++----
 forge-gui/res/cardsfolder/t/turf_war.txt         |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index 50d4eb60ce0..74fe90383b4 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -231,7 +231,9 @@ public class CountersPutEffect extends SpellAbilityEffect {
             }
 
             Map<String, Object> params = Maps.newHashMap();
-            params.put("CounterType", counterType);
+            if (counterType != null) {
+                params.put("CounterType", counterType);
+            }
             if (sa.hasParam("DividedRandomly")) {
                 tgtObjects.addAll(choices);
             } else {
diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
index 887af2cd51c..9d14fe11f54 100644
--- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java
+++ b/forge-game/src/main/java/forge/game/player/PlayerProperty.java
@@ -3,6 +3,8 @@ package forge.game.player;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import forge.game.CardTraitBase;
 import forge.game.Game;
@@ -221,10 +223,16 @@ public class PlayerProperty {
                 return false;
             }
         } else if (property.startsWith("controls")) {
-            final String[] type = property.substring(8).split("_");
-            final CardCollectionView list = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), type[0], sourceController, source, spellAbility);
-            String comparator = type.length > 1 ? type[1] : "GE";
-            int y = type.length > 1 ? AbilityUtils.calculateAmount(source, comparator.substring(2), spellAbility) : 1;
+            // this allows escaping _ with \ in case of complex restrictions (used on Turf War)
+            List<String> type = new ArrayList<>();
+            Pattern regex = Pattern.compile("(?:\\\\.|[^_\\\\]++)+");
+            Matcher regexMatcher = regex.matcher(property.substring(8));
+            while (regexMatcher.find()) {
+                type.add(regexMatcher.group());
+            } 
+            final CardCollectionView list = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), type.get(0).replace("\\_", "_"), sourceController, source, spellAbility);
+            String comparator = type.size() > 1 ? type.get(1) : "GE";
+            int y = type.size() > 1 ? AbilityUtils.calculateAmount(source, comparator.substring(2), spellAbility) : 1;
             if (!Expressions.compare(list.size(), comparator, y)) {
                 return false;
             }
diff --git a/forge-gui/res/cardsfolder/t/turf_war.txt b/forge-gui/res/cardsfolder/t/turf_war.txt
index 8487786dcb1..348c54bb793 100644
--- a/forge-gui/res/cardsfolder/t/turf_war.txt
+++ b/forge-gui/res/cardsfolder/t/turf_war.txt
@@ -4,6 +4,6 @@ Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, for each player, put a contested counter on target land that player controls.
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ CONTESTED | ValidTgts$ Land | TgtPrompt$ For each player, select a target land | TargetMin$ OneEach | TargetMax$ OneEach | TargetsWithDifferentControllers$ True
 SVar:OneEach:PlayerCountPlayers$Amount
-T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player.controlsLand+counters_GE1_CONTESTED | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever a creature deals combat damage to a player, if that player controls one or more lands with contested counters on them, that creature's controller gains control of one of those lands of their choice and untaps it.
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Player.controlsLand.counters\_GE1\_CONTESTED | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever a creature deals combat damage to a player, if that player controls one or more lands with contested counters on them, that creature's controller gains control of one of those lands of their choice and untaps it.
 SVar:TrigGainControl:DB$ GainControl | Choices$ Land.ControlledBy TriggeredTarget+counters_GE1_CONTESTED | Untap$ True | NewController$ TriggeredSourceController
 Oracle:When Turf War enters the battlefield, for each player, put a contested counter on target land that player controls.\nWhenever a creature deals combat damage to a player, if that player controls one or more lands with contested counters on them, that creature's controller gains control of one of those lands of their choice and untaps it.

From bf6d41672d58ec99ef71a457450023716c07ba1e Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Tue, 5 Jul 2022 06:49:10 -0400
Subject: [PATCH 154/309] CLB: Firkraag, Cunning Instigator and support (#1019)

* firkraag_cunning_instigator.txt

* CardProperty.cardHasProperty add "mustAttack"

* AttackRequirement.hasRequirement fix (thanks TRT)

* Add timestamp check

* Don't treat Trove of Temptation Requirement as Restriction

* Clean up

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
---
 .../java/forge/game/ability/AbilityUtils.java |  2 +-
 .../java/forge/game/card/CardProperty.java    |  6 ++
 .../forge/game/combat/AttackConstraints.java  |  9 +--
 .../forge/game/combat/AttackRequirement.java  | 46 +++++++------
 .../game/combat/GlobalAttackRestrictions.java | 69 +++----------------
 .../upcoming/firkraag_cunning_instigator.txt  | 14 ++++
 6 files changed, 62 insertions(+), 84 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/firkraag_cunning_instigator.txt

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 79bfd9181f8..668277ea322 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -147,7 +147,7 @@ public class AbilityUtils {
         } else if (defined.equals("TopOfGraveyard")) {
             final CardCollectionView grave = hostCard.getController().getCardsIn(ZoneType.Graveyard);
 
-            if (grave.size() > 0) { // TopOfLibrary or BottomOfLibrary
+            if (grave.size() > 0) {
                 c = grave.getLast();
             } else {
                 // we don't want this to fall through and return the "Self"
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 5458a62bff5..cc63af4777c 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -13,6 +13,7 @@ import forge.game.*;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.card.CardPredicates.Presets;
+import forge.game.combat.AttackRequirement;
 import forge.game.combat.AttackingBand;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
@@ -1689,6 +1690,11 @@ public class CardProperty {
             if (band == null || !band.getAttackers().contains(card)) {
                 return false;
             }
+        } else if (property.equals("hadToAttackThisCombat")) {
+            AttackRequirement e = game.getCombat().getAttackConstraints().getRequirements().get(card);
+            if (e == null || !e.hasCreatureRequirement() || !e.getAttacker().equalsWithTimestamp(card)) {
+                return false;
+            }
         } else if (property.equals("couldAttackButNotAttacking")) {
             if (!game.getPhaseHandler().isPlayerTurn(controller)) return false;
             return CombatUtil.couldAttackButNotAttacking(combat, card);
diff --git a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
index 27b508b1231..4628a64e4e8 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackConstraints.java
@@ -160,7 +160,7 @@ public class AttackConstraints {
                 }
             }
         }
-        myPossibleAttackers.removeAll((Iterable<Card>) attackersToRemove);
+        myPossibleAttackers.removeAll(attackersToRemove);
         for (final Card toRemove : attackersToRemove) {
             reqs.removeAll(findAll(reqs, toRemove));
         }
@@ -186,8 +186,9 @@ public class AttackConstraints {
         // Now try all others (plus empty attack) and count their violations
         final FCollection<Map<Card, GameEntity>> legalAttackers = collectLegalAttackers(reqs, myMax);
         possible.putAll(Maps.asMap(legalAttackers.asSet(), FN_COUNT_VIOLATIONS));
-        if (countViolations(Collections.emptyMap()) != -1) {
-            possible.put(Collections.emptyMap(), countViolations(Collections.emptyMap()));
+        int empty = countViolations(Collections.emptyMap());
+        if (empty != -1) {
+            possible.put(Collections.emptyMap(), empty);
         }
  
         // take the case with the fewest violations
@@ -392,7 +393,7 @@ public class AttackConstraints {
      *         restriction is violated.
      */
     public final int countViolations(final Map<Card, GameEntity> attackers) {
-        if (!globalRestrictions.isLegal(attackers, possibleAttackers)) {
+        if (!globalRestrictions.isLegal(attackers)) {
             return -1;
         }
         for (final Entry<Card, GameEntity> attacker : attackers.entrySet()) {
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 234453a2fa7..bbd1afdbb89 100644
--- a/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
+++ b/forge-game/src/main/java/forge/game/combat/AttackRequirement.java
@@ -107,8 +107,17 @@ public class AttackRequirement {
         }
     }
 
+    public Card getAttacker() {
+        return attacker;
+    }
+
     public boolean hasRequirement() {
-        return !defenderSpecific.isEmpty() || !causesToAttack.isEmpty() || !defenderOrPWSpecific.isEmpty();
+        return defenderSpecific.countAll() > 0 || causesToAttack.countAll() > 0 || defenderOrPWSpecific.countAll() > 0;
+    }
+
+    //  according to Firkraag ruling Trove of Temptation applies to players, not creatures
+    public boolean hasCreatureRequirement() {
+        return defenderSpecific.countAll() > 0 || causesToAttack.countAll() > 0;
     }
 
     public final MapToAmount<Card> getCausesToAttack() {
@@ -124,29 +133,24 @@ public class AttackRequirement {
         int violations = 0;
 
         // first. check to see if "must attack X or Y with at least one creature" requirements are satisfied
-        //List<GameEntity> toRemoveFromDefSpecific = Lists.newArrayList();
-        if (!defenderOrPWSpecific.isEmpty()) {
-            for (GameEntity def : defenderOrPWSpecific.keySet()) {
-                if (defenderSpecificAlternatives.containsKey(def)) {
-                    boolean isAttackingDefender = false;
-                    outer: for (Card atk : attackers.keySet()) {
-                        // is anyone attacking this defender or any of the alternative defenders?
-                        if (attackers.get(atk).equals(def)) {
-                            isAttackingDefender = true;
-                            break;
-                        }
-                        for (GameEntity altDef : defenderSpecificAlternatives.get(def)) {
-                            if (attackers.get(atk).equals(altDef)) {
-                                isAttackingDefender = true;
-                                break outer;
-                            }
-                        }
-                    }
-                    if (!isAttackingDefender && CombatUtil.getAttackCost(attacker.getGame(), attacker, def) == null) {
-                        violations++; // no one is attacking that defender or any of his PWs
+        for (GameEntity def : defenderOrPWSpecific.keySet()) {
+            boolean isAttackingDefender = false;
+            outer: for (Card atk : attackers.keySet()) {
+                // is anyone attacking this defender or any of the alternative defenders?
+                if (attackers.get(atk).equals(def)) {
+                    isAttackingDefender = true;
+                    break;
+                }
+                for (GameEntity altDef : defenderSpecificAlternatives.get(def)) {
+                    if (attackers.get(atk).equals(altDef)) {
+                        isAttackingDefender = true;
+                        break outer;
                     }
                 }
             }
+            if (!isAttackingDefender) {
+                violations++; // no one is attacking that defender or any of his PWs
+            }
         }
 
         // now, count everything else
diff --git a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
index 46e24fbfe70..f62bb00a819 100644
--- a/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
+++ b/forge-game/src/main/java/forge/game/combat/GlobalAttackRestrictions.java
@@ -9,9 +9,7 @@ import forge.game.Game;
 import forge.game.GameEntity;
 import forge.game.GlobalRuleChange;
 import forge.game.card.Card;
-import forge.game.card.CardCollection;
 import forge.game.player.Player;
-import forge.game.player.PlayerCollection;
 import forge.game.zone.ZoneType;
 import forge.util.collect.FCollectionView;
 import forge.util.maps.LinkedHashMapToAmount;
@@ -22,11 +20,9 @@ public class GlobalAttackRestrictions {
 
     private final int max;
     private final MapToAmount<GameEntity> defenderMax;
-    private final PlayerCollection mustBeAttackedByEachOpp;
-    private GlobalAttackRestrictions(final int max, final MapToAmount<GameEntity> defenderMax, PlayerCollection mustBeAttackedByEachOpp) {
+    private GlobalAttackRestrictions(final int max, final MapToAmount<GameEntity> defenderMax) {
         this.max = max;
         this.defenderMax = defenderMax;
-        this.mustBeAttackedByEachOpp = mustBeAttackedByEachOpp;
     }
 
     public int getMax() {
@@ -36,17 +32,17 @@ public class GlobalAttackRestrictions {
         return defenderMax;
     }
 
-    public boolean isLegal(final Map<Card, GameEntity> attackers, final CardCollection possibleAttackers) {
-        return !getViolations(attackers, possibleAttackers, true).isViolated();
+    public boolean isLegal(final Map<Card, GameEntity> attackers) {
+        return !getViolations(attackers, true).isViolated();
     }
 
-    public GlobalAttackRestrictionViolations getViolations(final Map<Card, GameEntity> attackers, final CardCollection possibleAttackers) {
-        return getViolations(attackers, possibleAttackers, false);
+    public GlobalAttackRestrictionViolations getViolations(final Map<Card, GameEntity> attackers) {
+        return getViolations(attackers, false);
     }
-    private GlobalAttackRestrictionViolations getViolations(final Map<Card, GameEntity> attackers, final CardCollection possibleAttackers, final boolean returnQuickly) {
+    private GlobalAttackRestrictionViolations getViolations(final Map<Card, GameEntity> attackers, final boolean returnQuickly) {
         final int nTooMany = max < 0 ? 0 : attackers.size() - max;
         if (returnQuickly && nTooMany > 0) {
-            return new GlobalAttackRestrictionViolations(nTooMany, MapToAmountUtil.emptyMap(), MapToAmountUtil.emptyMap());
+            return new GlobalAttackRestrictionViolations(nTooMany, MapToAmountUtil.emptyMap());
         }
 
         final MapToAmount<GameEntity> defenderTooMany = new LinkedHashMapToAmount<>(defenderMax.size());
@@ -77,49 +73,18 @@ public class GlobalAttackRestrictions {
             }
         }
 
-        final MapToAmount<GameEntity> defenderTooFew = new LinkedHashMapToAmount<>(defenderMax.size());
-        for (final GameEntity mandatoryDef : mustBeAttackedByEachOpp) {
-            // check to ensure that this defender can even legally be attacked in the first place
-            boolean canAttackThisDef = false;
-            for (Card c : possibleAttackers) {
-                if (CombatUtil.canAttack(c, mandatoryDef) && null == CombatUtil.getAttackCost(c.getGame(), c, mandatoryDef)) {
-                    canAttackThisDef = true;
-                    break;
-                }
-            }
-            if (!canAttackThisDef) {
-                continue;
-            }
-
-            boolean isAttacked = false;
-            for (final GameEntity defender : attackers.values()) {
-                if (defender.equals(mandatoryDef)) {
-                    isAttacked = true;
-                    break;
-                } else if (defender instanceof Card && ((Card)defender).getController().equals(mandatoryDef)) {
-                    isAttacked = true;
-                    break;
-                }
-            }
-            if (!isAttacked) {
-                defenderTooFew.add(mandatoryDef);
-            }
-        }
-
-        return new GlobalAttackRestrictionViolations(nTooMany, defenderTooMany, defenderTooFew);
+        return new GlobalAttackRestrictionViolations(nTooMany, defenderTooMany);
     }
 
     final class GlobalAttackRestrictionViolations {
         private final boolean isViolated;
         private final int globalTooMany;
         private final MapToAmount<GameEntity> defenderTooMany;
-        private final MapToAmount<GameEntity> defenderTooFew;
 
-        public GlobalAttackRestrictionViolations(final int globalTooMany, final MapToAmount<GameEntity> defenderTooMany, final MapToAmount<GameEntity> defenderTooFew) {
-            this.isViolated = globalTooMany > 0 || !defenderTooMany.isEmpty() || !defenderTooFew.isEmpty();
+        public GlobalAttackRestrictionViolations(final int globalTooMany, final MapToAmount<GameEntity> defenderTooMany) {
+            this.isViolated = globalTooMany > 0 || !defenderTooMany.isEmpty();
             this.globalTooMany = globalTooMany;
             this.defenderTooMany = defenderTooMany;
-            this.defenderTooFew = defenderTooFew;
         }
         public boolean isViolated() {
             return isViolated;
@@ -127,9 +92,6 @@ public class GlobalAttackRestrictions {
         public int getGlobalTooMany() {
             return globalTooMany;
         }
-        public MapToAmount<GameEntity> getDefenderTooFew() {
-            return defenderTooFew;
-        }
         public MapToAmount<GameEntity> getDefenderTooMany() {
             return defenderTooMany;
         }
@@ -147,7 +109,6 @@ public class GlobalAttackRestrictions {
     public static GlobalAttackRestrictions getGlobalRestrictions(final Player attackingPlayer, final FCollectionView<GameEntity> possibleDefenders) {
         int max = -1;
         final MapToAmount<GameEntity> defenderMax = new LinkedHashMapToAmount<>(possibleDefenders.size());
-        final PlayerCollection mustBeAttacked = new PlayerCollection();
         final Game game = attackingPlayer.getGame();
 
         /* if (game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.onlyOneAttackerATurn)) {
@@ -171,14 +132,6 @@ public class GlobalAttackRestrictions {
             }
         }
 
-        for (final Card card : game.getCardsIn(ZoneType.Battlefield)) {
-            if (card.hasKeyword("Each opponent must attack you or a planeswalker you control with at least one creature each combat if able.")) {
-                if (attackingPlayer.isOpponentOf(card.getController())) {
-                    mustBeAttacked.add(card.getController());
-                }
-            }
-        }
-
         for (final GameEntity defender : possibleDefenders) {
             final int defMax = getMaxAttackTo(defender);
             if (defMax != -1) {
@@ -190,7 +143,7 @@ public class GlobalAttackRestrictions {
             max = Ints.min(max, defenderMax.countAll());
         }
 
-        return new GlobalAttackRestrictions(max, defenderMax, mustBeAttacked);
+        return new GlobalAttackRestrictions(max, defenderMax);
     }
 
     /**
diff --git a/forge-gui/res/cardsfolder/upcoming/firkraag_cunning_instigator.txt b/forge-gui/res/cardsfolder/upcoming/firkraag_cunning_instigator.txt
new file mode 100644
index 00000000000..5bafe224a24
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/firkraag_cunning_instigator.txt
@@ -0,0 +1,14 @@
+Name:Firkraag, Cunning Instigator
+ManaCost:3 U R
+Types:Legendary Creature Dragon
+PT:3/3
+K:Flying
+K:Haste
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Dragon.YouCtrl | AttackedTarget$ Opponent | Execute$ TrigGoad | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Dragons you control attack an opponent, goad target creature that player controls.
+SVar:TrigGoad:DB$ Goad | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredAttackedTarget | TgtPrompt$ Select target creature that player controls
+T:Mode$ DamageDone | ValidSource$ Creature.hadToAttackThisCombat | ValidTarget$ Opponent | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature deals combat damage to one of your opponents, if that creature had to attack this combat, you put a +1/+1 counter on CARDNAME and you draw a card.
+SVar:TrigPutCounter:DB$ PutCounter | CounterType$ P1P1 | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw
+DeckHints:Type$Dragon
+DeckHas:Ability$Counters
+Oracle:Flying, haste\nWhenever one or more Dragons you control attack an opponent, goad target creature that player controls.\nWhenever a creature deals combat damage to one of your opponents, if that creature had to attack this combat, you put a +1/+1 counter on Firkraag, Cunning Instigator and you draw a card.

From 1527167c5eb559f23d41aae4358a4713eacd485b Mon Sep 17 00:00:00 2001
From: xaviermd <70407998+xaviermd@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:56:25 -0400
Subject: [PATCH 155/309] Card script for CLB - Bane Lord of Darkness (#1026)

* Created card script for Bane, Lord of Darkness.

* Minor edit to Bane, Lord of Darkness card script.

* Cleaned up card script and replaced Play with ChangeZone.

* Replaced You with Controller for consistent description.
---
 .../cardsfolder/upcoming/bane_lord_of_darkness.txt  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bane_lord_of_darkness.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/bane_lord_of_darkness.txt b/forge-gui/res/cardsfolder/upcoming/bane_lord_of_darkness.txt
new file mode 100644
index 00000000000..de086b0e3b9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bane_lord_of_darkness.txt
@@ -0,0 +1,13 @@
+Name:Bane, Lord of Darkness
+ManaCost:1 W U B
+Types:Legendary Creature God
+PT:5/2
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | CheckSVar$ CurrentLife | SVarCompare$ LEX | Description$ As long as your life total is less than or equal to half your starting life total, CARDNAME has indestructible.
+SVar:CurrentLife:Count$YourLifeTotal
+SVar:X:Count$YourStartingLife/HalfDown
+T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ DBAskOpponentDrawOrPlay | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken creature you control dies, target opponent may have you draw a card. If they don't, you may put a creature card with equal or lesser toughness from your hand onto the battlefield.
+SVar:DBAskOpponentDrawOrPlay:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ DBDrawCard,DBCheatCreature
+SVar:DBDrawCard:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Controller draws a card
+SVar:DBCheatCreature:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.toughnessLEY | ChangeNum$ 1 | SpellDescription$ Controller may put a creature card with equal or lesser toughness from your hand onto the battlefield.
+SVar:Y:TriggeredCard$CardToughness
+Oracle: As long as your life total is less than or equal to half your starting life total, Bane, Lord of Darkness has indestructible.\nWhenever another nontoken creature you control dies, target opponent may have you draw a card. If they don't, you may put a creature card with equal or lesser toughness from your hand onto the battlefield.

From 0fdfe26eff2d34e0234387d08d760b8a3bd8a077 Mon Sep 17 00:00:00 2001
From: xaviermd <70407998+xaviermd@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:57:25 -0400
Subject: [PATCH 156/309] Card script for CLB - Aboleth Spawn and modifications
 to TriggerAbilityTriggered to make it work. (#1035)

* Created the card script for Aboleth Spawn, and made the necessary modifications to TriggerAbilityTriggered to allow the identification of self-targeting triggered abilities.

* Changed the Aboleth Spawn card script, and TriggerAbilityTriggered.java following feedback on PR.
---
 .../game/trigger/TriggerAbilityTriggered.java | 19 +++++++++----------
 .../cardsfolder/upcoming/aboleth_spawn.txt    |  9 +++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/aboleth_spawn.txt

diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java b/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java
index b3c7c9419dc..45ea1fa3851 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java
@@ -18,6 +18,7 @@
 package forge.game.trigger;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import forge.game.Game;
 import forge.game.ability.AbilityKey;
 import forge.game.card.Card;
@@ -76,16 +77,14 @@ public class TriggerAbilityTriggered extends Trigger {
             return false;
         }
 
-        if (hasParam("ValidCause")) {
-            boolean match = false;
-            for (Card cause : causes) {
-                if (matchesValidParam("ValidCause", cause)) {
-                    match = true;
-                }
-            }
-            if (!match) {
-                return false;
-            }
+        if (!matchesValidParam("ValidCause", causes))
+        {
+            return false;
+        }
+        
+        if (hasParam("TriggeredOwnAbility") && "True".equals(getParam("TriggeredOwnAbility")) && !Iterables.contains(causes, source))
+        {
+            return false;
         }
 
         return true;
diff --git a/forge-gui/res/cardsfolder/upcoming/aboleth_spawn.txt b/forge-gui/res/cardsfolder/upcoming/aboleth_spawn.txt
new file mode 100644
index 00000000000..2822af7aeba
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/aboleth_spawn.txt
@@ -0,0 +1,9 @@
+Name:Aboleth Spawn
+ManaCost:2 U
+Types:Creature Fish Horror
+PT:2/3
+K:Flash
+K:Ward:2
+T:Mode$ AbilityTriggered | TriggerZones$ Battlefield | ValidDestination$ Battlefield | ValidMode$ ChangesZone,ChangesZoneAll | Execute$ DBProbingTelepathy | ValidSource$ Creature.OppCtrl | TriggeredOwnAbility$ True | TriggerDescription$ Probing Telepathy — Whenever a creature entering the battlefield under an opponent's control causes a triggered ability of that creature to trigger, you may copy that ability. You may choose new targets for the copy.
+SVar:DBProbingTelepathy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Optional$ True | MayChooseTarget$ True
+Oracle:Flash\nWard {2}\nProbing Telepathy — Whenever a creature entering the battlefield under an opponent's control causes a triggered ability of that creature to trigger, you may copy that ability. You may choose new targets for the copy.

From a972221408966c9f41b5fa7859eeacee4fa3da6c Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 5 Jul 2022 18:12:13 +0100
Subject: [PATCH 157/309] Alchemy Rebalancing for July 7, 2022

---
 forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt  | 7 +++++++
 forge-gui/res/formats/Archived/Historic/2022-07-07.txt | 7 +++++++
 forge-gui/res/formats/Sanctioned/Historic.txt          | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
 create mode 100644 forge-gui/res/formats/Archived/Historic/2022-07-07.txt

diff --git a/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt b/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
new file mode 100644
index 00000000000..ffae03f2c48
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
@@ -0,0 +1,7 @@
+[format]
+Name:Alchemy (2022-07-07)
+Type:Archived
+Subtype:Arena
+Effective:2022-07-07
+Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC, YSNC
+Banned:Grinning Ignus
diff --git a/forge-gui/res/formats/Archived/Historic/2022-07-07.txt b/forge-gui/res/formats/Archived/Historic/2022-07-07.txt
new file mode 100644
index 00000000000..7aecc7d09a8
--- /dev/null
+++ b/forge-gui/res/formats/Archived/Historic/2022-07-07.txt
@@ -0,0 +1,7 @@
+[format]
+Name:Historic (2022-07-07)
+Type:Archived
+Subtype:Arena
+Effective:2022-07-07
+Sets: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
+Banned:Agent of Treachery; Brainstorm; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Lightning Bolt; Memory Lapse; Natural Order; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Swords to Plowshares; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation
diff --git a/forge-gui/res/formats/Sanctioned/Historic.txt b/forge-gui/res/formats/Sanctioned/Historic.txt
index f5f2b80afe0..f6fdd767405 100644
--- a/forge-gui/res/formats/Sanctioned/Historic.txt
+++ b/forge-gui/res/formats/Sanctioned/Historic.txt
@@ -5,4 +5,4 @@ Subtype:Arena
 Effective:2019-11-21
 Order:142
 Sets: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
-Banned:Agent of Treachery; Brainstorm; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Lightning Bolt; Memory Lapse; Natural Order; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Swords to Plowshares; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation; Winota, Joiner of Forces
+Banned:Agent of Treachery; Brainstorm; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Lightning Bolt; Memory Lapse; Natural Order; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Swords to Plowshares; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation

From 212f883d8fc2aa9d8f54b74315762375c0f2ceb7 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 13:12:32 -0400
Subject: [PATCH 158/309] DraftEffect use made card in new zone for trigger,
 etc

---
 .../main/java/forge/game/ability/effects/DraftEffect.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 d0b3007de1c..283af522cf6 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
@@ -72,12 +72,12 @@ import java.util.*;
 
          final CardZoneTable triggerList = new CardZoneTable();
          for (final Card c : drafted) {
-             game.getAction().moveTo(zone, c, sa, moveParams);
+             Card made = game.getAction().moveTo(zone, c, sa, moveParams);
              if (c != null) {
-                 triggerList.put(ZoneType.None, c.getZone().getZoneType(), c);
+                 triggerList.put(ZoneType.None, made.getZone().getZoneType(), made);
              }
              if (sa.hasParam("RememberDrafted")) {
-                 source.addRemembered(c);
+                 source.addRemembered(made);
              }
          }
          triggerList.triggerChangesZoneAll(game, sa);

From ce90e3358eaf802aa71310b8ec88d005005472cf Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 13:12:43 -0400
Subject: [PATCH 159/309] MakeCardEffect use made card in new zone for trigger,
 etc

---
 .../java/forge/game/ability/effects/MakeCardEffect.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
index 5f746118833..c6ecc4d7610 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/MakeCardEffect.java
@@ -63,13 +63,13 @@ public class MakeCardEffect extends SpellAbilityEffect {
 
                 final CardZoneTable triggerList = new CardZoneTable();
                 for (final Card c : cards) {
-                    game.getAction().moveTo(zone, c, sa, moveParams);
-                    triggerList.put(ZoneType.None, c.getZone().getZoneType(), c);
+                    Card made = game.getAction().moveTo(zone, c, sa, moveParams);
+                    triggerList.put(ZoneType.None, made.getZone().getZoneType(), made);
                     if (sa.hasParam("RememberMade")) {
-                        sa.getHostCard().addRemembered(c);
+                        sa.getHostCard().addRemembered(made);
                     }
                     if (sa.hasParam("ImprintMade")) {
-                        sa.getHostCard().addImprintedCard(c);
+                        sa.getHostCard().addImprintedCard(made);
                     }
                 }
                 triggerList.triggerChangesZoneAll(game, sa);

From d7eff45cd1565636824a6db4d2686f59145873df Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Tue, 5 Jul 2022 14:23:40 -0400
Subject: [PATCH 160/309] GN3: Imaryll, Elfhame Elite (+ refactor another
 quasi-keyword -> static) (#1033)

* AI stuff refactor keyword to check StaticAbilityAssignCombatDamageAsUnblocked

* ComputerUtilCombat refactor keyword to check StaticAbilityAssignCombatDamageAsUnblocked

* CreatureEvaluator refactor keyword to check StaticAbilityAssignCombatDamageAsUnblocked

* Combat.java refactor keyword to check StaticAbilityAssignCombatDamageAsUnblocked

* AnimateAllEffect.resolve support "staticAbilities" for garruk_savage_herald.txt

* imaryll_elfhame_elite.txt

* StaticAbilityAssignCombatDamageAsUnblocked.java

* refactor old cards

* AnimateAllEffect remove no longer needed

* AiBlockController.makeGoodBlocks restore lost '!'
---
 .../java/forge/ai/AiAttackController.java     |  3 +-
 .../main/java/forge/ai/AiBlockController.java | 11 +++--
 .../java/forge/ai/ComputerUtilCombat.java     |  7 ++-
 .../main/java/forge/ai/CreatureEvaluator.java |  4 +-
 .../ability/effects/AnimateAllEffect.java     | 13 +++--
 .../main/java/forge/game/combat/Combat.java   |  6 ++-
 ...cAbilityAssignCombatDamageAsUnblocked.java | 47 +++++++++++++++++++
 .../res/cardsfolder/d/deathcoil_wurm.txt      |  2 +-
 .../cardsfolder/g/garruk_savage_herald.txt    |  3 +-
 forge-gui/res/cardsfolder/g/gurzigost.txt     |  3 +-
 .../res/cardsfolder/i/indomitable_might.txt   |  5 +-
 forge-gui/res/cardsfolder/l/lone_wolf.txt     |  2 +-
 forge-gui/res/cardsfolder/o/outmaneuver.txt   |  3 +-
 .../res/cardsfolder/p/predatory_focus.txt     |  4 +-
 .../res/cardsfolder/p/pride_of_lions.txt      |  2 +-
 .../res/cardsfolder/p/proud_wildbonder.txt    |  4 +-
 forge-gui/res/cardsfolder/r/rhox.txt          |  4 +-
 .../cardsfolder/r/ruxa_patient_professor.txt  |  2 +-
 .../res/cardsfolder/s/siege_behemoth.txt      |  3 +-
 forge-gui/res/cardsfolder/s/spinebiter.txt    |  2 +-
 .../res/cardsfolder/t/thorn_elemental.txt     |  2 +-
 .../res/cardsfolder/t/tornado_elemental.txt   |  2 +-
 .../upcoming/imaryll_elfhame_elite.txt        | 11 +++++
 forge-gui/res/cardsfolder/w/wolf_pack.txt     |  2 +-
 24 files changed, 109 insertions(+), 38 deletions(-)
 create mode 100644 forge-game/src/main/java/forge/game/staticability/StaticAbilityAssignCombatDamageAsUnblocked.java
 create mode 100644 forge-gui/res/cardsfolder/upcoming/imaryll_elfhame_elite.txt

diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index 64424620d11..dfa47c071e7 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -20,6 +20,7 @@ package forge.ai;
 import java.util.ArrayList;
 import java.util.List;
 
+import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Predicate;
@@ -540,7 +541,7 @@ public class AiAttackController {
 
         for (Card attacker : categorizedAttackers) {
             if (!CombatUtil.canBeBlocked(attacker, accountedBlockers, null)
-                    || attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
+                    || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                 unblockedAttackers.add(attacker);
             } else {
                 if (predictEvasion) {
diff --git a/forge-ai/src/main/java/forge/ai/AiBlockController.java b/forge-ai/src/main/java/forge/ai/AiBlockController.java
index de5ac94e04b..81e001f1c41 100644
--- a/forge-ai/src/main/java/forge/ai/AiBlockController.java
+++ b/forge-ai/src/main/java/forge/ai/AiBlockController.java
@@ -42,6 +42,7 @@ import forge.game.cost.Cost;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
+import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import forge.game.staticability.StaticAbilityCantAttackBlock;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
@@ -204,7 +205,7 @@ public class AiBlockController {
                     }
                     blocker = ComputerUtilCard.getWorstCreatureAI(killingBlockers);
                 // 2.Blockers that won't get destroyed
-                } else if (!attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
+                } else if (!StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)
                     && !ComputerUtilCombat.attackerHasThreateningAfflict(attacker, ai)) {
                     blocker = ComputerUtilCard.getWorstCreatureAI(safeBlockers);
                     // check whether it's better to block a creature without trample to absorb more damage
@@ -215,7 +216,7 @@ public class AiBlockController {
                                     || other.hasKeyword(Keyword.TRAMPLE)
                                     || ComputerUtilCombat.attackerHasThreateningAfflict(other, ai)
                                     || ComputerUtilCombat.canDestroyBlocker(ai, blocker, other, combat, false)
-                                    || other.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
+                                    || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(other)) {
                                 continue;
                             }
 
@@ -668,7 +669,7 @@ public class AiBlockController {
         Card attacker = attackers.get(0);
 
         if (CombatUtil.getMinNumBlockersForAttacker(attacker, combat.getDefenderPlayerByAttacker(attacker)) > 1
-            || attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
+            || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)
             || ComputerUtilCombat.attackerHasThreateningAfflict(attacker, ai)) {
             attackers.remove(0);
             makeChumpBlocks(combat, attackers);
@@ -689,7 +690,7 @@ public class AiBlockController {
                         }
                         if (other.getNetCombatDamage() >= damageAbsorbed
                                 && !other.hasKeyword(Keyword.TRAMPLE)
-                                && !other.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
+                                && !StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(other)
                                 && !ComputerUtilCombat.attackerHasThreateningAfflict(other, ai)
                                 && CombatUtil.canBlock(other, blocker, combat)) {
                             combat.addBlocker(other, blocker);
@@ -756,7 +757,7 @@ public class AiBlockController {
 
         for (final Card attacker : tramplingAttackers) {
             if (CombatUtil.getMinNumBlockersForAttacker(attacker, combat.getDefenderPlayerByAttacker(attacker)) > combat.getBlockers(attacker).size()
-                    || attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")
+                    || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)
                     || attacker.hasKeyword("CARDNAME can't be blocked unless all creatures defending player controls block it.")) {
                 continue;
             }
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index 5fd871ed612..15c0a89f1b9 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -48,6 +48,7 @@ import forge.game.replacement.ReplacementLayer;
 import forge.game.replacement.ReplacementType;
 import forge.game.spellability.SpellAbility;
 import forge.game.staticability.StaticAbility;
+import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import forge.game.staticability.StaticAbilityMustAttack;
 import forge.game.trigger.Trigger;
 import forge.game.trigger.TriggerType;
@@ -325,8 +326,7 @@ public class ComputerUtilCombat {
                 final List<Card> blockers = combat.getBlockers(attacker);
 
                 if (blockers.size() == 0
-                        || attacker.hasKeyword("You may have CARDNAME assign its combat damage "
-                                + "as though it weren't blocked.")) {
+                        || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                     unblocked.add(attacker);
                 } else if (attacker.hasKeyword(Keyword.TRAMPLE)
                         && getAttack(attacker) > totalShieldDamage(attacker, blockers)) {
@@ -367,8 +367,7 @@ public class ComputerUtilCombat {
             final List<Card> blockers = combat.getBlockers(attacker);
 
             if (blockers.size() == 0
-                    || attacker.hasKeyword("You may have CARDNAME assign its combat damage"
-                            + " as though it weren't blocked.")) {
+                    || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                 unblocked.add(attacker);
             } else if (attacker.hasKeyword(Keyword.TRAMPLE)
                     && getAttack(attacker) > totalShieldDamage(attacker, blockers)) {
diff --git a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
index 00485a66921..a9a58304bd4 100644
--- a/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
+++ b/forge-ai/src/main/java/forge/ai/CreatureEvaluator.java
@@ -10,6 +10,7 @@ import forge.game.card.CounterEnumType;
 import forge.game.cost.CostPayEnergy;
 import forge.game.keyword.Keyword;
 import forge.game.spellability.SpellAbility;
+import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import forge.game.staticability.StaticAbilityMustAttack;
 
 import java.util.List;
@@ -62,7 +63,8 @@ public class CreatureEvaluator implements Function<Card, Integer> {
         if (c.hasKeyword("Unblockable")) {
             value += addValue(power * 10, "unblockable");
         } else {
-            if (c.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
+            if (StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(c)
+                    || StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(c, false)) {
                 value += addValue(power * 6, "thorns");
             }
             if (c.hasKeyword(Keyword.FEAR)) {
diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
index d79bb6d4502..815164b2521 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -122,6 +121,12 @@ public class AnimateAllEffect extends AnimateEffectBase {
             sVars.addAll(Arrays.asList(sa.getParam("sVars").split(",")));
         }
 
+        // static abilities to add to the animated being
+        final List<String> stAbs = Lists.newArrayList();
+        if (sa.hasParam("staticAbilities")) {
+            stAbs.addAll(Arrays.asList(sa.getParam("staticAbilities").split(",")));
+        }
+
         Map<String, String> sVarsMap = Maps.newHashMap();
         for (final String s : sVars) {
             sVarsMap.put(s, AbilityUtils.getSVar(sa, s));
@@ -140,10 +145,8 @@ public class AnimateAllEffect extends AnimateEffectBase {
         list = CardLists.getValidCards(list, valid, host.getController(), host, sa);
 
         for (final Card c : list) {
-            doAnimate(c, sa, power, toughness, types, removeTypes, finalColors,
-                    keywords, removeKeywords, hiddenKeywords,
-                    abilities, triggers, replacements, ImmutableList.of(),
-                    timestamp);
+            doAnimate(c, sa, power, toughness, types, removeTypes, finalColors, keywords, removeKeywords,
+                    hiddenKeywords, abilities, triggers, replacements, stAbs, timestamp);
 
             // give sVars
             if (!sVarsMap.isEmpty() ) {
diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java
index 57bc21386e7..119396cab27 100644
--- a/forge-game/src/main/java/forge/game/combat/Combat.java
+++ b/forge-game/src/main/java/forge/game/combat/Combat.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import forge.game.staticability.StaticAbilityAssignCombatDamageAsUnblocked;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Function;
@@ -797,10 +798,11 @@ public class Combat {
             final SpellAbility emptySA = new SpellAbility.EmptySa(attacker);
 
             boolean assignToPlayer = false;
-            if (attacker.hasKeyword("CARDNAME assigns its combat damage as though it weren't blocked.")) {
+            if (StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker, false)) {
                 assignToPlayer = true;
             }
-            if (!assignToPlayer && attacker.getGame().getCombat().isBlocked(attacker) && attacker.hasKeyword("You may have CARDNAME assign its combat damage as though it weren't blocked.")) {
+            if (!assignToPlayer && attacker.getGame().getCombat().isBlocked(attacker)
+                    && StaticAbilityAssignCombatDamageAsUnblocked.assignCombatDamageAsUnblocked(attacker)) {
                 assignToPlayer = assigningPlayer.getController().confirmAction(emptySA, PlayerActionConfirmMode.AlternativeDamageAssignment,
                         Localizer.getInstance().getMessage("lblAssignCombatDamageWerentBlocked",
                                 CardTranslation.getTranslatedName(attacker.getName())), null);
diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityAssignCombatDamageAsUnblocked.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityAssignCombatDamageAsUnblocked.java
new file mode 100644
index 00000000000..490da6e38b2
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityAssignCombatDamageAsUnblocked.java
@@ -0,0 +1,47 @@
+package forge.game.staticability;
+
+import forge.game.Game;
+import forge.game.card.Card;
+import forge.game.zone.ZoneType;
+
+public class StaticAbilityAssignCombatDamageAsUnblocked {
+
+    static String MODE = "AssignCombatDamageAsUnblocked";
+
+    public static boolean assignCombatDamageAsUnblocked(final Card card) {
+        return assignCombatDamageAsUnblocked(card, true);
+    }
+
+    public static boolean assignCombatDamageAsUnblocked(final Card card, final boolean optional)  {
+        final Game game = card.getGame();
+        for (final Card ca : game.getCardsIn(ZoneType.STATIC_ABILITIES_SOURCE_ZONES)) {
+            for (final StaticAbility stAb : ca.getStaticAbilities()) {
+                if (!stAb.getParam("Mode").equals(MODE) || stAb.isSuppressed() || !stAb.checkConditions()) {
+                    continue;
+                }
+
+                if (stAb.hasParam("Optional")) {
+                    if (!optional) {
+                        continue;
+                    }
+                } else {
+                    if (optional) {
+                        continue;
+                    }
+                }
+
+                if (applyAssignCombatDamageAsUnblocked(stAb, card)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean applyAssignCombatDamageAsUnblocked(final StaticAbility stAb, final Card card) {
+        if (!stAb.matchesValidParam("ValidCard", card)) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/forge-gui/res/cardsfolder/d/deathcoil_wurm.txt b/forge-gui/res/cardsfolder/d/deathcoil_wurm.txt
index 8b9071bf0e9..4d665ac968c 100644
--- a/forge-gui/res/cardsfolder/d/deathcoil_wurm.txt
+++ b/forge-gui/res/cardsfolder/d/deathcoil_wurm.txt
@@ -2,5 +2,5 @@ Name:Deathcoil Wurm
 ManaCost:6 G G
 Types:Creature Wurm
 PT:7/6
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:You may have Deathcoil Wurm assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/g/garruk_savage_herald.txt b/forge-gui/res/cardsfolder/g/garruk_savage_herald.txt
index eed86c1f525..cd45ec22783 100644
--- a/forge-gui/res/cardsfolder/g/garruk_savage_herald.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_savage_herald.txt
@@ -6,5 +6,6 @@ A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 1 | Revea
 A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBDamage | AILogic$ PowerDmg | SpellDescription$ Target creature you control deals damage equal to its power to another target creature.
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature to damage | TargetUnique$ True | AILogic$ PowerDmg | NumDmg$ X | DamageSource$ ParentTarget
 SVar:X:ParentTargeted$CardPower
-A:AB$ PumpAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | KW$ HIDDEN You may have CARDNAME assign its combat damage as though it weren't blocked. | SpellDescription$ Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."
+A:AB$ AnimateAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | staticAbilities$ Static | SpellDescription$ Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."
+SVar:Static:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have this creature assign its combat damage as though it weren't blocked.
 Oracle:[+1]: Reveal the top card of your library. If it's a creature card, put it into your hand. Otherwise, put it on the bottom of your library.\n[-2]: Target creature you control deals damage equal to its power to another target creature.\n[-7]: Until end of turn, creatures you control gain "You may have this creature assign its combat damage as though it weren't blocked."
diff --git a/forge-gui/res/cardsfolder/g/gurzigost.txt b/forge-gui/res/cardsfolder/g/gurzigost.txt
index 0c780d73bcf..8f661c7fed3 100644
--- a/forge-gui/res/cardsfolder/g/gurzigost.txt
+++ b/forge-gui/res/cardsfolder/g/gurzigost.txt
@@ -3,7 +3,8 @@ ManaCost:3 G G
 Types:Creature Beast
 PT:6/8
 K:UpkeepCost:PutCardToLibFromGrave<2/-1/Card>
-A:AB$ Pump | Cost$ G G Discard<1/Card> | Defined$ Self | KW$ HIDDEN You may have CARDNAME assign its combat damage as though it weren't blocked. | SpellDescription$ You may have CARDNAME assign its combat damage this turn as though it weren't blocked.
+A:AB$ Effect | Cost$ G G Discard<1/Card> | StaticAbilities$ Static | SpellDescription$ You may have CARDNAME assign its combat damage this turn as though it weren't blocked.
+SVar:Static:Mode$ AssignCombatDamageAsUnblocked | EffectZone$ Command | ValidCard$ Card.EffectSource | Optional$ True | Description$ You may have EFFECTSOURCE assign its combat damage this turn as though it weren't blocked.
 AI:RemoveDeck:All
 DeckHas:Ability$Discard
 Oracle:At the beginning of your upkeep, sacrifice Gurzigost unless you put two cards from your graveyard on the bottom of your library.\n{G}{G}, Discard a card: You may have Gurzigost assign its combat damage this turn as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/i/indomitable_might.txt b/forge-gui/res/cardsfolder/i/indomitable_might.txt
index ed3061dcecc..da489a31865 100644
--- a/forge-gui/res/cardsfolder/i/indomitable_might.txt
+++ b/forge-gui/res/cardsfolder/i/indomitable_might.txt
@@ -3,6 +3,7 @@ ManaCost:3 G
 Types:Enchantment Aura
 K:Flash
 K:Enchant creature
-A:SP$ Attach | Cost$ 3 G | ValidTgts$ Creature | TgtPrompt$ Select creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddHiddenKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ Enchanted creature gets +3/+3. Enchanted creature's controller may have it assign its combat damage as though it weren't blocked.
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Creature.EnchantedBy | Optional$ True | Description$ Enchanted creature's controller may have it assign its combat damage as though it weren't blocked.
 Oracle:Flash\nEnchant creature\nEnchanted creature gets +3/+3.\nEnchanted creature's controller may have it assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/l/lone_wolf.txt b/forge-gui/res/cardsfolder/l/lone_wolf.txt
index 39ff4e5a990..d64d09bc6a9 100644
--- a/forge-gui/res/cardsfolder/l/lone_wolf.txt
+++ b/forge-gui/res/cardsfolder/l/lone_wolf.txt
@@ -2,5 +2,5 @@ Name:Lone Wolf
 ManaCost:2 G
 Types:Creature Wolf
 PT:2/2
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:You may have Lone Wolf assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/o/outmaneuver.txt b/forge-gui/res/cardsfolder/o/outmaneuver.txt
index c07120e901f..fddc46cb0bf 100644
--- a/forge-gui/res/cardsfolder/o/outmaneuver.txt
+++ b/forge-gui/res/cardsfolder/o/outmaneuver.txt
@@ -1,7 +1,8 @@
 Name:Outmaneuver
 ManaCost:X R
 Types:Instant
-A:SP$ Pump | Cost$ X R | KW$ HIDDEN CARDNAME assigns its combat damage as though it weren't blocked. | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature.blocked | TgtPrompt$ Select X target blocked creatures | StackDescription$ X target blocked creatures [{c:Targeted}] assign their combat damage this turn as though they weren't blocked. | SpellDescription$ X target blocked creatures assign their combat damage this turn as though they weren't blocked.
+A:SP$ Effect | StaticAbilities$ Static | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature.blocked | TgtPrompt$ Select X target blocked creatures | RememberObjects$ Targeted | SpellDescription$ X target blocked creatures assign their combat damage this turn as though they weren't blocked.
+SVar:Static:Mode$ AssignCombatDamageAsUnblocked | EffectZone$ Command | ValidCard$ Card.IsRemembered | Description$ These creatures assign their combat damage this turn as though they weren't blocked.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 Oracle:X target blocked creatures assign their combat damage this turn as though they weren't blocked.
diff --git a/forge-gui/res/cardsfolder/p/predatory_focus.txt b/forge-gui/res/cardsfolder/p/predatory_focus.txt
index 60b8198c505..447a537b6ab 100644
--- a/forge-gui/res/cardsfolder/p/predatory_focus.txt
+++ b/forge-gui/res/cardsfolder/p/predatory_focus.txt
@@ -1,6 +1,6 @@
 Name:Predatory Focus
 ManaCost:3 G G
 Types:Sorcery
-A:SP$ Effect | Cost$ 3 G G | Name$ Predatory Focus Effect | StaticAbilities$ KWPump | AILogic$ Evasion | SpellDescription$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
-SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddHiddenKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
+A:SP$ Effect | AILogic$ Evasion | StaticAbilities$ Static | SpellDescription$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
+SVar:Static:Mode$ AssignCombatDamageAsUnblocked | EffectZone$ Command | ValidCard$ Creature.YouCtrl | Optional$ True | Description$ You may have creatures you control assign their combat damage this turn as though they weren't blocked.
 Oracle:You may have creatures you control assign their combat damage this turn as though they weren't blocked.
diff --git a/forge-gui/res/cardsfolder/p/pride_of_lions.txt b/forge-gui/res/cardsfolder/p/pride_of_lions.txt
index e33c083ab45..5be9bb4db27 100644
--- a/forge-gui/res/cardsfolder/p/pride_of_lions.txt
+++ b/forge-gui/res/cardsfolder/p/pride_of_lions.txt
@@ -2,5 +2,5 @@ Name:Pride of Lions
 ManaCost:3 G G
 Types:Creature Cat
 PT:4/4
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:You may have Pride of Lions assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/p/proud_wildbonder.txt b/forge-gui/res/cardsfolder/p/proud_wildbonder.txt
index 509ba6ab126..c442e54b845 100644
--- a/forge-gui/res/cardsfolder/p/proud_wildbonder.txt
+++ b/forge-gui/res/cardsfolder/p/proud_wildbonder.txt
@@ -3,5 +3,7 @@ ManaCost:2 R/G R/G
 Types:Creature Human Warrior
 PT:4/3
 K:Trample
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+withTrample | AddKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ Creatures you control with trample have "You may have this creature assign its combat damage as though it weren't blocked."
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+withTrample | AddStaticAbility$ Static | Description$ Creatures you control with trample have "You may have this creature assign its combat damage as though it weren't blocked."
+SVar:Static:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have this creature assign its combat damage as though it weren't blocked.
+DeckHints:Keyword$Trample
 Oracle:Trample\nCreatures you control with trample have "You may have this creature assign its combat damage as though it weren't blocked."
diff --git a/forge-gui/res/cardsfolder/r/rhox.txt b/forge-gui/res/cardsfolder/r/rhox.txt
index 43a6d3299b8..935b280f027 100644
--- a/forge-gui/res/cardsfolder/r/rhox.txt
+++ b/forge-gui/res/cardsfolder/r/rhox.txt
@@ -2,6 +2,6 @@ Name:Rhox
 ManaCost:4 G G
 Types:Creature Rhino Beast
 PT:5/5
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
-A:AB$ Regenerate | Cost$ 2 G | SpellDescription$ Regenerate CARDNAME.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
+A:AB$ Regenerate | Cost$ 2 G | SpellDescription$ Regenerate CARDNAME. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
 Oracle:You may have Rhox assign its combat damage as though it weren't blocked.\n{2}{G}: Regenerate Rhox. (The next time this creature would be destroyed this turn, it isn't. Instead tap it, remove all damage from it, and remove it from combat.)
diff --git a/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt b/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
index ed5677893a6..532862c6ed9 100644
--- a/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
+++ b/forge-gui/res/cardsfolder/r/ruxa_patient_professor.txt
@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, return target creature card with no abilities from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.NoAbilities+YouOwn
 S:Mode$ Continuous | Affected$ Creature.NoAbilities+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control with no abilities get +1/+1.
-S:Mode$ Continuous | Affected$ Creature.NoAbilities+YouCtrl | AddHiddenKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | Description$ You may have creatures you control with no abilities assign their combat damage as though they weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Creature.NoAbilities+YouCtrl | Optional$ True | Description$ You may have creatures you control with no abilities assign their combat damage as though they weren't blocked.
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Ruxa, Patient Professor enters the battlefield or attacks, return target creature card with no abilities from your graveyard to your hand.\nCreatures you control with no abilities get +1/+1.\nYou may have creatures you control with no abilities assign their combat damage as though they weren't blocked.
diff --git a/forge-gui/res/cardsfolder/s/siege_behemoth.txt b/forge-gui/res/cardsfolder/s/siege_behemoth.txt
index f4be0da8332..f33d831d977 100644
--- a/forge-gui/res/cardsfolder/s/siege_behemoth.txt
+++ b/forge-gui/res/cardsfolder/s/siege_behemoth.txt
@@ -3,6 +3,5 @@ ManaCost:5 G G
 Types:Creature Beast
 PT:7/4
 K:Hexproof
-S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddHiddenKeyword$ You may have CARDNAME assign its combat damage as though it weren't blocked. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked.
-SVar:X:Count$Valid Card.Self+attacking
+S:Mode$ AssignCombatDamageAsUnblocked | IsPresent$ Card.Self+attacking | ValidCard$ Creature.YouCtrl | Optional$ True | Description$ As long as CARDNAME is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked.
 Oracle:Hexproof\nAs long as Siege Behemoth is attacking, for each creature you control, you may have that creature assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/s/spinebiter.txt b/forge-gui/res/cardsfolder/s/spinebiter.txt
index ba7f2a8dec7..84b4536f460 100644
--- a/forge-gui/res/cardsfolder/s/spinebiter.txt
+++ b/forge-gui/res/cardsfolder/s/spinebiter.txt
@@ -3,5 +3,5 @@ ManaCost:4 G G
 Types:Creature Phyrexian Beast
 PT:3/4
 K:Infect
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\nYou may have Spinebiter assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/t/thorn_elemental.txt b/forge-gui/res/cardsfolder/t/thorn_elemental.txt
index cfa8f5e82b6..01d19bc2c43 100644
--- a/forge-gui/res/cardsfolder/t/thorn_elemental.txt
+++ b/forge-gui/res/cardsfolder/t/thorn_elemental.txt
@@ -2,5 +2,5 @@ Name:Thorn Elemental
 ManaCost:5 G G
 Types:Creature Elemental
 PT:7/7
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:You may have Thorn Elemental assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/t/tornado_elemental.txt b/forge-gui/res/cardsfolder/t/tornado_elemental.txt
index 3737c7d1cb6..5c13a55cca6 100644
--- a/forge-gui/res/cardsfolder/t/tornado_elemental.txt
+++ b/forge-gui/res/cardsfolder/t/tornado_elemental.txt
@@ -2,7 +2,7 @@ Name:Tornado Elemental
 ManaCost:5 G G
 Types:Creature Elemental
 PT:6/6
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageAllFlyers | TriggerDescription$ When CARDNAME enters the battlefield, it deals 6 damage to each creature with flying.
 SVar:TrigDamageAllFlyers:DB$ DamageAll | ValidCards$ Creature.withFlying | NumDmg$ 6 | ValidDescription$ each creature with flying.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:When Tornado Elemental enters the battlefield, it deals 6 damage to each creature with flying.\nYou may have Tornado Elemental assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/upcoming/imaryll_elfhame_elite.txt b/forge-gui/res/cardsfolder/upcoming/imaryll_elfhame_elite.txt
new file mode 100644
index 00000000000..539379103cb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/imaryll_elfhame_elite.txt
@@ -0,0 +1,11 @@
+Name:Imaryll, Elfhame Elite
+ManaCost:2 G G
+Types:Legendary Creature Elf Warrior
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +X/+X until end of turn, where X is the number of other Elves you control.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
+SVar:X:Count$Valid Elf.YouCtrl+Other
+SVar:HasAttackEffect:TRUE
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have NICKNAME assign its combat damage as though it weren't blocked.
+DeckNeeds:Type$Elf
+Oracle:Whenever Imaryll, Elfhame Elite attacks, it gets +X/+X until end of turn, where X is the number of other Elves you control.\nYou may have Imaryll assign its combat damage as though it weren't blocked.
diff --git a/forge-gui/res/cardsfolder/w/wolf_pack.txt b/forge-gui/res/cardsfolder/w/wolf_pack.txt
index 2540889fccc..2f6075569a1 100644
--- a/forge-gui/res/cardsfolder/w/wolf_pack.txt
+++ b/forge-gui/res/cardsfolder/w/wolf_pack.txt
@@ -2,5 +2,5 @@ Name:Wolf Pack
 ManaCost:6 G G
 Types:Creature Wolf
 PT:7/6
-K:You may have CARDNAME assign its combat damage as though it weren't blocked.
+S:Mode$ AssignCombatDamageAsUnblocked | ValidCard$ Card.Self | Optional$ True | Description$ You may have CARDNAME assign its combat damage as though it weren't blocked.
 Oracle:You may have Wolf Pack assign its combat damage as though it weren't blocked.

From 9442f4c4d7aa55d9cf54c7ca67a58ae2cf24e776 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 14:40:52 -0400
Subject: [PATCH 161/309] carnelian_orb_of_dragonkind.txt

---
 .../cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt    | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt
new file mode 100644
index 00000000000..b033dcf77a0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt
@@ -0,0 +1,6 @@
+Name:Carnelian Orb of Dragonkind
+ManaCost:2 R
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ R | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Dragon | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.
+DeckHints:Type$Dragon
+Oracle:{T}: Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.

From de4b0890336289314fcdce13a415f14645641027 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 14:48:17 -0400
Subject: [PATCH 162/309] carnelian_orb_of_dragonkind.txt refine value

---
 .../res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt
index b033dcf77a0..1705750b380 100644
--- a/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt
+++ b/forge-gui/res/cardsfolder/upcoming/carnelian_orb_of_dragonkind.txt
@@ -1,6 +1,6 @@
 Name:Carnelian Orb of Dragonkind
 ManaCost:2 R
 Types:Artifact
-A:AB$ Mana | Cost$ T | Produced$ R | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Dragon | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.
+A:AB$ Mana | Cost$ T | Produced$ R | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Dragon+Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.
 DeckHints:Type$Dragon
 Oracle:{T}: Add {R}. If that mana is spent on a Dragon creature spell, it gains haste until end of turn.

From 9740e1e75b1227ecdb93f5d2627f63d0b692a362 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 14:48:27 -0400
Subject: [PATCH 163/309] refactor old cards

---
 forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt     | 2 +-
 forge-gui/res/cardsfolder/g/generator_servant.txt       | 2 +-
 forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt b/forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
index 593c34a484f..f783adc99bb 100644
--- a/forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
+++ b/forge-gui/res/cardsfolder/d/domri_chaos_bringer.txt
@@ -2,7 +2,7 @@ Name:Domri, Chaos Bringer
 ManaCost:2 R G
 Types:Legendary Planeswalker Domri
 Loyalty:5
-A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ Combo R G | Amount$ 1 | AddsKeywords$ Riot | AddsKeywordsType$ Creature | SpellDescription$ Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)
+A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ Combo R G | Amount$ 1 | AddsKeywords$ Riot | AddsKeywordsValid$ Spell.Creature | SpellDescription$ Add {R} or {G}. If that mana is spent on a creature spell, it gains riot. (It enters the battlefield with your choice of a +1/+1 counter or haste.)
 A:AB$ Dig | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ForceRevealToController$ True | DigNum$ 4 | ChangeNum$ 2 | Optional$ True | ChangeValid$ Creature | RestRandomOrder$ True | SpellDescription$ Look at the top four 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.
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Domri, Chaos Bringer | Image$ emblem_domri_chaos_bringer | Triggers$ EffPhase | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of each end step, create a 4/4 red and green Beast creature token with trample."
 SVar:EffPhase:Mode$ Phase | Phase$ End of Turn | Execute$ EmblemTrigToken | TriggerDescription$ At the beginning of each end step, create a 4/4 red and green Beast creature token with trample.
diff --git a/forge-gui/res/cardsfolder/g/generator_servant.txt b/forge-gui/res/cardsfolder/g/generator_servant.txt
index b65658b5db9..c5dfe1352dd 100644
--- a/forge-gui/res/cardsfolder/g/generator_servant.txt
+++ b/forge-gui/res/cardsfolder/g/generator_servant.txt
@@ -2,6 +2,6 @@ Name:Generator Servant
 ManaCost:1 R
 Types:Creature Elemental
 PT:2/1
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ C | Amount$ 2 | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn.
 AI:RemoveDeck:All
 Oracle:{T}, Sacrifice Generator Servant: Add {C}{C}. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt b/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
index 3d632de3861..93611c3276c 100644
--- a/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
+++ b/forge-gui/res/cardsfolder/h/hall_of_the_bandit_lord.txt
@@ -2,5 +2,5 @@ Name:Hall of the Bandit Lord
 ManaCost:no cost
 Types:Legendary Land
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsType$ Creature | SpellDescription$ Add {C}. If that mana is spent on a creature spell, it gains haste.
+A:AB$ Mana | Cost$ T PayLife<3> | Produced$ C | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Creature | SpellDescription$ Add {C}. If that mana is spent on a creature spell, it gains haste.
 Oracle:Hall of the Bandit Lord enters the battlefield tapped.\n{T}, Pay 3 life: Add {C}. If that mana is spent on a creature spell, it gains haste.

From 0acad1ecd50ddc9e2628413164223d1fde80b1a1 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 14:49:16 -0400
Subject: [PATCH 164/309] SpellAbility.applyPayingManaEffects use isValid
 instead of hasStringType

---
 .../src/main/java/forge/game/spellability/SpellAbility.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 9528878c710..8efe6869c98 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -638,7 +638,8 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
 
             if (isSpell() && host != null) {
                 if (mana.addsKeywords(this) && mana.addsKeywordsType()
-                        && host.getType().hasStringType(mana.getManaAbility().getAddsKeywordsType())) {
+                        && this.isValid(mana.getManaAbility().getAddsKeywordsType(),
+                        mana.getSourceCard().getController(), mana.getSourceCard(), null)) {
                     final long timestamp = host.getGame().getNextTimestamp();
                     final List<String> kws = Arrays.asList(mana.getAddedKeywords().split(" & "));
                     host.addChangedCardKeywords(kws, null, false, timestamp, 0);

From 508b6b4e90159453f56fc4df8f1144adae1a94c5 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 14:49:36 -0400
Subject: [PATCH 165/309] refactor param name

---
 .../src/main/java/forge/game/spellability/AbilityManaPart.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bf31cc6a915..c1f5dc6e9d7 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -93,7 +93,7 @@ public class AbilityManaPart implements java.io.Serializable {
         this.manaRestrictions = params.getOrDefault("RestrictValid", "");
         this.cannotCounterSpell = params.get("AddsNoCounter");
         this.addsKeywords = params.get("AddsKeywords");
-        this.addsKeywordsType = params.get("AddsKeywordsType");
+        this.addsKeywordsType = params.get("AddsKeywordsValid");
         this.addsKeywordsUntil = params.get("AddsKeywordsUntil");
         this.addsCounters = params.get("AddsCounters");
         this.triggersWhenSpent = params.get("TriggersWhenSpent");

From 35710e31f2c0cd5ca29754c9e0ec66b96b8b1af0 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 5 Jul 2022 20:54:42 +0100
Subject: [PATCH 166/309] scripts

---
 forge-gui/res/cardsfolder/d/dueling_coach.txt |  2 +-
 forge-gui/res/cardsfolder/p/painful_bond.txt  |  8 ++---
 .../rebalanced/a-ardent_dustspeaker.txt       | 11 +++++++
 .../rebalanced/a-bretagard_stronghold.txt     |  9 ++++++
 .../rebalanced/a-cauldron_familiar.txt        | 15 ++++++++++
 .../rebalanced/a-dragons_rage_channeler.txt   | 10 +++++++
 .../rebalanced/a-dueling_coach.txt            |  9 ++++++
 .../rebalanced/a-fall_of_the_impostor.txt     | 11 +++++++
 .../rebalanced/a-gnarlid_colony.txt           | 11 +++++++
 .../rebalanced/a-hagra_constrictor.txt        |  8 +++++
 .../rebalanced/a-iridescent_hornbeetle.txt    | 10 +++++++
 .../rebalanced/a-maelstrom_muse.txt           | 14 +++++++++
 .../rebalanced/a-master_of_winds.txt          | 15 ++++++++++
 .../rebalanced/a-mentors_guidance.txt         |  9 ++++++
 .../rebalanced/a-moss_pit_skeleton.txt        | 12 ++++++++
 .../cardsfolder/rebalanced/a-ochre_jelly.txt  | 14 +++++++++
 .../rebalanced/a-oran_rief_ooze.txt           | 11 +++++++
 .../rebalanced/a-rockslide_sorcerer.txt       |  9 ++++++
 ...cholar_of_sparks_will_scholar_of_frost.txt | 30 +++++++++++++++++++
 .../rebalanced/a-sigardian_paladin.txt        | 10 +++++++
 .../rebalanced/a-skyclave_shadowcat.txt       | 10 +++++++
 .../rebalanced/a-sorcerer_class.txt           | 14 +++++++++
 .../rebalanced/a-tanazir_quandrix.txt         | 15 ++++++++++
 .../rebalanced/a-tenured_inkcaster.txt        | 11 +++++++
 .../rebalanced/a-the_meathook_massacre.txt    | 10 +++++++
 .../rebalanced/a-tome_shredder.txt            |  8 +++++
 .../cardsfolder/rebalanced/a-umara_mystic.txt | 11 +++++++
 .../cardsfolder/rebalanced/a-unholy_heat.txt  |  7 +++++
 .../rebalanced/a-winota_joiner_of_forces.txt  | 10 +++++++
 .../res/cardsfolder/s/sigardian_paladin.txt   |  2 +-
 30 files changed, 320 insertions(+), 6 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-ardent_dustspeaker.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-bretagard_stronghold.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-cauldron_familiar.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-dragons_rage_channeler.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-fall_of_the_impostor.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-gnarlid_colony.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-hagra_constrictor.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-iridescent_hornbeetle.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-maelstrom_muse.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-master_of_winds.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-mentors_guidance.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-moss_pit_skeleton.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-oran_rief_ooze.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-rockslide_sorcerer.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-rowan_scholar_of_sparks_will_scholar_of_frost.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-sigardian_paladin.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-skyclave_shadowcat.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-sorcerer_class.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-tanazir_quandrix.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-tenured_inkcaster.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-the_meathook_massacre.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-tome_shredder.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-unholy_heat.txt
 create mode 100644 forge-gui/res/cardsfolder/rebalanced/a-winota_joiner_of_forces.txt

diff --git a/forge-gui/res/cardsfolder/d/dueling_coach.txt b/forge-gui/res/cardsfolder/d/dueling_coach.txt
index c7a27b75524..b959dee8c46 100644
--- a/forge-gui/res/cardsfolder/d/dueling_coach.txt
+++ b/forge-gui/res/cardsfolder/d/dueling_coach.txt
@@ -4,6 +4,6 @@ Types:Creature Human Monk
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ PutCounterAll | Cost$ 4 W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ PutCounterAll | Cost$ 4 W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
 DeckHas:Ability$Counters
 Oracle:When Dueling Coach enters the battlefield, put a +1/+1 counter on target creature.\n{4}{W}, {T}: Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/p/painful_bond.txt b/forge-gui/res/cardsfolder/p/painful_bond.txt
index c5be6a83c99..a95083b04ac 100644
--- a/forge-gui/res/cardsfolder/p/painful_bond.txt
+++ b/forge-gui/res/cardsfolder/p/painful_bond.txt
@@ -1,11 +1,11 @@
 Name:Painful Bond
 ManaCost:1 B
 Types:Instant
-A:SP$ Draw | Cost$ 1 B | NumCards$ 2 | SubAbility$ DBEffect | SpellDescription$ Draw two cards, then cards in your hand with mana value 3 or greater perpetually gain "When you cast this spell, you lose 1 life."
-SVar:DBEffect:DB$ Effect | RememberObjects$ ValidHand Card.cmcLE3+YouOwn | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Painful Bond's Perpetual Effect | StackDescription$ Then cards in {p:You}'s hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
-SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.IsRemembered | AddTrigger$ CastSpellLoseLife | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Cards in your hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
+A:SP$ Draw | Cost$ 1 B | NumCards$ 2 | SubAbility$ DBEffect | SpellDescription$ Draw two cards, then nonland cards in your hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
+SVar:DBEffect:DB$ Effect | RememberObjects$ ValidHand Card.nonLand+cmcLE3+YouOwn | StaticAbilities$ PerpetualAbility | Duration$ Permanent | Triggers$ Update | Name$ Painful Bond's Perpetual Effect | StackDescription$ Then nonland cards in {p:You}'s hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
+SVar:PerpetualAbility:Mode$ Continuous | Affected$ Card.IsRemembered | AddTrigger$ CastSpellLoseLife | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Nonland cards in your hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
 SVar:CastSpellLoseLife:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When you cast this spell, you lose 1 life.
 SVar:TrigDrain:DB$ LoseLife | LifeAmount$ 1
 SVar:Update:Mode$ ChangesZone | Origin$ Any | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered | Execute$ DBUpdate
 SVar:DBUpdate:DB$ UpdateRemember
-Oracle:Draw two cards, then cards in your hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
+Oracle:Draw two cards, then nonland cards in your hand with mana value 3 or less perpetually gain "When you cast this spell, you lose 1 life."
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-ardent_dustspeaker.txt b/forge-gui/res/cardsfolder/rebalanced/a-ardent_dustspeaker.txt
new file mode 100644
index 00000000000..a8bcc9d44db
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-ardent_dustspeaker.txt
@@ -0,0 +1,11 @@
+Name:A-Ardent Dustspeaker
+ManaCost:2 R
+Types:Creature Minotaur Shaman
+PT:3/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ ABImpulse | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may put an instant or sorcery card from your graveyard on the bottom of your library. If you do, exile the top two cards of your library. You may play those cards this turn.
+SVar:ABImpulse:AB$ Dig | Cost$ PutCardToLibFromGrave<1/-1/Sorcery;Instant> | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | SubAbility$ DBEffect | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top two cards of your library. You may play this cards this turn.
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ForgetOnMoved$ Exile
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Ardent Dustspeaker attacks, you may put an instant or sorcery card from your graveyard on the bottom of your library. If you do, exile the top two cards of your library. You may play those cards this turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-bretagard_stronghold.txt b/forge-gui/res/cardsfolder/rebalanced/a-bretagard_stronghold.txt
new file mode 100644
index 00000000000..ad8a29a999c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-bretagard_stronghold.txt
@@ -0,0 +1,9 @@
+Name:A-Bretagard Stronghold
+ManaCost:no cost
+Types:Land
+K:CARDNAME enters the battlefield tapped.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
+A:AB$ PutCounter | Cost$ G W W T Sac<1/CARDNAME> | CounterNum$ 2 | CounterType$ P1P1 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select one or two target creatures you control | SorcerySpeed$ True | SubAbility$ DBPump | SpellDescription$ Distribute two +1/+1 counters among one or two target creatures you control. They gain vigilance and lifelink until end of turn. Activate only as a sorcery.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Vigilance & Lifelink | StackDescription$ {c:Targeted} gain vigilance and lifelink until end of turn.
+DeckHas:Ability$Sacrifice|Counters|LifeGain
+Oracle:Bretagard Stronghold enters the battlefield tapped.\n{T}: Add {G}.\n{G}{W}{W}, {T}, Sacrifice Bretagard Stronghold: Distribute two +1/+1 counters among one or two target creatures you control. They gain vigilance and lifelink until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-cauldron_familiar.txt b/forge-gui/res/cardsfolder/rebalanced/a-cauldron_familiar.txt
new file mode 100644
index 00000000000..dd7e57a5991
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-cauldron_familiar.txt
@@ -0,0 +1,15 @@
+Name:A-Cauldron Familiar
+ManaCost:B
+Types:Creature Cat
+PT:1/1
+K:CARDNAME can't block.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses 1 life and you gain 1 life.
+SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$LifeGain
+A:AB$ ChangeZone | Cost$ Sac<1/Food> | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to the battlefield.
+SVar:DiscardMe:2
+SVar:SacMe:1
+SVar:AIPreference:SacCost$Card.Food
+DeckHints:Ability$Food
+Oracle:Cauldron Familiar can't block.\nWhen Cauldron Familiar enters the battlefield, each opponent loses 1 life and you gain 1 life.\nSacrifice a Food: Return Cauldron Familiar from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-dragons_rage_channeler.txt b/forge-gui/res/cardsfolder/rebalanced/a-dragons_rage_channeler.txt
new file mode 100644
index 00000000000..4c1ec431ed0
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-dragons_rage_channeler.txt
@@ -0,0 +1,10 @@
+Name:A-Dragon's Rage Channeler
+ManaCost:R
+Types:Creature Human Shaman
+PT:1/1
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSurveil | TriggerDescription$ Whenever you cast a noncreature spell, surveil 1.
+SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddKeyword$ Flying | Condition$ Delirium | Description$ Delirium — As long as there are four or more card types in your graveyard, CARDNAME gets +2/+0, has flying, and attacks each combat if able.
+S:Mode$ MustAttack | ValidCreature$ Card.Self | Condition$ Delirium | Secondary$ True
+DeckHas:Ability$Delirium|Surveil
+Oracle:Whenever you cast a noncreature spell, surveil 1.\nDelirium — As long as there are four or more card types among cards in your graveyard, Dragon's Rage Channeler gets +2/+0, has flying, and attacks each combat if able.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt b/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
new file mode 100644
index 00000000000..4464605a9e3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
@@ -0,0 +1,9 @@
+Name:A-Dueling Coach
+ManaCost:3 W
+Types:Creature Human Monk
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select one or two target creatures you control | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
+A:AB$ PutCounterAll | Cost$ W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
+DeckHas:Ability$Counters
+Oracle:When Dueling Coach enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.\n{W}, {T}: Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-fall_of_the_impostor.txt b/forge-gui/res/cardsfolder/rebalanced/a-fall_of_the_impostor.txt
new file mode 100644
index 00000000000..52513da069c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-fall_of_the_impostor.txt
@@ -0,0 +1,11 @@
+Name:A-Fall of the Impostor
+ManaCost:G W
+Types:Enchantment Saga
+K:Saga:3:DBPutCounter,DBPutCounter,DBExileGreatest
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 1 | SpellDescription$ Put a +1/+1 counter on up to one target creature.
+SVar:DBExileGreatest:DB$ Pump | ValidTgts$ Player.Opponent | RememberTargets$ True | SubAbility$ DBChooseExiled | IsCurse$ True | SpellDescription$ Exile a creature with the greatest power among creatures target opponent controls.
+SVar:DBChooseExiled:DB$ ChooseCard | Choices$ Creature.greatestPowerControlledByRemembered | MinAmount$ 1 | Amount$ 1 | Mandatory$ True | ChoiceZone$ Battlefield | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ ChosenCard | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
+Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI, II — Put a +1/+1 counter on up to one target creature.\nIII — Exile a creature with the greatest power among creatures target opponent controls.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-gnarlid_colony.txt b/forge-gui/res/cardsfolder/rebalanced/a-gnarlid_colony.txt
new file mode 100644
index 00000000000..94712c713bf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-gnarlid_colony.txt
@@ -0,0 +1,11 @@
+Name:A-Gnarlid Colony
+ManaCost:1 G
+Types:Creature Beast
+PT:2/2
+K:Kicker:2 G
+K:etbCounter:P1P1:4:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with four +1/+1 counters on it.
+SVar:WasKicked:Count$Kicked.1.0
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Trample | Description$ Each creature you control with a +1/+1 counter on it has trample.
+DeckHints:Ability$Counters
+DeckHas:Ability$Counters
+Oracle:Kicker {2}{G}\nIf Gnarlid Colony was kicked, it enters the battlefield with four +1/+1 counters on it.\nEach creature you control with a +1/+1 counter on it has trample.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-hagra_constrictor.txt b/forge-gui/res/cardsfolder/rebalanced/a-hagra_constrictor.txt
new file mode 100644
index 00000000000..ee28cfb23e6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-hagra_constrictor.txt
@@ -0,0 +1,8 @@
+Name:A-Hagra Constrictor
+ManaCost:1 B
+Types:Creature Snake
+PT:0/0
+K:etbCounter:P1P1:2
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+counters_GE1_P1P1 | AddKeyword$ Menace | Description$ Each creature you control with a +1/+1 counter on it has menace.
+DeckHas:Ability$Counters
+Oracle:Hagra Constrictor enters the battlefield with two +1/+1 counters on it.\nEach creature you control with a +1/+1 counter on it has menace.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-iridescent_hornbeetle.txt b/forge-gui/res/cardsfolder/rebalanced/a-iridescent_hornbeetle.txt
new file mode 100644
index 00000000000..3a71972483a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-iridescent_hornbeetle.txt
@@ -0,0 +1,10 @@
+Name:A-Iridescent Hornbeetle
+ManaCost:3 G
+Types:Creature Insect
+PT:3/3
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a 1/1 green Insect creature token for each +1/+1 counter you've put on creatures under your control this turn.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenOwner$ You | TokenScript$ g_1_1_insect
+SVar:X:Count$CountersAddedThisTurn P1P1 You Creature.YouCtrl
+DeckNeeds:Ability$Counters
+DeckHas:Ability$Counters
+Oracle:At the beginning of your end step, create a 1/1 green Insect creature token for each +1/+1 counter you've put on creatures under your control this turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-maelstrom_muse.txt b/forge-gui/res/cardsfolder/rebalanced/a-maelstrom_muse.txt
new file mode 100644
index 00000000000..94d546011b9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-maelstrom_muse.txt
@@ -0,0 +1,14 @@
+Name:A-Maelstrom Muse
+ManaCost:U U/R R
+Types:Creature Djinn Wizard
+PT:2/4
+K:Flying
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ CheckPower | TriggerDescription$ Whenever CARDNAME attacks, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is CARDNAME's power as this ability resolves.
+SVar:CheckPower:DB$ StoreSVar | SVar$ CurrPower | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect | SpellDescription$ The next instant or sorcery spell you cast this turn costs {X} less to cast, where X is CARDNAME's power as this ability resolves.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ ReduceCost | Triggers$ TrigCastSpell
+SVar:ReduceCost:Mode$ ReduceCost | EffectZone$ Command | Type$ Spell | ValidCard$ Instant,Sorcery | Activator$ You | Amount$ CurrPower | Description$ The next instant or sorcery spell you cast this turn costs {X} less to cast, where X is CARDNAME's power at the time EFFECTSOURCE's ability resolved.
+SVar:TrigCastSpell:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ RemoveEffect | Static$ True
+SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile
+SVar:CurrPower:Number$0
+SVar:X:TriggeredCard$CardPower
+Oracle:Flying\nWhenever Maelstrom Muse attacks, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is Maelstrom Muse's power as this ability resolves.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-master_of_winds.txt b/forge-gui/res/cardsfolder/rebalanced/a-master_of_winds.txt
new file mode 100644
index 00000000000..3152a38d04b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-master_of_winds.txt
@@ -0,0 +1,15 @@
+Name:A-Master of Winds
+ManaCost:2 U U
+Types:Creature Sphinx Wizard
+PT:1/5
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards, then discard a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery,Wizard | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChoose | TriggerDescription$ Whenever you cast an instant, sorcery, or Wizard spell, you may have CARDNAME's base power and toughness become 5/1 or 1/5 until end of turn.
+SVar:TrigChoose:DB$ GenericChoice | Defined$ You | Choices$ Animate51,Animate15
+SVar:Animate51:DB$ Animate | Defined$ Self | Power$ 5 | Toughness$ 1 | SpellDescription$ CARDNAME's base power and toughness become 5/1 until end of turn.
+SVar:Animate15:DB$ Animate | Defined$ Self | Power$ 1 | Toughness$ 5 | SpellDescription$ CARDNAME's base power and toughness become 1/5 until end of turn.
+SVar:BuffedBy:Instant,Sorcery,Wizard
+DeckNeeds:Type$Instant|Sorcery|Wizard
+Oracle:Flying\nWhen Master of Winds enters the battlefield, draw two cards, then discard a card.\nWhenever you cast an instant, sorcery, or Wizard spell, you may have Master of Winds's base power and toughness become 5/1 or 1/5 until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-mentors_guidance.txt b/forge-gui/res/cardsfolder/rebalanced/a-mentors_guidance.txt
new file mode 100644
index 00000000000..dd5e5851bb2
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-mentors_guidance.txt
@@ -0,0 +1,9 @@
+Name:A-Mentor's Guidance
+ManaCost:1 U
+Types:Sorcery
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ When you cast this spell, copy it if you control a planeswalker, Cleric, Druid, Shaman, Warlock, or Wizard.
+SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | ConditionPresent$ Planeswalker.YouCtrl,Cleric.YouCtrl,Druid.YouCtrl,Shaman.YouCtrl,Warlock.YouCtrl,Wizard.YouCtrl | ConditionCompare$ GE1
+A:SP$ Scry | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1,
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ then draw a card.
+DeckHints:Type$Planeswalker|Cleric|Druid|Shaman|Warlock|Wizard
+Oracle:When you cast this spell, copy it if you control a planeswalker, Cleric, Druid, Shaman, Warlock, or Wizard.\nScry 1, then draw a card.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-moss_pit_skeleton.txt b/forge-gui/res/cardsfolder/rebalanced/a-moss_pit_skeleton.txt
new file mode 100644
index 00000000000..642ea4e05ce
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-moss_pit_skeleton.txt
@@ -0,0 +1,12 @@
+Name:A-Moss-Pit Skeleton
+ManaCost:B G
+Types:Creature Plant Skeleton
+PT:2/2
+K:Kicker:3
+K:etbCounter:P1P1:3:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with three +1/+1 counters on it.
+SVar:WasKicked:Count$Kicked.1.0
+T:Mode$ CounterAddedOnce | ValidCard$ Creature.YouCtrl | CounterType$ P1P1 | TriggerZones$ Graveyard | IsPresent$ Card.StrictlySelf | PresentZone$ Graveyard | Execute$ TrigDelayedTrigger | TriggerDescription$ Whenever one or more +1/+1 counters are put on a creature you control, return CARDNAME from your graveyard to your hand at the beginning of the next end step.
+SVar:TrigDelayedTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigChange | TriggerDescription$ Return CARDNAME from your graveyard to your hand at the beginning of the next end step.
+SVar:TrigChange:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand
+DeckHints:Ability$Counters|Graveyard
+Oracle:Kicker {3}\nIf Moss-Pit Skeleton was kicked, it enters the battlefield with three +1/+1 counters on it.\nWhenever one or more +1/+1 counters are put on a creature you control, return Moss-Pit Skeleton from your graveyard to your hand at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt b/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt
new file mode 100644
index 00000000000..717e43c381d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-ochre_jelly.txt
@@ -0,0 +1,14 @@
+Name:A-Ochre Jelly
+ManaCost:X G
+Types:Creature Ooze
+PT:0/0
+K:Trample
+K:Ward:2
+K:etbCounter:P1P1:X
+SVar:X:Count$xPaid
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_GE2_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDelayTrigger | TriggerDescription$ Split — When CARDNAME dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down.
+SVar:TrigDelayTrigger:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | RememberObjects$ TriggeredCardLKICopy | CopyTriggeringObjects$ True | Execute$ TrigCopy | TriggerDescription$ Create a token that's a copy of it at the beginning of the next end step. That token enters the battlefield with half that many +1/+1 counters on it, rounded down.
+SVar:TrigCopy:DB$ CopyPermanent | Defined$ DelayTriggerRememberedLKI | WithCountersType$ P1P1 | WithCountersAmount$ Y
+SVar:Y:TriggeredCard$CardCounters.P1P1/HalfDown
+DeckHas:Ability$Counters|Token
+Oracle:Trample\nWard {2}\nOchre Jelly enters the battlefield with X +1/+1 counters on it.\nSplit — When Ochre Jelly dies, if it had two or more +1/+1 counters on it, create a token that's a copy of it at the beginning of the next end step. The token enters the battlefield with half that many +1/+1 counters on it, rounded down.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-oran_rief_ooze.txt b/forge-gui/res/cardsfolder/rebalanced/a-oran_rief_ooze.txt
new file mode 100644
index 00000000000..4f66135fa49
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-oran_rief_ooze.txt
@@ -0,0 +1,11 @@
+Name:A-Oran-Rief Ooze
+ManaCost:2 G
+Types:Creature Ooze
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature you control.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
+SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters
+Oracle:When Oran-Rief Ooze enters the battlefield, put a +1/+1 counter on target creature you control.\nWhenever Oran-Rief Ooze attacks, put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-rockslide_sorcerer.txt b/forge-gui/res/cardsfolder/rebalanced/a-rockslide_sorcerer.txt
new file mode 100644
index 00000000000..b8e1aa4dace
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-rockslide_sorcerer.txt
@@ -0,0 +1,9 @@
+Name:A-Rockslide Sorcerer
+ManaCost:2 R
+Types:Creature Human Wizard
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery,Wizard | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast an instant, sorcery, or Wizard spell, CARDNAME deals 1 damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
+SVar:BuffedBy:Instant,Sorcery,Wizard
+DeckNeeds:Type$Instant|Sorcery|Wizard
+Oracle:Whenever you cast an instant, sorcery, or Wizard spell, Rockslide Sorcerer deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-rowan_scholar_of_sparks_will_scholar_of_frost.txt b/forge-gui/res/cardsfolder/rebalanced/a-rowan_scholar_of_sparks_will_scholar_of_frost.txt
new file mode 100644
index 00000000000..90095d53a16
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-rowan_scholar_of_sparks_will_scholar_of_frost.txt
@@ -0,0 +1,30 @@
+Name:A-Rowan, Scholar of Sparks
+ManaCost:2 R
+Types:Legendary Planeswalker Rowan
+Loyalty:3
+S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Instant and sorcery spells you cast cost {1} less to cast.
+A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ Player.Opponent | NumDmg$ X | SpellDescription$ CARDNAME deals 1 damage to each opponent. If you've drawn three or more cards this turn, she deals 3 damage to each opponent instead.
+SVar:X:Count$Compare Y GE3.3.1
+SVar:Y:Count$YouDrewThisTurn
+A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Rowan, Scholar of Sparks | Triggers$ TRCast | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy."
+SVar:TRCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy.
+SVar:TrigCopy:AB$ CopySpellAbility | Cost$ 2 | Defined$ TriggeredSpellAbility | AILogic$ AlwaysIfViable | MayChooseTarget$ True
+AlternateMode:Modal
+DeckHints:Type$Instant|Sorcery
+Oracle:Instant and sorcery spells you cast cost {1} less to cast.\n[+1]: Rowan, Scholar of Sparks deals 1 damage to each opponent. If you've drawn three or more cards this turn, she deals 3 damage to each opponent instead.\n[-5]: You get an emblem with "Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy."
+
+ALTERNATE
+
+Name:A-Will, Scholar of Frost
+ManaCost:4 U
+Types:Legendary Planeswalker Will
+Loyalty:5
+S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Instant and sorcery spells you cast cost {1} less to cast.
+A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | Power$ 0 | Toughness$ 2 | Duration$ UntilYourNextTurn | SpellDescription$ Up to one target creature has base power and toughness 0/2 until your next turn.
+A:AB$ Draw | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | NumCards$ 2 | SpellDescription$ Draw two cards.
+A:AB$ ChangeZone | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Permanent | TgtPrompt$ Select up to five target permanents | TargetMin$ 0 | TargetMax$ 5 | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBRepeat | SpellDescription$ Exile up to five target permanents. For each permanent exiled this way, its controller creates a 4/4 blue and red Elemental creature token.
+SVar:DBRepeat:DB$ RepeatEach | DefinedCards$ DirectRemembered | UseImprinted$ True | RepeatSubAbility$ DBToken | SubAbility$ DBCleanup | ChangeZoneTables$ True
+SVar:DBToken:DB$ Token | TokenScript$ ur_4_4_elemental | TokenOwner$ ImprintedController
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Token
+Oracle:Instant and sorcery spells you cast cost {1} less to cast.\n[+1]: Up to one target creature has base power and toughness 0/2 until your next turn.\n[-3]: Draw two cards.\n[-8]: Exile up to five target permanents. For each permanent exiled this way, its controller creates a 4/4 blue and red Elemental creature token.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-sigardian_paladin.txt b/forge-gui/res/cardsfolder/rebalanced/a-sigardian_paladin.txt
new file mode 100644
index 00000000000..9ecc4847fe3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-sigardian_paladin.txt
@@ -0,0 +1,10 @@
+Name:A-Sigardian Paladin
+ManaCost:1 G W
+Types:Creature Human Knight
+PT:4/3
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample & Lifelink | CheckSVar$ X | Description$ As long as you've put one or more +1/+1 counters on a creature this turn, CARDNAME has trample and lifelink.
+SVar:X:Count$CountersAddedThisTurn P1P1 You Creature
+A:AB$ Pump | Cost$ G W | ValidTgts$ Creature.YouCtrl+counters_GE1_P1P1 | TgtPrompt$ Select target creature with a +1/+1 counter on it | KW$ Trample & Lifelink | SpellDescription$ Target creature you control with a +1/+1 counter on it gains trample and lifelink until end of turn.
+DeckNeeds:Ability$Counters
+DeckHas:Ability$LifeGain
+Oracle:As long as you've put one or more +1/+1 counters on a creature this turn, Sigardian Paladin has trample and lifelink.\n{G}{W}: Target creature you control with a +1/+1 counter on it gains trample and lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-skyclave_shadowcat.txt b/forge-gui/res/cardsfolder/rebalanced/a-skyclave_shadowcat.txt
new file mode 100644
index 00000000000..c510e3832ea
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-skyclave_shadowcat.txt
@@ -0,0 +1,10 @@
+Name:A-Skyclave Shadowcat
+ManaCost:2 B
+Types:Creature Cat Horror
+PT:3/3
+A:AB$ PutCounter | Cost$ B Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it dies, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:PlayMain1:TRUE
+DeckHas:Ability$Sacrifice|Counters
+Oracle:{B}, Sacrifice another creature: Put a +1/+1 counter on Skyclave Shadowcat.\nWhenever a creature you control with a +1/+1 counter on it dies, draw a card.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-sorcerer_class.txt b/forge-gui/res/cardsfolder/rebalanced/a-sorcerer_class.txt
new file mode 100644
index 00000000000..57f2d403001
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-sorcerer_class.txt
@@ -0,0 +1,14 @@
+Name:A-Sorcerer Class
+ManaCost:U R
+Types:Enchantment Class
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards, then discard two cards.
+SVar:TrigDraw:DB$ Draw | NumCards$ 2 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose
+K:Class:2:U R:AddStaticAbility$ STapMana
+SVar:STapMana:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Creature.YouCtrl | AddAbility$ AddMana | Secondary$ True | Description$ Creatures you control have "{T}: Add {U} or {R}. Spend this mana only to cast an instant or sorcery spell or to gain a Class level."
+SVar:AddMana:AB$ Mana | Cost$ T | Produced$ Combo U R | Amount$ 1 | RestrictValid$ Spell.Instant,Spell.Sorcery,Activated.ClassLevelUp | SpellDescription$ Add {U} or {R}. Spend this mana only to cast an instant or sorcery spell or to gain a Class level.
+K:Class:3:1 U R:AddTrigger$ TriggerSpellCast
+SVar:TriggerSpellCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | Secondary$ True | TriggerDescription$ Whenever you cast an instant or sorcery spell, that spell deals damage to each opponent equal to the number of instant and sorcery spells you've cast this turn.
+SVar:TrigDealDamage:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ X | DamageSource$ TriggeredCard
+SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
+Oracle:(Gain the next level as a sorcery to add its ability.)\nWhen Sorcerer Class enters the battlefield, draw two cards, then discard two cards.\n{U}{R}: Level 2\nCreatures you control have "{T}: Add {U} or {R}. Spend this mana only to cast an instant or sorcery spell or to gain a Class level."\n{1}{U}{R}: Level 3\nWhenever you cast an instant or sorcery spell, that spell deals damage to each opponent equal to the number of instant and sorcery spells you've cast this turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-tanazir_quandrix.txt b/forge-gui/res/cardsfolder/rebalanced/a-tanazir_quandrix.txt
new file mode 100644
index 00000000000..c13be2ee7fb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-tanazir_quandrix.txt
@@ -0,0 +1,15 @@
+Name:A-Tanazir Quandrix
+ManaCost:3 G U
+Types:Legendary Creature Elder Dragon
+PT:5/5
+K:Flying
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDouble | TriggerDescription$ When CARDNAME enters the battlefield, double the number of +1/+1 counters on target creature you control.
+SVar:TrigDouble:DB$ MultiplyCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigAnimateAll | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may have the base power and toughness of other creatures you control become equal to CARDNAME's power and toughness until end of turn.
+SVar:TrigAnimateAll:DB$ AnimateAll | Power$ X | Toughness$ Y | ValidCards$ Creature.YouCtrl+Other
+SVar:X:Count$CardPower
+SVar:Y:Count$CardToughness
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters
+Oracle:Flying, trample\nWhen Tanazir Quandrix enters the battlefield, double the number of +1/+1 counters on target creature you control.\nWhenever Tanazir Quandrix attacks, you may have the base power and toughness of other creatures you control become equal to Tanazir Quandrix's power and toughness until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-tenured_inkcaster.txt b/forge-gui/res/cardsfolder/rebalanced/a-tenured_inkcaster.txt
new file mode 100644
index 00000000000..5150ad8f6bf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-tenured_inkcaster.txt
@@ -0,0 +1,11 @@
+Name:A-Tenured Inkcaster
+ManaCost:3 B
+Types:Creature Vampire Warlock
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it attacks, each opponent loses 1 life and you gain 1 life.
+SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckHas:Ability$Counters|LifeGain
+Oracle:When Tenured Inkcaster enters the battlefield, put a +1/+1 counter on target creature.\nWhenever a creature you control with a +1/+1 counter on it attacks, each opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-the_meathook_massacre.txt b/forge-gui/res/cardsfolder/rebalanced/a-the_meathook_massacre.txt
new file mode 100644
index 00000000000..2fb4b9dae26
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-the_meathook_massacre.txt
@@ -0,0 +1,10 @@
+Name:A-The Meathook Massacre
+ManaCost:X B B
+Types:Legendary Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, each creature gets -X/-X until end of turn.
+SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature you control dies, each opponent loses 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1
+SVar:X:Count$xPaid
+DeckHints:Ability$Graveyard|Sacrifice
+Oracle:When The Meathook Massacre enters the battlefield, each creature gets -X/-X until end of turn.\nWhenever a creature you control dies, each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-tome_shredder.txt b/forge-gui/res/cardsfolder/rebalanced/a-tome_shredder.txt
new file mode 100644
index 00000000000..22102dc727e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-tome_shredder.txt
@@ -0,0 +1,8 @@
+Name:A-Tome Shredder
+ManaCost:1 R
+Types:Creature Wolf
+PT:2/1
+K:Haste
+A:AB$ PutCounter | Cost$ T ExileFromGrave<1/Instant;Sorcery> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Exile an instant or sorcery card from your graveyard: Put a +1/+1 counter on CARDNAME.
+DeckHas:Ability$Counters
+Oracle:Haste\n{T}, Exile an instant or sorcery card from your graveyard: Put a +1/+1 counter on Tome Shredder.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt b/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
new file mode 100644
index 00000000000..ad36b9a7a0a
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-umara_mystic.txt
@@ -0,0 +1,11 @@
+Name:A-Umara Mystic
+ManaCost:1 U R
+Types:Creature Merfolk Wizard
+PT:1/3
+K:Flying
+K:Haste
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery,Wizard | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a instant, sorcery, or Wizard spell, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+SVar:BuffedBy:Instant,Sorcery,Wizard
+DeckHints:Type$Instant|Sorcery|Wizard
+Oracle:Flying, haste\nWhenever you cast an instant, sorcery, or Wizard spell, Umara Mystic gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-unholy_heat.txt b/forge-gui/res/cardsfolder/rebalanced/a-unholy_heat.txt
new file mode 100644
index 00000000000..e677adfc180
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-unholy_heat.txt
@@ -0,0 +1,7 @@
+Name:A-Unholy Heat
+ManaCost:R
+Types:Instant
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SpellDescription$ CARDNAME deals 2 damage to target creature or planeswalker. Delirium — CARDNAME deals 4 damage instead if there are four or more card types among cards in your graveyard.
+SVar:X:Count$Compare Y GE4.4.2
+SVar:Y:Count$CardControllerTypes.Graveyard
+Oracle:Unholy Heat deals 2 damage to target creature or planeswalker.\nDelirium — Unholy Heat deals 4 damage instead if there are four or more card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-winota_joiner_of_forces.txt b/forge-gui/res/cardsfolder/rebalanced/a-winota_joiner_of_forces.txt
new file mode 100644
index 00000000000..92def8178d9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/rebalanced/a-winota_joiner_of_forces.txt
@@ -0,0 +1,10 @@
+Name:A-Winota, Joiner of Forces
+ManaCost:2 R W
+Types:Legendary Creature Human Warrior
+PT:4/4
+T:Mode$ AttackersDeclared | ValidAttackers$ Creature.nonHuman+YouCtrl | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more non-Human creatures you control attack, look at the top six cards of your library. You may put a Human creature card from among them onto the battlefield tapped and attacking. It gains indestructible until end of turn. Put the rest of the cards on the bottom of your library in a random order.
+SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | Reveal$ False | ChangeValid$ Creature.Human | DestinationZone$ Battlefield | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | Tapped$ True | Attacking$ True | RememberChanged$ True | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Indestructible | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHints:Type$Human
+Oracle:Whenever one or more non-Human creatures you control attack, look at the top six cards of your library. You may put a Human creature card from among them onto the battlefield tapped and attacking. It gains indestructible until end of turn. Put the rest of the cards on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/s/sigardian_paladin.txt b/forge-gui/res/cardsfolder/s/sigardian_paladin.txt
index a31376d48aa..36a0b3f8a9a 100644
--- a/forge-gui/res/cardsfolder/s/sigardian_paladin.txt
+++ b/forge-gui/res/cardsfolder/s/sigardian_paladin.txt
@@ -2,7 +2,7 @@ Name:Sigardian Paladin
 ManaCost:2 G W
 Types:Creature Human Knight
 PT:4/4
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample & Lifelink | CheckSVar$ X | Description$ As long as you've put one or more +1/+1 counters on a creature this turn, Sigardian Paladin has trample and lifelink.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample & Lifelink | CheckSVar$ X | Description$ As long as you've put one or more +1/+1 counters on a creature this turn, CARDNAME has trample and lifelink.
 SVar:X:Count$CountersAddedThisTurn P1P1 You Creature
 A:AB$ Pump | Cost$ 1 G W | ValidTgts$ Creature.YouCtrl+counters_GE1_P1P1 | TgtPrompt$ Select target creature with a +1/+1 counter on it | KW$ Trample & Lifelink | SpellDescription$ Target creature you control with a +1/+1 counter on it gains trample and lifelink until end of turn.
 DeckNeeds:Ability$Counters

From 55783fbc737b4800c445cb941655e28579aad690 Mon Sep 17 00:00:00 2001
From: squee1968 <wrongway329@gmail.com>
Date: Tue, 5 Jul 2022 15:10:39 -0500
Subject: [PATCH 167/309] Create mocking_doppelganger.txt

-closes #897

Co-Authored-By: Northmoc <103371817+Northmoc@users.noreply.github.com>
Co-Authored-By: tool4ever <8506892+tool4ever@users.noreply.github.com>
---
 .../res/cardsfolder/upcoming/mocking_doppelganger.txt    | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt b/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt
new file mode 100644
index 00000000000..b677f1d3030
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt
@@ -0,0 +1,9 @@
+Name:Mocking Doppelganger
+ManaCost:3 U
+Types:Creature Shapeshifter
+PT:0/0
+K:ETBReplacement:Copy:DBCopy:Optional
+K:Flash
+SVar:DBCopy:DB$ Clone | Choices$ Creature.OppCtrl | AddStaticAbilities$ FamilyTease | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded."
+SVar:FamilyTease:Mode$ Continuous | Affected$ Creature.sameName+Other | Goad$ True | Description$ You may have CARDNAME enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded."
+Oracle:Flash\nYou may have Mocking Doppelganger enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded." (They attack each combat if able and attack a player other than you if able.)

From 1762c7a0d8c2a6850ec7637346d07716e9cbad02 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Tue, 5 Jul 2022 21:59:48 +0100
Subject: [PATCH 168/309] editions

---
 ...eons & Dragons Adventures in the Forgotten Realms.txt | 2 ++
 forge-gui/res/editions/Ikoria Lair of Behemoths.txt      | 3 +++
 forge-gui/res/editions/Innistrad Crimson Vow.txt         | 1 +
 forge-gui/res/editions/Innistrad Midnight Hunt.txt       | 1 +
 forge-gui/res/editions/Jumpstart Historic Horizons.txt   | 4 ++++
 forge-gui/res/editions/Kaldheim.txt                      | 2 ++
 forge-gui/res/editions/Strixhaven School of Mages.txt    | 8 ++++++++
 forge-gui/res/editions/Throne of Eldraine.txt            | 1 +
 forge-gui/res/editions/Zendikar Rising.txt               | 9 +++++++++
 9 files changed, 31 insertions(+)

diff --git a/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt b/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt
index 9a0a23ab885..f0bc4795efd 100644
--- a/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt	
+++ b/forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms.txt	
@@ -440,8 +440,10 @@ A130 C A-Armory Veteran @Caio Monteiro
 A180 U A-Druid Class @Svetlin Velinov
 A181 M A-Ellywick Tumblestrum @Anna Steinbauer
 A183 C A-Find the Path @Lindsey Look
+A196 R A-Ochre Jelly @Daarken
 A219 U A-Bruenor Battlehammer @Wayne Reynolds
 A231 U A-Shessra, Death's Whisper @Marie Magny
+A233 R A-Sorcerer Class @Alexander Mokhov
 A237 R A-Triumphant Adventurer @Alexander Mokhov
 A255 R A-Dungeon Descent @Kasia 'Kafis' Zielińska
 
diff --git a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt
index 50c747ab1f9..f38d8dd711c 100644
--- a/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
+++ b/forge-gui/res/editions/Ikoria Lair of Behemoths.txt	
@@ -411,6 +411,9 @@ ScryfallCode=IKO
 386 R Dirge Bat @羽山晃平
 387 R Crystalline Giant @Kotakan
 
+[rebalanced]
+A216 M A-Winota, Joiner of Forces @Magali Villeneuve
+
 [Lands]
 10 Bloodfell Caves|IKO
 10 Blossoming Sands|IKO
diff --git a/forge-gui/res/editions/Innistrad Crimson Vow.txt b/forge-gui/res/editions/Innistrad Crimson Vow.txt
index 314154c7a43..a49d054ff55 100644
--- a/forge-gui/res/editions/Innistrad Crimson Vow.txt	
+++ b/forge-gui/res/editions/Innistrad Crimson Vow.txt	
@@ -437,6 +437,7 @@ Prerelease=6 Boosters, 1 RareMythic+
 A52 U A-Cobbled Lancer @Igor Kieryluk
 A63 R A-Hullbreaker Horror @Svetlin Velinov
 A81 C A-Stitched Assistant @Andrey Kuzinskiy
+A247 U A-Sigardian Paladin @Slawomir Maniak
 A248 U A-Skull Skaab @Nicholas Gregory
 
 [tokens]
diff --git a/forge-gui/res/editions/Innistrad Midnight Hunt.txt b/forge-gui/res/editions/Innistrad Midnight Hunt.txt
index ec059f71f76..6ed816bf8e7 100644
--- a/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
+++ b/forge-gui/res/editions/Innistrad Midnight Hunt.txt	
@@ -417,6 +417,7 @@ Prerelease=6 Boosters, 1 RareMythic+
 A52 C A-Falcon Abomination @Brent Hollowell
 A59 M A-Lier, Disciple of the Drowned @Ekaterina Burmak
 A106 C A-Hobbling Zombie @Josh Hass
+A112 M A-The Meathook Massacre @Chris Seaman
 
 [tokens]
 b_1_1_bat_flying
diff --git a/forge-gui/res/editions/Jumpstart Historic Horizons.txt b/forge-gui/res/editions/Jumpstart Historic Horizons.txt
index 9adc946bf70..a4fc22b816b 100644
--- a/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
+++ b/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
@@ -794,5 +794,9 @@ ScryfallCode=J21
 786 L Mountain
 787 L Forest
 
+[rebalanced]
+A438 U A-Dragon's Rage Channeler @Martina Fackova
+A529 C A-Unholy Heat @Kari Christensen
+
 [tokens]
 u_8_8_kraken
diff --git a/forge-gui/res/editions/Kaldheim.txt b/forge-gui/res/editions/Kaldheim.txt
index a1db1e459a9..88e57b6d4cf 100644
--- a/forge-gui/res/editions/Kaldheim.txt
+++ b/forge-gui/res/editions/Kaldheim.txt
@@ -442,11 +442,13 @@ A165 C A-Elderleaf Mentor @Zoltan Boros
 A166 U A-Elven Bow @Dallas Williams
 A169 R A-Esika's Chariot @Raoul Vitale
 A198 M A-Tyvar Kell @Chris Rallis
+A208 U A-Fall of the Impostor @Eric Deschamps
 A224 U A-Narfi, Betrayer King @Daarken
 A212 U A-Harald, King of Skemfar @Grzegorz Rutkowski
 A213 R A-Harald Unites the Elves @Ryan Pancoast
 A233 U A-Vega, the Watcher @Paul Scott Canavan
 A237 R A-Cosmos Elixir @Volkan Baǵa
+A253 U A-Bretagard Stronghold @Jung Park
 A255 R A-Faceless Haven @Titus Lunter
 A268 U A-Skemfar Elderhall @Johannes Voss
 A378 R A-Canopy Tactician @Ekaterina Burmak
diff --git a/forge-gui/res/editions/Strixhaven School of Mages.txt b/forge-gui/res/editions/Strixhaven School of Mages.txt
index f4a3c6c0291..4f3c9f9419a 100644
--- a/forge-gui/res/editions/Strixhaven School of Mages.txt	
+++ b/forge-gui/res/editions/Strixhaven School of Mages.txt	
@@ -409,8 +409,16 @@ ScryfallCode=STX
 382 U Decisive Denial @Lorenzo Mastroianni
 
 [rebalanced]
+A15 U A-Dueling Coach @Caio Monteiro
 A41 U A-Divide by Zero @Liiga Smilshkalne
+A46 U A-Mentor's Guidance @Brian Valeza
 A56 U A-Symmetry Sage @Jehan Choo
+A88 U A-Tenured Inkcaster @Jake Murray
+A92 U A-Ardent Dustspeaker @Mads Ahm
+A117 C A-Tome Shredder @Sam Rowan
+A156 M A-Rowan, Scholar of Sparks @Magali Villeneuve
+A202 U A-Maelstrom Muse @Michele Parisi
+A240 M A-Tanazir Quandrix @Raymond Swanland
 A258 U A-Spell Satchel @YW Tang
 
 [lesson]
diff --git a/forge-gui/res/editions/Throne of Eldraine.txt b/forge-gui/res/editions/Throne of Eldraine.txt
index 5174383e2ac..d53f359cd39 100644
--- a/forge-gui/res/editions/Throne of Eldraine.txt	
+++ b/forge-gui/res/editions/Throne of Eldraine.txt	
@@ -425,6 +425,7 @@ ScryfallCode=ELD
 397 U Inspiring Veteran @Scott Murphy
 
 [rebalanced]
+A81 U A-Cauldron Familiar @Milivoj Ćeran
 A125 R A-Fires of Invention @Stanton Feng
 
 [tokens]
diff --git a/forge-gui/res/editions/Zendikar Rising.txt b/forge-gui/res/editions/Zendikar Rising.txt
index 1fd2b6e4fb5..882f1bc3819 100644
--- a/forge-gui/res/editions/Zendikar Rising.txt	
+++ b/forge-gui/res/editions/Zendikar Rising.txt	
@@ -419,12 +419,21 @@ ScryfallCode=ZNR
 
 [rebalanced]
 A24 R A-Luminarch Aspirant @Mads Ahm
+A68 R A-Master of Winds @Yigit Koroglu
+A105 C A-Hagra Constrictor @Simon Dominic
+A126 U A-Skyclave Shadowcat @Simon Dominic
 A141 U A-Goma Fada Vanguard @Sean Sevestre
 A145 R A-Kargan Intimidator @Kieran Yanner
+A154 U A-Rockslide Sorcerer @Daarken
+A185 C A-Gnarlid Colony @Izzy
+A187 U A-Iridescent Hornbeetle @Simon Dominic
+A198 R A-Oran-Rief Ooze @Daarken
 A224 U A-Kargan Warleader @Colin Boyer
+A228 U A-Moss-Pit Skeleton @Bryan Sola
 A230 M A-Nahiri, Heir of the Ancients @Anna Steinbauer
 A232 M A-Omnath, Locus of Creation @Chris Rahn
 A234 R A-Phylath, World Sculptor @Victor Adame Minguez
+A238 U A-Umara Mystic @Bryan Sola
 A257 U A-Base Camp @Jokubas Uogintas
 
 [ModalDoubleFaceCards]

From 0748b58a3afddd47a680f4778c0fe288b05d852a Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Tue, 5 Jul 2022 19:33:38 -0500
Subject: [PATCH 169/309] Update mocking_doppelganger.txt

---
 forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt b/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt
index b677f1d3030..d67aeafb798 100644
--- a/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mocking_doppelganger.txt
@@ -5,5 +5,5 @@ PT:0/0
 K:ETBReplacement:Copy:DBCopy:Optional
 K:Flash
 SVar:DBCopy:DB$ Clone | Choices$ Creature.OppCtrl | AddStaticAbilities$ FamilyTease | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded."
-SVar:FamilyTease:Mode$ Continuous | Affected$ Creature.sameName+Other | Goad$ True | Description$ You may have CARDNAME enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded."
+SVar:FamilyTease:Mode$ Continuous | Affected$ Creature.sameName+Other | Goad$ True | Description$ Other creatures with the same name as this creature are goaded.
 Oracle:Flash\nYou may have Mocking Doppelganger enter the battlefield as a copy of a creature an opponent controls, except it has "Other creatures with the same name as this creature are goaded." (They attack each combat if able and attack a player other than you if able.)

From 616637d1608c8fb6fadbfe604e3f4872bdba1f84 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 08:42:54 +0800
Subject: [PATCH 170/309] [Mobile] Assetmanager for card texture & texture
 atlas - texture atlas manager for adventure & card texture manager for card
 images - Assetmanager is automatically used except when
 UI_ENABLE_BORDER_MASKING = Full - makes dispose textures option effective
 (free up some RAM)

---
 forge-gui-mobile/src/forge/Forge.java         |  2 +
 .../src/forge/adventure/util/Config.java      | 15 +++++--
 .../src/forge/assets/ImageCache.java          | 43 +++++++++++++++++--
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 6c264b57984..d4202528440 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -984,6 +984,8 @@ public class Forge implements ApplicationListener {
             currentScreen.onClose(null);
             currentScreen = null;
         }
+        ImageCache.disposeCardTextureManager();
+        Config.instance().disposeTextureAtlasManager();
         Dscreens.clear();
         graphics.dispose();
         SoundSystem.instance.dispose();
diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
index a9ce6206b5d..d5287464db3 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Config.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -1,5 +1,7 @@
 package forge.adventure.util;
 
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.utils.Json;
@@ -25,7 +27,7 @@ public class Config {
     private static Config currentConfig;
     private final String prefix;
     private final HashMap<String, FileHandle> Cache = new HashMap<String, FileHandle>();
-    private final HashMap<String, TextureAtlas> atlasCache = new HashMap<>();
+    private final AssetManager textureAtlasManager = new AssetManager(new AbsoluteFileHandleResolver());
     private final ConfigData configData;
     private final String[] adventures;
     private SettingData settingsData;
@@ -119,10 +121,12 @@ public class Config {
     }
 
     public TextureAtlas getAtlas(String spriteAtlas) {
-        if (!atlasCache.containsKey(spriteAtlas)) {
-            atlasCache.put(spriteAtlas, new TextureAtlas(getFile(spriteAtlas)));
+        String fileName = getFile(spriteAtlas).path();
+        if (!textureAtlasManager.contains(fileName, TextureAtlas.class)) {
+            textureAtlasManager.load(fileName, TextureAtlas.class);
+            textureAtlasManager.finishLoadingAsset(fileName);
         }
-        return atlasCache.get(spriteAtlas);
+        return textureAtlasManager.get(fileName);
     }
     public SettingData getSettingData()
     {
@@ -140,4 +144,7 @@ public class Config {
         handle.writeString(json.prettyPrint(json.toJson(settingsData, SettingData.class)),false);
 
     }
+    public void disposeTextureAtlasManager() {
+        textureAtlasManager.dispose();
+    }
 }
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 3d0d199ff25..87a6ac89cd5 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -20,6 +20,9 @@ package forge.assets;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.TextureLoader;
+import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.ObjectSet;
 import org.apache.commons.lang3.StringUtils;
@@ -68,7 +71,10 @@ public class ImageCache {
 
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
     private static LoadingCache<String, Texture> cache;
+    static int maxCardCapacity = 400; //default cap
+    static AssetManager cardTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
     public static void initCache(int capacity) {
+        maxCardCapacity = capacity;
         cache = CacheBuilder.newBuilder()
                 .maximumSize(capacity)
                 .expireAfterAccess(15, TimeUnit.MINUTES)
@@ -116,7 +122,10 @@ public class ImageCache {
 
     public static void disposeTexture(){
         CardRenderer.clearcardArtCache();
-        clear();
+        cardTextureManager.clear();
+    }
+    public static void disposeCardTextureManager() {
+        cardTextureManager.dispose();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -214,9 +223,11 @@ public class ImageCache {
         }
 
         Texture image;
+        File imageFile = ImageKeys.getImageFile(imageKey);
         if (useDefaultIfNotFound) {
             // Load from file and add to cache if not found in cache initially.
-            image = useOtherCache ? otherCache.getIfPresent(imageKey) : cache.getIfPresent(imageKey);
+            // Except for full bordermask, use assetmanager for card textures. This should make dispose texture options work effectively.
+            image = useOtherCache ? otherCache.getIfPresent(imageKey) : Forge.enableUIMask.equals("Full") ? cache.getIfPresent(imageKey) : getAsset(imageFile);
 
             if (image != null) { return image; }
 
@@ -231,8 +242,9 @@ public class ImageCache {
             imageLoaded = true;
         }
 
-        try { image = useOtherCache ? otherCache.get(imageKey) : cache.get(imageKey); }
-        catch (final Exception ex) {
+        try {
+            image = useOtherCache ? otherCache.get(imageKey) : Forge.enableUIMask.equals("Full") ? cache.get(imageKey) : loadAsset(imageFile);
+        } catch (final Exception ex) {
             image = null;
         }
 
@@ -250,6 +262,29 @@ public class ImageCache {
         }
         return image;
     }
+    static Texture getAsset(File file) {
+        return file == null ? null : cardTextureManager.get(file.getPath(), Texture.class, false);
+    }
+    static Texture loadAsset(File file) {
+        if (file == null)
+            return null;
+        if (cardTextureManager.getLoadedAssets() > maxCardCapacity) {
+            //when maxCardCapacity is reached, clear to refresh
+            cardTextureManager.clear();
+            CardRenderer.clearcardArtCache();
+            return null;
+        }
+        String fileName = file.getPath();
+        TextureLoader.TextureParameter parameter = new TextureLoader.TextureParameter();
+        if (Forge.isTextureFilteringEnabled()) {
+            parameter.minFilter = Texture.TextureFilter.MipMapLinearLinear;
+            parameter.magFilter = Texture.TextureFilter.Linear;
+            parameter.genMipMaps = true;
+        }
+        cardTextureManager.load(fileName, Texture.class, parameter);
+        cardTextureManager.finishLoadingAsset(fileName);
+        return cardTextureManager.get(fileName, Texture.class, false);
+    }
     public static void preloadCache(Iterable<String> keys) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
             return;

From 0b70fd0724fce88108358a9bd5f12b73e39e396d Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Tue, 5 Jul 2022 22:44:02 -0400
Subject: [PATCH 171/309] Draft of Call to the Void.

---
 .../res/cardsfolder/upcoming/call_to_the_void.txt      | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
new file mode 100644
index 00000000000..a7888a1978d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -0,0 +1,10 @@
+Name:Call to the Void
+ManaCost:4 B
+Types:Sorcery
+A:SP$ RepeatEach | Cost$ 4 B | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCreatureYouCtrl | SubAbility$ DBRevealChosen
+SVar:DBChooseCreatureYouCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you control | SubAbility$ DBChooseCreatureYouDontCtrl | RememberChosen$ True | Mandatory$ True
+SVar:DBChooseCreatureYouDontCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.nonRememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you don't control | RememberChosen$ True | Mandatory$ True
+SVar:DBRevealChosen:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBRevealToEachPlayer | SubAbility$ DBDestroyChosen
+SVar:DBRevealToEachPlayer:DB$ Reveal | Defined$ RememberedPlayer | RevealDefined$ ChosenCard
+SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanUp
+SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True 

From cf148f4b2cd4a14b9213bf6cd4ff26191a44e5c5 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Tue, 5 Jul 2022 23:58:52 -0400
Subject: [PATCH 172/309] Card Script for Alaundo the Seer.

---
 .../res/cardsfolder/upcoming/alaundo_the_seer.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
new file mode 100644
index 00000000000..495cee7a203
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
@@ -0,0 +1,15 @@
+Name:Alaundo the Seer
+ManaCost:2 G U
+Types:Legendary Creature Human Shaman
+PT:3/5
+A:AB$ Draw | Cost$ T | SubAbility$ DBExile | StackDescription$ SpellDescription | SpellDescription$ Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.
+SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | TgtPrompt$ Select a card to exile with a number of time counters equal to its mana value | SubAbility$ DBPutTimeCounters | RememberChanged$ True | Mandatory$ True
+SVar:DBPutTimeCounters:DB$ PutCounter | Defined$ Remembered | CounterType$ TIME | CounterNum$ X | SubAbility$ DBAddTrigger
+SVar:X:Remembered$CardManaCost
+SVar:DBAddTrigger:DB$ Animate | Defined$ Remembered | Triggers$ TWhenLastTimeCounterRemoved | Duration$ Permanent | SubAbility$ DBRemoveTimeCounterOtherCardsInExile
+SVar:TWhenLastTimeCounterRemoved:Mode$ CounterRemoved | ValidCard$ Card.Self+counters_EQ0_TIME | TriggerZones$ Exile | CounterType$ TIME | Execute$ DBCastWithoutPayingManaCost | TriggerDescription$ When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn.
+SVar:DBCastWithoutPayingManaCost:DB$ Play | Valid$ Card.Self | ValidSA$ Spell | ValidZone$ Exile | Destination$ Battlefield | WithoutManaCost$ True | Optional$ True | SubAbility$ DBGiveHaste
+SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | PumpZone$ Stack
+SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | SubAbility$ DBCleanUp
+SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
+Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile. (Test#2)

From ecdd4b2d778acda6a8fb0443360e3c7874410229 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 12:38:40 +0800
Subject: [PATCH 173/309] update description

---
 forge-gui/res/languages/de-DE.properties | 2 +-
 forge-gui/res/languages/en-US.properties | 2 +-
 forge-gui/res/languages/es-ES.properties | 2 +-
 forge-gui/res/languages/it-IT.properties | 2 +-
 forge-gui/res/languages/ja-JP.properties | 2 +-
 forge-gui/res/languages/pt-BR.properties | 2 +-
 forge-gui/res/languages/zh-CN.properties | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index b7cb90403d0..5ae2399c391 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -1077,7 +1077,7 @@ nlDisableCardImages=Wenn aktiviert, zeigt Forge keine Kartenbilder mehr.
 lblExperimentalNetworkCompatibility=Experimentelle Netzwerkkompatibilität
 nlExperimentalNetworkCompatibility=Forge wechselt auf kompatiblen Netzwerk-Stream. (Im Zweifel bitte ausschalten)
 lblDisposeTextures=Texturen anordnen
-nlDisposeTextures=Wenn aktiviert, wird der Bildspeicher angeordnet. (Im Zweifel bitte ausschalten)
+nlDisposeTextures=Wenn Sie aktiviert sind, entsorgen Sie die Kartenkunst- und Kartenbild -Caches, um den RAM während des Spielsumschaltens zu speichern. (Im Zweifel bitte ausschalten)
 lblAutoCacheSize=Aktiviere automatische Cache-Größe
 nlAutoCacheSize=Wenn aktiviert, wird die Cache-Größe beim Start automatisch ermittelt und eingestellt. (Im Zweifel bitte ausschalten)
 lblUseLaserArrows=Nutze "Laser"-Pfeile
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index 74bc11102d9..3ba883d2e4e 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -1078,7 +1078,7 @@ nlDisableCardImages=When enabled, Forge will not display card images.
 lblExperimentalNetworkCompatibility=Experimental Network Compatibility
 nlExperimentalNetworkCompatibility=Forge switches to compatible network stream. (If unsure, turn OFF this option)
 lblDisposeTextures=Dispose Textures
-nlDisposeTextures=When enabled, disposes the card art caches. (If unsure, turn OFF this option)
+nlDisposeTextures=When enabled, disposes the card art and card image caches to save RAM during game screen switching. (If unsure, turn OFF this option)
 lblAutoCacheSize=Enable Auto Cache Size
 nlAutoCacheSize=When enabled, Cache size are automatically determined on startup. (If unsure, turn OFF this option)
 lblUseLaserArrows=Use Laser Arrows
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 24e5ed65c1b..7685e776e20 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -1077,7 +1077,7 @@ nlDisableCardImages=Cuando está habilitado, Forge no mostrará imágenes de car
 lblExperimentalNetworkCompatibility=Compatibilidad de red experimental
 nlExperimentalNetworkCompatibility=Forge cambia a un flujo de red compatible. (Si no estás seguro, deshabilita esta opción)
 lblDisposeTextures=Desechar texturas
-nlDisposeTextures=Cuando está activado, elimina la caché de las imágenes de las cartas. (Si no estás seguro, deshabilita esta opción)
+nlDisposeTextures=Cuando está habilitado, elimina los cachés de arte de arte y tarjeta de tarjeta para guardar RAM durante el cambio de pantalla del juego. (Si no estás seguro, deshabilita esta opción)
 lblAutoCacheSize=Activar tamaño de caché automático
 nlAutoCacheSize=Cuando se activa, el tamaño de la caché se determina automáticamente al inicio. (Si no estás seguro, desactiva esta opción)
 lblUseLaserArrows=Usar Flechas Láser
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index 244622b73f3..d2a3fd593e8 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -1076,7 +1076,7 @@ nlDisableCardImages=Se abilitato, Forge non mostrerà alcuna immagine per le car
 lblExperimentalNetworkCompatibility=Compatibilità di rete sperimentale
 nlExperimentalNetworkCompatibility=Forge passa a un flusso di rete compatibile. (Nel dubbio, DISABILITARE questa opzione)
 lblDisposeTextures=Rimuovi Texture
-nlDisposeTextures=Quando abilitato, rimuove la cache delle immagini delle carte. (Nel dubbio, DISABILITARE questa opzione)
+nlDisposeTextures=Se abilitato, dispone la scheda Art e l'immagine della scheda Cache per salvare RAM durante la commutazione dello schermo del gioco. (Nel dubbio, DISABILITARE questa opzione)
 lblAutoCacheSize=Abilita dimensione automatica della cache
 nlAutoCacheSize=Se abilitato, la dimensione della cache è stabilita automaticamente all''avvio. (Nel dubbio, DISABILITARE questa opzione)
 lblUseLaserArrows=Use Laser Arrows
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index f1e2976a7a6..53658cf56b2 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -1078,7 +1078,7 @@ nlDisableCardImages=これを有効にすると、Forgeはカード画像を描
 lblExperimentalNetworkCompatibility=実験的なネットワークコンパチビリティ
 nlExperimentalNetworkCompatibility=Forge がコンパチブルネットワークストリーミに切り替えます。 (分からない場合はオフにしてください)
 lblDisposeTextures=テキスチャー廃棄
-nlDisposeTextures=有効にすると、カード画像キャッシュを廃棄します。 (分からない場合はオフにしてください)
+nlDisposeTextures=有効になったら、ゲーム画面の切り替え中にRAMを保存するために、カードアートとカードの画像キャッシュを配置します。 (分からない場合はオフにしてください)
 lblAutoCacheSize=キャッシュサイズ自動計算
 nlAutoCacheSize=有効にすると、キャッシュサイズは起動時に自動計算されます。 (分からない場合はオフにしてください)
 lblUseLaserArrows=Use Laser Arrows
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 5f8affb4dc3..065c3d9cf4a 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -1103,7 +1103,7 @@ nlDisableCardImages=Quando ativado, o Forge não exibirá imagens das cartas.
 lblExperimentalNetworkCompatibility=Compatibilidade de Rede Experimental
 nlExperimentalNetworkCompatibility=Alternar Forge para fluxo de rede compatível. (Na dúvida, desative esta opção)
 lblDisposeTextures=Descartar Texturas
-nlDisposeTextures=Quando ativado, elimina os caches de arte da carta. (Se não tiver certeza, desligue esta opção)
+nlDisposeTextures=Quando ativado, descarte a arte do cartão e os caches da imagem para salvar a RAM durante a troca da tela do jogo. (Se não tiver certeza, desligue esta opção)
 lblAutoCacheSize=Ativar Tamanho Automático do Cache
 nlAutoCacheSize=Quando ativado, o tamanho do cache é definido automaticamente na inicialização. (Na dúvida, desative esta opção)
 lblUseLaserArrows=Usar Flechas Laser
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index 9a6bb811dd4..e01e530a1aa 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -1078,7 +1078,7 @@ nlDisableCardImages=如果启用，forge将不会显示卡图。
 lblExperimentalNetworkCompatibility=实验性网络兼容
 nlExperimentalNetworkCompatibility=Forge将切换为兼容性的网络流。（如果不清楚此选项的作用，请关闭此选项）
 lblDisposeTextures=释放纹理
-nlDisposeTextures=如果启用，卡图缓存将被释放。（如果你不清楚此选项的作用，请将此选项设为OFF）
+nlDisposeTextures=启用后，将卡艺术和卡片图像缓存处置，以在游戏屏幕切换过程中节省RAM。（如果你不清楚此选项的作用，请将此选项设为OFF）
 lblAutoCacheSize=启用自动缓存大小
 nlAutoCacheSize=启用后，Forge将于启动时自动确定缓存大小。（如果不清楚此选项的作用，请关闭此选项）
 lblUseLaserArrows=使用镭射箭头

From c81158530fd26f7ac5e5221cf78ec3ff85fcaf87 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 15:10:00 +0800
Subject: [PATCH 174/309] add otherTextureManager

---
 forge-gui-mobile/src/forge/Forge.java         |  9 ++-
 .../src/forge/assets/ImageCache.java          | 63 ++++++++++---------
 .../src/forge/assets/OtherImageLoader.java    | 35 -----------
 .../forge/screens/match/MatchController.java  |  2 +
 .../forge/screens/settings/SettingsPage.java  |  2 +-
 5 files changed, 44 insertions(+), 67 deletions(-)
 delete mode 100644 forge-gui-mobile/src/forge/assets/OtherImageLoader.java

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index d4202528440..3fe7c0ddae4 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -757,6 +757,7 @@ public class Forge implements ApplicationListener {
         setTransitionScreen(new TransitionScreen(new Runnable() {
             @Override
             public void run() {
+                ImageCache.disposeTextures();
                 isMobileAdventureMode = false;
                 GuiBase.setIsAdventureMode(false);
                 setCursor(FSkin.getCursor().get(0), "0");
@@ -773,6 +774,7 @@ public class Forge implements ApplicationListener {
         setTransitionScreen(new TransitionScreen(new Runnable() {
             @Override
             public void run() {
+                ImageCache.disposeTextures();
                 clearCurrentScreen();
                 clearTransitionScreen();
                 openAdventure();
@@ -800,8 +802,9 @@ public class Forge implements ApplicationListener {
     private static void setCurrentScreen(FScreen screen0) {
         String toNewScreen = screen0 != null ? screen0.toString() : "";
         String previousScreen = currentScreen != null ? currentScreen.toString() : "";
-
+        //update gameInProgress for preload decks
         gameInProgress = toNewScreen.toLowerCase().contains("match") || previousScreen.toLowerCase().contains("match");
+        //dispose card textures handled by assetmanager
         boolean dispose = toNewScreen.toLowerCase().contains("homescreen") && disposeTextures;
         try {
             endKeyInput(); //end key input before switching screens
@@ -816,7 +819,7 @@ public class Forge implements ApplicationListener {
                 BugReporter.reportException(ex);
         } finally {
             if (dispose)
-                ImageCache.disposeTexture();
+                ImageCache.disposeTextures();
         }
     }
 
@@ -984,7 +987,7 @@ public class Forge implements ApplicationListener {
             currentScreen.onClose(null);
             currentScreen = null;
         }
-        ImageCache.disposeCardTextureManager();
+        ImageCache.disposeTextureManager();
         Config.instance().disposeTextureAtlasManager();
         Dscreens.clear();
         graphics.dispose();
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 87a6ac89cd5..85ad04232cc 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -36,7 +36,6 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.LoadingCache;
 import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
 
 import forge.Forge;
 import forge.ImageKeys;
@@ -71,28 +70,33 @@ public class ImageCache {
 
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
     private static LoadingCache<String, Texture> cache;
-    static int maxCardCapacity = 400; //default cap
+    static int maxCardCapacity = 400; //default card capacity
     static AssetManager cardTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
+    static AssetManager otherTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
+    static TextureLoader.TextureParameter defaultParameter = new TextureLoader.TextureParameter();
+    static TextureLoader.TextureParameter filtered = new TextureLoader.TextureParameter();
     public static void initCache(int capacity) {
+        //init filter
+        filtered.genMipMaps = true;
+        filtered.minFilter = Texture.TextureFilter.MipMapLinearLinear;
+        filtered.magFilter = Texture.TextureFilter.Linear;
+        //override maxCardCapacity
         maxCardCapacity = capacity;
+        //this cache is used exclusively for full bordermasking.
         cache = CacheBuilder.newBuilder()
                 .maximumSize(capacity)
                 .expireAfterAccess(15, TimeUnit.MINUTES)
-                .removalListener(new RemovalListener<String, Texture>() {
-                    @Override
-                    public void onRemoval(RemovalNotification<String, Texture> removalNotification) {
-                        if (removalNotification.wasEvicted()) {
-                            if (removalNotification.getValue() != ImageCache.defaultImage)
-                                removalNotification.getValue().dispose();
+                .removalListener((RemovalListener<String, Texture>) removalNotification -> {
+                    if (removalNotification.wasEvicted()) {
+                        if (removalNotification.getValue() != ImageCache.defaultImage)
+                            removalNotification.getValue().dispose();
 
-                            CardRenderer.clearcardArtCache();
-                        }
+                        CardRenderer.clearcardArtCache();
                     }
                 })
                 .build(new ImageLoader());
         System.out.println("Card Texture Cache Size: "+capacity);
     }
-    private static final LoadingCache<String, Texture> otherCache = CacheBuilder.newBuilder().build(new OtherImageLoader());
     public static final Texture defaultImage;
     public static FImage BlackBorder = FSkinImage.IMG_BORDER_BLACK;
     public static FImage WhiteBorder = FSkinImage.IMG_BORDER_WHITE;
@@ -120,12 +124,13 @@ public class ImageCache {
         ImageKeys.clearMissingCards();
     }
 
-    public static void disposeTexture(){
+    public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
         cardTextureManager.clear();
     }
-    public static void disposeCardTextureManager() {
+    public static void disposeTextureManager() {
         cardTextureManager.dispose();
+        otherTextureManager.dispose();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -227,7 +232,7 @@ public class ImageCache {
         if (useDefaultIfNotFound) {
             // Load from file and add to cache if not found in cache initially.
             // Except for full bordermask, use assetmanager for card textures. This should make dispose texture options work effectively.
-            image = useOtherCache ? otherCache.getIfPresent(imageKey) : Forge.enableUIMask.equals("Full") ? cache.getIfPresent(imageKey) : getAsset(imageFile);
+            image = Forge.enableUIMask.equals("Full") && !useOtherCache ? cache.getIfPresent(imageKey) : getAsset(imageFile, useOtherCache);
 
             if (image != null) { return image; }
 
@@ -243,7 +248,7 @@ public class ImageCache {
         }
 
         try {
-            image = useOtherCache ? otherCache.get(imageKey) : Forge.enableUIMask.equals("Full") ? cache.get(imageKey) : loadAsset(imageFile);
+            image = Forge.enableUIMask.equals("Full") && !useOtherCache ? cache.get(imageKey) : loadAsset(imageFile, useOtherCache);
         } catch (final Exception ex) {
             image = null;
         }
@@ -262,28 +267,30 @@ public class ImageCache {
         }
         return image;
     }
-    static Texture getAsset(File file) {
-        return file == null ? null : cardTextureManager.get(file.getPath(), Texture.class, false);
-    }
-    static Texture loadAsset(File file) {
+    static Texture getAsset(File file, boolean otherCache) {
         if (file == null)
             return null;
-        if (cardTextureManager.getLoadedAssets() > maxCardCapacity) {
+        return otherCache ? otherTextureManager.get(file.getPath(), Texture.class, false) : cardTextureManager.get(file.getPath(), Texture.class, false);
+    }
+    static Texture loadAsset(File file, boolean otherCache) {
+        if (file == null)
+            return null;
+        if (!otherCache && cardTextureManager.getLoadedAssets() > maxCardCapacity) {
             //when maxCardCapacity is reached, clear to refresh
             cardTextureManager.clear();
             CardRenderer.clearcardArtCache();
             return null;
         }
         String fileName = file.getPath();
-        TextureLoader.TextureParameter parameter = new TextureLoader.TextureParameter();
-        if (Forge.isTextureFilteringEnabled()) {
-            parameter.minFilter = Texture.TextureFilter.MipMapLinearLinear;
-            parameter.magFilter = Texture.TextureFilter.Linear;
-            parameter.genMipMaps = true;
+        if (otherCache) {
+            otherTextureManager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            otherTextureManager.finishLoadingAsset(fileName);
+            return otherTextureManager.get(fileName, Texture.class, false);
+        } else {
+            cardTextureManager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            cardTextureManager.finishLoadingAsset(fileName);
+            return cardTextureManager.get(fileName, Texture.class, false);
         }
-        cardTextureManager.load(fileName, Texture.class, parameter);
-        cardTextureManager.finishLoadingAsset(fileName);
-        return cardTextureManager.get(fileName, Texture.class, false);
     }
     public static void preloadCache(Iterable<String> keys) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
diff --git a/forge-gui-mobile/src/forge/assets/OtherImageLoader.java b/forge-gui-mobile/src/forge/assets/OtherImageLoader.java
deleted file mode 100644
index 13bf1477c29..00000000000
--- a/forge-gui-mobile/src/forge/assets/OtherImageLoader.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package forge.assets;
-
-import java.io.File;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.graphics.Texture;
-import com.google.common.cache.CacheLoader;
-
-import forge.Forge;
-import forge.ImageKeys;
-
-final class OtherImageLoader extends CacheLoader<String, Texture> {
-    @Override
-    public Texture load(String key) {
-        File file = ImageKeys.getImageFile(key);
-        if (file != null) {
-            FileHandle fh = new FileHandle(file);
-            try {
-                if (Forge.isTextureFilteringEnabled()) {
-                    Texture t = new Texture(fh, true);
-                    t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    return t;
-                } else {
-                    return new Texture(fh);
-                }
-            }
-            catch (Exception ex) {
-                Forge.log("Could not read image file " + fh.path() + "\n\nException:\n" + ex.toString());
-                return null;
-            }
-        }
-        return null;
-    }
-}
-
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index 1c7252a0753..ff8120b4520 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -524,6 +524,8 @@ public class MatchController extends AbstractGuiGame {
     public void afterGameEnd() {
         super.afterGameEnd();
         Forge.back(true);
+        if (Forge.disposeTextures)
+            ImageCache.disposeTextures();
         //view = null;
     }
 
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index 5a64fe146db..50635bfaeca 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -483,7 +483,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
                     @Override
                     public void select() {
                         super.select();
-                        ImageCache.disposeTexture();
+                        ImageCache.disposeTextures();
                     }
                 },
                 4);

From b1e307747fa8e2ee033a1c0a041314fa6a05e5b9 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 16:29:57 +0800
Subject: [PATCH 175/309] remove loadingCache and use card assetmanager
 exclusively

---
 .../src/forge/assets/ImageCache.java          | 162 ++++++++++++++---
 .../src/forge/assets/ImageLoader.java         | 165 ------------------
 2 files changed, 134 insertions(+), 193 deletions(-)
 delete mode 100644 forge-gui-mobile/src/forge/assets/ImageLoader.java

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 85ad04232cc..f344f72b49f 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -18,13 +18,20 @@
 package forge.assets;
 
 import java.io.File;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.TextureLoader;
 import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Pixmap;
+import com.badlogic.gdx.graphics.TextureData;
+import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.ObjectSet;
+import forge.gui.FThreads;
+import forge.util.FileUtil;
+import forge.util.TextUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -33,9 +40,6 @@ import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap.Format;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
 
 import forge.Forge;
 import forge.ImageKeys;
@@ -66,10 +70,8 @@ import forge.util.ImageUtil;
  * @version $Id: ImageCache.java 24769 2014-02-09 13:56:04Z Hellfish $
  */
 public class ImageCache {
-    // short prefixes to save memory
-
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
-    private static LoadingCache<String, Texture> cache;
+    private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
     static AssetManager cardTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
     static AssetManager otherTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
@@ -82,25 +84,12 @@ public class ImageCache {
         filtered.magFilter = Texture.TextureFilter.Linear;
         //override maxCardCapacity
         maxCardCapacity = capacity;
-        //this cache is used exclusively for full bordermasking.
-        cache = CacheBuilder.newBuilder()
-                .maximumSize(capacity)
-                .expireAfterAccess(15, TimeUnit.MINUTES)
-                .removalListener((RemovalListener<String, Texture>) removalNotification -> {
-                    if (removalNotification.wasEvicted()) {
-                        if (removalNotification.getValue() != ImageCache.defaultImage)
-                            removalNotification.getValue().dispose();
-
-                        CardRenderer.clearcardArtCache();
-                    }
-                })
-                .build(new ImageLoader());
-        System.out.println("Card Texture Cache Size: "+capacity);
     }
     public static final Texture defaultImage;
     public static FImage BlackBorder = FSkinImage.IMG_BORDER_BLACK;
     public static FImage WhiteBorder = FSkinImage.IMG_BORDER_WHITE;
     private static final ObjectMap<String, Pair<String, Boolean>> imageBorder = new ObjectMap<>(1024);
+    private static final ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
 
     private static boolean imageLoaded, delayLoadRequested;
     public static void allowSingleLoad() {
@@ -231,8 +220,7 @@ public class ImageCache {
         File imageFile = ImageKeys.getImageFile(imageKey);
         if (useDefaultIfNotFound) {
             // Load from file and add to cache if not found in cache initially.
-            // Except for full bordermask, use assetmanager for card textures. This should make dispose texture options work effectively.
-            image = Forge.enableUIMask.equals("Full") && !useOtherCache ? cache.getIfPresent(imageKey) : getAsset(imageFile, useOtherCache);
+            image = getAsset(imageKey, imageFile, useOtherCache);
 
             if (image != null) { return image; }
 
@@ -248,7 +236,7 @@ public class ImageCache {
         }
 
         try {
-            image = Forge.enableUIMask.equals("Full") && !useOtherCache ? cache.get(imageKey) : loadAsset(imageFile, useOtherCache);
+            image = loadAsset(imageKey, imageFile, useOtherCache);
         } catch (final Exception ex) {
             image = null;
         }
@@ -267,12 +255,14 @@ public class ImageCache {
         }
         return image;
     }
-    static Texture getAsset(File file, boolean otherCache) {
+    static Texture getAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
+        if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
+            return generatedCards.get(imageKey);
         return otherCache ? otherTextureManager.get(file.getPath(), Texture.class, false) : cardTextureManager.get(file.getPath(), Texture.class, false);
     }
-    static Texture loadAsset(File file, boolean otherCache) {
+    static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
         if (!otherCache && cardTextureManager.getLoadedAssets() > maxCardCapacity) {
@@ -289,7 +279,16 @@ public class ImageCache {
         } else {
             cardTextureManager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
             cardTextureManager.finishLoadingAsset(fileName);
-            return cardTextureManager.get(fileName, Texture.class, false);
+            Texture t = cardTextureManager.get(fileName, Texture.class, false);
+            if (Forge.enableUIMask.equals("Full")) {
+                boolean borderless = isBorderless(imageKey);
+                updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
+                if (borderless) {
+                    t = generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled());
+                    generatedCards.put(imageKey, t);
+                }
+            }
+            return t;
         }
     }
     public static void preloadCache(Iterable<String> keys) {
@@ -339,7 +338,7 @@ public class ImageCache {
         return 0;
     }
     public static boolean isBorderlessCardArt(Texture t) {
-        return ImageLoader.isBorderless(t);
+        return isBorderless(t);
     }
     public static void updateBorders(String textureString, Pair<String, Boolean> colorPair){
         imageBorder.put(textureString, colorPair);
@@ -386,4 +385,111 @@ public class ImageCache {
 
         return borderColor(t);
     }
+    public static Texture generateTexture(FileHandle fh, Texture t, boolean textureFilter) {
+        if (t == null || fh == null)
+            return t;
+        final Texture[] n = new Texture[1];
+        FThreads.invokeInEdtNowOrLater(new Runnable() {
+            @Override
+            public void run() {
+                Pixmap pImage = new Pixmap(fh);
+                int w = pImage.getWidth();
+                int h = pImage.getHeight();
+                int radius = (h - w) / 8;
+                Pixmap pMask = createRoundedRectangle(w, h, radius, Color.RED);
+                drawPixelstoMask(pImage, pMask);
+                TextureData textureData = new PixmapTextureData(
+                        pMask, //pixmap to use
+                        Pixmap.Format.RGBA8888,
+                        textureFilter, //use mipmaps
+                        false, true);
+                n[0] = new Texture(textureData);
+                if (textureFilter)
+                    n[0].setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+                pImage.dispose();
+                pMask.dispose();
+            }
+        });
+        return n[0];
+    }
+    public static Pixmap createRoundedRectangle(int width, int height, int cornerRadius, Color color) {
+        Pixmap pixmap = new Pixmap(width, height, Pixmap.Format.RGBA8888);
+        Pixmap ret = new Pixmap(width, height, Pixmap.Format.RGBA8888);
+        pixmap.setColor(color);
+        //round corners
+        pixmap.fillCircle(cornerRadius, cornerRadius, cornerRadius);
+        pixmap.fillCircle(width - cornerRadius - 1, cornerRadius, cornerRadius);
+        pixmap.fillCircle(cornerRadius, height - cornerRadius - 1, cornerRadius);
+        pixmap.fillCircle(width - cornerRadius - 1, height - cornerRadius - 1, cornerRadius);
+        //two rectangle parts
+        pixmap.fillRectangle(cornerRadius, 0, width - cornerRadius * 2, height);
+        pixmap.fillRectangle(0, cornerRadius, width, height - cornerRadius * 2);
+        //draw rounded rectangle
+        ret.setColor(color);
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                if (pixmap.getPixel(x, y) != 0) ret.drawPixel(x, y);
+            }
+        }
+        pixmap.dispose();
+        return ret;
+    }
+    public static void drawPixelstoMask(Pixmap pixmap, Pixmap mask){
+        int pixmapWidth = mask.getWidth();
+        int pixmapHeight = mask.getHeight();
+        Color pixelColor = new Color();
+        for (int x=0; x<pixmapWidth; x++){
+            for (int y=0; y<pixmapHeight; y++){
+                if (mask.getPixel(x, y) != 0) {
+                    Color.rgba8888ToColor(pixelColor, pixmap.getPixel(x, y));
+                    mask.setColor(pixelColor);
+                    mask.drawPixel(x, y);
+                }
+            }
+        }
+    }
+
+    public static boolean isBorderless(String imagekey) {
+        if(borderlessCardlistKey.isEmpty())
+            return false;
+        if (imagekey.length() > 7) {
+            if ((!imagekey.substring(0, 7).contains("MPS_KLD"))&&(imagekey.substring(0, 4).contains("MPS_"))) //MPS_ sets except MPD_KLD
+                return true;
+        }
+        return borderlessCardlistKey.contains(TextUtil.fastReplace(imagekey,".full",".fullborder"));
+    }
+
+    public static boolean isBorderless(Texture t) {
+        if(borderlessCardlistKey.isEmpty())
+            return false;
+        //generated texture/pixmap?
+        if (t.toString().contains("com.badlogic.gdx.graphics.Texture@"))
+            return true;
+        for (String key : borderlessCardlistKey) {
+            if (t.toString().contains(key))
+                return true;
+        }
+        return false;
+    }
+
+    public static String getpixelColor(Texture i) {
+        if (!i.getTextureData().isPrepared()) {
+            i.getTextureData().prepare(); //prepare texture
+        }
+        //get pixmap from texture data
+        Pixmap pixmap = i.getTextureData().consumePixmap();
+        //get pixel color from x,y texture coordinate based on the image fullborder or not
+        Color color = new Color(pixmap.getPixel(croppedBorderImage(i).getRegionX()+1, croppedBorderImage(i).getRegionY()+1));
+        pixmap.dispose();
+        return color.toString();
+    }
+    public static Pair<String, Boolean> isCloserToWhite(String c){
+        if (c == null || c == "")
+            return Pair.of(Color.valueOf("#171717").toString(), false);
+        int c_r = Integer.parseInt(c.substring(0,2),16);
+        int c_g = Integer.parseInt(c.substring(2,4),16);
+        int c_b = Integer.parseInt(c.substring(4,6),16);
+        int brightness = ((c_r * 299) + (c_g * 587) + (c_b * 114)) / 1000;
+        return  Pair.of(c,brightness > 155);
+    }
 }
diff --git a/forge-gui-mobile/src/forge/assets/ImageLoader.java b/forge-gui-mobile/src/forge/assets/ImageLoader.java
deleted file mode 100644
index 0d7786afaa8..00000000000
--- a/forge-gui-mobile/src/forge/assets/ImageLoader.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package forge.assets;
-
-import static forge.assets.ImageCache.croppedBorderImage;
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.commons.lang3.tuple.Pair;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.Pixmap;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.TextureData;
-import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
-import com.google.common.cache.CacheLoader;
-
-import forge.Forge;
-import forge.ImageKeys;
-import forge.gui.FThreads;
-import forge.localinstance.properties.ForgeConstants;
-import forge.localinstance.properties.ForgePreferences;
-import forge.model.FModel;
-import forge.util.FileUtil;
-import forge.util.TextUtil;
-
-final class ImageLoader extends CacheLoader<String, Texture> {
-    private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
-
-    Texture n;
-    @Override
-    public Texture load(String key) {
-        if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
-            return null;
-
-        boolean extendedArt = isBorderless(key) && Forge.enableUIMask.equals("Full");
-        boolean textureFilter = Forge.isTextureFilteringEnabled();
-        File file = ImageKeys.getImageFile(key);
-        if (file != null) {
-            FileHandle fh = new FileHandle(file);
-            try {
-                Texture t = new Texture(fh, textureFilter);
-                //update
-                ImageCache.updateBorders(t.toString(), extendedArt ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
-                if (textureFilter)
-                    t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                if (extendedArt)
-                    return generateTexture(fh, t, textureFilter);
-                return t;
-            }
-            catch (Exception ex) {
-                    Forge.log("Could not read image file " + fh.path() + "\nException:\n" + ex.toString());
-                    return null;
-            }
-        }
-        return null;
-    }
-
-    public Texture generateTexture(FileHandle fh, Texture t, boolean textureFilter) {
-        if (t == null || fh == null)
-            return t;
-        FThreads.invokeInEdtNowOrLater(new Runnable() {
-            @Override
-            public void run() {
-                Pixmap pImage = new Pixmap(fh);
-                int w = pImage.getWidth();
-                int h = pImage.getHeight();
-                int radius = (h - w) / 8;
-                Pixmap pMask = createRoundedRectangle(w, h, radius, Color.RED);
-                drawPixelstoMask(pImage, pMask);
-                TextureData textureData = new PixmapTextureData(
-                        pMask, //pixmap to use
-                        Pixmap.Format.RGBA8888,
-                        textureFilter, //use mipmaps
-                        false, true);
-                n = new Texture(textureData);
-                if (textureFilter)
-                    n.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                pImage.dispose();
-                pMask.dispose();
-            }
-        });
-        return n;
-    }
-    public Pixmap createRoundedRectangle(int width, int height, int cornerRadius, Color color) {
-        Pixmap pixmap = new Pixmap(width, height, Pixmap.Format.RGBA8888);
-        Pixmap ret = new Pixmap(width, height, Pixmap.Format.RGBA8888);
-        pixmap.setColor(color);
-        //round corners
-        pixmap.fillCircle(cornerRadius, cornerRadius, cornerRadius);
-        pixmap.fillCircle(width - cornerRadius - 1, cornerRadius, cornerRadius);
-        pixmap.fillCircle(cornerRadius, height - cornerRadius - 1, cornerRadius);
-        pixmap.fillCircle(width - cornerRadius - 1, height - cornerRadius - 1, cornerRadius);
-        //two rectangle parts
-        pixmap.fillRectangle(cornerRadius, 0, width - cornerRadius * 2, height);
-        pixmap.fillRectangle(0, cornerRadius, width, height - cornerRadius * 2);
-        //draw rounded rectangle
-        ret.setColor(color);
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                if (pixmap.getPixel(x, y) != 0) ret.drawPixel(x, y);
-            }
-        }
-        pixmap.dispose();
-        return ret;
-    }
-    public void drawPixelstoMask(Pixmap pixmap, Pixmap mask){
-        int pixmapWidth = mask.getWidth();
-        int pixmapHeight = mask.getHeight();
-        Color pixelColor = new Color();
-        for (int x=0; x<pixmapWidth; x++){
-            for (int y=0; y<pixmapHeight; y++){
-                if (mask.getPixel(x, y) != 0) {
-                    Color.rgba8888ToColor(pixelColor, pixmap.getPixel(x, y));
-                    mask.setColor(pixelColor);
-                    mask.drawPixel(x, y);
-                }
-            }
-        }
-    }
-
-    public boolean isBorderless(String imagekey) {
-        if(borderlessCardlistKey.isEmpty())
-            return false;
-        if (imagekey.length() > 7) {
-            if ((!imagekey.substring(0, 7).contains("MPS_KLD"))&&(imagekey.substring(0, 4).contains("MPS_"))) //MPS_ sets except MPD_KLD
-                return true;
-        }
-        return borderlessCardlistKey.contains(TextUtil.fastReplace(imagekey,".full",".fullborder"));
-    }
-
-    public static boolean isBorderless(Texture t) {
-        if(borderlessCardlistKey.isEmpty())
-            return false;
-        //generated texture/pixmap?
-        if (t.toString().contains("com.badlogic.gdx.graphics.Texture@"))
-            return true;
-        for (String key : borderlessCardlistKey) {
-            if (t.toString().contains(key))
-                return true;
-        }
-        return false;
-    }
-
-    public static String getpixelColor(Texture i) {
-        if (!i.getTextureData().isPrepared()) {
-            i.getTextureData().prepare(); //prepare texture
-        }
-        //get pixmap from texture data
-        Pixmap pixmap = i.getTextureData().consumePixmap();
-        //get pixel color from x,y texture coordinate based on the image fullborder or not
-        Color color = new Color(pixmap.getPixel(croppedBorderImage(i).getRegionX()+1, croppedBorderImage(i).getRegionY()+1));
-        pixmap.dispose();
-        return color.toString();
-    }
-    public static Pair<String, Boolean> isCloserToWhite(String c){
-        if (c == null || c == "")
-            return Pair.of(Color.valueOf("#171717").toString(), false);
-        int c_r = Integer.parseInt(c.substring(0,2),16);
-        int c_g = Integer.parseInt(c.substring(2,4),16);
-        int c_b = Integer.parseInt(c.substring(4,6),16);
-        int brightness = ((c_r * 299) + (c_g * 587) + (c_b * 114)) / 1000;
-        return  Pair.of(c,brightness > 155);
-    }
-}

From b65c7607d45e22793d0fb02000af8b9cfcd2bbf8 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 17:55:47 +0800
Subject: [PATCH 176/309] clear generated cards

---
 forge-gui-mobile/src/forge/assets/ImageCache.java          | 7 ++++---
 .../src/forge/screens/settings/SettingsPage.java           | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index f344f72b49f..ea76bddfa6e 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -112,7 +112,9 @@ public class ImageCache {
         missingIconKeys.clear();
         ImageKeys.clearMissingCards();
     }
-
+    public static void clearGeneratedCards() {
+        generatedCards.clear();
+    }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
         cardTextureManager.clear();
@@ -284,8 +286,7 @@ public class ImageCache {
                 boolean borderless = isBorderless(imageKey);
                 updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
                 if (borderless) {
-                    t = generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled());
-                    generatedCards.put(imageKey, t);
+                    generatedCards.put(imageKey, generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled()));
                 }
             }
             return t;
diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
index 50635bfaeca..c55bfae398c 100644
--- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
@@ -590,6 +590,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
             public void valueChanged(String newValue) {
                 super.valueChanged(newValue);
                 Forge.enableUIMask = FModel.getPreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING);
+                ImageCache.clearGeneratedCards();
+                ImageCache.disposeTextures();
             }
         }, 4);
         lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART,

From ee228e3fd76c3cb946a81bfd2dbda1ad9f0bce2f Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Wed, 6 Jul 2022 12:28:30 +0100
Subject: [PATCH 177/309] 3 CLB cards (#1037)

* Create bonecaller_cleric.txt

* Create carefree_swinemaster.txt

* Create chain_devil.txt
---
 forge-gui/res/cardsfolder/upcoming/bonecaller_cleric.txt | 7 +++++++
 .../res/cardsfolder/upcoming/carefree_swinemaster.txt    | 8 ++++++++
 forge-gui/res/cardsfolder/upcoming/chain_devil.txt       | 9 +++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/bonecaller_cleric.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/carefree_swinemaster.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/chain_devil.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/bonecaller_cleric.txt b/forge-gui/res/cardsfolder/upcoming/bonecaller_cleric.txt
new file mode 100644
index 00000000000..fd39bd311cd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/bonecaller_cleric.txt
@@ -0,0 +1,7 @@
+Name:Bonecaller Cleric
+ManaCost:1 B
+Types:Creature Human Cleric
+PT:2/1
+A:AB$ ChangeZone | Cost$ 3 B Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SorcerySpeed$ True | SpellDescription$ Return target creature card from your graveyard to the battlefield.
+DeckHas:Ability$Sacrifice|Graveyard
+Oracle:{3}{B}, Sacrifice Bonecaller Cleric: Return target creature card from your graveyard to the battlefield. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/carefree_swinemaster.txt b/forge-gui/res/cardsfolder/upcoming/carefree_swinemaster.txt
new file mode 100644
index 00000000000..1fc181e23fd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/carefree_swinemaster.txt
@@ -0,0 +1,8 @@
+Name:Carefree Swinemaster
+ManaCost:2 G
+Types:Creature Gnome Ranger
+PT:1/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks, you may pay {1}{G}. If you do, create a 2/2 green Boar creature token that's tapped and attacking.
+SVar:TrigToken:AB$ Token | Cost$ 1 G | TokenAmount$ 1 | TokenScript$ g_2_2_boar | TokenOwner$ You | TokenTapped$ True | TokenAttacking$ True
+DeckHas:Ability$Token & Type$Boar
+Oracle:Whenever Carefree Swinemaster attacks, you may pay {1}{G}. If you do, create a 2/2 green Boar creature token that's tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/upcoming/chain_devil.txt b/forge-gui/res/cardsfolder/upcoming/chain_devil.txt
new file mode 100644
index 00000000000..ec09d67403b
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/chain_devil.txt
@@ -0,0 +1,9 @@
+Name:Chain Devil
+ManaCost:3 B
+Types:Creature Devil
+PT:4/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Animate Chains — When CARDNAME enters the battlefield, each player sacrifices a nontoken creature.
+SVar:TrigSac:DB$ Sacrifice | Defined$ Player | SacValid$ Creature.nonToken
+DeckHas:Ability$Sacrifice
+SVar:NeedsToPlay:Creature.YouDontCtrl
+Oracle:Animate Chains — When Chain Devil enters the battlefield, each player sacrifices a nontoken creature.

From 09313773e25fb8d7675d1d0fc3b520aebed8b62a Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Wed, 6 Jul 2022 13:28:35 +0100
Subject: [PATCH 178/309] descriptions

---
 forge-gui/res/cardsfolder/d/dueling_coach.txt            | 2 +-
 forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/d/dueling_coach.txt b/forge-gui/res/cardsfolder/d/dueling_coach.txt
index b959dee8c46..3545bde30ea 100644
--- a/forge-gui/res/cardsfolder/d/dueling_coach.txt
+++ b/forge-gui/res/cardsfolder/d/dueling_coach.txt
@@ -4,6 +4,6 @@ Types:Creature Human Monk
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ PutCounterAll | Cost$ 4 W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
+A:AB$ PutCounterAll | Cost$ 4 W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | ValidCardsDesc$ creature you control with a +1/+1 counter on it. | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
 DeckHas:Ability$Counters
 Oracle:When Dueling Coach enters the battlefield, put a +1/+1 counter on target creature.\n{4}{W}, {T}: Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt b/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
index 4464605a9e3..eb9531afdb4 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-dueling_coach.txt
@@ -4,6 +4,6 @@ Types:Creature Human Monk
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select one or two target creatures you control | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
-A:AB$ PutCounterAll | Cost$ W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
+A:AB$ PutCounterAll | Cost$ W T | ValidCards$ Creature.YouCtrl+counters_GE1_P1P1 | CounterType$ P1P1 | CounterNum$ 1 | ValidCardsDesc$ creature you control with a +1/+1 counter on it. | SpellDescription$ Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.
 DeckHas:Ability$Counters
 Oracle:When Dueling Coach enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.\n{W}, {T}: Put a +1/+1 counter on each creature you control with a +1/+1 counter on it.

From 33fc17a936b30ed30c8f36dcfa0452e3721bf1ff Mon Sep 17 00:00:00 2001
From: Paul Hammerton <18243520+paulsnoops@users.noreply.github.com>
Date: Wed, 6 Jul 2022 13:38:54 +0100
Subject: [PATCH 179/309] Some CLB Dragon cards and Obscura Polymorphist
 (#1045)

Some CLB Dragon cards and Obscura Polymorphist
---
 .../res/cardsfolder/upcoming/draconic_muralists.txt  |  8 ++++++++
 .../cardsfolder/upcoming/korlessa_scale_singer.txt   |  8 ++++++++
 .../cardsfolder/upcoming/lapis_orb_of_dragonkind.txt |  8 ++++++++
 .../cardsfolder/upcoming/obscura_polymorphist.txt    |  8 ++++++++
 .../res/cardsfolder/upcoming/scaled_nurturer.txt     | 10 ++++++++++
 .../cardsfolder/upcoming/thrakkus_the_butcher.txt    | 12 ++++++++++++
 6 files changed, 54 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/draconic_muralists.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/korlessa_scale_singer.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/lapis_orb_of_dragonkind.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/obscura_polymorphist.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/scaled_nurturer.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/thrakkus_the_butcher.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/draconic_muralists.txt b/forge-gui/res/cardsfolder/upcoming/draconic_muralists.txt
new file mode 100644
index 00000000000..e479b2cad1f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/draconic_muralists.txt
@@ -0,0 +1,8 @@
+Name:Draconic Muralists
+ManaCost:3 G
+Types:Creature Dragon Bard
+PT:4/3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may search your library for a Dragon card, reveal it, put it into your hand, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Dragon | ChangeNum$ 1 | ShuffleNonMandatory$ True
+DeckNeeds:Type$Dragon
+Oracle:When Draconic Muralists dies, you may search your library for a Dragon card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/korlessa_scale_singer.txt b/forge-gui/res/cardsfolder/upcoming/korlessa_scale_singer.txt
new file mode 100644
index 00000000000..4fc35f4f706
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/korlessa_scale_singer.txt
@@ -0,0 +1,8 @@
+Name:Korlessa, Scale Singer
+ManaCost:G U
+Types:Legendary Creature Dragon Bard
+PT:1/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$ Dragon.TopLibrary+YouCtrl+nonLand | AffectedZone$ Library | MayPlay$ True | Description$ You may cast Dragon spells from the top of your library.
+DeckHints:Type$Dragon
+Oracle:You may look at the top card of your library any time.\nYou may cast Dragon spells from the top of your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/lapis_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/lapis_orb_of_dragonkind.txt
new file mode 100644
index 00000000000..0092f00caf9
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lapis_orb_of_dragonkind.txt
@@ -0,0 +1,8 @@
+Name:Lapis Orb of Dragonkind
+ManaCost:2 U
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ U | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add {U}. When you spend this mana to cast a Dragon creature spell, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigScry | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+SVar:TrigScry:DB$ Scry | ScryNum$ 2
+DeckHints:Type$Dragon
+Oracle:{T}: Add {U}. When you spend this mana to cast a Dragon creature spell, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/upcoming/obscura_polymorphist.txt b/forge-gui/res/cardsfolder/upcoming/obscura_polymorphist.txt
new file mode 100644
index 00000000000..eadaacb5634
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/obscura_polymorphist.txt
@@ -0,0 +1,8 @@
+Name:Obscura Polymorphist
+ManaCost:1 W U
+Types:Creature Cephalid Wizard
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target creature. Its controller seeks a creature card.
+SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBSeek
+SVar:DBSeek:DB$ ChangeZone | Origin$ Library | Destination$ Hand | AtRandom$ True | NoShuffle$ True | Mandatory$ True | NoLooking$ True | NoReveal$ True | ChangeType$ Card.Creature | ChangeNum$ 1 | DefinedPlayer$ TargetedController
+Oracle:When Obscura Polymorphist enters the battlefield, exile up to one target creature. Its controller seeks a creature card.
diff --git a/forge-gui/res/cardsfolder/upcoming/scaled_nurturer.txt b/forge-gui/res/cardsfolder/upcoming/scaled_nurturer.txt
new file mode 100644
index 00000000000..ac43d7da030
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/scaled_nurturer.txt
@@ -0,0 +1,10 @@
+Name:Scaled Nurturer
+ManaCost:1 G
+Types:Creature Dragon Druid
+PT:0/2
+A:AB$ Mana | Cost$ T | Produced$ G | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add {G}. When you spend this mana to cast a Dragon creature spell, you gain 2 life.
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigGainLife | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, you gain 2 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
+DeckHas:Ability$LifeGain
+DeckHints:Type$Dragon
+Oracle:{T}: Add {G}. When you spend this mana to cast a Dragon creature spell, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/thrakkus_the_butcher.txt b/forge-gui/res/cardsfolder/upcoming/thrakkus_the_butcher.txt
new file mode 100644
index 00000000000..9079e1596ea
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/thrakkus_the_butcher.txt
@@ -0,0 +1,12 @@
+Name:Thrakkus the Butcher
+ManaCost:3 R G
+Types:Legendary Creature Dragon Peasant
+PT:3/4
+K:Trample
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDoublePower | TriggerDescription$ Whenever CARDNAME attacks, double the power of each Dragon you control until end of turn.
+SVar:TrigDoublePower:DB$ RepeatEach | RepeatCards$ Dragon.YouCtrl | RepeatSubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Remembered | NumAtt$ X | Double$ True
+SVar:X:Remembered$CardPower
+SVar:HasAttackEffect:TRUE
+DeckHints:Type$Dragon
+Oracle:Trample\nWhenever Thrakkus the Butcher attacks, double the power of each Dragon you control until end of turn.

From c838b60b7a013e2d877b01a98d5e5faecb7cd37d Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 21:32:37 +0800
Subject: [PATCH 180/309] Assets class

---
 .../src/forge/adventure/util/Config.java      | 15 ++--
 forge-gui-mobile/src/forge/assets/Assets.java | 16 ++++
 .../src/forge/assets/ImageCache.java          | 73 +++++++++----------
 3 files changed, 57 insertions(+), 47 deletions(-)
 create mode 100644 forge-gui-mobile/src/forge/assets/Assets.java

diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
index d5287464db3..fafd7608da0 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Config.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -1,13 +1,12 @@
 package forge.adventure.util;
 
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonWriter;
 import forge.adventure.data.ConfigData;
 import forge.adventure.data.SettingData;
+import forge.assets.Assets;
 import forge.deck.Deck;
 import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgeConstants;
@@ -27,7 +26,7 @@ public class Config {
     private static Config currentConfig;
     private final String prefix;
     private final HashMap<String, FileHandle> Cache = new HashMap<String, FileHandle>();
-    private final AssetManager textureAtlasManager = new AssetManager(new AbsoluteFileHandleResolver());
+    private final Assets atlasAssets = new Assets();
     private final ConfigData configData;
     private final String[] adventures;
     private SettingData settingsData;
@@ -122,11 +121,11 @@ public class Config {
 
     public TextureAtlas getAtlas(String spriteAtlas) {
         String fileName = getFile(spriteAtlas).path();
-        if (!textureAtlasManager.contains(fileName, TextureAtlas.class)) {
-            textureAtlasManager.load(fileName, TextureAtlas.class);
-            textureAtlasManager.finishLoadingAsset(fileName);
+        if (!atlasAssets.manager().contains(fileName, TextureAtlas.class)) {
+            atlasAssets.manager().load(fileName, TextureAtlas.class);
+            atlasAssets.manager().finishLoadingAsset(fileName);
         }
-        return textureAtlasManager.get(fileName);
+        return atlasAssets.manager().get(fileName);
     }
     public SettingData getSettingData()
     {
@@ -145,6 +144,6 @@ public class Config {
 
     }
     public void disposeTextureAtlasManager() {
-        textureAtlasManager.dispose();
+        atlasAssets.dispose();
     }
 }
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
new file mode 100644
index 00000000000..6d0d01dd3db
--- /dev/null
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -0,0 +1,16 @@
+package forge.assets;
+
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
+import com.badlogic.gdx.utils.Disposable;
+
+public class Assets implements Disposable {
+    public AssetManager manager = new AssetManager(new AbsoluteFileHandleResolver());
+    public AssetManager manager() {
+        return manager;
+    }
+    @Override
+    public void dispose() {
+        manager.dispose();
+    }
+}
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index ea76bddfa6e..5b5cf9e542b 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -20,9 +20,7 @@ package forge.assets;
 import java.io.File;
 import java.util.List;
 
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.assets.loaders.TextureLoader;
-import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
+import com.badlogic.gdx.assets.loaders.TextureLoader.TextureParameter;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.TextureData;
@@ -73,10 +71,10 @@ public class ImageCache {
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
     private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
-    static AssetManager cardTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
-    static AssetManager otherTextureManager = new AssetManager(new AbsoluteFileHandleResolver());
-    static TextureLoader.TextureParameter defaultParameter = new TextureLoader.TextureParameter();
-    static TextureLoader.TextureParameter filtered = new TextureLoader.TextureParameter();
+    static Assets cardAssets = new Assets();
+    static Assets otherAssets = new Assets();
+    static TextureParameter defaultParameter = new TextureParameter();
+    static TextureParameter filtered = new TextureParameter();
     public static void initCache(int capacity) {
         //init filter
         filtered.genMipMaps = true;
@@ -117,11 +115,11 @@ public class ImageCache {
     }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
-        cardTextureManager.clear();
+        cardAssets.manager().clear();
     }
     public static void disposeTextureManager() {
-        cardTextureManager.dispose();
-        otherTextureManager.dispose();
+        cardAssets.dispose();
+        otherAssets.dispose();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -262,26 +260,26 @@ public class ImageCache {
             return null;
         if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
             return generatedCards.get(imageKey);
-        return otherCache ? otherTextureManager.get(file.getPath(), Texture.class, false) : cardTextureManager.get(file.getPath(), Texture.class, false);
+        return otherCache ? otherAssets.manager().get(file.getPath(), Texture.class, false) : cardAssets.manager().get(file.getPath(), Texture.class, false);
     }
     static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
-        if (!otherCache && cardTextureManager.getLoadedAssets() > maxCardCapacity) {
+        if (!otherCache && cardAssets.manager().getLoadedAssets() > maxCardCapacity) {
             //when maxCardCapacity is reached, clear to refresh
-            cardTextureManager.clear();
+            cardAssets.manager().clear();
             CardRenderer.clearcardArtCache();
             return null;
         }
         String fileName = file.getPath();
         if (otherCache) {
-            otherTextureManager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            otherTextureManager.finishLoadingAsset(fileName);
-            return otherTextureManager.get(fileName, Texture.class, false);
+            otherAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            otherAssets.manager().finishLoadingAsset(fileName);
+            return otherAssets.manager().get(fileName, Texture.class, false);
         } else {
-            cardTextureManager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            cardTextureManager.finishLoadingAsset(fileName);
-            Texture t = cardTextureManager.get(fileName, Texture.class, false);
+            cardAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            cardAssets.manager().finishLoadingAsset(fileName);
+            Texture t = cardAssets.manager().get(fileName, Texture.class, false);
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
                 updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
@@ -390,26 +388,23 @@ public class ImageCache {
         if (t == null || fh == null)
             return t;
         final Texture[] n = new Texture[1];
-        FThreads.invokeInEdtNowOrLater(new Runnable() {
-            @Override
-            public void run() {
-                Pixmap pImage = new Pixmap(fh);
-                int w = pImage.getWidth();
-                int h = pImage.getHeight();
-                int radius = (h - w) / 8;
-                Pixmap pMask = createRoundedRectangle(w, h, radius, Color.RED);
-                drawPixelstoMask(pImage, pMask);
-                TextureData textureData = new PixmapTextureData(
-                        pMask, //pixmap to use
-                        Pixmap.Format.RGBA8888,
-                        textureFilter, //use mipmaps
-                        false, true);
-                n[0] = new Texture(textureData);
-                if (textureFilter)
-                    n[0].setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                pImage.dispose();
-                pMask.dispose();
-            }
+        FThreads.invokeInEdtNowOrLater(() -> {
+            Pixmap pImage = new Pixmap(fh);
+            int w = pImage.getWidth();
+            int h = pImage.getHeight();
+            int radius = (h - w) / 8;
+            Pixmap pMask = createRoundedRectangle(w, h, radius, Color.RED);
+            drawPixelstoMask(pImage, pMask);
+            TextureData textureData = new PixmapTextureData(
+                    pMask, //pixmap to use
+                    Format.RGBA8888,
+                    textureFilter, //use mipmaps
+                    false, true);
+            n[0] = new Texture(textureData);
+            if (textureFilter)
+                n[0].setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+            pImage.dispose();
+            pMask.dispose();
         });
         return n[0];
     }

From c266da76ec5ebcdb8dab26741d66a3ade8b0c30c Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Wed, 6 Jul 2022 09:48:43 -0400
Subject: [PATCH 181/309] DraftEffect fix bad comment lines

---
 .../src/main/java/forge/game/ability/effects/DraftEffect.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 283af522cf6..8ded58eb4e0 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
@@ -57,8 +57,8 @@ import java.util.*;
              List<ICardFace> faces = new ArrayList<>();
              for (String name : spellbook.subList(0, 3)) {
                  // Cardnames that include "," must use ";" instead in Spellbook$ (i.e. Tovolar; Dire Overlord)
-                 // name = name.replace(";", ",");
-                 // faces.add(StaticData.instance().getCommonCards().getFaceByName(name));
+                 name = name.replace(";", ",");
+                 faces.add(StaticData.instance().getCommonCards().getFaceByName(name));
              }
              chosen = player.getController().chooseCardName(sa, faces,
                      Localizer.getInstance().getMessage("lblChooseCardDraft"));

From 8ca8e145e45749625296866f91e89506d6ad0583 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 21:53:14 +0800
Subject: [PATCH 182/309] remove static reference

---
 forge-gui-mobile/src/forge/Forge.java         |  3 +++
 .../src/forge/assets/ImageCache.java          | 27 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 3fe7c0ddae4..9bb1be0d844 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -23,6 +23,7 @@ import forge.adventure.scene.SceneType;
 import forge.adventure.stage.MapStage;
 import forge.adventure.util.Config;
 import forge.animation.ForgeAnimation;
+import forge.assets.Assets;
 import forge.assets.AssetsDownloader;
 import forge.assets.FSkin;
 import forge.assets.FSkinFont;
@@ -103,6 +104,8 @@ public class Forge implements ApplicationListener {
     public static boolean enablePreloadExtendedArt = false;
     public static boolean isTabletDevice = false;
     public static String locale = "en-US";
+    public Assets cardAssets = new Assets();
+    public Assets otherAssets = new Assets();
     public static boolean hdbuttons = false;
     public static boolean hdstart = false;
     public static boolean isPortraitMode = false;
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 5b5cf9e542b..1397962cc8e 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -71,8 +71,6 @@ public class ImageCache {
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
     private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
-    static Assets cardAssets = new Assets();
-    static Assets otherAssets = new Assets();
     static TextureParameter defaultParameter = new TextureParameter();
     static TextureParameter filtered = new TextureParameter();
     public static void initCache(int capacity) {
@@ -115,11 +113,11 @@ public class ImageCache {
     }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
-        cardAssets.manager().clear();
+        ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().clear();
     }
     public static void disposeTextureManager() {
-        cardAssets.dispose();
-        otherAssets.dispose();
+        ((Forge)Gdx.app.getApplicationListener()).cardAssets.dispose();
+        ((Forge)Gdx.app.getApplicationListener()).otherAssets.dispose();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -260,26 +258,27 @@ public class ImageCache {
             return null;
         if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
             return generatedCards.get(imageKey);
-        return otherCache ? otherAssets.manager().get(file.getPath(), Texture.class, false) : cardAssets.manager().get(file.getPath(), Texture.class, false);
+        return otherCache ? ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().get(file.getPath(), Texture.class, false)
+                : ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().get(file.getPath(), Texture.class, false);
     }
     static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
-        if (!otherCache && cardAssets.manager().getLoadedAssets() > maxCardCapacity) {
+        if (!otherCache && ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().getLoadedAssets() > maxCardCapacity) {
             //when maxCardCapacity is reached, clear to refresh
-            cardAssets.manager().clear();
+            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().clear();
             CardRenderer.clearcardArtCache();
             return null;
         }
         String fileName = file.getPath();
         if (otherCache) {
-            otherAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            otherAssets.manager().finishLoadingAsset(fileName);
-            return otherAssets.manager().get(fileName, Texture.class, false);
+            ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().finishLoadingAsset(fileName);
+            return ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().get(fileName, Texture.class, false);
         } else {
-            cardAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            cardAssets.manager().finishLoadingAsset(fileName);
-            Texture t = cardAssets.manager().get(fileName, Texture.class, false);
+            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().finishLoadingAsset(fileName);
+            Texture t = ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().get(fileName, Texture.class, false);
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
                 updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));

From 51b1391aee202ccb6de236ed7241af93164c39d7 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 6 Jul 2022 22:09:01 +0800
Subject: [PATCH 183/309] prevent NPE

---
 forge-gui-mobile/src/forge/assets/ImageCache.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 1397962cc8e..e5a0bf68d85 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -322,7 +322,11 @@ public class ImageCache {
     public static Color borderColor(Texture t) {
         if (t == null)
             return Color.valueOf("#171717");
-        return Color.valueOf(imageBorder.get(t.toString()).getLeft());
+        try {
+            return Color.valueOf(imageBorder.get(t.toString()).getLeft());
+        } catch (Exception e) {
+            return Color.valueOf("#171717");
+        }
     }
     public static int getFSkinBorders(CardView c) {
         if (c == null)

From 3fdff97f9fa1db12ff848dfb3f8d94aabf00abf3 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Wed, 6 Jul 2022 12:39:41 -0400
Subject: [PATCH 184/309] Card Script for Alaundo the Seer using PutCounters.

---
 forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
index 495cee7a203..f2d367e8273 100644
--- a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
@@ -9,7 +9,7 @@ SVar:X:Remembered$CardManaCost
 SVar:DBAddTrigger:DB$ Animate | Defined$ Remembered | Triggers$ TWhenLastTimeCounterRemoved | Duration$ Permanent | SubAbility$ DBRemoveTimeCounterOtherCardsInExile
 SVar:TWhenLastTimeCounterRemoved:Mode$ CounterRemoved | ValidCard$ Card.Self+counters_EQ0_TIME | TriggerZones$ Exile | CounterType$ TIME | Execute$ DBCastWithoutPayingManaCost | TriggerDescription$ When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn.
 SVar:DBCastWithoutPayingManaCost:DB$ Play | Valid$ Card.Self | ValidSA$ Spell | ValidZone$ Exile | Destination$ Battlefield | WithoutManaCost$ True | Optional$ True | SubAbility$ DBGiveHaste
-SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | PumpZone$ Stack
+SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | ConditionDefined$ Self | ConditionPresent$ Card.Creature | PumpZone$ Stack
 SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
-Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile. (Test#2)
+Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.

From 6ba164ebadbaad49abac3e6dc7d141d5eb6a33e6 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Wed, 6 Jul 2022 12:45:26 -0400
Subject: [PATCH 185/309] Card Script for Alaundo the Seer WithCountersType and
 WithCountersAmount, and modifications to ChangeZoneEffect.

This commit adds code to ChangeZoneEffect which enables WithCountersType and WithCountersAmount with an SVar dependent on Remembered when exiling.
---
 .../java/forge/game/ability/effects/ChangeZoneEffect.java  | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt    | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

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 072538ebf2e..d675f24b9f6 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
@@ -1448,6 +1448,13 @@ 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);
+                    GameEntityCounterTable table = new GameEntityCounterTable();
+                    movedCard.addCounter(cType, cAmount, player, table);
+                    table.replaceCounterEffect(game, sa, true);
+                }
             }
 
             if (((!ZoneType.Battlefield.equals(destination) && changeType != null && !defined && !changeType.equals("Card"))
diff --git a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
index f2d367e8273..f27a9415ddd 100644
--- a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
@@ -3,8 +3,7 @@ ManaCost:2 G U
 Types:Legendary Creature Human Shaman
 PT:3/5
 A:AB$ Draw | Cost$ T | SubAbility$ DBExile | StackDescription$ SpellDescription | SpellDescription$ Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.
-SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | TgtPrompt$ Select a card to exile with a number of time counters equal to its mana value | SubAbility$ DBPutTimeCounters | RememberChanged$ True | Mandatory$ True
-SVar:DBPutTimeCounters:DB$ PutCounter | Defined$ Remembered | CounterType$ TIME | CounterNum$ X | SubAbility$ DBAddTrigger
+SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | TgtPrompt$ Select a card to exile with a number of time counters equal to its mana value | WithCountersType$ TIME | WithCountersAmount$ X | SubAbility$ DBAddTrigger | RememberChanged$ True | Mandatory$ True
 SVar:X:Remembered$CardManaCost
 SVar:DBAddTrigger:DB$ Animate | Defined$ Remembered | Triggers$ TWhenLastTimeCounterRemoved | Duration$ Permanent | SubAbility$ DBRemoveTimeCounterOtherCardsInExile
 SVar:TWhenLastTimeCounterRemoved:Mode$ CounterRemoved | ValidCard$ Card.Self+counters_EQ0_TIME | TriggerZones$ Exile | CounterType$ TIME | Execute$ DBCastWithoutPayingManaCost | TriggerDescription$ When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn.

From 9f180759b8341beef03e8227a29aea0e2fdf9bfd Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:55:19 +0100
Subject: [PATCH 186/309] 2 CLB Cards (#1047)

* Create prized_statue.txt

* Create patriars_seal.txt
---
 forge-gui/res/cardsfolder/upcoming/patriars_seal.txt | 7 +++++++
 forge-gui/res/cardsfolder/upcoming/prized_statue.txt | 8 ++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/patriars_seal.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/prized_statue.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/patriars_seal.txt b/forge-gui/res/cardsfolder/upcoming/patriars_seal.txt
new file mode 100644
index 00000000000..ccf18f2a240
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/patriars_seal.txt
@@ -0,0 +1,7 @@
+Name:Patriar's Seal
+ManaCost:3
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Untap | Cost$ 1 T | ValidTgts$ Creature.Legendary+YouCtrl | SpellDescription$ Untap target legendary creature you control.
+DeckHints:Type$Legendary
+Oracle:{T}: Add one mana of any color.\n{1}, {T}: Untap target legendary creature you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/prized_statue.txt b/forge-gui/res/cardsfolder/upcoming/prized_statue.txt
new file mode 100644
index 00000000000..8a633df7fe8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/prized_statue.txt
@@ -0,0 +1,8 @@
+Name:Prized Statue
+ManaCost:2
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a Treasure token.(It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
+DeckHas:Ability$Token
+Oracle:When Prized Statue enters the battlefield or is put into a graveyard from the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

From 6b11e0b5d14ebcb5790af6511fa09c232cc734c8 Mon Sep 17 00:00:00 2001
From: t-w-o-s-a-t <103374130+t-w-o-s-a-t@users.noreply.github.com>
Date: Wed, 6 Jul 2022 19:35:45 +0200
Subject: [PATCH 187/309] Update de-DE.properties

reworked translation of DisposeTextures
there multiple possible translations of 'save' with totally different meanings - hard to decided wich to use for an nonnative speaker
that's why we work together - everyone does his share :)
---
 forge-gui/res/languages/de-DE.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 5ae2399c391..67a336c0e72 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -1076,8 +1076,8 @@ lblDisableCardImages=Kartenbilder abschalten
 nlDisableCardImages=Wenn aktiviert, zeigt Forge keine Kartenbilder mehr.
 lblExperimentalNetworkCompatibility=Experimentelle Netzwerkkompatibilität
 nlExperimentalNetworkCompatibility=Forge wechselt auf kompatiblen Netzwerk-Stream. (Im Zweifel bitte ausschalten)
-lblDisposeTextures=Texturen anordnen
-nlDisposeTextures=Wenn Sie aktiviert sind, entsorgen Sie die Kartenkunst- und Kartenbild -Caches, um den RAM während des Spielsumschaltens zu speichern. (Im Zweifel bitte ausschalten)
+lblDisposeTextures=Bildspeicher reorganisieren
+nlDisposeTextures=Wenn aktiviert, wird der Kartenbildspeicher zwischen einzelnen Spiele entleert um RAM zu sparen. (Im Zweifel bitte ausschalten)
 lblAutoCacheSize=Aktiviere automatische Cache-Größe
 nlAutoCacheSize=Wenn aktiviert, wird die Cache-Größe beim Start automatisch ermittelt und eingestellt. (Im Zweifel bitte ausschalten)
 lblUseLaserArrows=Nutze "Laser"-Pfeile

From 54ed9790ccb959ecca715cb60aaa028ac7e88151 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Wed, 6 Jul 2022 17:11:31 -0400
Subject: [PATCH 188/309] CleanUp -> Cleanup

---
 forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
index a7888a1978d..5459cb9bd9e 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -7,4 +7,4 @@ SVar:DBChooseCreatureYouDontCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$
 SVar:DBRevealChosen:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBRevealToEachPlayer | SubAbility$ DBDestroyChosen
 SVar:DBRevealToEachPlayer:DB$ Reveal | Defined$ RememberedPlayer | RevealDefined$ ChosenCard
 SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanUp
-SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True 
+SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True 

From 237359679659fe8de1e14acbc319c95bc47f8a50 Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Thu, 7 Jul 2022 00:20:44 -0400
Subject: [PATCH 189/309] CLB: Elminster and support (#1053)

* elminster.txt

* TypeLists add Elminster to [WalkerTypes]

* TriggerScry ScryNum for setTriggeringObjects and getImportantStackObjects

* TriggerHandler.runSingleTriggerInternal implement RememberAmount for integer

* StaticAbility.toString allow for INSERT tag

* GameAction.scry track numLookedAt for trigger

* DigEffect.getStackDescription check for exile first in verb parsing

* AbilityKey add ScryNum
---
 .../src/main/java/forge/game/GameAction.java  |  2 ++
 .../java/forge/game/ability/AbilityKey.java   |  1 +
 .../forge/game/ability/effects/DigEffect.java |  8 +++----
 .../game/staticability/StaticAbility.java     |  5 ++++-
 .../forge/game/trigger/TriggerHandler.java    |  5 +++++
 .../java/forge/game/trigger/TriggerScry.java  |  5 ++++-
 .../res/cardsfolder/upcoming/elminster.txt    | 22 +++++++++++++++++++
 forge-gui/res/lists/TypeLists.txt             |  1 +
 8 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/elminster.txt

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 2d8b14adc96..03552568b9c 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -2315,6 +2315,7 @@ public class GameAction {
             final Player p = e.getKey();
             final CardCollection toTop = e.getValue().getLeft();
             final CardCollection toBottom = e.getValue().getRight();
+            final int numLookedAt = toTop.size() + toBottom.size();
             if (toTop != null) {
                 Collections.reverse(toTop); // reverse to get the correct order
                 for (Card c : toTop) {
@@ -2331,6 +2332,7 @@ public class GameAction {
                 // set up triggers (but not actually do them until later)
                 final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
                 runParams.put(AbilityKey.Player, p);
+                runParams.put(AbilityKey.ScryNum, numLookedAt);
                 game.getTriggerHandler().runTrigger(TriggerType.Scry, runParams, false);
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityKey.java b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
index 896bcc3268f..b59c96e35d3 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityKey.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityKey.java
@@ -113,6 +113,7 @@ public enum AbilityKey {
     Result("Result"),
     RoomName("RoomName"),
     Scheme("Scheme"),
+    ScryNum("ScryNum"),
     Sides("Sides"),
     Source("Source"),
     Sources("Sources"),
diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
index a716df1de98..1cd26f2d896 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
@@ -44,11 +44,11 @@ public class DigEffect extends SpellAbilityEffect {
             final int numToChange = toChange.startsWith("All") ? numToDig : AbilityUtils.calculateAmount(host, sa.getParam("ChangeNum"), sa);
 
             String verb = " looks at ";
-            if (sa.hasParam("Reveal") && sa.getParam("Reveal").equals("True")) {
-                verb = " reveals ";
-            } else if (sa.hasParam("DestinationZone") && sa.getParam("DestinationZone").equals("Exile") &&
-                    numToDig == numToChange) {
+            if (sa.hasParam("DestinationZone") && sa.getParam("DestinationZone").equals("Exile") &&
+                numToDig == numToChange) {
                 verb = " exiles ";
+            } else if (sa.hasParam("Reveal") && sa.getParam("Reveal").equals("True")) {
+                verb = " reveals ";
             }
             sb.append(host.getController()).append(verb).append("the top ");
             sb.append(numToDig == 1 ? "card" : Lang.getNumeral(numToDig) + " cards").append(" of ");
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 dde359b29ab..e0a45949555 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java
@@ -211,7 +211,10 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
             }
             String desc = CardTranslation.translateSingleDescriptionText(getParam("Description"), currentName);
             desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName));
-            desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName)));
+            desc = TextUtil.fastReplace(desc, "NICKNAME",
+                    Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName)));
+            desc = TextUtil.fastReplace(desc, "INSERT",
+                    Integer.toString(AbilityUtils.calculateAmount(getHostCard(), getParam("Insert"), this)));
 
             return desc;
         } else {
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 c0a3e78cffe..47e199d060e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -581,6 +581,11 @@ public class TriggerHandler {
             host.addRemembered(runParams.get(AbilityKey.fromString(regtrig.getParam("RememberKey"))));
         }
 
+        if (regtrig.hasParam("RememberAmount")) {
+            Integer amount = (Integer) sa.getTriggeringObject(AbilityKey.fromString(regtrig.getParam("RememberAmount")));
+            host.addRemembered(amount);
+        }
+
         sa.setStackDescription(sa.toString());
 
         Player decider = null;
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
index 4cba3657554..5512ddbc89a 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
@@ -65,12 +65,15 @@ public class TriggerScry extends Trigger {
     @Override
     public final void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {
         sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
+        sa.setTriggeringObjectsFrom(runParams, AbilityKey.ScryNum);
     }
 
     @Override
     public String getImportantStackObjects(SpellAbility sa) {
         StringBuilder sb = new StringBuilder();
-        sb.append(Localizer.getInstance().getMessage("lblScryer")).append(": ").append(sa.getTriggeringObject(AbilityKey.Player));
+        sb.append(Localizer.getInstance().getMessage("lblScryer")).append(": ");
+        sb.append(sa.getTriggeringObject(AbilityKey.Player)).append(", ");
+        sb.append(sa.getTriggeringObject(AbilityKey.ScryNum));
         return sb.toString();
     }
 }
diff --git a/forge-gui/res/cardsfolder/upcoming/elminster.txt b/forge-gui/res/cardsfolder/upcoming/elminster.txt
new file mode 100644
index 00000000000..b3d5afaa01c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/elminster.txt
@@ -0,0 +1,22 @@
+Name:Elminster
+ManaCost:3 W U
+Types:Legendary Planeswalker Elminster
+Loyalty:5
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigStore | RememberAmount$ ScryNum | TriggerDescription$ Whenever you scry, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying this way.
+SVar:TrigStore:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ Y | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ ReduceCost | Triggers$ TrigCastSpell | SubAbility$ DBCleanup
+SVar:ReduceCost:Mode$ ReduceCost | EffectZone$ Command | Type$ Spell | ValidCard$ Instant,Sorcery | Activator$ You | Amount$ X | Insert$ X | Description$ The next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying. (INSERT)
+SVar:TrigCastSpell:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ RemoveEffect | Static$ True
+SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Number$0
+SVar:Y:Count$RememberedNumber
+A:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | SubAbility$ DBScry | SpellDescription$ Draw a card, then scry 2.
+SVar:DBScry:DB$ Scry | ScryNum$ 2
+A:AB$ Dig | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | Reveal$ True | SubAbility$ DBToken | SpellDescription$ Exile the top card of your library.
+SVar:DBToken:DB$ Token | TokenAmount$ Z | TokenScript$ u_1_1_faerie_dragon_flying | SpellDescription$ Create a number of 1/1 blue Faerie Dragon creature tokens with flying equal to that card's mana value.
+SVar:Z:Count$RememberedCardManaCost
+Text:CARDNAME can be your commander.
+DeckHas:Ability$Token & Type$Faerie|Dragon
+DeckHints:Type$Instant|Sorcery
+Oracle:Whenever you scry, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying this way.\n+2: Draw a card, then scry 2.\n−3: Exile the top card of your library. Create a number of 1/1 blue Faerie Dragon creature tokens with flying equal to that card's mana value.\nElminster can be your commander.
diff --git a/forge-gui/res/lists/TypeLists.txt b/forge-gui/res/lists/TypeLists.txt
index 0437f310a60..ce9d93f9234 100644
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -337,6 +337,7 @@ Dovin
 Duck
 Dungeon Master
 Ellywick
+Elminster
 Elspeth
 Estrid
 Freyalise

From 901a7bd670d48c116e4f1f1b23e7a463e2021667 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Thu, 7 Jul 2022 00:57:06 -0400
Subject: [PATCH 190/309] First working draft.

---
 forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
index 5459cb9bd9e..0908ba5a65e 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -1,10 +1,9 @@
 Name:Call to the Void
 ManaCost:4 B
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 4 B | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCreatureYouCtrl | SubAbility$ DBRevealChosen
+A:SP$ RepeatEach | Cost$ 4 B | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCreatureYouCtrl | SubAbility$ DBRevealChosenToAll
 SVar:DBChooseCreatureYouCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you control | SubAbility$ DBChooseCreatureYouDontCtrl | RememberChosen$ True | Mandatory$ True
 SVar:DBChooseCreatureYouDontCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.nonRememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you don't control | RememberChosen$ True | Mandatory$ True
-SVar:DBRevealChosen:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBRevealToEachPlayer | SubAbility$ DBDestroyChosen
-SVar:DBRevealToEachPlayer:DB$ Reveal | Defined$ RememberedPlayer | RevealDefined$ ChosenCard
+SVar:DBRevealChosenToAll:DB$ Reveal | Defined$ CardOwner | RevealDefined$ RememberedCard | RevealToAll$ True | RevealTitle$ OVERRIDE Creatures chosen. They will be destroyed. | Description$ Test | SubAbility$ DBDestroyChosen
 SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True 

From 4d9d060e9dbfddab5d4fc4fd347c19af3aebc046 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:50:35 +0100
Subject: [PATCH 191/309] Create chardalyn_dragon.txt

---
 forge-gui/res/cardsfolder/upcoming/chardalyn_dragon.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/chardalyn_dragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/chardalyn_dragon.txt b/forge-gui/res/cardsfolder/upcoming/chardalyn_dragon.txt
new file mode 100644
index 00000000000..08739f799fb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/chardalyn_dragon.txt
@@ -0,0 +1,6 @@
+Name:Chardalyn Dragon
+ManaCost:6
+Types:Artifact Creature Dragon
+PT:4/4
+K:Flying
+Oracle:Flying

From 424f4ad88ebbab4de9b0bbbf002de46e2ee75a8b Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:51:33 +0100
Subject: [PATCH 192/309] Create cloak_of_the_bat.txt

---
 forge-gui/res/cardsfolder/upcoming/cloak_of_the_bat.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/cloak_of_the_bat.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/cloak_of_the_bat.txt b/forge-gui/res/cardsfolder/upcoming/cloak_of_the_bat.txt
new file mode 100644
index 00000000000..37e6727a75e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/cloak_of_the_bat.txt
@@ -0,0 +1,6 @@
+Name:Cloak of the Bat
+ManaCost:2
+Types:Artifact Equipment
+K:Equip:2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying & Haste | Description$ Equipped creature has flying and haste.
+Oracle:Equipped creature has flying and haste.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)

From 5679cf687347fd35e2940b00c1097a307068fa8a Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:52:06 +0100
Subject: [PATCH 193/309] Create decanter_of_endless_water.txt

---
 .../res/cardsfolder/upcoming/decanter_of_endless_water.txt  | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/decanter_of_endless_water.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/decanter_of_endless_water.txt b/forge-gui/res/cardsfolder/upcoming/decanter_of_endless_water.txt
new file mode 100644
index 00000000000..792da402c7f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/decanter_of_endless_water.txt
@@ -0,0 +1,6 @@
+Name:Decanter of Endless Water
+ManaCost:3
+Types:Artifact
+S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:You have no maximum hand size.\n{T}: Add one mana of any color.

From 8e5b05b07552fc9c4e38a262a68f7b8ce2ef7cdd Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:52:46 +0100
Subject: [PATCH 194/309] Create draconic_lore.txt

---
 forge-gui/res/cardsfolder/upcoming/draconic_lore.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/draconic_lore.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/draconic_lore.txt b/forge-gui/res/cardsfolder/upcoming/draconic_lore.txt
new file mode 100644
index 00000000000..0e6e29061bb
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/draconic_lore.txt
@@ -0,0 +1,7 @@
+Name:Draconic Lore
+ManaCost:5 U
+Types:Instant
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | IsPresent$ Dragon.YouCtrl | Description$ This spell costs {2} less to cast if you control a Dragon.
+DeckHints:Type$Dragon
+A:SP$ Draw | Cost$ 5 U | NumCards$ 3 | SpellDescription$ Draw three cards.
+Oracle:This spell costs {2} less to cast if you control a Dragon.\nDraw three cards.

From 18e3def8b76ddcb66fa8024bdd81491a0c7c498c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 7 Jul 2022 21:07:40 +0800
Subject: [PATCH 195/309] Refactor FSkin to use Assetmanager

---
 forge-gui-mobile/src/forge/Forge.java         | 220 ++++++++----------
 forge-gui-mobile/src/forge/Graphics.java      |   1 +
 .../src/forge/adventure/util/Config.java      |  14 +-
 forge-gui-mobile/src/forge/assets/Assets.java |   3 -
 forge-gui-mobile/src/forge/assets/FSkin.java  | 206 ++++++++--------
 .../src/forge/assets/FSkinFont.java           |  33 ++-
 .../src/forge/assets/FSkinImage.java          |  36 +--
 .../src/forge/assets/FSkinTexture.java        |   9 +-
 .../src/forge/assets/ImageCache.java          |  18 +-
 .../src/forge/screens/LoadingOverlay.java     |  64 ++---
 forge-gui/res/languages/de-DE.properties      |   1 +
 forge-gui/res/languages/en-US.properties      |   1 +
 forge-gui/res/languages/es-ES.properties      |   1 +
 forge-gui/res/languages/it-IT.properties      |   1 +
 forge-gui/res/languages/ja-JP.properties      |   1 +
 forge-gui/res/languages/pt-BR.properties      |   1 +
 forge-gui/res/languages/zh-CN.properties      |   1 +
 17 files changed, 296 insertions(+), 315 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 9bb1be0d844..a3fe58024f8 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -104,8 +104,8 @@ public class Forge implements ApplicationListener {
     public static boolean enablePreloadExtendedArt = false;
     public static boolean isTabletDevice = false;
     public static String locale = "en-US";
-    public Assets cardAssets = new Assets();
-    public Assets otherAssets = new Assets();
+    public Assets cardAssets;
+    public Assets otherAssets;
     public static boolean hdbuttons = false;
     public static boolean hdstart = false;
     public static boolean isPortraitMode = false;
@@ -166,7 +166,8 @@ public class Forge implements ApplicationListener {
             // don't allow to read and process
             ForgeConstants.SPRITE_CARDBG_FILE = "";
         }
-
+        cardAssets = new Assets();
+        otherAssets = new Assets();
         graphics = new Graphics();
         splashScreen = new SplashScreen();
         frameRate = new FrameRate();
@@ -219,50 +220,44 @@ public class Forge implements ApplicationListener {
         ImageCache.initCache(cacheSize);
 
         //load model on background thread (using progress bar to report progress)
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                //see if app or assets need updating
-                AssetsDownloader.checkForUpdates(splashScreen);
-                if (exited) {
-                    return;
-                } //don't continue if user chose to exit or couldn't download required assets
+        FThreads.invokeInBackgroundThread(() -> {
+            //see if app or assets need updating
+            AssetsDownloader.checkForUpdates(splashScreen, enableSentry, locale);
+            if (exited) {
+                return;
+            } //don't continue if user chose to exit or couldn't download required assets
 
-                safeToClose = false;
-                ImageKeys.setIsLibGDXPort(GuiBase.getInterface().isLibgdxPort());
-                FModel.initialize(splashScreen.getProgressBar(), null);
+            safeToClose = false;
+            ImageKeys.setIsLibGDXPort(GuiBase.getInterface().isLibgdxPort());
+            FModel.initialize(splashScreen.getProgressBar(), null);
 
-                splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingFonts"));
-                FSkinFont.preloadAll(locale);
+            splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingFonts"));
+            FSkinFont.preloadAll(locale);
 
-                splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingCardTranslations"));
-                CardTranslation.preloadTranslation(locale, ForgeConstants.LANG_DIR);
+            splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingCardTranslations"));
+            CardTranslation.preloadTranslation(locale, ForgeConstants.LANG_DIR);
 
-                splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
+            splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
 
-                //add reminder to preload
-                if (enablePreloadExtendedArt) {
-                    if (autoCache)
-                        splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
-                    else
-                        splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt"));
-                } else {
-                    if (autoCache)
-                        splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
-                    else
-                        splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
-                }
-
-                Gdx.app.postRunnable(new Runnable() {
-                    @Override
-                    public void run() {
-                        afterDbLoaded();
-                        /*  call preloadExtendedArt here, if we put it above we will  *
-                         *  get error: No OpenGL context found in the current thread. */
-                        preloadExtendedArt();
-                    }
-                });
+            //add reminder to preload
+            if (enablePreloadExtendedArt) {
+                if (autoCache)
+                    splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
+                else
+                    splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt"));
+            } else {
+                if (autoCache)
+                    splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
+                else
+                    splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
             }
+
+            Gdx.app.postRunnable(() -> {
+                afterDbLoaded();
+                /*  call preloadExtendedArt here, if we put it above we will  *
+                 *  get error: No OpenGL context found in the current thread. */
+                preloadExtendedArt();
+            });
         });
     }
 
@@ -380,52 +375,35 @@ public class Forge implements ApplicationListener {
             FModel.getPreferences().save();
         }
 
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        //load skin full
-                        FSkin.loadFull(splashScreen);
-                        FThreads.invokeInBackgroundThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                //load Drafts
-                                preloadBoosterDrafts();
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        //selection transition
-                                        setTransitionScreen(new TransitionScreen(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                if (selector.equals("Classic")) {
-                                                    openHomeDefault();
-                                                    clearSplashScreen();
-                                                } else if (selector.equals("Adventure")) {
-                                                    openAdventure();
-                                                    clearSplashScreen();
-                                                } else if (splashScreen != null) {
-                                                    splashScreen.setShowModeSelector(true);
-                                                } else {//default mode in case splashscreen is null at some point as seen on resume..
-                                                    openHomeDefault();
-                                                    clearSplashScreen();
-                                                }
-                                                //start background music
-                                                SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
-                                                safeToClose = true;
-                                                clearTransitionScreen();
-                                            }
-                                        }, Forge.takeScreenshot(), false, false, true, false));
-                                    }
-                                });
-                            }
-                        });
-                    }
+        FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
+            //load skin full
+            FSkin.loadFull(splashScreen);
+            FThreads.invokeInBackgroundThread(() -> {
+                //load Drafts
+                preloadBoosterDrafts();
+                FThreads.invokeInEdtLater(() -> {
+                    //selection transition
+                    setTransitionScreen(new TransitionScreen(() -> {
+                        if (selector.equals("Classic")) {
+                            openHomeDefault();
+                            clearSplashScreen();
+                        } else if (selector.equals("Adventure")) {
+                            openAdventure();
+                            clearSplashScreen();
+                        } else if (splashScreen != null) {
+                            splashScreen.setShowModeSelector(true);
+                        } else {//default mode in case splashscreen is null at some point as seen on resume..
+                            openHomeDefault();
+                            clearSplashScreen();
+                        }
+                        //start background music
+                        SoundSystem.instance.setBackgroundMusic(MusicPlaylist.MENUS);
+                        safeToClose = true;
+                        clearTransitionScreen();
+                    }, Forge.takeScreenshot(), false, false, true, false));
                 });
-            }
-        });
+            });
+        }));
     }
 
     public static void setCursor(TextureRegion textureRegion, String name) {
@@ -757,32 +735,26 @@ public class Forge implements ApplicationListener {
     }
 
     public static void switchToClassic() {
-        setTransitionScreen(new TransitionScreen(new Runnable() {
-            @Override
-            public void run() {
-                ImageCache.disposeTextures();
-                isMobileAdventureMode = false;
-                GuiBase.setIsAdventureMode(false);
-                setCursor(FSkin.getCursor().get(0), "0");
-                altZoneTabs = FModel.getPreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS);
-                Gdx.input.setInputProcessor(getInputProcessor());
-                clearTransitionScreen();
-                openHomeDefault();
-                exited = false;
-            }
+        setTransitionScreen(new TransitionScreen(() -> {
+            ImageCache.disposeTextures();
+            isMobileAdventureMode = false;
+            GuiBase.setIsAdventureMode(false);
+            setCursor(FSkin.getCursor().get(0), "0");
+            altZoneTabs = FModel.getPreferences().getPrefBoolean(FPref.UI_ALT_PLAYERZONETABS);
+            Gdx.input.setInputProcessor(getInputProcessor());
+            clearTransitionScreen();
+            openHomeDefault();
+            exited = false;
         }, Forge.takeScreenshot(), false, false));
     }
 
     public static void switchToAdventure() {
-        setTransitionScreen(new TransitionScreen(new Runnable() {
-            @Override
-            public void run() {
-                ImageCache.disposeTextures();
-                clearCurrentScreen();
-                clearTransitionScreen();
-                openAdventure();
-                exited = false;
-            }
+        setTransitionScreen(new TransitionScreen(() -> {
+            ImageCache.disposeTextures();
+            clearCurrentScreen();
+            clearTransitionScreen();
+            openAdventure();
+            exited = false;
         }, null, false, true));
     }
 
@@ -936,19 +908,11 @@ public class Forge implements ApplicationListener {
     }
 
     public static void delayedSwitchBack() {
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        clearTransitionScreen();
-                        clearCurrentScreen();
-                        switchToLast();
-                    }
-                });
-            }
-        });
+        FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
+            clearTransitionScreen();
+            clearCurrentScreen();
+            switchToLast();
+        }));
     }
 
     @Override
@@ -990,8 +954,8 @@ public class Forge implements ApplicationListener {
             currentScreen.onClose(null);
             currentScreen = null;
         }
-        ImageCache.disposeTextureManager();
-        Config.instance().disposeTextureAtlasManager();
+        cardAssets.dispose();
+        otherAssets.dispose();
         Dscreens.clear();
         graphics.dispose();
         SoundSystem.instance.dispose();
@@ -1000,7 +964,15 @@ public class Forge implements ApplicationListener {
         } catch (Exception e) {
         }
     }
-
+    /** Retrieve assets.
+     * @param other if set to true returns otherAssets otherwise returns cardAssets
+     */
+    public static Assets getAssets(boolean other) {
+        if (other)
+            return ((Forge)Gdx.app.getApplicationListener()).otherAssets;
+        else
+            return ((Forge)Gdx.app.getApplicationListener()).cardAssets;
+    }
     public static boolean switchScene(Scene newScene) {
         if (currentScene != null) {
             if (!currentScene.leave())
diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java
index 0183fc15070..48cba88cbcd 100644
--- a/forge-gui-mobile/src/forge/Graphics.java
+++ b/forge-gui-mobile/src/forge/Graphics.java
@@ -1132,6 +1132,7 @@ public class Graphics {
             P.setColor(1f,1f,1f,1f);
             P.drawPixel(0, 0);
             dummyTexture = new Texture(P);
+            P.dispose();
         }
         return dummyTexture;
     }
diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
index fafd7608da0..8813e54725c 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Config.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -4,9 +4,9 @@ import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonWriter;
+import forge.Forge;
 import forge.adventure.data.ConfigData;
 import forge.adventure.data.SettingData;
-import forge.assets.Assets;
 import forge.deck.Deck;
 import forge.gui.GuiBase;
 import forge.localinstance.properties.ForgeConstants;
@@ -26,7 +26,6 @@ public class Config {
     private static Config currentConfig;
     private final String prefix;
     private final HashMap<String, FileHandle> Cache = new HashMap<String, FileHandle>();
-    private final Assets atlasAssets = new Assets();
     private final ConfigData configData;
     private final String[] adventures;
     private SettingData settingsData;
@@ -121,11 +120,11 @@ public class Config {
 
     public TextureAtlas getAtlas(String spriteAtlas) {
         String fileName = getFile(spriteAtlas).path();
-        if (!atlasAssets.manager().contains(fileName, TextureAtlas.class)) {
-            atlasAssets.manager().load(fileName, TextureAtlas.class);
-            atlasAssets.manager().finishLoadingAsset(fileName);
+        if (!Forge.getAssets(true).manager.contains(fileName, TextureAtlas.class)) {
+            Forge.getAssets(true).manager.load(fileName, TextureAtlas.class);
+            Forge.getAssets(true).manager.finishLoadingAsset(fileName);
         }
-        return atlasAssets.manager().get(fileName);
+        return Forge.getAssets(true).manager.get(fileName);
     }
     public SettingData getSettingData()
     {
@@ -143,7 +142,4 @@ public class Config {
         handle.writeString(json.prettyPrint(json.toJson(settingsData, SettingData.class)),false);
 
     }
-    public void disposeTextureAtlasManager() {
-        atlasAssets.dispose();
-    }
 }
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index 6d0d01dd3db..0b88a5af937 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -6,9 +6,6 @@ import com.badlogic.gdx.utils.Disposable;
 
 public class Assets implements Disposable {
     public AssetManager manager = new AssetManager(new AbsoluteFileHandleResolver());
-    public AssetManager manager() {
-        return manager;
-    }
     @Override
     public void dispose() {
         manager.dispose();
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 4440cb9d006..6c33a438979 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -1,6 +1,8 @@
 package forge.assets;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.TextureLoader;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -19,6 +21,7 @@ import forge.localinstance.skin.FSkinProp;
 import forge.model.FModel;
 import forge.screens.LoadingOverlay;
 import forge.screens.SplashScreen;
+import forge.screens.TransitionScreen;
 import forge.toolbox.FProgressBar;
 import forge.util.WordUtil;
 
@@ -50,38 +53,27 @@ public class FSkin {
         prefs.setPref(FPref.UI_SKIN, skinName);
         prefs.save();
 
-        //load skin
-        loaded = false; //reset this temporarily until end of loadFull()
-
-        final LoadingOverlay loader = new LoadingOverlay("Loading new theme...");
-        loader.show(); //show loading overlay then delay running remaining logic so UI can respond
-        FThreads.invokeInBackgroundThread(new Runnable() {
+        Forge.setTransitionScreen(new TransitionScreen(new Runnable() {
             @Override
             public void run() {
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        loadLight(skinName, null);
-                        loadFull(null);
-                        loader.setCaption("Loading fonts...");
-                        FThreads.invokeInBackgroundThread(new Runnable() {
+                FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
+                    final LoadingOverlay loader = new LoadingOverlay(Forge.getLocalizer().getMessageorUseDefault("lblRestartInFewSeconds", "Forge will restart after a few seconds..."), true);
+                    loader.show();
+                    FThreads.invokeInBackgroundThread(() -> {
+                        FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
+                        FThreads.delayInEDT(2000, new Runnable() {
                             @Override
                             public void run() {
-                                FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
-                                FSkinFont.updateAll();
-                                //CardImageRenderer.forceStaticFieldUpdate();
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        loader.hide();
-                                    }
+                                Forge.clearTransitionScreen();
+                                FThreads.invokeInEdtLater(() -> {
+                                    Forge.restart(true);
                                 });
                             }
                         });
-                    }
-                });
+                    });
+                }));
             }
-        });
+        }, null, false, true));
     }
     public static void loadLight(String skinName, final SplashScreen splashScreen,FileHandle prefDir) {
         preferredDir = prefDir;
@@ -96,6 +88,7 @@ public class FSkin {
      *            the skin name
      */
     public static void loadLight(String skinName, final SplashScreen splashScreen) {
+        AssetManager manager = Forge.getAssets(true).manager;
         preferredName = skinName.toLowerCase().replace(' ', '_');
 
         //reset hd buttons/icons
@@ -137,25 +130,25 @@ public class FSkin {
         //load theme logo while changing skins
         final FileHandle theme_logo = getSkinFile("hd_logo.png");
         if (theme_logo.exists()) {
-            Texture txOverlay = new Texture(theme_logo, true);
-            txOverlay.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-            hdLogo = txOverlay;
+            manager.load(theme_logo.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+            manager.finishLoadingAsset(theme_logo.path());
+            hdLogo = manager.get(theme_logo.path());
         } else {
             hdLogo = null;
         }
         final FileHandle duals_overlay = getDefaultSkinFile("overlay_alpha.png");
         if (duals_overlay.exists()) {
-            Texture txAlphaLines = new Texture(duals_overlay, true);
-            txAlphaLines.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-            overlay_alpha = txAlphaLines;
+            manager.load(duals_overlay.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+            manager.finishLoadingAsset(duals_overlay.path());
+            overlay_alpha = manager.get(duals_overlay.path());
         } else {
             overlay_alpha = null;
         }
         final FileHandle splatter_overlay = getDefaultSkinFile("splatter.png");
         if (splatter_overlay.exists()) {
-            Texture txSplatter = new Texture(splatter_overlay, true);
-            txSplatter.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-            splatter = txSplatter;
+            manager.load(splatter_overlay.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+            manager.finishLoadingAsset(splatter_overlay.path());
+            splatter = manager.get(splatter_overlay.path());
         } else {
             splatter = null;
         }
@@ -172,16 +165,17 @@ public class FSkin {
             }
 
             try {
-                Texture txSplash = new Texture(f);
-                final int w = txSplash.getWidth();
-                final int h = txSplash.getHeight();
+                manager.load(f.path(), Texture.class);
+                manager.finishLoadingAsset(f.path());
+                final int w = manager.get(f.path(), Texture.class).getWidth();
+                final int h = manager.get(f.path(), Texture.class).getHeight();
 
                 if (f2.exists()) {
-                    Texture txSplashHD = new Texture(f2, true);
-                    txSplashHD.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    splashScreen.setBackground(new TextureRegion(txSplashHD));
+                    manager.load(f2.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+                    manager.finishLoadingAsset(f2.path());
+                    splashScreen.setBackground(new TextureRegion(manager.get(f2.path(), Texture.class)));
                 } else {
-                    splashScreen.setBackground(new TextureRegion(txSplash, 0, 0, w, h - 100));
+                    splashScreen.setBackground(new TextureRegion(manager.get(f.path(), Texture.class), 0, 0, w, h - 100));
                 }
 
                 Pixmap pxSplash = new Pixmap(f);
@@ -226,9 +220,14 @@ public class FSkin {
         avatars.clear();
         sleeves.clear();
 
-        boolean textureFilter = Forge.isTextureFilteringEnabled();
+        TextureLoader.TextureParameter parameter = new TextureLoader.TextureParameter();
+        if (Forge.isTextureFilteringEnabled()) {
+            parameter.genMipMaps = true;
+            parameter.minFilter = Texture.TextureFilter.MipMapLinearLinear;
+            parameter.magFilter = Texture.TextureFilter.Linear;
+        }
 
-        final Map<String, Texture> textures = new HashMap<>();
+        AssetManager manager = Forge.getAssets(true).manager;
 
         // Grab and test various sprite files.
         final FileHandle f1 = getDefaultSkinFile(SourceFile.ICONS.getFilename());
@@ -255,24 +254,24 @@ public class FSkin {
         */
 
         try {
-            textures.put(f1.path(), new Texture(f1));
+            manager.load(f1.path(), Texture.class);
+            manager.finishLoadingAsset(f1.path());
             Pixmap preferredIcons = new Pixmap(f1);
             if (f2.exists()) {
-                textures.put(f2.path(), new Texture(f2));
+                manager.load(f2.path(), Texture.class);
+                manager.finishLoadingAsset(f2.path());
                 preferredIcons = new Pixmap(f2);
             }
 
-            textures.put(f3.path(), new Texture(f3));
+            manager.load(f3.path(), Texture.class);
+            manager.finishLoadingAsset(f3.path());
             if (f6.exists()) {
-                textures.put(f6.path(), new Texture(f6));
-            }
-            else {
-                textures.put(f6.path(), textures.get(f3.path()));
+                manager.load(f6.path(), Texture.class);
+                manager.finishLoadingAsset(f6.path());
             }
             if (f7.exists()){
-                Texture t = new Texture(f7, true);
-                //t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                textures.put(f7.path(), t);
+                manager.load(f7.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true;}});
+                manager.finishLoadingAsset(f7.path());
             }
 
             //hdbuttons
@@ -280,9 +279,8 @@ public class FSkin {
                 if (GuiBase.isAndroid() && Forge.totalDeviceRAM <5000) {
                     Forge.hdbuttons = false;
                 } else {
-                    Texture t = new Texture(f11, true);
-                    t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    textures.put(f11.path(), t);
+                    manager.load(f11.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+                    manager.finishLoadingAsset(f11.path());
                     Forge.hdbuttons = true;
                 }
             } else { Forge.hdbuttons = false; } //how to refresh buttons when a theme don't have hd buttons?
@@ -290,9 +288,8 @@ public class FSkin {
                 if (GuiBase.isAndroid() && Forge.totalDeviceRAM <5000) {
                     Forge.hdstart = false;
                 } else {
-                    Texture t = new Texture(f12, true);
-                    t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    textures.put(f12.path(), t);
+                    manager.load(f12.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+                    manager.finishLoadingAsset(f12.path());
                     Forge.hdstart = true;
                 }
             } else { Forge.hdstart = false; }
@@ -305,13 +302,13 @@ public class FSkin {
             for (FSkinImage image : FSkinImage.values()) {
                 if (GuiBase.isAndroid()) {
                     if (Forge.totalDeviceRAM>5000)
-                        image.load(textures, preferredIcons);
+                        image.load(manager, preferredIcons);
                     else if (image.toString().equals("HDMULTI"))
-                        image.load(textures, preferredIcons);
+                        image.load(manager, preferredIcons);
                     else if (!image.toString().startsWith("HD"))
-                        image.load(textures, preferredIcons);
+                        image.load(manager, preferredIcons);
                 } else {
-                    image.load(textures, preferredIcons);
+                    image.load(manager, preferredIcons);
                 }
             }
             for (FSkinTexture texture : FSkinTexture.values()) {
@@ -324,23 +321,21 @@ public class FSkin {
             int counter = 0;
             int scount = 0;
             Color pxTest;
-            Pixmap pxDefaultAvatars, pxPreferredAvatars, pxDefaultSleeves, pxCracks;
-            Texture txDefaultAvatars, txPreferredAvatars, txDefaultSleeves, txCracks;
+            Pixmap pxDefaultAvatars, pxPreferredAvatars, pxDefaultSleeves;
 
             pxDefaultAvatars = new Pixmap(f4);
             pxDefaultSleeves = new Pixmap(f8);
-            txDefaultAvatars = new Texture(f4, textureFilter);
-            if (textureFilter)
-                txDefaultAvatars.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-            txDefaultSleeves = new Texture(f8, textureFilter);
-            if (textureFilter)
-                txDefaultSleeves.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-
+            //default avatar
+            manager.load(f4.path(), Texture.class, parameter);
+            manager.finishLoadingAsset(f4.path());
+            //sleeves first set
+            manager.load(f8.path(), Texture.class, parameter);
+            manager.finishLoadingAsset(f8.path());
+            //preferred avatar
             if (f5.exists()) {
                 pxPreferredAvatars = new Pixmap(f5);
-                txPreferredAvatars = new Texture(f5, textureFilter);
-                if (textureFilter)
-                    txPreferredAvatars.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+                manager.load(f5.path(), Texture.class, parameter);
+                manager.finishLoadingAsset(f5.path());
 
                 final int pw = pxPreferredAvatars.getWidth();
                 final int ph = pxPreferredAvatars.getHeight();
@@ -350,7 +345,7 @@ public class FSkin {
                         if (i == 0 && j == 0) { continue; }
                         pxTest = new Color(pxPreferredAvatars.getPixel(i + 50, j + 50));
                         if (pxTest.a == 0) { continue; }
-                        FSkin.avatars.put(counter++, new TextureRegion(txPreferredAvatars, i, j, 100, 100));
+                        FSkin.avatars.put(counter++, new TextureRegion(manager.get(f5.path(), Texture.class), i, j, 100, 100));
                     }
                 }
                 pxPreferredAvatars.dispose();
@@ -365,24 +360,11 @@ public class FSkin {
                         if (i == 0 && j == 0) { continue; }
                         pxTest = new Color(pxDefaultAvatars.getPixel(i + 50, j + 50));
                         if (pxTest.a == 0) { continue; }
-                        FSkin.avatars.put(counter++, new TextureRegion(txDefaultAvatars, i, j, 100, 100));
+                        FSkin.avatars.put(counter++, new TextureRegion(manager.get(f4.path(), Texture.class), i, j, 100, 100));
                     }
                 }
             }
 
-            final int aw = pxDefaultAvatars.getWidth();
-            final int ah = pxDefaultAvatars.getHeight();
-
-            for (int j = 0; j < ah; j += 100) {
-                for (int i = 0; i < aw; i += 100) {
-                    if (i == 0 && j == 0) { continue; }
-                    pxTest = new Color(pxDefaultAvatars.getPixel(i + 50, j + 50));
-                    if (pxTest.a == 0) { continue; }
-                    FSkin.avatars.put(counter++, new TextureRegion(txDefaultAvatars, i, j, 100, 100));
-                }
-            }
-
-
             final int sw = pxDefaultSleeves.getWidth();
             final int sh = pxDefaultSleeves.getHeight();
 
@@ -390,15 +372,14 @@ public class FSkin {
                 for (int i = 0; i < sw; i += 360) {
                     pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
                     if (pxTest.a == 0) { continue; }
-                    FSkin.sleeves.put(scount++, new TextureRegion(txDefaultSleeves, i, j, 360, 500));
+                    FSkin.sleeves.put(scount++, new TextureRegion(manager.get(f8.path(), Texture.class), i, j, 360, 500));
                 }
             }
 
             //re init second set of sleeves
             pxDefaultSleeves = new Pixmap(f9);
-            txDefaultSleeves = new Texture(f9, textureFilter);
-            if (textureFilter)
-                txDefaultSleeves.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+            manager.load(f9.path(), Texture.class, parameter);
+            manager.finishLoadingAsset(f9.path());
 
             final int sw2 = pxDefaultSleeves.getWidth();
             final int sh2 = pxDefaultSleeves.getHeight();
@@ -407,50 +388,47 @@ public class FSkin {
                 for (int i = 0; i < sw2; i += 360) {
                     pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
                     if (pxTest.a == 0) { continue; }
-                    FSkin.sleeves.put(scount++, new TextureRegion(txDefaultSleeves, i, j, 360, 500));
+                    FSkin.sleeves.put(scount++, new TextureRegion(manager.get(f9.path(), Texture.class), i, j, 360, 500));
                 }
             }
             //cracks
-            pxCracks = new Pixmap(f17);
-            txCracks = new Texture(f17, textureFilter);
+            manager.load(f17.path(), Texture.class, parameter);
+            manager.finishLoadingAsset(f17.path());
             int crackCount = 0;
-            if (textureFilter)
-                txCracks.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-
             for (int j = 0; j < 4; j++) {
                 int x = j * 200;
                 for(int i = 0; i < 4; i++) {
                     int y = i * 279;
-                    FSkin.cracks.put(crackCount++, new TextureRegion(txCracks, x, y, 200, 279));
+                    FSkin.cracks.put(crackCount++, new TextureRegion(manager.get(f17.path(), Texture.class), x, y, 200, 279));
                 }
             }
 
             //borders
-            Texture bordersBW = new Texture(f10);
-            FSkin.borders.put(0, new TextureRegion(bordersBW, 2, 2, 672, 936));
-            FSkin.borders.put(1, new TextureRegion(bordersBW, 676, 2, 672, 936));
+            manager.load(f10.path(), Texture.class);
+            manager.finishLoadingAsset(f10.path());
+            FSkin.borders.put(0, new TextureRegion(manager.get(f10.path(), Texture.class), 2, 2, 672, 936));
+            FSkin.borders.put(1, new TextureRegion(manager.get(f10.path(), Texture.class), 676, 2, 672, 936));
             //deckboxes
-            Texture deckboxes = new Texture(f13, textureFilter);
-            if (textureFilter)
-                deckboxes.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+            manager.load(f13.path(), Texture.class, parameter);
+            manager.finishLoadingAsset(f13.path());
             //gold bg
-            FSkin.deckbox.put(0, new TextureRegion(deckboxes, 2, 2, 488, 680));
+            FSkin.deckbox.put(0, new TextureRegion(manager.get(f13.path(), Texture.class), 2, 2, 488, 680));
             //deck box for card art
-            FSkin.deckbox.put(1, new TextureRegion(deckboxes, 492, 2, 488, 680));
+            FSkin.deckbox.put(1, new TextureRegion(manager.get(f13.path(), Texture.class), 492, 2, 488, 680));
             //generic deck box
-            FSkin.deckbox.put(2, new TextureRegion(deckboxes, 982, 2, 488, 680));
+            FSkin.deckbox.put(2, new TextureRegion(manager.get(f13.path(), Texture.class), 982, 2, 488, 680));
             //cursor
-            Texture cursors = new Texture(f19);
-            FSkin.cursor.put(0, new TextureRegion(cursors, 0, 0, 32, 32)); //default
-            FSkin.cursor.put(1, new TextureRegion(cursors, 32, 0, 32, 32)); //magnify on
-            FSkin.cursor.put(2, new TextureRegion(cursors, 64, 0, 32, 32)); // magnify off
+            manager.load(f19.path(), Texture.class);
+            manager.finishLoadingAsset(f19.path());
+            FSkin.cursor.put(0, new TextureRegion(manager.get(f19.path(), Texture.class), 0, 0, 32, 32)); //default
+            FSkin.cursor.put(1, new TextureRegion(manager.get(f19.path(), Texture.class), 32, 0, 32, 32)); //magnify on
+            FSkin.cursor.put(2, new TextureRegion(manager.get(f19.path(), Texture.class), 64, 0, 32, 32)); // magnify off
 
             Forge.setCursor(cursor.get(0), "0");
 
             preferredIcons.dispose();
             pxDefaultAvatars.dispose();
             pxDefaultSleeves.dispose();
-            pxCracks.dispose();
         }
         catch (final Exception e) {
             System.err.println("FSkin$loadFull: Missing a sprite (default icons, "
diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index b685c9b0934..8367c054642 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -3,6 +3,7 @@ package forge.assets;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
@@ -38,7 +39,7 @@ public class FSkinFont {
     private static final int MAX_FONT_SIZE_MANY_GLYPHS = 36;
 
     private static final String TTF_FILE = "font1.ttf";
-    private static final ObjectMap<Integer, FSkinFont> fonts = new ObjectMap<>();
+    private static final HashMap<Integer, FSkinFont> fonts = new HashMap<>();
 
     private static final String commonCharacterSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklm"
             + "nopqrstuvwxyz1234567890\"!?'.,;:()[]{}<>|/@\\^$-%+=#_&*\u2014"
@@ -395,24 +396,34 @@ public class FSkinFont {
             fontName += Forge.locale;
         }
         FileHandle fontFile = Gdx.files.absolute(ForgeConstants.FONTS_DIR + fontName + ".fnt");
+        final boolean[] found = {false};
         if (fontFile != null && fontFile.exists()) {
             final BitmapFontData data = new BitmapFontData(fontFile, false);
+            String finalFontName = fontName;
             FThreads.invokeInEdtNowOrLater(new Runnable() {
                 @Override
                 public void run() { //font must be initialized on UI thread
-                    font = new BitmapFont(data, (TextureRegion)null, true);
+                    try {
+                        font = new BitmapFont(data, (TextureRegion) null, true);
+                        found[0] = true;
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        found[0] = false;
+                    }
                 }
             });
-        } else {
-            if (Forge.locale.equals("zh-CN") || Forge.locale.equals("ja-JP") && !Forge.forcedEnglishonCJKMissing) {
-                String ttfName = Forge.CJK_Font;
-                FileHandle ttfFile = Gdx.files.absolute(ForgeConstants.FONTS_DIR + ttfName + ".ttf");
-                if (ttfFile != null && ttfFile.exists()) {
-                    generateFont(ttfFile, fontName, fontSize);
-                }
-            } else {
-                generateFont(FSkin.getSkinFile(TTF_FILE), fontName, fontSize);
+        }
+        if (found[0])
+            return;
+        //not found generate
+        if (Forge.locale.equals("zh-CN") || Forge.locale.equals("ja-JP") && !Forge.forcedEnglishonCJKMissing) {
+            String ttfName = Forge.CJK_Font;
+            FileHandle ttfFile = Gdx.files.absolute(ForgeConstants.FONTS_DIR + ttfName + ".ttf");
+            if (ttfFile != null && ttfFile.exists()) {
+                generateFont(ttfFile, fontName, fontSize);
             }
+        } else {
+            generateFont(FSkin.getSkinFile(TTF_FILE), fontName, fontSize);
         }
     }
 
diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java
index ce0657935f6..7c4dd86a5a6 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinImage.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java
@@ -1,7 +1,7 @@
 package forge.assets;
 
-import java.util.Map;
-
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.TextureLoader.TextureParameter;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -536,19 +536,22 @@ public enum FSkinImage implements FImage {
         FSkin.getImages().put(skinProp, this);
     }
 
-    public void load(Map<String, Texture> textures, Pixmap preferredIcons) {
+    public void load(AssetManager manager, Pixmap preferredIcons) {
         String filename = sourceFile.getFilename();
         FileHandle preferredFile = FSkin.getSkinFile(filename);
-        Texture texture = textures.get(preferredFile.path());
+        Texture texture = manager.get(preferredFile.path(), Texture.class, false);
         if (texture == null) {
             if (preferredFile.exists()) {
                 try {
-                    if (Forge.isTextureFilteringEnabled()){
-                        texture = new Texture(preferredFile, true);
-                        texture.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    } else {
-                        texture = new Texture(preferredFile);
+                    TextureParameter parameter = new TextureParameter();
+                    if (Forge.isTextureFilteringEnabled()) {
+                        parameter.genMipMaps = true;
+                        parameter.minFilter = Texture.TextureFilter.MipMapLinearLinear;
+                        parameter.magFilter = Texture.TextureFilter.Linear;
                     }
+                    manager.load(preferredFile.path(), Texture.class, parameter);
+                    manager.finishLoadingAsset(preferredFile.path());
+                    texture = manager.get(preferredFile.path(), Texture.class);
                 }
                 catch (final Exception e) {
                     System.err.println("Failed to load skin file: " + preferredFile);
@@ -615,16 +618,19 @@ public enum FSkinImage implements FImage {
 
         //use default file if can't use preferred file
         FileHandle defaultFile = FSkin.getDefaultSkinFile(filename);
-        texture = textures.get(defaultFile.path());
+        texture = manager.get(defaultFile.path(), Texture.class, false);
         if (texture == null) {
             if (defaultFile.exists()) {
                 try {
-                    if (Forge.isTextureFilteringEnabled()){
-                        texture = new Texture(defaultFile, true);
-                        texture.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
-                    } else {
-                        texture = new Texture(defaultFile);
+                    TextureParameter parameter = new TextureParameter();
+                    if (Forge.isTextureFilteringEnabled()) {
+                        parameter.genMipMaps = true;
+                        parameter.minFilter = Texture.TextureFilter.MipMapLinearLinear;
+                        parameter.magFilter = Texture.TextureFilter.Linear;
                     }
+                    manager.load(defaultFile.path(), Texture.class, parameter);
+                    manager.finishLoadingAsset(defaultFile.path());
+                    texture = manager.get(defaultFile.path(), Texture.class);
                 }
                 catch (final Exception e) {
                     System.err.println("Failed to load skin file: " + defaultFile);
diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
index c5998b56e32..26463c2850c 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.Texture.TextureWrap;
 
+import forge.Forge;
 import forge.Graphics;
 import forge.localinstance.properties.ForgeConstants;
 
@@ -127,7 +128,9 @@ public enum FSkinTexture implements FImage {
         FileHandle preferredFile = isPlane ? FSkin.getCachePlanechaseFile(filename) : FSkin.getSkinFile(filename);
         if (preferredFile.exists()) {
             try {
-                texture = new Texture(preferredFile);
+                Forge.getAssets(true).manager.load(preferredFile.path(), Texture.class);
+                Forge.getAssets(true).manager.finishLoadingAsset(preferredFile.path());
+                texture = Forge.getAssets(true).manager.get(preferredFile.path(), Texture.class);
             }
             catch (final Exception e) {
                 System.err.println("Failed to load skin file: " + preferredFile);
@@ -145,7 +148,9 @@ public enum FSkinTexture implements FImage {
 
             if (defaultFile.exists()) {
                 try {
-                    texture = new Texture(defaultFile);
+                    Forge.getAssets(true).manager.load(defaultFile.path(), Texture.class);
+                    Forge.getAssets(true).manager.finishLoadingAsset(defaultFile.path());
+                    texture = Forge.getAssets(true).manager.get(defaultFile.path(), Texture.class);
                 }
                 catch (final Exception e) {
                     System.err.println("Failed to load skin file: " + defaultFile);
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index e5a0bf68d85..fd3159526ff 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -115,10 +115,6 @@ public class ImageCache {
         CardRenderer.clearcardArtCache();
         ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().clear();
     }
-    public static void disposeTextureManager() {
-        ((Forge)Gdx.app.getApplicationListener()).cardAssets.dispose();
-        ((Forge)Gdx.app.getApplicationListener()).otherAssets.dispose();
-    }
 
     public static Texture getImage(InventoryItem ii) {
         String imageKey = ii.getImageKey(false);
@@ -271,17 +267,19 @@ public class ImageCache {
             return null;
         }
         String fileName = file.getPath();
+        //load to assetmanager
+        Forge.getAssets(otherCache).manager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+        Forge.getAssets(otherCache).manager.finishLoadingAsset(fileName);
+        //return loaded assets
         if (otherCache) {
-            ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().finishLoadingAsset(fileName);
-            return ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().get(fileName, Texture.class, false);
+            return Forge.getAssets(true).manager.get(fileName, Texture.class, false);
         } else {
-            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().finishLoadingAsset(fileName);
-            Texture t = ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().get(fileName, Texture.class, false);
+            Texture t = Forge.getAssets(false).manager.get(fileName, Texture.class, false);
+            //if full bordermasking is enabled, update the border color
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
                 updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
+                //if borderless, generate new texture from the asset and store
                 if (borderless) {
                     generatedCards.put(imageKey, generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled()));
                 }
diff --git a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
index dd726980b8e..4fd299a2c4d 100644
--- a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
+++ b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
@@ -59,11 +59,17 @@ public class LoadingOverlay extends FOverlay {
     }
 
     private String caption;
+    private boolean textMode = false;
 
     public LoadingOverlay(String caption0) {
         caption = caption0;
     }
 
+    public LoadingOverlay(String caption0, boolean textOnly) {
+        caption = caption0;
+        textMode = textOnly;
+    }
+
     public void setCaption(String caption0) {
         caption = caption0;
     }
@@ -79,34 +85,38 @@ public class LoadingOverlay extends FOverlay {
 
     @Override
     public void drawOverlay(Graphics g) {
-        float x = INSETS;
-        float panelWidth = getWidth() - 2 * INSETS;
+        if (!textMode) {
+            float x = INSETS;
+            float panelWidth = getWidth() - 2 * INSETS;
 
-        if (Forge.isLandscapeMode()) {
-            panelWidth = getHeight() - 2 * INSETS;
-            x = (getWidth() - panelWidth) / 2;
+            if (Forge.isLandscapeMode()) {
+                panelWidth = getHeight() - 2 * INSETS;
+                x = (getWidth() - panelWidth) / 2;
+            }
+
+            float padding = panelWidth * INSETS_FACTOR;
+            float logoSize = panelWidth * LOGO_SIZE_FACTOR;
+            float fontHeight = FONT.getCapHeight();
+            float panelHeight = logoSize + fontHeight + 4 * padding;
+
+            float y = (getHeight() - panelHeight) / 2;
+            float oldAlpha = g.getfloatAlphaComposite();
+            //dark translucent back..
+            g.setAlphaComposite(0.6f);
+            g.fillRect(Color.BLACK, 0, 0, getWidth(), getHeight());
+            g.setAlphaComposite(oldAlpha);
+            //overlay
+            g.fillRect(BACK_COLOR, x, y, panelWidth, panelHeight);
+            g.drawRect(Utils.scale(2), FORE_COLOR, x, y, panelWidth, panelHeight);
+            y += padding;
+            if (FSkin.hdLogo == null)
+                g.drawImage(FSkinImage.LOGO, (getWidth() - logoSize) / 2f, y, logoSize, logoSize);
+            else
+                g.drawImage(FSkin.hdLogo, (getWidth() - logoSize) / 2f, y, logoSize, logoSize);
+            y += logoSize + padding;
+            g.drawText(caption, FONT, FORE_COLOR, x, y, panelWidth, getHeight(), false, Align.center, false);
+        } else {
+            g.drawText(caption, FONT, FORE_COLOR, 0, 0, getWidth(), getHeight(), true, Align.center, true);
         }
-
-        float padding = panelWidth * INSETS_FACTOR;
-        float logoSize = panelWidth * LOGO_SIZE_FACTOR;
-        float fontHeight = FONT.getCapHeight();
-        float panelHeight = logoSize + fontHeight + 4 * padding;
-
-        float y = (getHeight() - panelHeight) / 2;
-        float oldAlpha = g.getfloatAlphaComposite();
-        //dark translucent back..
-        g.setAlphaComposite(0.6f);
-        g.fillRect(Color.BLACK, 0, 0, getWidth(), getHeight());
-        g.setAlphaComposite(oldAlpha);
-        //overlay
-        g.fillRect(BACK_COLOR, x, y, panelWidth, panelHeight);
-        g.drawRect(Utils.scale(2), FORE_COLOR, x, y, panelWidth, panelHeight);
-        y += padding;
-        if (FSkin.hdLogo == null)
-            g.drawImage(FSkinImage.LOGO, (getWidth() - logoSize) / 2f, y, logoSize, logoSize);
-        else
-            g.drawImage(FSkin.hdLogo, (getWidth() - logoSize) / 2f, y, logoSize, logoSize);
-        y += logoSize + padding;
-        g.drawText(caption, FONT, FORE_COLOR, x, y, panelWidth, getHeight(), false, Align.center, false);
     }
 }
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 67a336c0e72..9edcb5f56ae 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -2849,6 +2849,7 @@ lblNewVersionAvailable=Neue Version vorhanden
 lblNewVersionDownloading=Lade neue Version...
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge wurde heruntergeladen. Du solltest die Datei entpacken und Forge neu starten.
 lblExitNowConfirm=Jetzt verlassen?
+lblRestartInFewSeconds=Forge wird nach ein paar Sekunden neu starten ...
 #OnlineChatScreen.java
 lblEnterMessageToSend=Nachricht zum Senden eingeben
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index 3ba883d2e4e..cd3d95cc229 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -2852,6 +2852,7 @@ lblNewVersionAvailable=New Version Available
 lblNewVersionDownloading=Download the new version..
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge has been downloaded. You should extract the package and restart Forge for the new version.
 lblExitNowConfirm=Exit now?
+lblRestartInFewSeconds=Forge will restart after a few seconds...
 #OnlineChatScreen.java
 lblEnterMessageToSend=Enter message to send
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 7685e776e20..6d9c08b0e81 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -2852,6 +2852,7 @@ lblNewVersionAvailable=Nueva versión disponible
 lblNewVersionDownloading=Descarga la nueva versión ...
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge se ha descargado. Extrae el fichero y reinicia Forge para cargar la nueva versión.
 lblExitNowConfirm=¿Salir ahora?
+lblRestartInFewSeconds=Forge se reiniciará después de unos segundos ...
 #OnlineChatScreen.java
 lblEnterMessageToSend=Introduce el mensaje a enviar
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index d2a3fd593e8..c4e9cadf3b4 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -2855,6 +2855,7 @@ lblNewVersionAvailable=Nuova versione disponibile
 lblNewVersionDownloading=Scaricamento nuova versione...
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge è stato scaricato. Devi estrarre i dati dal file compresso e riavviare Forge.
 lblExitNowConfirm=Vuoi uscire ora?
+lblRestartInFewSeconds=Forge si riavvierà dopo pochi secondi ...
 #OnlineChatScreen.java
 lblEnterMessageToSend=Inserisci il messaggio da inviare
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index 53658cf56b2..406f7c2f50a 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -2851,6 +2851,7 @@ lblNewVersionAvailable=新しいバージョンを見つかりました
 lblNewVersionDownloading=新しいバージョンをダウンロード中...
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge のダウンロードが完了しました。パッケージを解凍して Forge を再起動してください。
 lblExitNowConfirm=終了しますか？
+lblRestartInFewSeconds=Forge は数秒後に再起動します...
 #OnlineChatScreen.java
 lblEnterMessageToSend=送るメッセージを入力
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 065c3d9cf4a..6b46663718e 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -2941,6 +2941,7 @@ lblNewVersionAvailable=Nova Versão Disponível
 lblNewVersionDownloading=Baixar a nova versão..
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=O Forge foi baixado. Você deve extrair o pacote e reiniciar o Forge para a nova versão.
 lblExitNowConfirm=Sair agora?
+lblRestartInFewSeconds=Forge irá reiniciar depois de alguns segundos ...
 #OnlineChatScreen.java
 lblEnterMessageToSend=Digite a mensagem a enviar
 #OnlineLobbyScreen.java
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index e01e530a1aa..1f1b3423eb4 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -2834,6 +2834,7 @@ lblNewVersionAvailable=有新版本可用
 lblNewVersionDownloading=下载新版本中
 lblForgeHasBeenUpdateRestartForgeToUseNewVersion=Forge已经下载好。你应该解压压缩包并使用新版本的Forge重启游戏。
 lblExitNowConfirm=现在退出吗？
+lblRestartInFewSeconds=Forge 将在几秒钟后重新启动...
 #OnlineChatScreen.java
 lblEnterMessageToSend=输入要发送的信息
 #OnlineLobbyScreen.java

From acea266dc09af678175328ce72427f0206d4ee55 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 7 Jul 2022 21:27:13 +0800
Subject: [PATCH 196/309] remove extra entries

---
 forge-gui-mobile/src/forge/Forge.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index a3fe58024f8..7267170a25b 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -222,7 +222,7 @@ public class Forge implements ApplicationListener {
         //load model on background thread (using progress bar to report progress)
         FThreads.invokeInBackgroundThread(() -> {
             //see if app or assets need updating
-            AssetsDownloader.checkForUpdates(splashScreen, enableSentry, locale);
+            AssetsDownloader.checkForUpdates(splashScreen);
             if (exited) {
                 return;
             } //don't continue if user chose to exit or couldn't download required assets

From 8e4cca7fe881b287b7ae42053aaad28ab2d4668c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 7 Jul 2022 21:37:05 +0800
Subject: [PATCH 197/309] Update ImageCache.java

---
 forge-gui-mobile/src/forge/assets/ImageCache.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index fd3159526ff..7c45beb4155 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -113,7 +113,7 @@ public class ImageCache {
     }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
-        ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().clear();
+        Forge.getAssets(false).manager.clear();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -254,15 +254,14 @@ public class ImageCache {
             return null;
         if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
             return generatedCards.get(imageKey);
-        return otherCache ? ((Forge)Gdx.app.getApplicationListener()).otherAssets.manager().get(file.getPath(), Texture.class, false)
-                : ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().get(file.getPath(), Texture.class, false);
+        return Forge.getAssets(otherCache).manager.get(file.getPath(), Texture.class, false);
     }
     static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
-        if (!otherCache && ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().getLoadedAssets() > maxCardCapacity) {
+        if (!otherCache && Forge.getAssets(false).manager.getLoadedAssets() > maxCardCapacity) {
             //when maxCardCapacity is reached, clear to refresh
-            ((Forge)Gdx.app.getApplicationListener()).cardAssets.manager().clear();
+            Forge.getAssets(false).manager.clear();
             CardRenderer.clearcardArtCache();
             return null;
         }

From 6fd49d8bdf12ad1b93fa590ab4641013887bfaba Mon Sep 17 00:00:00 2001
From: squee1968 <105706641+squee1968@users.noreply.github.com>
Date: Thu, 7 Jul 2022 09:24:57 -0500
Subject: [PATCH 198/309] Moonshae Pixie & Myrkul's Edict (#1048)

* Moonshae Pixie & Myrkul's Edict

-closes #899
-closes #902

* Update moonshae_pixie.txt

* Update myrkuls_edict.txt
---
 .../cardsfolder/upcoming/moonshae_pixie.txt   | 19 +++++++++++++++++++
 .../cardsfolder/upcoming/myrkuls_edict.txt    | 14 ++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt b/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
new file mode 100644
index 00000000000..7e1365cf04c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
@@ -0,0 +1,19 @@
+Name:Moonshae Pixie
+ManaCost:3 U
+Types:Creature Faerie
+PT:2/2
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw cards equal to the number of opponents who were dealt combat damage this turn.
+SVar:TrigDraw:AB$ Draw | NumCards$ X
+SVar:X:PlayerCountRegisteredOpponents$HasPropertywasDealtCombatDamageThisTurn
+AlternateMode:Adventure
+Oracle:Flying\nWhen Moonshae Pixie enters the battlefield, draw cards equal to the number of opponents who were dealt combat damage this turn.
+
+ALTERNATE
+
+Name:Pixie Dust
+ManaCost:1 U
+Types:Instant Adventure
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 3 | KW$ Flying | ValidTgts$ Creature | TgtPrompt$ Select up to three target creatures | SpellDescription$ Up to three target creatures gain flying until end of turn.
+SVar:PlayMain1:TRUE
+Oracle:Up to three target creatures gain flying until end of turn. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt b/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt
new file mode 100644
index 00000000000..510104f75bf
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt
@@ -0,0 +1,14 @@
+Name:Myrkul's Edict
+ManaCost:1 B
+Types:Sorcery
+A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:OneOppSac,10-19:EachOppSac,20:SacTopPower | SpellDescription$ Roll a d20.
+SVar:OneOppSac:ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Choose an opponent. That player sacrifices a creature.
+SVar:DBSac:DB$ Sacrifice | Defined$ Chosen | SacValid$ Creature | SubAbility$ DBCleanupChosen
+SVar:EachOppSac:DB$ Sacrifice | Defined$ Player.Opponent | SacValid$ Creature | StackDescription$ SpellDescription | SpellDescription$ 10—19 VERT Each opponent sacrifices a creature.
+SVar:SacTopPower:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard | SubAbility$ DBSacAll | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Each opponent sacrifices a creature with the greatest power among creatures that player controls.
+SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | ChoiceTitle$ Choose a creature you control with the greatest power | Mandatory$ True | RememberChosen$ True
+SVar:DBSacAll:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup
+SVar:DBCleanupChosen:DB$ Cleanup | ClearChosenPlayer$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:NeedsToPlay:Creature.OppCtrl
+Oracle:Roll a d20.\n1—9 | Choose an opponent. That player sacrifices a creature.\n10—19 | Each opponent sacrifices a creature.\n20 | Each opponent sacrifices a creature with the greatest power among creatures that player controls.

From 8d1b96df5a6497811f82e3b0248cb9c9c319f380 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:16:17 -0500
Subject: [PATCH 199/309] Add files via upload

---
 Gluntch, the Bestower.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Gluntch, the Bestower.txt

diff --git a/Gluntch, the Bestower.txt b/Gluntch, the Bestower.txt
new file mode 100644
index 00000000000..0424a24c616
--- /dev/null
+++ b/Gluntch, the Bestower.txt	
@@ -0,0 +1,15 @@
+Name:Gluntch, the Bestower
+ManaCost:1 G W
+Types:Creature Jellyfish
+PT:0/5
+K:Flying
+SVar:X:PlayerCountPlayers$Amount
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
+SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$Counters
+SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$TrigChoosePlayer2
+SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$Card
+SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$TrigChoosePlayer3
+SVar:TrigChoosePlayer3:DB$ ChoosePlayer | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to create two Treasure tokens | SubAbility$Tokens
+SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$CleanupFinal
+SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
+Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file

From 3ab9289b336b2b16d0037bfdcf4a4cd9b0540d2d Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:21:35 -0500
Subject: [PATCH 200/309] Add files via upload

---
 Wilson Refined Grizzly.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Wilson Refined Grizzly.txt

diff --git a/Wilson Refined Grizzly.txt b/Wilson Refined Grizzly.txt
new file mode 100644
index 00000000000..aab7aefedf7
--- /dev/null
+++ b/Wilson Refined Grizzly.txt	
@@ -0,0 +1,11 @@
+Name:Wilson, Refined Grizzly
+ManaCost:1 G
+Types:Legendary Creature Bear Warrior
+PT:2/2
+K:This spell can't be countered.
+K:Vigilance
+K:Reach
+K:Trample
+K:Ward:2
+K:Choose a Background
+Oracle:This spell can't be countered.\nVigilance, reach, trample\nWard {2}\nChoose a Background

From 7bda8790abcb8ee8756e4ee3f9ff02dc17bc5d0c Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Tue, 5 Jul 2022 19:11:22 -0400
Subject: [PATCH 201/309] deep_gnome_terramancer.txt

---
 .../res/cardsfolder/upcoming/deep_gnome_terramancer.txt  | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/deep_gnome_terramancer.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/deep_gnome_terramancer.txt b/forge-gui/res/cardsfolder/upcoming/deep_gnome_terramancer.txt
new file mode 100644
index 00000000000..e013dd8dbd7
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/deep_gnome_terramancer.txt
@@ -0,0 +1,9 @@
+Name:Deep Gnome Terramancer
+ManaCost:1 W
+Types:Creature Gnome Wizard
+PT:2/2
+K:Flash
+T:Mode$ ChangesZoneAll | ValidCards$ Land.OppCtrl | ValidCause$ !LandAbility | Destination$ Battlefield | TriggerZones$ Battlefield | ActivationLimit$ 1 | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ Mold Earth — Whenever one or more lands enter the battlefield under an opponent's control without being played, you may search your library for a Plains card, put it onto the battlefield tapped, then shuffle. Do this only once each turn.
+SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.Plains | ChangeNum$ 1 | ShuffleNonMandatory$ True
+AI:RemoveDeck:Random
+Oracle:Flash\nMold Earth — Whenever one or more lands enter the battlefield under an opponent's control without being played, you may search your library for a Plains card, put it onto the battlefield tapped, then shuffle. Do this only once each turn.

From 0526e91444e587d211466b2fc55f839f0a1f113b Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Thu, 7 Jul 2022 11:32:50 -0400
Subject: [PATCH 202/309] SpellAbility.isValid add LandAbility, support !
 prefix

---
 .../forge/game/spellability/SpellAbility.java | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

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 8efe6869c98..ab9d7fc1426 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -2045,41 +2045,52 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
         final String[] incR = restriction.split("\\.", 2);
         SpellAbility root = getRootAbility();
 
+        boolean testFailed = false;
+        if (incR[0].startsWith("!")) {
+            testFailed = true; // a bit counterintuitive
+            incR[0] = incR[0].substring(1); // consume negation sign
+        }
+
         if (incR[0].equals("Spell")) {
             if (!root.isSpell()) {
-                return false;
+                return testFailed;
             }
         }
         else if (incR[0].equals("Instant")) {
             if (!root.getCardState().getType().isInstant()) {
-                return false;
+                return testFailed;
             }
         }
         else if (incR[0].equals("Sorcery")) {
             if (!root.getCardState().getType().isSorcery()) {
-                return false;
+                return testFailed;
             }
         }
         else if (incR[0].equals("Triggered")) {
             if (!root.isTrigger()) {
-                return false;
+                return testFailed;
             }
         }
         else if (incR[0].equals("Activated")) {
             if (!root.isActivatedAbility()) {
-                return false;
+                return testFailed;
             }
         }
         else if (incR[0].equals("Static")) {
             if (!(root instanceof AbilityStatic)) {
-                return false;
+                return testFailed;
+            }
+        }
+        else if (incR[0].contains("LandAbility")) {
+            if (!(root instanceof LandAbility)) {
+                return testFailed;
             }
         }
         else if (incR[0].equals("SpellAbility")) {
             // Match anything
         }
         else { //not a spell/ability type
-            return false;
+            return testFailed;
         }
 
         if (incR.length > 1) {
@@ -2087,11 +2098,11 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             final String[] exR = excR.split("\\+"); // Exclusive Restrictions are ...
             for (int j = 0; j < exR.length; j++) {
                 if (!hasProperty(exR[j], sourceController, source, spellAbility)) {
-                    return false;
+                    return testFailed;
                 }
             }
         }
-        return true;
+        return !testFailed;
     }
 
     // Takes arguments like Blue or withFlying

From 6d2f016276a6806f6ab667b078a23281b9b5ed13 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 10:56:47 -0500
Subject: [PATCH 203/309] Add files via upload

---
 Gluntch, the Bestower.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gluntch, the Bestower.txt b/Gluntch, the Bestower.txt
index 0424a24c616..879e52f0a32 100644
--- a/Gluntch, the Bestower.txt	
+++ b/Gluntch, the Bestower.txt	
@@ -3,13 +3,14 @@ ManaCost:1 G W
 Types:Creature Jellyfish
 PT:0/5
 K:Flying
-SVar:X:PlayerCountPlayers$Amount
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
-SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$Counters
+SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$ Counters
 SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$TrigChoosePlayer2
-SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$Card
+SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$ Card
 SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$TrigChoosePlayer3
 SVar:TrigChoosePlayer3:DB$ ChoosePlayer | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to create two Treasure tokens | SubAbility$Tokens
-SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$CleanupFinal
+SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$ CleanupFinal
+SVar:X:PlayerCountPlayers$Amount
 SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters|Token|Sacrifice & Type$Treasure|Artifact
 Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file

From b57d935674c2eac371dc6befb65c6c973dc7887e Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Thu, 7 Jul 2022 12:16:22 -0400
Subject: [PATCH 204/309] PhaseHandler set Cause to sa for
 triggerChangesZoneAll

---
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0dd761bb918..8ab507529ac 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -1064,7 +1064,7 @@ public class PhaseHandler implements java.io.Serializable {
                             // currently there can be only one Spell put on the Stack at once, or Land Abilities be played
                             final CardZoneTable triggerList = new CardZoneTable();
                             triggerList.put(originZone.getZoneType(), currentZone.getZoneType(), saHost);
-                            triggerList.triggerChangesZoneAll(game, null);
+                            triggerList.triggerChangesZoneAll(game, sa);
                         }
 
                     }

From 2d865269983856dfddedb4b3e04a34c64ede8630 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 11:29:18 -0500
Subject: [PATCH 205/309] Add files via upload

---
 Wilson Refined Grizzly.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wilson Refined Grizzly.txt b/Wilson Refined Grizzly.txt
index aab7aefedf7..7b9d7c9ac5f 100644
--- a/Wilson Refined Grizzly.txt	
+++ b/Wilson Refined Grizzly.txt	
@@ -8,4 +8,4 @@ K:Reach
 K:Trample
 K:Ward:2
 K:Choose a Background
-Oracle:This spell can't be countered.\nVigilance, reach, trample\nWard {2}\nChoose a Background
+Oracle:This spell can't be countered.\nVigilance, reach, trample\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.\nChoose a Background (You can have a Background as a second commander.)

From ba236597ad01aa9156ab25d34d2ec692c3f39bd0 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Thu, 7 Jul 2022 18:59:28 +0100
Subject: [PATCH 206/309] Move and rename Wilson

---
 .../upcoming/wilson_refined_grizzly.txt       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
 rename Wilson Refined Grizzly.txt => forge-gui/res/cardsfolder/upcoming/wilson_refined_grizzly.txt (97%)

diff --git a/Wilson Refined Grizzly.txt b/forge-gui/res/cardsfolder/upcoming/wilson_refined_grizzly.txt
similarity index 97%
rename from Wilson Refined Grizzly.txt
rename to forge-gui/res/cardsfolder/upcoming/wilson_refined_grizzly.txt
index 7b9d7c9ac5f..73bc7b7d2f8 100644
--- a/Wilson Refined Grizzly.txt	
+++ b/forge-gui/res/cardsfolder/upcoming/wilson_refined_grizzly.txt
@@ -1,11 +1,11 @@
-Name:Wilson, Refined Grizzly
-ManaCost:1 G
-Types:Legendary Creature Bear Warrior
-PT:2/2
-K:This spell can't be countered.
-K:Vigilance
-K:Reach
-K:Trample
-K:Ward:2
-K:Choose a Background
-Oracle:This spell can't be countered.\nVigilance, reach, trample\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.\nChoose a Background (You can have a Background as a second commander.)
+Name:Wilson, Refined Grizzly
+ManaCost:1 G
+Types:Legendary Creature Bear Warrior
+PT:2/2
+K:This spell can't be countered.
+K:Vigilance
+K:Reach
+K:Trample
+K:Ward:2
+K:Choose a Background
+Oracle:This spell can't be countered.\nVigilance, reach, trample\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.\nChoose a Background (You can have a Background as a second commander.)

From 2133a6782b77f344b6df5c93f28c126016e7c982 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 13:04:54 -0500
Subject: [PATCH 207/309] Add files via upload

---
 .../upcoming/Gluntch, the Bestower.txt           | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt b/forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt
new file mode 100644
index 00000000000..879e52f0a32
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt	
@@ -0,0 +1,16 @@
+Name:Gluntch, the Bestower
+ManaCost:1 G W
+Types:Creature Jellyfish
+PT:0/5
+K:Flying
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
+SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$ Counters
+SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$TrigChoosePlayer2
+SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$ Card
+SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$TrigChoosePlayer3
+SVar:TrigChoosePlayer3:DB$ ChoosePlayer | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to create two Treasure tokens | SubAbility$Tokens
+SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$ CleanupFinal
+SVar:X:PlayerCountPlayers$Amount
+SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters|Token|Sacrifice & Type$Treasure|Artifact
+Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file

From a895c8c059101c18acde7f284f8cf7b8a7f8506f Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 7 Jul 2022 18:27:55 +0000
Subject: [PATCH 208/309] Delete Gluntch, the Bestower.txt

---
 Gluntch, the Bestower.txt | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 Gluntch, the Bestower.txt

diff --git a/Gluntch, the Bestower.txt b/Gluntch, the Bestower.txt
deleted file mode 100644
index 879e52f0a32..00000000000
--- a/Gluntch, the Bestower.txt	
+++ /dev/null
@@ -1,16 +0,0 @@
-Name:Gluntch, the Bestower
-ManaCost:1 G W
-Types:Creature Jellyfish
-PT:0/5
-K:Flying
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
-SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$ Counters
-SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$TrigChoosePlayer2
-SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$ Card
-SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$TrigChoosePlayer3
-SVar:TrigChoosePlayer3:DB$ ChoosePlayer | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to create two Treasure tokens | SubAbility$Tokens
-SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$ CleanupFinal
-SVar:X:PlayerCountPlayers$Amount
-SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Counters|Token|Sacrifice & Type$Treasure|Artifact
-Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file

From b01fe99954207da36726026d99a07155bbbf1a6d Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 7 Jul 2022 18:28:32 +0000
Subject: [PATCH 209/309] Rename Gluntch, the Bestower.txt to gluntch, the
 Bestower.txt

---
 .../{Gluntch, the Bestower.txt => gluntch, the Bestower.txt}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename forge-gui/res/cardsfolder/upcoming/{Gluntch, the Bestower.txt => gluntch, the Bestower.txt} (97%)

diff --git a/forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt b/forge-gui/res/cardsfolder/upcoming/gluntch, the Bestower.txt
similarity index 97%
rename from forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt
rename to forge-gui/res/cardsfolder/upcoming/gluntch, the Bestower.txt
index 879e52f0a32..59efba9b2ac 100644
--- a/forge-gui/res/cardsfolder/upcoming/Gluntch, the Bestower.txt	
+++ b/forge-gui/res/cardsfolder/upcoming/gluntch, the Bestower.txt	
@@ -13,4 +13,4 @@ SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defi
 SVar:X:PlayerCountPlayers$Amount
 SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters|Token|Sacrifice & Type$Treasure|Artifact
-Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file
+Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.

From 929114dc161d684cf60e910b09c190cf5d561b91 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 7 Jul 2022 18:29:14 +0000
Subject: [PATCH 210/309] Rename gluntch, the Bestower.txt to
 gluntch_the_bestower.txt

---
 .../{gluntch, the Bestower.txt => gluntch_the_bestower.txt}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename forge-gui/res/cardsfolder/upcoming/{gluntch, the Bestower.txt => gluntch_the_bestower.txt} (100%)

diff --git a/forge-gui/res/cardsfolder/upcoming/gluntch, the Bestower.txt b/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/upcoming/gluntch, the Bestower.txt
rename to forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt

From 24587febf2f645ac451c80ecb3deec2253335656 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 7 Jul 2022 18:33:06 +0000
Subject: [PATCH 211/309] Update gluntch_the_bestower.txt

---
 forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt b/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
index 59efba9b2ac..dc9a26e6d7d 100644
--- a/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
@@ -5,9 +5,9 @@ PT:0/5
 K:Flying
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
 SVar:TrigChoosePlayer1:DB$ ChoosePlayer | Defined$ You | Choices$ Player | RememberChosen$ True | ChoiceTitle$ Choose a player to put two +1/+1 counters on a creature they control | SubAbility$ Counters
-SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$TrigChoosePlayer2
+SVar:Counters:DB$ PutCounter | Defined$ ChosenPlayer | Choices$ Creature.ControlledBy ChosenPlayer | ChoiceTitle$ Choose a creature you control | Chooser$ ChosenPlayer | Placer$ ChosenPlayer | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ TrigChoosePlayer2
 SVar:TrigChoosePlayer2:DB$ ChoosePlayer | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to draw a card | SubAbility$ Card
-SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$TrigChoosePlayer3
+SVar:Card:DB$ Draw | Defined$ ChosenPlayer | SubAbility$ TrigChoosePlayer3
 SVar:TrigChoosePlayer3:DB$ ChoosePlayer | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ You | Choices$ Player.IsNotRemembered | RememberChosen$ True | ChoiceTitle$ Choose a player to create two Treasure tokens | SubAbility$Tokens
 SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defined$ ChosenPlayer | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ ChosenPlayer | SubAbility$ CleanupFinal
 SVar:X:PlayerCountPlayers$Amount

From 3b342583024e6956d8a4215b8fe38dbfe0eca837 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:47:58 -0500
Subject: [PATCH 212/309] Update CONTRIBUTORS.txt

---
 forge-gui/release-files/CONTRIBUTORS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/release-files/CONTRIBUTORS.txt b/forge-gui/release-files/CONTRIBUTORS.txt
index 863dbaa699d..8c948dd7771 100644
--- a/forge-gui/release-files/CONTRIBUTORS.txt
+++ b/forge-gui/release-files/CONTRIBUTORS.txt
@@ -28,6 +28,7 @@ Magpie
 Marek14
 Marvel
 mcrawford
+mctubbies
 medusa
 Meerkov
 Monkey Gland Sauce

From 599ad6980d1d436cafed61ea618d0a9865c58d74 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Thu, 7 Jul 2022 21:11:10 +0100
Subject: [PATCH 213/309] SLD Fortnite update

---
 forge-gui/res/editions/Secret Lair Drop Series.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/forge-gui/res/editions/Secret Lair Drop Series.txt b/forge-gui/res/editions/Secret Lair Drop Series.txt
index 00f51473af8..104b149d570 100644
--- a/forge-gui/res/editions/Secret Lair Drop Series.txt	
+++ b/forge-gui/res/editions/Secret Lair Drop Series.txt	
@@ -413,6 +413,18 @@ ScryfallCode=SLD
 438 R Howltooth Hollow @Shie Nanahara
 439 R Spinerock Knoll @Nagano
 440 R Mosswort Bridge @Maiko Aoji
+441 R Wrath of God @Kevin Gnutzmans
+442 R Dance of Many @Caroline Gariba
+443 R Etherium Sculptor @Rudy Siswanto
+444 M Grim Tutor @Roberto Gatto
+445 R Triumph of the Hordes @Felipe Martini
+446 R Smuggler's Copter @Brandon L Hunt
+447 M Planar Bridge @Alexandre Leoni
+448 R Plains @Alexander Kintner
+449 R Island @Roberto Gatto
+450 R Swamp @Kevin Gnutzmans
+451 R Mountain @Alexander Kintner
+452 R Forest @Roberto Gatto
 453 M Atraxa, Praetors' Voice @Tom Roberts
 454 M Breya, Etherium Shaper @Julie Dillon
 455 M Yidris, Maelstrom Wielder @Krharts

From 80472b27f7e01914855e44ecef35564e30dc558f Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Thu, 7 Jul 2022 19:09:55 -0400
Subject: [PATCH 214/309] Added DeckHints

---
 forge-gui/release-files/CONTRIBUTORS.txt                | 1 +
 forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/forge-gui/release-files/CONTRIBUTORS.txt b/forge-gui/release-files/CONTRIBUTORS.txt
index 863dbaa699d..13a02623a39 100644
--- a/forge-gui/release-files/CONTRIBUTORS.txt
+++ b/forge-gui/release-files/CONTRIBUTORS.txt
@@ -60,5 +60,6 @@ twosat
 Xyx
 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/cardsfolder/upcoming/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
index f27a9415ddd..8751788d632 100644
--- a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
@@ -11,4 +11,5 @@ SVar:DBCastWithoutPayingManaCost:DB$ Play | Valid$ Card.Self | ValidSA$ Spell |
 SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | ConditionDefined$ Self | ConditionPresent$ Card.Creature | PumpZone$ Stack
 SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
+DeckHints:Keyword$Suspend
 Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.

From fed4ab99c139f108fd3daf510f721336bd397781 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 8 Jul 2022 11:04:53 +0800
Subject: [PATCH 215/309] add EvictingQueue for loaded images -use the Queue as
 reference for removing old entries on the AssetManager -fix cardArtCache
 storing forgeArt, should fix missing cardArt

---
 .../src/forge/assets/ImageCache.java          | 31 +++++++++++++++++--
 .../src/forge/card/CardRenderer.java          | 13 +++++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 7c45beb4155..66e6f6da2de 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -19,7 +19,10 @@ package forge.assets;
 
 import java.io.File;
 import java.util.List;
+import java.util.Queue;
+import java.util.Set;
 
+import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.TextureLoader.TextureParameter;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Pixmap;
@@ -27,6 +30,9 @@ import com.badlogic.gdx.graphics.TextureData;
 import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.ObjectSet;
+import com.google.common.collect.EvictingQueue;
+import com.google.common.collect.Queues;
+import com.google.common.collect.Sets;
 import forge.gui.FThreads;
 import forge.util.FileUtil;
 import forge.util.TextUtil;
@@ -71,6 +77,8 @@ public class ImageCache {
     private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
     private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
+    static EvictingQueue<String> q;
+    static Queue<String> syncQ;
     static TextureParameter defaultParameter = new TextureParameter();
     static TextureParameter filtered = new TextureParameter();
     public static void initCache(int capacity) {
@@ -80,6 +88,10 @@ public class ImageCache {
         filtered.magFilter = Texture.TextureFilter.Linear;
         //override maxCardCapacity
         maxCardCapacity = capacity;
+        //init q
+        q = EvictingQueue.create(capacity);
+        //init syncQ for threadsafe use
+        syncQ = Queues.synchronizedQueue(q);
     }
     public static final Texture defaultImage;
     public static FImage BlackBorder = FSkinImage.IMG_BORDER_BLACK;
@@ -259,10 +271,9 @@ public class ImageCache {
     static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
+        syncQ.add(file.getPath());
         if (!otherCache && Forge.getAssets(false).manager.getLoadedAssets() > maxCardCapacity) {
-            //when maxCardCapacity is reached, clear to refresh
-            Forge.getAssets(false).manager.clear();
-            CardRenderer.clearcardArtCache();
+            unloadCardTextures(Forge.getAssets(false).manager);
             return null;
         }
         String fileName = file.getPath();
@@ -286,6 +297,20 @@ public class ImageCache {
             return t;
         }
     }
+    static void unloadCardTextures(AssetManager manager) {
+        //get latest images from syncQ
+        Set<String> newQ = Sets.newHashSet(syncQ);
+        //get loaded images from assetmanager
+        Set<String> old = Sets.newHashSet(manager.getAssetNames());
+        //get all images not in newQ (old images to unload)
+        Set<String> toUnload = Sets.difference(old, newQ);
+        //unload from assetmanager to save RAM
+        for (String asset : toUnload) {
+            manager.unload(asset);
+        }
+        //clear cachedArt since this is dependant to the loaded texture
+        CardRenderer.clearcardArtCache();
+    }
     public static void preloadCache(Iterable<String> keys) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
             return;
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index 412371e8254..a9d53f9f142 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -304,7 +304,8 @@ public class CardRenderer {
                     }
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
                 }
-                cardArtCache.put(imageKey, cardArt);
+                if (!CardImageRenderer.forgeArt.equals(cardArt))
+                    cardArtCache.put(imageKey, cardArt);
             }
         }
         //fix display for effect
@@ -339,7 +340,8 @@ public class CardRenderer {
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
 
                 }
-                cardArtCache.put("Aftermath_second_"+imageKey, cardArt);
+                if (!CardImageRenderer.forgeArt.equals(cardArt))
+                    cardArtCache.put("Aftermath_second_"+imageKey, cardArt);
             }
         }
         return cardArt;
@@ -385,7 +387,8 @@ public class CardRenderer {
                     }
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
                 }
-                cardArtCache.put("Alternate_"+imageKey, cardArt);
+                if (!CardImageRenderer.forgeArt.equals(cardArt))
+                    cardArtCache.put("Alternate_"+imageKey, cardArt);
             }
         }
         return cardArt;
@@ -419,9 +422,9 @@ public class CardRenderer {
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
 
                 }
-                if (!bottom)
+                if (!bottom && !CardImageRenderer.forgeArt.equals(cardArt))
                     cardArtCache.put("Meld_primary_"+imageKey, cardArt);
-                else
+                else if (!CardImageRenderer.forgeArt.equals(cardArt))
                     cardArtCache.put("Meld_secondary_"+imageKey, cardArt);
             }
         }

From 6bd5ad8a06018197acb298ddc67a07898efd6d7b Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Fri, 8 Jul 2022 00:26:27 -0400
Subject: [PATCH 216/309] Added TargetedCard to getDefinedCards() and to the
 filtered options in getDefinedPlayers()

---
 .../src/main/java/forge/game/ability/AbilityUtils.java    | 8 +++-----
 .../cardsfolder/upcoming/jon_irenicus_shattered_one.txt   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

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 18190a19b1c..660ff3e3c7c 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -162,17 +162,15 @@ public class AbilityUtils {
                 return cards;
             }
         }
-        else if (defined.equals("Targeted") && sa instanceof SpellAbility) {
+        else if ((defined.equals("Targeted") || defined.equals("TargetedCard")) && sa instanceof SpellAbility) {
             for (TargetChoices tc : ((SpellAbility)sa).getAllTargetChoices()) {
                 Iterables.addAll(cards, tc.getTargetCards());
             }
         }
         else if (defined.equals("TargetedSource") && sa instanceof SpellAbility) {
-            for (TargetChoices tc : ((SpellAbility)sa).getAllTargetChoices()) {
-                for (SpellAbility s : tc.getTargetSpells()) {
+            for (TargetChoices tc : ((SpellAbility)sa).getAllTargetChoices()) for (SpellAbility s : tc.getTargetSpells()) {
                     cards.add(s.getHostCard());
                 }
-            }
         }
         else if (defined.equals("ThisTargetedCard") && sa instanceof SpellAbility) { // do not add parent targeted
             if (((SpellAbility)sa).getTargets() != null) {
@@ -972,7 +970,7 @@ public class AbilityUtils {
 
         final Player player = sa instanceof SpellAbility ? ((SpellAbility)sa).getActivatingPlayer() : card.getController();
 
-        if (defined.equals("Self") || defined.equals("ThisTargetedCard") || defined.startsWith("Valid") || getPaidCards(sa, defined) != null) {
+        if (defined.equals("Self") || defined.equals("TargetedCard") || defined.equals("ThisTargetedCard") || defined.startsWith("Valid") || getPaidCards(sa, defined) != null) {
             // do nothing, Self is for Cards, not Players
         } else if (defined.equals("TargetedOrController")) {
             players.addAll(getDefinedPlayers(card, "Targeted", sa));
diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
index 7a9686af9e8..1bed23e7f1a 100644
--- a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
@@ -5,7 +5,7 @@ PT:3/3
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control.
 SVar:DBSelectRecipient:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDonate
 SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters
-SVar:DBPutCounters:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBTap
+SVar:DBPutCounters:DB$ PutCounter | Defined$ TargetedCard | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBTap | Description$ Test
 SVar:DBTap:DB$ Tap | Defined$ Targeted | SubAbility$ DBGoad
 SVar:DBGoad:DB$ Goad | Defined$ Targeted | Duration$ Permanent | SubAbility$ DBDisableSacing
 SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent

From 77678b4cbc66ac3ee8bad94a08caf1528c8733c7 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 8 Jul 2022 14:38:43 +0800
Subject: [PATCH 217/309] Fix loading fallback_skin, delay setlookup file

---
 forge-core/src/main/java/forge/ImageKeys.java | 26 +++++++++++++----
 forge-gui-mobile/src/forge/assets/FSkin.java  | 29 ++++++++++++-------
 .../src/forge/assets/FSkinTexture.java        | 20 +++++++++----
 .../src/forge/assets/ImageCache.java          |  6 +---
 4 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index 3975890cf9b..a1ac75b988b 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -3,6 +3,7 @@ package forge;
 import forge.item.PaperCard;
 import forge.util.FileUtil;
 import forge.util.TextUtil;
+import forge.util.ThreadUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
@@ -171,10 +172,18 @@ public final class ImageKeys {
                     return file;
                 }
                 //setlookup
-                file = setLookUpFile(filename, fullborderFile);
-                if (file != null) {
-                    cachedCards.put(filename, file);
-                    return file;
+                if (hasSetLookup(filename)) {
+                    //delay processing so gui is responsive
+                    ThreadUtil.delay(60, new Runnable() {
+                        @Override
+                        public void run() {
+                            File f = setLookUpFile(filename, fullborderFile);
+                            if (f != null)
+                                cachedCards.put(filename, f);
+                            else //is null
+                                missingCards.add(filename);
+                        }
+                    });
                 }
             }
             //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder
@@ -250,7 +259,7 @@ public final class ImageKeys {
 
         // System.out.println("File not found, no image created: " + key);
         //add missing cards - disable for desktop version for compatibility reasons with autodownloader
-        if (isLibGDXPort)
+        if (isLibGDXPort && !hasSetLookup(filename)) //missing cards with setlookup is handled differently
             missingCards.add(filename);
         return null;
     }
@@ -260,6 +269,13 @@ public final class ImageKeys {
                 ? StaticData.instance().getEditions().getCode2ByCode(edition) // by default 2-letter codes from MWS are used
                 : CACHE_CARD_PICS_SUBDIR.get(edition); // may use custom paths though
     }
+    static boolean hasSetLookup(String filename) {
+        if (!StaticData.instance().getSetLookup().isEmpty()) {
+            return StaticData.instance().getSetLookup().keySet().stream().anyMatch(setKey -> filename.startsWith(setKey));
+        }
+
+        return false;
+    }
     private static File setLookUpFile(String filename, String fullborderFile) {
         if (!StaticData.instance().getSetLookup().isEmpty()) {
             for (String setKey : StaticData.instance().getSetLookup().keySet()) {
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 6c33a438979..eb5f2c8ce24 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -165,17 +165,26 @@ public class FSkin {
             }
 
             try {
-                manager.load(f.path(), Texture.class);
-                manager.finishLoadingAsset(f.path());
-                final int w = manager.get(f.path(), Texture.class).getWidth();
-                final int h = manager.get(f.path(), Texture.class).getHeight();
-
-                if (f2.exists()) {
-                    manager.load(f2.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
-                    manager.finishLoadingAsset(f2.path());
-                    splashScreen.setBackground(new TextureRegion(manager.get(f2.path(), Texture.class)));
+                int w, h;
+                if (f.path().contains("fallback_skin")) {
+                    //the file is not accesible by the manager since it not on absolute path...
+                    Texture txSplash = new Texture(f);
+                    w = txSplash.getWidth();
+                    h = txSplash.getHeight();
+                    splashScreen.setBackground(new TextureRegion(txSplash, 0, 0, w, h - 100));
                 } else {
-                    splashScreen.setBackground(new TextureRegion(manager.get(f.path(), Texture.class), 0, 0, w, h - 100));
+                    manager.load(f.path(), Texture.class);
+                    manager.finishLoadingAsset(f.path());
+                    w = manager.get(f.path(), Texture.class).getWidth();
+                    h = manager.get(f.path(), Texture.class).getHeight();
+
+                    if (f2.exists()) {
+                        manager.load(f2.path(), Texture.class, new TextureLoader.TextureParameter(){{genMipMaps = true; minFilter = Texture.TextureFilter.MipMapLinearLinear; magFilter = Texture.TextureFilter.Linear;}});
+                        manager.finishLoadingAsset(f2.path());
+                        splashScreen.setBackground(new TextureRegion(manager.get(f2.path(), Texture.class)));
+                    } else {
+                        splashScreen.setBackground(new TextureRegion(manager.get(f.path(), Texture.class), 0, 0, w, h - 100));
+                    }
                 }
 
                 Pixmap pxSplash = new Pixmap(f);
diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
index 26463c2850c..348f51b69cb 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
@@ -128,9 +128,13 @@ public enum FSkinTexture implements FImage {
         FileHandle preferredFile = isPlane ? FSkin.getCachePlanechaseFile(filename) : FSkin.getSkinFile(filename);
         if (preferredFile.exists()) {
             try {
-                Forge.getAssets(true).manager.load(preferredFile.path(), Texture.class);
-                Forge.getAssets(true).manager.finishLoadingAsset(preferredFile.path());
-                texture = Forge.getAssets(true).manager.get(preferredFile.path(), Texture.class);
+                if (preferredFile.path().contains("fallback_skin")) {
+                    texture = new Texture(preferredFile);
+                } else {
+                    Forge.getAssets(true).manager.load(preferredFile.path(), Texture.class);
+                    Forge.getAssets(true).manager.finishLoadingAsset(preferredFile.path());
+                    texture = Forge.getAssets(true).manager.get(preferredFile.path(), Texture.class);
+                }
             }
             catch (final Exception e) {
                 System.err.println("Failed to load skin file: " + preferredFile);
@@ -148,9 +152,13 @@ public enum FSkinTexture implements FImage {
 
             if (defaultFile.exists()) {
                 try {
-                    Forge.getAssets(true).manager.load(defaultFile.path(), Texture.class);
-                    Forge.getAssets(true).manager.finishLoadingAsset(defaultFile.path());
-                    texture = Forge.getAssets(true).manager.get(defaultFile.path(), Texture.class);
+                    if (defaultFile.path().contains("fallback_skin")) {
+                        texture = new Texture(defaultFile);
+                    } else {
+                        Forge.getAssets(true).manager.load(defaultFile.path(), Texture.class);
+                        Forge.getAssets(true).manager.finishLoadingAsset(defaultFile.path());
+                        texture = Forge.getAssets(true).manager.get(defaultFile.path(), Texture.class);
+                    }
                 }
                 catch (final Exception e) {
                     System.err.println("Failed to load skin file: " + defaultFile);
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 66e6f6da2de..e3694817979 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -486,11 +486,7 @@ public class ImageCache {
         //generated texture/pixmap?
         if (t.toString().contains("com.badlogic.gdx.graphics.Texture@"))
             return true;
-        for (String key : borderlessCardlistKey) {
-            if (t.toString().contains(key))
-                return true;
-        }
-        return false;
+        return borderlessCardlistKey.stream().anyMatch(key -> t.toString().contains(key));
     }
 
     public static String getpixelColor(Texture i) {

From 267ec6f1d79afa3be25d139d35a59f62e1b20e93 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 8 Jul 2022 19:21:00 +0800
Subject: [PATCH 218/309] Update borderlessCardList.txt

---
 forge-gui/res/lists/borderlessCardList.txt | 244 ++++++++++++++++++++-
 1 file changed, 241 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/lists/borderlessCardList.txt b/forge-gui/res/lists/borderlessCardList.txt
index 61c6dbad236..2e512c10f20 100644
--- a/forge-gui/res/lists/borderlessCardList.txt
+++ b/forge-gui/res/lists/borderlessCardList.txt
@@ -1,3 +1,88 @@
+2X2/Aether Vial2.fullborder
+2X2/Allosaurus Shepherd2.fullborder
+2X2/Anger of the Gods2.fullborder
+2X2/Assassin's Trophy2.fullborder
+2X2/Azorius Chancery2.fullborder
+2X2/Blood Artist2.fullborder
+2X2/Bloodbraid Elf2.fullborder
+2X2/Bloodforged Battle-Axe2.fullborder
+2X2/Bloom Tender2.fullborder
+2X2/Boros Garrison2.fullborder
+2X2/Burning-Tree Emissary2.fullborder
+2X2/Cavern of Souls2.fullborder
+2X2/Chaos Warp2.fullborder
+2X2/City of Brass2.fullborder
+2X2/Coiling Oracle2.fullborder
+2X2/Concordant Crossroads2.fullborder
+2X2/Consecrated Sphinx2.fullborder
+2X2/Crucible of Worlds2.fullborder
+2X2/Damnation2.fullborder
+2X2/Dimir Aqueduct2.fullborder
+2X2/Dockside Extortionist2.fullborder
+2X2/Dragonlord Dromoka2.fullborder
+2X2/Elenda, the Dusk Rose2.fullborder
+2X2/Emiel the Blessed2.fullborder
+2X2/Emrakul, the Aeons Torn2.fullborder
+2X2/Emrakul, the Aeons Torn4.fullborder
+2X2/Eternal Witness2.fullborder
+2X2/Flickerwisp2.fullborder
+2X2/Forbidden Orchard2.fullborder
+2X2/Force of Negation2.fullborder
+2X2/Gifts Ungiven2.fullborder
+2X2/Glimpse the Unthinkable2.fullborder
+2X2/Golgari Rot Farm2.fullborder
+2X2/Grand Arbiter Augustin IV2.fullborder
+2X2/Grim Flayer2.fullborder
+2X2/Gruul Turf2.fullborder
+2X2/Hardened Scales2.fullborder
+2X2/Imperial Seal2.fullborder
+2X2/Inquisition of Kozilek2.fullborder
+2X2/Izzet Boilerworks2.fullborder
+2X2/Kolaghan's Command2.fullborder
+2X2/Kozilek, Butcher of Truth2.fullborder
+2X2/Kozilek, Butcher of Truth4.fullborder
+2X2/Lightning Bolt2.fullborder
+2X2/Liliana, the Last Hope2.fullborder
+2X2/Liliana, the Last Hope4.fullborder
+2X2/Mana Drain2.fullborder
+2X2/Mana Vault2.fullborder
+2X2/Marchesa, the Black Rose2.fullborder
+2X2/Mentor of the Meek2.fullborder
+2X2/Monastery Swiftspear2.fullborder
+2X2/Muldrotha, the Gravetide2.fullborder
+2X2/Mulldrifter2.fullborder
+2X2/Oracle of Mul Daya2.fullborder
+2X2/Orzhov Basilica2.fullborder
+2X2/Panharmonicon2.fullborder
+2X2/Phyrexian Altar2.fullborder
+2X2/Pithing Needle2.fullborder
+2X2/Privileged Position2.fullborder
+2X2/Qasali Pridemage2.fullborder
+2X2/Rakdos Carnarium2.fullborder
+2X2/Rampant Growth2.fullborder
+2X2/Seasoned Pyromancer2.fullborder
+2X2/Sedris, the Traitor King2.fullborder
+2X2/Seeker of the Way2.fullborder
+2X2/Selesnya Sanctuary2.fullborder
+2X2/Sensei's Divining Top2.fullborder
+2X2/Simic Growth Chamber2.fullborder
+2X2/Smothering Tithe2.fullborder
+2X2/Spell Pierce2.fullborder
+2X2/Supreme Verdict2.fullborder
+2X2/Surgical Extraction2.fullborder
+2X2/Teferi's Protection2.fullborder
+2X2/Terminate2.fullborder
+2X2/The Mimeoplasm2.fullborder
+2X2/Thought Scour2.fullborder
+2X2/Thousand-Year Storm2.fullborder
+2X2/Ulamog, the Infinite Gyre2.fullborder
+2X2/Ulamog, the Infinite Gyre4.fullborder
+2X2/Unearth2.fullborder
+2X2/Vedalken Orrery2.fullborder
+2X2/Wall of Omens2.fullborder
+2X2/Wrenn and Six2.fullborder
+2X2/Wrenn and Six4.fullborder
+2X2/Young Pyromancer2.fullborder
 2XM/Academy Ruins2.fullborder
 2XM/Atraxa, Praetors' Voice2.fullborder
 2XM/Avacyn, Angel of Hope2.fullborder
@@ -38,6 +123,36 @@
 2XM/Urza's Power Plant2.fullborder
 2XM/Urza's Tower2.fullborder
 2XM/Wurmcoil Engine2.fullborder
+AFR/Adult Gold Dragon2.fullborder
+AFR/Black Dragon2.fullborder
+AFR/Blue Dragon2.fullborder
+AFR/Ebondeath, Dracolich2.fullborder
+AFR/Ellywick Tumblestrum2.fullborder
+AFR/Grand Master of Flowers2.fullborder
+AFR/Green Dragon2.fullborder
+AFR/Icingdeath, Frost Tyrant2.fullborder
+AFR/Inferno of the Star Mounts2.fullborder
+AFR/Iymrith, Desert Doom2.fullborder
+AFR/Lolth, Spider Queen2.fullborder
+AFR/Mordenkainen2.fullborder
+AFR/Old Gnawbone2.fullborder
+AFR/Red Dragon2.fullborder
+AFR/Tiamat2.fullborder
+AFR/White Dragon2.fullborder
+AFR/Zariel, Archduke of Avernus2.fullborder
+CLB/Ancient Brass Dragon2.fullborder
+CLB/Ancient Bronze Dragon2.fullborder
+CLB/Ancient Copper Dragon2.fullborder
+CLB/Ancient Gold Dragon2.fullborder
+CLB/Ancient Silver Dragon2.fullborder
+CLB/Battle Angels of Tyr2.fullborder
+CLB/Bramble Sovereign2.fullborder
+CLB/Elminster2.fullborder
+CLB/Legion Loyalty2.fullborder
+CLB/Minsc & Boo, Timeless Heroes2.fullborder
+CLB/Nautiloid Ship2.fullborder
+CLB/Tasha, the Witch Queen2.fullborder
+CLB/Vexing Puzzlebox2.fullborder
 CMR/Jeska, Thrice Reborn2.fullborder
 CMR/Tevesh Szat, Doom of Fools2.fullborder
 ELD/Garruk, Cursed Huntsman2.fullborder
@@ -112,6 +227,53 @@ M21/Solemn Simulacrum2.fullborder
 M21/Teferi, Master of Time2.fullborder
 M21/Ugin, the Spirit Dragon2.fullborder
 M21/Ugin, the Spirit Dragon3.fullborder
+MH2/Cabal Coffers2.fullborder
+MH2/Chatterfang, Squirrel General3.fullborder
+MH2/Dakkon, Shadow Slayer3.fullborder
+MH2/Endurance2.fullborder
+MH2/Fury2.fullborder
+MH2/Geyadrone Dihada3.fullborder
+MH2/Grief2.fullborder
+MH2/Grist, the Hunger Tide3.fullborder
+MH2/Imperial Recruiter2.fullborder
+MH2/Mirari's Wake2.fullborder
+MH2/Mishra's Factory2.fullborder
+MH2/Ragavan, Nimble Pilferer2.fullborder
+MH2/Scion of Draco3.fullborder
+MH2/Shardless Agent3.fullborder
+MH2/Solitude2.fullborder
+MH2/Subtlety2.fullborder
+MH2/Svyelun of Sea and Sky3.fullborder
+MH2/Sword of Hearth and Home3.fullborder
+MH2/Thrasta, Tempest's Roar2.fullborder
+MH2/Titania, Protector of Argoth2.fullborder
+MH2/Tourach, Dread Cantor2.fullborder
+MH2/Vindicate2.fullborder
+MID/Arlinn, the Moon's Fury2.fullborder
+MID/Arlinn, the Pack's Hope2.fullborder
+MID/Deserted Beach2.fullborder
+MID/Haunted Ridge2.fullborder
+MID/Overgrown Farmland2.fullborder
+MID/Rockfall Vale2.fullborder
+MID/Shipwreck Marsh2.fullborder
+MID/Teferi, Who Slows the Sunset2.fullborder
+MID/Wrenn and Seven2.fullborder
+NEO/Ao, the Dawn Sky2.fullborder
+NEO/Atsushi, the Blazing Sky2.fullborder
+NEO/Boseiju, Who Endures2.fullborder
+NEO/Eiganjo, Seat of the Empire3.fullborder
+NEO/Junji, the Midnight Sky2.fullborder
+NEO/Kairi, the Swirling Sky2.fullborder
+NEO/Kaito Shizuki2.fullborder
+NEO/Kura, the Boundless Sky2.fullborder
+NEO/Kyodai, Soul of Kamigawa2.fullborder
+NEO/Otawara, Soaring City2.fullborder
+NEO/Sokenzan, Crucible of Defiance2.fullborder
+NEO/Takenuma, Abandoned Mire2.fullborder
+NEO/Tamiyo, Compleated Sage2.fullborder
+NEO/Tezzeret, Betrayer of Flesh2.fullborder
+NEO/The Wandering Emperor2.fullborder
+PLG20/Hangarback Walker.fullborder
 PLGS/Hangarback Walker.fullborder
 PSLD/Tibalt, the Fiend-Blooded.fullborder
 SLD/Acidic Slime.fullborder
@@ -124,6 +286,8 @@ SLD/Saskia the Unyielding.fullborder
 SLD/Scavenging Ooze.fullborder
 SLD/The Mimeoplasm.fullborder
 SLD/Voidslime.fullborder
+SLU/Boulderloft Pathway.fullborder
+SLU/Branchloft Pathway.fullborder
 SLU/Brightclimb Pathway.fullborder
 SLU/Clearwater Pathway.fullborder
 SLU/Cragcrown Pathway.fullborder
@@ -134,8 +298,32 @@ SLU/Needleverge Pathway.fullborder
 SLU/Pillarverge Pathway.fullborder
 SLU/Riverglide Pathway.fullborder
 SLU/Timbercrown Pathway.fullborder
-SLU/Boulderloft Pathway.fullborder
-SLU/Branchloft Pathway.fullborder
+SNC/All-Seeing Arbiter2.fullborder
+SNC/Bootleggers' Stash2.fullborder
+SNC/Elspeth Resplendent2.fullborder
+SNC/Gala Greeters10.fullborder
+SNC/Gala Greeters11.fullborder
+SNC/Gala Greeters12.fullborder
+SNC/Gala Greeters13.fullborder
+SNC/Gala Greeters3.fullborder
+SNC/Gala Greeters4.fullborder
+SNC/Gala Greeters5.fullborder
+SNC/Gala Greeters6.fullborder
+SNC/Gala Greeters7.fullborder
+SNC/Gala Greeters8.fullborder
+SNC/Gala Greeters9.fullborder
+SNC/Halo Fountain2.fullborder
+SNC/Jetmir's Garden2.fullborder
+SNC/Ob Nixilis, the Adversary2.fullborder
+SNC/Raffine's Tower2.fullborder
+SNC/Shadow of Mortality2.fullborder
+SNC/Spara's Headquarters2.fullborder
+SNC/Titan of Industry2.fullborder
+SNC/Topiary Stomper2.fullborder
+SNC/Vivien on the Hunt3.fullborder
+SNC/Xander's Lounge2.fullborder
+SNC/Ziatora's Proving Ground2.fullborder
+STA/Abundant Harvest1.fullborder
 STA/Abundant Harvest2.fullborder
 STA/Adventurous Impulse1.fullborder
 STA/Adventurous Impulse2.fullborder
@@ -261,7 +449,6 @@ STA/Weather the Storm1.fullborder
 STA/Weather the Storm2.fullborder
 STA/Whirlwind Denial1.fullborder
 STA/Whirlwind Denial2.fullborder
-STA/Abundant Harvest1.fullborder
 STX/Beledros Witherbloom2.fullborder
 STX/Galazeth Prismari2.fullborder
 STX/Kasmina, Enigma Sage2.fullborder
@@ -276,11 +463,62 @@ STX/Will, Scholar of Frost2.fullborder
 THB/Ashiok, Nightmare Muse2.fullborder
 THB/Calix, Destiny's Hand2.fullborder
 THB/Elspeth, Sun's Nemesis2.fullborder
+UNF/Blood Crypt.fullborder
+UNF/Breeding Pool.fullborder
+UNF/Forest1.fullborder
+UNF/Forest2.fullborder
+UNF/Godless Shrine.fullborder
+UNF/Hallowed Fountain.fullborder
+UNF/Island1.fullborder
+UNF/Island2.fullborder
+UNF/Mountain1.fullborder
+UNF/Mountain2.fullborder
+UNF/Overgrown Tomb.fullborder
+UNF/Plains1.fullborder
+UNF/Plains2.fullborder
+UNF/Sacred Foundry.fullborder
+UNF/Steam Vents.fullborder
+UNF/Stomping Ground.fullborder
+UNF/Swamp1.fullborder
+UNF/Swamp2.fullborder
+UNF/Temple Garden.fullborder
+UNF/Watery Grave.fullborder
 UST/Forest.fullborder
 UST/Island.fullborder
 UST/Mountain.fullborder
 UST/Plains.fullborder
 UST/Swamp.fullborder
+VOW/Bloodbat Summoner3.fullborder
+VOW/Chandra, Dressed to Kill2.fullborder
+VOW/Circle of Confinement2.fullborder
+VOW/Deathcap Glade2.fullborder
+VOW/Dreamroot Cascade2.fullborder
+VOW/Edgar Markov's Coffin3.fullborder
+VOW/Edgar, Charmed Groom3.fullborder
+VOW/Eruth, Tormented Prophet3.fullborder
+VOW/Falkenrath Forebear3.fullborder
+VOW/Hauken's Insight3.fullborder
+VOW/Henrika Domnathi3.fullborder
+VOW/Henrika, Infernal Seer3.fullborder
+VOW/Innocent Traveler3.fullborder
+VOW/Investigator's Journal2.fullborder
+VOW/Jacob Hauken, Inspector3.fullborder
+VOW/Kaya, Geist Hunter2.fullborder
+VOW/Malicious Invader3.fullborder
+VOW/Olivia, Crimson Bride3.fullborder
+VOW/Reclusive Taxidermist2.fullborder
+VOW/Savior of Ollenbock2.fullborder
+VOW/Shattered Sanctum2.fullborder
+VOW/Sorin the Mirthless2.fullborder
+VOW/Sorin the Mirthless4.fullborder
+VOW/Stormcarved Coast2.fullborder
+VOW/Sundown Pass2.fullborder
+VOW/Thalia, Guardian of Thraben3.fullborder
+VOW/Thirst for Discovery2.fullborder
+VOW/Torens, Fist of the Angels3.fullborder
+VOW/Vampires' Vengeance2.fullborder
+VOW/Voldaren Bloodcaster3.fullborder
+VOW/Voldaren Estate3.fullborder
 ZNR/Boulderloft Pathway2.fullborder
 ZNR/Branchloft Pathway2.fullborder
 ZNR/Brightclimb Pathway2.fullborder

From d1869911071c7a9a73859acb47d3f0f622efdcc9 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 8 Jul 2022 21:55:14 +0800
Subject: [PATCH 219/309] fix crash

closes #1068
---
 forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt | 2 +-
 forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt b/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
index 7e1365cf04c..f2f45c2d8ca 100644
--- a/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
+++ b/forge-gui/res/cardsfolder/upcoming/moonshae_pixie.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie
 PT:2/2
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw cards equal to the number of opponents who were dealt combat damage this turn.
-SVar:TrigDraw:AB$ Draw | NumCards$ X
+SVar:TrigDraw:DB$ Draw | NumCards$ X
 SVar:X:PlayerCountRegisteredOpponents$HasPropertywasDealtCombatDamageThisTurn
 AlternateMode:Adventure
 Oracle:Flying\nWhen Moonshae Pixie enters the battlefield, draw cards equal to the number of opponents who were dealt combat damage this turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt b/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt
index 510104f75bf..74211a09160 100644
--- a/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt
+++ b/forge-gui/res/cardsfolder/upcoming/myrkuls_edict.txt
@@ -2,7 +2,7 @@ Name:Myrkul's Edict
 ManaCost:1 B
 Types:Sorcery
 A:SP$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:OneOppSac,10-19:EachOppSac,20:SacTopPower | SpellDescription$ Roll a d20.
-SVar:OneOppSac:ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Choose an opponent. That player sacrifices a creature.
+SVar:OneOppSac:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ 1—9 VERT Choose an opponent. That player sacrifices a creature.
 SVar:DBSac:DB$ Sacrifice | Defined$ Chosen | SacValid$ Creature | SubAbility$ DBCleanupChosen
 SVar:EachOppSac:DB$ Sacrifice | Defined$ Player.Opponent | SacValid$ Creature | StackDescription$ SpellDescription | SpellDescription$ 10—19 VERT Each opponent sacrifices a creature.
 SVar:SacTopPower:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard | SubAbility$ DBSacAll | StackDescription$ SpellDescription | SpellDescription$ 20 VERT Each opponent sacrifices a creature with the greatest power among creatures that player controls.

From fdff74d84c11991aecb3cb4302c72819ec54ddbd Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 8 Jul 2022 22:06:18 +0800
Subject: [PATCH 220/309] prevent NPE

---
 .../src/main/java/forge/game/GameAction.java  | 40 ++++++++++++++-----
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 03552568b9c..257c33cd3f0 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -162,14 +162,32 @@ public class GameAction {
         // need to check before it enters
         if (c.isAura() && !c.isAttachedToEntity() && toBattlefield && (zoneFrom == null || !zoneFrom.is(ZoneType.Stack))) {
             boolean found = false;
-            if (Iterables.any(game.getPlayers(), PlayerPredicates.canBeAttached(c, null))) {
-                found = true;
+            try {
+                if (Iterables.any(game.getPlayers(), PlayerPredicates.canBeAttached(c, null))) {
+                    found = true;
+                }
+            } catch (Exception e1) {
+                found = false;
             }
-            else if (Iterables.any((CardCollectionView) params.get(AbilityKey.LastStateBattlefield), CardPredicates.canBeAttached(c, null))) {
-                found = true;
+
+            if (!found) {
+                try {
+                    if (Iterables.any((CardCollectionView) params.get(AbilityKey.LastStateBattlefield), CardPredicates.canBeAttached(c, null))) {
+                        found = true;
+                    }
+                } catch (Exception e2) {
+                    found = false;
+                }
             }
-            else if (Iterables.any((CardCollectionView) params.get(AbilityKey.LastStateGraveyard), CardPredicates.canBeAttached(c, null))) {
-                found = true;
+
+            if (!found) {
+                try {
+                    if (Iterables.any((CardCollectionView) params.get(AbilityKey.LastStateGraveyard), CardPredicates.canBeAttached(c, null))) {
+                        found = true;
+                    }
+                } catch (Exception e3) {
+                    found = false;
+                }
             }
             if (!found) {
                 c.clearControllers();
@@ -341,8 +359,10 @@ public class GameAction {
                     if (commanderEffect != null) break;
                 }
                 // Disable the commander replacement effect
-                for (final ReplacementEffect re : commanderEffect.getReplacementEffects()) {
-                    re.setSuppressed(true);
+                if (commanderEffect != null) {
+                    for (final ReplacementEffect re : commanderEffect.getReplacementEffects()) {
+                        re.setSuppressed(true);
+                    }
                 }
             }
 
@@ -2315,14 +2335,16 @@ public class GameAction {
             final Player p = e.getKey();
             final CardCollection toTop = e.getValue().getLeft();
             final CardCollection toBottom = e.getValue().getRight();
-            final int numLookedAt = toTop.size() + toBottom.size();
+            int numLookedAt = 0;
             if (toTop != null) {
+                numLookedAt += toTop.size();
                 Collections.reverse(toTop); // reverse to get the correct order
                 for (Card c : toTop) {
                     moveToLibrary(c, cause, null);
                 }
             }
             if (toBottom != null) {
+                numLookedAt += toBottom.size();
                 for (Card c : toBottom) {
                     moveToBottomOfLibrary(c, cause, null);
                 }

From 2d81a1ad08d48bc4b485197d866b27282b262b4c Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Fri, 8 Jul 2022 11:41:24 -0500
Subject: [PATCH 221/309] Gluntch - Fixing Legendary Tag (#1073)

* Add files via upload

* Correcting Gluntch's Legendary tag

Previous merge did not have Gluntch marked correctly as legendary.
---
 forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt b/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
index dc9a26e6d7d..f3f1f538384 100644
--- a/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
+++ b/forge-gui/res/cardsfolder/upcoming/gluntch_the_bestower.txt
@@ -1,6 +1,6 @@
 Name:Gluntch, the Bestower
 ManaCost:1 G W
-Types:Creature Jellyfish
+Types:Legendary Creature Jellyfish
 PT:0/5
 K:Flying
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoosePlayer1 | TriggerDescription$ At the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
@@ -13,4 +13,4 @@ SVar:Tokens:DB$ Token | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | Defi
 SVar:X:PlayerCountPlayers$Amount
 SVar:CleanupFinal:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters|Token|Sacrifice & Type$Treasure|Artifact
-Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
+Oracle:Flying\nAt the beginning of your end step, choose a player. They put two +1/+1 counters on a creature they control. Choose a second player to draw a card. Then choose a third player to create two Treasure tokens.
\ No newline at end of file

From 93e199fb57aa6f0af7541744bee1003eaaab237a Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Fri, 8 Jul 2022 20:28:47 +0100
Subject: [PATCH 222/309] Alchemy Horizons: Baldur's Gate edition file

---
 .../Alchemy Horizons Baldur's Gate.txt        | 385 ++++++++++++++++++
 1 file changed, 385 insertions(+)
 create mode 100644 forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt

diff --git a/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt b/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt
new file mode 100644
index 00000000000..4e9b48dd31a
--- /dev/null
+++ b/forge-gui/res/editions/Alchemy Horizons Baldur's Gate.txt	
@@ -0,0 +1,385 @@
+[metadata]
+Code=HBG
+Date=2022-07-07
+Name=Alchemy Horizons: Baldur's Gate
+Type=Online
+ScryfallCode=HBG
+
+[cards]
+1 R Klement, Novice Acolyte @Maria Poliakova
+1b R Klement, Death Acolyte @Diego Gisbert
+1g R Klement, Nature Acolyte @Raluca Marinescu
+1r R Klement, Tempest Acolyte @Zezhou Chen
+1u R Klement, Knowledge Acolyte @Jodie Muir
+1w R Klement, Life Acolyte @Winona Nelson
+2 R Lae'zel, Githyanki Warrior @John Stanko
+2b R Lae'zel, Callous Warrior @John Stanko
+2g R Lae'zel, Primal Warrior @John Stanko
+2r R Lae'zel, Wrathful Warrior @John Stanko
+2u R Lae'zel, Illithid Thrall @Igor Grechanyi
+2w R Lae'zel, Blessed Warrior @John Stanko
+3 U Lulu, Forgetful Hollyphant @Jakob Eirich
+3b U Lulu, Vengeful Hollyphant @Jakob Eirich
+3g U Lulu, Wild Hollyphant @Jakob Eirich
+3r U Lulu, Inspiring Hollyphant @Jakob Eirich
+3u U Lulu, Curious Hollyphant @Jakob Eirich
+3w U Lulu, Helpful Hollyphant @Jakob Eirich
+4 U Rasaad, Monk of Selûne @Dan Scott
+4b U Rasaad, Shadow Monk @Dan Scott
+4g U Rasaad, Sylvan Monk @Dan Scott
+4r U Rasaad, Warrior Monk @Dan Scott
+4u U Rasaad, Dragon Monk @Dan Scott
+4w U Rasaad, Radiant Monk @Dan Scott
+5 U Alora, Rogue Companion @Aaron Miller
+5b U Alora, Cheerful Assassin @Aaron Miller
+5g U Alora, Cheerful Scout @Aaron Miller
+5r U Alora, Cheerful Swashbuckler @Aaron Miller
+5u U Alora, Cheerful Thief @Aaron Miller
+5w U Alora, Cheerful Mastermind @Aaron Miller
+6 M Gale, Conduit of the Arcane @Cristi Balanescu
+6b M Gale, Abyssal Conduit @Cristi Balanescu
+6g M Gale, Primeval Conduit @Cristi Balanescu
+6r M Gale, Storm Conduit @Cristi Balanescu
+6u M Gale, Temporal Conduit @Cristi Balanescu
+6w M Gale, Holy Conduit @Cristi Balanescu
+7 R Imoen, Trickster Friend @Alix Branwyn
+7b R Imoen, Occult Trickster @Alix Branwyn
+7g R Imoen, Wise Trickster @Alix Branwyn
+7r R Imoen, Chaotic Trickster @Alix Branwyn
+7u R Imoen, Wily Trickster @Alix Branwyn
+7w R Imoen, Honorable Trickster @Alix Branwyn
+8 U Vhal, Eager Scholar @David Gaillet
+8b U Vhal, Scholar of Mortality @David Gaillet
+8g U Vhal, Scholar of Creation @David Gaillet
+8r U Vhal, Scholar of Elements @David Gaillet
+8u U Vhal, Scholar of Prophecy @David Gaillet
+8w U Vhal, Scholar of Tactics @David Gaillet
+9 U Sarevok the Usurper @Ben Hill
+9b U Sarevok, Deadly Usurper @Ben Hill
+9g U Sarevok, Mighty Usurper @Ben Hill
+9r U Sarevok, Ferocious Usurper @Ben Hill
+9u U Sarevok, Deceitful Usurper @Ben Hill
+9w U Sarevok, Divine Usurper @Ben Hill
+10 R Shadowheart, Sharran Cleric @Cristi Balanescu
+10b R Shadowheart, Cleric of Graves @Cristi Balanescu
+10g R Shadowheart, Cleric of Twilight @Cristi Balanescu
+10r R Shadowheart, Cleric of War @Cristi Balanescu
+10u R Shadowheart, Cleric of Trickery @Cristi Balanescu
+10w R Shadowheart, Cleric of Order @Cristi Balanescu
+11 U Viconia, Nightsinger's Disciple @Daarken
+11b U Viconia, Disciple of Blood @Daarken
+11g U Viconia, Disciple of Strength @Daarken
+11r U Viconia, Disciple of Violence @Daarken
+11u U Viconia, Disciple of Arcana @Daarken
+11w U Viconia, Disciple of Rebirth @Daarken
+12 U Ambergris, Citadel Agent @Darek Zabrocki
+12b U Ambergris, Agent of Tyranny @Darek Zabrocki
+12g U Ambergris, Agent of Balance @Darek Zabrocki
+12r U Ambergris, Agent of Destruction @Darek Zabrocki
+12u U Ambergris, Agent of Progress @Darek Zabrocki
+12w U Ambergris, Agent of Law @Darek Zabrocki
+13 U Gut, Fanatical Priestess @Wayne Reynolds
+13b U Gut, Brutal Fanatic @Wayne Reynolds
+13g U Gut, Bestial Fanatic @Wayne Reynolds
+13r U Gut, Furious Fanatic @Wayne Reynolds
+13u U Gut, Devious Fanatic @Wayne Reynolds
+13w U Gut, Zealous Fanatic @Wayne Reynolds
+14 R Karlach, Raging Tiefling @Billy Christian
+14b R Karlach, Tiefling Punisher @Billy Christian
+14g R Karlach, Tiefling Guardian @Billy Christian
+14r R Karlach, Tiefling Berserker @Billy Christian
+14u R Karlach, Tiefling Spellrager @Billy Christian
+14w R Karlach, Tiefling Zealot @Billy Christian
+15 M Wyll, Pact-Bound Duelist @Mads Ahm
+15b M Wyll of the Fiend Pact @Mads Ahm
+15g M Wyll of the Fey Pact @Mads Ahm
+15r M Wyll of the Blade Pact @Mads Ahm
+15u M Wyll of the Elder Pact @Mads Ahm
+15w M Wyll of the Celestial Pact @Mads Ahm
+16 U Jaheira, Harper Emissary @Mila Pesic
+16b U Jaheira, Ruthless Harper @Mila Pesic
+16g U Jaheira, Merciful Harper @Mila Pesic
+16r U Jaheira, Stirring Harper @Mila Pesic
+16u U Jaheira, Insightful Harper @Mila Pesic
+16w U Jaheira, Heroic Harper @Mila Pesic
+17 M Lukamina, Moon Druid @Zara Alfonso
+17b M Lukamina, Scorpion Form @Jason Kang
+17g M Lukamina, Bear Form @Wisnu Tan
+17r M Lukamina, Wolf Form @Maria Zolotukhina
+17u M Lukamina, Crocodile Form @Simon Dominic
+17w M Lukamina, Hawk Form @Julie Dillon
+18 U Skanos, Dragon Vassal @Daarken
+18b U Skanos, Black Dragon Vassal @Daarken
+18g U Skanos, Green Dragon Vassal @Daarken
+18r U Skanos, Red Dragon Vassal @Daarken
+18u U Skanos, Blue Dragon Vassal @Daarken
+18w U Skanos, White Dragon Vassal @Daarken
+19 R Wilson, Bear Comrade @Ilse Gort
+19b R Wilson, Fearsome Bear @Ilse Gort
+19g R Wilson, Majestic Bear @Ilse Gort
+19r R Wilson, Ardent Bear @Ilse Gort
+19u R Wilson, Subtle Bear @Ilse Gort
+19w R Wilson, Urbane Bear @Ilse Gort
+20 U Boareskyr Tollkeeper @Andrey Kuzinskiy
+21 M Champions of Tyr @Fajareka Setiawan
+22 C Flaming Fist Duskguard @Matt Forsyth
+23 C Mace of Disruption @Craig J Spearing
+24 U Moradin's Disciples @Justine Cruz
+25 C Patriar's Humiliation @Dave Greco
+26 C Ranger Squadron @Filipe Pagliuso
+27 U Seatower Imprisonment @Jokubas Uogintas
+28 C Soldiers of the Watch @Edgar Sánchez Hidalgo
+29 R Sune's Intervention @Anastasia Ovchinnikova
+30 M Sworn to the Legion @Aaron J. Riley
+31 C Valiant Farewell @Konstantin Porubov
+32 R Vladimir and Godfrey @Josu Hernaiz
+33 R Calim, Djinn Emperor @Zoltan Boros
+34 C Hypnotic Pattern @Olena Richards
+35 C Lizardfolk Librarians @Brian Valeza
+36 U Seek New Knowledge @Dave Greco
+37 R Signature Spells @Reiko Murakami
+38 M Snowborn Simulacra @Irina Nordsol
+39 R Thayan Evokers @Josh Hass
+40 C Undersimplify @Brent Hollowell
+41 C Water Weird @Brent Hollowell
+42 C Wizened Githzerai @Jodie Muir
+43 U Grave Choice @Will Gist
+44 C Hook Horror @Olivier Bernard
+45 R The Hourglass Coven @Konstantin Porubov
+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
+46 U Mind Spike @Matt Forsyth
+47 C Sewer Plague @Piotr Foksowicz
+48 R Stroke of Luck @Forrest Imel
+49 M Chaos Balor @Uriah Voth
+50 U Craving of Yeenoghu @Yeong-Hao Han
+51 U Dragonborn Immolator @Artur Nakhodkin
+52 R Flames of Moradin @Forrest Imel
+53 C Genasi Rabble-Rouser @Joshua Raphael
+54 C Giant Fire Beetles @Vincent Christiaens
+55 U Gnoll Hunting Party @Ben Wootten
+56 U Goblin Trapfinder @Brian Valeza
+57 C Incessant Provocation @Brian Valeza
+58 R Kardum, Patron of Flames @Artur Nakhodkin
+59 C Kobold Warcaller @Igor Grechanyi
+60 U Mephit's Enthusiasm @Kim Sokol
+61 R Tiefling Outcasts @Zoltan Boros
+62 C Unexpected Allies @Milivoj Ćeran
+63 R Uthgardt Fury @Yeong-Hao Han
+64 C Warriors of Tiamat @David Auden Nash
+65 C Arcane Archery @Julian Kok Joon Wen
+66 R Favored Enemy @Aaron J. Riley
+67 C Follow the Tracks @Julian Kok Joon Wen
+68 R Oyaminartok, Polar Werebear @Borja Pindado
+69 M Verdant Rejuvenation @Alayna Danner
+70 C You Line Up the Shot @Joe Slucher
+71 R Yuan-Ti Scaleshield @Ben Hill
+72 R Jon Irenicus, the Exile @Igor Grechanyi
+73 U Liara of the Flaming Fist @David Rapoza
+74 U Minthara of the Absolute @Evyn Fong
+75 M Tasha, Unholy Archmage @Martina Fackova
+76 R Ulder Ravengard, Marshal @Eric Deschamps
+77 U Gate of the Black Dragon @Sergey Glushakov
+78 U Gate to Manorborn @Andreas Rocha
+79 U Gate to Seatower @Kamila Szutenberg
+80 U Gate to the Citadel @Andreas Rocha
+81 U Gate to Tumbledown @Emmanuel Shiu
+82 M Ancient Gold Dragon @Simon Dominic
+83 R Archivist of Oghma @Stella Spente
+84 R Ascend from Avernus @Bruce Brenneise
+85 C Blessed Hippogriff @Leanna Crossan
+86 C Celestial Unicorn @Johannes Voss
+87 C Dawnbringer Cleric @Lie Setiawan
+88 C Devoted Paladin @Chris Rallis
+89 C Flaming Fist Officer @Darek Zabrocki
+90 C Guardian Naga @Tom Babbey
+91 U Guiding Bolt @Halil Ural
+92 R Horn of Valhalla @John Severin Brassell
+93 C Icewind Stalwart @Marcela Medeiros
+94 R Lae'zel's Acrobatics @Tatiana Kirgetova
+95 C Minimus Containment @Steve Prescott
+96 U Monk of the Open Hand @Bryan Sola
+97 U Pegasus Guardian @Leanna Crossan
+98 U Portable Hole @John Stanko
+99 C Priest of Ancient Lore @Jarel Threat
+100 U Rally Maneuver @Vincent Proce
+101 U Rescuer Chwinga @Nils Hamm
+102 U Scouting Hawk @Ilse Gort
+103 C Steadfast Paladin @Chris Rallis
+104 C Steadfast Unicorn @John Thacker
+105 R Stick Together @Dave Greco
+106 C You Hear Something on Watch @Zezhou Chen
+107 C You're Ambushed on the Road @Eric Deschamps
+108 U You're Confronted by Robbers @Durion
+109 C Air-Cult Elemental @Kari Christensen
+110 M Ancient Silver Dragon @Raoul Vitale
+111 C Blur @Dave Greco
+112 C Charmed Sleep @Zoltan Boros
+113 C Clever Conjurer @Zoltan Boros
+114 C Contact Other Plane @Alix Branwyn
+115 R Displacer Kitten @Campbell White
+116 U Draconic Lore @Tom Babbey
+117 C Dragonborn Looter @Julio Reyna
+118 U Dream Fracture @Liiga Smilshkalne
+119 R Gale's Redirection @Yeong-Hao Han
+120 U Goggles of Night @Forrest Imel
+121 U Guild Thief @Mike Jordana
+122 R Illithid Harvester @David Astruga
+123 U Irenicus's Vile Duplication @Oleksandr Kozachenko
+124 U Juvenile Mist Dragon @Leanna Crossan
+125 U Kenku Artificer @Dave Greco
+126 R Kindred Discovery @Vincent Christiaens
+127 U Lapis Orb of Dragonkind @Olena Richards
+128 C Pseudodragon Familiar @Campbell White
+129 U Ray of Frost @Kim Sokol
+130 C Rimeshield Frost Giant @Matt Stewart
+131 R Robe of the Archmagi @Dallas Williams
+132 C Shocking Grasp @Jason Felix
+133 C Soulknife Spy @Miguel Mercado
+134 U Sword Coast Serpent @Caio Monteiro
+135 C Tymora's Invoker @Leonardo Santanna
+136 C You Come to a River @Viko Menezes
+137 C You Find the Villains' Lair @Gabor Szikszai
+138 C Young Blue Dragon @Tuan Duong Chu
+139 R Altar of Bhaal @Jonas De Ro
+140 U Ambition's Cost @Zezhou Chen
+141 M Ancient Brass Dragon @Johan Grenier
+142 C Armor of Shadows @Craig J Spearing
+143 C Baleful Beholder @Lars Grant-West
+144 U Black Dragon @Mark Zug
+145 R Black Market Connections @Evyn Fong
+146 M Blood Money @Inka Schulz
+147 U Bonecaller Cleric @Jason A. Engle
+148 U Cast Down @Tyler Walpole
+149 C Chain Devil @Bartek Fedyczak
+150 C Deadly Dispute @Irina Nordsol
+151 C Demogorgon's Clutches @Alexander Mokhov
+152 U Drider @Jodie Muir
+153 R Eldritch Pact @Peter Polach
+154 C Eyes of the Beholder @Kari Christensen
+155 U Ghost Lantern @Julian Kok Joon Wen
+156 C Gray Slaad @Piotr Foksowicz
+157 C Grim Bounty @Justine Cruz
+158 R Grim Hireling @Tomas Duchek
+159 U Grim Wanderer @Jason A. Engle
+160 C Guildsworn Prowler @Fariba Khamseh
+161 C Hoard Robber @Anna Pavleeva
+162 R Intellect Devourer @Brian Valeza
+163 C Manticore @Billy Christian
+164 C Nefarious Imp @Konstantin Porubov
+165 M Pact Weapon @Volkan Baǵa
+166 C Sepulcher Ghoul @Jason A. Engle
+167 C Shambling Ghast @Dave Kendall
+168 U Sigil of Myrkul @David Astruga
+169 U Skullport Merchant @Tomek Larek
+170 C Summon Undead @Dallas Williams
+171 C Thieves' Tools @Deruchenko Alexander
+172 C Vampire Spawn @Alex Brock
+173 R Wand of Orcus @Andrew Mar
+174 M Ancient Copper Dragon @Antonio José Manzanedo
+175 U Battle Cry Goblin @April Prime
+176 U Breath Weapon @Adam Vehige
+177 U Carnelian Orb of Dragonkind @Olena Richards
+178 C Dragon's Fire @Campbell White
+179 C Dueling Rapier @Anna Podedworna
+180 C Earth-Cult Elemental @Aaron Miller
+181 C Farideh's Fireball @Josu Hernaiz
+182 R Fiendlash @Antonio José Manzanedo
+183 C Hobgoblin Captain @Karl Kopinski
+184 C Improvised Weaponry @Alix Branwyn
+185 C Jaded Sell-Sword @Randy Vargas
+186 R Nalfeshnee @Sam White
+187 C Reckless Barbarian @Oleksandr Kozachenko
+188 U Red Dragon @Andrey Kuzinskiy
+189 M Storm King's Thunder @Alexander Mokhov
+190 U Swashbuckler Extraordinaire @Durion
+191 U Two-Handed Axe @Milivoj Ćeran
+192 C Unexpected Windfall @Alayna Danner
+193 C Valor Singer @Justyna Gil
+194 R Wrathful Red Dragon @Dan Scott
+195 C You Come to the Gnoll Camp @Billy Christian
+196 C You Find Some Prisoners @Lie Setiawan
+197 C Young Red Dragon @Adam Vehige
+198 C Ambitious Dragonborn @Gaboleps
+199 M Ancient Bronze Dragon @Johan Grenier
+200 C Band Together @Brian Valeza
+201 R Belt of Giant Strength @Viko Menezes
+202 U Choose Your Weapon @Olivier Bernard
+203 C Circle of the Land Druid @Alexandre Honoré
+204 C Circle of the Moon Druid @Nicholas Elias
+205 U Draconic Muralists @Tom Babbey
+206 C Dread Linnorm @Caio Monteiro
+207 U Druid of the Emerald Grove @Edgar Sánchez Hidalgo
+208 C Druidic Ritual @Vincent Christiaens
+209 R Earthquake Dragon @Johan Grenier
+210 U Emerald Dragon @Diego Gisbert
+211 C Ettercap @Olivier Bernard
+212 C Gnoll Hunter @Jesper Ejsing
+213 C Hill Giant Herdgorger @Chris Rahn
+214 C Inspiring Bard @Eelis Kyttanen
+215 U Jade Orb of Dragonkind @Olena Richards
+216 U Lurking Roper @Andrew Mar
+217 R Monster Manual @David Gaillet
+218 C Owlbear @Ilse Gort
+219 U Owlbear Shepherd @Scott Murphy
+220 C Poison the Blade @Matt Forsyth
+221 U Prosperous Innkeeper @Eric Deschamps
+222 C Scaled Nurturer @David Gaillet
+223 U Split the Spoils @Edgar Sánchez Hidalgo
+224 C Sylvan Shepherd @Darrell Riche
+225 R Traverse the Outlands @Chuck Lukacs
+226 C Undercellar Myconid @David Szabo
+227 C Underdark Basilisk @Brent Hollowell
+228 U Wild Shape @Sam Guay
+229 U You Meet in a Tavern @Zoltan Boros
+230 R Alaundo the Seer @Aurore Folny
+231 R Astarion, the Decadent @Ben Hill
+232 R Baba Lysaga, Night Witch @Slawomir Maniak
+233 R Catti-brie of Mithral Hall @Lius Lasahido
+234 R Gorion, Wise Mentor @Jason Kang
+235 R Jan Jansen, Chaos Crafter @Vladimir Krisetskiy
+236 U Kagha, Shadow Archdruid @Alexander Mokhov
+237 U Kalain, Reclusive Painter @Justine Cruz
+238 U Korlessa, Scale Singer @Jesper Ejsing
+239 U Krydle of Baldur's Gate @Bryan Sola
+240 U Lozhan, Dragons' Legacy @Rudy Siswanto
+241 R Mazzy, Truesword Paladin @Justyna Gil
+242 R Miirym, Sentinel Wyrm @Kekai Kotaki
+243 M Minsc & Boo, Timeless Heroes @Andreas Zafiratos
+244 M Nalia de'Arnise @John Stanko
+245 R Neera, Wild Mage @Pauline Voss
+246 U Oji, the Exquisite Blade @Andreas Zafiratos
+247 M Prosper, Tome-Bound @Yongjae Choi
+248 R Raggadragga, Goreguts Boss @Xavier Ribeiro
+249 R Raphael, Fiendish Savior @Livia Prima
+250 U Thrakkus the Butcher @Nestor Ossandon Leal
+251 U Trelasarra, Moon Dancer @Kieran Yanner
+252 U Bag of Holding @Evyn Fong
+253 R Basilisk Collar @Craig J Spearing
+254 U Bronze Walrus @James Paick
+255 U Chardalyn Dragon @Sergey Glushakov
+256 C Cloak of the Bat @Dominik Mayer
+257 R Fraying Line @Campbell White
+258 C Iron Golem @Nicholas Gregory
+259 C Lantern of Revealing @Eytan Zana
+260 U Meteor Golem @James Paick
+261 R Mirror of Life Trapping @Dallas Williams
+262 U Navigation Orb @Robin Olausson
+263 C Pilgrim's Eye @Sean Murray
+264 C Prophetic Prism @Diego Gisbert
+265 C Spiked Pit Trap @Deruchenko Alexander
+266 R Baldur's Gate @Titus Lunter
+
+[rebalanced]
+A166 C A-Sepulcher Ghoul @Jason A. Engle
+A209 R A-Earthquake Dragon @Johan Grenier
+A217 R A-Monster Manual @David Gaillet
+A232 R A-Baba Lysaga, Night Witch @Slawomir Maniak
+A243 M A-Minsc & Boo, Timeless Heroes @Andreas Zafiratos

From ce6e20ff824ad8b146f07bee2232b20a61fae220 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Fri, 8 Jul 2022 14:38:27 -0500
Subject: [PATCH 223/309] Card Script for Haunted One (#1060)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete Haunted One.txt

* Add files via upload

* Delete Haunted One.txt

* Add files via upload

* Add files via upload
---
 forge-gui/res/cardsfolder/upcoming/haunted_one.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/haunted_one.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/haunted_one.txt b/forge-gui/res/cardsfolder/upcoming/haunted_one.txt
new file mode 100644
index 00000000000..d06a97698ff
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/haunted_one.txt
@@ -0,0 +1,9 @@
+Name:Haunted One
+ManaCost:2 B
+Types:Legendary Enchantment Background
+S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddTrigger$ BecomesTapped | Description$ Commander creatures you own have "Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn."
+SVar:BecomesTapped:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn.
+SVar:TrigPump:DB$ PumpAll | ValidCards$ Card.sharesCreatureTypeWith+YouCtrl | KW$ Undying | NumAtt$ 2
+DeckHas:Ability$Counters & Keyword$Undying
+AI:RemoveDeck:NonCommander
+Oracle:Commander creatures you own have "Whenever this creature becomes tapped, it and other creatures you control that share a creature type with it each get +2/+0 and gain undying until end of turn." (When a creature with undying 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.)
\ No newline at end of file

From 3b0b7ff9e974d2eb73a4400ee5b2b82ed2ab4bc4 Mon Sep 17 00:00:00 2001
From: mctubbies <69433417+mctubbies@users.noreply.github.com>
Date: Fri, 8 Jul 2022 14:38:33 -0500
Subject: [PATCH 224/309] Card Script for Blur (#1059)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete Blur.txt
---
 forge-gui/res/cardsfolder/upcoming/blur.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/blur.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/blur.txt b/forge-gui/res/cardsfolder/upcoming/blur.txt
new file mode 100644
index 00000000000..5a87dc42d3f
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/blur.txt
@@ -0,0 +1,8 @@
+Name:Blur
+ManaCost:2 U
+Types:Instant
+A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | SpellDescription$ Exile target creature you control, then return that card to the battlefield under their owner's control.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ All | Destination$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBDraw
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
+Oracle:Exile target creature you control, then return that card to the battlefield under their owner's control.\nDraw a card.

From 495cd2289709b27babcc2d405a1d3e1f30ecb806 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Fri, 8 Jul 2022 17:45:33 +0200
Subject: [PATCH 225/309] Clean up

---
 forge-ai/src/main/java/forge/ai/ComputerUtil.java     |  4 ++--
 .../src/main/java/forge/ai/PlayerControllerAi.java    |  5 ++---
 .../java/forge/game/ability/effects/CharmEffect.java  |  5 +++++
 .../src/main/java/forge/game/card/CardProperty.java   |  2 +-
 .../java/forge/game/spellability/AbilityManaPart.java |  4 ++--
 .../src/main/java/forge/game/trigger/TriggerScry.java |  3 +--
 .../src/main/java/forge/game/zone/MagicStack.java     | 11 ++++-------
 forge-gui/res/cardsfolder/m/maze_of_ith.txt           |  1 +
 forge-gui/src/main/java/forge/player/HumanPlay.java   | 11 ++++++-----
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 5aeb2b21e7c..675bf34f629 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -131,7 +131,7 @@ public class ComputerUtil {
 
         sa = GameActionUtil.addExtraKeywordCost(sa);
 
-        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
+        if (sa.getApi() == ApiType.Charm && !CharmEffect.makeChoices(sa)) {
             // 603.3c If no mode is chosen, the ability is removed from the stack.
             return false;
         }
@@ -294,7 +294,7 @@ public class ComputerUtil {
         if (newSA.isSpell() && !source.isCopiedSpell()) {
             newSA.setHostCard(game.getAction().moveToStack(source, newSA));
 
-            if (newSA.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(newSA)) {
+            if (newSA.getApi() == ApiType.Charm && !CharmEffect.makeChoices(newSA)) {
                 // 603.3c If no mode is chosen, the ability is removed from the stack.
                 return false;
             }
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 826710bf432..05d1f0a0a87 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -1065,9 +1065,8 @@ public class PlayerControllerAi extends PlayerController {
     }
 
     private boolean prepareSingleSa(final Card host, final SpellAbility sa, boolean isMandatory) {
-        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
-            // 603.3c If no mode is chosen, the ability is removed from the stack.
-            return false;
+        if (sa.getApi() == ApiType.Charm) {
+            return CharmEffect.makeChoices(sa);
         }
         if (sa.hasParam("TargetingPlayer")) {
             Player targetingPlayer = AbilityUtils.getDefinedPlayers(host, sa.getParam("TargetingPlayer"), sa).get(0);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
index 6e484d4a1a7..1f5902bc90a 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java
@@ -156,6 +156,11 @@ public class CharmEffect extends SpellAbilityEffect {
     }
 
     public static boolean makeChoices(SpellAbility sa) {
+        // CR 700.2g
+        if (sa.isCopied()) {
+            return true;
+        }
+
         //this resets all previous choices
         sa.setSubAbility(null);
 
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 cc63af4777c..0777d3772f5 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -607,7 +607,7 @@ public class CardProperty {
                 return false;
             }
         } else if (property.startsWith("Cloned")) {
-            if ((card.getCloneOrigin() == null) || !card.getCloneOrigin().equals(source)) {
+            if (card.getCloneOrigin() == null || !card.getCloneOrigin().equals(source)) {
                 return false;
             }
         } else if (property.startsWith("SharesCMCWith")) {
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 c1f5dc6e9d7..abb22e116ea 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -179,7 +179,7 @@ public class AbilityManaPart implements java.io.Serializable {
         if (source.isLand() && root.isManaAbility() && root.getPayCosts() != null && root.getPayCosts().hasTapCost()) {
             player.setTappedLandForManaThisTurn(true);
         }
-    } // end produceMana(String)
+    }
 
     /**
      * <p>
@@ -348,7 +348,7 @@ public class AbilityManaPart implements java.io.Serializable {
 
             // "can't" zone restriction – shouldn't be mixed with other restrictions
             if (restriction.startsWith("CantCastSpellFrom")) {
-                if (!sa.isSpell()) { //
+                if (!sa.isSpell()) {
                     return true;
                 }
                 final ZoneType badZone = ZoneType.smartValueOf(restriction.substring(17));
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
index 5512ddbc89a..05a90284011 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java
@@ -64,8 +64,7 @@ public class TriggerScry extends Trigger {
     /** {@inheritDoc} */
     @Override
     public final void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {
-        sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
-        sa.setTriggeringObjectsFrom(runParams, AbilityKey.ScryNum);
+        sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player, AbilityKey.ScryNum);
     }
 
     @Override
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 f81487fd80c..4fc81955212 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -830,13 +830,10 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
             Player activator = sa.getActivatingPlayer();
 
             if (activator == null) {
-                if (sa.getHostCard().getController().equals(activePlayer)) {
-                    activePlayerSAs.add(sa);
-                }
-            } else {
-                if (activator.equals(activePlayer)) {
-                    activePlayerSAs.add(sa);
-                }
+                activator = sa.getHostCard().getController();
+            }
+            if (activator.equals(activePlayer)) {
+                activePlayerSAs.add(sa);
             }
         }
         simultaneousStackEntryList.removeAll(activePlayerSAs);
diff --git a/forge-gui/res/cardsfolder/m/maze_of_ith.txt b/forge-gui/res/cardsfolder/m/maze_of_ith.txt
index cc8481dfa25..c766ff9b417 100644
--- a/forge-gui/res/cardsfolder/m/maze_of_ith.txt
+++ b/forge-gui/res/cardsfolder/m/maze_of_ith.txt
@@ -5,4 +5,5 @@ A:AB$ Untap | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target
 SVar:DBPump:DB$ Effect | ReplacementEffects$ RPrevent1,RPrevent2 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all combat damage that would be dealt to and dealt by that creature this turn.
 SVar:RPrevent1:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt to and dealt by that creature this turn.
 SVar:RPrevent2:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt to and dealt by that creature this turn. | Secondary$ True
+AI:RemoveDeck:All
 Oracle:{T}: Untap target attacking creature. Prevent all combat damage that would be dealt to and dealt by that creature this turn.
diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
index b9cfb20351d..4a324214593 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlay.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -105,7 +105,7 @@ public class HumanPlay {
             source.forceTurnFaceUp();
         }
 
-        if (sa.getApi() == ApiType.Charm && !sa.isCopied() && !CharmEffect.makeChoices(sa)) {
+        if (sa.getApi() == ApiType.Charm && !CharmEffect.makeChoices(sa)) {
             // 603.3c If no mode is chosen, the ability is removed from the stack.
             return false;
         }
@@ -167,11 +167,12 @@ public class HumanPlay {
 
         source.setSplitStateToPlayAbility(sa);
 
+        if (sa.getApi() == ApiType.Charm && !CharmEffect.makeChoices(sa)) {
+            // 603.3c If no mode is chosen, the ability is removed from the stack.
+            return;
+        }
+
         if (!sa.isCopied()) {
-            if (sa.getApi() == ApiType.Charm && !CharmEffect.makeChoices(sa)) {
-                // 603.3c If no mode is chosen, the ability is removed from the stack.
-                return;
-            }
             sa = AbilityUtils.addSpliceEffects(sa);
         }
 

From 4b5ebf2575a13f1bfd6ee5f207d75d9844559fc7 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 15:53:19 +0800
Subject: [PATCH 226/309] refactor libgdx static objects to be disposed -fixes
 memory leaks since these objects are not properly disposed by the GC
 -Textures, BitmapFonts and others should be disposed manually if not loaded
 in the assetmanager

---
 forge-gui-mobile/src/forge/Forge.java         | 17 +++-------
 .../src/forge/adventure/util/Config.java      |  8 ++---
 forge-gui-mobile/src/forge/assets/Assets.java | 20 +++++++++--
 forge-gui-mobile/src/forge/assets/FSkin.java  |  4 +--
 .../src/forge/assets/FSkinFont.java           | 27 ++++++---------
 .../src/forge/assets/FSkinTexture.java        | 12 +++----
 .../src/forge/assets/ImageCache.java          | 34 ++++++++++++-------
 .../src/forge/card/CardRenderer.java          |  8 ++---
 8 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 7267170a25b..bcd1cc46b44 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -55,7 +55,6 @@ import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -104,8 +103,7 @@ public class Forge implements ApplicationListener {
     public static boolean enablePreloadExtendedArt = false;
     public static boolean isTabletDevice = false;
     public static String locale = "en-US";
-    public Assets cardAssets;
-    public Assets otherAssets;
+    public Assets assets;
     public static boolean hdbuttons = false;
     public static boolean hdstart = false;
     public static boolean isPortraitMode = false;
@@ -166,8 +164,7 @@ public class Forge implements ApplicationListener {
             // don't allow to read and process
             ForgeConstants.SPRITE_CARDBG_FILE = "";
         }
-        cardAssets = new Assets();
-        otherAssets = new Assets();
+        assets = new Assets();
         graphics = new Graphics();
         splashScreen = new SplashScreen();
         frameRate = new FrameRate();
@@ -954,8 +951,7 @@ public class Forge implements ApplicationListener {
             currentScreen.onClose(null);
             currentScreen = null;
         }
-        cardAssets.dispose();
-        otherAssets.dispose();
+        assets.dispose();
         Dscreens.clear();
         graphics.dispose();
         SoundSystem.instance.dispose();
@@ -967,11 +963,8 @@ public class Forge implements ApplicationListener {
     /** Retrieve assets.
      * @param other if set to true returns otherAssets otherwise returns cardAssets
      */
-    public static Assets getAssets(boolean other) {
-        if (other)
-            return ((Forge)Gdx.app.getApplicationListener()).otherAssets;
-        else
-            return ((Forge)Gdx.app.getApplicationListener()).cardAssets;
+    public static Assets getAssets() {
+        return ((Forge)Gdx.app.getApplicationListener()).assets;
     }
     public static boolean switchScene(Scene newScene) {
         if (currentScene != null) {
diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
index 8813e54725c..d3df18b0d22 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Config.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -120,11 +120,11 @@ public class Config {
 
     public TextureAtlas getAtlas(String spriteAtlas) {
         String fileName = getFile(spriteAtlas).path();
-        if (!Forge.getAssets(true).manager.contains(fileName, TextureAtlas.class)) {
-            Forge.getAssets(true).manager.load(fileName, TextureAtlas.class);
-            Forge.getAssets(true).manager.finishLoadingAsset(fileName);
+        if (!Forge.getAssets().others.contains(fileName, TextureAtlas.class)) {
+            Forge.getAssets().others.load(fileName, TextureAtlas.class);
+            Forge.getAssets().others.finishLoadingAsset(fileName);
         }
-        return Forge.getAssets(true).manager.get(fileName);
+        return Forge.getAssets().others.get(fileName);
     }
     public SettingData getSettingData()
     {
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index 0b88a5af937..f4410bf59ac 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -2,12 +2,28 @@ package forge.assets;
 
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.ObjectMap;
+
+import java.util.HashMap;
 
 public class Assets implements Disposable {
-    public AssetManager manager = new AssetManager(new AbsoluteFileHandleResolver());
+    public AssetManager cards = new AssetManager(new AbsoluteFileHandleResolver());
+    public AssetManager others = new AssetManager(new AbsoluteFileHandleResolver());
+    public HashMap<Integer, FSkinFont> fonts = new HashMap<>();
+    public ObjectMap<Integer, BitmapFont> counterFonts = new ObjectMap<>();
+    public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
     @Override
     public void dispose() {
-        manager.dispose();
+        cards.dispose();
+        others.dispose();
+        for (BitmapFont bitmapFont : counterFonts.values())
+            bitmapFont.dispose();
+        for (Texture texture : generatedCards.values())
+            texture.dispose();
+        for (FSkinFont fSkinFont : fonts.values())
+            fSkinFont.font.dispose();
     }
 }
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index eb5f2c8ce24..cb08205eecf 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -88,7 +88,7 @@ public class FSkin {
      *            the skin name
      */
     public static void loadLight(String skinName, final SplashScreen splashScreen) {
-        AssetManager manager = Forge.getAssets(true).manager;
+        AssetManager manager = Forge.getAssets().others;
         preferredName = skinName.toLowerCase().replace(' ', '_');
 
         //reset hd buttons/icons
@@ -236,7 +236,7 @@ public class FSkin {
             parameter.magFilter = Texture.TextureFilter.Linear;
         }
 
-        AssetManager manager = Forge.getAssets(true).manager;
+        AssetManager manager = Forge.getAssets().others;
 
         // Grab and test various sprite files.
         final FileHandle f1 = getDefaultSkinFile(SourceFile.ICONS.getFilename());
diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index 8367c054642..f00e6adb98a 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -3,7 +3,6 @@ package forge.assets;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
@@ -39,7 +38,6 @@ public class FSkinFont {
     private static final int MAX_FONT_SIZE_MANY_GLYPHS = 36;
 
     private static final String TTF_FILE = "font1.ttf";
-    private static final HashMap<Integer, FSkinFont> fonts = new HashMap<>();
 
     private static final String commonCharacterSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklm"
             + "nopqrstuvwxyz1234567890\"!?'.,;:()[]{}<>|/@\\^$-%+=#_&*\u2014"
@@ -58,10 +56,10 @@ public class FSkinFont {
         return _get((int)Utils.scale(unscaledSize));
     }
     public static FSkinFont _get(final int scaledSize) {
-        FSkinFont skinFont = fonts.get(scaledSize);
+        FSkinFont skinFont = Forge.getAssets().fonts.get(scaledSize);
         if (skinFont == null) {
             skinFont = new FSkinFont(scaledSize);
-            fonts.put(scaledSize, skinFont);
+            Forge.getAssets().fonts.put(scaledSize, skinFont);
         }
         return skinFont;
     }
@@ -97,14 +95,14 @@ public class FSkinFont {
     }
 
     public static void updateAll() {
-        for (FSkinFont skinFont : fonts.values()) {
+        for (FSkinFont skinFont : Forge.getAssets().fonts.values()) {
             skinFont.updateFont();
         }
     }
 
     private final int fontSize;
     private final float scale;
-    private BitmapFont font;
+    BitmapFont font;
 
     private FSkinFont(int fontSize0) {
         if (fontSize0 > MAX_FONT_SIZE) {
@@ -400,16 +398,13 @@ public class FSkinFont {
         if (fontFile != null && fontFile.exists()) {
             final BitmapFontData data = new BitmapFontData(fontFile, false);
             String finalFontName = fontName;
-            FThreads.invokeInEdtNowOrLater(new Runnable() {
-                @Override
-                public void run() { //font must be initialized on UI thread
-                    try {
-                        font = new BitmapFont(data, (TextureRegion) null, true);
-                        found[0] = true;
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        found[0] = false;
-                    }
+            FThreads.invokeInEdtNowOrLater(() -> { //font must be initialized on UI thread
+                try {
+                    font = new BitmapFont(data, (TextureRegion) null, true);
+                    found[0] = true;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    found[0] = false;
                 }
             });
         }
diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
index 348f51b69cb..8bee73fe9b3 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
@@ -131,9 +131,9 @@ public enum FSkinTexture implements FImage {
                 if (preferredFile.path().contains("fallback_skin")) {
                     texture = new Texture(preferredFile);
                 } else {
-                    Forge.getAssets(true).manager.load(preferredFile.path(), Texture.class);
-                    Forge.getAssets(true).manager.finishLoadingAsset(preferredFile.path());
-                    texture = Forge.getAssets(true).manager.get(preferredFile.path(), Texture.class);
+                    Forge.getAssets().others.load(preferredFile.path(), Texture.class);
+                    Forge.getAssets().others.finishLoadingAsset(preferredFile.path());
+                    texture = Forge.getAssets().others.get(preferredFile.path(), Texture.class);
                 }
             }
             catch (final Exception e) {
@@ -155,9 +155,9 @@ public enum FSkinTexture implements FImage {
                     if (defaultFile.path().contains("fallback_skin")) {
                         texture = new Texture(defaultFile);
                     } else {
-                        Forge.getAssets(true).manager.load(defaultFile.path(), Texture.class);
-                        Forge.getAssets(true).manager.finishLoadingAsset(defaultFile.path());
-                        texture = Forge.getAssets(true).manager.get(defaultFile.path(), Texture.class);
+                        Forge.getAssets().others.load(defaultFile.path(), Texture.class);
+                        Forge.getAssets().others.finishLoadingAsset(defaultFile.path());
+                        texture = Forge.getAssets().others.get(defaultFile.path(), Texture.class);
                     }
                 }
                 catch (final Exception e) {
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index e3694817979..ff85bdec796 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -97,7 +97,6 @@ public class ImageCache {
     public static FImage BlackBorder = FSkinImage.IMG_BORDER_BLACK;
     public static FImage WhiteBorder = FSkinImage.IMG_BORDER_WHITE;
     private static final ObjectMap<String, Pair<String, Boolean>> imageBorder = new ObjectMap<>(1024);
-    private static final ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
 
     private static boolean imageLoaded, delayLoadRequested;
     public static void allowSingleLoad() {
@@ -121,11 +120,11 @@ public class ImageCache {
         ImageKeys.clearMissingCards();
     }
     public static void clearGeneratedCards() {
-        generatedCards.clear();
+        Forge.getAssets().generatedCards.clear();
     }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
-        Forge.getAssets(false).manager.clear();
+        Forge.getAssets().cards.clear();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -134,7 +133,9 @@ public class ImageCache {
             if(imageKey.startsWith(ImageKeys.CARD_PREFIX) || imageKey.startsWith(ImageKeys.TOKEN_PREFIX))
                 return getImage(ii.getImageKey(false), true, false);
         }
-        return getImage(ii.getImageKey(false), true, true);
+        boolean useDefaultNotFound = imageKey != null && !(imageKey.startsWith(ImageKeys.PRECON_PREFIX) || imageKey.startsWith(ImageKeys.FATPACK_PREFIX)
+                || imageKey.startsWith(ImageKeys.BOOSTERBOX_PREFIX) || imageKey.startsWith(ImageKeys.BOOSTER_PREFIX) || imageKey.startsWith(ImageKeys.TOURNAMENTPACK_PREFIX));
+        return getImage(ii.getImageKey(false), useDefaultNotFound, true);
     }
 
     /**
@@ -265,33 +266,40 @@ public class ImageCache {
         if (file == null)
             return null;
         if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
-            return generatedCards.get(imageKey);
-        return Forge.getAssets(otherCache).manager.get(file.getPath(), Texture.class, false);
+            return Forge.getAssets().generatedCards.get(imageKey);
+        if (otherCache)
+            return Forge.getAssets().others.get(file.getPath(), Texture.class, false);
+        return Forge.getAssets().cards.get(file.getPath(), Texture.class, false);
     }
     static Texture loadAsset(String imageKey, File file, boolean otherCache) {
         if (file == null)
             return null;
         syncQ.add(file.getPath());
-        if (!otherCache && Forge.getAssets(false).manager.getLoadedAssets() > maxCardCapacity) {
-            unloadCardTextures(Forge.getAssets(false).manager);
+        if (!otherCache && Forge.getAssets().cards.getLoadedAssets() > maxCardCapacity) {
+            unloadCardTextures(Forge.getAssets().cards);
             return null;
         }
         String fileName = file.getPath();
         //load to assetmanager
-        Forge.getAssets(otherCache).manager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-        Forge.getAssets(otherCache).manager.finishLoadingAsset(fileName);
+        if (otherCache) {
+            Forge.getAssets().others.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            Forge.getAssets().others.finishLoadingAsset(fileName);
+        } else {
+            Forge.getAssets().cards.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+            Forge.getAssets().cards.finishLoadingAsset(fileName);
+        }
         //return loaded assets
         if (otherCache) {
-            return Forge.getAssets(true).manager.get(fileName, Texture.class, false);
+            return Forge.getAssets().others.get(fileName, Texture.class, false);
         } else {
-            Texture t = Forge.getAssets(false).manager.get(fileName, Texture.class, false);
+            Texture t = Forge.getAssets().cards.get(fileName, Texture.class, false);
             //if full bordermasking is enabled, update the border color
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
                 updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
                 //if borderless, generate new texture from the asset and store
                 if (borderless) {
-                    generatedCards.put(imageKey, generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled()));
+                    Forge.getAssets().generatedCards.put(imageKey, generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled()));
                 }
             }
             return t;
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index a9d53f9f142..b8acce7d277 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -104,8 +104,6 @@ public class CardRenderer {
     private static final float BORDER_THICKNESS = Utils.scale(1);
     public static final float PADDING_MULTIPLIER = 0.021f;
     public static final float CROP_MULTIPLIER = 0.96f;
-
-    private static Map<Integer, BitmapFont> counterFonts = new HashMap<>();
     private static final Color counterBackgroundColor = new Color(0f, 0f, 0f, 0.9f);
     private static final Map<CounterType, Color> counterColorCache = new HashMap<>();
     private static final GlyphLayout layout = new GlyphLayout();
@@ -1101,7 +1099,7 @@ public class CardRenderer {
     private static void drawCounterTabs(final CardView card, final Graphics g, final float x, final float y, final float w, final float h) {
 
         int fontSize = Math.max(11, Math.min(22, (int) (h * 0.08)));
-        BitmapFont font = counterFonts.get(fontSize);
+        BitmapFont font = Forge.getAssets().counterFonts.get(fontSize);
 
         final float additionalXOffset = 3f * ((fontSize - 11) / 11f);
         final float variableWidth = ((fontSize - 11) / 11f) * 44f;
@@ -1218,7 +1216,7 @@ public class CardRenderer {
     private static void drawMarkersTabs(final List<String> markers, final Graphics g, final float x, final float y, final float w, final float h, boolean larger) {
 
         int fontSize = larger ? Math.max(9, Math.min(22, (int) (h * 0.08))) : Math.max(8, Math.min(22, (int) (h * 0.05)));
-        BitmapFont font = counterFonts.get(fontSize);
+        BitmapFont font = Forge.getAssets().counterFonts.get(fontSize);
 
         final float additionalXOffset = 3f * ((fontSize - 8) / 8f);
 
@@ -1410,7 +1408,7 @@ public class CardRenderer {
                     textureRegions.add(new TextureRegion(texture));
                 }
 
-                counterFonts.put(fontSize, new BitmapFont(fontData, textureRegions, true));
+                Forge.getAssets().counterFonts.put(fontSize, new BitmapFont(fontData, textureRegions, true));
 
                 generator.dispose();
                 packer.dispose();

From d3460d1901630c7f136d09518e79afc5c43891c5 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 9 Jul 2022 09:29:41 +0100
Subject: [PATCH 227/309] edition_fix

---
 forge-gui/res/editions/Jumpstart Historic Horizons.txt | 4 ----
 forge-gui/res/editions/Modern Horizons 2.txt           | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/editions/Jumpstart Historic Horizons.txt b/forge-gui/res/editions/Jumpstart Historic Horizons.txt
index a4fc22b816b..9adc946bf70 100644
--- a/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
+++ b/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
@@ -794,9 +794,5 @@ ScryfallCode=J21
 786 L Mountain
 787 L Forest
 
-[rebalanced]
-A438 U A-Dragon's Rage Channeler @Martina Fackova
-A529 C A-Unholy Heat @Kari Christensen
-
 [tokens]
 u_8_8_kraken
diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt
index 4bbc7b682e3..a5515edfbf6 100644
--- a/forge-gui/res/editions/Modern Horizons 2.txt	
+++ b/forge-gui/res/editions/Modern Horizons 2.txt	
@@ -522,6 +522,10 @@ ScryfallCode=MH2
 [bundle]
 492 R Yusri, Fortune's Flame @Evyn Fong
 
+[rebalanced]
+A121 U A-Dragon's Rage Channeler @Martina Fackova
+A145 C A-Unholy Heat @Kari Christensen
+
 [Lands]
 19 Arid Mesa|MH2|1
 1 Arid Mesa|MH2|2

From b385fe803305c21894d5ec5cf29559074d974bb4 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 16:40:07 +0800
Subject: [PATCH 228/309] remove unused function

---
 forge-gui-mobile/src/forge/assets/FSkinFont.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index f00e6adb98a..985baaec43e 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -47,11 +47,6 @@ public class FSkinFont {
     static {
         FileUtil.ensureDirectoryExists(ForgeConstants.FONTS_DIR);
     }
-    public static void clear() {
-        fonts.clear();
-        //reset maxFontSize and Preload
-        preloadAll("");
-    }
     public static FSkinFont get(final int unscaledSize) {
         return _get((int)Utils.scale(unscaledSize));
     }

From 24069c2b2a7616a8745482642a051833b593a25b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 16:45:45 +0800
Subject: [PATCH 229/309] Update SplashScreen.java

---
 forge-gui-mobile/src/forge/screens/SplashScreen.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java
index ed80eceb8b6..8fe1539f532 100644
--- a/forge-gui-mobile/src/forge/screens/SplashScreen.java
+++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java
@@ -307,7 +307,7 @@ public class SplashScreen extends FContainer {
                 + "Forge is open source software, released under the GNU General Public License.";
         if (Forge.forcedEnglishonCJKMissing && !clear) {
             clear = true;
-            FSkinFont.clear();
+            FSkinFont.preloadAll("");
             disclaimerFont = FSkinFont.get(9);
         }
         g.drawText(disclaimer, disclaimerFont, FProgressBar.SEL_FORE_COLOR,

From e5727c60d5725d9ecb41082f06f891e51e616093 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 16:53:45 +0800
Subject: [PATCH 230/309] revert override

---
 forge-gui-mobile/src/forge/assets/ImageCache.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index ff85bdec796..52f33eeeed4 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -133,9 +133,7 @@ public class ImageCache {
             if(imageKey.startsWith(ImageKeys.CARD_PREFIX) || imageKey.startsWith(ImageKeys.TOKEN_PREFIX))
                 return getImage(ii.getImageKey(false), true, false);
         }
-        boolean useDefaultNotFound = imageKey != null && !(imageKey.startsWith(ImageKeys.PRECON_PREFIX) || imageKey.startsWith(ImageKeys.FATPACK_PREFIX)
-                || imageKey.startsWith(ImageKeys.BOOSTERBOX_PREFIX) || imageKey.startsWith(ImageKeys.BOOSTER_PREFIX) || imageKey.startsWith(ImageKeys.TOURNAMENTPACK_PREFIX));
-        return getImage(ii.getImageKey(false), useDefaultNotFound, true);
+        return getImage(ii.getImageKey(false), true, true);
     }
 
     /**

From fe5cc6f82999ca541c8b4b51d3045902cbd85aab Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 16:54:55 +0800
Subject: [PATCH 231/309] missing import

---
 forge-gui-mobile/src/forge/Forge.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index bcd1cc46b44..8d79b197caf 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -55,6 +55,7 @@ import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

From 3e3abed3444107dd8eacb3c966c438a58bd5b5a1 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 17:01:20 +0800
Subject: [PATCH 232/309] misc moved to Assets

---
 forge-gui-mobile/src/forge/Forge.java         | 12 ++++++------
 forge-gui-mobile/src/forge/assets/Assets.java |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index bcd1cc46b44..5bdf9ac32fc 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -343,20 +343,20 @@ public class Forge implements ApplicationListener {
         }
     }
     public static Texture getTitleBG() {
-        if (misc.get(0) == null) {
-            misc.put(0, new Texture(GuiBase.isAndroid()
+        if (getAssets().misc.get(0) == null) {
+            getAssets().misc.put(0, new Texture(GuiBase.isAndroid()
                     ? Gdx.files.internal("fallback_skin").child("title_bg_lq.png")
                     : Gdx.files.classpath("fallback_skin").child("title_bg_lq.png")));
         }
-        return misc.get(0);
+        return getAssets().misc.get(0);
     }
     public static Texture getTransitionBG() {
-        if (misc.get(1) == null) {
-            misc.put(1, new Texture(GuiBase.isAndroid()
+        if (getAssets().misc.get(1) == null) {
+            getAssets().misc.put(1, new Texture(GuiBase.isAndroid()
                     ? Gdx.files.internal("fallback_skin").child("transition.png")
                     : Gdx.files.classpath("fallback_skin").child("transition.png")));
         }
-        return misc.get(1);
+        return getAssets().misc.get(1);
     }
     protected void afterDbLoaded() {
         destroyThis = false; //Allow back()
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index f4410bf59ac..d0f812f578d 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -15,6 +15,7 @@ public class Assets implements Disposable {
     public HashMap<Integer, FSkinFont> fonts = new HashMap<>();
     public ObjectMap<Integer, BitmapFont> counterFonts = new ObjectMap<>();
     public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
+    public ObjectMap<Integer, Texture> misc = new ObjectMap<>();
     @Override
     public void dispose() {
         cards.dispose();
@@ -25,5 +26,7 @@ public class Assets implements Disposable {
             texture.dispose();
         for (FSkinFont fSkinFont : fonts.values())
             fSkinFont.font.dispose();
+        for (Texture texture : misc.values())
+            texture.dispose();
     }
 }

From 2b9fa901c6d86becb2c417362351c56530474251 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 17:15:36 +0800
Subject: [PATCH 233/309] unused import

---
 forge-gui-mobile/src/forge/Forge.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index d8f662b25c9..5bdf9ac32fc 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -55,7 +55,6 @@ import java.io.File;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

From 3c4f31d37ca5dfff8382adfa9d53ba5cee5e235f Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 17:17:07 +0800
Subject: [PATCH 234/309] remove extra

---
 forge-gui-mobile/src/forge/Forge.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 5bdf9ac32fc..9246024c179 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -124,7 +124,6 @@ public class Forge implements ApplicationListener {
     public static boolean forcedEnglishonCJKMissing = false;
     public static boolean adventureLoaded = false;
     private static Localizer localizer;
-    static Map<Integer, Texture> misc = new HashMap<>();
 
     public static ApplicationListener getApp(Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean value, boolean androidOrientation, int totalRAM, boolean isTablet, int AndroidAPI, String AndroidRelease, String deviceName) {
         app = new Forge();

From ffef4c61912972490154445e2942d21617768f47 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 17:23:35 +0800
Subject: [PATCH 235/309] unused import

---
 forge-gui-mobile/src/forge/Forge.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index 9246024c179..f80ad5bca7c 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -56,7 +56,6 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
-import java.util.Map;
 
 public class Forge implements ApplicationListener {
     public static final String CURRENT_VERSION = "1.6.53.001";

From 421c2102526acd607f2a7287c2ab9d7c2b7d8534 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 18:42:37 +0800
Subject: [PATCH 236/309] move tmx textures to Assets

---
 forge-gui-mobile/src/forge/Forge.java         | 25 +++----------------
 .../adventure/util/TemplateTmxMapLoader.java  |  9 +++----
 forge-gui-mobile/src/forge/assets/Assets.java | 19 ++++++++++++--
 forge-gui-mobile/src/forge/assets/FSkin.java  |  2 +-
 .../src/forge/screens/SplashScreen.java       |  2 +-
 .../screens/quest/QuestTournamentsScreen.java |  3 ++-
 6 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index f80ad5bca7c..ec9e08fb219 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -8,7 +8,6 @@ import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.graphics.Cursor;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Pixmap;
-import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.TextureData;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -340,22 +339,6 @@ public class Forge implements ApplicationListener {
             e.printStackTrace();
         }
     }
-    public static Texture getTitleBG() {
-        if (getAssets().misc.get(0) == null) {
-            getAssets().misc.put(0, new Texture(GuiBase.isAndroid()
-                    ? Gdx.files.internal("fallback_skin").child("title_bg_lq.png")
-                    : Gdx.files.classpath("fallback_skin").child("title_bg_lq.png")));
-        }
-        return getAssets().misc.get(0);
-    }
-    public static Texture getTransitionBG() {
-        if (getAssets().misc.get(1) == null) {
-            getAssets().misc.put(1, new Texture(GuiBase.isAndroid()
-                    ? Gdx.files.internal("fallback_skin").child("transition.png")
-                    : Gdx.files.classpath("fallback_skin").child("transition.png")));
-        }
-        return getAssets().misc.get(1);
-    }
     protected void afterDbLoaded() {
         destroyThis = false; //Allow back()
         Gdx.input.setCatchKey(Keys.MENU, true);
@@ -832,8 +815,8 @@ public class Forge implements ApplicationListener {
                                 animationBatch.setColor(1, 1, 1, 1);
                                 animationBatch.draw(lastScreenTexture, 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
                                 animationBatch.setColor(1, 1, 1, 1 - (1 / transitionTime) * animationTimeout);
-                                animationBatch.draw(getTransitionBG(), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-                                animationBatch.draw(getTransitionBG(), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+                                animationBatch.draw(getAssets().fallback_skins.get(1), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+                                animationBatch.draw(getAssets().fallback_skins.get(1), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
                                 animationBatch.end();
                                 if (animationTimeout < 0) {
                                     currentScene.render();
@@ -852,8 +835,8 @@ public class Forge implements ApplicationListener {
                                 animationBatch.setColor(1, 1, 1, 1);
                                 animationBatch.draw(lastScreenTexture, 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
                                 animationBatch.setColor(1, 1, 1, (1 / transitionTime) * (animationTimeout + transitionTime));
-                                animationBatch.draw(getTransitionBG(), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-                                animationBatch.draw(getTransitionBG(), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+                                animationBatch.draw(getAssets().fallback_skins.get(1), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+                                animationBatch.draw(getAssets().fallback_skins.get(1), 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
                                 animationBatch.end();
                                 return;
                             }
diff --git a/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java b/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java
index 0306838517a..9580c3382f7 100644
--- a/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java
+++ b/forge-gui-mobile/src/forge/adventure/util/TemplateTmxMapLoader.java
@@ -15,6 +15,7 @@ import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.SerializationException;
 import com.badlogic.gdx.utils.XmlReader;
+import forge.Forge;
 
 import java.io.File;
 
@@ -34,17 +35,15 @@ public class TemplateTmxMapLoader extends TmxMapLoader {
 
         this.root = xml.parse(tmxFile);
 
-        ObjectMap<String, Texture> textures = new ObjectMap<String, Texture>();
-
         final Array<FileHandle> textureFiles = getDependencyFileHandles(tmxFile);
         for (FileHandle textureFile : textureFiles) {
             Texture texture = new Texture(textureFile, parameter.generateMipMaps);
             texture.setFilter(parameter.textureMinFilter, parameter.textureMagFilter);
-            textures.put(textureFile.path(), texture);
+            Forge.getAssets().tmxMap.put(textureFile.path(), texture);
         }
 
-        TiledMap map = loadTiledMap(tmxFile, parameter, new ImageResolver.DirectImageResolver(textures));
-        map.setOwnedResources(textures.values().toArray());
+        TiledMap map = loadTiledMap(tmxFile, parameter, new ImageResolver.DirectImageResolver(Forge.getAssets().tmxMap));
+        map.setOwnedResources(Forge.getAssets().tmxMap.values().toArray());
         return map;
     }
 
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index d0f812f578d..4d191b19dc9 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -1,11 +1,13 @@
 package forge.assets;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.ObjectMap;
+import forge.gui.GuiBase;
 
 import java.util.HashMap;
 
@@ -15,7 +17,18 @@ public class Assets implements Disposable {
     public HashMap<Integer, FSkinFont> fonts = new HashMap<>();
     public ObjectMap<Integer, BitmapFont> counterFonts = new ObjectMap<>();
     public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
-    public ObjectMap<Integer, Texture> misc = new ObjectMap<>();
+    public ObjectMap<Integer, Texture> fallback_skins = new ObjectMap<>();
+    public ObjectMap<String, Texture> tmxMap = new ObjectMap<String, Texture>();
+    public Assets() {
+        //init titlebg fallback
+        fallback_skins.put(0, new Texture(GuiBase.isAndroid()
+                ? Gdx.files.internal("fallback_skin").child("title_bg_lq.png")
+                : Gdx.files.classpath("fallback_skin").child("title_bg_lq.png")));
+        //init transition fallback
+        fallback_skins.put(1, new Texture(GuiBase.isAndroid()
+                ? Gdx.files.internal("fallback_skin").child("transition.png")
+                : Gdx.files.classpath("fallback_skin").child("transition.png")));
+    }
     @Override
     public void dispose() {
         cards.dispose();
@@ -26,7 +39,9 @@ public class Assets implements Disposable {
             texture.dispose();
         for (FSkinFont fSkinFont : fonts.values())
             fSkinFont.font.dispose();
-        for (Texture texture : misc.values())
+        for (Texture texture : fallback_skins.values())
+            texture.dispose();
+        for (Texture texture : tmxMap.values())
             texture.dispose();
     }
 }
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index cb08205eecf..3ac32a9d883 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -167,7 +167,7 @@ public class FSkin {
             try {
                 int w, h;
                 if (f.path().contains("fallback_skin")) {
-                    //the file is not accesible by the manager since it not on absolute path...
+                    //the file is not accesible by the assetmanager using absolute fileresolver since it resides on internal path or classpath
                     Texture txSplash = new Texture(f);
                     w = txSplash.getWidth();
                     h = txSplash.getHeight();
diff --git a/forge-gui-mobile/src/forge/screens/SplashScreen.java b/forge-gui-mobile/src/forge/screens/SplashScreen.java
index 8fe1539f532..d43f57bc13d 100644
--- a/forge-gui-mobile/src/forge/screens/SplashScreen.java
+++ b/forge-gui-mobile/src/forge/screens/SplashScreen.java
@@ -169,7 +169,7 @@ public class SplashScreen extends FContainer {
     }
 
     void drawTransition(Graphics g, boolean openAdventure, float percentage) {
-        TextureRegion tr = new TextureRegion(Forge.getTitleBG());
+        TextureRegion tr = new TextureRegion(Forge.getAssets().fallback_skins.get(0));
         if (!Forge.isLandscapeMode() && tr != null) {
             float ar = 1.78f;
             int w = (int) (tr.getRegionHeight() / ar);
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
index 710393ab227..00bbc802c72 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
@@ -173,7 +173,8 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
     @Override
     protected void updateHeaderCaption() {
         if (mode == Mode.PREPARE_DECK) {
-            setHeaderCaption(FModel.getQuest().getName() + " - " + getGameType() + "\n" + Forge.getLocalizer().getMessage("lblDraft") + " - " + FModel.getQuest().getAchievements().getCurrentDraft().getTitle());
+            String title = FModel.getQuest().getAchievements().getCurrentDraft() == null ? "" : FModel.getQuest().getAchievements().getCurrentDraft().getTitle();
+            setHeaderCaption(FModel.getQuest().getName() + " - " + getGameType() + "\n" + Forge.getLocalizer().getMessage("lblDraft") + " - " + title);
         }
         else {
             super.updateHeaderCaption();

From 6915b0d7a429ccc9619d655095fdcf884e5534ad Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 9 Jul 2022 20:27:56 +0800
Subject: [PATCH 237/309] adjust label width

should fix portrait mode
---
 forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
index 0d6e55b270a..4f7dae601c9 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
@@ -133,7 +133,8 @@ public class SettingsScene extends UIScene {
         Label label = Controls.newLabel(name);
         label.setWrap(true);
         settingGroup.row().space(5);
-        settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5).width(100).expand();
+        int w = Forge.isLandscapeMode() ? 160 : 80;
+        settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5).width(w).expand();
     }
 
     @Override

From b1224cb37ec8f2a6bf7ae503f4d9d253361e81cc Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Sat, 9 Jul 2022 09:39:30 -0400
Subject: [PATCH 238/309] TriggerMilledAll (for Zellix [CLB]) (#1064)

* TriggerMilledAll.java

* TriggerType.MilledAll

* Player.mill run MilledAll trigger

* CardZoneTable remove redundant Map
---
 .../java/forge/game/card/CardZoneTable.java   |  2 +-
 .../main/java/forge/game/player/Player.java   |  6 ++
 .../forge/game/trigger/TriggerMilledAll.java  | 71 +++++++++++++++++++
 .../java/forge/game/trigger/TriggerType.java  |  1 +
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 forge-game/src/main/java/forge/game/trigger/TriggerMilledAll.java

diff --git a/forge-game/src/main/java/forge/game/card/CardZoneTable.java b/forge-game/src/main/java/forge/game/card/CardZoneTable.java
index f0e9bb8d387..12b09e2e65a 100644
--- a/forge-game/src/main/java/forge/game/card/CardZoneTable.java
+++ b/forge-game/src/main/java/forge/game/card/CardZoneTable.java
@@ -56,7 +56,7 @@ public class CardZoneTable extends ForwardingTable<ZoneType, ZoneType, CardColle
             final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
             runParams.put(AbilityKey.Cards, new CardZoneTable(this));
             runParams.put(AbilityKey.Cause, cause);
-            game.getTriggerHandler().runTrigger(TriggerType.ChangesZoneAll, AbilityKey.newMap(runParams), false);
+            game.getTriggerHandler().runTrigger(TriggerType.ChangesZoneAll, runParams, false);
         }
     }
 
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 3e3a90e74f0..e6c7dc253a7 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -1603,6 +1603,12 @@ public class Player extends GameEntity implements Comparable<Player> {
             }
         }
 
+        // MilledAll trigger
+        final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
+        runParams.put(AbilityKey.Cards, milled);
+        runParams.put(AbilityKey.Player, this);
+        game.getTriggerHandler().runTrigger(TriggerType.MilledAll, runParams, false);
+
         return milled;
     }
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerMilledAll.java b/forge-game/src/main/java/forge/game/trigger/TriggerMilledAll.java
new file mode 100644
index 00000000000..fa2fd2ea73c
--- /dev/null
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerMilledAll.java
@@ -0,0 +1,71 @@
+package forge.game.trigger;
+
+import forge.game.ability.AbilityKey;
+import forge.game.card.Card;
+import forge.game.card.CardCollection;
+import forge.game.card.CardLists;
+import forge.game.spellability.SpellAbility;
+import forge.util.Localizer;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * TriggerMilledAll class.
+ * </p>
+ */
+public class TriggerMilledAll extends Trigger {
+
+    /**
+     * <p>
+     * Constructor for TriggerMilledAll
+     * </p>
+     *
+     * @param params
+     *            a {@link java.util.HashMap} object.
+     * @param host
+     *            a {@link forge.game.card.Card} object.
+     * @param intrinsic
+     *            the intrinsic
+     */
+    public TriggerMilledAll (final Map<String, String> params, final Card host, final boolean intrinsic) {
+        super(params, host, intrinsic);
+    }
+
+    /** {@inheritDoc}
+     * @param runParams*/
+    @Override
+    public final boolean performTest(final Map<AbilityKey, Object> runParams) {
+
+        if (!matchesValidParam("ValidPlayer", runParams.get(AbilityKey.Player))) {
+            return false;
+        }
+        if (!matchesValidParam("ValidCard", runParams.get(AbilityKey.Cards))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public final void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {
+        CardCollection cards = (CardCollection) runParams.get(AbilityKey.Cards);
+
+        if (hasParam("ValidCard")) {
+            cards = CardLists.getValidCards(cards, getParam("ValidCard"), getHostCard().getController(),
+                    getHostCard(), this);
+        }
+
+        sa.setTriggeringObject(AbilityKey.Cards, cards);
+        sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
+    }
+
+    @Override
+    public String getImportantStackObjects(SpellAbility sa) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(Localizer.getInstance().getMessage("lblPlayer")).append(": ");
+        sb.append(sa.getTriggeringObject(AbilityKey.Player));
+        return sb.toString();
+    }
+}
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 4f7c94c9ba8..2490cb3b9aa 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java
@@ -80,6 +80,7 @@ public enum TriggerType {
     LifeGained(TriggerLifeGained.class),
     LifeLost(TriggerLifeLost.class),
     LosesGame(TriggerLosesGame.class),
+    MilledAll(TriggerMilledAll.class),
     Mutates(TriggerMutates.class),
     NewGame(TriggerNewGame.class),
     PayCumulativeUpkeep(TriggerPayCumulativeUpkeep.class),

From 241467c34cd6ed34668694642e9aea4186278a88 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sat, 9 Jul 2022 15:39:56 +0200
Subject: [PATCH 239/309] Northmocs Zangief and support, round two (#1074)

* Northmocs Zangief and support, round two

* Cleanup Elminster

Co-authored-by: TRT <>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
---
 forge-game/src/main/java/forge/game/GameAction.java   |  4 +++-
 forge-game/src/main/java/forge/game/card/Card.java    | 11 ++++++++++-
 .../src/main/java/forge/game/card/CardDamageMap.java  |  1 +
 .../src/main/java/forge/game/card/CardProperty.java   |  4 ++++
 .../main/java/forge/game/trigger/TriggerHandler.java  |  5 -----
 forge-gui/res/cardsfolder/upcoming/elminster.txt      |  9 ++++-----
 .../cardsfolder/upcoming/zangief_the_red_cyclone.txt  |  9 +++++++++
 7 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/zangief_the_red_cyclone.txt

diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 257c33cd3f0..a3f9d0598ec 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -2412,6 +2412,9 @@ public class GameAction {
             }
         }
 
+        // for Zangief do this before runWaitingTriggers DamageDone
+        damageMap.triggerExcessDamage(isCombat, lethalDamage, game);
+
         // lose life simultaneously
         if (isCombat) {
             for (Player p : game.getPlayers()) {
@@ -2440,7 +2443,6 @@ public class GameAction {
         preventMap.clear();
 
         damageMap.triggerDamageDoneOnce(isCombat, game);
-        damageMap.triggerExcessDamage(isCombat, lethalDamage, game);
         damageMap.clear();
 
         counterTable.replaceCounterEffect(game, cause, !isCombat);
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 ef63ba39d97..627d0d2a116 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -256,6 +256,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
 
     private Map<Integer, Integer> damage = Maps.newHashMap();
     private boolean hasBeenDealtDeathtouchDamage;
+    private boolean hasBeenDealtExcessDamageThisTurn;
 
     // regeneration
     private FCollection<Card> shields = new FCollection<>();
@@ -5361,6 +5362,13 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         this.hasBeenDealtDeathtouchDamage = hasBeenDealtDeatchtouchDamage;
     }
 
+    public final boolean hasBeenDealtExcessDamageThisTurn() {
+        return hasBeenDealtExcessDamageThisTurn;
+    }
+    public final void setHasBeenDealtExcessDamageThisTurn(final boolean bool) {
+        this.hasBeenDealtExcessDamageThisTurn = bool;
+    }
+
     public final Map<Card, Integer> getAssignedDamageMap() {
         return assignedDamageMap;
     }
@@ -5515,7 +5523,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
         }
         // Defending player at the time the damage was dealt
         runParams.put(AbilityKey.DefendingPlayer, game.getCombat() != null ? game.getCombat().getDefendingPlayerRelatedTo(source) : null);
-        getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, false);
+        getGame().getTriggerHandler().runTrigger(TriggerType.DamageDone, runParams, true);
 
         DamageType damageType = DamageType.Normal;
         if (isPlaneswalker()) { // 120.3c
@@ -6158,6 +6166,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
             setDamage(0);
         }
         setHasBeenDealtDeathtouchDamage(false);
+        setHasBeenDealtExcessDamageThisTurn(false);
         setRegeneratedThisTurn(0);
         resetShield();
         setBecameTargetThisTurn(false);
diff --git a/forge-game/src/main/java/forge/game/card/CardDamageMap.java b/forge-game/src/main/java/forge/game/card/CardDamageMap.java
index ad93f326739..37dd9c620b8 100644
--- a/forge-game/src/main/java/forge/game/card/CardDamageMap.java
+++ b/forge-game/src/main/java/forge/game/card/CardDamageMap.java
@@ -113,6 +113,7 @@ public class CardDamageMap extends ForwardingTable<Card, GameEntity, Integer> {
 
             int excess = sum - (damaged.getKey().hasBeenDealtDeathtouchDamage() ? 1 : damaged.getValue());
             if (excess > 0) {
+                damaged.getKey().setHasBeenDealtExcessDamageThisTurn(true);
                 // Run triggers
                 final Map<AbilityKey, Object> runParams = AbilityKey.newMap();
                 runParams.put(AbilityKey.DamageTarget, damaged.getKey());
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 cc63af4777c..20c17f7c322 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1180,6 +1180,10 @@ public class CardProperty {
             if (card.getAssignedDamage(false, null) == 0) {
                 return false;
             }
+        } else if (property.startsWith("wasDealtExcessDamageThisTurn")) {
+            if (!card.hasBeenDealtExcessDamageThisTurn()) {
+                return false;
+            }
         } else if (property.startsWith("wasDealtDamageByThisGame")) {
             int idx = source.getDamageHistory().getThisGameDamaged().indexOf(card);
             if (idx == -1) {
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 47e199d060e..c0a3e78cffe 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -581,11 +581,6 @@ public class TriggerHandler {
             host.addRemembered(runParams.get(AbilityKey.fromString(regtrig.getParam("RememberKey"))));
         }
 
-        if (regtrig.hasParam("RememberAmount")) {
-            Integer amount = (Integer) sa.getTriggeringObject(AbilityKey.fromString(regtrig.getParam("RememberAmount")));
-            host.addRemembered(amount);
-        }
-
         sa.setStackDescription(sa.toString());
 
         Player decider = null;
diff --git a/forge-gui/res/cardsfolder/upcoming/elminster.txt b/forge-gui/res/cardsfolder/upcoming/elminster.txt
index b3d5afaa01c..0b1fd9ef44b 100644
--- a/forge-gui/res/cardsfolder/upcoming/elminster.txt
+++ b/forge-gui/res/cardsfolder/upcoming/elminster.txt
@@ -2,15 +2,14 @@ Name:Elminster
 ManaCost:3 W U
 Types:Legendary Planeswalker Elminster
 Loyalty:5
-T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigStore | RememberAmount$ ScryNum | TriggerDescription$ Whenever you scry, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying this way.
-SVar:TrigStore:DB$ StoreSVar | SVar$ X | Type$ CountSVar | Expression$ Y | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | StaticAbilities$ ReduceCost | Triggers$ TrigCastSpell | SubAbility$ DBCleanup
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigStore | TriggerDescription$ Whenever you scry, the next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying this way.
+SVar:TrigStore:DB$ StoreSVar | SVar$ X | Type$ Calculate | Expression$ Y | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | StaticAbilities$ ReduceCost | Triggers$ TrigCastSpell
 SVar:ReduceCost:Mode$ ReduceCost | EffectZone$ Command | Type$ Spell | ValidCard$ Instant,Sorcery | Activator$ You | Amount$ X | Insert$ X | Description$ The next instant or sorcery spell you cast this turn costs {X} less to cast, where X is the number of cards looked at while scrying. (INSERT)
 SVar:TrigCastSpell:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ RemoveEffect | Static$ True
 SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Number$0
-SVar:Y:Count$RememberedNumber
+SVar:Y:TriggerCount$ScryNum
 A:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | SubAbility$ DBScry | SpellDescription$ Draw a card, then scry 2.
 SVar:DBScry:DB$ Scry | ScryNum$ 2
 A:AB$ Dig | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | Reveal$ True | SubAbility$ DBToken | SpellDescription$ Exile the top card of your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/zangief_the_red_cyclone.txt b/forge-gui/res/cardsfolder/upcoming/zangief_the_red_cyclone.txt
new file mode 100644
index 00000000000..70157645115
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/zangief_the_red_cyclone.txt
@@ -0,0 +1,9 @@
+Name:Zangief, the Red Cyclone
+ManaCost:2 B R G
+Types:Legendary Creature Human Warrior
+PT:7/4
+K:CARDNAME must be blocked if able.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Indestructible | Condition$ PlayerTurn | Description$ Iron Muscle — As long as it's your turn, NICKNAME has indestructible.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature.wasDealtExcessDamageThisTurn | Execute$ TrigSac | TriggerDescription$ Spinning Piledriver – Whenever NICKNAME deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.
+SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent.nonCreature+nonLand | SacMessage$ noncreature, nonland permanent | Defined$ TriggeredTargetController
+Oracle:Zangief, the Red Cyclone must be blocked if able.\nIron Muscle — As long as it's your turn, Zangief has indestructible.\nSpinning Piledriver — Whenever Zangief deals damage to a creature, if that creature was dealt excess damage this turn, that creature's controller sacrifices a noncreature, nonland permanent.

From 25565478401fe648d482abaf9b873eb458fdceca Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sat, 9 Jul 2022 14:47:35 +0100
Subject: [PATCH 240/309] 2 more CLB cards (#1083)

* Create patron_of_the_arts.txt

* Create earth_tremor.txt
---
 forge-gui/res/cardsfolder/upcoming/earth_tremor.txt      | 6 ++++++
 .../res/cardsfolder/upcoming/patron_of_the_arts.txt      | 9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/earth_tremor.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/patron_of_the_arts.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/earth_tremor.txt b/forge-gui/res/cardsfolder/upcoming/earth_tremor.txt
new file mode 100644
index 00000000000..66e50f7e772
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/earth_tremor.txt
@@ -0,0 +1,6 @@
+Name:Earth Tremor
+ManaCost:3 R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | SpellDescription$ CARDNAME deals damage to target creature or planeswalker equal to the number of lands you control.
+SVar:X:Count$Valid Land.YouCtrl
+Oracle:Earth Tremor deals damage to target creature or planeswalker equal to the number of lands you control.
diff --git a/forge-gui/res/cardsfolder/upcoming/patron_of_the_arts.txt b/forge-gui/res/cardsfolder/upcoming/patron_of_the_arts.txt
new file mode 100644
index 00000000000..63efea66796
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/patron_of_the_arts.txt
@@ -0,0 +1,9 @@
+Name:Patron of the Arts
+ManaCost:2 R
+Types:Creature Dragon Noble
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ TriggeredCardController
+DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact
+Oracle:When Patron of the Arts enters the battlefield or dies, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

From 5eac1623777840aa659239761ab0e0f2ba1e9af7 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sat, 9 Jul 2022 15:35:21 +0100
Subject: [PATCH 241/309] Add HBG to formats

---
 forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt  | 4 ++--
 forge-gui/res/formats/Archived/Historic/2022-07-07.txt | 4 ++--
 forge-gui/res/formats/Sanctioned/Historic.txt          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt b/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
index ffae03f2c48..f020b77db24 100644
--- a/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
+++ b/forge-gui/res/formats/Archived/Alchemy/2022-07-07.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Alchemy (2022-07-07)
+Name:Alchemy (HBG)
 Type:Archived
 Subtype:Arena
 Effective:2022-07-07
-Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC, YSNC
+Sets:ANA, ANB, ZNR, KHM, STX, AFR, MID, VOW, YMID, NEO, YNEO, SNC, YSNC, HBG
 Banned:Grinning Ignus
diff --git a/forge-gui/res/formats/Archived/Historic/2022-07-07.txt b/forge-gui/res/formats/Archived/Historic/2022-07-07.txt
index 7aecc7d09a8..f42567978ad 100644
--- a/forge-gui/res/formats/Archived/Historic/2022-07-07.txt
+++ b/forge-gui/res/formats/Archived/Historic/2022-07-07.txt
@@ -1,7 +1,7 @@
 [format]
-Name:Historic (2022-07-07)
+Name:Historic (HBG)
 Type:Archived
 Subtype:Arena
 Effective:2022-07-07
-Sets: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
+Sets: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
 Banned:Agent of Treachery; Brainstorm; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Lightning Bolt; Memory Lapse; Natural Order; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Swords to Plowshares; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation
diff --git a/forge-gui/res/formats/Sanctioned/Historic.txt b/forge-gui/res/formats/Sanctioned/Historic.txt
index f6fdd767405..0fd4d467bae 100644
--- a/forge-gui/res/formats/Sanctioned/Historic.txt
+++ b/forge-gui/res/formats/Sanctioned/Historic.txt
@@ -4,5 +4,5 @@ Type:Digital
 Subtype:Arena
 Effective:2019-11-21
 Order:142
-Sets: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
+Sets: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
 Banned:Agent of Treachery; Brainstorm; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Lightning Bolt; Memory Lapse; Natural Order; Nexus of Fate; Oko, Thief of Crowns; Once Upon a Time; Swords to Plowshares; Thassa's Oracle; Tibalt's Trickery; Time Warp; Uro, Titan of Nature's Wrath; Veil of Summer; Wilderness Reclamation

From aa395db23408bc16e10aacc8903606b3159f6a5e Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Sat, 9 Jul 2022 11:24:03 -0400
Subject: [PATCH 242/309] CleanUp -> Cleanup

---
 forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
index 8751788d632..8d018b7090f 100644
--- a/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/alaundo_the_seer.txt
@@ -10,6 +10,6 @@ SVar:TWhenLastTimeCounterRemoved:Mode$ CounterRemoved | ValidCard$ Card.Self+cou
 SVar:DBCastWithoutPayingManaCost:DB$ Play | Valid$ Card.Self | ValidSA$ Spell | ValidZone$ Exile | Destination$ Battlefield | WithoutManaCost$ True | Optional$ True | SubAbility$ DBGiveHaste
 SVar:DBGiveHaste:DB$ Pump | Defined$ Self | KW$ Haste | ConditionDefined$ Self | ConditionPresent$ Card.Creature | PumpZone$ Stack
 SVar:DBRemoveTimeCounterOtherCardsInExile:DB$ RemoveCounterAll | ValidCards$ Card.YouOwn+IsNotRemembered | ValidZone$ Exile | CounterType$ TIME | CounterNum$ 1 | SubAbility$ DBCleanUp
-SVar:DBCleanUp:DB$ CleanUp | ClearRemembered$ True
+SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Keyword$Suspend
 Oracle:{T}:Draw a card, then exile a card from your hand and put a number of time counters on it equal to its mana value. It gains "When the last time counter is removed from this card, if it's exiled, you may cast it without paying its mana cost. If you cast a creature spell this way, it gains haste until end of turn." Then remove a time counter from each other card you own in exile.

From 3c5a3b426c1b0898219317aa0c30106db5f8d0b7 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sat, 9 Jul 2022 17:29:41 +0200
Subject: [PATCH 243/309] No SpellAbilityRestriction in Subs (performance + fix
 AI mayplay Charms)

---
 forge-ai/src/main/java/forge/ai/ability/CharmAi.java        | 6 ++----
 .../src/main/java/forge/game/ability/AbilityFactory.java    | 6 ++++--
 .../src/main/java/forge/game/spellability/SpellAbility.java | 5 ++++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
index 15dc3b6ad26..ebb6a5b94a6 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
@@ -90,6 +90,8 @@ public class CharmAi extends SpellAbilityAi {
         for (AbilitySub sub : choices) {
             sub.setActivatingPlayer(ai);
             sub.getRestrictions().setZone(sub.getParent().getRestrictions().getZone());
+
+            // TODO checks from MayPlay fail for subs currently
             if (AiPlayDecision.WillPlay == aic.canPlaySa(sub)) {
                 chosenList.add(sub);
                 if (chosenList.size() == num) {
@@ -101,8 +103,6 @@ public class CharmAi extends SpellAbilityAi {
             // Second pass using doTrigger(false) to fulfill minimum choice
             choices.removeAll(chosenList);
             for (AbilitySub sub : choices) {
-                sub.setActivatingPlayer(ai);
-                sub.getRestrictions().setZone(sub.getParent().getRestrictions().getZone());
                 if (aic.doTrigger(sub, false)) {
                     chosenList.add(sub);
                     if (chosenList.size() == min) {
@@ -114,8 +114,6 @@ public class CharmAi extends SpellAbilityAi {
             if (chosenList.size() < min) {
                 choices.removeAll(chosenList);
                 for (AbilitySub sub : choices) {
-                    sub.setActivatingPlayer(ai);
-                    sub.getRestrictions().setZone(sub.getParent().getRestrictions().getZone());
                     if (aic.doTrigger(sub, true)) {
                         chosenList.add(sub);
                         if (chosenList.size() == min) {
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 a34a1019d38..9396f9ff2df 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
@@ -426,7 +426,9 @@ public final class AbilityFactory {
     private static final void makeRestrictions(final SpellAbility sa) {
         // SpellAbilityRestrictions should be added in here
         final SpellAbilityRestriction restrict = sa.getRestrictions();
-        restrict.setRestrictions(sa.getMapParams());
+        if (restrict != null) {
+            restrict.setRestrictions(sa.getMapParams());
+        }
     }
 
     /**
@@ -438,7 +440,7 @@ public final class AbilityFactory {
      *            a {@link forge.game.spellability.SpellAbility} object.
      */
     private static final void makeConditions(final SpellAbility sa) {
-        // SpellAbilityRestrictions should be added in here
+        // SpellAbilityConditions should be added in here
         final SpellAbilityCondition condition = sa.getConditions();
         condition.setConditions(sa.getMapParams());
     }
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 ab9d7fc1426..1cdb04d8176 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java
@@ -138,7 +138,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
 
     /** The pay costs. */
     private Cost payCosts;
-    private SpellAbilityRestriction restrictions = new SpellAbilityRestriction();
+    private SpellAbilityRestriction restrictions;
     private SpellAbilityCondition conditions = new SpellAbilityCondition();
     private AbilitySub subAbility;
 
@@ -214,6 +214,9 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
             view0 = new SpellAbilityView(this);
         }
         view = view0;
+        if (!(this instanceof AbilitySub)) {
+            restrictions = new SpellAbilityRestriction();
+        }
     }
 
     @Override

From 373e4d59e689389e18bf36cfdbb740c6ff33d2cf Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Sat, 9 Jul 2022 11:35:28 -0400
Subject: [PATCH 244/309] CLB: Stick Together and support (#1062)

* stick_together.txt

* ChooseCardEffect support "Choose Party"
---
 .../ability/effects/ChooseCardEffect.java     | 22 ++++++++++++++++---
 .../cardsfolder/upcoming/stick_together.txt   |  9 ++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/stick_together.txt

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
index d60a1bd5532..58c6141c8b0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
@@ -1,9 +1,8 @@
 package forge.game.ability.effects;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
+import com.google.common.collect.Sets;
 import forge.game.player.DelayedReveal;
 import forge.game.player.PlayerView;
 import forge.util.CardTranslation;
@@ -119,6 +118,23 @@ public class ChooseCardEffect extends SpellAbilityEffect {
                         }
                     }
                 }
+            } else if (sa.hasParam("ChooseParty")) {
+                Set<String> partyTypes = Sets.newHashSet("Cleric", "Rogue", "Warrior", "Wizard");
+                for (final String type : partyTypes) {
+                    CardCollection valids = CardLists.filter(p.getCardsIn(ZoneType.Battlefield),
+                            CardPredicates.isType(type));
+                    for (Card alreadyChosen : chosen) {
+                        valids.remove(alreadyChosen);
+                    }
+                    if (!valids.isEmpty()) {
+                        final String prompt = Localizer.getInstance().getMessage("lblChoose") + " " +
+                                Lang.nounWithNumeralExceptOne(1, type);
+                        Card c = p.getController().chooseSingleEntityForEffect(valids, sa, prompt, true, null);
+                        if (c != null) {
+                            chosen.add(c);
+                        }
+                    }
+                }
             } else if (sa.hasParam("WithTotalPower")) {
                 final int totP = AbilityUtils.calculateAmount(host, sa.getParam("WithTotalPower"), sa);
                 CardCollection negativeCreats = CardLists.filterLEPower(p.getCreaturesInPlay(), -1);
diff --git a/forge-gui/res/cardsfolder/upcoming/stick_together.txt b/forge-gui/res/cardsfolder/upcoming/stick_together.txt
new file mode 100644
index 00000000000..b97333a2366
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/stick_together.txt
@@ -0,0 +1,9 @@
+Name:Stick Together
+ManaCost:3 W W
+Types:Sorcery
+A:SP$ ChooseCard | Defined$ Player | ChooseParty$ True | SubAbility$ SacAllOthers | StackDescription$ SpellDescription | SpellDescription$ Each player chooses a party from among creatures they control,
+SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Creature.nonChosenCard | StackDescription$ then sacrifices the rest. | SpellDescription$ then sacrifices the rest. (To choose a party, choose up to one each of Cleric, Rogue, Warrior, and Wizard.)
+DeckHints:Ability$Party
+DeckNeeds:Type$Cleric|Rogue|Warrior|Wizard
+AI:RemoveDeck:Random
+Oracle:Each player chooses a party from among creatures they control, then sacrifices the rest. (To choose a party, choose up to one each of Cleric, Rogue, Warrior, and Wizard.)

From 207a29079e8b57f7b6119e7f20bfebe0bb98123e Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sat, 9 Jul 2022 17:30:06 +0200
Subject: [PATCH 245/309] Fabricate fix

---
 forge-ai/src/main/java/forge/ai/ability/CharmAi.java      | 4 ----
 .../src/main/java/forge/game/ability/AbilityFactory.java  | 2 +-
 .../forge/game/ability/effects/ChooseGenericEffect.java   | 2 +-
 .../src/main/java/forge/game/card/CardFactoryUtil.java    | 8 ++++++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
index ebb6a5b94a6..957dcb8f03d 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java
@@ -89,9 +89,6 @@ public class CharmAi extends SpellAbilityAi {
         // First pass using standard canPlayAi() for good choices
         for (AbilitySub sub : choices) {
             sub.setActivatingPlayer(ai);
-            sub.getRestrictions().setZone(sub.getParent().getRestrictions().getZone());
-
-            // TODO checks from MayPlay fail for subs currently
             if (AiPlayDecision.WillPlay == aic.canPlaySa(sub)) {
                 chosenList.add(sub);
                 if (chosenList.size() == num) {
@@ -229,7 +226,6 @@ public class CharmAi extends SpellAbilityAi {
             } else {
                 // Standard canPlayAi()
                 sub.setActivatingPlayer(ai);
-                sub.getRestrictions().setZone(sub.getParent().getRestrictions().getZone());
                 if (AiPlayDecision.WillPlay == aic.canPlaySa(sub)) {
                     chosenList.add(sub);
                     if (chosenList.size() == min) {
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 9396f9ff2df..e8b400abf19 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java
@@ -277,7 +277,7 @@ public final class AbilityFactory {
             }
         }
 
-        if (api == ApiType.Charm  || api == ApiType.GenericChoice || api == ApiType.AssignGroup) {
+        if (api == ApiType.Charm || api == ApiType.GenericChoice || api == ApiType.AssignGroup) {
             final String key = "Choices";
             if (mapParams.containsKey(key)) {
                 List<String> names = Lists.newArrayList(mapParams.get(key).split(","));
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
index 5f95d0c4dd8..c1724471c82 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java
@@ -50,7 +50,7 @@ public class ChooseGenericEffect extends SpellAbilityEffect {
             List<SpellAbility> saToRemove = Lists.newArrayList();
             
             for (SpellAbility saChoice : abilities) {
-                if (!saChoice.getRestrictions().checkOtherRestrictions(host, saChoice, sa.getActivatingPlayer()) ) {
+                if (saChoice.getRestrictions() != null && !saChoice.getRestrictions().checkOtherRestrictions(host, saChoice, sa.getActivatingPlayer())) {
                     saToRemove.add(saChoice);
                 } else if (saChoice.hasParam("UnlessCost")) {
                     // generic check for if the cost can be paid
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 3f454c027cf..636794f1037 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1149,7 +1149,7 @@ public class CardFactoryUtil {
 
             final String choose = "DB$ GenericChoice | AILogic$ " + name;
             final String counter = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ " + n +
-                    " | IsPresent$ Card.StrictlySelf | SpellDescription$ Put "
+                    " | SpellDescription$ Put "
                     + Lang.nounWithNumeral(n, "+1/+1 counter") + " on it.";
             final String token = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | TokenOwner$ You "
                     + " | SpellDescription$ Create "
@@ -1160,7 +1160,11 @@ public class CardFactoryUtil {
             SpellAbility saChoose = AbilityFactory.getAbility(choose, card);
 
             List<AbilitySub> list = Lists.newArrayList();
-            list.add((AbilitySub)AbilityFactory.getAbility(counter, card));
+            AbilitySub putCounter = (AbilitySub)AbilityFactory.getAbility(counter, card);
+            SpellAbilityRestriction restriction = new SpellAbilityRestriction();
+            restriction.setIsPresent("Card.StrictlySelf");
+            putCounter.setRestrictions(restriction);
+            list.add(putCounter);
             list.add((AbilitySub)AbilityFactory.getAbility(token, card));
             saChoose.setAdditionalAbilityList("Choices", list);
             saChoose.setIntrinsic(intrinsic);

From 1d91146cef6273ce43337a2f5c2f86e7ebdaeeaf Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:17:02 +0100
Subject: [PATCH 246/309] Create minthara_merciless_soul.txt

---
 .../cardsfolder/upcoming/minthara_merciless_soul.txt   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt b/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt
new file mode 100644
index 00000000000..ef64148c39d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt
@@ -0,0 +1,10 @@
+Name:Minthara, Merciless Soul
+ManaCost:2 W B
+Types:Legendary Creature Elf Cleric
+PT:2/2
+K:Ward:X
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield |  ValidTgts$ Permanent.YouOwn | Origin$ Battlefield | Destination$ Graveyard |  Execute$ TrigExperience | TriggerDescription$ At the beginning of your end step, if a permanent you controlled left the battlefield this turn, you get an experience counter.
+SVar:TrigExperience:DB$ PutCounter | Defined$ You | CounterType$ Experience | CounterNum$ 1
+S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ X | Description$ Creatures you control get +1/+0 for each experience counter you have.
+SVar:X:Count$YourCountersExperience
+Oracle:Ward {X}, where X is the number of experience counters you have.\nAt the beginning of your end step, if a permanent you controlled left the battlefield this turn, you get an experience counter.\nCreatures you control get +1/+0 for each experience counter you have.

From fddcdd4f9088b32159b090bb80c3723eaff7ea0e Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 13:42:32 -0400
Subject: [PATCH 247/309] astral_dragon.txt

---
 forge-gui/res/cardsfolder/upcoming/astral_dragon.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/astral_dragon.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/astral_dragon.txt b/forge-gui/res/cardsfolder/upcoming/astral_dragon.txt
new file mode 100644
index 00000000000..76ef3414450
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/astral_dragon.txt
@@ -0,0 +1,9 @@
+Name:Astral Dragon
+ManaCost:6 U U
+Types:Creature Dragon
+PT:4/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ Project Image — When CARDNAME enters the battlefield, create two tokens that are copies of target noncreature permanent, except they're 3/3 Dragon creatures in addition to their other types, and they have flying.
+SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.nonCreature | NumCopies$ 2 | SetPower$ 3 | SetToughness$ 3 | AddTypes$ Dragon & Creature | AddKeywords$ Flying | TgtPrompt$ Select target noncreature permanent
+DeckHas:Ability$Token
+Oracle:Flying\nProject Image — When Astral Dragon enters the battlefield, create two tokens that are copies of target noncreature permanent, except they're 3/3 Dragon creatures in addition to their other types, and they have flying.

From 0d36510a6cda51c971d36ac58d636e6d8bc84527 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 13:43:48 -0400
Subject: [PATCH 248/309] jade_orb_of_dragonkind.txt

---
 .../cardsfolder/upcoming/jade_orb_of_dragonkind.txt    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
new file mode 100644
index 00000000000..085d4d7e373
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
@@ -0,0 +1,10 @@
+Name:Jade Orb of Dragonkind
+ManaCost:2 G
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ G | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigETBReplacement | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
+SVar:TrigETBReplacement:DB$ Pump | Defined$ TriggeredCard | KW$ etbCounter:P1P1:1:no Condition:no desc | PumpZone$ Stack | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ TriggeredCard | Duration$ UntilYourNextTurn | KW$ Hexproof | PumpZone$ Stack
+DeckHas:Ability$Counters
+DeckHints:Type$Dragon
+Oracle:{T}: Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)

From 1a956d62f593b3849189ca866f064dffee2e6e72 Mon Sep 17 00:00:00 2001
From: JohnWilliams77 <103562494+JohnWilliams77@users.noreply.github.com>
Date: Sat, 9 Jul 2022 21:02:41 +0100
Subject: [PATCH 249/309] Update minthara_merciless_soul.txt

---
 forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt b/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt
index ef64148c39d..71ef84a6d07 100644
--- a/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt
+++ b/forge-gui/res/cardsfolder/upcoming/minthara_merciless_soul.txt
@@ -3,7 +3,7 @@ ManaCost:2 W B
 Types:Legendary Creature Elf Cleric
 PT:2/2
 K:Ward:X
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield |  ValidTgts$ Permanent.YouOwn | Origin$ Battlefield | Destination$ Graveyard |  Execute$ TrigExperience | TriggerDescription$ At the beginning of your end step, if a permanent you controlled left the battlefield this turn, you get an experience counter.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Revolt$ True | Execute$ TrigExperience | TriggerDescription$ At the beginning of your end step, if a permanent you controlled left the battlefield this turn, you get an experience counter.
 SVar:TrigExperience:DB$ PutCounter | Defined$ You | CounterType$ Experience | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ X | Description$ Creatures you control get +1/+0 for each experience counter you have.
 SVar:X:Count$YourCountersExperience

From a225366cd44a2fc20036816e4cf19253d016b884 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 16:38:46 -0400
Subject: [PATCH 250/309] street_urchin.txt

---
 forge-gui/res/cardsfolder/upcoming/street_urchin.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/street_urchin.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/street_urchin.txt b/forge-gui/res/cardsfolder/upcoming/street_urchin.txt
new file mode 100644
index 00000000000..df29c421ed8
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/street_urchin.txt
@@ -0,0 +1,10 @@
+Name:Street Urchin
+ManaCost:1 R
+Types:Legendary Enchantment Background
+S:Mode$ Continuous | Affected$ Creature.IsCommander+YouOwn | AddAbility$ DealDamage | Description$ Commander creatures you own have "{1}, Sacrifice another creature or an artifact: This creature deals 1 damage to any target."
+SVar:DealDamage:AB$ DealDamage | Cost$ 1 Sac<1/Creature.Other;Artifact/another creature or an artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ This creature deals 1 damage to any target.
+SVar:AIPreference:SacCost$Creature.token,Artifact.token,Creature.cmcLE1,Artifact.cmcEQ1
+AI:RemoveDeck:NonCommander
+DeckHas:Ability$Sacrifice
+DeckHints:Type$Artifact
+Oracle:Commander creatures you own have "{1}, Sacrifice another creature or an artifact: This creature deals 1 damage to any target."

From 4fd216f44193ccdab9201399f5ac566faf2451db Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 16:42:55 -0400
Subject: [PATCH 251/309] ingenious_artillerist.txt

---
 .../res/cardsfolder/upcoming/ingenious_artillerist.txt   | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ingenious_artillerist.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/ingenious_artillerist.txt b/forge-gui/res/cardsfolder/upcoming/ingenious_artillerist.txt
new file mode 100644
index 00000000000..8f1e1ef5c33
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ingenious_artillerist.txt
@@ -0,0 +1,9 @@
+Name:Ingenious Artillerist
+ManaCost:2 R
+Types:Creature Human Artificer
+PT:3/1
+T:Mode$ ChangesZoneAll | ValidCards$ Artifact.YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever one or more artifacts enter the battlefield under your control, CARDNAME deals that much damage to each opponent.
+SVar:TrigDealDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X
+SVar:X:TriggerCount$Amount
+DeckNeeds:Type$Artifact
+Oracle:Whenever one or more artifacts enter the battlefield under your control, Ingenious Artillerist deals that much damage to each opponent.

From 4364f4d5c86a6669681bdc616ebcc39374564566 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 16:43:10 -0400
Subject: [PATCH 252/309] marut.txt

---
 forge-gui/res/cardsfolder/upcoming/marut.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/marut.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/marut.txt b/forge-gui/res/cardsfolder/upcoming/marut.txt
new file mode 100644
index 00000000000..c6d2f46a256
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/marut.txt
@@ -0,0 +1,11 @@
+Name:Marut
+ManaCost:8
+Types:Artifact Creature Construct
+PT:7/7
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | Execute$ TrigTreasure | TriggerDescription$ When CARDNAME enters the battlefield, if mana from a Treasure was spent to cast it, create a Treasure token for each mana from a Treasure spent to cast it.
+SVar:TrigTreasure:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac
+SVar:X:Count$CastTotalManaSpent Treasure
+SVar:AIPreference:ManaFrom$Treasure
+DeckHas:Ability$Sacrifice|Token & Type$Treasure|Artifact
+Oracle:Trample\nWhen Marut enters the battlefield, if mana from a Treasure was spent to cast it, create a Treasure token for each mana from a Treasure spent to cast it.

From 2e78de34b4e04309fa57314a89a406972453c372 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 10 Jul 2022 00:11:26 +0200
Subject: [PATCH 253/309] check for canReceiveCounters

---
 .../java/forge/game/card/CardFactoryUtil.java |  2 +-
 .../java/forge/game/card/CardProperty.java    | 20 +++++++++++--------
 .../spellability/SpellAbilityRestriction.java |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

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 636794f1037..31ae3d89ee8 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1162,7 +1162,7 @@ public class CardFactoryUtil {
             List<AbilitySub> list = Lists.newArrayList();
             AbilitySub putCounter = (AbilitySub)AbilityFactory.getAbility(counter, card);
             SpellAbilityRestriction restriction = new SpellAbilityRestriction();
-            restriction.setIsPresent("Card.StrictlySelf");
+            restriction.setIsPresent("Card.StrictlySelf+canReceiveCounters P1P1");
             putCounter.setRestrictions(restriction);
             list.add(putCounter);
             list.add((AbilitySub)AbilityFactory.getAbility(token, card));
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 0777d3772f5..3c831061e65 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1475,6 +1475,18 @@ public class CardProperty {
             if (!card.getManaCost().getShortString().equals(property.substring(8))) {
                 return false;
             }
+        } else if (property.startsWith("canReceiveCounters")) {
+            if (!card.canReceiveCounters(CounterType.getType(property.split(" ")[1]))) {
+                return false;
+            }
+        } else if (property.equals("HasCounters")) {
+            if (!card.hasCounters()) {
+                return false;
+            }
+        } else if (property.equals("NoCounters")) {
+            if (card.hasCounters()) {
+                return false;
+            }
         }
 
         // syntax example: countersGE9 P1P1 or countersLT12TIME (greater number
@@ -1807,14 +1819,6 @@ public class CardProperty {
             if (!card.hasNoAbilities()) {
                 return false;
             }
-        } else if (property.equals("HasCounters")) {
-            if (!card.hasCounters()) {
-                return false;
-            }
-        } else if (property.equals("NoCounters")) {
-            if (card.hasCounters()) {
-                return false;
-            }
         } else if (property.equals("castKeyword")) {
             SpellAbility castSA = card.getCastSA();
             if (castSA == null) {
diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
index 8f72ba69673..583830f2dc0 100644
--- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
+++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
@@ -443,7 +443,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
             if (getPresentDefined() != null) {
                 list = AbilityUtils.getDefinedObjects(sa.getHostCard(), getPresentDefined(), sa);
             } else {
-                list = new FCollection<GameObject>(game.getCardsIn(getPresentZone()));
+                list = new FCollection<>(game.getCardsIn(getPresentZone()));
             }
 
             final int left = Iterables.size(Iterables.filter(list, GameObjectPredicates.restriction(getIsPresent().split(","), activator, c, sa)));

From cf8f584106e8288acbe17205c6980584fa2411da Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 18:39:57 -0400
Subject: [PATCH 254/309] add lblAttacker from TriggerAttackerBlockedOnce

---
 forge-gui/res/languages/de-DE.properties | 2 ++
 forge-gui/res/languages/en-US.properties | 2 ++
 forge-gui/res/languages/es-ES.properties | 2 ++
 forge-gui/res/languages/it-IT.properties | 2 ++
 forge-gui/res/languages/ja-JP.properties | 2 ++
 forge-gui/res/languages/pt-BR.properties | 2 ++
 forge-gui/res/languages/zh-CN.properties | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 9edcb5f56ae..fea5db7fbc5 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -1502,6 +1502,8 @@ lblAttachee=Anhang
 #TriggerAttackerBlocked.java
 lblNumberBlockers=Anzahl Blocker
 lblBlocker=Blocker
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Anzahl Angreifer
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index cd3d95cc229..91b1d08af31 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -1504,6 +1504,8 @@ lblAttachee=Attachee
 #TriggerAttackerBlocked.java
 lblNumberBlockers=Number Blockers
 lblBlocker=Blocker
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Number Attackers
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 6d9c08b0e81..64db4565dc9 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -1502,6 +1502,8 @@ lblAttachee=Acoplado
 #TriggerAttackerBlocked.java
 lblNumberBlockers=Número de bloqueadores
 lblBlocker=Bloqueador
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Atacantes
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Atacantes
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index c4e9cadf3b4..ca8e68d71f1 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -1502,6 +1502,8 @@ lblAttachee=Assegnata
 #TriggerAttackerBlocked.java
 lblNumberBlockers=Numero di bloccanti
 lblBlocker=Creatura bloccante
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Numero di attaccanti
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index 406f7c2f50a..8b11fe363e0 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -1503,6 +1503,8 @@ lblAttachee=つけ先
 #TriggerAttackerBlocked.java
 lblNumberBlockers=ブロッカー数
 lblBlocker=ブロッカー
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=アタッカー数
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 6b46663718e..3febad95ad1 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -1538,6 +1538,8 @@ lblAttachee=Anexar
 #TriggerAttackerBlocked.java
 lblNumberBlockers=Numerar Bloqueadores
 lblBlocker=Bloqueador
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Numerar Atacantes
 #TriggerAttackerUnblockedOnce.java
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index 1f1b3423eb4..e5c17f4461b 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -1504,6 +1504,8 @@ lblAttachee=结附
 #TriggerAttackerBlocked.java
 lblNumberBlockers=阻挡者数
 lblBlocker=阻挡者
+#TriggerAttackerBlockedOnce.java
+lblAttackers=Attackers
 #TriggerAttackersDeclared.java
 lblNumberAttackers=攻击者数
 #TriggerAttackerUnblockedOnce.java

From a50e608f864f250bb7e43a45c97646b874697409 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 18:53:42 -0400
Subject: [PATCH 255/309] aerial_predation.txt clean up

---
 forge-gui/res/cardsfolder/a/aerial_predation.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/aerial_predation.txt b/forge-gui/res/cardsfolder/a/aerial_predation.txt
index 229268eb642..742936cffc4 100644
--- a/forge-gui/res/cardsfolder/a/aerial_predation.txt
+++ b/forge-gui/res/cardsfolder/a/aerial_predation.txt
@@ -1,6 +1,7 @@
 Name:Aerial Predation
 ManaCost:2 G
 Types:Instant
-A:SP$ Destroy | Cost$ 2 G | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SubAbility$ NaturalLife | SpellDescription$ Destroy target creature with flying. You gain 2 life
-SVar:NaturalLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
+A:SP$ Destroy | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SubAbility$ DBGainLife | SpellDescription$ Destroy target creature with flying. You gain 2 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
+DeckHas:Ability$LifeGain
 Oracle:Destroy target creature with flying. You gain 2 life.

From dea4e07dcc9819a2d8227dc148dde805c4470b55 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 18:54:13 -0400
Subject: [PATCH 256/309] cathedral_sanctifier.txt AI hint

---
 forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt b/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
index ee333ab61c3..30ab9315729 100644
--- a/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
+++ b/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
@@ -4,4 +4,5 @@ Types:Creature Human Cleric
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
+DeckHas:Ability$LifeGain
 Oracle:When Cathedral Sanctifier enters the battlefield, you gain 3 life.

From abdaf039a597748d3794b26e1f931b7b4dbaa938 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 19:14:16 -0400
Subject: [PATCH 257/309] ephemerate.txt tidy

---
 forge-gui/res/cardsfolder/e/ephemerate.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/e/ephemerate.txt b/forge-gui/res/cardsfolder/e/ephemerate.txt
index ebd5abecdb3..9825f714363 100644
--- a/forge-gui/res/cardsfolder/e/ephemerate.txt
+++ b/forge-gui/res/cardsfolder/e/ephemerate.txt
@@ -2,7 +2,7 @@ Name:Ephemerate
 ManaCost:W
 Types:Instant
 K:Rebound
-A:SP$ ChangeZone | Cost$ W | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, then return it the battlefield under its owner's control. | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup | StackDescription$ then return it to the battlefield under its owner's control.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Exile target creature you control, then return it to the battlefield under its owner's control.\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.)

From 017e5a610ffb3cf19597ed95f6bcf2aee4a2961d Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 19:27:04 -0400
Subject: [PATCH 258/309] battle_angels_of_tyr.txt

---
 .../upcoming/battle_angels_of_tyr.txt          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/battle_angels_of_tyr.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/battle_angels_of_tyr.txt b/forge-gui/res/cardsfolder/upcoming/battle_angels_of_tyr.txt
new file mode 100644
index 00000000000..36d511876be
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/battle_angels_of_tyr.txt
@@ -0,0 +1,18 @@
+Name:Battle Angels of Tyr
+ManaCost:2 W W
+Types:Creature Angel Knight
+PT:4/4
+K:Flying
+K:Myriad
+T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigDraw | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, draw a card if that player has more cards in hand than each other player. Then you create a Treasure token if that player controls more lands than each other player. Then you gain 3 life if that player has more life than each other player.
+SVar:TrigDraw:DB$ Draw | ConditionCheckSVar$ NumInHand | ConditionSVarCompare$ GTMostInHand | SubAbility$ DBTreasure
+SVar:DBTreasure:DB$ Token | ConditionCheckSVar$ NumLands | ConditionSVarCompare$ GTMostLands | TokenScript$ c_a_treasure_sac | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | ConditionCheckSVar$ NumLife | ConditionSVarCompare$ GTMostLife | LifeAmount$ 3
+SVar:NumInHand:TriggeredTarget$CardsInHand
+SVar:MostInHand:PlayerCountDefinedNonTriggeredTarget$HighestCardsInHand
+SVar:NumLands:TriggeredTarget$Valid Land.YouCtrl
+SVar:MostLands:PlayerCountDefinedNonTriggeredTarget$HighestValid Land.YouCtrl
+SVar:NumLife:TriggeredTarget$LifeTotal
+SVar:MostLife:PlayerCountDefinedNonTriggeredTarget$HighestLifeTotal
+DeckHas:Ability$Token|Sacrifice|LifeGain & Type$Artifact|Treasure
+Oracle:Flying, myriad\nWhenever Battle Angels of Tyr deals combat damage to a player, draw a card if that player has more cards in hand than each other player. Then you create a Treasure token if that player controls more lands than each other player. Then you gain 3 life if that player has more life than each other player.

From 2d607bf28975abf196acba693049f79ad5c1bb2c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 10 Jul 2022 07:49:31 +0800
Subject: [PATCH 259/309] move skin and adventure fonts to Assets

---
 .../src/forge/adventure/util/Controls.java    | 36 +++++++------------
 forge-gui-mobile/src/forge/assets/Assets.java |  9 +++++
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/util/Controls.java b/forge-gui-mobile/src/forge/adventure/util/Controls.java
index bc667451338..073c4e9ea3c 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Controls.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Controls.java
@@ -11,6 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.*;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.utils.Align;
+import forge.Forge;
 
 import java.util.function.Function;
 
@@ -18,15 +19,10 @@ import java.util.function.Function;
  * Class to create ui elements in the correct style
  */
 public class Controls {
-    private static Skin SelectedSkin = null;
-    private static BitmapFont defaultfont, bigfont;
-
     static public TextButton newTextButton(String text) {
-
         return new TextButton(text, GetSkin());
     }
     static public Rectangle getBoundingRect(Actor actor) {
-
         return new Rectangle(actor.getX(),actor.getY(),actor.getWidth(),actor.getHeight());
     }
     static public boolean actorContainsVector (Actor actor, Vector2 point) {
@@ -56,8 +52,6 @@ public class Controls {
         return ret;
     }
 
-
-
     static public TextField newTextField(String text) {
         return new TextField(text, GetSkin());
     }
@@ -108,32 +102,28 @@ public class Controls {
         switch (fontName) {
             case "blackbig":
             case "big":
-                return bigfont;
+                return Forge.getAssets().advBigFont;
             default:
-                return defaultfont;
+                return Forge.getAssets().advDefaultFont;
         }
     }
 
-
     static public Skin GetSkin() {
-
-        if (SelectedSkin == null) {
-            SelectedSkin = new Skin();
-
+        if (Forge.getAssets().skin == null) {
+            Forge.getAssets().skin = new Skin();
             FileHandle skinFile = Config.instance().getFile(Paths.SKIN);
             FileHandle atlasFile = skinFile.sibling(skinFile.nameWithoutExtension() + ".atlas");
             TextureAtlas atlas = new TextureAtlas(atlasFile);
             //font
-            defaultfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixel.fnt"));
-            bigfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixel.fnt"));
-            bigfont.getData().setScale(2, 2);
-            SelectedSkin.add("default", defaultfont);
-            SelectedSkin.add("big", bigfont);
-            SelectedSkin.addRegions(atlas);
-            SelectedSkin.load(skinFile);
-
+            Forge.getAssets().advDefaultFont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixel.fnt"));
+            Forge.getAssets().advBigFont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixel.fnt"));
+            Forge.getAssets().advBigFont.getData().setScale(2, 2);
+            Forge.getAssets().skin.add("default", Forge.getAssets().advDefaultFont);
+            Forge.getAssets().skin.add("big", Forge.getAssets().advBigFont);
+            Forge.getAssets().skin.addRegions(atlas);
+            Forge.getAssets().skin.load(skinFile);
         }
-        return SelectedSkin;
+        return Forge.getAssets().skin;
     }
 
     public static Label newLabel(String name) {
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index 4d191b19dc9..4efab66a1f1 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.ObjectMap;
 import forge.gui.GuiBase;
@@ -19,6 +20,8 @@ public class Assets implements Disposable {
     public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
     public ObjectMap<Integer, Texture> fallback_skins = new ObjectMap<>();
     public ObjectMap<String, Texture> tmxMap = new ObjectMap<String, Texture>();
+    public Skin skin;
+    public BitmapFont advDefaultFont, advBigFont;
     public Assets() {
         //init titlebg fallback
         fallback_skins.put(0, new Texture(GuiBase.isAndroid()
@@ -43,5 +46,11 @@ public class Assets implements Disposable {
             texture.dispose();
         for (Texture texture : tmxMap.values())
             texture.dispose();
+        if (advDefaultFont != null)
+            advDefaultFont.dispose();
+        if (advBigFont != null)
+            advBigFont.dispose();
+        if (skin != null)
+            skin.dispose();
     }
 }

From fd85179c45be86ff544cdd24a03fc84b6855503b Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 20:35:35 -0400
Subject: [PATCH 260/309] DigUntilEffect support "NoMoveRevealed"

---
 .../java/forge/game/ability/effects/DigUntilEffect.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
index 07ca5f7cfe6..61aa696a247 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java
@@ -67,7 +67,7 @@ public class DigUntilEffect extends SpellAbilityEffect {
             if (revealed.equals(ZoneType.Exile)) {
                 sb.append("and exile all other cards revealed this way.");
             }
-        } else {
+        } else if (revealed != null) {
             if (revealed.equals(ZoneType.Hand)) {
                 sb.append("all cards revealed this way into their hand");
             }
@@ -209,7 +209,9 @@ public class DigUntilEffect extends SpellAbilityEffect {
                     Collections.shuffle(revealed, MyRandom.getRandom());
                 }
 
-                if (sa.hasParam("NoneFoundDestination") && found.size() < untilAmount) {
+                if (sa.hasParam("NoMoveRevealed")) {
+                    //don't do anything
+                } else if (sa.hasParam("NoneFoundDestination") && found.size() < untilAmount) {
                     // Allow ordering the revealed cards
                     if (noneFoundDest.isKnown() && revealed.size() >= 2) {
                         revealed = (CardCollection)p.getController().orderMoveToZoneList(revealed, noneFoundDest, sa);

From 7a90d9b0b7258b80c47370d415e1331e75888408 Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Sat, 9 Jul 2022 20:35:45 -0400
Subject: [PATCH 261/309] neera_wild_mage.txt

---
 .../res/cardsfolder/upcoming/neera_wild_mage.txt      | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/neera_wild_mage.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/neera_wild_mage.txt b/forge-gui/res/cardsfolder/upcoming/neera_wild_mage.txt
new file mode 100644
index 00000000000..e0f43ddb16d
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/neera_wild_mage.txt
@@ -0,0 +1,11 @@
+Name:Neera, Wild Mage
+ManaCost:4 U R
+Types:Legendary Creature Human Elf Shaman
+PT:2/7
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigPutBottom | TriggerZones$ Battlefield | ActivationLimit$ 1 | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell, you may put it on the bottom of its owner's library. If you do, reveal cards from the top of your library until you reveal a nonland card. You may cast that card without paying its mana cost. Then put all revealed cards not cast this way on the bottom of your library in a random order. This ability triggers only once each turn.
+SVar:TrigPutBottom:DB$ ChangeZone | Origin$ Stack | Destination$ Library | LibraryPosition$ -1 | Defined$ TriggeredCard | Fizzle$ True | SubAbility$ DBDig
+SVar:DBDig:DB$ DigUntil | Valid$ Card.nonLand | ImprintFound$ True | RememberFound$ True | RememberRevealed$ True | NoMoveFound$ True | NoMoveRevealed$ True | SubAbility$ DBPlay
+SVar:DBPlay:DB$ Play | Defined$ Imprinted | ValidZone$ Library | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | ForgetPlayed$ True | SubAbility$ DBBottom
+SVar:DBBottom:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | RandomOrder$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
+Oracle:Whenever you cast a spell, you may put it on the bottom of its owner's library. If you do, reveal cards from the top of your library until you reveal a nonland card. You may cast that card without paying its mana cost. Then put all revealed cards not cast this way on the bottom of your library in a random order. This ability triggers only once each turn.

From 9e5f2d48595e353378799e98a0f4626df4d97f50 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Sun, 10 Jul 2022 00:03:43 -0400
Subject: [PATCH 262/309] Deleted `Description$ Test` from script.

---
 .../res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
index 1bed23e7f1a..49397f88be3 100644
--- a/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jon_irenicus_shattered_one.txt
@@ -5,7 +5,7 @@ PT:3/3
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ DBSelectRecipient | TriggerDescription$ At the beginning of your end step, target opponent gains control of up to one target creature you control.
 SVar:DBSelectRecipient:DB$ Pump | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SubAbility$ DBDonate
 SVar:DBDonate:DB$ GainControl | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature you control | NewController$ ParentTarget | SubAbility$ DBPutCounters
-SVar:DBPutCounters:DB$ PutCounter | Defined$ TargetedCard | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBTap | Description$ Test
+SVar:DBPutCounters:DB$ PutCounter | Defined$ TargetedCard | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBTap
 SVar:DBTap:DB$ Tap | Defined$ Targeted | SubAbility$ DBGoad
 SVar:DBGoad:DB$ Goad | Defined$ Targeted | Duration$ Permanent | SubAbility$ DBDisableSacing
 SVar:DBDisableSacing:DB$ Animate | Defined$ Targeted | staticAbilities$ SCantSac | Duration$ Permanent

From 617b1dd832f57d09744925d1bf7ea8422ec85f5d Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Sun, 10 Jul 2022 00:18:17 -0400
Subject: [PATCH 263/309] CLB Adventure commons (#1092)

* ettercap_web_shot.txt

* gray_slaad_entropic_decay.txt

* hezrou_demonic_stench.txt

* guardian_naga_banishing_coils.txt

* sword_coast_serpent_capsizing_wave.txt

* pegasus_guardian_rescue_the_foal.txt

* colossal_badger_dig_deep.txt

* CountersPutEffect.getStackDescription better handle "for each"

* sword_coast_serpent_capsizing_wave.txt fix
---
 .../ability/effects/CountersPutEffect.java    |  9 ++++----
 .../upcoming/colossal_badger_dig_deep.txt     | 21 +++++++++++++++++++
 .../upcoming/ettercap_web_shot.txt            | 15 +++++++++++++
 .../upcoming/gray_slaad_entropic_decay.txt    | 18 ++++++++++++++++
 .../guardian_naga_banishing_coils.txt         | 16 ++++++++++++++
 .../upcoming/hezrou_demonic_stench.txt        | 16 ++++++++++++++
 .../pegasus_guardian_rescue_the_foal.txt      | 20 ++++++++++++++++++
 .../sword_coast_serpent_capsizing_wave.txt    | 17 +++++++++++++++
 8 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/colossal_badger_dig_deep.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/ettercap_web_shot.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/gray_slaad_entropic_decay.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/guardian_naga_banishing_coils.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/hezrou_demonic_stench.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/sword_coast_serpent_capsizing_wave.txt

diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index 74fe90383b4..bab1c1bd3e0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -67,8 +67,9 @@ public class CountersPutEffect extends SpellAbilityEffect {
 
         stringBuilder.append(pronoun ? "they" : who).append(" ");
 
+        String desc = sa.getDescription();
+        boolean forEach = desc.contains("for each");
         if (sa.hasParam("CounterTypes")) {
-            String desc = sa.getDescription();
             if (desc.contains("Put ") && desc.contains(" on ")) {
                 desc = desc.substring(desc.indexOf("Put "), desc.indexOf(" on ") + 4)
                         .replaceFirst("Put ", "puts ");
@@ -84,8 +85,8 @@ public class CountersPutEffect extends SpellAbilityEffect {
             }
         }
 
-        final int amount = AbilityUtils.calculateAmount(card,
-                sa.getParamOrDefault("CounterNum", "1"), sa);
+        final String key = forEach ? "ForEachNum" : "CounterNum";
+        final int amount = AbilityUtils.calculateAmount(card, sa.getParamOrDefault(key, "1"), sa);
 
         if (sa.hasParam("Bolster")) {
             stringBuilder.append("bolsters ").append(amount).append(".");
@@ -155,7 +156,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
                 }
             }
         }
-        stringBuilder.append(".");
+        stringBuilder.append(forEach ? desc.substring(desc.indexOf(" for each")) : ".");
         return stringBuilder.toString();
     }
 
diff --git a/forge-gui/res/cardsfolder/upcoming/colossal_badger_dig_deep.txt b/forge-gui/res/cardsfolder/upcoming/colossal_badger_dig_deep.txt
new file mode 100644
index 00000000000..9f0221451d5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/colossal_badger_dig_deep.txt
@@ -0,0 +1,21 @@
+Name:Colossal Badger
+ManaCost:5 G
+Types:Creature Badger
+PT:6/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
+DeckHas:Ability$LifeGain
+AlternateMode:Adventure
+Oracle:When Colossal Badger enters the battlefield, you gain 3 life.
+
+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,
+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
+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/upcoming/ettercap_web_shot.txt b/forge-gui/res/cardsfolder/upcoming/ettercap_web_shot.txt
new file mode 100644
index 00000000000..d52520ce57c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/ettercap_web_shot.txt
@@ -0,0 +1,15 @@
+Name:Ettercap
+ManaCost:4 G
+Types:Creature Spider Beast
+PT:2/5
+K:Reach
+AlternateMode:Adventure
+Oracle:Reach
+
+ALTERNATE
+
+Name:Web Shot
+ManaCost:2 G
+Types:Instant Adventure
+A:SP$ Destroy | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Destroy target creature with flying.
+Oracle:Destroy target creature with flying. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/gray_slaad_entropic_decay.txt b/forge-gui/res/cardsfolder/upcoming/gray_slaad_entropic_decay.txt
new file mode 100644
index 00000000000..ca85b4dc024
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/gray_slaad_entropic_decay.txt
@@ -0,0 +1,18 @@
+Name:Gray Slaad
+ManaCost:2 B
+Types:Creature Frog Horror
+PT:4/1
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Menace & Deathtouch | IsPresent$ Creature.YouOwn | PresentCompare$ GE4 | PresentZone$ Graveyard | Description$ As long as there are four or more creature cards in your graveyard, CARDNAME has menace and deathtouch.
+DeckHints:Ability$Sacrifice|Discard|Mill
+DeckHas:Ability$Graveyard
+AlternateMode:Adventure
+Oracle:As long as there are four or more creature cards in your graveyard, Gray Slaad has menace and deathtouch.
+
+ALTERNATE
+
+Name:Entropic Decay
+ManaCost:1 B
+Types:Sorcery Adventure
+A:SP$ Mill | NumCards$ 4 | SpellDescription$ Mill four cards. (Then exile this card. You may cast the creature later from exile.)
+DeckHas:Ability$Mill
+Oracle:Mill four cards. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/guardian_naga_banishing_coils.txt b/forge-gui/res/cardsfolder/upcoming/guardian_naga_banishing_coils.txt
new file mode 100644
index 00000000000..c51f4eea210
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/guardian_naga_banishing_coils.txt
@@ -0,0 +1,16 @@
+Name:Guardian Naga
+ManaCost:5 W W
+Types:Creature Naga
+PT:5/6
+K:Vigilance
+R:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.Self | PlayerTurn$ True | Description$ As long as it's your turn, prevent all damage that would be dealt to CARDNAME.
+AlternateMode:Adventure
+Oracle:Vigilance\nAs long as it's your turn, prevent all damage that would be dealt to Guardian Naga.
+
+ALTERNATE
+
+Name:Banishing Coils
+ManaCost:2 W
+Types:Instant Adventure
+A:SP$ ChangeZone | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Choose target artifact or enchantment | ValidTgts$ Artifact,Enchantment | SpellDescription$ Exile target artifact or enchantment.
+Oracle:Exile target artifact or enchantment. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/hezrou_demonic_stench.txt b/forge-gui/res/cardsfolder/upcoming/hezrou_demonic_stench.txt
new file mode 100644
index 00000000000..61fcaaf8484
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/hezrou_demonic_stench.txt
@@ -0,0 +1,16 @@
+Name:Hezrou
+ManaCost:5 B B
+Types:Creature Frog Demon
+PT:6/6
+T:Mode$ AttackerBlockedOnce | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever one or more creatures you control become blocked, each blocking creature gets -1/-1 until end of turn.
+SVar:TrigPump:DB$ PumpAll | NumAtt$ -1 | NumDef$ -1 | ValidCards$ Creature.blocking
+AlternateMode:Adventure
+Oracle:Whenever one or more creatures you control become blocked, each blocking creature gets -1/-1 until end of turn.
+
+ALTERNATE
+
+Name:Demonic Stench
+ManaCost:B
+Types:Instant Adventure
+A:SP$ PumpAll | NumAtt$ -1 | NumDef$ -1 | ValidCards$ Creature.blockedThisTurn | SpellDescription$ Each creature that blocked this turn gets -1/-1 until end of turn.
+Oracle:Each creature that blocked this turn gets -1/-1 until end of turn. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt b/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
new file mode 100644
index 00000000000..6c8dd5fbbd5
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
@@ -0,0 +1,20 @@
+Name:Pegasus Guardian
+ManaCost:5 W
+Types:Creature Pegasus
+PT:3/3
+K:Flying
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Revolt$ True | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if a permanent you controlled left the battlefield this turn, create a 1/1 white Pegasus creature token with flying.
+SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_pegasus_flying
+AlternateMode:Adventure
+DeckHas:Ability$Token
+Oracle:Flying\nAt the beginning of your end step, if a permanent you controlled left the battlefield this turn, create a 1/1 white Pegasus creature token with flying.
+
+ALTERNATE
+
+Name:Rescue the Foal
+ManaCost:1 W
+Types:Instant Adventure
+A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup | StackDescription$ then return it to the battlefield under its owner's control.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Exile target creature you control, then return that card to the battlefield under its owner's control. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/upcoming/sword_coast_serpent_capsizing_wave.txt b/forge-gui/res/cardsfolder/upcoming/sword_coast_serpent_capsizing_wave.txt
new file mode 100644
index 00000000000..4ad81ae7abd
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sword_coast_serpent_capsizing_wave.txt
@@ -0,0 +1,17 @@
+Name:Sword Coast Serpent
+ManaCost:5 U U
+Types:Creature Serpent Dragon
+PT:6/6
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ Unblockable | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't be blocked as long as you've cast a noncreature spell this turn.
+SVar:X:Count$ThisTurnCast_Card.nonCreature+YouCtrl
+AlternateMode:Adventure
+SVar:BuffedBy:Card.nonCreature+nonLand
+Oracle:Sword Coast Serpent can't be blocked as long as you've cast a noncreature spell this turn.
+
+ALTERNATE
+
+Name:Capsizing Wave
+ManaCost:1 U
+Types:Instant Adventure
+A:SP$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+Oracle:Return target creature to its owner's hand. (Then exile this card. You may cast the creature later from exile.)

From 00130296d8a416ac6439f9f38105e50b46798cdb Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 10 Jul 2022 13:35:17 +0800
Subject: [PATCH 264/309] use single assetmanager - add seperate set to
 determine cards loaded

---
 forge-gui-mobile/src/forge/Forge.java         |  2 +
 .../src/forge/adventure/util/Config.java      |  8 +--
 forge-gui-mobile/src/forge/assets/Assets.java |  6 +-
 forge-gui-mobile/src/forge/assets/FSkin.java  |  4 +-
 .../src/forge/assets/FSkinTexture.java        | 12 ++--
 .../src/forge/assets/ImageCache.java          | 62 ++++++++++---------
 6 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index ec9e08fb219..ae0a7e166d6 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.graphics.Cursor;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Pixmap;
+import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.TextureData;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -920,6 +921,7 @@ public class Forge implements ApplicationListener {
 
     @Override
     public void resume() {
+        Texture.setAssetManager(getAssets().manager);
         if (MatchController.getHostedMatch() != null) {
             MatchController.getHostedMatch().resume();
         }
diff --git a/forge-gui-mobile/src/forge/adventure/util/Config.java b/forge-gui-mobile/src/forge/adventure/util/Config.java
index d3df18b0d22..ef1c69bc8a2 100644
--- a/forge-gui-mobile/src/forge/adventure/util/Config.java
+++ b/forge-gui-mobile/src/forge/adventure/util/Config.java
@@ -120,11 +120,11 @@ public class Config {
 
     public TextureAtlas getAtlas(String spriteAtlas) {
         String fileName = getFile(spriteAtlas).path();
-        if (!Forge.getAssets().others.contains(fileName, TextureAtlas.class)) {
-            Forge.getAssets().others.load(fileName, TextureAtlas.class);
-            Forge.getAssets().others.finishLoadingAsset(fileName);
+        if (!Forge.getAssets().manager.contains(fileName, TextureAtlas.class)) {
+            Forge.getAssets().manager.load(fileName, TextureAtlas.class);
+            Forge.getAssets().manager.finishLoadingAsset(fileName);
         }
-        return Forge.getAssets().others.get(fileName);
+        return Forge.getAssets().manager.get(fileName);
     }
     public SettingData getSettingData()
     {
diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index 4efab66a1f1..b6455900c11 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -13,8 +13,7 @@ import forge.gui.GuiBase;
 import java.util.HashMap;
 
 public class Assets implements Disposable {
-    public AssetManager cards = new AssetManager(new AbsoluteFileHandleResolver());
-    public AssetManager others = new AssetManager(new AbsoluteFileHandleResolver());
+    public AssetManager manager = new AssetManager(new AbsoluteFileHandleResolver());
     public HashMap<Integer, FSkinFont> fonts = new HashMap<>();
     public ObjectMap<Integer, BitmapFont> counterFonts = new ObjectMap<>();
     public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
@@ -34,8 +33,7 @@ public class Assets implements Disposable {
     }
     @Override
     public void dispose() {
-        cards.dispose();
-        others.dispose();
+        manager.dispose();
         for (BitmapFont bitmapFont : counterFonts.values())
             bitmapFont.dispose();
         for (Texture texture : generatedCards.values())
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 3ac32a9d883..08e4d3298aa 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -88,7 +88,7 @@ public class FSkin {
      *            the skin name
      */
     public static void loadLight(String skinName, final SplashScreen splashScreen) {
-        AssetManager manager = Forge.getAssets().others;
+        AssetManager manager = Forge.getAssets().manager;
         preferredName = skinName.toLowerCase().replace(' ', '_');
 
         //reset hd buttons/icons
@@ -236,7 +236,7 @@ public class FSkin {
             parameter.magFilter = Texture.TextureFilter.Linear;
         }
 
-        AssetManager manager = Forge.getAssets().others;
+        AssetManager manager = Forge.getAssets().manager;
 
         // Grab and test various sprite files.
         final FileHandle f1 = getDefaultSkinFile(SourceFile.ICONS.getFilename());
diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
index 8bee73fe9b3..8251ec416c6 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java
@@ -131,9 +131,9 @@ public enum FSkinTexture implements FImage {
                 if (preferredFile.path().contains("fallback_skin")) {
                     texture = new Texture(preferredFile);
                 } else {
-                    Forge.getAssets().others.load(preferredFile.path(), Texture.class);
-                    Forge.getAssets().others.finishLoadingAsset(preferredFile.path());
-                    texture = Forge.getAssets().others.get(preferredFile.path(), Texture.class);
+                    Forge.getAssets().manager.load(preferredFile.path(), Texture.class);
+                    Forge.getAssets().manager.finishLoadingAsset(preferredFile.path());
+                    texture = Forge.getAssets().manager.get(preferredFile.path(), Texture.class);
                 }
             }
             catch (final Exception e) {
@@ -155,9 +155,9 @@ public enum FSkinTexture implements FImage {
                     if (defaultFile.path().contains("fallback_skin")) {
                         texture = new Texture(defaultFile);
                     } else {
-                        Forge.getAssets().others.load(defaultFile.path(), Texture.class);
-                        Forge.getAssets().others.finishLoadingAsset(defaultFile.path());
-                        texture = Forge.getAssets().others.get(defaultFile.path(), Texture.class);
+                        Forge.getAssets().manager.load(defaultFile.path(), Texture.class);
+                        Forge.getAssets().manager.finishLoadingAsset(defaultFile.path());
+                        texture = Forge.getAssets().manager.get(defaultFile.path(), Texture.class);
                     }
                 }
                 catch (final Exception e) {
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 52f33eeeed4..94236afaca6 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -18,6 +18,7 @@
 package forge.assets;
 
 import java.io.File;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
@@ -78,6 +79,7 @@ public class ImageCache {
     private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
     static EvictingQueue<String> q;
+    static Set<String> cardsLoaded = new HashSet<>(800);
     static Queue<String> syncQ;
     static TextureParameter defaultParameter = new TextureParameter();
     static TextureParameter filtered = new TextureParameter();
@@ -124,7 +126,12 @@ public class ImageCache {
     }
     public static void disposeTextures(){
         CardRenderer.clearcardArtCache();
-        Forge.getAssets().cards.clear();
+        //unload all cardsLoaded
+        for (String fileName : cardsLoaded) {
+            if (Forge.getAssets().manager.contains(fileName))
+                Forge.getAssets().manager.unload(fileName);
+        }
+        cardsLoaded.clear();
     }
 
     public static Texture getImage(InventoryItem ii) {
@@ -200,7 +207,7 @@ public class ImageCache {
     public static Texture getImage(String imageKey, boolean useDefaultIfNotFound) {
         return getImage(imageKey, useDefaultIfNotFound, false);
     }
-    public static Texture getImage(String imageKey, boolean useDefaultIfNotFound, boolean useOtherCache) {
+    public static Texture getImage(String imageKey, boolean useDefaultIfNotFound, boolean others) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
             return null;
 
@@ -225,7 +232,7 @@ public class ImageCache {
         File imageFile = ImageKeys.getImageFile(imageKey);
         if (useDefaultIfNotFound) {
             // Load from file and add to cache if not found in cache initially.
-            image = getAsset(imageKey, imageFile, useOtherCache);
+            image = getAsset(imageKey, imageFile, others);
 
             if (image != null) { return image; }
 
@@ -241,7 +248,7 @@ public class ImageCache {
         }
 
         try {
-            image = loadAsset(imageKey, imageFile, useOtherCache);
+            image = loadAsset(imageKey, imageFile, others);
         } catch (final Exception ex) {
             image = null;
         }
@@ -260,37 +267,34 @@ public class ImageCache {
         }
         return image;
     }
-    static Texture getAsset(String imageKey, File file, boolean otherCache) {
+    static Texture getAsset(String imageKey, File file, boolean others) {
         if (file == null)
             return null;
-        if (!otherCache && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
+        if (!others && Forge.enableUIMask.equals("Full") && isBorderless(imageKey))
             return Forge.getAssets().generatedCards.get(imageKey);
-        if (otherCache)
-            return Forge.getAssets().others.get(file.getPath(), Texture.class, false);
-        return Forge.getAssets().cards.get(file.getPath(), Texture.class, false);
+        return Forge.getAssets().manager.get(file.getPath(), Texture.class, false);
     }
-    static Texture loadAsset(String imageKey, File file, boolean otherCache) {
+    static Texture loadAsset(String imageKey, File file, boolean others) {
         if (file == null)
             return null;
-        syncQ.add(file.getPath());
-        if (!otherCache && Forge.getAssets().cards.getLoadedAssets() > maxCardCapacity) {
-            unloadCardTextures(Forge.getAssets().cards);
+        if (!others) {
+            syncQ.add(file.getPath());
+            cardsLoaded.add(file.getPath());
+        }
+        if (!others && cardsLoaded.size() > maxCardCapacity) {
+            unloadCardTextures(Forge.getAssets().manager);
             return null;
         }
         String fileName = file.getPath();
         //load to assetmanager
-        if (otherCache) {
-            Forge.getAssets().others.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            Forge.getAssets().others.finishLoadingAsset(fileName);
-        } else {
-            Forge.getAssets().cards.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
-            Forge.getAssets().cards.finishLoadingAsset(fileName);
-        }
+        Forge.getAssets().manager.load(fileName, Texture.class, Forge.isTextureFilteringEnabled() ? filtered : defaultParameter);
+        Forge.getAssets().manager.finishLoadingAsset(fileName);
+
         //return loaded assets
-        if (otherCache) {
-            return Forge.getAssets().others.get(fileName, Texture.class, false);
+        if (others) {
+            return Forge.getAssets().manager.get(fileName, Texture.class, false);
         } else {
-            Texture t = Forge.getAssets().cards.get(fileName, Texture.class, false);
+            Texture t = Forge.getAssets().manager.get(fileName, Texture.class, false);
             //if full bordermasking is enabled, update the border color
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
@@ -306,16 +310,18 @@ public class ImageCache {
     static void unloadCardTextures(AssetManager manager) {
         //get latest images from syncQ
         Set<String> newQ = Sets.newHashSet(syncQ);
-        //get loaded images from assetmanager
-        Set<String> old = Sets.newHashSet(manager.getAssetNames());
-        //get all images not in newQ (old images to unload)
-        Set<String> toUnload = Sets.difference(old, newQ);
+        //get all images not in newQ (cardLists to unload)
+        Set<String> toUnload = Sets.difference(cardsLoaded, newQ);
         //unload from assetmanager to save RAM
         for (String asset : toUnload) {
-            manager.unload(asset);
+            if(manager.contains(asset))
+                manager.unload(asset);
         }
         //clear cachedArt since this is dependant to the loaded texture
         CardRenderer.clearcardArtCache();
+        cardsLoaded.clear();
+        //update with recent
+        cardsLoaded.addAll(newQ);
     }
     public static void preloadCache(Iterable<String> keys) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))

From be885d8656ba9b53a79a4dd0cc49ed2f86f8ef36 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Sun, 10 Jul 2022 01:55:52 -0400
Subject: [PATCH 265/309] CardScript for Call to the Void and changes to
 ChooseCardEffect

- Created CardScript for call to the void.
- Added "ControlAndNot" parameter to ChooseCardEffect as suggested by @northmoc on discord (https://discord.com/channels/267367946135928833/994588726254633090/994610830815539370)
- Added and implemented "SecretlyChoose".
- Added RevealTitle.
---
 .../ability/effects/ChooseCardEffect.java     | 23 ++++++++++++++++---
 .../cardsfolder/upcoming/call_to_the_void.txt |  7 ++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
index d60a1bd5532..ec78e6e598e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
@@ -83,7 +83,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
             combined.addAll(choices);
             choices = combined;
         }
-
+        
         final String amountValue = sa.getParamOrDefault("Amount", "1");
         int validAmount;
         if (StringUtils.isNumeric(amountValue)) {
@@ -187,6 +187,18 @@ public class ChooseCardEffect extends SpellAbilityEffect {
                     chosenPool.add(choice);
                 }
                 chosen.addAll(chosenPool);
+            } else if (sa.hasParam("ControlAndNot")) {
+                String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : Localizer.getInstance().getMessage("lblChooseCreature");
+                // Targeted player (p) chooses N creatures that belongs to them
+                CardCollection tgtPlayerCtrl = CardLists.filterControlledBy(choices, p);
+                chosen.addAll(p.getController().chooseCardsForEffect(tgtPlayerCtrl, sa, title + " " + "you control", minAmount, validAmount,
+                    !sa.hasParam("Mandatory"), null));
+                // Targeted player (p) chooses N creatures that don't belong to them
+                CardCollection notTgtPlayerCtrl = new CardCollection(choices);
+                notTgtPlayerCtrl.removeAll(tgtPlayerCtrl);
+                chosen.addAll(p.getController().chooseCardsForEffect(notTgtPlayerCtrl, sa, title + " " + "you don't control", minAmount, validAmount,
+                    !sa.hasParam("Mandatory"), null));
+
             } else if ((tgt == null) || p.canBeTargetedBy(sa)) {
                 if (sa.hasParam("AtRandom") && !choices.isEmpty()) {
                     Aggregates.random(choices, validAmount, chosen);
@@ -217,8 +229,13 @@ public class ChooseCardEffect extends SpellAbilityEffect {
                     }
                 }
             }
-            if (sa.hasParam("Reveal")) {
-                game.getAction().reveal(chosen, p, true, Localizer.getInstance().getMessage("lblChosenCards") + " ");
+            if (sa.hasParam("Reveal") && !sa.hasParam("SecretlyChoose")) {
+                game.getAction().reveal(chosen, p, true, sa.hasParam("RevealTitle") ? sa.getParam("RevealTitle") : Localizer.getInstance().getMessage("lblChosenCards") + " ");
+            }
+        }
+        if(sa.hasParam("Reveal") && sa.hasParam("SecretlyChoose")) {
+            for (final Player p : tgtPlayers) {
+                game.getAction().reveal(chosen, p, true, sa.hasParam("RevealTitle") ? sa.getParam("RevealTitle") : Localizer.getInstance().getMessage("lblChosenCards") + " ");
             }
         }
         host.setChosenCards(chosen);
diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
index 0908ba5a65e..df3a6c7e2bb 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -1,9 +1,6 @@
 Name:Call to the Void
 ManaCost:4 B
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 4 B | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCreatureYouCtrl | SubAbility$ DBRevealChosenToAll
-SVar:DBChooseCreatureYouCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you control | SubAbility$ DBChooseCreatureYouDontCtrl | RememberChosen$ True | Mandatory$ True
-SVar:DBChooseCreatureYouDontCtrl:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.nonRememberedPlayerCtrl | ChoiceTitle$ Secretly choose a creature you don't control | RememberChosen$ True | Mandatory$ True
-SVar:DBRevealChosenToAll:DB$ Reveal | Defined$ CardOwner | RevealDefined$ RememberedCard | RevealToAll$ True | RevealTitle$ OVERRIDE Creatures chosen. They will be destroyed. | Description$ Test | SubAbility$ DBDestroyChosen
+A:SP$ ChooseCard | Defined$ Player | Choices$ Creature | SecretlyChoose$ True | Amount$ 1 | ControlAndNot$ True | ChoiceTitle$ Secretly choose a creature | Reveal$ True | RevealTitle$ OVERRIDE Chosen creatures. They will be destroyed. | SubAbility$ DBDestroyChosen | RememberChosen$ True | Mandatory$ True
 SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanUp
-SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True 
+SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True

From 8cb8fb2bba2ba90ffedf844b26b4689bd35c748c Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 10 Jul 2022 16:44:59 +0800
Subject: [PATCH 266/309] refactor overlay to use text mode - update
 assetmanager on resume

---
 forge-gui-mobile/src/forge/Forge.java         |   6 +
 .../src/forge/deck/FDeckChooser.java          | 677 ++++++++----------
 .../src/forge/screens/LoadingOverlay.java     |  41 +-
 .../screens/constructed/LobbyScreen.java      | 158 ++--
 .../screens/gauntlet/LoadGauntletScreen.java  | 130 ++--
 .../screens/home/puzzle/PuzzleScreen.java     |  45 +-
 .../screens/limited/LoadDraftScreen.java      | 122 ++--
 .../screens/limited/LoadSealedScreen.java     | 112 ++-
 .../forge/screens/limited/NewDraftScreen.java |  26 +-
 .../screens/online/OnlineLobbyScreen.java     |  87 +--
 .../screens/planarconquest/ConquestMenu.java  |  87 +--
 .../ConquestMultiverseScreen.java             |  34 +-
 .../planarconquest/NewConquestScreen.java     |  35 +-
 .../forge/screens/quest/NewQuestScreen.java   | 165 ++---
 .../forge/screens/quest/QuestDuelsScreen.java |  33 +-
 .../screens/quest/QuestLaunchScreen.java      |  21 +-
 .../src/forge/screens/quest/QuestMenu.java    | 161 ++---
 .../screens/quest/QuestSpellShopScreen.java   | 158 ++--
 .../screens/quest/QuestTournamentsScreen.java |  95 +--
 19 files changed, 826 insertions(+), 1367 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index ae0a7e166d6..bd2403e855c 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -79,6 +79,7 @@ public class Forge implements ApplicationListener {
     protected static TransitionScreen transitionScreen;
     public static KeyInputAdapter keyInputAdapter;
     private static boolean exited;
+    private boolean needsUpdate = false;
     public static boolean safeToClose = true;
     public static boolean magnify = false;
     public static boolean magnifyToggle = true;
@@ -785,6 +786,10 @@ public class Forge implements ApplicationListener {
         try {
             ImageCache.allowSingleLoad();
             ForgeAnimation.advanceAll();
+            if (needsUpdate) {
+                if (getAssets().manager.update())
+                    needsUpdate = false;
+            }
 
             Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); // Clear the screen.
 
@@ -922,6 +927,7 @@ public class Forge implements ApplicationListener {
     @Override
     public void resume() {
         Texture.setAssetManager(getAssets().manager);
+        needsUpdate = true;
         if (MatchController.getHostedMatch() != null) {
             MatchController.getHostedMatch().resume();
         }
diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
index 90a7b41ba43..dea7c235863 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java
@@ -131,75 +131,59 @@ public class FDeckChooser extends FScreen {
         lstDecks = new DeckManager(gameType0);
         isAi = isAi0;
 
-        lstDecks.setItemActivateHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                if (lstDecks.getGameType() == GameType.DeckManager) {
-                    //for Deck Editor, edit deck instead of accepting
-                    editSelectedDeck();
-                    return;
-                }
-                accept();
-            }
-        });
-        btnNewDeck.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                createNewDeck();
-            }
-        });
-        btnEditDeck.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
+        lstDecks.setItemActivateHandler(event -> {
+            if (lstDecks.getGameType() == GameType.DeckManager) {
+                //for Deck Editor, edit deck instead of accepting
                 editSelectedDeck();
+                return;
+            }
+            accept();
+        });
+        btnNewDeck.setCommand(event -> createNewDeck());
+        btnEditDeck.setCommand(event -> editSelectedDeck());
+        btnViewDeck.setCommand(event -> {
+            if (selectedDeckType != DeckType.STANDARD_COLOR_DECK && selectedDeckType != DeckType.STANDARD_CARDGEN_DECK
+                    && selectedDeckType != DeckType.PIONEER_CARDGEN_DECK && selectedDeckType != DeckType.HISTORIC_CARDGEN_DECK
+                    && selectedDeckType != DeckType.MODERN_CARDGEN_DECK && selectedDeckType != DeckType.LEGACY_CARDGEN_DECK
+                    && selectedDeckType != DeckType.VINTAGE_CARDGEN_DECK && selectedDeckType != DeckType.MODERN_COLOR_DECK &&
+                    selectedDeckType != DeckType.COLOR_DECK && selectedDeckType != DeckType.THEME_DECK
+                    && selectedDeckType != DeckType.RANDOM_COMMANDER_DECK && selectedDeckType != DeckType.RANDOM_CARDGEN_COMMANDER_DECK) {
+                FDeckViewer.show(getDeck(), false, DeckType.DRAFT_DECK.equals(selectedDeckType));
             }
         });
-        btnViewDeck.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                if (selectedDeckType != DeckType.STANDARD_COLOR_DECK && selectedDeckType != DeckType.STANDARD_CARDGEN_DECK
-                        && selectedDeckType != DeckType.PIONEER_CARDGEN_DECK && selectedDeckType != DeckType.HISTORIC_CARDGEN_DECK
-                        && selectedDeckType != DeckType.MODERN_CARDGEN_DECK && selectedDeckType != DeckType.LEGACY_CARDGEN_DECK
-                        && selectedDeckType != DeckType.VINTAGE_CARDGEN_DECK && selectedDeckType != DeckType.MODERN_COLOR_DECK &&
-                        selectedDeckType != DeckType.COLOR_DECK && selectedDeckType != DeckType.THEME_DECK
-                        && selectedDeckType != DeckType.RANDOM_COMMANDER_DECK && selectedDeckType != DeckType.RANDOM_CARDGEN_COMMANDER_DECK) {
-                    FDeckViewer.show(getDeck(), false, DeckType.DRAFT_DECK.equals(selectedDeckType));
-                }
+        btnRandom.setCommand(event -> {
+            if (lstDecks.getGameType() == GameType.DeckManager) {
+                //for Deck Editor, test deck instead of randomly selecting deck
+                testSelectedDeck();
+                return;
             }
-        });
-        btnRandom.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                if (lstDecks.getGameType() == GameType.DeckManager) {
-                    //for Deck Editor, test deck instead of randomly selecting deck
-                    testSelectedDeck();
-                    return;
-                }
-                if (selectedDeckType == DeckType.COLOR_DECK || selectedDeckType == DeckType.STANDARD_COLOR_DECK
-                        || selectedDeckType == DeckType.MODERN_COLOR_DECK) {
-                    DeckgenUtil.randomSelectColors(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.STANDARD_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.PIONEER_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.HISTORIC_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.MODERN_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.LEGACY_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else if (selectedDeckType == DeckType.VINTAGE_CARDGEN_DECK){
-                    DeckgenUtil.randomSelect(lstDecks);
-                }
-                else {
-                    int size = 0;
+            if (selectedDeckType == DeckType.COLOR_DECK || selectedDeckType == DeckType.STANDARD_COLOR_DECK
+                    || selectedDeckType == DeckType.MODERN_COLOR_DECK) {
+                DeckgenUtil.randomSelectColors(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.STANDARD_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.PIONEER_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.HISTORIC_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.MODERN_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.LEGACY_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else if (selectedDeckType == DeckType.VINTAGE_CARDGEN_DECK){
+                DeckgenUtil.randomSelect(lstDecks);
+            }
+            else {
+                int size = 0;
+                try {
                     if (isAi && !isGeneratedDeck(selectedDeckType) && Forge.autoAIDeckSelection) {
+                        btnRandom.setEnabled(false);
                         AIDecks = lstDecks.getPool().toFlatList().parallelStream().filter(deckProxy -> deckProxy.getAI().inMainDeck == 0).collect(Collectors.toList());
                         size = AIDecks.size();
                     }
@@ -207,9 +191,12 @@ public class FDeckChooser extends FScreen {
                         lstDecks.setSelectedItem(AIDecks.get(MyRandom.getRandom().nextInt(size)));
                     else
                         DeckgenUtil.randomSelect(lstDecks);
+                } catch (Exception ee) {
+                    DeckgenUtil.randomSelect(lstDecks);
                 }
-                accept();
             }
+            btnRandom.setEnabled(true);
+            accept();
         });
         switch (lstDecks.getGameType()) {
         case Constructed:
@@ -371,32 +358,29 @@ public class FDeckChooser extends FScreen {
         } else {
             editor = new FDeckEditor(getEditorType(), "", false);
         }
-        editor.setSaveHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                //ensure user returns to proper deck type and that list is refreshed if new deck is saved
-                if (!needRefreshOnActivate) {
-                    needRefreshOnActivate = true;
-                    if (lstDecks.getGameType() == GameType.DeckManager) {
-                        switch (selectedDeckType) {
-                            case COMMANDER_DECK:
-                            case OATHBREAKER_DECK:
-                            case TINY_LEADERS_DECK:
-                            case BRAWL_DECK:
-                            case SCHEME_DECK:
-                            case PLANAR_DECK:
-                            case DRAFT_DECK:
-                            case SEALED_DECK:
-                                break;
-                            default:
-                                setSelectedDeckType(DeckType.CONSTRUCTED_DECK);
-                                break;
-                        }
-                    }
-                    else {
-                        setSelectedDeckType(DeckType.CUSTOM_DECK);
+        editor.setSaveHandler(event -> {
+            //ensure user returns to proper deck type and that list is refreshed if new deck is saved
+            if (!needRefreshOnActivate) {
+                needRefreshOnActivate = true;
+                if (lstDecks.getGameType() == GameType.DeckManager) {
+                    switch (selectedDeckType) {
+                        case COMMANDER_DECK:
+                        case OATHBREAKER_DECK:
+                        case TINY_LEADERS_DECK:
+                        case BRAWL_DECK:
+                        case SCHEME_DECK:
+                        case PLANAR_DECK:
+                        case DRAFT_DECK:
+                        case SEALED_DECK:
+                            break;
+                        default:
+                            setSelectedDeckType(DeckType.CONSTRUCTED_DECK);
+                            break;
                     }
                 }
+                else {
+                    setSelectedDeckType(DeckType.CUSTOM_DECK);
+                }
             }
         });
         Forge.openScreen(editor);
@@ -624,249 +608,205 @@ public class FDeckChooser extends FScreen {
             cmbDeckTypes.setAlignment(Align.center);
             restoreSavedState();
 
-            cmbDeckTypes.setChangedHandler(new FEventHandler() {
-                @Override
+            cmbDeckTypes.setChangedHandler(event -> {
+                final DeckType deckType = cmbDeckTypes.getSelectedItem();
 
-                public void handleEvent(final FEvent e) {
-                    final DeckType deckType = cmbDeckTypes.getSelectedItem();
+                if (!refreshingDeckType&&(deckType == DeckType.NET_DECK || deckType == DeckType.NET_COMMANDER_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = deckType == DeckType.NET_COMMANDER_DECK ? GameType.Commander : GameType.Constructed;
+                        }
+                        final NetDeckCategory category = NetDeckCategory.selectAndLoad(gameType);
 
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_DECK || deckType == DeckType.NET_COMMANDER_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = deckType == DeckType.NET_COMMANDER_DECK ? GameType.Commander : GameType.Constructed;
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && netDeckCategory != null) {
+                                    cmbDeckTypes.setText(netDeckCategory.getDeckType());
                                 }
-                                final NetDeckCategory category = NetDeckCategory.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && netDeckCategory != null) {
-                                                cmbDeckTypes.setText(netDeckCategory.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        netDeckCategory = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
+                                return;
                             }
+
+                            netDeckCategory = category;
+                            refreshDecksList(deckType, true, event);
                         });
-                        return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_STANDARD_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchiveStandard category = NetDeckArchiveStandard.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchiveStandard != null) {
-                                                cmbDeckTypes.setText(NetDeckArchiveStandard.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchiveStandard = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                       return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PIONEER_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchivePioneer category = NetDeckArchivePioneer.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchivePioneer != null) {
-                                                cmbDeckTypes.setText(NetDeckArchivePioneer.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchivePioneer = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                        return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_MODERN_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchiveModern category = NetDeckArchiveModern.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchiveModern != null) {
-                                                cmbDeckTypes.setText(NetDeckArchiveModern.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchiveModern = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                        return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PAUPER_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchivePauper category = NetDeckArchivePauper.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchivePauper != null) {
-                                                cmbDeckTypes.setText(NetDeckArchivePauper.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchivePauper = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                        return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_LEGACY_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchiveLegacy category = NetDeckArchiveLegacy.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchiveLegacy != null) {
-                                                cmbDeckTypes.setText(NetDeckArchiveLegacy.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchiveLegacy = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                        return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_VINTAGE_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchiveVintage category = NetDeckArchiveVintage.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchiveVintage != null) {
-                                                cmbDeckTypes.setText(NetDeckArchiveVintage.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchiveVintage = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                       return;
-                    }
-                    if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_BLOCK_DECK)) {
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                GameType gameType = lstDecks.getGameType();
-                                if (gameType == GameType.DeckManager) {
-                                    gameType = GameType.Constructed;
-                                }
-                                final NetDeckArchiveBlock category = NetDeckArchiveBlock.selectAndLoad(gameType);
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        if (category == null) {
-                                            cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
-                                            if (selectedDeckType == deckType && NetDeckArchiveBlock != null) {
-                                                cmbDeckTypes.setText(NetDeckArchiveBlock.getDeckType());
-                                            }
-                                            return;
-                                        }
-
-                                        NetDeckArchiveBlock = category;
-                                        refreshDecksList(deckType, true, e);
-                                    }
-                                });
-                            }
-                        });
-                        return;
-                    }
-
-
-
-                    refreshDecksList(deckType, false, e);
+                    });
+                    return;
                 }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_STANDARD_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchiveStandard category = NetDeckArchiveStandard.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchiveStandard != null) {
+                                    cmbDeckTypes.setText(NetDeckArchiveStandard.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchiveStandard = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                   return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PIONEER_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchivePioneer category = NetDeckArchivePioneer.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchivePioneer != null) {
+                                    cmbDeckTypes.setText(NetDeckArchivePioneer.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchivePioneer = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                    return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_MODERN_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchiveModern category = NetDeckArchiveModern.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchiveModern != null) {
+                                    cmbDeckTypes.setText(NetDeckArchiveModern.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchiveModern = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                    return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_PAUPER_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchivePauper category = NetDeckArchivePauper.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchivePauper != null) {
+                                    cmbDeckTypes.setText(NetDeckArchivePauper.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchivePauper = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                    return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_LEGACY_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchiveLegacy category = NetDeckArchiveLegacy.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchiveLegacy != null) {
+                                    cmbDeckTypes.setText(NetDeckArchiveLegacy.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchiveLegacy = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                    return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_VINTAGE_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchiveVintage category = NetDeckArchiveVintage.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchiveVintage != null) {
+                                    cmbDeckTypes.setText(NetDeckArchiveVintage.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchiveVintage = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                   return;
+                }
+                if (!refreshingDeckType&&(deckType == DeckType.NET_ARCHIVE_BLOCK_DECK)) {
+                    //needed for loading net decks
+                    FThreads.invokeInBackgroundThread(() -> {
+                        GameType gameType = lstDecks.getGameType();
+                        if (gameType == GameType.DeckManager) {
+                            gameType = GameType.Constructed;
+                        }
+                        final NetDeckArchiveBlock category = NetDeckArchiveBlock.selectAndLoad(gameType);
+
+                        FThreads.invokeInEdtLater(() -> {
+                            if (category == null) {
+                                cmbDeckTypes.setSelectedItem(selectedDeckType); //restore old selection if user cancels
+                                if (selectedDeckType == deckType && NetDeckArchiveBlock != null) {
+                                    cmbDeckTypes.setText(NetDeckArchiveBlock.getDeckType());
+                                }
+                                return;
+                            }
+
+                            NetDeckArchiveBlock = category;
+                            refreshDecksList(deckType, true, event);
+                        });
+                    });
+                    return;
+                }
+
+
+
+                refreshDecksList(deckType, false, event);
             });
             add(cmbDeckTypes);
             add(lstDecks);
@@ -888,11 +828,11 @@ public class FDeckChooser extends FScreen {
         saveState();
     }
 
-    private void refreshDecksList(DeckType deckType, boolean forceRefresh, FEvent e) {
+    private void refreshDecksList(DeckType deckType, boolean forceRefresh, FEvent event) {
         if (selectedDeckType == deckType && !forceRefresh) { return; }
         selectedDeckType = deckType;
 
-        if (e == null) {
+        if (event == null) {
             refreshingDeckType = true;
             cmbDeckTypes.setSelectedItem(deckType);
             refreshingDeckType = false;
@@ -1186,7 +1126,7 @@ public class FDeckChooser extends FScreen {
 
         btnRandom.setLeft(getWidth() - PADDING - btnRandom.getWidth());
 
-        if (e != null) { //set default list selection if from combo box change event
+        if (event != null) { //set default list selection if from combo box change event
             if (deckType == DeckType.COLOR_DECK) {
                 // default selection = basic two color deck
                 lstDecks.setSelectedIndices(new Integer[]{0, 1});
@@ -1510,36 +1450,26 @@ public class FDeckChooser extends FScreen {
                             return;
                         }
 
-                        FThreads.invokeInBackgroundThread(new Runnable() { //needed for loading net decks
-                            @Override
-                            public void run() {
-                                final NetDeckCategory netCat;
-                                if (allowedDeckTypes.contains(DeckType.NET_DECK)) {
-                                    netCat = NetDeckCategory.selectAndLoad(GameType.Constructed);
-                                } else {
-                                    netCat = null;
-                                }
-
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, netCat);
-                                                FModel.setGauntletData(gauntlet);
-
-                                                List<RegisteredPlayer> players = new ArrayList<>();
-                                                RegisteredPlayer humanPlayer = new RegisteredPlayer(userDeck).setPlayer(GamePlayerUtil.getGuiPlayer());
-                                                players.add(humanPlayer);
-                                                players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
-
-                                                gauntlet.startRound(players, humanPlayer);
-                                            }
-                                        });
-                                    }
-                                });
+                        //needed for loading net decks
+                        FThreads.invokeInBackgroundThread(() -> {
+                            final NetDeckCategory netCat;
+                            if (allowedDeckTypes.contains(DeckType.NET_DECK)) {
+                                netCat = NetDeckCategory.selectAndLoad(GameType.Constructed);
+                            } else {
+                                netCat = null;
                             }
+
+                            FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                                GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, netCat);
+                                FModel.setGauntletData(gauntlet);
+
+                                List<RegisteredPlayer> players = new ArrayList<>();
+                                RegisteredPlayer humanPlayer = new RegisteredPlayer(userDeck).setPlayer(GamePlayerUtil.getGuiPlayer());
+                                players.add(humanPlayer);
+                                players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
+
+                                gauntlet.startRound(players, humanPlayer);
+                            }));
                         });
                     }
                 });
@@ -1554,26 +1484,23 @@ public class FDeckChooser extends FScreen {
             public void run(final Deck aiDeck) {
                 if (aiDeck == null) { return; }
 
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                    @Override
-                    public void run() {
-                        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/screens/LoadingOverlay.java b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
index 4fd299a2c4d..2ccda45df86 100644
--- a/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
+++ b/forge-gui-mobile/src/forge/screens/LoadingOverlay.java
@@ -22,39 +22,25 @@ public class LoadingOverlay extends FOverlay {
     private static final FSkinFont FONT = FSkinFont.get(22);
     private static final FSkinColor BACK_COLOR = FSkinColor.get(Colors.CLR_ACTIVE).alphaColor(0.75f);
     private static final FSkinColor FORE_COLOR = FSkinColor.get(Colors.CLR_TEXT);
-
     public static void show(String caption0, final Runnable runnable) {
-        final LoadingOverlay loader = new LoadingOverlay(caption0);
+        show(caption0, false, runnable);
+    }
+    public static void show(String caption0, boolean textMode, final Runnable runnable) {
+        final LoadingOverlay loader = new LoadingOverlay(caption0, textMode);
         loader.show(); //show loading overlay then delay running remaining logic so UI can respond
-        ThreadUtil.invokeInGameThread(new Runnable() {
-            @Override
-            public void run() {
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        runnable.run();
-                        loader.hide();
-                        loader.finishedloading(); //setLoadingaMatch to false
-                    }
-                });
-            }
-        });
+        ThreadUtil.invokeInGameThread(() -> FThreads.invokeInEdtLater(() -> {
+            runnable.run();
+            loader.hide();
+            loader.finishedloading(); //setLoadingaMatch to false
+        }));
     }
 
     public static void runBackgroundTask(String caption0, final Runnable task) {
-        final LoadingOverlay loader = new LoadingOverlay(caption0);
+        final LoadingOverlay loader = new LoadingOverlay(caption0, true);
         loader.show();
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                task.run();
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        loader.hide();
-                    }
-                });
-            }
+        FThreads.invokeInBackgroundThread(() -> {
+            task.run();
+            FThreads.invokeInEdtLater(() -> loader.hide());
         });
     }
 
@@ -63,6 +49,7 @@ public class LoadingOverlay extends FOverlay {
 
     public LoadingOverlay(String caption0) {
         caption = caption0;
+        textMode = false;
     }
 
     public LoadingOverlay(String caption0, boolean textOnly) {
diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index 098ef9f2b04..e0864e43b22 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -111,23 +111,20 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
             cbPlayerCount.addItem(i);
         }
         cbPlayerCount.setSelectedItem(2);
-        cbPlayerCount.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                int numPlayers = getNumPlayers();
-                while(lobby.getNumberOfSlots() < getNumPlayers()){
-                    lobby.addSlot();
-                }
-                while(lobby.getNumberOfSlots() > getNumPlayers()){
-                    lobby.removeSlot(lobby.getNumberOfSlots()-1);
-                }
-                for (int i = 0; i < MAX_PLAYERS; i++) {
-                    if(i<playerPanels.size()) {
-                        playerPanels.get(i).setVisible(i < numPlayers);
-                    }
-                }
-                playersScroll.revalidate();
+        cbPlayerCount.setChangedHandler(event -> {
+            int numPlayers = getNumPlayers();
+            while(lobby.getNumberOfSlots() < getNumPlayers()){
+                lobby.addSlot();
             }
+            while(lobby.getNumberOfSlots() > getNumPlayers()){
+                lobby.removeSlot(lobby.getNumberOfSlots()-1);
+            }
+            for (int i = 0; i < MAX_PLAYERS; i++) {
+                if(i<playerPanels.size()) {
+                    playerPanels.get(i).setVisible(i < numPlayers);
+                }
+            }
+            playersScroll.revalidate();
         });
 
         initLobby(lobby0);
@@ -139,12 +136,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
         cbGamesInMatch.addItem("3");
         cbGamesInMatch.addItem("5");
         cbGamesInMatch.setSelectedItem(FModel.getPreferences().getPref((FPref.UI_MATCHES_PER_GAME)));
-        cbGamesInMatch.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                FModel.getPreferences().setPref(FPref.UI_MATCHES_PER_GAME, cbGamesInMatch.getSelectedItem());
-            }
-        });
+        cbGamesInMatch.setChangedHandler(event -> FModel.getPreferences().setPref(FPref.UI_MATCHES_PER_GAME, cbGamesInMatch.getSelectedItem()));
 
         add(lblVariants);
         add(cbVariants);
@@ -161,31 +153,28 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
         cbVariants.addItem(GameType.Archenemy);
         cbVariants.addItem(GameType.ArchenemyRumble);
         cbVariants.addItem(Forge.getLocalizer().getMessage("lblMore"));
-        cbVariants.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                if (cbVariants.getSelectedIndex() <= 0) {
-                    lobby.clearVariants();
-                    updateLayoutForVariants();
-                    Set<GameType> gameTypes = new HashSet<>();
-                    FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
-                    FModel.getPreferences().save();
-                }
-                else if (cbVariants.getSelectedIndex() == cbVariants.getItemCount() - 1) {
-                    Forge.openScreen(new MultiVariantSelect());
-                    updateVariantSelection();
-                }
-                else {
-                    lobby.clearVariants();
-                    lobby.applyVariant((GameType)cbVariants.getSelectedItem());
-                    updateLayoutForVariants();
-                    Set<GameType> gameTypes = new HashSet<>();
-                    for (GameType variant: lobby.getAppliedVariants()) {
-                        gameTypes.add(variant);
-                    }
-                    FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
-                    FModel.getPreferences().save();
+        cbVariants.setChangedHandler(event -> {
+            if (cbVariants.getSelectedIndex() <= 0) {
+                lobby.clearVariants();
+                updateLayoutForVariants();
+                Set<GameType> gameTypes = new HashSet<>();
+                FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
+                FModel.getPreferences().save();
+            }
+            else if (cbVariants.getSelectedIndex() == cbVariants.getItemCount() - 1) {
+                Forge.openScreen(new MultiVariantSelect());
+                updateVariantSelection();
+            }
+            else {
+                lobby.clearVariants();
+                lobby.applyVariant((GameType)cbVariants.getSelectedItem());
+                updateLayoutForVariants();
+                Set<GameType> gameTypes = new HashSet<>();
+                for (GameType variant: lobby.getAppliedVariants()) {
+                    gameTypes.add(variant);
                 }
+                FModel.getPreferences().setGameType(FPref.UI_APPLIED_VARIANTS, gameTypes);
+                FModel.getPreferences().save();
             }
         });
 
@@ -195,40 +184,34 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
 
         updatePlayersFromPrefs();
 
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                playerPanels.get(0).initialize(FPref.CONSTRUCTED_P1_DECK_STATE, FPref.COMMANDER_P1_DECK_STATE, FPref.OATHBREAKER_P1_DECK_STATE, FPref.TINY_LEADER_P1_DECK_STATE, FPref.BRAWL_P1_DECK_STATE, DeckType.PRECONSTRUCTED_DECK);
-                playerPanels.get(1).initialize(FPref.CONSTRUCTED_P2_DECK_STATE, FPref.COMMANDER_P2_DECK_STATE, FPref.OATHBREAKER_P2_DECK_STATE, FPref.TINY_LEADER_P2_DECK_STATE, FPref.BRAWL_P2_DECK_STATE, DeckType.COLOR_DECK);
-                try {
-                    if (getNumPlayers() > 2) {
-                        playerPanels.get(2).initialize(FPref.CONSTRUCTED_P3_DECK_STATE, FPref.COMMANDER_P3_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P3_DECK_STATE, FPref.BRAWL_P3_DECK_STATE, DeckType.COLOR_DECK);
-                    }
-                    if (getNumPlayers() > 3) {
-                        playerPanels.get(3).initialize(FPref.CONSTRUCTED_P4_DECK_STATE, FPref.COMMANDER_P4_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P4_DECK_STATE, FPref.BRAWL_P4_DECK_STATE, DeckType.COLOR_DECK);
-                    }
-                } catch (Exception e) {}
-                /*playerPanels.get(4).initialize(FPref.CONSTRUCTED_P5_DECK_STATE, DeckType.COLOR_DECK);
-                playerPanels.get(5).initialize(FPref.CONSTRUCTED_P6_DECK_STATE, DeckType.COLOR_DECK);
-                playerPanels.get(6).initialize(FPref.CONSTRUCTED_P7_DECK_STATE, DeckType.COLOR_DECK);
-                playerPanels.get(7).initialize(FPref.CONSTRUCTED_P8_DECK_STATE, DeckType.COLOR_DECK);*/ //TODO: Improve performance of loading this screen by using background thread
+        FThreads.invokeInBackgroundThread(() -> {
+            playerPanels.get(0).initialize(FPref.CONSTRUCTED_P1_DECK_STATE, FPref.COMMANDER_P1_DECK_STATE, FPref.OATHBREAKER_P1_DECK_STATE, FPref.TINY_LEADER_P1_DECK_STATE, FPref.BRAWL_P1_DECK_STATE, DeckType.PRECONSTRUCTED_DECK);
+            playerPanels.get(1).initialize(FPref.CONSTRUCTED_P2_DECK_STATE, FPref.COMMANDER_P2_DECK_STATE, FPref.OATHBREAKER_P2_DECK_STATE, FPref.TINY_LEADER_P2_DECK_STATE, FPref.BRAWL_P2_DECK_STATE, DeckType.COLOR_DECK);
+            try {
+                if (getNumPlayers() > 2) {
+                    playerPanels.get(2).initialize(FPref.CONSTRUCTED_P3_DECK_STATE, FPref.COMMANDER_P3_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P3_DECK_STATE, FPref.BRAWL_P3_DECK_STATE, DeckType.COLOR_DECK);
+                }
+                if (getNumPlayers() > 3) {
+                    playerPanels.get(3).initialize(FPref.CONSTRUCTED_P4_DECK_STATE, FPref.COMMANDER_P4_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P4_DECK_STATE, FPref.BRAWL_P4_DECK_STATE, DeckType.COLOR_DECK);
+                }
+            } catch (Exception e) {}
+            /*playerPanels.get(4).initialize(FPref.CONSTRUCTED_P5_DECK_STATE, DeckType.COLOR_DECK);
+            playerPanels.get(5).initialize(FPref.CONSTRUCTED_P6_DECK_STATE, DeckType.COLOR_DECK);
+            playerPanels.get(6).initialize(FPref.CONSTRUCTED_P7_DECK_STATE, DeckType.COLOR_DECK);
+            playerPanels.get(7).initialize(FPref.CONSTRUCTED_P8_DECK_STATE, DeckType.COLOR_DECK);*/ //TODO: Improve performance of loading this screen by using background thread
 
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        btnStart.setEnabled(lobby.hasControl());
+            FThreads.invokeInEdtLater(() -> {
+                btnStart.setEnabled(lobby.hasControl());
 
-                        Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPLIED_VARIANTS);
-                        if (!gameTypes.isEmpty()) {
-                            for (GameType gameType : gameTypes) {
-                                lobby.applyVariant(gameType);
-                            }
-                            updateVariantSelection();
-                            updateLayoutForVariants();
-                        }
+                Set<GameType> gameTypes = FModel.getPreferences().getGameType(FPref.UI_APPLIED_VARIANTS);
+                if (!gameTypes.isEmpty()) {
+                    for (GameType gameType : gameTypes) {
+                        lobby.applyVariant(gameType);
                     }
-                });
-            }
+                    updateVariantSelection();
+                    updateLayoutForVariants();
+                }
+            });
         });
 
         lblPlayers.setEnabled(true);
@@ -351,20 +334,13 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
                 updateName(0, GamePlayerUtil.getGuiPlayer().getName());
             }
         }
-        FThreads.invokeInBackgroundThread(new Runnable() { //must call startGame in background thread in case there are alerts
-            @Override
-            public void run() {
-                final Runnable startGame = lobby.startGame();
-                if (startGame != null) {
-                    //set this so we cant get any multi/rapid tap on start button
-                    Forge.setLoadingaMatch(true);
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), startGame);
-                        }
-                    });
-                }
+        //must call startGame in background thread in case there are alerts
+        FThreads.invokeInBackgroundThread(() -> {
+            final Runnable startGame = lobby.startGame();
+            if (startGame != null) {
+                //set this so we cant get any multi/rapid tap on start button
+                Forge.setLoadingaMatch(true);
+                FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, startGame));
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
index 07c08c7bb34..88def6f37c3 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
@@ -53,26 +53,11 @@ public class LoadGauntletScreen extends LaunchScreen {
         super(null, LoadGameMenu.getMenu());
 
         btnNewGauntlet.setFont(FSkinFont.get(16));
-        btnNewGauntlet.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                NewGameScreen.Gauntlet.open();
-            }
-        });
+        btnNewGauntlet.setCommand(event -> NewGameScreen.Gauntlet.open());
         btnRenameGauntlet.setFont(btnNewGauntlet.getFont());
-        btnRenameGauntlet.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                renameGauntlet(lstGauntlets.getSelectedGauntlet());
-            }
-        });
+        btnRenameGauntlet.setCommand(event -> renameGauntlet(lstGauntlets.getSelectedGauntlet()));
         btnDeleteGauntlet.setFont(btnNewGauntlet.getFont());
-        btnDeleteGauntlet.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                deleteGauntlet(lstGauntlets.getSelectedGauntlet());
-            }
-        });
+        btnDeleteGauntlet.setCommand(event -> deleteGauntlet(lstGauntlets.getSelectedGauntlet()));
     }
 
     public void onActivate() {
@@ -136,81 +121,69 @@ public class LoadGauntletScreen extends LaunchScreen {
             return;
         }
 
-        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-            @Override
-            public void run() {
-                final GauntletData gauntlet = FModel.getGauntletData();
-                List<RegisteredPlayer> players = new ArrayList<>();
-                RegisteredPlayer humanPlayer = new RegisteredPlayer(gauntlet.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
-                players.add(humanPlayer);
-                players.add(new RegisteredPlayer(gauntlet.getDecks().get(gauntlet.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
-                gauntlet.startRound(players, humanPlayer);
-            }
+        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+            final GauntletData gauntlet1 = FModel.getGauntletData();
+            List<RegisteredPlayer> players = new ArrayList<>();
+            RegisteredPlayer humanPlayer = new RegisteredPlayer(gauntlet1.getUserDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
+            players.add(humanPlayer);
+            players.add(new RegisteredPlayer(gauntlet1.getDecks().get(gauntlet1.getCompleted())).setPlayer(GamePlayerUtil.createAiPlayer()));
+            gauntlet1.startRound(players, humanPlayer);
         });
     }
 
     private void renameGauntlet(final GauntletData gauntlet) {
         if (gauntlet == null) { return; }
 
-        ThreadUtil.invokeInGameThread(new Runnable() {
-            @Override
-            public void run() {
-                String gauntletName;
-                String oldGauntletName = gauntlet.getName();
-                while (true) {
-                    gauntletName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewGauntletGameName"), Forge.getLocalizer().getMessage("lblRenameGauntlet"), null, oldGauntletName);
-                    if (gauntletName == null) { return; }
+        ThreadUtil.invokeInGameThread(() -> {
+            String gauntletName;
+            String oldGauntletName = gauntlet.getName();
+            while (true) {
+                gauntletName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewGauntletGameName"), Forge.getLocalizer().getMessage("lblRenameGauntlet"), null, oldGauntletName);
+                if (gauntletName == null) { return; }
 
-                    gauntletName = QuestUtil.cleanString(gauntletName);
-                    if (gauntletName.equals(oldGauntletName)) { return; } //quit if chose same name
+                gauntletName = QuestUtil.cleanString(gauntletName);
+                if (gauntletName.equals(oldGauntletName)) { return; } //quit if chose same name
 
-                    if (gauntletName.isEmpty()) {
-                        SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblPleaseSpecifyGauntletName"));
-                        continue;
-                    }
-
-                    boolean exists = false;
-                    for (GauntletData gauntletData : lstGauntlets) {
-                        if (gauntletData.getName().equalsIgnoreCase(gauntletName)) {
-                            exists = true;
-                            break;
-                        }
-                    }
-                    if (exists) {
-                        SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblGauntletNameExistsPleasePickAnotherName"));
-                        continue;
-                    }
-                    break;
+                if (gauntletName.isEmpty()) {
+                    SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblPleaseSpecifyGauntletName"));
+                    continue;
                 }
-                final String newGauntletName = gauntletName;
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        gauntlet.rename(newGauntletName);
-                        lstGauntlets.refresh();
-                        lstGauntlets.setSelectedGauntlet(gauntlet);
+
+                boolean exists = false;
+                for (GauntletData gauntletData : lstGauntlets) {
+                    if (gauntletData.getName().equalsIgnoreCase(gauntletName)) {
+                        exists = true;
+                        break;
                     }
-                });
+                }
+                if (exists) {
+                    SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblGauntletNameExistsPleasePickAnotherName"));
+                    continue;
+                }
+                break;
             }
+            final String newGauntletName = gauntletName;
+            FThreads.invokeInEdtLater(() -> {
+                gauntlet.rename(newGauntletName);
+                lstGauntlets.refresh();
+                lstGauntlets.setSelectedGauntlet(gauntlet);
+            });
         });
     }
 
     private void deleteGauntlet(final GauntletData gauntlet) {
         if (gauntlet == null) { return; }
 
-        ThreadUtil.invokeInGameThread(new Runnable() {
-            @Override
-            public void run() {
-                if (!SOptionPane.showConfirmDialog(
-                        Forge.getLocalizer().getMessage("lblAreYouSuerDeleteGauntlet", gauntlet.getName()),
-                        Forge.getLocalizer().getMessage("lblDeleteGauntlet"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"))) {
-                    return;
-                }
-
-                GauntletIO.getGauntletFile(gauntlet).delete();
-
-                lstGauntlets.removeGauntlet(gauntlet);
+        ThreadUtil.invokeInGameThread(() -> {
+            if (!SOptionPane.showConfirmDialog(
+                    Forge.getLocalizer().getMessage("lblAreYouSuerDeleteGauntlet", gauntlet.getName()),
+                    Forge.getLocalizer().getMessage("lblDeleteGauntlet"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"))) {
+                return;
             }
+
+            GauntletIO.getGauntletFile(gauntlet).delete();
+
+            lstGauntlets.removeGauntlet(gauntlet);
         });
     }
 
@@ -299,12 +272,7 @@ public class LoadGauntletScreen extends LaunchScreen {
         public void refresh() {
             List<GauntletData> sorted = new ArrayList<>();
             sorted.addAll(gauntlets);
-            Collections.sort(sorted, new Comparator<GauntletData>() {
-                @Override
-                public int compare(final GauntletData x, final GauntletData y) {
-                    return x.getName().toLowerCase().compareTo(y.getName().toLowerCase());
-                }
-            });
+            Collections.sort(sorted, (x, y) -> x.getName().toLowerCase().compareTo(y.getName().toLowerCase()));
             setListData(sorted);
         }
 
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 751d20d5bfe..2393dd7ca24 100644
--- a/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
+++ b/forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
@@ -60,39 +60,26 @@ public class PuzzleScreen extends LaunchScreen {
             @Override
             public void run(final Puzzle chosen) {
                 if (chosen != null) {
-                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingThePuzzle"), new Runnable() {
-                        @Override
-                        public void run() {
-                            // Load selected puzzle
-                            final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
-                            hostedMatch.setStartGameHook(new Runnable() {
-                                @Override
-                                public final void run() {
-                                    chosen.applyToGame(hostedMatch.getGame());
-                                }
-                            });
+                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingThePuzzle"), true, () -> {
+                        // Load selected puzzle
+                        final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
+                        hostedMatch.setStartGameHook(() -> chosen.applyToGame(hostedMatch.getGame()));
 
-                            hostedMatch.setEndGameHook((new Runnable() {
-                                @Override
-                                public void run() {
-                                    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/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
index 6f4139da61d..2f8fe07fc84 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
@@ -54,12 +54,7 @@ public class LoadDraftScreen extends LaunchScreen {
         cbMode.addItem(Forge.getLocalizer().getMessage("lblSingleMatch"));
 
         lstDecks.setup(ItemManagerConfig.DRAFT_DECKS);
-        lstDecks.setItemActivateHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                editSelectedDeck();
-            }
-        });
+        lstDecks.setItemActivateHandler(event -> editSelectedDeck());
     }
 
     @Override
@@ -96,80 +91,63 @@ public class LoadDraftScreen extends LaunchScreen {
 
     @Override
     protected void startMatch() {
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                final DeckProxy humanDeck = lstDecks.getSelectedItem();
-                if (humanDeck == null) {
-                    FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingDeck"), Forge.getLocalizer().getMessage("lblNoDeck"));
+        FThreads.invokeInBackgroundThread(() -> {
+            final DeckProxy humanDeck = lstDecks.getSelectedItem();
+            if (humanDeck == null) {
+                FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingDeck"), Forge.getLocalizer().getMessage("lblNoDeck"));
+                return;
+            }
+
+            // TODO: if booster draft tournaments are supported in the future, add the possibility to choose them here
+            final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
+
+            if (gauntlet) {
+                final Integer rounds = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"),
+                        1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
+                if (rounds == null) {
                     return;
                 }
 
-                // TODO: if booster draft tournaments are supported in the future, add the possibility to choose them here
-                final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
-
-                if (gauntlet) {
-                    final Integer rounds = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"),
-                            1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
-                    if (rounds == null) {
+                FThreads.invokeInEdtLater(() -> {
+                    if (!checkDeckLegality(humanDeck)) {
                         return;
                     }
 
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!checkDeckLegality(humanDeck)) {
-                                return;
-                            }
-
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                @Override
-                                public void run() {
-                                    FModel.getGauntletMini().resetGauntletDraft();
-                                    FModel.getGauntletMini().launch(rounds, humanDeck.getDeck(), GameType.Draft);
-                                }
-                            });
-                        }
-                    });
-                } else {
-                    final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
-                            1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
-                    if (aiIndex == null) {
-                        return; // Cancel was pressed
-                    }
-
-                    final DeckGroup opponentDecks = FModel.getDecks().getDraft().get(humanDeck.getName());
-                    final Deck aiDeck = opponentDecks.getAiDecks().get(aiIndex - 1);
-                    if (aiDeck == null) {
-                        throw new IllegalStateException("Draft: Computer deck is null!");
-                    }
-
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                @Override
-                                public void run() {
-                                    if (!checkDeckLegality(humanDeck)) {
-                                        return;
-                                    }
-
-                                    final List<RegisteredPlayer> starter = new ArrayList<>();
-                                    final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
-                                    starter.add(human);
-                                    starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
-                                    for (final RegisteredPlayer pl : starter) {
-                                        pl.assignConspiracies();
-                                    }
-
-                                    FModel.getGauntletMini().resetGauntletDraft();
-                                    final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
-                                    hostedMatch.startMatch(GameType.Draft, null, starter, human, GuiBase.getInterface().getNewGuiGame());
-                                }
-                            });
-                        }
+                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                        FModel.getGauntletMini().resetGauntletDraft();
+                        FModel.getGauntletMini().launch(rounds, humanDeck.getDeck(), GameType.Draft);
                     });
+                });
+            } else {
+                final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
+                        1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
+                if (aiIndex == null) {
+                    return; // Cancel was pressed
                 }
+
+                final DeckGroup opponentDecks = FModel.getDecks().getDraft().get(humanDeck.getName());
+                final Deck aiDeck = opponentDecks.getAiDecks().get(aiIndex - 1);
+                if (aiDeck == null) {
+                    throw new IllegalStateException("Draft: Computer deck is null!");
+                }
+
+                FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                    if (!checkDeckLegality(humanDeck)) {
+                        return;
+                    }
+
+                    final List<RegisteredPlayer> starter = new ArrayList<>();
+                    final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
+                    starter.add(human);
+                    starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
+                    for (final RegisteredPlayer pl : starter) {
+                        pl.assignConspiracies();
+                    }
+
+                    FModel.getGauntletMini().resetGauntletDraft();
+                    final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
+                    hostedMatch.startMatch(GameType.Draft, null, starter, human, GuiBase.getInterface().getNewGuiGame());
+                }));
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
index b73491db893..d814720729d 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
@@ -54,12 +54,7 @@ public class LoadSealedScreen extends LaunchScreen {
         cbMode.addItem(Forge.getLocalizer().getMessage("lblSingleMatch"));
 
         lstDecks.setup(ItemManagerConfig.SEALED_DECKS);
-        lstDecks.setItemActivateHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                editSelectedDeck();
-            }
-        });
+        lstDecks.setItemActivateHandler(event -> editSelectedDeck());
     }
 
     @Override
@@ -95,74 +90,59 @@ public class LoadSealedScreen extends LaunchScreen {
 
     @Override
     protected void startMatch() {
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                final DeckProxy humanDeck = lstDecks.getSelectedItem();
-                if (humanDeck == null) {
-                    FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingSealedPool"), Forge.getLocalizer().getMessage("lblNoDeck"));
-                    return;
-                }
+        FThreads.invokeInBackgroundThread(() -> {
+            final DeckProxy humanDeck = lstDecks.getSelectedItem();
+            if (humanDeck == null) {
+                FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingSealedPool"), Forge.getLocalizer().getMessage("lblNoDeck"));
+                return;
+            }
 
-                final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
+            final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
 
-                if (gauntlet) {
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!checkDeckLegality(humanDeck)) {
-                                return;
-                            }
-
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                @Override
-                                public void run() {
-                                    final int matches = FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size();
-                                    FModel.getGauntletMini().launch(matches, humanDeck.getDeck(), GameType.Sealed);
-                                }
-                            });
-                        }
-                    });
-                } else {
-
-                    final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
-                            1, FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size());
-                    if (aiIndex == null) {
-                        return; // Cancel was pressed
+            if (gauntlet) {
+                FThreads.invokeInEdtLater(() -> {
+                    if (!checkDeckLegality(humanDeck)) {
+                        return;
                     }
 
-                    final DeckGroup opponentDecks = FModel.getDecks().getSealed().get(humanDeck.getName());
-                    final Deck aiDeck = opponentDecks.getAiDecks().get(aiIndex - 1);
-                    if (aiDeck == null) {
-                        throw new IllegalStateException("Draft: Computer deck is null!");
+                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                        final int matches = FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size();
+                        FModel.getGauntletMini().launch(matches, humanDeck.getDeck(), GameType.Sealed);
+                    });
+                });
+            } else {
+
+                final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
+                        1, FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size());
+                if (aiIndex == null) {
+                    return; // Cancel was pressed
+                }
+
+                final DeckGroup opponentDecks = FModel.getDecks().getSealed().get(humanDeck.getName());
+                final Deck aiDeck = opponentDecks.getAiDecks().get(aiIndex - 1);
+                if (aiDeck == null) {
+                    throw new IllegalStateException("Draft: Computer deck is null!");
+                }
+
+                FThreads.invokeInEdtLater(() -> {
+                    if (!checkDeckLegality(humanDeck)) {
+                        return;
                     }
 
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (!checkDeckLegality(humanDeck)) {
-                                return;
-                            }
-
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                @Override
-                                public void run() {
-                                    final List<RegisteredPlayer> starter = new ArrayList<>();
-                                    final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
-                                    starter.add(human);
-                                    starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
-                                    for (final RegisteredPlayer pl : starter) {
-                                        pl.assignConspiracies();
-                                    }
-
-                                    FModel.getGauntletMini().resetGauntletDraft();
-                                    final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
-                                    hostedMatch.startMatch(GameType.Sealed, null, starter, human, GuiBase.getInterface().getNewGuiGame());
-                                }
-                            });
+                    LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> {
+                        final List<RegisteredPlayer> starter = new ArrayList<>();
+                        final RegisteredPlayer human = new RegisteredPlayer(humanDeck.getDeck()).setPlayer(GamePlayerUtil.getGuiPlayer());
+                        starter.add(human);
+                        starter.add(new RegisteredPlayer(aiDeck).setPlayer(GamePlayerUtil.createAiPlayer()));
+                        for (final RegisteredPlayer pl : starter) {
+                            pl.assignConspiracies();
                         }
+
+                        FModel.getGauntletMini().resetGauntletDraft();
+                        final HostedMatch hostedMatch = GuiBase.getInterface().hostMatch();
+                        hostedMatch.startMatch(GameType.Sealed, null, starter, human, GuiBase.getInterface().getNewGuiGame());
                     });
-                }
+                });
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
index 2431e17df83..60da366d034 100644
--- a/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
@@ -41,27 +41,15 @@ public class NewDraftScreen extends LaunchScreen {
 
     @Override
     protected void startMatch() {
-        ThreadUtil.invokeInGameThread(new Runnable() { //must run in game thread to prevent blocking UI thread
-            @Override
-            public void run() {
-                final LimitedPoolType poolType = SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseDraftFormat"), LimitedPoolType.values());
-                if (poolType == null) { return; }
+        //must run in game thread to prevent blocking UI thread
+        ThreadUtil.invokeInGameThread(() -> {
+            final LimitedPoolType poolType = SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseDraftFormat"), LimitedPoolType.values());
+            if (poolType == null) { return; }
 
-                final BoosterDraft draft = BoosterDraft.createDraft(poolType);
-                if (draft == null) { return; }
+            final BoosterDraft draft = BoosterDraft.createDraft(poolType);
+            if (draft == null) { return; }
 
-                FThreads.invokeInEdtLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewDraft"), new Runnable() {
-                            @Override
-                            public void run() {
-                                Forge.openScreen(new DraftingProcessScreen(draft, EditorType.Draft, null));
-                            }
-                        });
-                    }
-                });
-            }
+            FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewDraft"), true, () -> Forge.openScreen(new DraftingProcessScreen(draft, EditorType.Draft, null))));
         });
     }
 }
diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
index 48753d91323..5eeb5f5169d 100644
--- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
@@ -56,18 +56,15 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
         clearGameLobby();
         Forge.back();
         if (msg.length() > 0) {
-            FThreads.invokeInBackgroundThread(new Runnable() {
-                @Override
-                public void run() {
-                    final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOk")), 1) == 0;
-                    if (callBackAlwaysTrue) { //to activate online menu popup when player press play online
-                        GuiBase.setInterrupted(false);
+            FThreads.invokeInBackgroundThread(() -> {
+                final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOk")), 1) == 0;
+                if (callBackAlwaysTrue) { //to activate online menu popup when player press play online
+                    GuiBase.setInterrupted(false);
 
-                        if(FServerManager.getInstance() != null)
-                            FServerManager.getInstance().stopServer();
-                        if(getfGameClient() != null)
-                            closeClient();
-                    }
+                    if(FServerManager.getInstance() != null)
+                        FServerManager.getInstance().stopServer();
+                    if(getfGameClient() != null)
+                        closeClient();
                 }
             });
         }
@@ -93,51 +90,37 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
         if (getGameLobby() == null) {
             setGameLobby(getLobby());
             //prompt to connect to server when offline lobby activated
-            FThreads.invokeInBackgroundThread(new Runnable() {
-                @Override
-                public void run() {
-                    final String url = NetConnectUtil.getServerUrl();
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (url == null) {
-                                closeConn(""); //go back to previous screen if user cancels connection
+            FThreads.invokeInBackgroundThread(() -> {
+                final String url = NetConnectUtil.getServerUrl();
+                FThreads.invokeInEdtLater(() -> {
+                    if (url == null) {
+                        closeConn(""); //go back to previous screen if user cancels connection
+                        return;
+                    }
+
+                    final boolean joinServer = url.length() > 0;
+                    final String caption = joinServer ?  Forge.getLocalizer().getMessage("lblConnectingToServer") : Forge.getLocalizer().getMessage("lblStartingServer");
+                    LoadingOverlay.show(caption, true, () -> {
+                        final ChatMessage result;
+                        final IOnlineChatInterface chatInterface = (IOnlineChatInterface)OnlineScreen.Chat.getScreen();
+                        if (joinServer) {
+                            result = NetConnectUtil.join(url, OnlineLobbyScreen.this, chatInterface);
+                            if (result.getMessage() == ForgeConstants.CLOSE_CONN_COMMAND) { //this message is returned via netconnectutil on exception
+                                closeConn(Forge.getLocalizer().getMessage("lblDetectedInvalidHostAddress", url));
                                 return;
                             }
-
-                            final boolean joinServer = url.length() > 0;
-                            final String caption = joinServer ?  Forge.getLocalizer().getMessage("lblConnectingToServer") : Forge.getLocalizer().getMessage("lblStartingServer");
-                            LoadingOverlay.show(caption, new Runnable() {
-                                @Override
-                                public void run() {
-                                    final ChatMessage result;
-                                    final IOnlineChatInterface chatInterface = (IOnlineChatInterface)OnlineScreen.Chat.getScreen();
-                                    if (joinServer) {
-                                        result = NetConnectUtil.join(url, OnlineLobbyScreen.this, chatInterface);
-                                        if (result.getMessage() == ForgeConstants.CLOSE_CONN_COMMAND) { //this message is returned via netconnectutil on exception
-                                            closeConn(Forge.getLocalizer().getMessage("lblDetectedInvalidHostAddress", url));
-                                            return;
-                                        }
-                                    }
-                                    else {
-                                        result = NetConnectUtil.host(OnlineLobbyScreen.this, chatInterface);
-                                    }
-                                    chatInterface.addMessage(result);
-                                    if (!joinServer) {
-                                        FThreads.invokeInBackgroundThread(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                NetConnectUtil.copyHostedServerUrl();
-                                            }
-                                        });
-                                    }
-                                    //update menu buttons
-                                    OnlineScreen.Lobby.update();
-                                }
-                            });
                         }
+                        else {
+                            result = NetConnectUtil.host(OnlineLobbyScreen.this, chatInterface);
+                        }
+                        chatInterface.addMessage(result);
+                        if (!joinServer) {
+                            FThreads.invokeInBackgroundThread(() -> NetConnectUtil.copyHostedServerUrl());
+                        }
+                        //update menu buttons
+                        OnlineScreen.Lobby.update();
                     });
-                }
+                });
             });
         }
     }
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
index 4416c32bd23..662471f20fe 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
@@ -26,54 +26,14 @@ public class ConquestMenu extends FPopupMenu {
     private static final ConquestStatsScreen statsScreen = new ConquestStatsScreen();
     private static final ConquestPrefsScreen prefsScreen = new ConquestPrefsScreen();
 
-    private static final FMenuItem multiverseItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheMultiverse"), FSkinImage.MULTIVERSE, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(multiverseScreen);
-        }
-    });
-    private static final FMenuItem aetherItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheAether"), FSkinImage.AETHER_SHARD, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(aetherScreen);
-        }
-    });
-    private static final FMenuItem commandersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCommanders"), FSkinImage.COMMANDER, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(commandersScreen);
-        }
-    });
-    private static final FMenuItem planeswalkersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalkers"), FSkinImage.PLANESWALKER, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(planeswalkersScreen);
-        }
-    });
-    private static final FMenuItem collectionItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(collectionScreen);
-        }
-    });
-    private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(statsScreen);
-        }
-    });
-    private static final FMenuItem planeswalkItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalk"), FSkinImage.PW_BADGE_COMMON, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(planeswalkScreen);
-        }
-    });
-    private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(prefsScreen);
-        }
-    });
+    private static final FMenuItem multiverseItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheMultiverse"), FSkinImage.MULTIVERSE, event -> setCurrentScreen(multiverseScreen));
+    private static final FMenuItem aetherItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheAether"), FSkinImage.AETHER_SHARD, event -> setCurrentScreen(aetherScreen));
+    private static final FMenuItem commandersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCommanders"), FSkinImage.COMMANDER, event -> setCurrentScreen(commandersScreen));
+    private static final FMenuItem planeswalkersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalkers"), FSkinImage.PLANESWALKER, event -> setCurrentScreen(planeswalkersScreen));
+    private static final FMenuItem collectionItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK, event -> setCurrentScreen(collectionScreen));
+    private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, event -> setCurrentScreen(statsScreen));
+    private static final FMenuItem planeswalkItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalk"), FSkinImage.PW_BADGE_COMMON, event -> setCurrentScreen(planeswalkScreen));
+    private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, event -> setCurrentScreen(prefsScreen));
 
     private static void setCurrentScreen(FScreen screen0) {
         //make it so pressing Back from any screen besides Multiverse screen always goes to Multiverse screen
@@ -84,12 +44,7 @@ public class ConquestMenu extends FPopupMenu {
     static {
         //the first time planarconquest mode is launched, add button for it if in Landscape mode
         if (Forge.isLandscapeMode()) {
-            HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblPlanarConquest"), new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                    launchPlanarConquest(LaunchReason.StartPlanarConquest);
-                }
-            });
+            HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblPlanarConquest"), event -> launchPlanarConquest(LaunchReason.StartPlanarConquest));
         }
     }
 
@@ -108,20 +63,16 @@ public class ConquestMenu extends FPopupMenu {
 
     public static void launchPlanarConquest(final LaunchReason reason) {
         Forge.lastButtonIndex = 7;
-        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentConquest"), new Runnable() {
-            @Override
-            @SuppressWarnings("unchecked")
-            public void run() {
-                ((DeckController<Deck>)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks());
-                if (reason == LaunchReason.StartPlanarConquest) {
-                    Forge.openScreen(multiverseScreen);
-                }
-                else {
-                    multiverseScreen.update();
-                    Forge.openScreen(multiverseScreen);
-                    if (reason == LaunchReason.NewConquest) {
-                        LoadGameScreen.PlanarConquest.setAsBackScreen(true);
-                    }
+        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentConquest"), true, () -> {
+            ((DeckController<Deck>)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks());
+            if (reason == LaunchReason.StartPlanarConquest) {
+                Forge.openScreen(multiverseScreen);
+            }
+            else {
+                multiverseScreen.update();
+                Forge.openScreen(multiverseScreen);
+                if (reason == LaunchReason.NewConquest) {
+                    LoadGameScreen.PlanarConquest.setAsBackScreen(true);
                 }
             }
         });
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
index 5cbc1308f48..148736b36d6 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
@@ -260,29 +260,18 @@ public class ConquestMultiverseScreen extends FScreen {
     }
 
     private void launchEvent() {
-        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingBattle"), new Runnable() {
-            @Override
-            public void run() {
-                ConquestLocation loc = model.getCurrentLocation();
-                activeBattle = loc.getEvent().createBattle(loc, 0);
-                FModel.getConquest().startBattle(activeBattle);
-            }
+        LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingBattle"), true, () -> {
+            ConquestLocation loc = model.getCurrentLocation();
+            activeBattle = loc.getEvent().createBattle(loc, 0);
+            FModel.getConquest().startBattle(activeBattle);
         });
     }
 
     private void launchChaosBattle() {
-        FThreads.invokeInEdtNowOrLater(new Runnable() {
-            @Override
-            public void run() {
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblChaosApproaching"), new Runnable() {
-                    @Override
-                    public void run() {
-                        activeBattle = new ConquestChaosBattle();
-                        FModel.getConquest().startBattle(activeBattle);
-                    }
-                });
-            }
-        });
+        FThreads.invokeInEdtNowOrLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblChaosApproaching"), true, () -> {
+            activeBattle = new ConquestChaosBattle();
+            FModel.getConquest().startBattle(activeBattle);
+        }));
     }
 
     @Override
@@ -678,12 +667,7 @@ public class ConquestMultiverseScreen extends FScreen {
         private BattleBar() {
             playerAvatar = add(new AvatarDisplay(false));
             opponentAvatar = add(new AvatarDisplay(true));
-            btnBattle = add(new FButton(Forge.getLocalizer().getMessage("lblBattle"), new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                    launchEvent();
-                }
-            }));
+            btnBattle = add(new FButton(Forge.getLocalizer().getMessage("lblBattle"), event -> launchEvent()));
             btnBattle.setFont(FSkinFont.get(20));
         }
 
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
index 085ab992f89..5cfbaa7fb21 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
@@ -37,12 +37,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
     @Override
     protected void finish() {
         //create new quest in game thread so option panes can wait for input
-        ThreadUtil.invokeInGameThread(new Runnable() {
-            @Override
-            public void run() {
-                newConquest();
-            }
-        });
+        ThreadUtil.invokeInGameThread(() -> newConquest());
     }
 
     private void newConquest() {
@@ -52,26 +47,18 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
     }
 
     private void startNewConquest(final String conquestName) {
-        FThreads.invokeInEdtLater(new Runnable() {
-            @Override
-            public void run() {
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingNewConquest"), new Runnable() {
-                    @Override
-                    public void run() {
-                        ConquestController qc = FModel.getConquest();
-                        qc.setModel(new ConquestData(conquestName, model.startingPlane, model.startingPlaneswalker, model.startingCommander));
-                        qc.getDecks().add(Iterables.getFirst(qc.getModel().getCommanders(), null).getDeck()); //ensure starting deck is saved
-                        qc.getModel().saveData();
+        FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingNewConquest"), true, () -> {
+            ConquestController qc = FModel.getConquest();
+            qc.setModel(new ConquestData(conquestName, model.startingPlane, model.startingPlaneswalker, model.startingCommander));
+            qc.getDecks().add(Iterables.getFirst(qc.getModel().getCommanders(), null).getDeck()); //ensure starting deck is saved
+            qc.getModel().saveData();
 
-                        // Save in preferences.
-                        FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName);
-                        FModel.getConquestPreferences().save();
+            // Save in preferences.
+            FModel.getConquestPreferences().setPref(CQPref.CURRENT_CONQUEST, conquestName);
+            FModel.getConquestPreferences().save();
 
-                        ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest);
-                    }
-                });
-            }
-        });
+            ConquestMenu.launchPlanarConquest(LaunchReason.NewConquest);
+        }));
     }
 
     private static class SelectStartingPlaneStep extends WizardStep<NewConquestScreenModel> {
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index 56eeeff4e54..fc97b112188 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -186,17 +186,9 @@ public class NewQuestScreen extends FScreen {
     private final FCheckBox cbCommander = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("rbCommanderSubformat")));
 
     private final FLabel btnEmbark = add(new FLabel.ButtonBuilder()
-            .font(FSkinFont.get(22)).text(Forge.getLocalizer().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                    //create new quest in game thread so option panes can wait for input
-                    ThreadUtil.invokeInGameThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            newQuest();
-                        }
-                    });
-                }
+            .font(FSkinFont.get(22)).text(Forge.getLocalizer().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(event -> {
+                //create new quest in game thread so option panes can wait for input
+                ThreadUtil.invokeInGameThread(() -> newQuest());
             }).build());
 
     public NewQuestScreen() {
@@ -209,24 +201,18 @@ public class NewQuestScreen extends FScreen {
         cbxStartingPool.addItem(StartingPoolType.DraftDeck);
         cbxStartingPool.addItem(StartingPoolType.SealedDeck);
         cbxStartingPool.addItem(StartingPoolType.Cube);
-        cbxStartingPool.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                updateStartingPoolOptions();
-                scroller.revalidate();
-            }
+        cbxStartingPool.setChangedHandler(event -> {
+            updateStartingPoolOptions();
+            scroller.revalidate();
         });
 
         cbxPrizedCards.addItem(Forge.getLocalizer().getMessage("lblSameAsStartingPool"));
         cbxPrizedCards.addItem(StartingPoolType.Complete);
         cbxPrizedCards.addItem(StartingPoolType.Sanctioned);
         cbxPrizedCards.addItem(StartingPoolType.Casual);
-        cbxPrizedCards.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                updatePrizeOptions();
-                scroller.revalidate();
-            }
+        cbxPrizedCards.setChangedHandler(event -> {
+            updatePrizeOptions();
+            scroller.revalidate();
         });
 
         for (GameFormat gf : FModel.getFormats().getSanctionedList()) {
@@ -243,18 +229,15 @@ public class NewQuestScreen extends FScreen {
         numberOfBoostersField.setEnabled(false);
 
         @SuppressWarnings("serial")
-        UiCommand colorBoxEnabler = new UiCommand() {
-            @Override
-            public void run() {
-                cbBlack.setEnabled(radBalanced.isSelected());
-                cbBlue.setEnabled(radBalanced.isSelected());
-                cbGreen.setEnabled(radBalanced.isSelected());
-                cbRed.setEnabled(radBalanced.isSelected());
-                cbWhite.setEnabled(radBalanced.isSelected());
-                cbColorless.setEnabled(radBalanced.isSelected());
-                cbIncludeArtifacts.setEnabled(!radSurpriseMe.isSelected());
-                numberOfBoostersField.setEnabled(radBoosters.isSelected());
-            }
+        UiCommand colorBoxEnabler = () -> {
+            cbBlack.setEnabled(radBalanced.isSelected());
+            cbBlue.setEnabled(radBalanced.isSelected());
+            cbGreen.setEnabled(radBalanced.isSelected());
+            cbRed.setEnabled(radBalanced.isSelected());
+            cbWhite.setEnabled(radBalanced.isSelected());
+            cbColorless.setEnabled(radBalanced.isSelected());
+            cbIncludeArtifacts.setEnabled(!radSurpriseMe.isSelected());
+            numberOfBoostersField.setEnabled(radBoosters.isSelected());
         };
 
         radBalanced.setCommand(colorBoxEnabler);
@@ -268,12 +251,7 @@ public class NewQuestScreen extends FScreen {
         // Default to 'Main world'
         cbxStartingWorld.setSelectedItem(FModel.getWorlds().get("Main world"));
 
-        cbxStartingWorld.setChangedHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                updateEnabledFormats();
-            }
-        });
+        cbxStartingWorld.setChangedHandler(event -> updateEnabledFormats());
 
         updateStartingPoolOptions();
         updatePrizeOptions();
@@ -298,59 +276,44 @@ public class NewQuestScreen extends FScreen {
         unselectableSets.add("ARC");
         unselectableSets.add("PC2");
 
-        btnSelectFormat.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
-                archivedFormatSelect.setOnCloseCallBack(new Runnable() {
-                    @Override
-                    public void run() {
-                        customFormatCodes.clear();
-                        btnSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
-                        for (String setName:setsToAdd){
-                            if(!unselectableSets.contains(setName)){
-                                customFormatCodes.add(setName);
-                            }
-                        }
+        btnSelectFormat.setCommand(event -> {
+            ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
+            archivedFormatSelect.setOnCloseCallBack(() -> {
+                customFormatCodes.clear();
+                btnSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
+                List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                for (String setName:setsToAdd){
+                    if(!unselectableSets.contains(setName)){
+                        customFormatCodes.add(setName);
                     }
-                });
-                Forge.openScreen(archivedFormatSelect);
-            }
+                }
+            });
+            Forge.openScreen(archivedFormatSelect);
         });
 
-        btnPrizeSelectFormat.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
-                archivedFormatSelect.setOnCloseCallBack(new Runnable() {
-                    @Override
-                    public void run() {
-                        customPrizeFormatCodes.clear();
-                        btnPrizeSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
-                        List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
-                        for (String setName:setsToAdd){
-                            if(!unselectableSets.contains(setName)){
-                                customPrizeFormatCodes.add(setName);
-                            }
-                        }
+        btnPrizeSelectFormat.setCommand(event -> {
+            ArchivedFormatSelect archivedFormatSelect = new ArchivedFormatSelect();
+            archivedFormatSelect.setOnCloseCallBack(() -> {
+                customPrizeFormatCodes.clear();
+                btnPrizeSelectFormat.setText(archivedFormatSelect.getSelectedFormat().getName());
+                List<String> setsToAdd = archivedFormatSelect.getSelectedFormat().getAllowedSetCodes();
+                for (String setName:setsToAdd){
+                    if(!unselectableSets.contains(setName)){
+                        customPrizeFormatCodes.add(setName);
                     }
-                });
-                Forge.openScreen(archivedFormatSelect);
-            }
+                }
+            });
+            Forge.openScreen(archivedFormatSelect);
         });
 
         // Fantasy box enabled by Default
         cbFantasy.setSelected(true);
         cbFantasy.setEnabled(true);
         cbCommander.setSelected(false);
-        cbCommander.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                if (!isCommander())
-                    return;
-                cbxStartingWorld.setSelectedItem(FModel.getWorlds().get("Random Commander"));
-            }
+        cbCommander.setCommand(event -> {
+            if (!isCommander())
+                return;
+            cbxStartingWorld.setSelectedItem(FModel.getWorlds().get("Random Commander"));
         });
 
     }
@@ -644,30 +607,22 @@ public class NewQuestScreen extends FScreen {
     }
 
     private void startNewQuest(final String questName, final GameFormat fmtPrizes, final Deck dckStartPool, final GameFormat fmtStartPool) {
-        FThreads.invokeInEdtLater(new Runnable() {
-            @Override
-            public void run() {
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblCreatingNewQuest"), new Runnable() {
-                    @Override
-                    public void run() {
-                        final QuestMode mode = isFantasy() ? QuestMode.Fantasy : QuestMode.Classic;
-                        final StartingPoolPreferences userPrefs =
-                                new StartingPoolPreferences(getPoolType(), getPreferredColors(), cbIncludeArtifacts.isSelected(), startWithCompleteSet(), allowDuplicateCards(), numberOfBoostersField.getValue());
-                        QuestController qc = FModel.getQuest();
+        FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblCreatingNewQuest"), true, () -> {
+            final QuestMode mode = isFantasy() ? QuestMode.Fantasy : QuestMode.Classic;
+            final StartingPoolPreferences userPrefs =
+                    new StartingPoolPreferences(getPoolType(), getPreferredColors(), cbIncludeArtifacts.isSelected(), startWithCompleteSet(), allowDuplicateCards(), numberOfBoostersField.getValue());
+            QuestController qc = FModel.getQuest();
 
-                        DeckConstructionRules dcr = isCommander() ?  DeckConstructionRules.Commander: DeckConstructionRules.Default;
+            DeckConstructionRules dcr = isCommander() ?  DeckConstructionRules.Commander: DeckConstructionRules.Default;
 
-                        qc.newGame(questName, getSelectedDifficulty(), mode, fmtPrizes, isUnlockSetsAllowed(), dckStartPool, fmtStartPool, getStartingWorldName(), userPrefs, dcr);
-                        qc.save();
+            qc.newGame(questName, getSelectedDifficulty(), mode, fmtPrizes, isUnlockSetsAllowed(), dckStartPool, fmtStartPool, getStartingWorldName(), userPrefs, dcr);
+            qc.save();
 
-                        // Save in preferences.
-                        FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST, questName + ".dat");
-                        FModel.getQuestPreferences().save();
+            // Save in preferences.
+            FModel.getQuestPreferences().setPref(QPref.CURRENT_QUEST, questName + ".dat");
+            FModel.getQuestPreferences().save();
 
-                        QuestMenu.launchQuestMode(LaunchReason.NewQuest, isCommander()); //launch quest mode for new quest
-                    }
-                });
-            }
-        });
+            QuestMenu.launchQuestMode(LaunchReason.NewQuest, isCommander()); //launch quest mode for new quest
+        }));
     }
 }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
index 52a6757d73a..da84d585ef8 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
@@ -33,12 +33,7 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
 
     public QuestDuelsScreen() {
         super();
-        pnlDuels.setActivateHandler(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                startMatch();
-            }
-        });
+        pnlDuels.setActivateHandler(event -> startMatch());
     }
 
     @Override
@@ -74,23 +69,15 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
     }
 
     private void generateDuels() {
-        FThreads.invokeInEdtLater(new Runnable() {
-            @Override
-            public void run() {
-                LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), new Runnable() {
-                    @Override
-                    public void run() {
-                        pnlDuels.clear();
-                        List<QuestEventDuel> duels = FModel.getQuest().getDuelsManager().generateDuels();
-                        if (duels != null) {
-                            for (QuestEventDuel duel : duels) {
-                                pnlDuels.add(new QuestEventPanel(duel, pnlDuels));
-                            }
-                        }
-                        pnlDuels.revalidate();
-                    }
-                });
+        FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), true, () -> {
+            pnlDuels.clear();
+            List<QuestEventDuel> duels = FModel.getQuest().getDuelsManager().generateDuels();
+            if (duels != null) {
+                for (QuestEventDuel duel : duels) {
+                    pnlDuels.add(new QuestEventPanel(duel, pnlDuels));
+                }
             }
-        });
+            pnlDuels.revalidate();
+        }));
     }
 }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java
index bc1f77da627..ea2169a9f83 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java
@@ -22,23 +22,10 @@ public abstract class QuestLaunchScreen extends LaunchScreen {
 
     @Override
     protected void startMatch() {
-        FThreads.invokeInBackgroundThread(new Runnable() {
-            @Override
-            public void run() {
-                if (QuestUtil.canStartGame()) {
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
-                                @Override
-                                public void run() {
-                                    QuestUtil.finishStartingGame();
-                                }
-                            });
-                        }
-                    });
-                    return;
-                }
+        FThreads.invokeInBackgroundThread(() -> {
+            if (QuestUtil.canStartGame()) {
+                FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), true, () -> QuestUtil.finishStartingGame()));
+                return;
             }
         });
     }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
index e2d6c1c7b9a..358a55aeb0a 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
@@ -42,88 +42,28 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
     private static final QuestStatsScreen statsScreen = new QuestStatsScreen();
     private static final QuestTournamentsScreen tournamentsScreen = new QuestTournamentsScreen();
 
-    private static final FMenuItem duelsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblDuels"), FSkinImage.QUEST_BIG_SWORD, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(duelsScreen);
-        }
+    private static final FMenuItem duelsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblDuels"), FSkinImage.QUEST_BIG_SWORD, event -> setCurrentScreen(duelsScreen));
+    private static final FMenuItem challengesItem = new FMenuItem(Forge.getLocalizer().getMessage("lblChallenges"), FSkinImage.QUEST_HEART, event -> setCurrentScreen(challengesScreen));
+    private static final FMenuItem tournamentsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTournaments"), FSkinImage.QUEST_BIG_SHIELD, event -> setCurrentScreen(tournamentsScreen));
+    private static final FMenuItem decksItem = new FMenuItem(Forge.getLocalizer().getMessage("lblQuestDecks"), FSkinImage.QUEST_BIG_BAG, event -> setCurrentScreen(decksScreen));
+    private static final FMenuItem spellShopItem = new FMenuItem(Forge.getLocalizer().getMessage("lblSpellShop"), FSkinImage.QUEST_BOOK, event -> setCurrentScreen(spellShopScreen));
+    private static final FMenuItem bazaarItem = new FMenuItem(Forge.getLocalizer().getMessage("lblBazaar"), FSkinImage.QUEST_BOTTLES, event -> setCurrentScreen(bazaarScreen));
+    private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, event -> setCurrentScreen(statsScreen));
+    private static final FMenuItem unlockSetsItem = new FMenuItem(Forge.getLocalizer().getMessage("btnUnlockSets"), FSkinImage.QUEST_MAP, event -> {
+        //invoke in background thread so prompts can work
+        ThreadUtil.invokeInGameThread(() -> {
+            QuestUtil.chooseAndUnlockEdition();
+            FThreads.invokeInEdtLater(() -> updateCurrentQuestScreen());
+        });
     });
-    private static final FMenuItem challengesItem = new FMenuItem(Forge.getLocalizer().getMessage("lblChallenges"), FSkinImage.QUEST_HEART, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(challengesScreen);
-        }
-    });
-    private static final FMenuItem tournamentsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTournaments"), FSkinImage.QUEST_BIG_SHIELD, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(tournamentsScreen);
-        }
-    });
-    private static final FMenuItem decksItem = new FMenuItem(Forge.getLocalizer().getMessage("lblQuestDecks"), FSkinImage.QUEST_BIG_BAG, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(decksScreen);
-        }
-    });
-    private static final FMenuItem spellShopItem = new FMenuItem(Forge.getLocalizer().getMessage("lblSpellShop"), FSkinImage.QUEST_BOOK, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(spellShopScreen);
-        }
-    });
-    private static final FMenuItem bazaarItem = new FMenuItem(Forge.getLocalizer().getMessage("lblBazaar"), FSkinImage.QUEST_BOTTLES, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(bazaarScreen);
-        }
-    });
-    private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(statsScreen);
-        }
-    });
-    private static final FMenuItem unlockSetsItem = new FMenuItem(Forge.getLocalizer().getMessage("btnUnlockSets"), FSkinImage.QUEST_MAP, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            ThreadUtil.invokeInGameThread(new Runnable() { //invoke in background thread so prompts can work
-                @Override
-                public void run() {
-                    QuestUtil.chooseAndUnlockEdition();
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            updateCurrentQuestScreen();
-                        }
-                    });
-                }
-            });
-        }
-    });
-    private static final FMenuItem travelItem = new FMenuItem(Forge.getLocalizer().getMessage("btnTravel"), FSkinImage.QUEST_MAP, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            ThreadUtil.invokeInGameThread(new Runnable() { //invoke in background thread so prompts can work
-                @Override
-                public void run() {
-                    QuestUtil.travelWorld();
-                    FThreads.invokeInEdtLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            updateCurrentQuestScreen();
-                        }
-                    });
-                }
-            });
-        }
-    });
-    private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
-        @Override
-        public void handleEvent(FEvent e) {
-            setCurrentScreen(prefsScreen);
-        }
+    private static final FMenuItem travelItem = new FMenuItem(Forge.getLocalizer().getMessage("btnTravel"), FSkinImage.QUEST_MAP, event -> {
+        //invoke in background thread so prompts can work
+        ThreadUtil.invokeInGameThread(() -> {
+            QuestUtil.travelWorld();
+            FThreads.invokeInEdtLater(() -> updateCurrentQuestScreen());
+        });
     });
+    private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, event -> setCurrentScreen(prefsScreen));
 
     static {
         statsScreen.addTournamentResultsLabels(tournamentsScreen);
@@ -159,12 +99,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
     static {
         //the first time quest mode is launched, add button for it if in Landscape mode
         if (Forge.isLandscapeMode()) {
-            HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblQuestMode"), new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                    launchQuestMode(LaunchReason.StartQuestMode, HomeScreen.instance.getQuestCommanderMode());
-                }
-            });
+            HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblQuestMode"), event -> launchQuestMode(LaunchReason.StartQuestMode, HomeScreen.instance.getQuestCommanderMode()));
         }
     }
 
@@ -190,40 +125,36 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
         final String questname = FModel.getQuestPreferences().getPref(QPref.CURRENT_QUEST);
         final File data = new File(dirQuests.getPath(), questname);
         if (data.exists()) {
-            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), new Runnable() {
-                @Override
-                @SuppressWarnings("unchecked")
-                public void run() {
-                    try {
-                        FModel.getQuest().load(QuestDataIO.loadData(data));
-                    } catch (IOException e) {
-                        System.err.println(String.format("Failed to load quest '%s'", questname));
-                        // Failed to load last quest, don't continue with quest loading stuff
-                        return;
-                    }
+            LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), true, () -> {
+                try {
+                    FModel.getQuest().load(QuestDataIO.loadData(data));
+                } catch (IOException e) {
+                    System.err.println(String.format("Failed to load quest '%s'", questname));
+                    // Failed to load last quest, don't continue with quest loading stuff
+                    return;
+                }
 
-                    ((DeckController<Deck>)EditorType.Quest.getController()).setRootFolder(FModel.getQuest().getMyDecks());
-                    ((DeckController<DeckGroup>)EditorType.QuestDraft.getController()).setRootFolder(FModel.getQuest().getDraftDecks());
-                    if (reason == LaunchReason.StartQuestMode) {
-                        if (QuestUtil.getCurrentDeck() == null) {
-                            Forge.openScreen(decksScreen); //if quest doesn't have a deck specified, open decks screen by default
-                        }
-                        else {
-                            Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view
-                        }
+                ((DeckController<Deck>)EditorType.Quest.getController()).setRootFolder(FModel.getQuest().getMyDecks());
+                ((DeckController<DeckGroup>)EditorType.QuestDraft.getController()).setRootFolder(FModel.getQuest().getDraftDecks());
+                if (reason == LaunchReason.StartQuestMode) {
+                    if (QuestUtil.getCurrentDeck() == null) {
+                        Forge.openScreen(decksScreen); //if quest doesn't have a deck specified, open decks screen by default
                     }
                     else {
-                        duelsScreen.update();
-                        challengesScreen.update();
-                        tournamentsScreen.update();
-                        decksScreen.refreshDecks();
-                        Forge.openScreen(duelsScreen);
-                        if (reason == LaunchReason.NewQuest) {
-                            LoadGameScreen.QuestMode.setAsBackScreen(true);
-                        }
+                        Forge.openScreen(duelsScreen); //TODO: Consider opening most recent quest view
                     }
-                    HomeScreen.instance.updateQuestWorld(FModel.getQuest().getWorld() == null ? "" : FModel.getQuest().getWorld().toString());
                 }
+                else {
+                    duelsScreen.update();
+                    challengesScreen.update();
+                    tournamentsScreen.update();
+                    decksScreen.refreshDecks();
+                    Forge.openScreen(duelsScreen);
+                    if (reason == LaunchReason.NewQuest) {
+                        LoadGameScreen.QuestMode.setAsBackScreen(true);
+                    }
+                }
+                HomeScreen.instance.updateQuestWorld(FModel.getQuest().getWorld() == null ? "" : FModel.getQuest().getWorld().toString());
             });
             return;
         }
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
index 50fab6e379d..ea9c4d98eff 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
@@ -49,36 +49,25 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
         inventoryPage = ((InventoryPage)tabPages[1]);
 
         btnBuySellMultiple.setVisible(false); //hide unless in multi-select mode
-        btnBuySellMultiple.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                final SpellShopManager itemManager = ((SpellShopBasePage)getSelectedPage()).itemManager;
-                final ItemPool<InventoryItem> items = itemManager.getSelectedItemPool();
+        btnBuySellMultiple.setCommand(event -> {
+            final SpellShopManager itemManager = ((SpellShopBasePage)getSelectedPage()).itemManager;
+            final ItemPool<InventoryItem> items = itemManager.getSelectedItemPool();
 
-                if (items.isEmpty()) {
-                    //toggle off multi-select mode if no items selected
-                    itemManager.toggleMultiSelectMode(-1);
-                    return;
-                }
-
-                FThreads.invokeInBackgroundThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (getSelectedPage() == spellShopPage) {
-                            spellShopPage.activateItems(items);
-                        }
-                        else {
-                            inventoryPage.activateItems(items);
-                        }
-                        FThreads.invokeInEdtLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                updateCreditsLabel();
-                            }
-                        });
-                    }
-                });
+            if (items.isEmpty()) {
+                //toggle off multi-select mode if no items selected
+                itemManager.toggleMultiSelectMode(-1);
+                return;
             }
+
+            FThreads.invokeInBackgroundThread(() -> {
+                if (getSelectedPage() == spellShopPage) {
+                    spellShopPage.activateItems(items);
+                }
+                else {
+                    inventoryPage.activateItems(items);
+                }
+                FThreads.invokeInEdtLater(() -> updateCreditsLabel());
+            });
         });
     }
 
@@ -190,28 +179,17 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
                     parentScreen.tabHeader.setVisible(!multiSelectMode);
                 }
             });
-            itemManager.setItemActivateHandler(new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                }
+            itemManager.setItemActivateHandler(event -> {
             });
             itemManager.setContextMenuBuilder(new ContextMenuBuilder<InventoryItem>() {
                 @Override
                 public void buildMenu(final FDropDownMenu menu, final InventoryItem item) {
-                    menu.addItem(new FMenuItem(getVerb(), getVerbIcon(), new FEventHandler() {
-                        @Override
-                        public void handleEvent(FEvent e) {
-                            activateSelectedItem();
-                        }
-                    }));
+                    menu.addItem(new FMenuItem(getVerb(), getVerbIcon(), event -> activateSelectedItem()));
                 }
             });
-            itemManager.setSelectionChangedHandler(new FEventHandler() {
-                @Override
-                public void handleEvent(FEvent e) {
-                    if (itemManager.getMultiSelectMode()) {
-                        parentScreen.updateBuySellButtonCaption();
-                    }
+            itemManager.setSelectionChangedHandler(event -> {
+                if (itemManager.getMultiSelectMode()) {
+                    parentScreen.updateBuySellButtonCaption();
                 }
             });
             add(lblCredits);
@@ -235,19 +213,11 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
                     if (result == null || result <= 0) { return; }
 
                     //invoke in background thread so other dialogs can be shown properly
-                    FThreads.invokeInBackgroundThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            ItemPool<InventoryItem> items = new ItemPool<>(InventoryItem.class);
-                            items.add(item, result);
-                            activateItems(items);
-                            FThreads.invokeInEdtLater(new Runnable() {
-                                @Override
-                                public void run() {
-                                    parentScreen.updateCreditsLabel();
-                                }
-                            });
-                        }
+                    FThreads.invokeInBackgroundThread(() -> {
+                        ItemPool<InventoryItem> items = new ItemPool<>(InventoryItem.class);
+                        items.add(item, result);
+                        activateItems(items);
+                        FThreads.invokeInEdtLater(() -> parentScreen.updateCreditsLabel());
                     });
                 }
             };
@@ -290,22 +260,14 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
 
         @Override
         protected void refresh() {
-            FThreads.invokeInEdtLater(new Runnable() {
-                @Override
-                public void run() {
-                    LoadingOverlay.show(Forge.getLocalizer().getInstance().getMessage("lblLoading"), new Runnable() {
-                        @Override
-                        public void run() {
-                            Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
-                            ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.PRICE, QuestSpellShop.fnPriceCompare, QuestSpellShop.fnPriceGet);
-                            ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.OWNED, FModel.getQuest().getCards().getFnOwnedCompare(), FModel.getQuest().getCards().getFnOwnedGet());
-                            itemManager.setup(ItemManagerConfig.SPELL_SHOP, colOverrides);
+            FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getInstance().getMessage("lblLoading"), true, () -> {
+                Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
+                ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.PRICE, QuestSpellShop.fnPriceCompare, QuestSpellShop.fnPriceGet);
+                ItemColumn.addColOverride(ItemManagerConfig.SPELL_SHOP, colOverrides, ColumnDef.OWNED, FModel.getQuest().getCards().getFnOwnedCompare(), FModel.getQuest().getCards().getFnOwnedGet());
+                itemManager.setup(ItemManagerConfig.SPELL_SHOP, colOverrides);
 
-                            itemManager.setPool(FModel.getQuest().getCards().getShopList());
-                        }
-                    });
-                }
-            });
+                itemManager.setPool(FModel.getQuest().getCards().getShopList());
+            }));
         }
 
         @Override
@@ -337,47 +299,25 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
     private static class InventoryPage extends SpellShopBasePage {
         protected FLabel lblSellExtras = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSellAllExtras"))
                 .icon(Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16))
-                .command(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                //invoke in background thread so other dialogs can be shown properly
-                FThreads.invokeInBackgroundThread(new Runnable() {
-                    @Override
-                    public void run() {
+                .command(event -> {
+                    //invoke in background thread so other dialogs can be shown properly
+                    FThreads.invokeInBackgroundThread(() -> {
                         QuestSpellShop.sellExtras(parentScreen.spellShopPage.itemManager, itemManager);
-                        FThreads.invokeInEdtLater(new Runnable() {
-                            @Override
-                            public void run() {
-                                parentScreen.updateCreditsLabel();
-                            }
-                        });
-                    }
-                });
-            }
-        }).build());
+                        FThreads.invokeInEdtLater(() -> parentScreen.updateCreditsLabel());
+                    });
+                }).build());
 
         protected FLabel lblSelectAll = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectAllCards"))
                 .icon(Forge.hdbuttons ? FSkinImage.HDSTAR_FILLED : FSkinImage.STAR_FILLED).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16))
-                .command(new FEventHandler() {
-                    @Override
-                    public void handleEvent(FEvent e) {
-                        //invoke in background thread so other dialogs can be shown properly
-                        FThreads.invokeInBackgroundThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                if (!itemManager.getMultiSelectMode()) {
-                                    itemManager.toggleMultiSelectMode(0);
-                                }
-                                itemManager.selectAll();
-                                FThreads.invokeInEdtLater(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        parentScreen.updateCreditsLabel();
-                                    }
-                                });
-                            }
-                        });
-                    }
+                .command(event -> {
+                    //invoke in background thread so other dialogs can be shown properly
+                    FThreads.invokeInBackgroundThread(() -> {
+                        if (!itemManager.getMultiSelectMode()) {
+                            itemManager.toggleMultiSelectMode(0);
+                        }
+                        itemManager.selectAll();
+                        FThreads.invokeInEdtLater(() -> parentScreen.updateCreditsLabel());
+                    });
                 }).build());
 
         private InventoryPage() {
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
index 00bbc802c72..3a03a606b49 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
@@ -84,52 +84,21 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
     public QuestTournamentsScreen() {
         super();
         controller = new QuestTournamentController(this);
-        btnSpendToken.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
-                    @Override
-                    public void run() {
-                        controller.spendToken();
-                    }
-                });
-            }
+        btnSpendToken.setCommand(event -> {
+            //must run in background thread to handle alerts
+            FThreads.invokeInBackgroundThread(() -> controller.spendToken());
         });
-        btnEditDeck.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                editDeck(true);
-            }
-        });
-        btnLeaveTournament.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
-                    @Override
-                    public void run() {
-                        controller.endTournamentAndAwardPrizes();
-                    }
-                });
-            }
+        btnEditDeck.setCommand(event -> editDeck(true));
+        btnLeaveTournament.setCommand(event -> {
+            //must run in background thread to handle alerts
+            FThreads.invokeInBackgroundThread(() -> controller.endTournamentAndAwardPrizes());
         });
 
         // TODO: is it possible to somehow reuse the original btnEditDeck/btnLeaveTournament
-        btnEditDeckInTourn.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                editDeck(true);
-            }
-        });
-        btnLeaveTournamentInTourn.setCommand(new FEventHandler() {
-            @Override
-            public void handleEvent(FEvent e) {
-                FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
-                    @Override
-                    public void run() {
-                        controller.endTournamentAndAwardPrizes();
-                    }
-                });
-            }
+        btnEditDeckInTourn.setCommand(event -> editDeck(true));
+        btnLeaveTournamentInTourn.setCommand(event -> {
+            //must run in background thread to handle alerts
+            FThreads.invokeInBackgroundThread(() -> controller.endTournamentAndAwardPrizes());
         });
 
         pnlPrepareDeck.add(btnEditDeck);
@@ -231,17 +200,7 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
 
     @Override
     public void startDraft(BoosterDraft draft) {
-        FThreads.invokeInEdtLater(new Runnable() {
-            @Override
-            public void run() {
-                LoadingOverlay.show("Loading Quest Tournament", new Runnable() {
-                    @Override
-                    public void run() {
-                        Forge.openScreen(new DraftingProcessScreen(draft, EditorType.QuestDraft, controller));
-                    }
-                });
-            }
-        });
+        FThreads.invokeInEdtLater(() -> LoadingOverlay.show("Loading Quest Tournament", true, () -> Forge.openScreen(new DraftingProcessScreen(draft, EditorType.QuestDraft, controller))));
     }
     
     private Deck getDeck() {
@@ -276,22 +235,20 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
             return;
         }
 
-        FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
-            @Override
-            public void run() {
-                switch (mode) {
-                case SELECT_TOURNAMENT:
-                    controller.startDraft();
-                    break;
-                case PREPARE_DECK:
-                    controller.startTournament();
-                    break;
-                case TOURNAMENT_ACTIVE:
-                    controller.startNextMatch();
-                    break;
-                default:
-                    break;
-                }
+        //must run in background thread to handle alerts
+        FThreads.invokeInBackgroundThread(() -> {
+            switch (mode) {
+            case SELECT_TOURNAMENT:
+                controller.startDraft();
+                break;
+            case PREPARE_DECK:
+                controller.startTournament();
+                break;
+            case TOURNAMENT_ACTIVE:
+                controller.startNextMatch();
+                break;
+            default:
+                break;
             }
         });
     }

From edbef89cfa42ef77a6d34a08986a8b9eb48a836f Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 10 Jul 2022 16:56:16 +0800
Subject: [PATCH 267/309] unused imports

---
 .../src/forge/screens/constructed/LobbyScreen.java             | 2 --
 .../src/forge/screens/gauntlet/LoadGauntletScreen.java         | 3 ---
 .../src/forge/screens/limited/LoadDraftScreen.java             | 2 --
 .../src/forge/screens/limited/LoadSealedScreen.java            | 2 --
 .../src/forge/screens/planarconquest/ConquestMenu.java         | 2 --
 .../forge/screens/planarconquest/ConquestMultiverseScreen.java | 2 --
 forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java   | 2 --
 forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java | 2 --
 forge-gui-mobile/src/forge/screens/quest/QuestMenu.java        | 2 --
 .../src/forge/screens/quest/QuestSpellShopScreen.java          | 2 --
 .../src/forge/screens/quest/QuestTournamentsScreen.java        | 2 --
 11 files changed, 23 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index e0864e43b22..216b4c46463 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -44,8 +44,6 @@ import forge.screens.LoadingOverlay;
 import forge.screens.settings.SettingsScreen;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBox;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
index 88def6f37c3..e8dc7a078ca 100644
--- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
+++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import com.badlogic.gdx.utils.Align;
@@ -31,8 +30,6 @@ import forge.screens.home.LoadGameMenu;
 import forge.screens.home.NewGameMenu.NewGameScreen;
 import forge.screens.settings.SettingsScreen;
 import forge.toolbox.FButton;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.util.Callback;
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
index 2f8fe07fc84..1331e0824a8 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
@@ -30,8 +30,6 @@ import forge.screens.LaunchScreen;
 import forge.screens.LoadingOverlay;
 import forge.screens.home.LoadGameMenu;
 import forge.toolbox.FComboBox;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 
diff --git a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
index d814720729d..27f7c82e56b 100644
--- a/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
+++ b/forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
@@ -30,8 +30,6 @@ import forge.screens.LaunchScreen;
 import forge.screens.LoadingOverlay;
 import forge.screens.home.LoadGameMenu;
 import forge.toolbox.FComboBox;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOptionPane;
 
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
index 662471f20fe..2fc572cf44b 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
@@ -12,8 +12,6 @@ import forge.screens.FScreen;
 import forge.screens.LoadingOverlay;
 import forge.screens.home.HomeScreen;
 import forge.screens.home.LoadGameMenu.LoadGameScreen;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 
 public class ConquestMenu extends FPopupMenu {
     private static final ConquestMenu conquestMenu = new ConquestMenu();
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
index 148736b36d6..fbe7327925c 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
@@ -47,8 +47,6 @@ import forge.screens.LoadingOverlay;
 import forge.toolbox.FButton;
 import forge.toolbox.FContainer;
 import forge.toolbox.FDisplayObject;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.FScrollPane;
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index fc97b112188..51f14a71410 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -42,8 +42,6 @@ import forge.screens.quest.QuestMenu.LaunchReason;
 import forge.toolbox.FCheckBox;
 import forge.toolbox.FComboBox;
 import forge.toolbox.FDisplayObject;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FNumericTextField;
 import forge.toolbox.FOptionPane;
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
index da84d585ef8..8560f42ec61 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
@@ -12,8 +12,6 @@ import forge.gui.FThreads;
 import forge.gui.interfaces.IButton;
 import forge.model.FModel;
 import forge.screens.LoadingOverlay;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 
 public class QuestDuelsScreen extends QuestLaunchScreen {
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
index 358a55aeb0a..67ca2c6eba6 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
@@ -26,8 +26,6 @@ import forge.screens.LoadingOverlay;
 import forge.screens.home.HomeScreen;
 import forge.screens.home.LoadGameMenu.LoadGameScreen;
 import forge.screens.home.NewGameMenu.NewGameScreen;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.util.ThreadUtil;
 
 public class QuestMenu extends FPopupMenu implements IVQuestStats {
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
index ea9c4d98eff..4cf53a0909f 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
@@ -29,8 +29,6 @@ import forge.model.FModel;
 import forge.screens.LoadingOverlay;
 import forge.screens.TabPageScreen;
 import forge.toolbox.FDisplayObject;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FTextArea;
 import forge.toolbox.GuiChoose;
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
index 3a03a606b49..98f4a5ac791 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
@@ -34,8 +34,6 @@ import forge.screens.LoadingOverlay;
 import forge.screens.limited.DraftingProcessScreen;
 import forge.toolbox.FButton;
 import forge.toolbox.FContainer;
-import forge.toolbox.FEvent;
-import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FLabel;
 import forge.toolbox.FTextField;
 import forge.util.Utils;

From 1714cac0c21ab5b58c9c9a73e8019866ab71899a Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Sun, 10 Jul 2022 12:25:10 +0100
Subject: [PATCH 268/309] Rescue the Foal add Oracle:

---
 .../cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt b/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
index 6c8dd5fbbd5..27edc434df3 100644
--- a/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pegasus_guardian_rescue_the_foal.txt
@@ -17,4 +17,4 @@ Types:Instant Adventure
 A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | RememberTargets$ True | SubAbility$ DBReturn | StackDescription$ Exile {c:Targeted}, | SpellDescription$ Exile target creature you control, then return that card to the battlefield under its owner's control.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup | StackDescription$ then return it to the battlefield under its owner's control.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Exile target creature you control, then return that card to the battlefield under its owner's control. (Then exile this card. You may cast the creature later from exile.)
+Oracle:Exile target creature you control, then return that card to the battlefield under its owner's control. (Then exile this card. You may cast the creature later from exile.)

From ecb54c6fce475c9bc5e3399651cb563c9e849ad5 Mon Sep 17 00:00:00 2001
From: t-w-o-s-a-t <103374130+t-w-o-s-a-t@users.noreply.github.com>
Date: Sun, 10 Jul 2022 14:46:55 +0200
Subject: [PATCH 269/309] Update de-DE.properties

translated lblAttackers
---
 forge-gui/res/languages/de-DE.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index fea5db7fbc5..2dd48a9348a 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -1503,7 +1503,7 @@ lblAttachee=Anhang
 lblNumberBlockers=Anzahl Blocker
 lblBlocker=Blocker
 #TriggerAttackerBlockedOnce.java
-lblAttackers=Attackers
+lblAttackers=Angreifer
 #TriggerAttackersDeclared.java
 lblNumberAttackers=Anzahl Angreifer
 #TriggerAttackerUnblockedOnce.java

From d247b22e0af57e331055bc504e1fb89d5fac4716 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 10 Jul 2022 15:07:39 +0200
Subject: [PATCH 270/309] Clean up Fabricate

---
 .../java/forge/game/card/CardFactoryUtil.java | 26 +++++++------------
 .../java/forge/game/card/CardProperty.java    |  4 ---
 .../java/forge/player/HumanCostDecision.java  |  3 +++
 3 files changed, 12 insertions(+), 21 deletions(-)

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 31ae3d89ee8..e9e779c77db 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1147,33 +1147,25 @@ public class CardFactoryUtil {
                     + " | ValidCard$ Card.Self | Secondary$ True"
                     + " | TriggerDescription$ Fabricate " + n + " (" + inst.getReminderText() + ")";
 
-            final String choose = "DB$ GenericChoice | AILogic$ " + name;
-            final String counter = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ " + n +
-                    " | SpellDescription$ Put "
-                    + Lang.nounWithNumeral(n, "+1/+1 counter") + " on it.";
-            final String token = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | TokenOwner$ You "
-                    + " | SpellDescription$ Create "
+            final String token = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | ConditionPresent$ Card.StrictlySelf | ConditionCompare$ EQ1"
+                    + " | UnlessCost$ AddCounter<" + n + "/P1P1> | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | UnlessAI$ " + name
+                    + " | SpellDescription$ Fabricate - Create "
                     + Lang.nounWithNumeral(n, "1/1 colorless Servo artifact creature token") + ".";
+            final String token2 = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | ConditionPresent$ Card.StrictlySelf | ConditionCompare$ EQ0";
 
             final Trigger trigger = TriggerHandler.parseTrigger(trigStr, card, intrinsic);
 
-            SpellAbility saChoose = AbilityFactory.getAbility(choose, card);
-
-            List<AbilitySub> list = Lists.newArrayList();
-            AbilitySub putCounter = (AbilitySub)AbilityFactory.getAbility(counter, card);
-            SpellAbilityRestriction restriction = new SpellAbilityRestriction();
-            restriction.setIsPresent("Card.StrictlySelf+canReceiveCounters P1P1");
-            putCounter.setRestrictions(restriction);
-            list.add(putCounter);
-            list.add((AbilitySub)AbilityFactory.getAbility(token, card));
-            saChoose.setAdditionalAbilityList("Choices", list);
+            SpellAbility saChoose = AbilityFactory.getAbility(token, card);
             saChoose.setIntrinsic(intrinsic);
 
+            AbilitySub saNoChoose = (AbilitySub) AbilityFactory.getAbility(token2, card);
+            saChoose.setSubAbility(saNoChoose);
+
             trigger.setOverridingAbility(saChoose);
 
             inst.addTrigger(trigger);
         } else if (keyword.startsWith("Fading")) {
-            String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Secondary$ True " +
+            String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Secondary$ True" +
                     " | TriggerDescription$ At the beginning of your upkeep, remove a fade counter from CARDNAME. If you can't, sacrifice CARDNAME.";
 
             final String removeCounterStr = "DB$ RemoveCounter | Defined$ Self | CounterType$ FADE | CounterNum$ 1 | RememberRemoved$ True";
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 3c831061e65..0143e6a5657 100644
--- a/forge-game/src/main/java/forge/game/card/CardProperty.java
+++ b/forge-game/src/main/java/forge/game/card/CardProperty.java
@@ -1475,10 +1475,6 @@ public class CardProperty {
             if (!card.getManaCost().getShortString().equals(property.substring(8))) {
                 return false;
             }
-        } else if (property.startsWith("canReceiveCounters")) {
-            if (!card.canReceiveCounters(CounterType.getType(property.split(" ")[1]))) {
-                return false;
-            }
         } else if (property.equals("HasCounters")) {
             if (!card.hasCounters()) {
                 return false;
diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index cb06d43414d..e3969bf35b4 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -667,6 +667,9 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         final int c = cost.getAbilityAmount(ability);
 
         if (cost.payCostFromSource()) {
+            if (ability.getDescription().contains("Fabricate") && !controller.confirmPayment(cost, Localizer.getInstance().getMessage("lblPutNTypeCounterOnTarget", String.valueOf(c), cost.getCounter().getName(), ability.getHostCard().getName()), ability)) {
+                return null;
+            }
             cost.setLastPaidAmount(c);
             return PaymentDecision.number(c);
         }

From 8f4c5039ed95932e0565670d4f16d93ca618deea Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 10 Jul 2022 15:07:47 +0200
Subject: [PATCH 271/309] Cleanup AI

---
 .../main/java/forge/ai/ComputerUtilCost.java  | 68 +++++++++++++++
 .../ai/ability/ChooseGenericEffectAi.java     | 83 +------------------
 2 files changed, 69 insertions(+), 82 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
index 46f379218ce..2f39a64fbf5 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import forge.ai.AiCardMemory.MemorySet;
 import forge.ai.ability.AnimateAi;
+import forge.ai.ability.TokenAi;
 import forge.card.ColorSet;
 import forge.game.Game;
 import forge.game.ability.AbilityUtils;
@@ -14,6 +15,7 @@ import forge.game.ability.ApiType;
 import forge.game.card.*;
 import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.Combat;
+import forge.game.combat.CombatUtil;
 import forge.game.cost.*;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseType;
@@ -692,6 +694,72 @@ public class ComputerUtilCost {
             return false;
         } else if ("LowPriority".equals(aiLogic) && MyRandom.getRandom().nextInt(100) < 67) {
             return false;
+        } else if (aiLogic != null && aiLogic.startsWith("Fabricate")) {
+            final int n = Integer.valueOf(aiLogic.substring("Fabricate".length()));
+
+            // if host would leave the play or if host is useless, create tokens
+            if (source.hasSVar("EndOfTurnLeavePlay") || ComputerUtilCard.isUselessCreature(payer, source)) {
+                return false;
+            }
+
+            // need a copy for one with extra +1/+1 counter boost,
+            // without causing triggers to run
+            final Card copy = CardUtil.getLKICopy(source);
+            copy.setCounters(CounterEnumType.P1P1, copy.getCounters(CounterEnumType.P1P1) + n);
+            copy.setZone(source.getZone());
+
+            // if host would put into the battlefield attacking
+            Combat combat = source.getGame().getCombat();
+            if (combat != null && combat.isAttacking(source)) {
+                final Player defender = combat.getDefenderPlayerByAttacker(source);
+                if (defender.canLoseLife() && !ComputerUtilCard.canBeBlockedProfitably(defender, copy, true)) {
+                    return true;
+                }
+                return false;
+            }
+
+            // if the host has haste and can attack
+            if (CombatUtil.canAttack(copy)) {
+                for (final Player opp : payer.getOpponents()) {
+                    if (CombatUtil.canAttack(copy, opp) &&
+                            opp.canLoseLife() &&
+                            !ComputerUtilCard.canBeBlockedProfitably(opp, copy, true))
+                        return true;
+                }
+            }
+
+            // TODO check for trigger to turn token ETB into +1/+1 counter for host
+            // TODO check for trigger to turn token ETB into damage or life loss for opponent
+            // in this cases Token might be prefered even if they would not survive
+            final Card tokenCard = TokenAi.spawnToken(payer, sa);
+
+            // Token would not survive
+            if (!tokenCard.isCreature() || tokenCard.getNetToughness() < 1) {
+                return true;
+            }
+
+            // Special Card logic, this one try to median its power with the number of artifacts
+            if ("Marionette Master".equals(source.getName())) {
+                CardCollection list = CardLists.filter(payer.getCardsIn(ZoneType.Battlefield), Presets.ARTIFACTS);
+                return list.size() >= copy.getNetPower();
+            } else if ("Cultivator of Blades".equals(source.getName())) {
+                // Cultivator does try to median with number of Creatures
+                CardCollection list = payer.getCreaturesInPlay();
+                return list.size() >= copy.getNetPower();
+            }
+
+            // evaluate Creature with +1/+1
+            int evalCounter = ComputerUtilCard.evaluateCreature(copy);
+
+            final CardCollection tokenList = new CardCollection(source);
+            for (int i = 0; i < n; ++i) {
+                tokenList.add(TokenAi.spawnToken(payer, sa));
+            }
+
+            // evaluate Host with Tokens
+            int evalToken = ComputerUtilCard.evaluateCreatureList(tokenList);
+
+            return evalToken < evalCounter;
         }
 
         // Check for shocklands and similar ETB replacement effects
diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
index e81059371c7..596ee8f6671 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
@@ -9,7 +9,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import forge.ai.ComputerUtilAbility;
-import forge.ai.ComputerUtilCard;
 import forge.ai.ComputerUtilCost;
 import forge.ai.SpecialCardAi;
 import forge.ai.SpellAbilityAi;
@@ -19,12 +18,9 @@ import forge.game.Game;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates.Presets;
 import forge.game.card.CardUtil;
 import forge.game.card.CounterEnumType;
 import forge.game.combat.Combat;
-import forge.game.combat.CombatUtil;
 import forge.game.cost.Cost;
 import forge.game.keyword.Keyword;
 import forge.game.phase.PhaseHandler;
@@ -43,7 +39,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
     protected boolean checkAiLogic(final Player ai, final SpellAbility sa, final String aiLogic) {
         if ("Khans".equals(aiLogic) || "Dragons".equals(aiLogic)) {
             return true;
-        } else if (aiLogic.startsWith("Fabricate") || "Riot".equals(aiLogic)) {
+        } else if ("Riot".equals(aiLogic)) {
             return true;
         } else if ("Pump".equals(aiLogic) || "BestOption".equals(aiLogic)) {
             for (AbilitySub sb : sa.getAdditionalAbilityList("Choices")) {
@@ -265,83 +261,6 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
             }
             // if unsure, random?
             return Aggregates.random(spells);
-        } else if (logic.startsWith("Fabricate")) {
-            final int n = Integer.valueOf(logic.substring("Fabricate".length()));
-            if(spells.size() < 2) {
-				// If the creature is no longer on the battlefield, the option
-				// to add counters is already removed at this point. Return the
-				// only available option: create servo tokens.
-            	return spells.get(0);
-            }
-            SpellAbility counterSA = spells.get(0), tokenSA = spells.get(1);
-
-            // check for something which might prevent the counters to be placed on host
-            if (!host.canReceiveCounters(CounterEnumType.P1P1)) {
-                return tokenSA;
-            }
-
-            // if host would leave the play or if host is useless, create tokens
-            if (host.hasSVar("EndOfTurnLeavePlay") || ComputerUtilCard.isUselessCreature(player, host)) {
-                return tokenSA;
-            }
-
-            // need a copy for one with extra +1/+1 counter boost,
-            // without causing triggers to run
-            final Card copy = CardUtil.getLKICopy(host);
-            copy.setCounters(CounterEnumType.P1P1, copy.getCounters(CounterEnumType.P1P1) + n);
-            copy.setZone(host.getZone());
-
-            // if host would put into the battlefield attacking
-            if (combat != null && combat.isAttacking(host)) {
-                final Player defender = combat.getDefenderPlayerByAttacker(host);
-                if (defender.canLoseLife() && !ComputerUtilCard.canBeBlockedProfitably(defender, copy, true)) {
-                    return counterSA;
-                }
-                return tokenSA;
-            }
-
-            // if the host has haste and can attack
-            if (CombatUtil.canAttack(copy)) {
-                for (final Player opp : player.getOpponents()) {
-                    if (CombatUtil.canAttack(copy, opp) &&
-                            opp.canLoseLife() &&
-                            !ComputerUtilCard.canBeBlockedProfitably(opp, copy, true))
-                        return counterSA;
-                }
-            }
-
-            // TODO check for trigger to turn token ETB into +1/+1 counter for host
-            // TODO check for trigger to turn token ETB into damage or life loss for opponent
-            // in this cases Token might be prefered even if they would not survive
-            final Card tokenCard = TokenAi.spawnToken(player, tokenSA);
-
-            // Token would not survive
-            if (!tokenCard.isCreature() || tokenCard.getNetToughness() < 1) {
-                return counterSA;
-            }
-
-            // Special Card logic, this one try to median its power with the number of artifacts
-            if ("Marionette Master".equals(sourceName)) {
-                CardCollection list = CardLists.filter(player.getCardsIn(ZoneType.Battlefield), Presets.ARTIFACTS);
-                return list.size() >= copy.getNetPower() ? counterSA : tokenSA;
-            } else if ("Cultivator of Blades".equals(sourceName)) {
-                // Cultivator does try to median with number of Creatures
-                CardCollection list = player.getCreaturesInPlay();
-                return list.size() >= copy.getNetPower() ? counterSA : tokenSA;
-            }
-
-            // evaluate Creature with +1/+1
-            int evalCounter = ComputerUtilCard.evaluateCreature(copy);
-
-            final CardCollection tokenList = new CardCollection(host);
-            for (int i = 0; i < n; ++i) {
-                tokenList.add(TokenAi.spawnToken(player, tokenSA));
-            }
-
-            // evaluate Host with Tokens
-            int evalToken = ComputerUtilCard.evaluateCreatureList(tokenList);
-
-            return evalToken >= evalCounter ? tokenSA : counterSA;
         } else if ("CombustibleGearhulk".equals(logic)) {
             Player controller = sa.getActivatingPlayer();
             List<ZoneType> zones = ZoneType.listValueOf("Graveyard, Battlefield, Exile");

From ec3f7e00ca0e1e787d531a45d7505a30f47d09a8 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Sun, 10 Jul 2022 15:51:56 +0200
Subject: [PATCH 272/309] Fix AI casting suspended spells against Drannith
 Magistrate (#1098)

* Cleanup cards

* Fix AI casting suspended spells against Drannith Magistrate

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
---
 .../src/main/java/forge/ai/ComputerUtil.java  | 30 ++++++++++++-
 .../java/forge/ai/PlayerControllerAi.java     |  2 +-
 .../main/java/forge/game/GameActionUtil.java  | 43 ++++++++++++++++++
 .../ability/effects/CountersPutEffect.java    |  2 +-
 .../res/cardsfolder/d/djerus_resolve.txt      |  3 +-
 forge-gui/res/cardsfolder/g/godtoucher.txt    |  3 +-
 .../cardsfolder/h/harvestguard_alseids.txt    |  3 +-
 .../res/cardsfolder/i/indestructible_aura.txt |  3 +-
 .../res/cardsfolder/p/piston_fist_cyclops.txt |  2 +-
 .../res/cardsfolder/s/shielded_passage.txt    |  3 +-
 .../cardsfolder/w/wellgabber_apothecary.txt   |  3 +-
 .../forge/player/HumanPlaySpellAbility.java   | 44 +------------------
 12 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index 83520cd8c55..b85f75da7fd 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -250,6 +250,13 @@ public class ComputerUtil {
             return false;
 
         final Card source = sa.getHostCard();
+
+        Zone fromZone = game.getZoneOf(source);
+        int zonePosition = 0;
+        if (fromZone != null) {
+            zonePosition = fromZone.getCards().indexOf(source);
+        }
+
         if (sa.isSpell() && !source.isCopiedSpell()) {
             sa.setHostCard(game.getAction().moveToStack(source, sa));
         }
@@ -257,11 +264,18 @@ public class ComputerUtil {
         sa = GameActionUtil.addExtraKeywordCost(sa);
 
         final Cost cost = sa.getPayCosts();
+        final CostPayment pay = new CostPayment(cost, sa);
+
+        // do this after card got added to stack
+        if (!sa.checkRestrictions(ai)) {
+            GameActionUtil.rollbackAbility(sa, fromZone, zonePosition, pay, source);
+            return false;
+        }
+
         if (cost == null) {
             ComputerUtilMana.payManaCost(ai, sa, false);
             game.getStack().add(sa);
         } else {
-            final CostPayment pay = new CostPayment(cost, sa);
             if (pay.payComputerCosts(new AiCostDecision(ai, sa, false))) {
                 game.getStack().add(sa);
             }
@@ -292,6 +306,13 @@ public class ComputerUtil {
         newSA = GameActionUtil.addExtraKeywordCost(newSA);
 
         final Card source = newSA.getHostCard();
+
+        Zone fromZone = game.getZoneOf(source);
+        int zonePosition = 0;
+        if (fromZone != null) {
+            zonePosition = fromZone.getCards().indexOf(source);
+        }
+
         if (newSA.isSpell() && !source.isCopiedSpell()) {
             newSA.setHostCard(game.getAction().moveToStack(source, newSA));
 
@@ -303,6 +324,13 @@ public class ComputerUtil {
         }
 
         final CostPayment pay = new CostPayment(newSA.getPayCosts(), newSA);
+
+        // do this after card got added to stack
+        if (!sa.checkRestrictions(ai)) {
+            GameActionUtil.rollbackAbility(sa, fromZone, zonePosition, pay, source);
+            return false;
+        }
+        
         pay.payComputerCosts(new AiCostDecision(ai, newSA, false));
 
         game.getStack().add(newSA);
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 772f0d51734..5ca41529349 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -1087,7 +1087,7 @@ public class PlayerControllerAi extends PlayerController {
         if (tgtSA instanceof Spell) { // Isn't it ALWAYS a spell?
             Spell spell = (Spell) tgtSA;
             // TODO if mandatory AI is only forced to use mana when it's already in the pool
-            if (tgtSA.checkRestrictions(brains.getPlayer()) && (brains.canPlayFromEffectAI(spell, !optional, noManaCost) == AiPlayDecision.WillPlay || !optional)) {
+            if (brains.canPlayFromEffectAI(spell, !optional, noManaCost) == AiPlayDecision.WillPlay || !optional) {
                 if (noManaCost) {
                     return ComputerUtil.playSpellAbilityWithoutPayingManaCost(player, tgtSA, getGame());
                 }
diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index f7574571163..22f49d4fa62 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -34,6 +34,7 @@ import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.CardPlayOption.PayManaCost;
 import forge.game.cost.Cost;
+import forge.game.cost.CostPayment;
 import forge.game.keyword.Keyword;
 import forge.game.keyword.KeywordInterface;
 import forge.game.player.Player;
@@ -842,4 +843,46 @@ public final class GameActionUtil {
         c.getGame().getTriggerHandler().resetActiveTriggers();
     }
 
+    public static void rollbackAbility(SpellAbility ability, final Zone fromZone, final int zonePosition, CostPayment payment, Card oldCard) {
+        // cancel ability during target choosing
+        final Game game = ability.getActivatingPlayer().getGame();
+
+        if (fromZone != null) { // and not a copy
+            oldCard.setCastSA(null);
+            oldCard.setCastFrom(null);
+            // add back to where it came from, hopefully old state
+            // skip GameAction
+            oldCard.getZone().remove(oldCard);
+            fromZone.add(oldCard, zonePosition >= 0 ? Integer.valueOf(zonePosition) : null);
+            ability.setHostCard(oldCard);
+            ability.setXManaCostPaid(null);
+            ability.setSpendPhyrexianMana(false);
+            if (ability.hasParam("Announce")) {
+                for (final String aVar : ability.getParam("Announce").split(",")) {
+                    final String varName = aVar.trim();
+                    if (!varName.equals("X")) {
+                        ability.setSVar(varName, "0");
+                    }
+                }
+            }
+            // better safe than sorry approach in case rolled back ability was copy (from addExtraKeywordCost)
+            for (SpellAbility sa : oldCard.getSpells()) {
+                sa.setHostCard(oldCard);
+            }
+            //for Chorus of the Conclave
+            ability.rollback();
+
+            oldCard.setBackSide(false);
+            oldCard.setState(oldCard.getFaceupCardStateName(), true);
+            oldCard.unanimateBestow();
+        }
+
+        ability.clearTargets();
+
+        ability.resetOnceResolved();
+        payment.refundPayment();
+        game.getStack().clearFrozen();
+        game.getTriggerHandler().clearWaitingTriggers();
+    }
+
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index bab1c1bd3e0..3dec9d6ae4e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -496,7 +496,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
                             // need to unfreeze tracker
                             game.getTracker().unfreeze();
 
-                            // check if it can recive the Tribute
+                            // check if it can receive the Tribute
                             if (abort) {
                                 continue;
                             }
diff --git a/forge-gui/res/cardsfolder/d/djerus_resolve.txt b/forge-gui/res/cardsfolder/d/djerus_resolve.txt
index 441cab095b4..c940cf2a52e 100644
--- a/forge-gui/res/cardsfolder/d/djerus_resolve.txt
+++ b/forge-gui/res/cardsfolder/d/djerus_resolve.txt
@@ -2,6 +2,7 @@ Name:Djeru's Resolve
 ManaCost:W
 Types:Instant
 A:SP$ Untap | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ Untap target creature. Prevent all damage that would be dealt to it this turn.
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Prevent all damage that would be dealt to CARDNAME.
+SVar:DBPump:DB$ Effect | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 K:Cycling:2
 Oracle:Untap target creature. Prevent all damage that would be dealt to it this turn.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/g/godtoucher.txt b/forge-gui/res/cardsfolder/g/godtoucher.txt
index ffa765c3cde..1052967e2fe 100644
--- a/forge-gui/res/cardsfolder/g/godtoucher.txt
+++ b/forge-gui/res/cardsfolder/g/godtoucher.txt
@@ -2,7 +2,8 @@ Name:Godtoucher
 ManaCost:3 G
 Types:Creature Elf Cleric
 PT:2/2
-A:AB$ Pump | Cost$ 1 W T | KW$ Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Select target creature with power 5 or greater | SpellDescription$ Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
+A:AB$ Effect | Cost$ 1 W T | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Select target creature with power 5 or greater | ReplacementEffects$ RPrevent| RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 Oracle:{1}{W}, {T}: Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
diff --git a/forge-gui/res/cardsfolder/h/harvestguard_alseids.txt b/forge-gui/res/cardsfolder/h/harvestguard_alseids.txt
index 50e85f86af2..efb0d150036 100644
--- a/forge-gui/res/cardsfolder/h/harvestguard_alseids.txt
+++ b/forge-gui/res/cardsfolder/h/harvestguard_alseids.txt
@@ -3,7 +3,8 @@ ManaCost:2 W
 Types:Enchantment Creature Nymph
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigPump | TriggerDescription$ Constellation — Whenever CARDNAME or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Prevent all damage that would be dealt to CARDNAME.
+SVar:TrigPump:DB$ Effect | Cost$ W | ValidTgts$ Creature | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Enchantment
 Oracle:Constellation — Whenever Harvestguard Alseids or another enchantment enters the battlefield under your control, prevent all damage that would be dealt to target creature this turn.
diff --git a/forge-gui/res/cardsfolder/i/indestructible_aura.txt b/forge-gui/res/cardsfolder/i/indestructible_aura.txt
index da743170761..fab165f32b9 100644
--- a/forge-gui/res/cardsfolder/i/indestructible_aura.txt
+++ b/forge-gui/res/cardsfolder/i/indestructible_aura.txt
@@ -1,6 +1,7 @@
 Name:Indestructible Aura
 ManaCost:W
 Types:Instant
-A:SP$ Pump | Cost$ W | KW$ Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
+A:SP$ Effect | ValidTgts$ Creature | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 AI:RemoveDeck:All
 Oracle:Prevent all damage that would be dealt to target creature this turn.
diff --git a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
index 25f2a682d01..37fb8914942 100644
--- a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
+++ b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
@@ -4,7 +4,7 @@ Types:Creature Cyclops
 PT:4/3
 K:Defender
 S:Mode$ CanAttackDefender | ValidCard$ Card.Self | CheckSVar$ X | Description$ As long as you've cast an instant or sorcery spell this turn, CARDNAME can attack as though it didn't have defender.
-SVar:X:Count$ThisTurnCast_Instant.YouOwn,Sorcery.YouOwn
+SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
 SVar:BuffedBy:Instant,Sorcery
 DeckHints:Type$Instant|Sorcery
 Oracle:Defender\nAs long as you've cast an instant or sorcery spell this turn, Piston-Fist Cyclops can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/s/shielded_passage.txt b/forge-gui/res/cardsfolder/s/shielded_passage.txt
index 596241bbb38..5ab6ad87861 100644
--- a/forge-gui/res/cardsfolder/s/shielded_passage.txt
+++ b/forge-gui/res/cardsfolder/s/shielded_passage.txt
@@ -1,6 +1,7 @@
 Name:Shielded Passage
 ManaCost:W
 Types:Instant
-A:SP$ Pump | Cost$ W | KW$ Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
+A:SP$ Effect | ValidTgts$ Creature | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target creature this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 AI:RemoveDeck:All
 Oracle:Prevent all damage that would be dealt to target creature this turn.
diff --git a/forge-gui/res/cardsfolder/w/wellgabber_apothecary.txt b/forge-gui/res/cardsfolder/w/wellgabber_apothecary.txt
index 239f9a3e2b4..8dd9b05c732 100644
--- a/forge-gui/res/cardsfolder/w/wellgabber_apothecary.txt
+++ b/forge-gui/res/cardsfolder/w/wellgabber_apothecary.txt
@@ -2,5 +2,6 @@ Name:Wellgabber Apothecary
 ManaCost:4 W
 Types:Creature Merfolk Cleric
 PT:2/3
-A:AB$ Pump | Cost$ 1 W | KW$ Prevent all damage that would be dealt to CARDNAME. | ValidTgts$ Creature.Merfolk+tapped,Creature.Kithkin+tapped | TgtPrompt$ Select tapped Merfolk or Kithkin creature | SpellDescription$ Prevent all damage that would be dealt to target tapped Merfolk or Kithkin creature this turn.
+A:SP$ Effect | Cost$ 1 W | ValidTgts$ Creature.Merfolk+tapped,Creature.Kithkin+tapped | TgtPrompt$ Select tapped Merfolk or Kithkin creature | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target tapped Merfolk or Kithkin creature this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 Oracle:{1}{W}: Prevent all damage that would be dealt to target tapped Merfolk or Kithkin creature this turn.
diff --git a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
index 74fa086002a..9d9b4ce0ebb 100644
--- a/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
+++ b/forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
@@ -164,7 +164,7 @@ public class HumanPlaySpellAbility {
 
         if (!prerequisitesMet) {
             if (!ability.isTrigger()) {
-                rollbackAbility(fromZone, zonePosition, payment, c);
+                GameActionUtil.rollbackAbility(ability, fromZone, zonePosition, payment, c);
                 if (ability.getHostCard().isMadness()) {
                     // if a player failed to play madness cost, move the card to graveyard
                     Card newCard = game.getAction().moveToGraveyard(c, null);
@@ -209,48 +209,6 @@ public class HumanPlaySpellAbility {
         return true;
     }
 
-    private void rollbackAbility(final Zone fromZone, final int zonePosition, CostPayment payment, Card oldCard) {
-        // cancel ability during target choosing
-        final Game game = ability.getActivatingPlayer().getGame();
-
-        if (fromZone != null) { // and not a copy
-            oldCard.setCastSA(null);
-            oldCard.setCastFrom(null);
-            // add back to where it came from, hopefully old state
-            // skip GameAction
-            oldCard.getZone().remove(oldCard);
-            fromZone.add(oldCard, zonePosition >= 0 ? Integer.valueOf(zonePosition) : null);
-            ability.setHostCard(oldCard);
-            ability.setXManaCostPaid(null);
-            ability.setSpendPhyrexianMana(false);
-            if (ability.hasParam("Announce")) {
-                for (final String aVar : ability.getParam("Announce").split(",")) {
-                    final String varName = aVar.trim();
-                    if (!varName.equals("X")) {
-                        ability.setSVar(varName, "0");
-                    }
-                }
-            }
-            // better safe than sorry approach in case rolled back ability was copy (from addExtraKeywordCost)
-            for (SpellAbility sa : oldCard.getSpells()) {
-                sa.setHostCard(oldCard);
-            }
-            //for Chorus of the Conclave
-            ability.rollback();
-
-            oldCard.setBackSide(false);
-            oldCard.setState(oldCard.getFaceupCardStateName(), true);
-            oldCard.unanimateBestow();
-        }
-
-        ability.clearTargets();
-
-        ability.resetOnceResolved();
-        payment.refundPayment();
-        game.getStack().clearFrozen();
-        game.getTriggerHandler().clearWaitingTriggers();
-    }
-
     private boolean announceValuesLikeX() {
         if (ability.isCopied() || ability.isWrapper()) { return true; } //don't re-announce for spell copies
 

From 5c3f75d0d9b5e739cdcef9acdef6b4a34f9db86e Mon Sep 17 00:00:00 2001
From: Northmoc <103371817+Northmoc@users.noreply.github.com>
Date: Sun, 10 Jul 2022 09:52:15 -0400
Subject: [PATCH 273/309] CLB: Illithid Harvester // Plant Tadpoles and support
 (#1056)

* illithid_harvester_plant_tadpoles.txt

* SetStateEffect.setFaceDownState

* tidy up the tadpoles

* CardFactoryUtil.setFaceDownState

* ChangeZoneEffect remove setFaceDownState

* SetStateEffect remove setFaceDownState

* ChangeZoneEffect.changeZonePlayerInvariant call CardFactoryUtil too
---
 .../ability/effects/ChangeZoneEffect.java     | 78 +++----------------
 .../game/ability/effects/SetStateEffect.java  |  4 +
 .../java/forge/game/card/CardFactoryUtil.java | 34 ++++++++
 .../illithid_harvester_plant_tadpoles.txt     | 19 +++++
 4 files changed, 68 insertions(+), 67 deletions(-)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/illithid_harvester_plant_tadpoles.txt

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 d675f24b9f6..7a7e633dc4a 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
@@ -1,41 +1,18 @@
 package forge.game.ability.effects;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import forge.game.*;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
-import forge.GameCommand;
-import forge.card.CardStateName;
 import forge.card.CardType;
+import forge.game.*;
 import forge.game.ability.AbilityKey;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
-import forge.game.card.Card;
-import forge.game.card.CardCollection;
-import forge.game.card.CardCollectionView;
-import forge.game.card.CardLists;
-import forge.game.card.CardPredicates;
-import forge.game.card.CardState;
-import forge.game.card.CardUtil;
-import forge.game.card.CardView;
-import forge.game.card.CardZoneTable;
-import forge.game.card.CounterType;
+import forge.game.card.*;
 import forge.game.event.GameEventCombatChanged;
-import forge.game.player.DelayedReveal;
-import forge.game.player.Player;
-import forge.game.player.PlayerActionConfirmMode;
-import forge.game.player.PlayerCollection;
-import forge.game.player.PlayerView;
+import forge.game.player.*;
 import forge.game.replacement.ReplacementEffect;
 import forge.game.replacement.ReplacementType;
 import forge.game.spellability.SpellAbility;
@@ -43,13 +20,13 @@ import forge.game.spellability.SpellAbilityStackInstance;
 import forge.game.trigger.TriggerType;
 import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
-import forge.util.Aggregates;
-import forge.util.CardTranslation;
-import forge.util.Lang;
-import forge.util.Localizer;
-import forge.util.MessageUtil;
-import forge.util.TextUtil;
+import forge.util.*;
 import forge.util.collect.FCollectionView;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.Map;
 
 public class ChangeZoneEffect extends SpellAbilityEffect {
 
@@ -689,7 +666,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     // need to be facedown before it hits the battlefield in case of Replacement Effects or Trigger
                     if (sa.hasParam("FaceDown")) {
                         gameCard.turnFaceDown(true);
-                        setFaceDownState(gameCard, sa);
+                        CardFactoryUtil.setFaceDownState(gameCard, sa);
                     }
 
                     movedCard = game.getAction().moveTo(gameCard.getController().getZone(destination), gameCard, sa, moveParams);
@@ -1345,7 +1322,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                     // need to be facedown before it hits the battlefield in case of Replacement Effects or Trigger
                     if (sa.hasParam("FaceDown")) {
                         c.turnFaceDown(true);
-                        setFaceDownState(c, sa);
+                        CardFactoryUtil.setFaceDownState(c, sa);
                     }
                     movedCard = game.getAction().moveToPlay(c, c.getController(), sa, moveParams);
 
@@ -1503,39 +1480,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
                 && sa.getParam("WithTotalCMC") == null;
     }
 
-    private static void setFaceDownState(Card c, SpellAbility sa) {
-        final Card source = sa.getHostCard();
-        CardState faceDown = c.getFaceDownState();
-
-        // set New Pt doesn't work because this values need to be copyable for clone effects
-        if (sa.hasParam("FaceDownPower")) {
-            faceDown.setBasePower(AbilityUtils.calculateAmount(
-                    source, sa.getParam("FaceDownPower"), sa));
-        }
-        if (sa.hasParam("FaceDownToughness")) {
-            faceDown.setBaseToughness(AbilityUtils.calculateAmount(
-                    source, sa.getParam("FaceDownToughness"), sa));
-        }
-
-        if (sa.hasParam("FaceDownSetType")) {
-            faceDown.setType(new CardType(Arrays.asList(sa.getParam("FaceDownSetType").split(" & ")), false));
-        }
-
-        if (sa.hasParam("FaceDownPower") || sa.hasParam("FaceDownToughness")
-                || sa.hasParam("FaceDownSetType")) {
-            final GameCommand unanimate = new GameCommand() {
-                private static final long serialVersionUID = 8853789549297846163L;
-
-                @Override
-                public void run() {
-                    c.clearStates(CardStateName.FaceDown, true);
-                }
-            };
-
-            c.addFaceupCommand(unanimate);
-        }
-    }
-
     /**
      * <p>
      * removeFromStack.
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
index 39c3d3eb71a..820e1ae2a91 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
@@ -162,6 +162,10 @@ public class SetStateEffect extends SpellAbilityEffect {
                 hasTransformed = gameCard.turnFaceUp(true, true, sa);
             } else {
                 hasTransformed = gameCard.changeCardState(mode, sa.getParam("NewState"), sa);
+                if (gameCard.isFaceDown() && (sa.hasParam("FaceDownPower") || sa.hasParam("FaceDownToughness")
+                        || sa.hasParam("FaceDownSetType"))) {
+                    CardFactoryUtil.setFaceDownState(gameCard, sa);
+                }
             }
             if (hasTransformed) {
                 if (sa.isMorphUp()) {
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 3f454c027cf..fe14a850e82 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import forge.GameCommand;
 import forge.game.event.GameEventCardForetold;
 import forge.game.trigger.TriggerType;
 import org.apache.commons.lang3.StringUtils;
@@ -3748,4 +3749,37 @@ public class CardFactoryUtil {
         re.setOverridingAbility(saExile);
         card.addReplacementEffect(re);
     }
+
+    public static void setFaceDownState(Card c, SpellAbility sa) {
+        final Card source = sa.getHostCard();
+        CardState faceDown = c.getFaceDownState();
+
+        // set New Pt doesn't work because this values need to be copyable for clone effects
+        if (sa.hasParam("FaceDownPower")) {
+            faceDown.setBasePower(AbilityUtils.calculateAmount(
+                    source, sa.getParam("FaceDownPower"), sa));
+        }
+        if (sa.hasParam("FaceDownToughness")) {
+            faceDown.setBaseToughness(AbilityUtils.calculateAmount(
+                    source, sa.getParam("FaceDownToughness"), sa));
+        }
+
+        if (sa.hasParam("FaceDownSetType")) {
+            faceDown.setType(new CardType(Arrays.asList(sa.getParam("FaceDownSetType").split(" & ")), false));
+        }
+
+        if (sa.hasParam("FaceDownPower") || sa.hasParam("FaceDownToughness")
+                || sa.hasParam("FaceDownSetType")) {
+            final GameCommand unanimate = new GameCommand() {
+                private static final long serialVersionUID = 8853789549297846163L;
+
+                @Override
+                public void run() {
+                    c.clearStates(CardStateName.FaceDown, true);
+                }
+            };
+
+            c.addFaceupCommand(unanimate);
+        }
+    }
 }
diff --git a/forge-gui/res/cardsfolder/upcoming/illithid_harvester_plant_tadpoles.txt b/forge-gui/res/cardsfolder/upcoming/illithid_harvester_plant_tadpoles.txt
new file mode 100644
index 00000000000..e350f2df221
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/illithid_harvester_plant_tadpoles.txt
@@ -0,0 +1,19 @@
+Name:Illithid Harvester
+ManaCost:4 U
+Types:Creature Horror
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTurnFaceDown | TriggerDescription$ Ceremorphosis — When CARDNAME enters the battlefield, turn any number of target tapped nontoken creatures face down. They're 2/2 Horror creatures.
+SVar:TrigTurnFaceDown:DB$ SetState | ValidTgts$ Creature.tapped+nonToken | TgtPrompt$ Select any number of target tapped nontoken creatures | TargetMin$ 0 | TargetMax$ X | Mode$ TurnFace | FaceDownPower$ 2 | FaceDownToughness$ 2 | FaceDownSetType$ Horror & Creature
+SVar:X:Count$Valid Creature.tapped+nonToken
+AlternateMode:Adventure
+Oracle:Ceremorphosis — When Illithid Harvester enters the battlefield, turn any number of target tapped nontoken creatures face down. They're 2/2 Horror creatures.
+
+ALTERNATE
+
+Name:Plant Tadpoles
+ManaCost:X U U
+Types:Sorcery Adventure
+A:SP$ Tap | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | TargetMin$ X | TargetMax$ X | AlwaysRemember$ True | SubAbility$ DBPump | SpellDescription$ Tap X target creatures.
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Duration$ Permanent | StackDescription$ SpellDescription | SpellDescription$ They don't untap during their controllers' next untap steps.
+SVar:X:Count$xPaid
+Oracle:Tap X target creatures. They don't untap during their controllers' next untap steps. (Then exile this card. You may cast the creature later from exile.)

From aff63c531553e6b3e94ecb446b385a21db516a4f Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 10 Jul 2022 15:53:23 +0200
Subject: [PATCH 274/309] Use canPay check

---
 .../java/forge/game/card/CardFactoryUtil.java  |  8 ++------
 .../java/forge/game/cost/CostPutCounter.java   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

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 e9e779c77db..02207cf1abf 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1147,20 +1147,16 @@ public class CardFactoryUtil {
                     + " | ValidCard$ Card.Self | Secondary$ True"
                     + " | TriggerDescription$ Fabricate " + n + " (" + inst.getReminderText() + ")";
 
-            final String token = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | ConditionPresent$ Card.StrictlySelf | ConditionCompare$ EQ1"
-                    + " | UnlessCost$ AddCounter<" + n + "/P1P1> | UnlessPayer$ You | UnlessResolveSubs$ WhenNotPaid | UnlessAI$ " + name
+            final String token = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo"
+                    + " | UnlessCost$ AddCounter<" + n + "/P1P1> | UnlessPayer$ You | UnlessAI$ " + name
                     + " | SpellDescription$ Fabricate - Create "
                     + Lang.nounWithNumeral(n, "1/1 colorless Servo artifact creature token") + ".";
-            final String token2 = "DB$ Token | TokenAmount$ " + n + " | TokenScript$ c_1_1_a_servo | ConditionPresent$ Card.StrictlySelf | ConditionCompare$ EQ0";
 
             final Trigger trigger = TriggerHandler.parseTrigger(trigStr, card, intrinsic);
 
             SpellAbility saChoose = AbilityFactory.getAbility(token, card);
             saChoose.setIntrinsic(intrinsic);
 
-            AbilitySub saNoChoose = (AbilitySub) AbilityFactory.getAbility(token2, card);
-            saChoose.setSubAbility(saNoChoose);
-
             trigger.setOverridingAbility(saChoose);
 
             inst.addTrigger(trigger);
diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java
index 8b8ed940eb5..ca4d4fd2b45 100644
--- a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java
+++ b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java
@@ -141,16 +141,16 @@ public class CostPutCounter extends CostPartWithList {
     public final boolean canPay(final SpellAbility ability, final Player payer, final boolean effect) {
         final Card source = ability.getHostCard();
         if (this.payCostFromSource()) {
-            return source.canReceiveCounters(this.counter);
-        } else {
-            // 3 Cards have Put a -1/-1 Counter on a Creature you control.
-            List<Card> typeList = CardLists.getValidCards(source.getGame().getCardsIn(ZoneType.Battlefield),
-                    this.getType().split(";"), payer, source, ability);
-
-            typeList = CardLists.filter(typeList, CardPredicates.canReceiveCounters(this.counter));
-
-            return !typeList.isEmpty();
+            return source.isInPlay() && source.canReceiveCounters(this.counter);
         }
+
+        // 3 Cards have Put a -1/-1 Counter on a Creature you control.
+        List<Card> typeList = CardLists.getValidCards(source.getGame().getCardsIn(ZoneType.Battlefield),
+                this.getType().split(";"), payer, source, ability);
+
+        typeList = CardLists.filter(typeList, CardPredicates.canReceiveCounters(this.counter));
+
+        return !typeList.isEmpty();
     }
 
     /*

From 2a7ccd69d6cf34a0a01e7b8a73dff1042b519ede Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 10 Jul 2022 16:03:27 +0200
Subject: [PATCH 275/309] Just check for UnlessCost

---
 forge-gui/src/main/java/forge/player/HumanCostDecision.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
index e3969bf35b4..1647515cac3 100644
--- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java
+++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java
@@ -667,7 +667,8 @@ public class HumanCostDecision extends CostDecisionMakerBase {
         final int c = cost.getAbilityAmount(ability);
 
         if (cost.payCostFromSource()) {
-            if (ability.getDescription().contains("Fabricate") && !controller.confirmPayment(cost, Localizer.getInstance().getMessage("lblPutNTypeCounterOnTarget", String.valueOf(c), cost.getCounter().getName(), ability.getHostCard().getName()), ability)) {
+            // UnlessCost so player might not want to pay (Fabricate)
+            if (ability.hasParam("UnlessCost") && !controller.confirmPayment(cost, Localizer.getInstance().getMessage("lblPutNTypeCounterOnTarget", String.valueOf(c), cost.getCounter().getName(), ability.getHostCard().getName()), ability)) {
                 return null;
             }
             cost.setLastPaidAmount(c);

From 31e089993d2e8526bf77a64a34ed864bf5f94437 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 10 Jul 2022 22:14:41 +0800
Subject: [PATCH 276/309] update ImageCache check - update some variables,
 prevent NPE on font on reload

---
 forge-gui-mobile/src/forge/Forge.java         |  9 ++--
 .../src/forge/adventure/stage/MapStage.java   |  4 +-
 .../src/forge/assets/FSkinFont.java           | 42 +++++++++++++------
 .../src/forge/assets/ImageCache.java          | 32 +++++++-------
 4 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index bd2403e855c..ad1d79681db 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -786,10 +786,6 @@ public class Forge implements ApplicationListener {
         try {
             ImageCache.allowSingleLoad();
             ForgeAnimation.advanceAll();
-            if (needsUpdate) {
-                if (getAssets().manager.update())
-                    needsUpdate = false;
-            }
 
             Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); // Clear the screen.
 
@@ -880,6 +876,11 @@ public class Forge implements ApplicationListener {
                     }
                 }
             }
+            //update here
+            if (needsUpdate) {
+                if (getAssets().manager.update())
+                    needsUpdate = false;
+            }
             graphics.end();
         } catch (Exception ex) {
             graphics.end();
diff --git a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
index df973dd5781..1dc759ef348 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/MapStage.java
@@ -23,7 +23,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.Scaling;
 import forge.Forge;
 import forge.adventure.character.*;
@@ -43,6 +42,7 @@ import forge.sound.SoundEffectType;
 import forge.sound.SoundSystem;
 
 
+import java.util.HashMap;
 import java.util.Map;
 
 import static forge.adventure.util.Paths.MANA_ATLAS;
@@ -69,7 +69,7 @@ public class MapStage extends GameStage {
     private final Vector2 oldPosition3 = new Vector2();
     private final Vector2 oldPosition4 = new Vector2();
     private boolean isLoadingMatch = false;
-    private ObjectMap<String, Byte> mapFlags = new ObjectMap<>(); //Stores local map flags. These aren't available outside this map.
+    private HashMap<String, Byte> mapFlags = new HashMap<>(); //Stores local map flags. These aren't available outside this map.
 
     private Dialog dialog;
     private Stage dialogStage;
diff --git a/forge-gui-mobile/src/forge/assets/FSkinFont.java b/forge-gui-mobile/src/forge/assets/FSkinFont.java
index 985baaec43e..1c5fa17d7ac 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinFont.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinFont.java
@@ -3,6 +3,7 @@ package forge.assets;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
@@ -21,7 +22,6 @@ import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
 import com.badlogic.gdx.utils.Array;
 
 import com.badlogic.gdx.utils.IntSet;
-import com.badlogic.gdx.utils.ObjectMap;
 import forge.Forge;
 import forge.gui.FThreads;
 import forge.localinstance.properties.ForgeConstants;
@@ -38,11 +38,7 @@ public class FSkinFont {
     private static final int MAX_FONT_SIZE_MANY_GLYPHS = 36;
 
     private static final String TTF_FILE = "font1.ttf";
-
-    private static final String commonCharacterSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklm"
-            + "nopqrstuvwxyz1234567890\"!?'.,;:()[]{}<>|/@\\^$-%+=#_&*\u2014"
-            + "\u2022ÁÉÍÓÚáéíóúÀÈÌÒÙàèìòùÑñÄËÏÖÜäëïöüẞß¿¡";
-    private static ObjectMap<String, String> langUniqueCharacterSet = new ObjectMap<>();
+    private static HashMap<String, String> langUniqueCharacterSet = new HashMap<>();
 
     static {
         FileUtil.ensureDirectoryExists(ForgeConstants.FONTS_DIR);
@@ -62,7 +58,8 @@ public class FSkinFont {
     public static FSkinFont forHeight(final float height) {
         int size = MIN_FONT_SIZE + 1;
         while (true) {
-            if (_get(size).getLineHeight() > height) {
+            FSkinFont f = _get(size);
+            if (f != null && f.getLineHeight() > height) {
                 return _get(size - 1);
             }
             size++;
@@ -120,6 +117,8 @@ public class FSkinFont {
 
     }
     public int computeVisibleGlyphs (CharSequence str, int start, int end, float availableWidth) {
+        if (font == null)
+            return 0;
         BitmapFontData data = font.getData();
         int index = start;
         float width = 0;
@@ -173,6 +172,9 @@ public class FSkinFont {
         return getBounds(str, 0, str.length());
     }
     public TextBounds getBounds(CharSequence str, int start, int end) {
+        if (font == null) {
+            return new TextBounds(0f, 0f);
+        }
         BitmapFontData data = font.getData();
         //int start = 0;
         //int end = str.length();
@@ -221,6 +223,9 @@ public class FSkinFont {
     }
     public TextBounds getMultiLineBounds(CharSequence str) {
         updateScale();
+        if (font == null) {
+            return new TextBounds(0f, 0f);
+        }
         BitmapFontData data = font.getData();
         int start = 0;
         float maxWidth = 0;
@@ -240,6 +245,9 @@ public class FSkinFont {
     }
     public TextBounds getWrappedBounds(CharSequence str, float wrapWidth) {
         updateScale();
+        if (font == null) {
+            return new TextBounds(0f, 0f);
+        }
         BitmapFontData data = font.getData();
         if (wrapWidth <= 0) wrapWidth = Integer.MAX_VALUE;
         int start = 0;
@@ -296,14 +304,20 @@ public class FSkinFont {
         return new TextBounds(maxWidth, data.capHeight + (numLines - 1) * data.lineHeight);
     }
     public float getAscent() {
+        if (font == null)
+            return 0f;
         updateScale();
         return font.getAscent();
     }
     public float getCapHeight() {
+        if (font == null)
+            return 0f;
         updateScale();
         return font.getCapHeight();
     }
     public float getLineHeight() {
+        if (font == null)
+            return 0f;
         updateScale();
         return font.getLineHeight();
     }
@@ -316,8 +330,12 @@ public class FSkinFont {
 
     //update scale of font if needed
     private void updateScale() {
-        if (font.getScaleX() != scale) {
-            font.getData().setScale(scale);
+        try {
+            if (font.getScaleX() != scale) {
+                font.getData().setScale(scale);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 
@@ -341,10 +359,10 @@ public class FSkinFont {
         if (langUniqueCharacterSet.containsKey(langCode)) {
             return langUniqueCharacterSet.get(langCode);
         }
-        StringBuilder characters = new StringBuilder(commonCharacterSet);
+        StringBuilder characters = new StringBuilder(FreeTypeFontGenerator.DEFAULT_CHARS);
         IntSet characterSet = new IntSet();
-        for (int offset = 0; offset < commonCharacterSet.length();) {
-            final int codePoint = commonCharacterSet.codePointAt(offset);
+        for (int offset = 0; offset < FreeTypeFontGenerator.DEFAULT_CHARS.length();) {
+            final int codePoint = FreeTypeFontGenerator.DEFAULT_CHARS.codePointAt(offset);
             characterSet.add(codePoint);
             offset += Character.charCount(codePoint);
         }
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 94236afaca6..403c7b94a75 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -18,6 +18,7 @@
 package forge.assets;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Queue;
@@ -29,8 +30,6 @@ import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.TextureData;
 import com.badlogic.gdx.graphics.glutils.PixmapTextureData;
-import com.badlogic.gdx.utils.ObjectMap;
-import com.badlogic.gdx.utils.ObjectSet;
 import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.Queues;
 import com.google.common.collect.Sets;
@@ -75,7 +74,7 @@ import forge.util.ImageUtil;
  * @version $Id: ImageCache.java 24769 2014-02-09 13:56:04Z Hellfish $
  */
 public class ImageCache {
-    private static final ObjectSet<String> missingIconKeys = new ObjectSet<>();
+    private static final HashSet<String> missingIconKeys = new HashSet<>();
     private static List<String> borderlessCardlistKey = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
     static int maxCardCapacity = 400; //default card capacity
     static EvictingQueue<String> q;
@@ -98,7 +97,7 @@ public class ImageCache {
     public static final Texture defaultImage;
     public static FImage BlackBorder = FSkinImage.IMG_BORDER_BLACK;
     public static FImage WhiteBorder = FSkinImage.IMG_BORDER_WHITE;
-    private static final ObjectMap<String, Pair<String, Boolean>> imageBorder = new ObjectMap<>(1024);
+    private static final HashMap<String, Pair<String, Boolean>> imageBorder = new HashMap<>(1024);
 
     private static boolean imageLoaded, delayLoadRequested;
     public static void allowSingleLoad() {
@@ -277,6 +276,9 @@ public class ImageCache {
     static Texture loadAsset(String imageKey, File file, boolean others) {
         if (file == null)
             return null;
+        Texture check = getAsset(imageKey, file, others);
+        if (check != null)
+            return check;
         if (!others) {
             syncQ.add(file.getPath());
             cardsLoaded.add(file.getPath());
@@ -294,17 +296,17 @@ public class ImageCache {
         if (others) {
             return Forge.getAssets().manager.get(fileName, Texture.class, false);
         } else {
-            Texture t = Forge.getAssets().manager.get(fileName, Texture.class, false);
+            Texture cardTexture = Forge.getAssets().manager.get(fileName, Texture.class, false);
             //if full bordermasking is enabled, update the border color
             if (Forge.enableUIMask.equals("Full")) {
                 boolean borderless = isBorderless(imageKey);
-                updateBorders(t.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(t)));
+                updateBorders(cardTexture.toString(), borderless ? Pair.of(Color.valueOf("#171717").toString(), false): isCloserToWhite(getpixelColor(cardTexture)));
                 //if borderless, generate new texture from the asset and store
                 if (borderless) {
-                    Forge.getAssets().generatedCards.put(imageKey, generateTexture(new FileHandle(file), t, Forge.isTextureFilteringEnabled()));
+                    Forge.getAssets().generatedCards.put(imageKey, generateTexture(new FileHandle(file), cardTexture, Forge.isTextureFilteringEnabled()));
                 }
             }
-            return t;
+            return cardTexture;
         }
     }
     static void unloadCardTextures(AssetManager manager) {
@@ -421,10 +423,10 @@ public class ImageCache {
 
         return borderColor(t);
     }
-    public static Texture generateTexture(FileHandle fh, Texture t, boolean textureFilter) {
-        if (t == null || fh == null)
-            return t;
-        final Texture[] n = new Texture[1];
+    public static Texture generateTexture(FileHandle fh, Texture cardTexture, boolean textureFilter) {
+        if (cardTexture == null || fh == null)
+            return cardTexture;
+        final Texture[] placeholder = new Texture[1];
         FThreads.invokeInEdtNowOrLater(() -> {
             Pixmap pImage = new Pixmap(fh);
             int w = pImage.getWidth();
@@ -437,13 +439,13 @@ public class ImageCache {
                     Format.RGBA8888,
                     textureFilter, //use mipmaps
                     false, true);
-            n[0] = new Texture(textureData);
+            placeholder[0] = new Texture(textureData);
             if (textureFilter)
-                n[0].setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
+                placeholder[0].setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear);
             pImage.dispose();
             pMask.dispose();
         });
-        return n[0];
+        return placeholder[0];
     }
     public static Pixmap createRoundedRectangle(int width, int height, int cornerRadius, Color color) {
         Pixmap pixmap = new Pixmap(width, height, Pixmap.Format.RGBA8888);

From eb4400a8bf0d4c42b840dc17166667962eeb3ac1 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Sun, 10 Jul 2022 12:10:44 -0400
Subject: [PATCH 277/309] Added Oracle, removed remembered, and removed
 unnecessary spaces.

---
 .../java/forge/game/ability/effects/ChooseCardEffect.java    | 2 +-
 forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
index ec78e6e598e..0d61a333e83 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java
@@ -83,7 +83,7 @@ public class ChooseCardEffect extends SpellAbilityEffect {
             combined.addAll(choices);
             choices = combined;
         }
-        
+
         final String amountValue = sa.getParamOrDefault("Amount", "1");
         int validAmount;
         if (StringUtils.isNumeric(amountValue)) {
diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
index df3a6c7e2bb..ae36055dc48 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -1,6 +1,7 @@
 Name:Call to the Void
 ManaCost:4 B
 Types:Sorcery
-A:SP$ ChooseCard | Defined$ Player | Choices$ Creature | SecretlyChoose$ True | Amount$ 1 | ControlAndNot$ True | ChoiceTitle$ Secretly choose a creature | Reveal$ True | RevealTitle$ OVERRIDE Chosen creatures. They will be destroyed. | SubAbility$ DBDestroyChosen | RememberChosen$ True | Mandatory$ True
-SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.IsRemembered | SubAbility$ DBCleanUp
+A:SP$ ChooseCard | Defined$ Player | Choices$ Creature | SecretlyChoose$ True | Amount$ 1 | ControlAndNot$ True | ChoiceTitle$ Secretly choose a creature | Reveal$ True | RevealTitle$ OVERRIDE Chosen creatures. They will be destroyed. | SubAbility$ DBDestroyChosen | Mandatory$ True
+SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.ChosenCard | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
+Oracle:Each player secretly chooses a creature they control and a creature they don't control. Then those choices are revealed. Destroy each creature chosen this way.

From b6063933444019d1c90749e431a3732405c05249 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Sun, 10 Jul 2022 12:16:56 -0400
Subject: [PATCH 278/309] Removed Cleanup

---
 forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
index ae36055dc48..1d3cdcd9124 100644
--- a/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
+++ b/forge-gui/res/cardsfolder/upcoming/call_to_the_void.txt
@@ -2,6 +2,5 @@ Name:Call to the Void
 ManaCost:4 B
 Types:Sorcery
 A:SP$ ChooseCard | Defined$ Player | Choices$ Creature | SecretlyChoose$ True | Amount$ 1 | ControlAndNot$ True | ChoiceTitle$ Secretly choose a creature | Reveal$ True | RevealTitle$ OVERRIDE Chosen creatures. They will be destroyed. | SubAbility$ DBDestroyChosen | Mandatory$ True
-SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.ChosenCard | SubAbility$ DBCleanUp
-SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
+SVar:DBDestroyChosen:DB$ DestroyAll | ValidCards$ Creature.ChosenCard
 Oracle:Each player secretly chooses a creature they control and a creature they don't control. Then those choices are revealed. Destroy each creature chosen this way.

From 9dd5d9282dcf9dda08104d78261fbc53cdc9e162 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 11 Jul 2022 10:53:14 +0800
Subject: [PATCH 279/309] move skin and art related objects to Assets

---
 forge-gui-mobile/src/forge/assets/Assets.java |  13 +
 forge-gui-mobile/src/forge/assets/FSkin.java  |  87 +++---
 .../src/forge/assets/TextRenderer.java        | 113 ++++----
 .../src/forge/card/CardFaceSymbols.java       | 250 +++++++++---------
 .../src/forge/card/CardRenderer.java          |  35 ++-
 .../forge/screens/match/MatchController.java  |  39 ++-
 6 files changed, 260 insertions(+), 277 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/Assets.java b/forge-gui-mobile/src/forge/assets/Assets.java
index b6455900c11..b439d7cc007 100644
--- a/forge-gui-mobile/src/forge/assets/Assets.java
+++ b/forge-gui-mobile/src/forge/assets/Assets.java
@@ -5,16 +5,29 @@ import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.assets.loaders.resolvers.AbsoluteFileHandleResolver;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.ObjectMap;
 import forge.gui.GuiBase;
+import forge.localinstance.skin.FSkinProp;
 
 import java.util.HashMap;
 
 public class Assets implements Disposable {
     public AssetManager manager = new AssetManager(new AbsoluteFileHandleResolver());
     public HashMap<Integer, FSkinFont> fonts = new HashMap<>();
+    public HashMap<String, FImageComplex> cardArtCache = new HashMap<>(1024);
+    public HashMap<String, FImage> avatarImages = new HashMap<>();
+    public HashMap<String, FSkinImage> MANA_IMAGES = new HashMap<>(128);
+    public HashMap<String, FSkinImage> symbolLookup = new HashMap<>(64);
+    public HashMap<FSkinProp, FSkinImage> images = new HashMap<>(512);
+    public HashMap<Integer, TextureRegion> avatars = new HashMap<>(150);
+    public HashMap<Integer, TextureRegion> sleeves = new HashMap<>(64);
+    public HashMap<Integer, TextureRegion> cracks = new HashMap<>(16);
+    public HashMap<Integer, TextureRegion> borders = new HashMap<>();
+    public HashMap<Integer, TextureRegion> deckbox = new HashMap<>();
+    public HashMap<Integer, TextureRegion> cursor = new HashMap<>();
     public ObjectMap<Integer, BitmapFont> counterFonts = new ObjectMap<>();
     public ObjectMap<String, Texture> generatedCards = new ObjectMap<>(512);
     public ObjectMap<Integer, Texture> fallback_skins = new ObjectMap<>();
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 08e4d3298aa..3660243cdff 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -25,18 +25,9 @@ import forge.screens.TransitionScreen;
 import forge.toolbox.FProgressBar;
 import forge.util.WordUtil;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class FSkin {
-    private static final Map<FSkinProp, FSkinImage> images = new HashMap<>(512);
-    private static final Map<Integer, TextureRegion> avatars = new HashMap<>(150);
-    private static final Map<Integer, TextureRegion> sleeves = new HashMap<>(64);
-    private static final Map<Integer, TextureRegion> cracks = new HashMap<>(16);
-    private static final Map<Integer, TextureRegion> borders = new HashMap<>();
-    private static final Map<Integer, TextureRegion> deckbox = new HashMap<>();
-    private static final Map<Integer, TextureRegion> cursor = new HashMap<>();
-
     private static Array<String> allSkins;
     private static FileHandle preferredDir;
     private static String preferredName;
@@ -53,27 +44,19 @@ public class FSkin {
         prefs.setPref(FPref.UI_SKIN, skinName);
         prefs.save();
 
-        Forge.setTransitionScreen(new TransitionScreen(new Runnable() {
-            @Override
-            public void run() {
-                FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
-                    final LoadingOverlay loader = new LoadingOverlay(Forge.getLocalizer().getMessageorUseDefault("lblRestartInFewSeconds", "Forge will restart after a few seconds..."), true);
-                    loader.show();
-                    FThreads.invokeInBackgroundThread(() -> {
-                        FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
-                        FThreads.delayInEDT(2000, new Runnable() {
-                            @Override
-                            public void run() {
-                                Forge.clearTransitionScreen();
-                                FThreads.invokeInEdtLater(() -> {
-                                    Forge.restart(true);
-                                });
-                            }
-                        });
+        Forge.setTransitionScreen(new TransitionScreen(() -> FThreads.invokeInBackgroundThread(() -> FThreads.invokeInEdtLater(() -> {
+            final LoadingOverlay loader = new LoadingOverlay(Forge.getLocalizer().getMessageorUseDefault("lblRestartInFewSeconds", "Forge will restart after a few seconds..."), true);
+            loader.show();
+            FThreads.invokeInBackgroundThread(() -> {
+                FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
+                FThreads.delayInEDT(2000, () -> {
+                    Forge.clearTransitionScreen();
+                    FThreads.invokeInEdtLater(() -> {
+                        Forge.restart(true);
                     });
-                }));
-            }
-        }, null, false, true));
+                });
+            });
+        })), null, false, true));
     }
     public static void loadLight(String skinName, final SplashScreen splashScreen,FileHandle prefDir) {
         preferredDir = prefDir;
@@ -226,8 +209,8 @@ public class FSkin {
             if (FSkin.preferredName.isEmpty()) { FSkin.loadLight("default", splashScreen); }
         }
 
-        avatars.clear();
-        sleeves.clear();
+        Forge.getAssets().avatars.clear();
+        Forge.getAssets().sleeves.clear();
 
         TextureLoader.TextureParameter parameter = new TextureLoader.TextureParameter();
         if (Forge.isTextureFilteringEnabled()) {
@@ -354,7 +337,7 @@ public class FSkin {
                         if (i == 0 && j == 0) { continue; }
                         pxTest = new Color(pxPreferredAvatars.getPixel(i + 50, j + 50));
                         if (pxTest.a == 0) { continue; }
-                        FSkin.avatars.put(counter++, new TextureRegion(manager.get(f5.path(), Texture.class), i, j, 100, 100));
+                        Forge.getAssets().avatars.put(counter++, new TextureRegion(manager.get(f5.path(), Texture.class), i, j, 100, 100));
                     }
                 }
                 pxPreferredAvatars.dispose();
@@ -369,7 +352,7 @@ public class FSkin {
                         if (i == 0 && j == 0) { continue; }
                         pxTest = new Color(pxDefaultAvatars.getPixel(i + 50, j + 50));
                         if (pxTest.a == 0) { continue; }
-                        FSkin.avatars.put(counter++, new TextureRegion(manager.get(f4.path(), Texture.class), i, j, 100, 100));
+                        Forge.getAssets().avatars.put(counter++, new TextureRegion(manager.get(f4.path(), Texture.class), i, j, 100, 100));
                     }
                 }
             }
@@ -381,7 +364,7 @@ public class FSkin {
                 for (int i = 0; i < sw; i += 360) {
                     pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
                     if (pxTest.a == 0) { continue; }
-                    FSkin.sleeves.put(scount++, new TextureRegion(manager.get(f8.path(), Texture.class), i, j, 360, 500));
+                    Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f8.path(), Texture.class), i, j, 360, 500));
                 }
             }
 
@@ -397,7 +380,7 @@ public class FSkin {
                 for (int i = 0; i < sw2; i += 360) {
                     pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
                     if (pxTest.a == 0) { continue; }
-                    FSkin.sleeves.put(scount++, new TextureRegion(manager.get(f9.path(), Texture.class), i, j, 360, 500));
+                    Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f9.path(), Texture.class), i, j, 360, 500));
                 }
             }
             //cracks
@@ -408,32 +391,32 @@ public class FSkin {
                 int x = j * 200;
                 for(int i = 0; i < 4; i++) {
                     int y = i * 279;
-                    FSkin.cracks.put(crackCount++, new TextureRegion(manager.get(f17.path(), Texture.class), x, y, 200, 279));
+                    Forge.getAssets().cracks.put(crackCount++, new TextureRegion(manager.get(f17.path(), Texture.class), x, y, 200, 279));
                 }
             }
 
             //borders
             manager.load(f10.path(), Texture.class);
             manager.finishLoadingAsset(f10.path());
-            FSkin.borders.put(0, new TextureRegion(manager.get(f10.path(), Texture.class), 2, 2, 672, 936));
-            FSkin.borders.put(1, new TextureRegion(manager.get(f10.path(), Texture.class), 676, 2, 672, 936));
+            Forge.getAssets().borders.put(0, new TextureRegion(manager.get(f10.path(), Texture.class), 2, 2, 672, 936));
+            Forge.getAssets().borders.put(1, new TextureRegion(manager.get(f10.path(), Texture.class), 676, 2, 672, 936));
             //deckboxes
             manager.load(f13.path(), Texture.class, parameter);
             manager.finishLoadingAsset(f13.path());
             //gold bg
-            FSkin.deckbox.put(0, new TextureRegion(manager.get(f13.path(), Texture.class), 2, 2, 488, 680));
+            Forge.getAssets().deckbox.put(0, new TextureRegion(manager.get(f13.path(), Texture.class), 2, 2, 488, 680));
             //deck box for card art
-            FSkin.deckbox.put(1, new TextureRegion(manager.get(f13.path(), Texture.class), 492, 2, 488, 680));
+            Forge.getAssets().deckbox.put(1, new TextureRegion(manager.get(f13.path(), Texture.class), 492, 2, 488, 680));
             //generic deck box
-            FSkin.deckbox.put(2, new TextureRegion(manager.get(f13.path(), Texture.class), 982, 2, 488, 680));
+            Forge.getAssets().deckbox.put(2, new TextureRegion(manager.get(f13.path(), Texture.class), 982, 2, 488, 680));
             //cursor
             manager.load(f19.path(), Texture.class);
             manager.finishLoadingAsset(f19.path());
-            FSkin.cursor.put(0, new TextureRegion(manager.get(f19.path(), Texture.class), 0, 0, 32, 32)); //default
-            FSkin.cursor.put(1, new TextureRegion(manager.get(f19.path(), Texture.class), 32, 0, 32, 32)); //magnify on
-            FSkin.cursor.put(2, new TextureRegion(manager.get(f19.path(), Texture.class), 64, 0, 32, 32)); // magnify off
+            Forge.getAssets().cursor.put(0, new TextureRegion(manager.get(f19.path(), Texture.class), 0, 0, 32, 32)); //default
+            Forge.getAssets().cursor.put(1, new TextureRegion(manager.get(f19.path(), Texture.class), 32, 0, 32, 32)); //magnify on
+            Forge.getAssets().cursor.put(2, new TextureRegion(manager.get(f19.path(), Texture.class), 64, 0, 32, 32)); // magnify off
 
-            Forge.setCursor(cursor.get(0), "0");
+            Forge.setCursor(Forge.getAssets().cursor.get(0), "0");
 
             preferredIcons.dispose();
             pxDefaultAvatars.dispose();
@@ -523,31 +506,31 @@ public class FSkin {
     }
 
     public static Map<FSkinProp, FSkinImage> getImages() {
-        return images;
+        return Forge.getAssets().images;
     }
 
     public static Map<Integer, TextureRegion> getAvatars() {
-        return avatars;
+        return Forge.getAssets().avatars;
     }
 
     public static Map<Integer, TextureRegion> getSleeves() {
-        return sleeves;
+        return Forge.getAssets().sleeves;
     }
 
     public static Map<Integer, TextureRegion> getCracks() {
-        return cracks;
+        return Forge.getAssets().cracks;
     }
 
     public static Map<Integer, TextureRegion> getBorders() {
-        return borders;
+        return Forge.getAssets().borders;
     }
 
     public static Map<Integer, TextureRegion> getDeckbox() {
-        return deckbox;
+        return Forge.getAssets().deckbox;
     }
 
     public static Map<Integer, TextureRegion> getCursor() {
-        return cursor;
+        return Forge.getAssets().cursor;
     }
 
     public static boolean isLoaded() { return loaded; }
diff --git a/forge-gui-mobile/src/forge/assets/TextRenderer.java b/forge-gui-mobile/src/forge/assets/TextRenderer.java
index 231e16cfc66..f42c6f9a1b4 100644
--- a/forge-gui-mobile/src/forge/assets/TextRenderer.java
+++ b/forge-gui-mobile/src/forge/assets/TextRenderer.java
@@ -2,10 +2,8 @@ package forge.assets;
 
 import java.text.BreakIterator;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.utils.Align;
@@ -20,64 +18,63 @@ import forge.util.TextBounds;
 
 //Encodes text for drawing with symbols and reminder text
 public class TextRenderer {
-    private static final Map<String, FSkinImage> symbolLookup = new HashMap<>(64);
     static {
-        symbolLookup.put("C", FSkinImage.MANA_COLORLESS);
-        symbolLookup.put("W", FSkinImage.MANA_W);
-        symbolLookup.put("U", FSkinImage.MANA_U);
-        symbolLookup.put("B", FSkinImage.MANA_B);
-        symbolLookup.put("R", FSkinImage.MANA_R);
-        symbolLookup.put("G", FSkinImage.MANA_G);
-        symbolLookup.put("W/U", FSkinImage.MANA_HYBRID_WU);
-        symbolLookup.put("U/B", FSkinImage.MANA_HYBRID_UB);
-        symbolLookup.put("B/R", FSkinImage.MANA_HYBRID_BR);
-        symbolLookup.put("R/G", FSkinImage.MANA_HYBRID_RG);
-        symbolLookup.put("G/W", FSkinImage.MANA_HYBRID_GW);
-        symbolLookup.put("W/B", FSkinImage.MANA_HYBRID_WB);
-        symbolLookup.put("U/R", FSkinImage.MANA_HYBRID_UR);
-        symbolLookup.put("B/G", FSkinImage.MANA_HYBRID_BG);
-        symbolLookup.put("R/W", FSkinImage.MANA_HYBRID_RW);
-        symbolLookup.put("G/U", FSkinImage.MANA_HYBRID_GU);
-        symbolLookup.put("2/W", FSkinImage.MANA_2W);
-        symbolLookup.put("2/U", FSkinImage.MANA_2U);
-        symbolLookup.put("2/B", FSkinImage.MANA_2B);
-        symbolLookup.put("2/R", FSkinImage.MANA_2R);
-        symbolLookup.put("2/G", FSkinImage.MANA_2G);
-        symbolLookup.put("P", FSkinImage.MANA_PHRYX);
-        symbolLookup.put("P/W", FSkinImage.MANA_PHRYX_W);
-        symbolLookup.put("P/U", FSkinImage.MANA_PHRYX_U);
-        symbolLookup.put("P/B", FSkinImage.MANA_PHRYX_B);
-        symbolLookup.put("P/R", FSkinImage.MANA_PHRYX_R);
-        symbolLookup.put("P/G", FSkinImage.MANA_PHRYX_G);
-        symbolLookup.put("W/P", FSkinImage.MANA_PHRYX_W);
-        symbolLookup.put("U/P", FSkinImage.MANA_PHRYX_U);
-        symbolLookup.put("B/P", FSkinImage.MANA_PHRYX_B);
-        symbolLookup.put("R/P", FSkinImage.MANA_PHRYX_R);
-        symbolLookup.put("G/P", FSkinImage.MANA_PHRYX_G);
-        symbolLookup.put("P/B/G", FSkinImage.MANA_PHRYX_BG);
-        symbolLookup.put("P/B/R", FSkinImage.MANA_PHRYX_BR);
-        symbolLookup.put("P/G/U", FSkinImage.MANA_PHRYX_GU);
-        symbolLookup.put("P/G/W", FSkinImage.MANA_PHRYX_GW);
-        symbolLookup.put("P/R/G", FSkinImage.MANA_PHRYX_RG);
-        symbolLookup.put("P/R/W", FSkinImage.MANA_PHRYX_RW);
-        symbolLookup.put("P/U/B", FSkinImage.MANA_PHRYX_UB);
-        symbolLookup.put("P/U/R", FSkinImage.MANA_PHRYX_UR);
-        symbolLookup.put("P/W/B", FSkinImage.MANA_PHRYX_WB);
-        symbolLookup.put("P/W/U", FSkinImage.MANA_PHRYX_WU);
+        Forge.getAssets().symbolLookup.put("C", FSkinImage.MANA_COLORLESS);
+        Forge.getAssets().symbolLookup.put("W", FSkinImage.MANA_W);
+        Forge.getAssets().symbolLookup.put("U", FSkinImage.MANA_U);
+        Forge.getAssets().symbolLookup.put("B", FSkinImage.MANA_B);
+        Forge.getAssets().symbolLookup.put("R", FSkinImage.MANA_R);
+        Forge.getAssets().symbolLookup.put("G", FSkinImage.MANA_G);
+        Forge.getAssets().symbolLookup.put("W/U", FSkinImage.MANA_HYBRID_WU);
+        Forge.getAssets().symbolLookup.put("U/B", FSkinImage.MANA_HYBRID_UB);
+        Forge.getAssets().symbolLookup.put("B/R", FSkinImage.MANA_HYBRID_BR);
+        Forge.getAssets().symbolLookup.put("R/G", FSkinImage.MANA_HYBRID_RG);
+        Forge.getAssets().symbolLookup.put("G/W", FSkinImage.MANA_HYBRID_GW);
+        Forge.getAssets().symbolLookup.put("W/B", FSkinImage.MANA_HYBRID_WB);
+        Forge.getAssets().symbolLookup.put("U/R", FSkinImage.MANA_HYBRID_UR);
+        Forge.getAssets().symbolLookup.put("B/G", FSkinImage.MANA_HYBRID_BG);
+        Forge.getAssets().symbolLookup.put("R/W", FSkinImage.MANA_HYBRID_RW);
+        Forge.getAssets().symbolLookup.put("G/U", FSkinImage.MANA_HYBRID_GU);
+        Forge.getAssets().symbolLookup.put("2/W", FSkinImage.MANA_2W);
+        Forge.getAssets().symbolLookup.put("2/U", FSkinImage.MANA_2U);
+        Forge.getAssets().symbolLookup.put("2/B", FSkinImage.MANA_2B);
+        Forge.getAssets().symbolLookup.put("2/R", FSkinImage.MANA_2R);
+        Forge.getAssets().symbolLookup.put("2/G", FSkinImage.MANA_2G);
+        Forge.getAssets().symbolLookup.put("P", FSkinImage.MANA_PHRYX);
+        Forge.getAssets().symbolLookup.put("P/W", FSkinImage.MANA_PHRYX_W);
+        Forge.getAssets().symbolLookup.put("P/U", FSkinImage.MANA_PHRYX_U);
+        Forge.getAssets().symbolLookup.put("P/B", FSkinImage.MANA_PHRYX_B);
+        Forge.getAssets().symbolLookup.put("P/R", FSkinImage.MANA_PHRYX_R);
+        Forge.getAssets().symbolLookup.put("P/G", FSkinImage.MANA_PHRYX_G);
+        Forge.getAssets().symbolLookup.put("W/P", FSkinImage.MANA_PHRYX_W);
+        Forge.getAssets().symbolLookup.put("U/P", FSkinImage.MANA_PHRYX_U);
+        Forge.getAssets().symbolLookup.put("B/P", FSkinImage.MANA_PHRYX_B);
+        Forge.getAssets().symbolLookup.put("R/P", FSkinImage.MANA_PHRYX_R);
+        Forge.getAssets().symbolLookup.put("G/P", FSkinImage.MANA_PHRYX_G);
+        Forge.getAssets().symbolLookup.put("P/B/G", FSkinImage.MANA_PHRYX_BG);
+        Forge.getAssets().symbolLookup.put("P/B/R", FSkinImage.MANA_PHRYX_BR);
+        Forge.getAssets().symbolLookup.put("P/G/U", FSkinImage.MANA_PHRYX_GU);
+        Forge.getAssets().symbolLookup.put("P/G/W", FSkinImage.MANA_PHRYX_GW);
+        Forge.getAssets().symbolLookup.put("P/R/G", FSkinImage.MANA_PHRYX_RG);
+        Forge.getAssets().symbolLookup.put("P/R/W", FSkinImage.MANA_PHRYX_RW);
+        Forge.getAssets().symbolLookup.put("P/U/B", FSkinImage.MANA_PHRYX_UB);
+        Forge.getAssets().symbolLookup.put("P/U/R", FSkinImage.MANA_PHRYX_UR);
+        Forge.getAssets().symbolLookup.put("P/W/B", FSkinImage.MANA_PHRYX_WB);
+        Forge.getAssets().symbolLookup.put("P/W/U", FSkinImage.MANA_PHRYX_WU);
         for (int i = 0; i <= 20; i++) {
-            symbolLookup.put(String.valueOf(i), FSkinImage.valueOf("MANA_" + i));
+            Forge.getAssets().symbolLookup.put(String.valueOf(i), FSkinImage.valueOf("MANA_" + i));
         }
-        symbolLookup.put("X", FSkinImage.MANA_X);
-        symbolLookup.put("Y", FSkinImage.MANA_Y);
-        symbolLookup.put("Z", FSkinImage.MANA_Z);
-        symbolLookup.put("CHAOS", FSkinImage.CHAOS);
-        symbolLookup.put("Q", FSkinImage.UNTAP);
-        symbolLookup.put("S", FSkinImage.MANA_SNOW);
-        symbolLookup.put("T", FSkinImage.TAP);
-        symbolLookup.put("E", FSkinImage.ENERGY);
-        symbolLookup.put("AE", FSkinImage.AETHER_SHARD);
-        symbolLookup.put("PW", FSkinImage.PW_BADGE_COMMON);
-        symbolLookup.put("CR", FSkinImage.QUEST_COINSTACK);
+        Forge.getAssets().symbolLookup.put("X", FSkinImage.MANA_X);
+        Forge.getAssets().symbolLookup.put("Y", FSkinImage.MANA_Y);
+        Forge.getAssets().symbolLookup.put("Z", FSkinImage.MANA_Z);
+        Forge.getAssets().symbolLookup.put("CHAOS", FSkinImage.CHAOS);
+        Forge.getAssets().symbolLookup.put("Q", FSkinImage.UNTAP);
+        Forge.getAssets().symbolLookup.put("S", FSkinImage.MANA_SNOW);
+        Forge.getAssets().symbolLookup.put("T", FSkinImage.TAP);
+        Forge.getAssets().symbolLookup.put("E", FSkinImage.ENERGY);
+        Forge.getAssets().symbolLookup.put("AE", FSkinImage.AETHER_SHARD);
+        Forge.getAssets().symbolLookup.put("PW", FSkinImage.PW_BADGE_COMMON);
+        Forge.getAssets().symbolLookup.put("CR", FSkinImage.QUEST_COINSTACK);
     }
 
     public static String startColor(Color color) {
@@ -192,7 +189,7 @@ public class TextRenderer {
                 if (inSymbolCount > 0) {
                     inSymbolCount--;
                     if (text.length() > 0) {
-                        FSkinImage symbol = symbolLookup.get(text.toString());
+                        FSkinImage symbol = Forge.getAssets().symbolLookup.get(text.toString());
                         if (symbol != null) {
                             pieceWidth = lineHeight * CardFaceSymbols.FONT_SIZE_FACTOR;
                             if (x + pieceWidth > width) {
diff --git a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
index 4c73a945404..bedbc659fc4 100644
--- a/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
+++ b/forge-gui-mobile/src/forge/card/CardFaceSymbols.java
@@ -17,10 +17,9 @@
  */
 package forge.card;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.StringTokenizer;
 
+import forge.Forge;
 import forge.Graphics;
 import forge.assets.FSkinImage;
 import forge.card.mana.ManaCost;
@@ -30,141 +29,140 @@ import forge.gui.error.BugReporter;
 
 public class CardFaceSymbols {
     public static final float FONT_SIZE_FACTOR = 0.85f;
-    private static final Map<String, FSkinImage> MANA_IMAGES = new HashMap<>(128);
 
     public static void loadImages() {
         for (int i = 0; i <= 20; i++) {
-            MANA_IMAGES.put(String.valueOf(i), FSkinImage.valueOf("MANA_" + i));
+            Forge.getAssets().MANA_IMAGES.put(String.valueOf(i), FSkinImage.valueOf("MANA_" + i));
         }
-        MANA_IMAGES.put("X", FSkinImage.MANA_X);
-        MANA_IMAGES.put("Y", FSkinImage.MANA_Y);
-        MANA_IMAGES.put("Z", FSkinImage.MANA_Z);
+        Forge.getAssets().MANA_IMAGES.put("X", FSkinImage.MANA_X);
+        Forge.getAssets().MANA_IMAGES.put("Y", FSkinImage.MANA_Y);
+        Forge.getAssets().MANA_IMAGES.put("Z", FSkinImage.MANA_Z);
 
-        MANA_IMAGES.put("C", FSkinImage.MANA_COLORLESS);
-        MANA_IMAGES.put("B", FSkinImage.MANA_B);
-        MANA_IMAGES.put("BG", FSkinImage.MANA_HYBRID_BG);
-        MANA_IMAGES.put("BR", FSkinImage.MANA_HYBRID_BR);
-        MANA_IMAGES.put("G", FSkinImage.MANA_G);
-        MANA_IMAGES.put("GU", FSkinImage.MANA_HYBRID_GU);
-        MANA_IMAGES.put("GW", FSkinImage.MANA_HYBRID_GW);
-        MANA_IMAGES.put("R", FSkinImage.MANA_R);
-        MANA_IMAGES.put("RG", FSkinImage.MANA_HYBRID_RG);
-        MANA_IMAGES.put("RW", FSkinImage.MANA_HYBRID_RW);
-        MANA_IMAGES.put("U", FSkinImage.MANA_U);
-        MANA_IMAGES.put("UB", FSkinImage.MANA_HYBRID_UB);
-        MANA_IMAGES.put("UR", FSkinImage.MANA_HYBRID_UR);
-        MANA_IMAGES.put("W", FSkinImage.MANA_W);
-        MANA_IMAGES.put("WB", FSkinImage.MANA_HYBRID_WB);
-        MANA_IMAGES.put("WU", FSkinImage.MANA_HYBRID_WU);
-        MANA_IMAGES.put("P", FSkinImage.MANA_PHRYX);
-        MANA_IMAGES.put("PW", FSkinImage.MANA_PHRYX_W);
-        MANA_IMAGES.put("PR", FSkinImage.MANA_PHRYX_R);
-        MANA_IMAGES.put("PU", FSkinImage.MANA_PHRYX_U);
-        MANA_IMAGES.put("PB", FSkinImage.MANA_PHRYX_B);
-        MANA_IMAGES.put("PG", FSkinImage.MANA_PHRYX_G);
-        MANA_IMAGES.put("PBG", FSkinImage.MANA_PHRYX_BG);
-        MANA_IMAGES.put("PBR", FSkinImage.MANA_PHRYX_BR);
-        MANA_IMAGES.put("PGU", FSkinImage.MANA_PHRYX_GU);
-        MANA_IMAGES.put("PGW", FSkinImage.MANA_PHRYX_GW);
-        MANA_IMAGES.put("PRG", FSkinImage.MANA_PHRYX_RG);
-        MANA_IMAGES.put("PRW", FSkinImage.MANA_PHRYX_RW);
-        MANA_IMAGES.put("PUB", FSkinImage.MANA_PHRYX_UB);
-        MANA_IMAGES.put("PUR", FSkinImage.MANA_PHRYX_UR);
-        MANA_IMAGES.put("PWB", FSkinImage.MANA_PHRYX_WB);
-        MANA_IMAGES.put("PWU", FSkinImage.MANA_PHRYX_WU);
-        MANA_IMAGES.put("2W", FSkinImage.MANA_2W);
-        MANA_IMAGES.put("2U", FSkinImage.MANA_2U);
-        MANA_IMAGES.put("2R", FSkinImage.MANA_2R);
-        MANA_IMAGES.put("2G", FSkinImage.MANA_2G);
-        MANA_IMAGES.put("2B", FSkinImage.MANA_2B);
+        Forge.getAssets().MANA_IMAGES.put("C", FSkinImage.MANA_COLORLESS);
+        Forge.getAssets().MANA_IMAGES.put("B", FSkinImage.MANA_B);
+        Forge.getAssets().MANA_IMAGES.put("BG", FSkinImage.MANA_HYBRID_BG);
+        Forge.getAssets().MANA_IMAGES.put("BR", FSkinImage.MANA_HYBRID_BR);
+        Forge.getAssets().MANA_IMAGES.put("G", FSkinImage.MANA_G);
+        Forge.getAssets().MANA_IMAGES.put("GU", FSkinImage.MANA_HYBRID_GU);
+        Forge.getAssets().MANA_IMAGES.put("GW", FSkinImage.MANA_HYBRID_GW);
+        Forge.getAssets().MANA_IMAGES.put("R", FSkinImage.MANA_R);
+        Forge.getAssets().MANA_IMAGES.put("RG", FSkinImage.MANA_HYBRID_RG);
+        Forge.getAssets().MANA_IMAGES.put("RW", FSkinImage.MANA_HYBRID_RW);
+        Forge.getAssets().MANA_IMAGES.put("U", FSkinImage.MANA_U);
+        Forge.getAssets().MANA_IMAGES.put("UB", FSkinImage.MANA_HYBRID_UB);
+        Forge.getAssets().MANA_IMAGES.put("UR", FSkinImage.MANA_HYBRID_UR);
+        Forge.getAssets().MANA_IMAGES.put("W", FSkinImage.MANA_W);
+        Forge.getAssets().MANA_IMAGES.put("WB", FSkinImage.MANA_HYBRID_WB);
+        Forge.getAssets().MANA_IMAGES.put("WU", FSkinImage.MANA_HYBRID_WU);
+        Forge.getAssets().MANA_IMAGES.put("P", FSkinImage.MANA_PHRYX);
+        Forge.getAssets().MANA_IMAGES.put("PW", FSkinImage.MANA_PHRYX_W);
+        Forge.getAssets().MANA_IMAGES.put("PR", FSkinImage.MANA_PHRYX_R);
+        Forge.getAssets().MANA_IMAGES.put("PU", FSkinImage.MANA_PHRYX_U);
+        Forge.getAssets().MANA_IMAGES.put("PB", FSkinImage.MANA_PHRYX_B);
+        Forge.getAssets().MANA_IMAGES.put("PG", FSkinImage.MANA_PHRYX_G);
+        Forge.getAssets().MANA_IMAGES.put("PBG", FSkinImage.MANA_PHRYX_BG);
+        Forge.getAssets().MANA_IMAGES.put("PBR", FSkinImage.MANA_PHRYX_BR);
+        Forge.getAssets().MANA_IMAGES.put("PGU", FSkinImage.MANA_PHRYX_GU);
+        Forge.getAssets().MANA_IMAGES.put("PGW", FSkinImage.MANA_PHRYX_GW);
+        Forge.getAssets().MANA_IMAGES.put("PRG", FSkinImage.MANA_PHRYX_RG);
+        Forge.getAssets().MANA_IMAGES.put("PRW", FSkinImage.MANA_PHRYX_RW);
+        Forge.getAssets().MANA_IMAGES.put("PUB", FSkinImage.MANA_PHRYX_UB);
+        Forge.getAssets().MANA_IMAGES.put("PUR", FSkinImage.MANA_PHRYX_UR);
+        Forge.getAssets().MANA_IMAGES.put("PWB", FSkinImage.MANA_PHRYX_WB);
+        Forge.getAssets().MANA_IMAGES.put("PWU", FSkinImage.MANA_PHRYX_WU);
+        Forge.getAssets().MANA_IMAGES.put("2W", FSkinImage.MANA_2W);
+        Forge.getAssets().MANA_IMAGES.put("2U", FSkinImage.MANA_2U);
+        Forge.getAssets().MANA_IMAGES.put("2R", FSkinImage.MANA_2R);
+        Forge.getAssets().MANA_IMAGES.put("2G", FSkinImage.MANA_2G);
+        Forge.getAssets().MANA_IMAGES.put("2B", FSkinImage.MANA_2B);
 
-        MANA_IMAGES.put("S", FSkinImage.MANA_SNOW);
-        MANA_IMAGES.put("T", FSkinImage.TAP);
-        MANA_IMAGES.put("E", FSkinImage.ENERGY);
-        MANA_IMAGES.put("slash", FSkinImage.SLASH);
-        MANA_IMAGES.put("attack", FSkinImage.ATTACK);
-        MANA_IMAGES.put("defend", FSkinImage.DEFEND);
-        MANA_IMAGES.put("summonsick", FSkinImage.SUMMONSICK);
-        MANA_IMAGES.put("phasing", FSkinImage.PHASING);
-        MANA_IMAGES.put("sacrifice", FSkinImage.COSTRESERVED);
-        MANA_IMAGES.put("counters1", FSkinImage.COUNTERS1);
-        MANA_IMAGES.put("counters2", FSkinImage.COUNTERS2);
-        MANA_IMAGES.put("counters3", FSkinImage.COUNTERS3);
-        MANA_IMAGES.put("countersMulti", FSkinImage.COUNTERS_MULTI);
+        Forge.getAssets().MANA_IMAGES.put("S", FSkinImage.MANA_SNOW);
+        Forge.getAssets().MANA_IMAGES.put("T", FSkinImage.TAP);
+        Forge.getAssets().MANA_IMAGES.put("E", FSkinImage.ENERGY);
+        Forge.getAssets().MANA_IMAGES.put("slash", FSkinImage.SLASH);
+        Forge.getAssets().MANA_IMAGES.put("attack", FSkinImage.ATTACK);
+        Forge.getAssets().MANA_IMAGES.put("defend", FSkinImage.DEFEND);
+        Forge.getAssets().MANA_IMAGES.put("summonsick", FSkinImage.SUMMONSICK);
+        Forge.getAssets().MANA_IMAGES.put("phasing", FSkinImage.PHASING);
+        Forge.getAssets().MANA_IMAGES.put("sacrifice", FSkinImage.COSTRESERVED);
+        Forge.getAssets().MANA_IMAGES.put("counters1", FSkinImage.COUNTERS1);
+        Forge.getAssets().MANA_IMAGES.put("counters2", FSkinImage.COUNTERS2);
+        Forge.getAssets().MANA_IMAGES.put("counters3", FSkinImage.COUNTERS3);
+        Forge.getAssets().MANA_IMAGES.put("countersMulti", FSkinImage.COUNTERS_MULTI);
 
-        MANA_IMAGES.put("foil01", FSkinImage.FOIL_01);
-        MANA_IMAGES.put("foil02", FSkinImage.FOIL_02);
-        MANA_IMAGES.put("foil03", FSkinImage.FOIL_03);
-        MANA_IMAGES.put("foil04", FSkinImage.FOIL_04);
-        MANA_IMAGES.put("foil05", FSkinImage.FOIL_05);
-        MANA_IMAGES.put("foil06", FSkinImage.FOIL_06);
-        MANA_IMAGES.put("foil07", FSkinImage.FOIL_07);
-        MANA_IMAGES.put("foil08", FSkinImage.FOIL_08);
-        MANA_IMAGES.put("foil09", FSkinImage.FOIL_09);
-        MANA_IMAGES.put("foil10", FSkinImage.FOIL_10);
+        Forge.getAssets().MANA_IMAGES.put("foil01", FSkinImage.FOIL_01);
+        Forge.getAssets().MANA_IMAGES.put("foil02", FSkinImage.FOIL_02);
+        Forge.getAssets().MANA_IMAGES.put("foil03", FSkinImage.FOIL_03);
+        Forge.getAssets().MANA_IMAGES.put("foil04", FSkinImage.FOIL_04);
+        Forge.getAssets().MANA_IMAGES.put("foil05", FSkinImage.FOIL_05);
+        Forge.getAssets().MANA_IMAGES.put("foil06", FSkinImage.FOIL_06);
+        Forge.getAssets().MANA_IMAGES.put("foil07", FSkinImage.FOIL_07);
+        Forge.getAssets().MANA_IMAGES.put("foil08", FSkinImage.FOIL_08);
+        Forge.getAssets().MANA_IMAGES.put("foil09", FSkinImage.FOIL_09);
+        Forge.getAssets().MANA_IMAGES.put("foil10", FSkinImage.FOIL_10);
 
-        MANA_IMAGES.put("foil11", FSkinImage.FOIL_11);
-        MANA_IMAGES.put("foil12", FSkinImage.FOIL_12);
-        MANA_IMAGES.put("foil13", FSkinImage.FOIL_13);
-        MANA_IMAGES.put("foil14", FSkinImage.FOIL_14);
-        MANA_IMAGES.put("foil15", FSkinImage.FOIL_15);
-        MANA_IMAGES.put("foil16", FSkinImage.FOIL_16);
-        MANA_IMAGES.put("foil17", FSkinImage.FOIL_17);
-        MANA_IMAGES.put("foil18", FSkinImage.FOIL_18);
-        MANA_IMAGES.put("foil19", FSkinImage.FOIL_19);
-        MANA_IMAGES.put("foil20", FSkinImage.FOIL_20);
+        Forge.getAssets().MANA_IMAGES.put("foil11", FSkinImage.FOIL_11);
+        Forge.getAssets().MANA_IMAGES.put("foil12", FSkinImage.FOIL_12);
+        Forge.getAssets().MANA_IMAGES.put("foil13", FSkinImage.FOIL_13);
+        Forge.getAssets().MANA_IMAGES.put("foil14", FSkinImage.FOIL_14);
+        Forge.getAssets().MANA_IMAGES.put("foil15", FSkinImage.FOIL_15);
+        Forge.getAssets().MANA_IMAGES.put("foil16", FSkinImage.FOIL_16);
+        Forge.getAssets().MANA_IMAGES.put("foil17", FSkinImage.FOIL_17);
+        Forge.getAssets().MANA_IMAGES.put("foil18", FSkinImage.FOIL_18);
+        Forge.getAssets().MANA_IMAGES.put("foil19", FSkinImage.FOIL_19);
+        Forge.getAssets().MANA_IMAGES.put("foil20", FSkinImage.FOIL_20);
 
-        MANA_IMAGES.put("commander", FSkinImage.IMG_ABILITY_COMMANDER);
+        Forge.getAssets().MANA_IMAGES.put("commander", FSkinImage.IMG_ABILITY_COMMANDER);
 
-        MANA_IMAGES.put("deathtouch", FSkinImage.IMG_ABILITY_DEATHTOUCH);
-        MANA_IMAGES.put("defender", FSkinImage.IMG_ABILITY_DEFENDER);
-        MANA_IMAGES.put("doublestrike", FSkinImage.IMG_ABILITY_DOUBLE_STRIKE);
-        MANA_IMAGES.put("firststrike", FSkinImage.IMG_ABILITY_FIRST_STRIKE);
-        MANA_IMAGES.put("fear", FSkinImage.IMG_ABILITY_FEAR);
-        MANA_IMAGES.put("flash", FSkinImage.IMG_ABILITY_FLASH);
-        MANA_IMAGES.put("flying", FSkinImage.IMG_ABILITY_FLYING);
-        MANA_IMAGES.put("haste", FSkinImage.IMG_ABILITY_HASTE);
-        MANA_IMAGES.put("hexproof", FSkinImage.IMG_ABILITY_HEXPROOF);
-        MANA_IMAGES.put("horsemanship", FSkinImage.IMG_ABILITY_HORSEMANSHIP);
-        MANA_IMAGES.put("indestructible", FSkinImage.IMG_ABILITY_INDESTRUCTIBLE);
-        MANA_IMAGES.put("intimidate", FSkinImage.IMG_ABILITY_INTIMIDATE);
-        MANA_IMAGES.put("landwalk", FSkinImage.IMG_ABILITY_LANDWALK);
-        MANA_IMAGES.put("lifelink", FSkinImage.IMG_ABILITY_LIFELINK);
-        MANA_IMAGES.put("menace", FSkinImage.IMG_ABILITY_MENACE);
-        MANA_IMAGES.put("reach", FSkinImage.IMG_ABILITY_REACH);
-        MANA_IMAGES.put("shadow", FSkinImage.IMG_ABILITY_SHADOW);
-        MANA_IMAGES.put("shroud", FSkinImage.IMG_ABILITY_SHROUD);
-        MANA_IMAGES.put("trample", FSkinImage.IMG_ABILITY_TRAMPLE);
-        MANA_IMAGES.put("vigilance", FSkinImage.IMG_ABILITY_VIGILANCE);
+        Forge.getAssets().MANA_IMAGES.put("deathtouch", FSkinImage.IMG_ABILITY_DEATHTOUCH);
+        Forge.getAssets().MANA_IMAGES.put("defender", FSkinImage.IMG_ABILITY_DEFENDER);
+        Forge.getAssets().MANA_IMAGES.put("doublestrike", FSkinImage.IMG_ABILITY_DOUBLE_STRIKE);
+        Forge.getAssets().MANA_IMAGES.put("firststrike", FSkinImage.IMG_ABILITY_FIRST_STRIKE);
+        Forge.getAssets().MANA_IMAGES.put("fear", FSkinImage.IMG_ABILITY_FEAR);
+        Forge.getAssets().MANA_IMAGES.put("flash", FSkinImage.IMG_ABILITY_FLASH);
+        Forge.getAssets().MANA_IMAGES.put("flying", FSkinImage.IMG_ABILITY_FLYING);
+        Forge.getAssets().MANA_IMAGES.put("haste", FSkinImage.IMG_ABILITY_HASTE);
+        Forge.getAssets().MANA_IMAGES.put("hexproof", FSkinImage.IMG_ABILITY_HEXPROOF);
+        Forge.getAssets().MANA_IMAGES.put("horsemanship", FSkinImage.IMG_ABILITY_HORSEMANSHIP);
+        Forge.getAssets().MANA_IMAGES.put("indestructible", FSkinImage.IMG_ABILITY_INDESTRUCTIBLE);
+        Forge.getAssets().MANA_IMAGES.put("intimidate", FSkinImage.IMG_ABILITY_INTIMIDATE);
+        Forge.getAssets().MANA_IMAGES.put("landwalk", FSkinImage.IMG_ABILITY_LANDWALK);
+        Forge.getAssets().MANA_IMAGES.put("lifelink", FSkinImage.IMG_ABILITY_LIFELINK);
+        Forge.getAssets().MANA_IMAGES.put("menace", FSkinImage.IMG_ABILITY_MENACE);
+        Forge.getAssets().MANA_IMAGES.put("reach", FSkinImage.IMG_ABILITY_REACH);
+        Forge.getAssets().MANA_IMAGES.put("shadow", FSkinImage.IMG_ABILITY_SHADOW);
+        Forge.getAssets().MANA_IMAGES.put("shroud", FSkinImage.IMG_ABILITY_SHROUD);
+        Forge.getAssets().MANA_IMAGES.put("trample", FSkinImage.IMG_ABILITY_TRAMPLE);
+        Forge.getAssets().MANA_IMAGES.put("vigilance", FSkinImage.IMG_ABILITY_VIGILANCE);
         //hexproof from
-        MANA_IMAGES.put("hexproofR", FSkinImage.IMG_ABILITY_HEXPROOF_R);
-        MANA_IMAGES.put("hexproofG", FSkinImage.IMG_ABILITY_HEXPROOF_G);
-        MANA_IMAGES.put("hexproofB", FSkinImage.IMG_ABILITY_HEXPROOF_B);
-        MANA_IMAGES.put("hexproofU", FSkinImage.IMG_ABILITY_HEXPROOF_U);
-        MANA_IMAGES.put("hexproofW", FSkinImage.IMG_ABILITY_HEXPROOF_W);
-        MANA_IMAGES.put("hexproofC", FSkinImage.IMG_ABILITY_HEXPROOF_C);
-        MANA_IMAGES.put("hexproofUB", FSkinImage.IMG_ABILITY_HEXPROOF_UB);
+        Forge.getAssets().MANA_IMAGES.put("hexproofR", FSkinImage.IMG_ABILITY_HEXPROOF_R);
+        Forge.getAssets().MANA_IMAGES.put("hexproofG", FSkinImage.IMG_ABILITY_HEXPROOF_G);
+        Forge.getAssets().MANA_IMAGES.put("hexproofB", FSkinImage.IMG_ABILITY_HEXPROOF_B);
+        Forge.getAssets().MANA_IMAGES.put("hexproofU", FSkinImage.IMG_ABILITY_HEXPROOF_U);
+        Forge.getAssets().MANA_IMAGES.put("hexproofW", FSkinImage.IMG_ABILITY_HEXPROOF_W);
+        Forge.getAssets().MANA_IMAGES.put("hexproofC", FSkinImage.IMG_ABILITY_HEXPROOF_C);
+        Forge.getAssets().MANA_IMAGES.put("hexproofUB", FSkinImage.IMG_ABILITY_HEXPROOF_UB);
         //token icon
-        MANA_IMAGES.put("token", FSkinImage.IMG_ABILITY_TOKEN);
+        Forge.getAssets().MANA_IMAGES.put("token", FSkinImage.IMG_ABILITY_TOKEN);
         //protection from
-        MANA_IMAGES.put("protectAll", FSkinImage.IMG_ABILITY_PROTECT_ALL);
-        MANA_IMAGES.put("protectB", FSkinImage.IMG_ABILITY_PROTECT_B);
-        MANA_IMAGES.put("protectBU", FSkinImage.IMG_ABILITY_PROTECT_BU);
-        MANA_IMAGES.put("protectBW", FSkinImage.IMG_ABILITY_PROTECT_BW);
-        MANA_IMAGES.put("protectColoredSpells", FSkinImage.IMG_ABILITY_PROTECT_COLOREDSPELLS);
-        MANA_IMAGES.put("protectG", FSkinImage.IMG_ABILITY_PROTECT_G);
-        MANA_IMAGES.put("protectGB", FSkinImage.IMG_ABILITY_PROTECT_GB);
-        MANA_IMAGES.put("protectGU", FSkinImage.IMG_ABILITY_PROTECT_GU);
-        MANA_IMAGES.put("protectGW", FSkinImage.IMG_ABILITY_PROTECT_GW);
-        MANA_IMAGES.put("protectGeneric", FSkinImage.IMG_ABILITY_PROTECT_GENERIC);
-        MANA_IMAGES.put("protectR", FSkinImage.IMG_ABILITY_PROTECT_R);
-        MANA_IMAGES.put("protectRB", FSkinImage.IMG_ABILITY_PROTECT_RB);
-        MANA_IMAGES.put("protectRG", FSkinImage.IMG_ABILITY_PROTECT_RG);
-        MANA_IMAGES.put("protectRU", FSkinImage.IMG_ABILITY_PROTECT_RU);
-        MANA_IMAGES.put("protectRW", FSkinImage.IMG_ABILITY_PROTECT_RW);
-        MANA_IMAGES.put("protectU", FSkinImage.IMG_ABILITY_PROTECT_U);
-        MANA_IMAGES.put("protectUW", FSkinImage.IMG_ABILITY_PROTECT_UW);
-        MANA_IMAGES.put("protectW", FSkinImage.IMG_ABILITY_PROTECT_W);
+        Forge.getAssets().MANA_IMAGES.put("protectAll", FSkinImage.IMG_ABILITY_PROTECT_ALL);
+        Forge.getAssets().MANA_IMAGES.put("protectB", FSkinImage.IMG_ABILITY_PROTECT_B);
+        Forge.getAssets().MANA_IMAGES.put("protectBU", FSkinImage.IMG_ABILITY_PROTECT_BU);
+        Forge.getAssets().MANA_IMAGES.put("protectBW", FSkinImage.IMG_ABILITY_PROTECT_BW);
+        Forge.getAssets().MANA_IMAGES.put("protectColoredSpells", FSkinImage.IMG_ABILITY_PROTECT_COLOREDSPELLS);
+        Forge.getAssets().MANA_IMAGES.put("protectG", FSkinImage.IMG_ABILITY_PROTECT_G);
+        Forge.getAssets().MANA_IMAGES.put("protectGB", FSkinImage.IMG_ABILITY_PROTECT_GB);
+        Forge.getAssets().MANA_IMAGES.put("protectGU", FSkinImage.IMG_ABILITY_PROTECT_GU);
+        Forge.getAssets().MANA_IMAGES.put("protectGW", FSkinImage.IMG_ABILITY_PROTECT_GW);
+        Forge.getAssets().MANA_IMAGES.put("protectGeneric", FSkinImage.IMG_ABILITY_PROTECT_GENERIC);
+        Forge.getAssets().MANA_IMAGES.put("protectR", FSkinImage.IMG_ABILITY_PROTECT_R);
+        Forge.getAssets().MANA_IMAGES.put("protectRB", FSkinImage.IMG_ABILITY_PROTECT_RB);
+        Forge.getAssets().MANA_IMAGES.put("protectRG", FSkinImage.IMG_ABILITY_PROTECT_RG);
+        Forge.getAssets().MANA_IMAGES.put("protectRU", FSkinImage.IMG_ABILITY_PROTECT_RU);
+        Forge.getAssets().MANA_IMAGES.put("protectRW", FSkinImage.IMG_ABILITY_PROTECT_RW);
+        Forge.getAssets().MANA_IMAGES.put("protectU", FSkinImage.IMG_ABILITY_PROTECT_U);
+        Forge.getAssets().MANA_IMAGES.put("protectUW", FSkinImage.IMG_ABILITY_PROTECT_UW);
+        Forge.getAssets().MANA_IMAGES.put("protectW", FSkinImage.IMG_ABILITY_PROTECT_W);
     }
 
     public static void drawManaCost(Graphics g, ManaCost manaCost, float x, float y, final float imageSize) {
@@ -228,7 +226,7 @@ public class CardFaceSymbols {
         StringTokenizer tok = new StringTokenizer(s, " ");
         while (tok.hasMoreTokens()) {
             String symbol = tok.nextToken();
-            FSkinImage image = MANA_IMAGES.get(symbol);
+            FSkinImage image = Forge.getAssets().MANA_IMAGES.get(symbol);
             if (image == null) {
                 BugReporter.reportBug("Symbol not recognized \"" + symbol + "\" in string: " + s);
                 continue;
@@ -245,7 +243,7 @@ public class CardFaceSymbols {
     }
 
     public static void drawSymbol(final String imageName, final Graphics g, final float x, final float y, final float w, final float h) {
-        g.drawImage(MANA_IMAGES.get(imageName), x, y, w, h);
+        g.drawImage(Forge.getAssets().MANA_IMAGES.get(imageName), x, y, w, h);
     }
 
     public static float getWidth(final ManaCost manaCost, float imageSize) {
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index b8acce7d277..a34b54d3ba3 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -88,7 +88,7 @@ public class CardRenderer {
         public void onImageFetched() {
             ImageCache.clear();
             if (clearCardArtCache) {
-                cardArtCache.remove(key);
+                Forge.getAssets().cardArtCache.remove(key);
             }
         }
     }
@@ -189,13 +189,12 @@ public class CardRenderer {
         return Math.round(MANA_SYMBOL_SIZE + FSkinFont.get(12).getLineHeight() + 3 * FList.PADDING + 1);
     }
 
-    private static final Map<String, FImageComplex> cardArtCache = new HashMap<>(1024);
     public static final float CARD_ART_RATIO = 1.302f;
     public static final float CARD_ART_HEIGHT_PERCENTAGE = 0.43f;
     private static List<String> classicModuleCardtoCrop = FileUtil.readFile(ForgeConstants.CLASSIC_MODULE_CARD_TO_CROP_FILE);
 
     public static void clearcardArtCache(){
-        cardArtCache.clear();
+        Forge.getAssets().cardArtCache.clear();
     }
 
     //extract card art from the given card
@@ -219,7 +218,7 @@ public class CardRenderer {
     }
 
     public static FImageComplex getCardArt(String imageKey, boolean isSplitCard, boolean isHorizontalCard, boolean isAftermathCard, boolean isSaga, boolean isClass, boolean isDungeon, boolean isFlipCard, boolean isPlanesWalker, boolean isModernFrame) {
-        FImageComplex cardArt = cardArtCache.get(imageKey);
+        FImageComplex cardArt = Forge.getAssets().cardArtCache.get(imageKey);
         boolean isClassicModule = imageKey != null && imageKey.length() > 2 && classicModuleCardtoCrop.contains(imageKey.substring(ImageKeys.CARD_PREFIX.length()).replace(".jpg", "").replace(".png", ""));
         if (cardArt == null) {
             Texture image = new RendererCachedCardImage(imageKey, true).getImage();
@@ -280,7 +279,7 @@ public class CardRenderer {
                             w *= artH / srcH;
                             h *= artW / srcW;
                             cardArt = new FRotatedImage(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h), true);
-                            cardArtCache.put(imageKey, cardArt);
+                            Forge.getAssets().cardArtCache.put(imageKey, cardArt);
                             return cardArt;
                         }
                     } else {
@@ -303,7 +302,7 @@ public class CardRenderer {
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
                 }
                 if (!CardImageRenderer.forgeArt.equals(cardArt))
-                    cardArtCache.put(imageKey, cardArt);
+                    Forge.getAssets().cardArtCache.put(imageKey, cardArt);
             }
         }
         //fix display for effect
@@ -313,13 +312,13 @@ public class CardRenderer {
     }
 
     public static FImageComplex getAftermathSecondCardArt(final String imageKey) {
-        FImageComplex cardArt = cardArtCache.get("Aftermath_second_"+imageKey);
+        FImageComplex cardArt = Forge.getAssets().cardArtCache.get("Aftermath_second_"+imageKey);
         if (cardArt == null) {
             Texture image = new CachedCardImage(imageKey) {
                 @Override
                 public void onImageFetched() {
                     ImageCache.clear();
-                    cardArtCache.remove("Aftermath_second_" + imageKey);
+                    Forge.getAssets().cardArtCache.remove("Aftermath_second_" + imageKey);
                 }
             }.getImage();
             if (image != null) {
@@ -339,20 +338,20 @@ public class CardRenderer {
 
                 }
                 if (!CardImageRenderer.forgeArt.equals(cardArt))
-                    cardArtCache.put("Aftermath_second_"+imageKey, cardArt);
+                    Forge.getAssets().cardArtCache.put("Aftermath_second_"+imageKey, cardArt);
             }
         }
         return cardArt;
     }
 
     public static FImageComplex getAlternateCardArt(final String imageKey, boolean isPlanesWalker) {
-        FImageComplex cardArt = cardArtCache.get("Alternate_"+imageKey);
+        FImageComplex cardArt = Forge.getAssets().cardArtCache.get("Alternate_"+imageKey);
         if (cardArt == null) {
             Texture image = new CachedCardImage(imageKey) {
                 @Override
                 public void onImageFetched() {
                     ImageCache.clear();
-                    cardArtCache.remove("Alternate_" + imageKey);
+                    Forge.getAssets().cardArtCache.remove("Alternate_" + imageKey);
                 }
             }.getImage();
             if (image != null) {
@@ -386,7 +385,7 @@ public class CardRenderer {
                     cardArt = new FTextureRegionImage(new TextureRegion(image, Math.round(x), Math.round(y), Math.round(w), Math.round(h)));
                 }
                 if (!CardImageRenderer.forgeArt.equals(cardArt))
-                    cardArtCache.put("Alternate_"+imageKey, cardArt);
+                    Forge.getAssets().cardArtCache.put("Alternate_"+imageKey, cardArt);
             }
         }
         return cardArt;
@@ -395,9 +394,9 @@ public class CardRenderer {
     public static FImageComplex getMeldCardParts(final String imageKey, boolean bottom) {
         FImageComplex cardArt;
         if (!bottom) {
-            cardArt = cardArtCache.get("Meld_primary_"+imageKey);
+            cardArt = Forge.getAssets().cardArtCache.get("Meld_primary_"+imageKey);
         } else {
-            cardArt = cardArtCache.get("Meld_secondary_"+imageKey);
+            cardArt = Forge.getAssets().cardArtCache.get("Meld_secondary_"+imageKey);
         }
 
         if (cardArt == null) {
@@ -405,8 +404,8 @@ public class CardRenderer {
                 @Override
                 public void onImageFetched() {
                     ImageCache.clear();
-                    cardArtCache.remove("Meld_primary_" + imageKey);
-                    cardArtCache.remove("Meld_secondary_" + imageKey);
+                    Forge.getAssets().cardArtCache.remove("Meld_primary_" + imageKey);
+                    Forge.getAssets().cardArtCache.remove("Meld_secondary_" + imageKey);
                 }
             }.getImage();
             if (image != null) {
@@ -421,9 +420,9 @@ public class CardRenderer {
 
                 }
                 if (!bottom && !CardImageRenderer.forgeArt.equals(cardArt))
-                    cardArtCache.put("Meld_primary_"+imageKey, cardArt);
+                    Forge.getAssets().cardArtCache.put("Meld_primary_"+imageKey, cardArt);
                 else if (!CardImageRenderer.forgeArt.equals(cardArt))
-                    cardArtCache.put("Meld_secondary_"+imageKey, cardArt);
+                    Forge.getAssets().cardArtCache.put("Meld_secondary_"+imageKey, cardArt);
             }
         }
         return cardArt;
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index ff8120b4520..7643d16d684 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -2,7 +2,6 @@ package forge.screens.match;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -74,8 +73,6 @@ public class MatchController extends AbstractGuiGame {
     private MatchController() { }
     public static final MatchController instance = new MatchController();
 
-    private static final Map<String, FImage> avatarImages = new HashMap<>();
-
     private static HostedMatch hostedMatch;
     private static MatchScreen view;
     private static GameState phaseGameState;
@@ -114,7 +111,7 @@ public class MatchController extends AbstractGuiGame {
 
     public static FImage getPlayerAvatar(final PlayerView p) {
         final String lp = p.getLobbyPlayerName();
-        FImage avatar = avatarImages.get(lp);
+        FImage avatar = Forge.getAssets().avatarImages.get(lp);
         if (avatar == null) {
             if (StringUtils.isEmpty(p.getAvatarCardImageKey())) {
                 avatar = new FTextureRegionImage(FSkin.getAvatars().get(p.getAvatarIndex()));
@@ -488,15 +485,13 @@ public class MatchController extends AbstractGuiGame {
     public void setSelectables(final Iterable<CardView> cards) {
         super.setSelectables(cards);
         // update zones on tabletop and floating zones - non-selectable cards may be rendered differently
-        FThreads.invokeInEdtNowOrLater(new Runnable() {
-            @Override public final void run() {
-                for (final PlayerView p : getGameView().getPlayers()) {
-                    if ( p.getCards(ZoneType.Battlefield) != null ) {
-                        updateCards(p.getCards(ZoneType.Battlefield));
-                    }
-                    if ( p.getCards(ZoneType.Hand) != null ) {
-                        updateCards(p.getCards(ZoneType.Hand));
-                    }
+        FThreads.invokeInEdtNowOrLater(() -> {
+            for (final PlayerView p : getGameView().getPlayers()) {
+                if ( p.getCards(ZoneType.Battlefield) != null ) {
+                    updateCards(p.getCards(ZoneType.Battlefield));
+                }
+                if ( p.getCards(ZoneType.Hand) != null ) {
+                    updateCards(p.getCards(ZoneType.Hand));
                 }
             }
         });
@@ -506,15 +501,13 @@ public class MatchController extends AbstractGuiGame {
     public void clearSelectables() {
         super.clearSelectables();
         // update zones on tabletop and floating zones - non-selectable cards may be rendered differently
-        FThreads.invokeInEdtNowOrLater(new Runnable() {
-            @Override public final void run() {
-                for (final PlayerView p : getGameView().getPlayers()) {
-                    if ( p.getCards(ZoneType.Battlefield) != null ) {
-                        updateCards(p.getCards(ZoneType.Battlefield));
-                    }
-                    if ( p.getCards(ZoneType.Hand) != null ) {
-                        updateCards(p.getCards(ZoneType.Hand));
-                    }
+        FThreads.invokeInEdtNowOrLater(() -> {
+            for (final PlayerView p : getGameView().getPlayers()) {
+                if ( p.getCards(ZoneType.Battlefield) != null ) {
+                    updateCards(p.getCards(ZoneType.Battlefield));
+                }
+                if ( p.getCards(ZoneType.Hand) != null ) {
+                    updateCards(p.getCards(ZoneType.Hand));
                 }
             }
         });
@@ -703,7 +696,7 @@ public class MatchController extends AbstractGuiGame {
 
     @Override
     public void setPlayerAvatar(final LobbyPlayer player, final IHasIcon ihi) {
-        avatarImages.put(player.getName(), ImageCache.getIcon(ihi));
+        Forge.getAssets().avatarImages.put(player.getName(), ImageCache.getIcon(ihi));
     }
 
     @Override

From 4b4d0b7cab19a690a107e12ced8c48d5bc0e1692 Mon Sep 17 00:00:00 2001
From: paulsnoops <paulhammerton1@hotmail.co.uk>
Date: Mon, 11 Jul 2022 13:42:40 +0100
Subject: [PATCH 280/309] Move MH2 rebalanced to J21

---
 forge-gui/res/editions/Jumpstart Historic Horizons.txt | 4 ++++
 forge-gui/res/editions/Modern Horizons 2.txt           | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/editions/Jumpstart Historic Horizons.txt b/forge-gui/res/editions/Jumpstart Historic Horizons.txt
index 9adc946bf70..a4fc22b816b 100644
--- a/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
+++ b/forge-gui/res/editions/Jumpstart Historic Horizons.txt	
@@ -794,5 +794,9 @@ ScryfallCode=J21
 786 L Mountain
 787 L Forest
 
+[rebalanced]
+A438 U A-Dragon's Rage Channeler @Martina Fackova
+A529 C A-Unholy Heat @Kari Christensen
+
 [tokens]
 u_8_8_kraken
diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt
index a5515edfbf6..4bbc7b682e3 100644
--- a/forge-gui/res/editions/Modern Horizons 2.txt	
+++ b/forge-gui/res/editions/Modern Horizons 2.txt	
@@ -522,10 +522,6 @@ ScryfallCode=MH2
 [bundle]
 492 R Yusri, Fortune's Flame @Evyn Fong
 
-[rebalanced]
-A121 U A-Dragon's Rage Channeler @Martina Fackova
-A145 C A-Unholy Heat @Kari Christensen
-
 [Lands]
 19 Arid Mesa|MH2|1
 1 Arid Mesa|MH2|2

From cf03361a623b3fd3cc1ae0e61c54b49608c45d95 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Mon, 11 Jul 2022 19:13:57 +0200
Subject: [PATCH 281/309] LastState: pass through from GameAction into
 ReplacementHandler

---
 .../main/java/forge/game/replacement/ReplacementHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 7ce788fd936..1ce46f5418e 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
@@ -44,6 +44,7 @@ import forge.game.ability.AbilityUtils;
 import forge.game.ability.ApiType;
 import forge.game.card.Card;
 import forge.game.card.CardCollection;
+import forge.game.card.CardCollectionView;
 import forge.game.card.CardDamageMap;
 import forge.game.card.CardState;
 import forge.game.card.CardTraitChanges;
@@ -351,8 +352,8 @@ public class ReplacementHandler {
                 tailend = tailend.getSubAbility();
             } while(tailend != null);
 
-            effectSA.setLastStateBattlefield(game.getLastStateBattlefield());
-            effectSA.setLastStateGraveyard(game.getLastStateGraveyard());
+            effectSA.setLastStateBattlefield((CardCollectionView) runParams.getOrDefault(AbilityKey.LastStateBattlefield, game.getLastStateBattlefield()));
+            effectSA.setLastStateGraveyard((CardCollectionView) runParams.getOrDefault(AbilityKey.LastStateBattlefield, game.getLastStateGraveyard()));
             if (replacementEffect.isIntrinsic()) {
                 effectSA.setIntrinsic(true);
                 effectSA.changeText();

From cb2fc04f6ab9968b0ea9caedae75dc4ed1d1f74f Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Mon, 11 Jul 2022 19:15:26 +0200
Subject: [PATCH 282/309] Performance fixes

---
 .../staticability/StaticAbilityContinuous.java     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 b9f957a509f..2fd7291fa80 100644
--- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
+++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
@@ -111,12 +111,18 @@ public final class StaticAbilityContinuous {
         final List<Player> affectedPlayers = StaticAbilityContinuous.getAffectedPlayers(stAb);
         final Game game = hostCard.getGame();
 
-        final StaticEffect se = game.getStaticEffects().getStaticEffect(stAb);
+        final StaticEffects effects = game.getStaticEffects();
+        final StaticEffect se = effects.getStaticEffect(stAb);
         se.setAffectedCards(affectedCards);
         se.setAffectedPlayers(affectedPlayers);
         se.setParams(params);
         se.setTimestamp(hostCard.getTimestamp());
 
+        // nothing more to do
+        if (stAb.hasParam("Affected") && affectedPlayers.isEmpty() && affectedCards.isEmpty()) {
+            return affectedCards;
+        }
+
         String addP = "";
         int powerBonus = 0;
         String addT = "";
@@ -161,7 +167,6 @@ public final class StaticAbilityContinuous {
 
         //Global rules changes
         if (layer == StaticAbilityLayer.RULES && params.containsKey("GlobalRule")) {
-            final StaticEffects effects = game.getStaticEffects();
             effects.setGlobalRuleChange(GlobalRuleChange.fromString(params.get("GlobalRule")));
         }
 
@@ -197,8 +202,6 @@ public final class StaticAbilityContinuous {
                 // update keywords with Chosen parts
                 final String hostCardUID = Integer.toString(hostCard.getId()); // Protection with "doesn't remove" effect
 
-                final ColorSet colorsYouCtrl = CardUtil.getColorsYouCtrl(controller);
-
                 Iterables.removeIf(addKeywords, new Predicate<String>() {
                     @Override
                     public boolean apply(String input) {
@@ -246,6 +249,8 @@ public final class StaticAbilityContinuous {
                         }
                         // two variants for Red vs. red in keyword
                         if (input.contains("ColorsYouCtrl") || input.contains("colorsYouCtrl")) {
+                            final ColorSet colorsYouCtrl = CardUtil.getColorsYouCtrl(controller);
+
                             for (byte color : colorsYouCtrl) {
                                 final String colorWord = MagicColor.toLongString(color);
                                 String y = input.replaceAll("ColorsYouCtrl", StringUtils.capitalize(colorWord));
@@ -718,6 +723,7 @@ public final class StaticAbilityContinuous {
             // add P/T bonus
             if (layer == StaticAbilityLayer.MODIFYPT) {
                 if (addP.contains("Affected")) {
+                    // TODO don't calculate these above if this gets used instead
                     powerBonus = AbilityUtils.calculateAmount(affectedCard, addP, stAb, true);
                 }
                 if (addT.contains("Affected")) {

From 3ac2f00f468ecc3fc3456a5b3b32c130608545a0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 10:23:17 +0800
Subject: [PATCH 283/309] prevent NPE

---
 forge-gui-mobile/src/forge/Forge.java    | 11 +++++++++--
 forge-gui-mobile/src/forge/Graphics.java | 20 ++++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index ad1d79681db..7a692d8cb6e 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -927,8 +927,15 @@ public class Forge implements ApplicationListener {
 
     @Override
     public void resume() {
-        Texture.setAssetManager(getAssets().manager);
-        needsUpdate = true;
+        try {
+            Texture.setAssetManager(getAssets().manager);
+            needsUpdate = true;
+        } catch (Exception e) {
+            //the application context must have been recreated from its last state.
+            //it could be triggered by the low memory on heap on android.
+            needsUpdate = false;
+            e.printStackTrace();
+        }
         if (MatchController.getHostedMatch() != null) {
             MatchController.getHostedMatch().resume();
         }
diff --git a/forge-gui-mobile/src/forge/Graphics.java b/forge-gui-mobile/src/forge/Graphics.java
index 48cba88cbcd..da4feba9f20 100644
--- a/forge-gui-mobile/src/forge/Graphics.java
+++ b/forge-gui-mobile/src/forge/Graphics.java
@@ -661,8 +661,10 @@ public class Graphics {
             drawRoundRect(2f, borderLining(borderColor.toString()), x, y, w, h, (h-w)/12);
             fillRoundRect(tintColor, x, y, w, h, (h-w)/12);
         } else {
-            image.draw(this, x, y, w, h);
-            fillRoundRect(borderColor, x, y, w, h, (h-w)/10);//show corners edges
+            if (image != null) {
+                image.draw(this, x, y, w, h);
+                fillRoundRect(borderColor, x, y, w, h, (h - w) / 10);//show corners edges
+            }
         }
         setAlphaComposite(oldalpha);
     }
@@ -672,10 +674,14 @@ public class Graphics {
         setAlphaComposite(oldalpha);
     }
     public void drawImage(FImage image, Color borderColor, float x, float y, float w, float h) {
+        if (image == null)
+            return;
         image.draw(this, x, y, w, h);
         fillRoundRect(borderColor, x+1, y+1, w-1.5f, h-1.5f, (h-w)/10);//used by zoom let some edges show...
     }
     public void drawAvatarImage(FImage image, float x, float y, float w, float h, boolean drawGrayscale) {
+        if (image == null)
+            return;
         if (!drawGrayscale) {
             image.draw(this, x, y, w, h);
         } else {
@@ -693,6 +699,8 @@ public class Graphics {
         }
     }
     public void drawCardImage(FImage image, TextureRegion damage_overlay, float x, float y, float w, float h, boolean drawGrayscale, boolean damaged) {
+        if (image == null)
+            return;
         if (!drawGrayscale) {
             image.draw(this, x, y, w, h);
             if (damage_overlay != null && damaged)
@@ -752,6 +760,8 @@ public class Graphics {
         }
     }
     public void drawGrayTransitionImage(FImage image, float x, float y, float w, float h, boolean withDarkOverlay, float percentage) {
+        if (image == null)
+            return;
         batch.end();
         shaderGrayscale.bind();
         shaderGrayscale.setUniformf("u_grayness", percentage);
@@ -839,6 +849,8 @@ public class Graphics {
         batch.begin();
     }
     public void drawWarpImage(FImage image, float x, float y, float w, float h, float time) {
+        if (image == null)
+            return;
         batch.end();
         shaderWarp.bind();
         shaderWarp.setUniformf("u_amount", 0.2f);
@@ -854,6 +866,8 @@ public class Graphics {
         batch.begin();
     }
     public void drawUnderWaterImage(FImage image, float x, float y, float w, float h, float time, boolean withDarkOverlay) {
+        if (image == null)
+            return;
         batch.end();
         shaderUnderwater.bind();
         shaderUnderwater.setUniformf("u_amount", 10f*time);
@@ -893,6 +907,8 @@ public class Graphics {
         drawImage(image, x, y, w, h, false);
     }
     public void drawImage(FImage image, float x, float y, float w, float h, boolean withDarkOverlay) {
+        if (image == null)
+            return;
         image.draw(this, x, y, w, h);
         if(withDarkOverlay){
             float oldalpha = alphaComposite;

From 3a061ae3be1fbc243decea3c8a07c06c88da4ba0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 11:22:40 +0800
Subject: [PATCH 284/309] update ImageFetcher and setlookup - use
 newWorkStealingPool - update setlookup method

---
 forge-core/src/main/java/forge/ImageKeys.java | 41 +++++++++----------
 .../src/main/java/forge/util/ThreadUtil.java  | 21 ++++++++++
 .../main/java/forge/util/ImageFetcher.java    | 10 +++--
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index a1ac75b988b..7511bcf0604 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -173,16 +173,12 @@ public final class ImageKeys {
                 }
                 //setlookup
                 if (hasSetLookup(filename)) {
-                    //delay processing so gui is responsive
-                    ThreadUtil.delay(60, new Runnable() {
-                        @Override
-                        public void run() {
-                            File f = setLookUpFile(filename, fullborderFile);
-                            if (f != null)
-                                cachedCards.put(filename, f);
-                            else //is null
-                                missingCards.add(filename);
-                        }
+                    ThreadUtil.getServicePool().submit(() -> {
+                        File f = setLookUpFile(filename, fullborderFile);
+                        if (f != null)
+                            cachedCards.put(filename, f);
+                        else //is null
+                            missingCards.add(filename);
                     });
                 }
             }
@@ -283,27 +279,30 @@ public final class ImageKeys {
                     for (String setLookup : StaticData.instance().getSetLookup().get(setKey)) {
                         String lookupDirectory = CACHE_CARD_PICS_DIR + setLookup;
                         File f = new File(lookupDirectory);
-                        String[] cardNames = f.list();
-                        if (cardNames != null) {
-                            Set<String> cardList = new HashSet<>(Arrays.asList(cardNames));
+                        if (f.exists() && f.isDirectory()) {
                             for (String ext : FILE_EXTENSIONS) {
                                 if (ext.equals(""))
                                     continue;
+                                File placeholder;
                                 String fb1 = fullborderFile.replace(setKey+"/","")+ext;
-                                if (cardList.contains(fb1)) {
-                                    return new File(lookupDirectory+"/"+fb1);
+                                placeholder = new File(lookupDirectory+"/"+fb1);
+                                if (placeholder.exists()) {
+                                    return placeholder;
                                 }
                                 String fb2 = fullborderFile.replace(setKey+"/","").replaceAll("[0-9]*.fullborder", "1.fullborder")+ext;
-                                if (cardList.contains(fb2)) {
-                                    return new File(lookupDirectory+"/"+fb2);
+                                placeholder = new File(lookupDirectory+"/"+fb2);
+                                if (placeholder.exists()) {
+                                    return placeholder;
                                 }
                                 String f1 = filename.replace(setKey+"/","")+ext;
-                                if (cardList.contains(f1)) {
-                                    return new File(lookupDirectory+"/"+f1);
+                                placeholder = new File(lookupDirectory+"/"+f1);
+                                if (placeholder.exists()) {
+                                    return placeholder;
                                 }
                                 String f2 = filename.replace(setKey+"/","").replaceAll("[0-9]*.full", "1.full")+ext;
-                                if (cardList.contains(f2)) {
-                                    return new File(lookupDirectory+"/"+f2);
+                                placeholder = new File(lookupDirectory+"/"+f2);
+                                if (placeholder.exists()) {
+                                    return placeholder;
                                 }
                             }
                         }
diff --git a/forge-core/src/main/java/forge/util/ThreadUtil.java b/forge-core/src/main/java/forge/util/ThreadUtil.java
index 87e54edbc4c..c481816ff95 100644
--- a/forge-core/src/main/java/forge/util/ThreadUtil.java
+++ b/forge-core/src/main/java/forge/util/ThreadUtil.java
@@ -53,6 +53,27 @@ public class ThreadUtil {
         return Thread.currentThread().getName().startsWith("Game");
     }
 
+    private static ExecutorService service = Executors.newWorkStealingPool();
+    public static ExecutorService getServicePool() {
+        return service;
+    }
+    public static void refreshServicePool() {
+        service = Executors.newWorkStealingPool();
+    }
+    public static <T> T limit(Callable<T> task, long millis){
+        Future<T> future = null;
+        T result;
+        try {
+            future = service.submit(task);
+            result = future.get(millis, TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            result = null;
+        } finally {
+            if (future != null)
+                future.cancel(true);
+        }
+        return result;
+    }
     public static <T> T executeWithTimeout(Callable<T> task, int milliseconds) {
         ExecutorService executor = Executors.newCachedThreadPool();
         Future<T> future = executor.submit(task);
diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java
index f0f513f201f..da702c2c5da 100644
--- a/forge-gui/src/main/java/forge/util/ImageFetcher.java
+++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java
@@ -3,7 +3,7 @@ package forge.util;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
 
 import forge.card.CardEdition;
 import forge.item.IPaperCard;
@@ -18,7 +18,7 @@ import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
 
 public abstract class ImageFetcher {
-    private static final ExecutorService threadPool = Executors.newCachedThreadPool();
+    private static final ExecutorService threadPool = ThreadUtil.getServicePool();
     // see https://scryfall.com/docs/api/languages and
     // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
     private static final HashMap<String, String> langCodeMap = new HashMap<>();
@@ -167,7 +167,11 @@ public abstract class ImageFetcher {
                 currentFetches.remove(destPath);
             }
         };
-        threadPool.submit(getDownloadTask(downloadUrls.toArray(new String[0]), destPath, notifyObservers));
+        try {
+            threadPool.submit(getDownloadTask(downloadUrls.toArray(new String[0]), destPath, notifyObservers));
+        } catch (RejectedExecutionException re) {
+            re.printStackTrace();
+        }
     }
 
     protected abstract Runnable getDownloadTask(String[] toArray, String destPath, Runnable notifyObservers);

From 7874178f8b1a27742217cea21f7bd900b737b5ae Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 14:42:52 +0800
Subject: [PATCH 285/309] add stretchedArt for saga/class/dungeon

---
 forge-core/src/main/java/forge/ImageKeys.java |  6 ++-
 .../src/forge/card/CardImageRenderer.java     | 40 +++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index 7511bcf0604..0bf20419df8 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -31,6 +31,7 @@ public final class ImageKeys {
     private static Map<String, String> CACHE_CARD_PICS_SUBDIR;
 
     private static Map<String, Boolean> editionImageLookup = new HashMap<>();
+    private static Set<String> toFind = new HashSet<>();
 
     private static boolean isLibGDXPort = false;
 
@@ -110,7 +111,8 @@ public final class ImageKeys {
             filename = key;
             dir = CACHE_CARD_PICS_DIR;
         }
-
+        if (toFind.contains(filename))
+            return null;
         if (missingCards.contains(filename))
             return null;
 
@@ -173,12 +175,14 @@ public final class ImageKeys {
                 }
                 //setlookup
                 if (hasSetLookup(filename)) {
+                    toFind.add(filename);
                     ThreadUtil.getServicePool().submit(() -> {
                         File f = setLookUpFile(filename, fullborderFile);
                         if (f != null)
                             cachedCards.put(filename, f);
                         else //is null
                             missingCards.add(filename);
+                        toFind.remove(filename);
                     });
                 }
             }
diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index efdeab7f17c..499b049549c 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -52,6 +52,7 @@ public class CardImageRenderer {
         prevImageWidth = 0;
         prevImageHeight = 0;
         forgeArt.clear();
+        stretchedArt.clear();
     }
 
     private static void updateStaticFields(float w, float h) {
@@ -267,6 +268,7 @@ public class CardImageRenderer {
     }
 
     public static final FBufferedImage forgeArt;
+    private static final FBufferedImage stretchedArt;
     static {
         final float logoWidth = FSkinImage.LOGO.getWidth();
         final float logoHeight = FSkinImage.LOGO.getHeight();
@@ -280,9 +282,25 @@ public class CardImageRenderer {
                 g.drawImage(FSkinImage.LOGO, (w - logoWidth) / 2, (h - logoHeight) / 2, logoWidth, logoHeight);
             }
         };
+        stretchedArt = new FBufferedImage(w, h) {
+            @Override
+            protected void draw(Graphics g, float w, float h) {
+                g.drawImage(FSkinTexture.BG_TEXTURE, 0, 0, w, h);
+                g.fillRect(FScreen.TEXTURE_OVERLAY_COLOR, 0, 0, w, h);
+                g.drawImage(FSkinImage.LOGO, (w - logoWidth) / 2, ((h - logoHeight) / 2)+h/3.5f, logoWidth, logoHeight/3);
+            }
+        };
     }
 
     private static void drawArt(CardView cv, Graphics g, float x, float y, float w, float h, boolean altState, boolean isFaceDown) {
+        boolean isSaga = cv.getCurrentState().getType().hasSubtype("Saga");
+        boolean isClass = cv.getCurrentState().getType().hasSubtype("Class");
+        boolean isDungeon = cv.getCurrentState().getType().isDungeon();
+        if (altState && cv.hasAlternateState()) {
+            isSaga = cv.getAlternateState().getType().hasSubtype("Saga");
+            isClass = cv.getAlternateState().getType().hasSubtype("Class");
+            isDungeon = cv.getAlternateState().getType().isDungeon();
+        }
         if (cv == null) {
             if (isFaceDown) {
                 Texture cardBack = ImageCache.getImage(ImageKeys.getTokenKey(ImageKeys.HIDDEN_CARD), false);
@@ -292,7 +310,11 @@ public class CardImageRenderer {
                 }
             }
             //fallback
-            g.drawImage(forgeArt, x, y, w, h);
+            if (isSaga || isClass || isDungeon) {
+                g.drawImage(stretchedArt, x, y, w, h);
+            } else {
+                g.drawImage(forgeArt, x, y, w, h);
+            }
             g.drawRect(BORDER_THICKNESS, Color.BLACK, x, y, w, h);
             return;
         }
@@ -303,7 +325,11 @@ public class CardImageRenderer {
                     || cv.getCurrentState().getImageKey().equals(ImageKeys.getTokenKey(ImageKeys.FORETELL_IMAGE)));
             if (cardArt != null) {
                 if (isHidden && !altState) {
+                    if (isSaga || isClass || isDungeon) {
+                        g.drawImage(stretchedArt, x, y, w, h);
+                    } else {
                         g.drawImage(forgeArt, x, y, w, h);
+                    }
                 } else if (cv.getCurrentState().getImageKey().equals(ImageKeys.getTokenKey(ImageKeys.MANIFEST_IMAGE)) && !altState) {
                     altArt = CardRenderer.getAlternateCardArt(ImageKeys.getTokenKey(ImageKeys.MANIFEST_IMAGE), false);
                     g.drawImage(altArt, x, y, w, h);
@@ -330,10 +356,18 @@ public class CardImageRenderer {
                     }
                 }
             } else {
-                g.drawImage(forgeArt, x, y, w, h);
+                if (isSaga || isClass || isDungeon) {
+                    g.drawImage(stretchedArt, x, y, w, h);
+                } else {
+                    g.drawImage(forgeArt, x, y, w, h);
+                }
             }
         } else {
-            g.drawImage(forgeArt, x, y, w, h);
+            if (isSaga || isClass || isDungeon) {
+                g.drawImage(stretchedArt, x, y, w, h);
+            } else {
+                g.drawImage(forgeArt, x, y, w, h);
+            }
         }
         g.drawRect(BORDER_THICKNESS, Color.BLACK, x, y, w, h);
     }

From 1710447322450fc28f68fb1869b81fb8fc93cddd Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 14:55:59 +0800
Subject: [PATCH 286/309] update

---
 forge-core/src/main/java/forge/ImageKeys.java | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index 0bf20419df8..7d3c74a4580 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -176,14 +176,18 @@ public final class ImageKeys {
                 //setlookup
                 if (hasSetLookup(filename)) {
                     toFind.add(filename);
-                    ThreadUtil.getServicePool().submit(() -> {
-                        File f = setLookUpFile(filename, fullborderFile);
-                        if (f != null)
-                            cachedCards.put(filename, f);
-                        else //is null
-                            missingCards.add(filename);
+                    try {
+                        ThreadUtil.getServicePool().submit(() -> {
+                            File f = setLookUpFile(filename, fullborderFile);
+                            if (f != null)
+                                cachedCards.put(filename, f);
+                            else //is null
+                                missingCards.add(filename);
+                            toFind.remove(filename);
+                        });
+                    } catch (Exception e) {
                         toFind.remove(filename);
-                    });
+                    }
                 }
             }
             //if an image, like phenomenon or planes is missing .full in their filenames but you have an existing images that have .full/.fullborder

From a71148cfe3fb7cdcda354d350e8251cd12863b23 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 18:36:59 +0800
Subject: [PATCH 287/309] fix auditer closes #1096

---
 forge-core/src/main/java/forge/ImageKeys.java                 | 4 ++--
 .../java/forge/screens/home/settings/VSubmenuDownloaders.java | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java
index 7d3c74a4580..12cb9493a6b 100644
--- a/forge-core/src/main/java/forge/ImageKeys.java
+++ b/forge-core/src/main/java/forge/ImageKeys.java
@@ -273,14 +273,14 @@ public final class ImageKeys {
                 ? StaticData.instance().getEditions().getCode2ByCode(edition) // by default 2-letter codes from MWS are used
                 : CACHE_CARD_PICS_SUBDIR.get(edition); // may use custom paths though
     }
-    static boolean hasSetLookup(String filename) {
+    public static boolean hasSetLookup(String filename) {
         if (!StaticData.instance().getSetLookup().isEmpty()) {
             return StaticData.instance().getSetLookup().keySet().stream().anyMatch(setKey -> filename.startsWith(setKey));
         }
 
         return false;
     }
-    private static File setLookUpFile(String filename, String fullborderFile) {
+    public static File setLookUpFile(String filename, String fullborderFile) {
         if (!StaticData.instance().getSetLookup().isEmpty()) {
             for (String setKey : StaticData.instance().getSetLookup().keySet()) {
                 if (filename.startsWith(setKey)) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
index 369aaac808b..fdb082a4af4 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -297,6 +297,8 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
                 imagePath = ImageUtil.getImageRelativePath(cp, false, true, false);
                 if (imagePath != null) {
                     File file = ImageKeys.getImageFile(imagePath);
+                    if (file == null && ImageKeys.hasSetLookup(imagePath))
+                        file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
                     if (file == null) {
                         if (!nifHeader) {
                             nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
@@ -312,6 +314,8 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
                     imagePath = ImageUtil.getImageRelativePath(cp, true, true, false);
                     if (imagePath != null) {
                         File file = ImageKeys.getImageFile(imagePath);
+                        if (file == null && ImageKeys.hasSetLookup(imagePath))
+                            file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
                         if (file == null) {
                             if (!nifHeader) {
                                 nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");

From 7f6bbfea3c16cde739f78b5c744cf7dd5b6122d0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 19:02:35 +0800
Subject: [PATCH 288/309] move audit to StaticData - fix cards with setlookup
 closes #1096

---
 .../src/main/java/forge/StaticData.java       | 122 +++++++++++++++
 .../home/settings/VSubmenuDownloaders.java    | 139 +-----------------
 2 files changed, 125 insertions(+), 136 deletions(-)

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index e2d20940067..81d6c0c3144 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -8,9 +8,11 @@ import forge.card.PrintSheet;
 import forge.item.*;
 import forge.token.TokenDb;
 import forge.util.FileUtil;
+import forge.util.ImageUtil;
 import forge.util.TextUtil;
 import forge.util.storage.IStorage;
 import forge.util.storage.StorageBase;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.File;
 import java.util.*;
@@ -752,6 +754,126 @@ public class StaticData {
             preferences_avails[i] = prettifyCardArtPreferenceName(preferences[i]);
         return preferences_avails;
     }
+    public void audit(StringBuffer nifSB, StringBuffer cniSB, int missingCount, int notImplementedCount) {
+        for (CardEdition e : editions) {
+            if (CardEdition.Type.FUNNY.equals(e.getType()))
+                continue;
+            boolean nifHeader = false;
+            boolean cniHeader = false;
+            boolean tokenHeader = false;
+
+            String imagePath;
+            int artIndex = 1;
+
+            HashMap<String, Pair<Boolean, Integer>> cardCount = new HashMap<>();
+            for (CardEdition.CardInSet c : e.getAllCardsInSet()) {
+                if (cardCount.containsKey(c.name)) {
+                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), cardCount.get(c.name).getRight() + 1));
+                } else {
+                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), 1));
+                }
+            }
+
+            // loop through the cards in this edition, considering art variations...
+            for (Map.Entry<String, Pair<Boolean, Integer>> entry : cardCount.entrySet()) {
+                String c = entry.getKey();
+                artIndex = entry.getValue().getRight();
+
+                PaperCard cp = getCommonCards().getCard(c, e.getCode(), artIndex);
+                if (cp == null) {
+                    cp = getVariantCards().getCard(c, e.getCode(), artIndex);
+                }
+
+                if (cp == null) {
+                    if (entry.getValue().getLeft()) //skip funny cards
+                        continue;
+                    if (CardEdition.Type.FUNNY.equals(e.getType()) && !StaticData.instance().getFunnySetCode().isEmpty())
+                        continue;
+                    if (!cniHeader) {
+                        cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                        cniHeader = true;
+                    }
+                    cniSB.append(" ").append(c).append("\n");
+                    notImplementedCount++;
+                    continue;
+                }
+
+                // check the front image
+                imagePath = ImageUtil.getImageRelativePath(cp, false, true, false);
+                if (imagePath != null) {
+                    File file = ImageKeys.getImageFile(imagePath);
+                    if (file == null && ImageKeys.hasSetLookup(imagePath))
+                        file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
+                    if (file == null) {
+                        if (!nifHeader) {
+                            nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                            nifHeader = true;
+                        }
+                        nifSB.append(" ").append(imagePath).append("\n");
+                        missingCount++;
+                    }
+                }
+
+                // check the back face
+                if (cp.hasBackFace()) {
+                    imagePath = ImageUtil.getImageRelativePath(cp, true, true, false);
+                    if (imagePath != null) {
+                        File file = ImageKeys.getImageFile(imagePath);
+                        if (file == null && ImageKeys.hasSetLookup(imagePath))
+                            file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
+                        if (file == null) {
+                            if (!nifHeader) {
+                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                                nifHeader = true;
+                            }
+                            nifSB.append(" ").append(imagePath).append("\n");
+                            missingCount++;
+                        }
+                    }
+                }
+            }
+
+            // TODO: Audit token images here...
+            for(Map.Entry<String, Integer> tokenEntry : e.getTokens().entrySet()) {
+                String name = tokenEntry.getKey();
+                artIndex = tokenEntry.getValue();
+                try {
+                    PaperToken token = getAllTokens().getToken(name, e.getCode());
+                    if (token == null) {
+                        continue;
+                    }
+
+                    for(int i = 0; i < artIndex; i++) {
+                        String imgKey = token.getImageKey(i);
+                        File file = ImageKeys.getImageFile(imgKey);
+                        if (file == null) {
+                            if (!nifHeader) {
+                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                                nifHeader = true;
+                            }
+                            if (!tokenHeader) {
+                                nifSB.append("\nTOKENS\n");
+                                tokenHeader = true;
+                            }
+                            nifSB.append(" ").append(token.getImageFilename(i + 1)).append("\n");
+                            missingCount++;
+                        }
+                    }
+                } catch(Exception ex) {
+                    System.out.println("No Token found: " + name + " in " + e.getName());
+                }
+            }
+            if (nifHeader)
+                nifSB.append("\n");
+        }
+
+        String totalStats = "Missing images: " + missingCount + "\nUnimplemented cards: " + notImplementedCount + "\n";
+        cniSB.append("\n-----------\n");
+        cniSB.append(totalStats);
+        cniSB.append("-----------\n\n");
+
+        nifSB.append(cniSB); // combine things together...
+    }
 
     private String prettifyCardArtPreferenceName(CardDb.CardArtPreference preference) {
         StringBuilder label = new StringBuilder();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
index fdb082a4af4..751711887e6 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -7,9 +7,6 @@ import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map.Entry;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -17,24 +14,17 @@ import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 
-import forge.ImageKeys;
 import forge.StaticData;
-import forge.card.CardDb;
-import forge.card.CardEdition;
-import forge.card.CardEdition.CardInSet;
 import forge.gui.SOverlayUtils;
 import forge.gui.UiCommand;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
-import forge.item.PaperCard;
-import forge.item.PaperToken;
 import forge.localinstance.properties.ForgeConstants;
 import forge.localinstance.skin.FSkinProp;
 import forge.screens.home.EMenuGroup;
 import forge.screens.home.IVSubmenu;
 import forge.screens.home.VHomeUI;
-import forge.token.TokenDb;
 import forge.toolbox.FButton;
 import forge.toolbox.FLabel;
 import forge.toolbox.FOverlay;
@@ -43,11 +33,9 @@ import forge.toolbox.FScrollPane;
 import forge.toolbox.FSkin;
 import forge.toolbox.FTextArea;
 import forge.util.FileUtil;
-import forge.util.ImageUtil;
 import forge.util.Localizer;
 import forge.util.RuntimeVersion;
 import net.miginfocom.swing.MigLayout;
-import org.apache.commons.lang3.tuple.Pair;
 
 /**
  * Assembles Swing components of utilities submenu singleton.
@@ -232,17 +220,11 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
      * @param scr
      */
     public void auditUpdate(FTextArea tar, FScrollPane scr) {
-        // Get top-level Forge objects
-        CardDb cardDb = StaticData.instance().getCommonCards();
-        CardDb variantDb = StaticData.instance().getVariantCards();
-        TokenDb tokenDb = StaticData.instance().getAllTokens();
-        CardEdition.Collection editions = StaticData.instance().getEditions();
-
         int missingCount = 0;
         int notImplementedCount = 0;
 
-        final StringBuffer nifSB = new StringBuffer(); // NO IMAGE FOUND BUFFER
-        final StringBuffer cniSB = new StringBuffer(); // CARD NOT IMPLEMENTED BUFFER
+        StringBuffer nifSB = new StringBuffer(); // NO IMAGE FOUND BUFFER
+        StringBuffer cniSB = new StringBuffer(); // CARD NOT IMPLEMENTED BUFFER
         
         nifSB.append("\n\n-------------------\n");
         nifSB.append("NO IMAGE FOUND LIST\n");
@@ -252,122 +234,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
         cniSB.append("UNIMPLEMENTED CARD LIST\n");
         cniSB.append("-------------------\n\n");
 
-        for (CardEdition e : editions) {
-            if (CardEdition.Type.FUNNY.equals(e.getType()))
-                continue;
-            boolean nifHeader = false;
-            boolean cniHeader = false;
-            boolean tokenHeader = false;
-
-            String imagePath;
-            int artIndex = 1;
-
-            HashMap<String, Pair<Boolean, Integer>> cardCount = new HashMap<>();
-            for (CardInSet c : e.getAllCardsInSet()) {
-                if (cardCount.containsKey(c.name)) {
-                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), cardCount.get(c.name).getRight() + 1));
-                } else {
-                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), 1));
-                }
-            }
-            
-            // loop through the cards in this edition, considering art variations...
-            for (Entry<String, Pair<Boolean, Integer>> entry : cardCount.entrySet()) {
-                String c = entry.getKey();
-                artIndex = entry.getValue().getRight();
-
-                PaperCard cp = cardDb.getCard(c, e.getCode(), artIndex);
-                if (cp == null) {
-                    cp = variantDb.getCard(c, e.getCode(), artIndex);
-                }
-
-                if (cp == null) {
-                    if (entry.getValue().getLeft()) //skip funny cards
-                        continue;
-                    if (!cniHeader) {
-                        cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
-                        cniHeader = true;
-                    }
-                    cniSB.append(" ").append(c).append("\n");
-                    notImplementedCount++;
-                    continue;
-                }
-
-                // check the front image
-                imagePath = ImageUtil.getImageRelativePath(cp, false, true, false);
-                if (imagePath != null) {
-                    File file = ImageKeys.getImageFile(imagePath);
-                    if (file == null && ImageKeys.hasSetLookup(imagePath))
-                        file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
-                    if (file == null) {
-                        if (!nifHeader) {
-                            nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
-                            nifHeader = true;
-                        }
-                        nifSB.append(" ").append(imagePath).append("\n");
-                        missingCount++;
-                    }
-                } 
-
-                // check the back face
-                if (cp.hasBackFace()) {
-                    imagePath = ImageUtil.getImageRelativePath(cp, true, true, false);
-                    if (imagePath != null) {
-                        File file = ImageKeys.getImageFile(imagePath);
-                        if (file == null && ImageKeys.hasSetLookup(imagePath))
-                            file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
-                        if (file == null) {
-                            if (!nifHeader) {
-                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
-                                nifHeader = true;
-                            }
-                            nifSB.append(" ").append(imagePath).append("\n");
-                            missingCount++;
-                        }
-                    } 
-                }
-            }
-
-            // TODO: Audit token images here...
-            for(Entry<String, Integer> tokenEntry : e.getTokens().entrySet()) {
-                String name = tokenEntry.getKey();
-                artIndex = tokenEntry.getValue();
-                try {
-                    PaperToken token = tokenDb.getToken(name, e.getCode());
-                    if (token == null) {
-                        continue;
-                    }
-
-                    for(int i = 0; i < artIndex; i++) {
-                        String imgKey = token.getImageKey(i);
-                        File file = ImageKeys.getImageFile(imgKey);
-                        if (file == null) {
-                            if (!nifHeader) {
-                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
-                                nifHeader = true;
-                            }
-                            if (!tokenHeader) {
-                                nifSB.append("\nTOKENS\n");
-                                tokenHeader = true;
-                            }
-                            nifSB.append(" ").append(token.getImageFilename(i + 1)).append("\n");
-                            missingCount++;
-                        }
-                    }
-                } catch(Exception ex) {
-                    System.out.println("No Token found: " + name + " in " + e.getName());
-                }
-            }
-            if (nifHeader)
-                nifSB.append("\n");
-        }
-
-        String totalStats = "Missing images: " + missingCount + "\nUnimplemented cards: " + notImplementedCount + "\n";
-        cniSB.append("\n-----------\n");
-        cniSB.append(totalStats);
-        cniSB.append("-----------\n\n");
-        
-        nifSB.append(cniSB); // combine things together...
+        StaticData.instance().audit(nifSB, cniSB, missingCount, notImplementedCount);
 
         tar.setText(nifSB.toString());
         tar.setCaretPosition(0); // this will move scroll view to the top...

From 4fb89c121fdcf1f707652bf8bee69c55e4abd832 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 21:13:13 +0800
Subject: [PATCH 289/309] update check

---
 forge-core/src/main/java/forge/StaticData.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index 81d6c0c3144..a0beb2345a2 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -47,6 +47,7 @@ public class StaticData {
 
     private boolean allowCustomCardsInDecksConformance;
     private boolean enableSmartCardArtSelection;
+    private boolean loadNonLegalCards;
 
     // Loaded lazily:
     private IStorage<SealedProduct.Template> boosters;
@@ -76,6 +77,7 @@ public class StaticData {
         this.customCardReader = customCardReader;
         this.allowCustomCardsInDecksConformance = allowCustomCardsInDecksConformance;
         this.enableSmartCardArtSelection = enableSmartCardArtSelection;
+        this.loadNonLegalCards = loadNonLegalCards;
         lastInstance = this;
         List<String> funnyCards = new ArrayList<>();
         List<String> filtered = new ArrayList<>();
@@ -787,7 +789,7 @@ public class StaticData {
                 if (cp == null) {
                     if (entry.getValue().getLeft()) //skip funny cards
                         continue;
-                    if (CardEdition.Type.FUNNY.equals(e.getType()) && !StaticData.instance().getFunnySetCode().isEmpty())
+                    if (!loadNonLegalCards && CardEdition.Type.FUNNY.equals(e.getType()))
                         continue;
                     if (!cniHeader) {
                         cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");

From 47f240af0c3c1edfc094982a0833c3beda5284ed Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 21:38:00 +0800
Subject: [PATCH 290/309] return Pair values

---
 .../src/main/java/forge/StaticData.java       | 33 ++++++++++---------
 .../home/settings/VSubmenuDownloaders.java    |  8 ++---
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java
index a0beb2345a2..5570e7ea63a 100644
--- a/forge-core/src/main/java/forge/StaticData.java
+++ b/forge-core/src/main/java/forge/StaticData.java
@@ -756,7 +756,9 @@ public class StaticData {
             preferences_avails[i] = prettifyCardArtPreferenceName(preferences[i]);
         return preferences_avails;
     }
-    public void audit(StringBuffer nifSB, StringBuffer cniSB, int missingCount, int notImplementedCount) {
+    public Pair<Integer, Integer> audit(StringBuffer noImageFound, StringBuffer cardNotImplemented) {
+        int missingCount = 0;
+        int notImplementedCount = 0;
         for (CardEdition e : editions) {
             if (CardEdition.Type.FUNNY.equals(e.getType()))
                 continue;
@@ -792,10 +794,10 @@ public class StaticData {
                     if (!loadNonLegalCards && CardEdition.Type.FUNNY.equals(e.getType()))
                         continue;
                     if (!cniHeader) {
-                        cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                        cardNotImplemented.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
                         cniHeader = true;
                     }
-                    cniSB.append(" ").append(c).append("\n");
+                    cardNotImplemented.append(" ").append(c).append("\n");
                     notImplementedCount++;
                     continue;
                 }
@@ -808,10 +810,10 @@ public class StaticData {
                         file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
                     if (file == null) {
                         if (!nifHeader) {
-                            nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                            noImageFound.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
                             nifHeader = true;
                         }
-                        nifSB.append(" ").append(imagePath).append("\n");
+                        noImageFound.append(" ").append(imagePath).append("\n");
                         missingCount++;
                     }
                 }
@@ -825,10 +827,10 @@ public class StaticData {
                             file = ImageKeys.setLookUpFile(imagePath, imagePath+"border");
                         if (file == null) {
                             if (!nifHeader) {
-                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                                noImageFound.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
                                 nifHeader = true;
                             }
-                            nifSB.append(" ").append(imagePath).append("\n");
+                            noImageFound.append(" ").append(imagePath).append("\n");
                             missingCount++;
                         }
                     }
@@ -850,14 +852,14 @@ public class StaticData {
                         File file = ImageKeys.getImageFile(imgKey);
                         if (file == null) {
                             if (!nifHeader) {
-                                nifSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
+                                noImageFound.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
                                 nifHeader = true;
                             }
                             if (!tokenHeader) {
-                                nifSB.append("\nTOKENS\n");
+                                noImageFound.append("\nTOKENS\n");
                                 tokenHeader = true;
                             }
-                            nifSB.append(" ").append(token.getImageFilename(i + 1)).append("\n");
+                            noImageFound.append(" ").append(token.getImageFilename(i + 1)).append("\n");
                             missingCount++;
                         }
                     }
@@ -866,15 +868,16 @@ public class StaticData {
                 }
             }
             if (nifHeader)
-                nifSB.append("\n");
+                noImageFound.append("\n");
         }
 
         String totalStats = "Missing images: " + missingCount + "\nUnimplemented cards: " + notImplementedCount + "\n";
-        cniSB.append("\n-----------\n");
-        cniSB.append(totalStats);
-        cniSB.append("-----------\n\n");
+        cardNotImplemented.append("\n-----------\n");
+        cardNotImplemented.append(totalStats);
+        cardNotImplemented.append("-----------\n\n");
 
-        nifSB.append(cniSB); // combine things together...
+        noImageFound.append(cardNotImplemented); // combine things together...
+        return Pair.of(missingCount, notImplementedCount);
     }
 
     private String prettifyCardArtPreferenceName(CardDb.CardArtPreference preference) {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
index 751711887e6..0aea46f26fd 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -36,6 +36,7 @@ import forge.util.FileUtil;
 import forge.util.Localizer;
 import forge.util.RuntimeVersion;
 import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.tuple.Pair;
 
 /**
  * Assembles Swing components of utilities submenu singleton.
@@ -220,9 +221,6 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
      * @param scr
      */
     public void auditUpdate(FTextArea tar, FScrollPane scr) {
-        int missingCount = 0;
-        int notImplementedCount = 0;
-
         StringBuffer nifSB = new StringBuffer(); // NO IMAGE FOUND BUFFER
         StringBuffer cniSB = new StringBuffer(); // CARD NOT IMPLEMENTED BUFFER
         
@@ -234,7 +232,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
         cniSB.append("UNIMPLEMENTED CARD LIST\n");
         cniSB.append("-------------------\n\n");
 
-        StaticData.instance().audit(nifSB, cniSB, missingCount, notImplementedCount);
+        Pair<Integer, Integer> totalAudit = StaticData.instance().audit(nifSB, cniSB);
 
         tar.setText(nifSB.toString());
         tar.setCaretPosition(0); // this will move scroll view to the top...
@@ -249,7 +247,7 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
         });
         scr.getParent().add(btnClipboardCopy, "w 200!, h pref+12!, center, gaptop 10");
         
-        String labelText = "<html>Missing images: " + missingCount + "<br>Unimplemented cards: " + notImplementedCount + "<br>";
+        String labelText = "<html>Missing images: " + totalAudit.getLeft() + "<br>Unimplemented cards: " + totalAudit.getRight() + "<br>";
         final FLabel statsLabel = new FLabel.Builder().text(labelText).fontSize(15).build();
         scr.getParent().add(statsLabel);
 

From 5054ca19a8a992bdddf025b2e998a2a7d29976d0 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 23:15:59 +0800
Subject: [PATCH 291/309] add Card Auditer to Mobile

---
 .../src/forge/screens/settings/FilesPage.java | 78 ++++++++++++++++---
 forge-gui/res/languages/de-DE.properties      |  2 +
 forge-gui/res/languages/en-US.properties      |  2 +
 forge-gui/res/languages/es-ES.properties      |  2 +
 forge-gui/res/languages/it-IT.properties      |  2 +
 forge-gui/res/languages/ja-JP.properties      |  2 +
 forge-gui/res/languages/pt-BR.properties      |  2 +
 forge-gui/res/languages/zh-CN.properties      |  2 +
 8 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
index 93476fb842d..56da95a54a7 100644
--- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
@@ -5,7 +5,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.google.common.collect.ImmutableList;
+import forge.StaticData;
+import forge.gui.FThreads;
 import forge.gui.GuiBase;
+import forge.screens.LoadingOverlay;
 import org.apache.commons.lang3.StringUtils;
 
 import com.badlogic.gdx.utils.Align;
@@ -34,6 +38,9 @@ import forge.toolbox.FOptionPane;
 import forge.toolbox.GuiChoose;
 import forge.util.Callback;
 import forge.util.FileUtil;
+import org.apache.commons.lang3.tuple.Pair;
+
+import static forge.StaticData.instance;
 
 public class FilesPage extends TabPage<SettingsScreen> {
     private final FGroupList<FilesItem> lstItems = add(new FGroupList<>());
@@ -43,10 +50,45 @@ public class FilesPage extends TabPage<SettingsScreen> {
 
         lstItems.setListItemRenderer(new FilesItemRenderer());
 
+        lstItems.addGroup(Forge.getLocalizer().getMessage("lblCardAudit"));
         lstItems.addGroup(Forge.getLocalizer().getMessage("ContentDownloaders"));
         lstItems.addGroup(Forge.getLocalizer().getMessage("lblStorageLocations"));
         //lstItems.addGroup("Data Import");
 
+        //Auditer
+        lstItems.addItem(new Extra(Forge.getLocalizer().getMessage("btnListImageData"), Forge.getLocalizer().getMessage("lblListImageData")) {
+            @Override
+            public void select() {
+                FThreads.invokeInEdtLater(() -> LoadingOverlay.show(Forge.getLocalizer().getMessage("lblProcessingCards"), true, () -> {
+                    StringBuffer nifSB = new StringBuffer(); // NO IMAGE FOUND BUFFER
+                    StringBuffer cniSB = new StringBuffer(); // CARD NOT IMPLEMENTED BUFFER
+
+                    nifSB.append("\n\n-------------------\n");
+                    nifSB.append("NO IMAGE FOUND LIST\n");
+                    nifSB.append("-------------------\n\n");
+
+                    cniSB.append("\n\n-------------------\n");
+                    cniSB.append("UNIMPLEMENTED CARD LIST\n");
+                    cniSB.append("-------------------\n\n");
+
+                    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;
+                            }
+                        }
+                    });
+                }));
+            }
+        }, 0);
         //content downloaders
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadPics"),
                 Forge.getLocalizer().getMessage("lblDownloadPics")) {
@@ -54,35 +96,35 @@ public class FilesPage extends TabPage<SettingsScreen> {
             protected GuiDownloadService createService() {
                 return new GuiDownloadPicturesLQ();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadSetPics"),
                 Forge.getLocalizer().getMessage("lblDownloadSetPics")) {
             @Override
             protected GuiDownloadService createService() {
                 return new GuiDownloadSetPicturesLQ();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadQuestImages"),
                 Forge.getLocalizer().getMessage("lblDownloadQuestImages")) {
             @Override
             protected GuiDownloadService createService() {
                 return new GuiDownloadQuestImages();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadAchievementImages"),
                 Forge.getLocalizer().getMessage("lblDownloadAchievementImages")) {
             @Override
             protected GuiDownloadService createService() {
                 return new GuiDownloadAchievementImages();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadPrices"),
                 Forge.getLocalizer().getMessage("lblDownloadPrices")) {
             @Override
             protected GuiDownloadService createService() {
                 return new GuiDownloadPrices();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadSkins"),
                 Forge.getLocalizer().getMessage("lblDownloadSkins")) {
             @Override
@@ -93,7 +135,7 @@ public class FilesPage extends TabPage<SettingsScreen> {
             protected void finishCallback() {
                 SettingsScreen.getSettingsScreen().getSettingsPage().refreshSkinsList();
             }
-        }, 0);
+        }, 1);
         lstItems.addItem(new OptionContentDownloader(Forge.getLocalizer().getMessage("btnDownloadCJKFonts"),
                 Forge.getLocalizer().getMessage("lblDownloadCJKFonts"),
                 Forge.getLocalizer().getMessage("lblDownloadCJKFontPrompt")) {
@@ -118,7 +160,7 @@ public class FilesPage extends TabPage<SettingsScreen> {
             protected void finishCallback() {
                 SettingsScreen.getSettingsScreen().getSettingsPage().refreshCJKFontsList();
             }
-        }, 0);
+        }, 1);
         //storage locations
         final StorageOption cardPicsOption = new StorageOption(Forge.getLocalizer().getMessage("lblCardPicsLocation"), ForgeProfileProperties.getCardPicsDir()) {
             @Override
@@ -141,7 +183,7 @@ public class FilesPage extends TabPage<SettingsScreen> {
                     //ensure decks option is updated if needed
                     decksOption.updateDir(ForgeProfileProperties.getDecksDir());
                 }
-            }, 1);
+            }, 2);
             lstItems.addItem(new StorageOption(Forge.getLocalizer().getMessage("lblImageCacheLocation"), ForgeProfileProperties.getCacheDir()) {
                 @Override
                 protected void onDirectoryChanged(String newDir) {
@@ -150,9 +192,9 @@ public class FilesPage extends TabPage<SettingsScreen> {
                     //ensure card pics option is updated if needed
                     cardPicsOption.updateDir(ForgeProfileProperties.getCardPicsDir());
                 }
-            }, 1);
-            lstItems.addItem(cardPicsOption, 1);
-            lstItems.addItem(decksOption, 1);
+            }, 2);
+            lstItems.addItem(cardPicsOption, 2);
+            lstItems.addItem(decksOption, 2);
         }
     }
 
@@ -201,7 +243,19 @@ public class FilesPage extends TabPage<SettingsScreen> {
             g.drawText(value.description, SettingsScreen.DESC_FONT, SettingsScreen.DESC_COLOR, x, y + h, w, totalHeight - h + SettingsScreen.getInsets(w), true, Align.left, false);
         }
     }
+    private abstract class Extra extends FilesItem {
+        Extra(String label0, String description0) {
+            super(label0, description0);
+        }
 
+        @Override
+        public void select() {
+
+        }
+
+        protected void finishCallback() {
+        }
+    }
     private abstract class ContentDownloader extends FilesItem {
         ContentDownloader(String label0, String description0) {
             super(label0, description0);
@@ -239,7 +293,7 @@ public class FilesPage extends TabPage<SettingsScreen> {
                 @Override
                 public void run(String result) {
                     final String url = categories.get(result);
-                    final String name = url.substring(url.lastIndexOf("/") + 1);
+                    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) {
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index 2dd48a9348a..d9d41a58429 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -229,6 +229,8 @@ btnDownloadPics=Bilder(LQ) Karten herunterladen
 btnDownloadQuestImages=Bilder für Quests herunterladen
 btnDownloadAchievementImages=Bilder für Erfolge herunterladen
 btnReportBug=Einen Fehler melden
+lblProcessingCards=Karten verarbeiten ...
+lblCardAudit=Kartenprüfung
 btnListImageData=Prüfe Karten- und Bilddaten
 lblListImageData=Prüfe auf von Forge nicht unterstütze Karten und fehlende Kartenbilder
 btnImportPictures=Daten importieren
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index 91b1d08af31..fb0bb721444 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -230,6 +230,8 @@ btnDownloadPics=Download LQ Card Pictures
 btnDownloadQuestImages=Download Quest Images
 btnDownloadAchievementImages=Download Achievement Images
 btnReportBug=Report a Bug
+lblProcessingCards=Processing Cards...
+lblCardAudit=Card Audit
 btnListImageData=Audit Card and Image Data
 lblListImageData=Audit cards not implemented by Forge and missing card images
 btnImportPictures=Import Data
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 64db4565dc9..a958ef3753e 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -230,6 +230,8 @@ btnDownloadPics=Descargar cartas únicas
 btnDownloadQuestImages=Descargar imágenes del modo aventura
 btnDownloadAchievementImages=Descargar imágenes de los trofeos
 btnReportBug=Reportar un error
+lblProcessingCards=Tarjetas de procesamiento ...
+lblCardAudit=Auditoría
 btnListImageData=Auditar cartas y datos de imagen
 lblListImageData=Audita cartas no implementadas por Forge e imágenes de cartas faltantes
 btnImportPictures=Importar datos
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index ca8e68d71f1..a05c4995887 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -229,6 +229,8 @@ btnDownloadPics=Scarica immagini delle carte a bassa qualità
 btnDownloadQuestImages=Scarica immagini Avventura
 btnDownloadAchievementImages=Scarica immagini dei trofei
 btnReportBug=Segnalare un bug
+lblProcessingCards=Carte di elaborazione ...
+lblCardAudit=Audit della scheda
 btnListImageData=Verifica i dati e le immagini delle carte
 lblListImageData=Verifica le carte non implementate in Forge e le immagini mancanti
 btnImportPictures=Importa dati
diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties
index 8b11fe363e0..b0dcf152e0f 100644
--- a/forge-gui/res/languages/ja-JP.properties
+++ b/forge-gui/res/languages/ja-JP.properties
@@ -230,6 +230,8 @@ btnDownloadPics=LQ カード画像のダウンロード
 btnDownloadQuestImages=クエスト画像をダウンロード
 btnDownloadAchievementImages=実績画像のダウンロード
 btnReportBug=バグを報告する
+lblProcessingCards=処理カード...
+lblCardAudit=カード監査
 btnListImageData=カードと画像データの監査
 lblListImageData=Forge で実装されていないカードと欠落しているカード画像の監査
 btnImportPictures=画像データのインポート
diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties
index 3febad95ad1..fe47d779f1a 100644
--- a/forge-gui/res/languages/pt-BR.properties
+++ b/forge-gui/res/languages/pt-BR.properties
@@ -231,6 +231,8 @@ btnDownloadPics=Baixar Imagens das Cartas em Baixa Qualidade
 btnDownloadQuestImages=Baixar Imagens das Missões
 btnDownloadAchievementImages=Baixar Imagens das Conquistas
 btnReportBug=Relatar um Bug
+lblProcessingCards=Cartões de processamento ...
+lblCardAudit=Auditoria do cartão
 btnListImageData=Auditar Cartas e Imagens
 lblListImageData=Auditar cartas não implementadas no Forge e imagens ausentes de cartas
 btnImportPictures=Importar Dados
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index e5c17f4461b..fd78fe555f9 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -230,6 +230,8 @@ btnDownloadPics=下载低清卡图
 btnDownloadQuestImages=下载冒险图片
 btnDownloadAchievementImages=下载成就图片
 btnReportBug=报告错误
+lblProcessingCards=处理卡...
+lblCardAudit=卡审核
 btnListImageData=统计牌和图片数据
 lblListImageData=统计Forge实现且缺少的图片的牌
 btnImportPictures=导入数据

From b2984de2d45f1efaaaf8012bcbe3d6f1a7e8afcd Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 12 Jul 2022 23:33:12 +0800
Subject: [PATCH 292/309] unused import

---
 forge-gui-mobile/src/forge/screens/settings/FilesPage.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
index 56da95a54a7..cbd354505bb 100644
--- a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
+++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java
@@ -40,8 +40,6 @@ import forge.util.Callback;
 import forge.util.FileUtil;
 import org.apache.commons.lang3.tuple.Pair;
 
-import static forge.StaticData.instance;
-
 public class FilesPage extends TabPage<SettingsScreen> {
     private final FGroupList<FilesItem> lstItems = add(new FGroupList<>());
 

From d8588842fee60032d60856ed8101b06b6b66c9d6 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Tue, 12 Jul 2022 19:21:35 +0200
Subject: [PATCH 293/309] Add extra sanity check

---
 .../forge/game/replacement/ReplacementHandler.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 1ce46f5418e..030e8cd3879 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
@@ -176,9 +176,17 @@ public class ReplacementHandler {
                 final Card c = preList.get(crd);
 
                 for (final ReplacementEffect replacementEffect : c.getReplacementEffects()) {
-                    // Use "CheckLKIZone" parameter to test for effects that care abut where the card was last (e.g. Kalitas, Traitor of Ghet
+                    Zone cardZone;
+                    // Use "CheckLKIZone" parameter to test for effects that care about where the card was last (e.g. Kalitas, Traitor of Ghet
                     // getting hit by mass removal should still produce tokens).
-                    Zone cardZone = "True".equals(replacementEffect.getParam("CheckSelfLKIZone")) ? game.getChangeZoneLKIInfo(c).getLastKnownZone() : game.getZoneOf(c);
+                    if ("True".equals(replacementEffect.getParam("CheckSelfLKIZone"))) {
+                        cardZone = game.getChangeZoneLKIInfo(c).getLastKnownZone();
+                        if (cardZone.is(ZoneType.Battlefield) && runParams.containsKey(AbilityKey.LastStateBattlefield) && !((CardCollectionView) runParams.get(AbilityKey.LastStateBattlefield)).contains(crd)) {
+                            continue;
+                        }
+                    } else {
+                        cardZone = game.getZoneOf(c);
+                    }
 
                     // Replacement effects that are tied to keywords (e.g. damage prevention effects - if the keyword is removed, the replacement
                     // effect should be inactive)

From c5abdcd9751ce4bbb80df2fc76de53031af20eec Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Tue, 12 Jul 2022 19:12:33 -0400
Subject: [PATCH 294/309] Card scripts for Lantern of Revealing and Marching
 Duodrone.

---
 .../res/cardsfolder/upcoming/lantern_of_revealing.txt     | 8 ++++++++
 forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt  | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
 create mode 100644 forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt

diff --git a/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt b/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
new file mode 100644
index 00000000000..d22895723c4
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
@@ -0,0 +1,8 @@
+Name:Lantern of Revealing
+ManaCost:3
+Types:Artifact
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+A:AB$ Dig | Cost$ 4 T | DigNum$ 1 | ChangeNum$ All | ForceRevealToController$ True | Optional$ True | PromptToSkipOptionalAbility$ True | OptionalAbilityPrompt$ Would you like to put the land onto the battlefield tapped? | ChangeValid$ Land | DestinationZone$ Battlefield | Tapped$ True | DestinationZone2$ Library | LibraryPosition2$ 0 | RememberChanged$ True | SubAbility$ DBMoveToBottom | SpellDescription$ Look at the top card of your library. If it’s a land card, you may put it onto the battlefield tapped. If you don’t put the card onto the battlefield, you may put it on the bottom of your library.
+SVar:DBMoveToBottom:DB$ Dig | DigNum$ 1 | DestinationZone$ Library | Optional$ True | LibraryPosition$ -1 | LibraryPosition2$ 0 | ConditionPresent$ Card | ConditionDefined$ Remembered | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:{T}: Add one mana of any color.\n{4}, {T}: Look at the top card of your library. If it’s a land card, you may put it onto the battlefield tapped. If you don’t put the card onto the battlefield, you may put it on the bottom of your library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt b/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt
new file mode 100644
index 00000000000..64ccaeb3fde
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt
@@ -0,0 +1,7 @@
+Name:Marching Duodrone
+ManaCost:2
+Types:Artifact Creature Construct
+PT:2/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBTreasure | TriggerDescription$ Whenever CARDNAME attacks, each player creates a Treasure token.
+SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ Player
+Oracle:Whenever Marching Duodrone attacks, each player creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
\ No newline at end of file

From 5d4fcb55db94de8af56738cc892252b598af448c Mon Sep 17 00:00:00 2001
From: xaviermd <70407998+xaviermd@users.noreply.github.com>
Date: Wed, 13 Jul 2022 01:33:57 -0400
Subject: [PATCH 295/309] CardScript for Iron Mastiff and changes to
 RollDiceEffect (#1104)

* First draft for Iron Mastiff and changes to RollDiceEffect

* Removed unnecessary DamageDesc.
---
 .../forge/game/ability/effects/RollDiceEffect.java   |  4 ++++
 forge-gui/res/cardsfolder/upcoming/iron_mastiff.txt  | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 forge-gui/res/cardsfolder/upcoming/iron_mastiff.txt

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 fb0a99ace99..3a349fdd6ff 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
@@ -1,6 +1,7 @@
 package forge.game.ability.effects;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -144,6 +145,9 @@ public class RollDiceEffect extends SpellAbilityEffect {
                 sa.setSVar(sa.getParam("OtherSVar"), Integer.toString(other));
             }
         }
+        if (sa.hasParam("UseHighestRoll")) {
+            total = Collections.max(rolls);
+        }
 
         Map<String, SpellAbility> diceAbilities = sa.getAdditionalAbilities();
         SpellAbility resultAbility = null;
diff --git a/forge-gui/res/cardsfolder/upcoming/iron_mastiff.txt b/forge-gui/res/cardsfolder/upcoming/iron_mastiff.txt
new file mode 100644
index 00000000000..83f805f815c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/iron_mastiff.txt
@@ -0,0 +1,12 @@
+Name:Iron Mastiff
+ManaCost:4
+Types:Artifact Creature Dog
+PT:4/4
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBTrigRollDice | TriggerDescription$ Whenever CARDNAME attacks, roll a d20 for each player being attacked and ignore all but the highest roll.
+SVar:DBTrigRollDice:DB$ RollDice | Sides$ 20 | Amount$ NbAttackedPlayers | UseHighestRoll$ True | ResultSubAbilities$ 1-9:DBDamageToController,10-19:DBDamageToDefending,20:DBDamageToOpponents
+SVar:NbAttackedPlayers:PlayerCountOpponents$HasPropertyDefending
+SVar:DBDamageToController:DB$ DealDamage | Defined$ You | NumDmg$ X | SpellDescription$ 1—9 VERT CARDNAME deals damage equal to its power to you.
+SVar:DBDamageToDefending:DB$ DealDamage | Defined$ Player.attackedBySourceThisCombat | NumDmg$ X | SpellDescription$ 10—19 VERT CARDNAME deals damage equal to its power to defending player.
+SVar:DBDamageToOpponents:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ X | SpellDescription$ 20 VERT CARDNAME deals damage equal to its power to each opponent.
+SVar:X:Count$CardPower
+Oracle:Whenever Iron Mastiff attacks, roll a d20 for each player being attacked and ignore all but the highest roll.\n1—9 VERT Iron Mastiff deals damage equal to its power to you.\n10—19 VERT Iron Mastiff deals damage equal to its power to defending player.\n20 VERT Iron Mastiff deals damage equal to its power to each opponent.

From 5280e2606603f9c3ec277d15e693ff7406a87858 Mon Sep 17 00:00:00 2001
From: Austere Grim <flibbertigibbet007@gmail.com>
Date: Tue, 12 Jul 2022 22:34:42 -0700
Subject: [PATCH 296/309] Rebalance defeat gold loss (#1111)

added percent loss to defeated
changed gold loss to be calculated by a variable percentage loss not static divide by two.
---
 .../src/forge/adventure/player/AdventurePlayer.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index 42e5f08ce5f..528136f3102 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -457,7 +457,8 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         onLifeTotalChangeList.emit();
     }
     public void defeated() {
-        gold=gold/2;
+        percentLoss = 10
+        gold=gold-(gold*percentLoss/100);
         life=Math.max(1,(int)(life-(maxLife*0.2f)));
         onLifeTotalChangeList.emit();
         onGoldChangeList.emit();

From 5c26394ad087d65e9463b3ebe269c4223b8d81ef Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 13 Jul 2022 18:28:19 +0800
Subject: [PATCH 297/309] missing ";"

---
 .../src/forge/adventure/player/AdventurePlayer.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index 528136f3102..d10b9d9fbdc 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -457,7 +457,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         onLifeTotalChangeList.emit();
     }
     public void defeated() {
-        percentLoss = 10
+        percentLoss = 10;
         gold=gold-(gold*percentLoss/100);
         life=Math.max(1,(int)(life-(maxLife*0.2f)));
         onLifeTotalChangeList.emit();

From bf481ea746c1a67777951b9e0300b8922d2f374b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 13 Jul 2022 18:33:45 +0800
Subject: [PATCH 298/309] Update AdventurePlayer.java

---
 .../src/forge/adventure/player/AdventurePlayer.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
index d10b9d9fbdc..b3658b2dcf2 100644
--- a/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
+++ b/forge-gui-mobile/src/forge/adventure/player/AdventurePlayer.java
@@ -457,7 +457,7 @@ public class AdventurePlayer implements Serializable, SaveFileContent {
         onLifeTotalChangeList.emit();
     }
     public void defeated() {
-        percentLoss = 10;
+        int percentLoss = 10;
         gold=gold-(gold*percentLoss/100);
         life=Math.max(1,(int)(life-(maxLife*0.2f)));
         onLifeTotalChangeList.emit();

From 14134f15a14bb2239fd4914806961483dc280114 Mon Sep 17 00:00:00 2001
From: Xavier <xmorinduchesne@gmail.com>
Date: Wed, 13 Jul 2022 08:45:31 -0400
Subject: [PATCH 299/309] Addressed comments on PR

---
 forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt | 4 ++--
 forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt b/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
index d22895723c4..709f63c0384 100644
--- a/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lantern_of_revealing.txt
@@ -2,7 +2,7 @@ Name:Lantern of Revealing
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Dig | Cost$ 4 T | DigNum$ 1 | ChangeNum$ All | ForceRevealToController$ True | Optional$ True | PromptToSkipOptionalAbility$ True | OptionalAbilityPrompt$ Would you like to put the land onto the battlefield tapped? | ChangeValid$ Land | DestinationZone$ Battlefield | Tapped$ True | DestinationZone2$ Library | LibraryPosition2$ 0 | RememberChanged$ True | SubAbility$ DBMoveToBottom | SpellDescription$ Look at the top card of your library. If it’s a land card, you may put it onto the battlefield tapped. If you don’t put the card onto the battlefield, you may put it on the bottom of your library.
+A:AB$ Dig | Cost$ 4 T | DigNum$ 1 | ChangeNum$ All | ForceRevealToController$ True | Optional$ True | PromptToSkipOptionalAbility$ True | OptionalAbilityPrompt$ Would you like to put the land onto the battlefield tapped? | ChangeValid$ Land | DestinationZone$ Battlefield | Tapped$ True | DestinationZone2$ Library | LibraryPosition2$ 0 | RememberChanged$ True | SubAbility$ DBMoveToBottom | SpellDescription$ Look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped. If you don't put the card onto the battlefield, you may put it on the bottom of your library.
 SVar:DBMoveToBottom:DB$ Dig | DigNum$ 1 | DestinationZone$ Library | Optional$ True | LibraryPosition$ -1 | LibraryPosition2$ 0 | ConditionPresent$ Card | ConditionDefined$ Remembered | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:{T}: Add one mana of any color.\n{4}, {T}: Look at the top card of your library. If it’s a land card, you may put it onto the battlefield tapped. If you don’t put the card onto the battlefield, you may put it on the bottom of your library.
\ No newline at end of file
+Oracle:{T}: Add one mana of any color.\n{4}, {T}: Look at the top card of your library. If it's a land card, you may put it onto the battlefield tapped. If you don't put the card onto the battlefield, you may put it on the bottom of your library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt b/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt
index 64ccaeb3fde..60fe45d69c2 100644
--- a/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt
+++ b/forge-gui/res/cardsfolder/upcoming/marching_duodrone.txt
@@ -2,6 +2,7 @@ Name:Marching Duodrone
 ManaCost:2
 Types:Artifact Creature Construct
 PT:2/2
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBTreasure | TriggerDescription$ Whenever CARDNAME attacks, each player creates a Treasure token.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBTreasure | TriggerDescription$ Whenever CARDNAME attacks, each player creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:DBTreasure:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ Player
+DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 Oracle:Whenever Marching Duodrone attacks, each player creates a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
\ No newline at end of file

From 14d7c0fb115aec0a36f5b5103066d7046c8cbfb1 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Wed, 13 Jul 2022 19:56:48 +0200
Subject: [PATCH 300/309] Fix NPE when copying spell with failed targeting
 (#1118)

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
---
 forge-ai/src/main/java/forge/ai/ComputerUtil.java  |  2 +-
 .../src/main/java/forge/ai/PlayerControllerAi.java | 14 ++++++--------
 forge-gui/res/cardsfolder/a/audacious_swap.txt     |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
index b85f75da7fd..b1914c95d84 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java
@@ -2826,7 +2826,7 @@ public class ComputerUtil {
         }
 
         return type.is(CounterEnumType.AWAKENING) || type.is(CounterEnumType.MANIFESTATION) || type.is(CounterEnumType.PETRIFICATION)
-                || type.is(CounterEnumType.TRAINING);
+                || type.is(CounterEnumType.TRAINING) || type.is(CounterEnumType.GHOSTFORM);
     }
 
     public static Player evaluateBoardPosition(final List<Player> listToEvaluate) {
diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
index 5ca41529349..64c833c4eea 100644
--- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
+++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
@@ -1045,16 +1045,14 @@ public class PlayerControllerAi extends PlayerController {
                         }
                     }
 
-                    /* FIXME: the new implementation (below) requires implementing setupNewTargets in the AI controller, among other possible changes, otherwise breaks AI
                     if (sa.isMayChooseNewTargets()) {
-                        sa.setupNewTargets(player);
-                    }
-                    */
-                    if (sa.isMayChooseNewTargets() && !sa.setupTargets()) {
-                        if (sa.isSpell()) {
-                            getGame().getAction().ceaseToExist(sa.getHostCard(), false);
+                        TargetChoices tc = sa.getTargets();
+                        if (!sa.setupTargets()) {
+                            // if AI can't choose targets need to keep old one even if illegal
+                            sa.setTargets(tc);
                         }
-                        continue;
+                        // FIXME: the new implementation (below) requires implementing setupNewTargets in the AI controller, among other possible changes, otherwise breaks AI
+                        // sa.setupNewTargets(player);
                     }
                 }
                 // need finally add the new spell to the stack
diff --git a/forge-gui/res/cardsfolder/a/audacious_swap.txt b/forge-gui/res/cardsfolder/a/audacious_swap.txt
index 1a6033ff4e8..c71b1d856b8 100644
--- a/forge-gui/res/cardsfolder/a/audacious_swap.txt
+++ b/forge-gui/res/cardsfolder/a/audacious_swap.txt
@@ -5,7 +5,7 @@ K:Casualty:2
 A:SP$ ChangeZone | ValidTgts$ Permanent.nonEnchantment | TgtPrompt$ Select target nonenchantment permanent | Origin$ Battlefield | Destination$ Library | Shuffle$ True | SubAbility$ DBExile | SpellDescription$ The owner of target nonenchantment permanent shuffles it into their library,
 SVar:DBExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Defined$ TargetedOwner | RememberChanged$ True | SubAbility$ DBPutLand | SpellDescription$ then exiles the top card of their library.
 SVar:DBPutLand:DB$ ChangeZone | ConditionDefined$ Remembered | ConditionPresent$ Land | Defined$ Remembered | DefinedDesc$ it | Origin$ Exile | Destination$ Battlefield | ForgetChanged$ True | SubAbility$ DBCast | SpellDescription$ If it's a land card, they put it onto the battlefield.
-SVar:DBCast:DB$ Play | Defined$ Remembered | DefinedDesc$ it | ValidSA$ Spell | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup | SpellDescription$ Otherwise, they may cast it without paying its mana cost.
+SVar:DBCast:DB$ Play | Defined$ Remembered | DefinedDesc$ it | ValidSA$ Spell | Controller$ RememberedOwner | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup | SpellDescription$ Otherwise, they may cast it without paying its mana cost.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice
 Oracle:Casualty 2 (As you cast this spell, you may sacrifice a creature with power 2 or greater. When you do, copy this spell and you may choose a new target for the copy.)\nThe owner of target nonenchantment permanent shuffles it into their library, then exiles the top card of their library. If it's a land card, they put it onto the battlefield. Otherwise, they may cast it without paying its mana cost.

From b4751cdc617e51ffbb94188656159c22f910a7cf Mon Sep 17 00:00:00 2001
From: CCTV-1 <script.tar.gz@gmail.com>
Date: Thu, 14 Jul 2022 12:12:09 +0800
Subject: [PATCH 301/309] translate new setting texts.

---
 forge-gui/res/languages/zh-CN.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index fd78fe555f9..98aeec6bf1e 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -183,7 +183,7 @@ nlWorkshopSyntax=在作坊中启用卡牌脚本检查。注意：该功能任在
 nlGameLogEntryType=更改游戏中日志显示的信息量。排序为最少到最详细。
 nlCloseAction=更改单击右上角X按钮时的动作
 nlLoadCardsLazily=如果打开该选项Forge将在使用到卡牌脚本时才加载（警告：实验状态）。
-nlLoadArchivedFormats=If turned on, Forge will load all archived format definitions, this may take slightly longer to load at startup.
+nlLoadArchivedFormats=如果启用该选项，Forge将会在启动时加载所有历史赛制，这可能会导致Forge的启动时间明显变长。
 GraphicOptions=图形选项
 nlDefaultFontSize=UI中字体的默认大小。所有字体元素都相对于此缩放。（需要重启）
 nlCardArtFormat=牌图的格式。（Full表示使用完整的牌张图片，Crop表示只使用牌图的插画部分）
@@ -554,7 +554,7 @@ cbWantReprints=允许来自其他系列的重印牌
 lblChooseFormats=选择赛制
 lblSanctioned=常规
 lblOther=其他
-lblArchived=Archived
+lblArchived=存档
 lblCancel=取消
 #DialogChoosePoolDistribution.java
 lblBlack=黑
@@ -1507,7 +1507,7 @@ lblAttachee=结附
 lblNumberBlockers=阻挡者数
 lblBlocker=阻挡者
 #TriggerAttackerBlockedOnce.java
-lblAttackers=Attackers
+lblAttackers=进攻者
 #TriggerAttackersDeclared.java
 lblNumberAttackers=攻击者数
 #TriggerAttackerUnblockedOnce.java
@@ -2677,7 +2677,7 @@ lblRenameQuestTo=重命名冒险之旅为
 lblQuestRename=冒险之旅重命名
 #StartingPoolType.java
 lblUnrestricted=无限制
-lblCasualOrArchivedFormat=Casual/Archived format
+lblCasualOrArchivedFormat=休闲/存档赛制
 lblCustomFormat=自定义赛制
 lblEventOrStartDeck=活动或初始套牌
 lblMySealedDeck=我的现开套牌

From 26d906a89a5d93eea1453b8fbf6562c03121c509 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 14 Jul 2022 14:12:45 +0800
Subject: [PATCH 302/309] Support for preferred Skin sleeves

---
 forge-gui-mobile/src/forge/assets/FSkin.java  | 83 ++++++++++++++-----
 .../src/forge/assets/ImageCache.java          |  4 +-
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 3660243cdff..87b06d45b5b 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -238,6 +238,8 @@ public class FSkin {
         final FileHandle f17 = getDefaultSkinFile(ForgeConstants.SPRITE_CRACKS_FILE);
         final FileHandle f18 = getDefaultSkinFile(ForgeConstants.SPRITE_PHYREXIAN_FILE);
         final FileHandle f19 = getDefaultSkinFile(ForgeConstants.SPRITE_CURSOR_FILE);
+        final FileHandle f20 = getSkinFile(ForgeConstants.SPRITE_SLEEVES_FILE);
+        final FileHandle f21 = getSkinFile(ForgeConstants.SPRITE_SLEEVES2_FILE);
 
         /*TODO Themeable
         final FileHandle f14 = getDefaultSkinFile(ForgeConstants.SPRITE_SETLOGO_FILE);
@@ -313,7 +315,7 @@ public class FSkin {
             int counter = 0;
             int scount = 0;
             Color pxTest;
-            Pixmap pxDefaultAvatars, pxPreferredAvatars, pxDefaultSleeves;
+            Pixmap pxDefaultAvatars, pxPreferredAvatars, pxDefaultSleeves, pxPreferredSleeves;
 
             pxDefaultAvatars = new Pixmap(f4);
             pxDefaultSleeves = new Pixmap(f8);
@@ -356,33 +358,68 @@ public class FSkin {
                     }
                 }
             }
+            if (f20.exists()) {
+                pxPreferredSleeves = new Pixmap(f20);
+                manager.load(f20.path(), Texture.class, parameter);
+                manager.finishLoadingAsset(f20.path());
 
-            final int sw = pxDefaultSleeves.getWidth();
-            final int sh = pxDefaultSleeves.getHeight();
+                final int sw = pxPreferredSleeves.getWidth();
+                final int sh = pxPreferredSleeves.getHeight();
 
-            for (int j = 0; j < sh; j += 500) {
-                for (int i = 0; i < sw; i += 360) {
-                    pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
-                    if (pxTest.a == 0) { continue; }
-                    Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f8.path(), Texture.class), i, j, 360, 500));
+                for (int j = 0; j < sh; j += 500) {
+                    for (int i = 0; i < sw; i += 360) {
+                        pxTest = new Color(pxPreferredSleeves.getPixel(i + 180, j + 250));
+                        if (pxTest.a == 0) { continue; }
+                        Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f20.path(), Texture.class), i, j, 360, 500));
+                    }
+                }
+                pxPreferredSleeves.dispose();
+            } else {
+                final int sw = pxDefaultSleeves.getWidth();
+                final int sh = pxDefaultSleeves.getHeight();
+
+                for (int j = 0; j < sh; j += 500) {
+                    for (int i = 0; i < sw; i += 360) {
+                        pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
+                        if (pxTest.a == 0) { continue; }
+                        Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f8.path(), Texture.class), i, j, 360, 500));
+                    }
+                }
+            }
+            if (f21.exists()) {
+                pxPreferredSleeves = new Pixmap(f21);
+                manager.load(f21.path(), Texture.class, parameter);
+                manager.finishLoadingAsset(f21.path());
+
+                final int sw = pxPreferredSleeves.getWidth();
+                final int sh = pxPreferredSleeves.getHeight();
+
+                for (int j = 0; j < sh; j += 500) {
+                    for (int i = 0; i < sw; i += 360) {
+                        pxTest = new Color(pxPreferredSleeves.getPixel(i + 180, j + 250));
+                        if (pxTest.a == 0) { continue; }
+                        Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f21.path(), Texture.class), i, j, 360, 500));
+                    }
+                }
+                pxPreferredSleeves.dispose();
+            } else {
+                //re init second set of sleeves
+                pxDefaultSleeves = new Pixmap(f9);
+                manager.load(f9.path(), Texture.class, parameter);
+                manager.finishLoadingAsset(f9.path());
+
+                final int sw2 = pxDefaultSleeves.getWidth();
+                final int sh2 = pxDefaultSleeves.getHeight();
+
+                for (int j = 0; j < sh2; j += 500) {
+                    for (int i = 0; i < sw2; i += 360) {
+                        pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
+                        if (pxTest.a == 0) { continue; }
+                        Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f9.path(), Texture.class), i, j, 360, 500));
+                    }
                 }
             }
 
-            //re init second set of sleeves
-            pxDefaultSleeves = new Pixmap(f9);
-            manager.load(f9.path(), Texture.class, parameter);
-            manager.finishLoadingAsset(f9.path());
-
-            final int sw2 = pxDefaultSleeves.getWidth();
-            final int sh2 = pxDefaultSleeves.getHeight();
-
-            for (int j = 0; j < sh2; j += 500) {
-                for (int i = 0; i < sw2; i += 360) {
-                    pxTest = new Color(pxDefaultSleeves.getPixel(i + 180, j + 250));
-                    if (pxTest.a == 0) { continue; }
-                    Forge.getAssets().sleeves.put(scount++, new TextureRegion(manager.get(f9.path(), Texture.class), i, j, 360, 500));
-                }
-            }
             //cracks
             manager.load(f17.path(), Texture.class, parameter);
             manager.finishLoadingAsset(f17.path());
diff --git a/forge-gui-mobile/src/forge/assets/ImageCache.java b/forge-gui-mobile/src/forge/assets/ImageCache.java
index 403c7b94a75..b1f5cfec90e 100644
--- a/forge-gui-mobile/src/forge/assets/ImageCache.java
+++ b/forge-gui-mobile/src/forge/assets/ImageCache.java
@@ -318,12 +318,10 @@ public class ImageCache {
         for (String asset : toUnload) {
             if(manager.contains(asset))
                 manager.unload(asset);
+            cardsLoaded.remove(asset);
         }
         //clear cachedArt since this is dependant to the loaded texture
         CardRenderer.clearcardArtCache();
-        cardsLoaded.clear();
-        //update with recent
-        cardsLoaded.addAll(newQ);
     }
     public static void preloadCache(Iterable<String> keys) {
         if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))

From 30819f2ad138c11fe98f2a6bb853874da45d7ab0 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Thu, 14 Jul 2022 16:28:49 +0200
Subject: [PATCH 303/309] Fix copied trigger not resetting
 numberTurnActivations

---
 forge-game/src/main/java/forge/game/trigger/Trigger.java | 1 +
 forge-gui/res/cardsfolder/f/final_parting.txt            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 5b26b7adcbe..50a6f2f0c84 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -507,6 +507,7 @@ public abstract class Trigger extends TriggerReplacementBase {
 
         if (!lki) {
             copy.setId(nextId());
+            copy.numberTurnActivations = 0;
         }
 
         if (validPhases != null) {
diff --git a/forge-gui/res/cardsfolder/f/final_parting.txt b/forge-gui/res/cardsfolder/f/final_parting.txt
index 7738200ee91..45b80065299 100644
--- a/forge-gui/res/cardsfolder/f/final_parting.txt
+++ b/forge-gui/res/cardsfolder/f/final_parting.txt
@@ -2,7 +2,7 @@ Name:Final Parting
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 B B | Origin$ Library | Destination$ Library | ChangeType$ Card | ChangeNum$ 2 | Mandatory$ True | RememberChanged$ True | Shuffle$ False | StackDescription$ SpellDescription | SubAbility$ DBChangeZone1 | SpellDescription$ Search your library for two cards. Put one into your hand and the other into your graveyard. Then shuffle.
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to your hand | Shuffle$ False | SubAbility$ DBChangeZone2 | StackDescription$ None
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to your hand | Shuffle$ False | NoReveal$ True | SubAbility$ DBChangeZone2 | StackDescription$ None
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeType$ Card.IsRemembered | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to your graveyard | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Search your library for two cards. Put one into your hand and the other into your graveyard. Then shuffle.

From acf0670b761e619b85a58fb7e99c4e65886194e4 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Thu, 14 Jul 2022 17:55:08 +0200
Subject: [PATCH 304/309] Use ActivationTable for triggers with Limit

---
 .../main/java/forge/game/phase/PhaseHandler.java |  1 -
 .../main/java/forge/game/trigger/Trigger.java    | 16 ++++------------
 .../java/forge/game/trigger/TriggerHandler.java  |  9 ---------
 3 files changed, 4 insertions(+), 22 deletions(-)

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 8ab507529ac..b267caa6292 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -836,7 +836,6 @@ public class PhaseHandler implements java.io.Serializable {
         game.getStack().onNextTurn();
 
         game.getTriggerHandler().clearThisTurnDelayedTrigger();
-        game.getTriggerHandler().resetTurnTriggerState();
 
         Player next = getNextActivePlayer();
         while (next.hasLost()) {
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 50a6f2f0c84..d736589e14d 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -77,10 +77,6 @@ public abstract class Trigger extends TriggerReplacementBase {
 
     private List<Object> triggerRemembered = Lists.newArrayList();
 
-    // number of times this trigger was activated this this turn
-    // used to handle once-per-turn triggers like Crawling Sensation
-    private int numberTurnActivations = 0;
-
     private Set<PhaseType> validPhases;
 
     private SpellAbility spawningAbility;
@@ -507,7 +503,6 @@ public abstract class Trigger extends TriggerReplacementBase {
 
         if (!lki) {
             copy.setId(nextId());
-            copy.numberTurnActivations = 0;
         }
 
         if (validPhases != null) {
@@ -537,16 +532,13 @@ public abstract class Trigger extends TriggerReplacementBase {
     }
 
     public int getActivationsThisTurn() {
-        return this.numberTurnActivations;
+        return hostCard.getAbilityActivatedThisTurn(this.getOverridingAbility());
     }
 
     public void triggerRun() {
-        this.numberTurnActivations++;
-    }
-
-    // Resets the state stored each turn for per-turn and per-instance restriction
-    public void resetTurnState() {
-        this.numberTurnActivations = 0;
+        if (this.getOverridingAbility() != null) {
+            hostCard.addAbilityActivated(this.getOverridingAbility());
+        }
     }
 
     /** {@inheritDoc} */
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 c0a3e78cffe..b3abf325181 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -346,15 +346,6 @@ public class TriggerHandler {
         waitingTriggers.clear();
     }
 
-    public void resetTurnTriggerState() {
-        for (final Trigger t : activeTriggers) {
-            t.resetTurnState();
-        }
-        for (final Trigger t : delayedTriggers) {
-            t.resetTurnState();
-        }
-    }
-
     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();

From 462c20af86e006d964b4e34585306a05814ac8a7 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 15 Jul 2022 00:35:44 +0800
Subject: [PATCH 305/309] (Adventure) Double Tap Avatar to show Menu buttons -
 useful for Android devices without navigation buttons (back key to show menu
 by default) (Gesture detections like Edge detection needs AppCompatActivity
 which is missing on Forge Android)

---
 .../src/forge/adventure/stage/GameHUD.java             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index 08457be0005..fe979c69755 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -5,6 +5,7 @@ import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
 import com.badlogic.gdx.scenes.scene2d.ui.Image;
@@ -317,7 +318,7 @@ public class GameHUD extends Stage {
     }
     class ConsoleToggleListener extends ActorGestureListener {
         public ConsoleToggleListener() {
-            getGestureDetector().setLongPressSeconds(0.5f);
+            getGestureDetector().setLongPressSeconds(0.6f);
         }
         @Override
         public boolean longPress(Actor actor, float x, float y) {
@@ -325,5 +326,12 @@ public class GameHUD extends Stage {
             console.toggle();
             return super.longPress(actor, x, y);
         }
+        @Override
+        public void tap(InputEvent event, float x, float y, int count, int button) {
+            super.tap(event, x, y, count, button);
+            //show menu buttons if double tapping the avatar, for android devices without visible navigation buttons
+            if (count > 1)
+                showButtons();
+        }
     }
 }

From 02f7b7f383aef37eb8988f5c660ed7fae1237054 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 15 Jul 2022 00:48:02 +0800
Subject: [PATCH 306/309] make avatar semi transparent inside tiledmap

---
 .../src/forge/adventure/stage/GameHUD.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index fe979c69755..48efd81678e 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -252,23 +252,25 @@ public class GameHUD extends Stage {
         mapborder.setVisible(visible);
         miniMapPlayer.setVisible(visible);
         gamehud.setVisible(visible);
-        avatarborder.setVisible(visible);
-        avatar.setVisible(visible);
         lifePoints.setVisible(visible);
         money.setVisible(visible);
         blank.setVisible(visible);
         if (visible) {
+            avatarborder.getColor().a = 1f;
+            avatar.getColor().a = 1f;
             deckActor.getColor().a = 1f;
             menuActor.getColor().a = 1f;
             statsActor.getColor().a = 1f;
             inventoryActor.getColor().a = 1f;
             opacity = 1f;
         } else {
-            deckActor.getColor().a = 0.5f;
-            menuActor.getColor().a = 0.5f;
-            statsActor.getColor().a = 0.5f;
-            inventoryActor.getColor().a = 0.5f;
-            opacity = 0.5f;
+            avatarborder.getColor().a = 0.4f;
+            avatar.getColor().a = 0.4f;
+            deckActor.getColor().a = 0.4f;
+            menuActor.getColor().a = 0.4f;
+            statsActor.getColor().a = 0.4f;
+            inventoryActor.getColor().a = 0.4f;
+            opacity = 0.4f;
         }
     }
 

From c05ea978221ee3f096a765739a6ca3fd5f6d172b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 15 Jul 2022 01:01:41 +0800
Subject: [PATCH 307/309] update controls

---
 forge-gui-mobile/src/forge/adventure/stage/GameHUD.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
index 48efd81678e..4d6209d0150 100644
--- a/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
+++ b/forge-gui-mobile/src/forge/adventure/stage/GameHUD.java
@@ -193,7 +193,8 @@ public class GameHUD extends Stage {
         }
         //auto follow touchpad
         if (GuiBase.isAndroid() && !MapStage.getInstance().getDialogOnlyInput() && !console.isVisible()) {
-            if (!(Controls.actorContainsVector(miniMap,touch)) // not inside map bounds
+            if (!(Controls.actorContainsVector(avatar,touch)) // not inside avatar bounds
+                    && !(Controls.actorContainsVector(miniMap,touch)) // not inside map bounds
                     && !(Controls.actorContainsVector(gamehud,touch)) //not inside gamehud bounds
                     && !(Controls.actorContainsVector(menuActor,touch)) //not inside menu button
                     && !(Controls.actorContainsVector(deckActor,touch)) //not inside deck button

From 2a37888748ffe687d614b69b9e6cb317ac5af08e Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 15 Jul 2022 03:10:44 +0800
Subject: [PATCH 308/309] Update jade_orb_of_dragonkind.txt

---
 .../res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
index 085d4d7e373..98659ed95de 100644
--- a/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
@@ -2,9 +2,12 @@ Name:Jade Orb of Dragonkind
 ManaCost:2 G
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ G | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
-SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigETBReplacement | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
-SVar:TrigETBReplacement:DB$ Pump | Defined$ TriggeredCard | KW$ etbCounter:P1P1:1:no Condition:no desc | PumpZone$ Stack | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ TriggeredCard | Duration$ UntilYourNextTurn | KW$ Hexproof | PumpZone$ Stack
+SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat
+SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn.
+SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1 | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ ReplacedCard | Duration$ UntilYourNextTurn | KW$ Hexproof | PumpZone$ Stack
 DeckHas:Ability$Counters
 DeckHints:Type$Dragon
 Oracle:{T}: Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
+

From 612714aca54b135804c1d8edc9af4d5a15d39641 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Fri, 15 Jul 2022 03:28:41 +0800
Subject: [PATCH 309/309] Update jade_orb_of_dragonkind.txt

---
 forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
index 98659ed95de..51f0beaf807 100644
--- a/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
+++ b/forge-gui/res/cardsfolder/upcoming/jade_orb_of_dragonkind.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ G | TriggersWhenSpent$ TrigSpent | SpellDescription$ Add {G}. When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
 SVar:TrigSpent:Mode$ SpellCast | ValidCard$ Creature.Dragon | ValidActivatingPlayer$ You | Execute$ TrigEffect | TriggerDescription$ When you spend this mana to cast a Dragon creature spell, it enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn. (It can't be the target of spells or abilities your opponents control.)
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ReplacementEffects$ ETBCreat
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ETBCreat
 SVar:ETBCreat:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ DBPutP1P1 | ReplacementResult$ Updated | Description$ That creature enters the battlefield with an additional +1/+1 counter on it and gains hexproof until your next turn.
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 1 | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ ReplacedCard | Duration$ UntilYourNextTurn | KW$ Hexproof | PumpZone$ Stack