From 7175ec2a933eb7080dae89efecaa80d16409b21f Mon Sep 17 00:00:00 2001
From: paul_snoops <paulhammerton1@hotmail.co.uk>
Date: Fri, 5 Feb 2021 18:34:05 +0000
Subject: [PATCH] Various fixes

---
 .../Duel Decks Ajani vs. Nicol Bolas.txt      | 146 ++++++++--------
 .../Duel Decks Divine vs. Demonic.txt         | 111 ++++++------
 .../Duel Decks Elspeth vs. Tezzeret.txt       | 134 +++++++-------
 .../editions/Duel Decks Elves vs. Goblins.txt |  79 ++++-----
 .../Duel Decks Garruk vs. Liliana.txt         | 121 +++++++------
 .../Duel Decks Heroes vs. Monsters.txt        | 138 +++++++--------
 .../editions/Duel Decks Izzet vs. Golgari.txt | 164 +++++++++---------
 .../editions/Duel Decks Jace vs. Chandra.txt  | 115 ++++++------
 .../Duel Decks Knights vs. Dragons.txt        | 138 +++++++--------
 .../Duel Decks Phyrexia vs. the Coalition.txt | 129 +++++++-------
 .../editions/Duel Decks Sorin vs. Tibalt.txt  | 152 ++++++++--------
 .../editions/Duel Decks Speed vs. Cunning.txt |  24 +--
 .../editions/Duel Decks Venser vs. Koth.txt   | 138 +++++++--------
 .../Duel Decks Zendikar vs. Eldrazi.txt       |  88 +++++-----
 forge-gui/res/editions/Kaladesh.txt           |   1 -
 forge-gui/res/editions/Kaldheim Commander.txt |   2 +-
 forge-gui/res/editions/Mystery Booster.txt    |   2 +-
 .../res/editions/Secret Lair Drop Series.txt  |   2 +-
 forge-gui/res/editions/Tempest.txt            |   2 +-
 forge-gui/res/editions/The List.txt           |   6 +-
 .../res/editions/Theros Beyond Death.txt      |   8 -
 forge-gui/res/formats/Sanctioned/Standard.txt |   2 +-
 22 files changed, 840 insertions(+), 862 deletions(-)

diff --git a/forge-gui/res/editions/Duel Decks Ajani vs. Nicol Bolas.txt b/forge-gui/res/editions/Duel Decks Ajani vs. Nicol Bolas.txt
index 4e8047a54d4..816f147436f 100644
--- a/forge-gui/res/editions/Duel Decks Ajani vs. Nicol Bolas.txt	
+++ b/forge-gui/res/editions/Duel Decks Ajani vs. Nicol Bolas.txt	
@@ -6,86 +6,86 @@ MciCode=ddh
 Type=Duel_Decks
 
 [cards]
-18 R Ageless Entity
-66 C Agonizing Demise
 1 M Ajani Vengeant
-22 C Ajani's Mantra
-9 U Ajani's Pridemate
-28 U Behemoth Sledge
-52 R Blazing Specter
-46 C Brackwater Elemental
-14 U Briarhorn
-6 C Canyon Wildcat
-59 U Countersquall
-69 R Cruel Ultimatum
-74 U Crumbling Necropolis
-65 U Deep Analysis
-49 R Dimir Cutpurse
-68 U Elder Mastery
+2 U Kird Ape
 3 C Essence Warden
-32 C Evolving Wilds
-53 U Fire-Field Ogre
-21 R Firemane Angel
-12 U Fleetfoot Panther
-38 L Forest
-38 L Forest
-33 U Graypelt Refuge
-11 C Grazing Gladehart
-25 U Griffin Guide
-63 U Grixis Charm
-48 U Hellfire Mongrel
-64 U Icy Manipulator
-57 C Igneous Pouncer
-79 L Island
+4 C Wild Nacatl
+5 U Loam Lion
+6 C Canyon Wildcat
 7 U Jade Mage
-56 C Jhessian Zombies
+8 C Sylvan Ranger
+9 U Ajani's Pridemate
+10 C Qasali Pridemage
+11 C Grazing Gladehart
+12 U Fleetfoot Panther
+13 U Woolly Thoctar
+14 U Briarhorn
+15 R Loxodon Hierarch
+16 U Spitemare
+17 U Marisi's Twinclaws
+18 R Ageless Entity
+19 U Pride of Lions
+20 U Nacatl Hunt-Pride
+21 R Firemane Angel
+22 C Ajani's Mantra
+23 U Lightning Helix
+24 U Lead the Stampede
+25 U Griffin Guide
+26 C Recumbent Bliss
+27 R Searing Meditation
+28 U Behemoth Sledge
+29 U Naya Charm
+30 C Sylvan Bounty
+31 R Titanic Ultimatum
+32 C Evolving Wilds
+33 U Graypelt Refuge
 34 U Jungle Shrine
 35 U Kazandu Refuge
-2 U Kird Ape
-24 U Lead the Stampede
-23 U Lightning Helix
-5 U Loam Lion
-15 R Loxodon Hierarch
-17 U Marisi's Twinclaws
-47 C Morgue Toad
-51 U Moroii
-41 L Mountain
-41 L Mountain
-20 U Nacatl Hunt-Pride
-29 U Naya Charm
-42 M Nicol Bolas, Planeswalker
-44 C Nightscape Familiar
-60 C Obelisk of Grixis
-55 C Ogre Savant
-72 U Pain // Suffering
-40 L Plains
-19 U Pride of Lions
-70 R Profane Command
-10 C Qasali Pridemage
-61 C Recoil
-26 C Recumbent Bliss
-73 U Rise // Fall
-75 C Rupture Spire
 36 U Sapseep Forest
-27 R Searing Meditation
-54 U Shriekmaw
-67 U Slave of Bolas
-45 U Slavering Nulls
-71 U Spite // Malice
-16 U Spitemare
-50 C Steamcore Weird
-43 C Surveilling Sprite
-78 L Swamp
-78 L Swamp
-30 C Sylvan Bounty
-8 C Sylvan Ranger
-76 C Terramorphic Expanse
-31 R Titanic Ultimatum
-62 R Undermine
-58 C Vapor Snag
 37 U Vitu-Ghazi, the City-Tree
-4 C Wild Nacatl
-13 U Woolly Thoctar
+38 L Forest
+39 L Forest
+40 L Plains
+41 L Mountain
+42 M Nicol Bolas, Planeswalker
+43 C Surveilling Sprite
+44 C Nightscape Familiar
+45 U Slavering Nulls
+46 C Brackwater Elemental
+47 C Morgue Toad
+48 U Hellfire Mongrel
+49 R Dimir Cutpurse
+50 C Steamcore Weird
+51 U Moroii
+52 R Blazing Specter
+53 U Fire-Field Ogre
+54 U Shriekmaw
+55 C Ogre Savant
+56 C Jhessian Zombies
+57 C Igneous Pouncer
+58 C Vapor Snag
+59 U Countersquall
+60 C Obelisk of Grixis
+61 C Recoil
+62 R Undermine
+63 U Grixis Charm
+64 U Icy Manipulator
+65 U Deep Analysis
+66 C Agonizing Demise
+67 U Slave of Bolas
+68 U Elder Mastery
+69 R Cruel Ultimatum
+70 R Profane Command
+71 U Spite // Malice
+72 U Pain // Suffering
+73 U Rise // Fall
+74 U Crumbling Necropolis
+75 C Rupture Spire
+76 C Terramorphic Expanse
+77 L Swamp
+78 L Swamp
+79 L Island
+80 L Mountain
 
 [tokens]
 w_2_2_griffin_flying
diff --git a/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt b/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt
index 3f312721df0..c060770cf06 100644
--- a/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt	
+++ b/forge-gui/res/editions/Duel Decks Divine vs. Demonic.txt	
@@ -7,71 +7,68 @@ MciCode=dvd
 Type=Duel_Decks
 
 [cards]
-31 C Abyssal Gatekeeper
-40 U Abyssal Specter
 1 M Akroma, Angel of Wrath
-9 U Angel of Mercy
-23 U Angel's Feather
-19 U Angelic Benediction
+2 U Icatian Priest
 3 C Angelic Page
+4 C Charging Paladin
+5 C Venerable Monk
 6 U Angelic Protector
+7 U Serra Advocate
+8 U Sustainer of the Realm
+9 U Angel of Mercy
+10 R Serra Angel
+11 R Twilight Shepherd
+12 R Luminous Angel
+13 R Reya Dawnbringer
+14 C Healing Salve
 15 C Angelsong
-58 C Barren Moor
+16 U Otherworldly Journey
+17 C Pacifism
+18 U Serra's Boon
+19 U Angelic Benediction
+20 C Faith's Fetters
+21 U Serra's Embrace
+22 U Righteous Cause
+23 U Angel's Feather
+24 U Marble Diamond
+25 C Secluded Steppe
+26 L Plains
+27 L Plains
+28 L Plains
+29 L Plains
+30 M Lord of the Pit
+31 C Abyssal Gatekeeper
+32 C Foul Imp
+33 U Daggerclaw Imp
+34 C Dusk Imp
+35 C Overeager Apprentice
+36 C Stinkweed Imp
+37 U Soot Imp
+38 C Demon's Jester
+39 U Souldrinker
+40 U Abyssal Specter
+41 C Cackling Imp
+42 R Fallen Angel
+43 R Reiver Demon
+44 R Kuro, Pitlord
+45 C Dark Ritual
+46 C Duress
+47 C Unholy Strength
+48 U Cruel Edict
+49 U Demonic Tutor
+50 C Dark Banishing
+51 U Oni Possession
 52 U Barter in Blood
 53 U Breeding Pit
-41 C Cackling Imp
-4 C Charging Paladin
-56 U Consume Spirit
-55 U Corrupt
-48 U Cruel Edict
-33 U Daggerclaw Imp
-50 C Dark Banishing
-45 C Dark Ritual
-C Demon
-57 U Demon's Horn
-38 C Demon's Jester
-49 U Demonic Tutor
-46 C Duress
-34 C Dusk Imp
-20 C Faith's Fetters
-42 R Fallen Angel
-32 C Foul Imp
-14 C Healing Salve
-2 U Icatian Priest
-44 R Kuro, Pitlord
-30 M Lord of the Pit
-12 R Luminous Angel
-24 U Marble Diamond
-51 U Oni Possession
-16 U Otherworldly Journey
-35 C Overeager Apprentice
-17 C Pacifism
-28 L Plains
-28 L Plains
-28 L Plains
-28 L Plains
 54 R Promise of Power
-43 R Reiver Demon
-13 R Reya Dawnbringer
-22 U Righteous Cause
-25 C Secluded Steppe
-7 U Serra Advocate
-10 R Serra Angel
-18 U Serra's Boon
-21 U Serra's Embrace
-37 U Soot Imp
-39 U Souldrinker
-C Spirit
-36 C Stinkweed Imp
-8 U Sustainer of the Realm
+55 U Corrupt
+56 U Consume Spirit
+57 U Demon's Horn
+58 C Barren Moor
 59 L Swamp
-59 L Swamp
-59 L Swamp
-59 L Swamp
-C Thrull
-11 R Twilight Shepherd
-47 C Unholy Strength
-5 C Venerable Monk
+60 L Swamp
+61 L Swamp
+62 L Swamp
 
 [tokens]
 w_1_1_spirit_flying
diff --git a/forge-gui/res/editions/Duel Decks Elspeth vs. Tezzeret.txt b/forge-gui/res/editions/Duel Decks Elspeth vs. Tezzeret.txt
index a8a667d043a..5dea67074fe 100644
--- a/forge-gui/res/editions/Duel Decks Elspeth vs. Tezzeret.txt	
+++ b/forge-gui/res/editions/Duel Decks Elspeth vs. Tezzeret.txt	
@@ -6,85 +6,85 @@ MciCode=ddf
 Type=Duel_Decks
 
 [cards]
-61 C AEther Spellbomb
-29 U Abolish
-20 R Angel of Salvation
-40 C Arcbound Worker
-69 U Argivian Restoration
-45 U Assembly-Worker
-28 C Blinding Beam
-11 C Burrenton Bombardier
-18 R Catapult Master
-14 U Celestial Crusader
-50 C Clockwork Condor
-55 U Clockwork Hydra
-19 C Conclave Equenaut
-16 U Conclave Phalanx
-63 U Contagion Clasp
-27 R Crusade
-72 C Darksteel Citadel
-32 U Daru Encampment
-66 C Echoing Truth
-2 U Elite Vanguard
-62 U Elixir of Immortality
 1 M Elspeth, Knight-Errant
-64 U Energy Chamber
-47 U Esperzoa
-60 U Everflowing Chalice
-54 C Faerie Mechanist
-70 U Foil
-51 C Frogmite
-7 C Glory Seeker
+2 U Elite Vanguard
 3 C Goldmeadow Harrier
 4 C Infantry Veteran
-76 L Island
-76 L Island
-76 L Island
-76 L Island
-23 C Journey to Nowhere
-52 U Juggernaut
-33 C Kabira Crossroads
-13 C Kemba's Skyguard
-10 U Kor Aeronaut
-12 C Kor Hookmaster
-8 C Kor Skyfisher
 5 R Loyal Sentry
-48 R Master of Etherium
-24 C Mighty Leap
-73 U Mishra's Factory
-67 C Moonglove Extract
 6 C Mosquito Guard
-58 R Pentavus
-37 L Plains
-37 L Plains
-37 L Plains
-37 L Plains
-59 U Qumulox
+7 C Glory Seeker
+8 C Kor Skyfisher
+9 C Temple Acolyte
+10 U Kor Aeronaut
+11 C Burrenton Bombardier
+12 C Kor Hookmaster
+13 C Kemba's Skyguard
+14 U Celestial Crusader
+15 U Seasoned Marshal
+16 U Conclave Phalanx
+17 U Stormfront Riders
+18 R Catapult Master
+19 C Conclave Equenaut
+20 R Angel of Salvation
+21 C Sunlance
+22 U Swords to Plowshares
+23 C Journey to Nowhere
+24 C Mighty Leap
 25 C Raise the Alarm
 26 C Razor Barrier
-56 R Razormane Masticore
-42 U Runed Servitor
-34 R Rustic Clachan
+27 R Crusade
+28 C Blinding Beam
+29 U Abolish
 30 U Saltblast
-15 U Seasoned Marshal
-74 C Seat of the Synod
-46 U Serrated Biskelion
-43 C Silver Myr
-75 U Stalking Stones
-44 R Steel Overseer
-41 C Steel Wall
-17 U Stormfront Riders
-21 C Sunlance
 31 U Swell of Courage
-22 U Swords to Plowshares
-53 U Synod Centurion
-9 C Temple Acolyte
+32 U Daru Encampment
+33 C Kabira Crossroads
+34 R Rustic Clachan
+35 L Plains
+36 L Plains
+37 L Plains
+38 L Plains
 39 M Tezzeret the Seeker
-68 U Thirst for Knowledge
-71 C Thoughtcast
+40 C Arcbound Worker
+41 C Steel Wall
+42 U Runed Servitor
+43 C Silver Myr
+44 R Steel Overseer
+45 U Assembly-Worker
+46 U Serrated Biskelion
+47 U Esperzoa
+48 R Master of Etherium
 49 C Trinket Mage
-65 U Trip Noose
+50 C Clockwork Condor
+51 C Frogmite
+52 U Juggernaut
+53 U Synod Centurion
+54 C Faerie Mechanist
+55 U Clockwork Hydra
+56 R Razormane Masticore
 57 R Triskelion
+58 R Pentavus
+59 U Qumulox
+60 U Everflowing Chalice
+61 C Aether Spellbomb
+62 U Elixir of Immortality
+63 U Contagion Clasp
+64 U Energy Chamber
+65 U Trip Noose
+66 C Echoing Truth
+67 C Moonglove Extract
+68 U Thirst for Knowledge
+69 U Argivian Restoration
+70 U Foil
+71 C Thoughtcast
+72 C Darksteel Citadel
+73 U Mishra's Factory
+74 C Seat of the Synod
+75 U Stalking Stones
+76 L Island
+77 L Island
+78 L Island
+79 L Island
 
 [tokens]
 w_1_1_soldier
diff --git a/forge-gui/res/editions/Duel Decks Elves vs. Goblins.txt b/forge-gui/res/editions/Duel Decks Elves vs. Goblins.txt
index 469facc20ac..c2514a8ee0e 100644
--- a/forge-gui/res/editions/Duel Decks Elves vs. Goblins.txt	
+++ b/forge-gui/res/editions/Duel Decks Elves vs. Goblins.txt	
@@ -6,71 +6,68 @@ MciCode=dd1
 Type=Duel_Decks
 
 [cards]
-33 U Akki Coalflinger
-2 R Allosaurus Rider
 1 R Ambush Commander
-54 U Boggart Shenanigans
-34 R Clickslither
-C Elemental
-C Elf Warrior
+2 R Allosaurus Rider
 3 C Elvish Eulogist
 4 U Elvish Harbinger
-20 U Elvish Promenade
 5 C Elvish Warrior
+6 U Gempalm Strider
+7 U Heedless One
+8 U Imperious Perfect
+9 C Llanowar Elves
+10 C Lys Alana Huntmaster
+11 C Stonewood Invoker
+12 U Sylvan Messenger
+13 C Timberwatch Elf
+14 R Voice of the Woods
+15 C Wellwisher
+16 C Wirewood Herald
+17 U Wirewood Symbiote
+18 C Wood Elves
+19 U Wren's Run Vanquisher
+20 U Elvish Promenade
+21 C Giant Growth
+22 U Harmonize
+23 C Wildsize
+24 C Moonglove Extract
+25 R Slate of Ancestry
+26 U Wirewood Lodge
+27 C Tranquil Thicket
+28 L Forest
+28 L Forest
+28 L Forest
+28 L Forest
+32 R Siege-Gang Commander
+33 U Akki Coalflinger
+34 R Clickslither
 35 C Emberwilde Augur
 36 U Flamewave Invoker
-28 L Forest
-28 L Forest
-28 L Forest
-28 L Forest
-57 C Forgotten Cave
 37 U Gempalm Incinerator
-6 U Gempalm Strider
-21 C Giant Growth
-C Goblin
-58 U Goblin Burrows
 38 C Goblin Cohort
 39 U Goblin Matron
 40 U Goblin Ringleader
 41 C Goblin Sledder
 42 U Goblin Warchief
-22 U Harmonize
-7 U Heedless One
 43 R Ib Halfheart, Goblin Tactician
-8 U Imperious Perfect
-9 C Llanowar Elves
-10 C Lys Alana Huntmaster
 44 U Mogg Fanatic
 45 C Mogg War Marshal
-24 C Moonglove Extract
-62 L Mountain
-62 L Mountain
-62 L Mountain
-62 L Mountain
 46 C Mudbutton Torchrunner
 47 C Raging Goblin
 48 U Reckless One
-32 R Siege-Gang Commander
 49 U Skirk Drill Sergeant
 50 R Skirk Fire Marshal
 51 C Skirk Prospector
 52 C Skirk Shaman
-25 R Slate of Ancestry
-55 C Spitting Earth
-11 C Stonewood Invoker
-12 U Sylvan Messenger
 53 U Tar Pitcher
+54 U Boggart Shenanigans
+55 C Spitting Earth
 56 C Tarfire
-13 C Timberwatch Elf
-27 C Tranquil Thicket
-14 R Voice of the Woods
-15 C Wellwisher
-23 C Wildsize
-16 C Wirewood Herald
-26 U Wirewood Lodge
-17 U Wirewood Symbiote
-18 C Wood Elves
-19 U Wren's Run Vanquisher
+57 C Forgotten Cave
+58 U Goblin Burrows
+62 L Mountain
+62 L Mountain
+62 L Mountain
+62 L Mountain
 
 [tokens]
 r_1_1_goblin
diff --git a/forge-gui/res/editions/Duel Decks Garruk vs. Liliana.txt b/forge-gui/res/editions/Duel Decks Garruk vs. Liliana.txt
index dba9bf130ab..bfc17bacba1 100644
--- a/forge-gui/res/editions/Duel Decks Garruk vs. Liliana.txt	
+++ b/forge-gui/res/editions/Duel Decks Garruk vs. Liliana.txt	
@@ -6,72 +6,69 @@ MciCode=gvl
 Type=Duel_Decks
 
 [cards]
-3 U Albino Troll
-48 R Bad Moon
-2 C Basking Rootwalla
-C Beast
-C Beast
-23 U Beast Attack
-7 C Blastoderm
-57 U Corrupt
-33 C Deathgreeter
-36 C Drudge Skeletons
-C Elephant
-18 U Elephant Guide
-58 U Enslave
-42 C Faerie Macabre
-38 U Fleshbag Marauder
-29 L Forest
-29 L Forest
-29 L Forest
-29 L Forest
 1 M Garruk Wildspeaker
-13 U Genju of the Cedars
-47 U Genju of the Fens
-34 U Ghost-Lit Stalker
-14 C Giant Growth
-21 U Harmonize
-52 C Hideous End
-43 U Howling Banshee
-51 C Ichor Slick
-10 U Indrik Stomphowler
-19 C Invigorate
-44 U Keening Banshee
-11 C Krosan Tusker
-16 C Lignify
-32 M Liliana Vess
-55 R Mutilate
-17 C Nature's Lore
-24 U Overrun
-39 C Phyrexian Rager
-12 R Plated Slagwurm
-59 C Polluted Mire
-15 C Rancor
-8 R Ravenous Baloth
-37 C Ravenous Rats
-56 U Rise from the Grave
-22 R Rude Awakening
-20 C Serrated Arrows
-49 C Sign in Blood
-46 R Skeletal Vampire
-26 C Slippery Karst
-53 C Snuff Out
-9 U Stampeding Wildebeests
-61 L Swamp
-61 L Swamp
-61 L Swamp
-61 L Swamp
-54 C Tendrils of Corruption
-27 U Treetop Village
-45 C Twisted Abomination
-40 C Urborg Syphon-Mage
-35 C Vampire Bats
-50 C Vicious Hunger
+2 C Basking Rootwalla
+3 U Albino Troll
 4 C Vine Trellis
-41 U Wall of Bone
 5 C Wild Mongrel
-25 U Windstorm
 6 C Wirewood Savage
+7 C Blastoderm
+8 R Ravenous Baloth
+9 U Stampeding Wildebeests
+10 U Indrik Stomphowler
+11 C Krosan Tusker
+12 R Plated Slagwurm
+13 U Genju of the Cedars
+14 C Giant Growth
+15 C Rancor
+16 C Lignify
+17 C Nature's Lore
+18 U Elephant Guide
+19 C Invigorate
+20 C Serrated Arrows
+21 U Harmonize
+22 R Rude Awakening
+23 U Beast Attack
+24 U Overrun
+25 U Windstorm
+26 C Slippery Karst
+27 U Treetop Village
+28 L Forest
+29 L Forest
+30 L Forest
+31 L Forest
+32 M Liliana Vess
+33 C Deathgreeter
+34 U Ghost-Lit Stalker
+35 C Vampire Bats
+36 C Drudge Skeletons
+37 C Ravenous Rats
+38 U Fleshbag Marauder
+39 C Phyrexian Rager
+40 C Urborg Syphon-Mage
+41 U Wall of Bone
+42 C Faerie Macabre
+43 U Howling Banshee
+44 U Keening Banshee
+45 C Twisted Abomination
+46 R Skeletal Vampire
+47 U Genju of the Fens
+48 R Bad Moon
+49 C Sign in Blood
+50 C Vicious Hunger
+51 C Ichor Slick
+52 C Hideous End
+53 C Snuff Out
+54 C Tendrils of Corruption
+55 R Mutilate
+56 U Rise from the Grave
+57 U Corrupt
+58 U Enslave
+59 C Polluted Mire
+60 L Swamp
+61 L Swamp
+62 L Swamp
+63 L Swamp
 
 [tokens]
 b_1_1_bat_flying
diff --git a/forge-gui/res/editions/Duel Decks Heroes vs. Monsters.txt b/forge-gui/res/editions/Duel Decks Heroes vs. Monsters.txt
index 37a464f6d65..29e3d05d49d 100644
--- a/forge-gui/res/editions/Duel Decks Heroes vs. Monsters.txt	
+++ b/forge-gui/res/editions/Duel Decks Heroes vs. Monsters.txt	
@@ -7,87 +7,87 @@ MciCode=ddl
 Type=Duel_Decks
 
 [cards]
+1 M Sun Titan
+2 C Somberwald Vigilante
+3 R Figure of Destiny
+4 C Cavalry Pegasus
+5 U Fencing Ace
+6 C Thraben Valiant
+7 U Stun Sniper
+8 U Truefire Paladin
+9 C Auramancer
+10 C Freewind Equenaut
 11 R Anax and Cymede
 12 C Armory Guard
-9 C Auramancer
-27 U Battle Mastery
-69 U Beast Within
-49 C Blood Ogre
-24 C Bonds of Faith
-33 C Boros Guildgate
-4 C Cavalry Pegasus
-17 U Condemn
-55 R Conquering Manticore
-56 R Crater Hellion
-51 U Crowned Ceratok
-18 U Daily Regimen
-14 C Dawnstrike Paladin
-45 C Deadly Recluse
-66 U Destructive Revelry
-54 R Deus of Calamity
-67 U Dragon Blood
-5 U Fencing Ace
-3 R Figure of Destiny
-70 U Fires of Yavimaya
-81 L Forest
-81 L Forest
-81 L Forest
-81 L Forest
-10 C Freewind Equenaut
-53 C Ghor-Clan Savage
-52 C Gorehorn Minotaurs
-28 U Griffin Guide
 13 U Gustcloak Sentinel
-16 R Kamahl, Pit Fighter
-46 U Kavu Predator
-71 U Kazandu Refuge
-59 C Krosan Tusker
-72 U Llanowar Reborn
-22 U Magma Jet
-30 U Miraculous Recovery
-25 C Moment of Heroism
-35 L Mountain
-35 L Mountain
-35 L Mountain
-35 L Mountain
-35 L Mountain
-35 L Mountain
-35 L Mountain
-35 L Mountain
-34 U New Benalia
+14 C Dawnstrike Paladin
 15 R Nobilis of War
-44 C Orcish Lumberjack
-23 U Ordeal of Purphoros
+16 R Kamahl, Pit Fighter
+17 U Condemn
+18 U Daily Regimen
 19 C Pay No Heed
-42 L Plains
-42 L Plains
-42 L Plains
+20 U Righteousness
+21 C Stand Firm
+22 U Magma Jet
+23 U Ordeal of Purphoros
+24 C Bonds of Faith
+25 C Moment of Heroism
+26 U Undying Rage
+27 U Battle Mastery
+28 U Griffin Guide
+29 C Smite the Monstrous
+30 U Miraculous Recovery
+31 R Winds of Rath
+32 U Pyrokinesis
+33 C Boros Guildgate
+34 U New Benalia
+35 L Mountain
+36 L Mountain
+37 L Mountain
+38 L Mountain
+39 L Plains
+40 L Plains
+41 L Plains
 42 L Plains
 43 M Polukranos, World Eater
+44 C Orcish Lumberjack
+45 C Deadly Recluse
+46 U Kavu Predator
+47 C Satyr Hedonist
+48 C Zhur-Taa Druid
+49 C Blood Ogre
+50 R Troll Ascetic
+51 U Crowned Ceratok
+52 C Gorehorn Minotaurs
+53 C Ghor-Clan Savage
+54 R Deus of Calamity
+55 R Conquering Manticore
+56 R Crater Hellion
+57 R Skarrgan Firebird
+58 C Valley Rannet
+59 C Krosan Tusker
+60 U Skarrgan Skybreaker
+61 C Shower of Sparks
 62 C Prey Upon
 63 U Pyroclasm
-32 U Pyrokinesis
 64 U Regrowth
-20 U Righteousness
-47 C Satyr Hedonist
-61 C Shower of Sparks
-73 U Skarrg, the Rage Pits
-57 R Skarrgan Firebird
-60 U Skarrgan Skybreaker
-29 C Smite the Monstrous
-2 C Somberwald Vigilante
-21 C Stand Firm
-7 U Stun Sniper
-1 M Sun Titan
 65 C Terrifying Presence
-6 C Thraben Valiant
-50 R Troll Ascetic
-8 U Truefire Paladin
-26 U Undying Rage
-58 C Valley Rannet
+66 U Destructive Revelry
+67 U Dragon Blood
 68 C Volt Charge
-31 R Winds of Rath
-48 C Zhur-Taa Druid
+69 U Beast Within
+70 U Fires of Yavimaya
+71 U Kazandu Refuge
+72 U Llanowar Reborn
+73 U Skarrg, the Rage Pits
+74 L Mountain
+75 L Mountain
+76 L Mountain
+77 L Mountain
+78 L Forest
+79 L Forest
+80 L Forest
+81 L Forest
 
 [tokens]
 w_2_2_griffin_flying
diff --git a/forge-gui/res/editions/Duel Decks Izzet vs. Golgari.txt b/forge-gui/res/editions/Duel Decks Izzet vs. Golgari.txt
index c3456505b48..89b3e54b4d2 100644
--- a/forge-gui/res/editions/Duel Decks Izzet vs. Golgari.txt	
+++ b/forge-gui/res/editions/Duel Decks Izzet vs. Golgari.txt	
@@ -6,96 +6,96 @@ MciCode=ddj
 Type=Duel_Decks
 
 [cards]
-78 C Barren Moor
-51 U Boneyard Wurm
-58 C Brain Weevil
-13 C Brainstorm
-18 C Call to Heel
-79 U Dakmor Salvage
-25 U Dissipate
-12 R Djinn Illuminatus
-65 R Doomgape
-56 U Dreg Mangler
-47 C Elves of Deep Shadow
-55 U Eternal Witness
-72 C Feast or Famine
-32 U Fire // Ice
-14 C Force Spike
-89 L Forest
-89 L Forest
-89 L Forest
-89 L Forest
-33 C Forgotten Cave
-10 R Galvanoth
-5 U Gelectrode
-67 U Ghoul's Feast
-64 R Gleancrawler
-3 C Goblin Electromancer
-70 U Golgari Germination
-60 R Golgari Grave-Troll
-80 C Golgari Rot Farm
-63 C Golgari Rotwurm
-66 C Golgari Signet
-48 U Golgari Thug
-59 C Greater Mossdog
-75 U Grim Flowering
-31 R Invoke the Firemind
-38 L Island
-38 L Island
-38 L Island
-38 L Island
-16 U Isochron Scepter
-34 C Izzet Boilerworks
-21 U Izzet Charm
-11 C Izzet Chronarch
-4 U Izzet Guildmage
-17 C Izzet Signet
-45 M Jarad, Golgari Lich Lord
-2 C Kiln Fiend
-52 U Korozda Guildmage
-77 U Life // Death
-69 R Life from the Loam
-35 C Lonely Sandbar
-15 C Magma Spray
-42 L Mountain
-42 L Mountain
-42 L Mountain
-42 L Mountain
-73 U Nightmare Void
 1 M Niv-Mizzet, the Firemind
-36 U Nivix, Aerie of the Firemind
+2 C Kiln Fiend
+3 C Goblin Electromancer
+4 U Izzet Guildmage
+5 U Gelectrode
+6 C Wee Dragonauts
+7 C Steamcore Weird
+8 U Shrewd Hatchling
 9 C Ogre Savant
-28 U Overwhelming Intellect
-46 U Plagued Rusalka
-27 R Prophetic Bolt
-71 U Putrefy
-53 C Putrid Leech
+10 R Galvanoth
+11 C Izzet Chronarch
+12 R Djinn Illuminatus
+13 C Brainstorm
+14 C Force Spike
+15 C Magma Spray
+16 U Isochron Scepter
+17 C Izzet Signet
+18 C Call to Heel
+19 C Train of Thought
 20 C Pyromatics
+21 U Izzet Charm
+22 U Reminisce
+23 U Thunderheads
+24 U Vacuumelt
+25 U Dissipate
 26 C Quicksilver Dagger
+27 R Prophetic Bolt
+28 U Overwhelming Intellect
+29 R Sphinx-Bone Wand
+30 U Street Spasm
+31 R Invoke the Firemind
+32 U Fire // Ice
+33 C Forgotten Cave
+34 C Izzet Boilerworks
+35 C Lonely Sandbar
+36 U Nivix, Aerie of the Firemind
+37 L Island
+38 L Island
+39 L Island
+40 L Island
+41 L Mountain
+42 L Mountain
+43 L Mountain
+44 L Mountain
+45 M Jarad, Golgari Lich Lord
+46 U Plagued Rusalka
+47 C Elves of Deep Shadow
+48 U Golgari Thug
 49 C Ravenous Rats
 50 U Reassembling Skeleton
-22 U Reminisce
-62 U Sadistic Hypnotist
-57 C Shambling Shell
-8 U Shrewd Hatchling
-29 R Sphinx-Bone Wand
-7 C Steamcore Weird
-61 U Stingerfling Spider
+51 U Boneyard Wurm
+52 U Korozda Guildmage
+53 C Putrid Leech
 54 C Stinkweed Imp
-30 U Street Spasm
-81 U Svogthos, the Restless Tomb
-85 L Swamp
-85 L Swamp
-85 L Swamp
-85 L Swamp
-23 U Thunderheads
-19 C Train of Thought
-82 C Tranquil Thicket
-76 R Twilight's Call
-24 U Vacuumelt
-74 U Vigor Mortis
-6 C Wee Dragonauts
+55 U Eternal Witness
+56 U Dreg Mangler
+57 C Shambling Shell
+58 C Brain Weevil
+59 C Greater Mossdog
+60 R Golgari Grave-Troll
+61 U Stingerfling Spider
+62 U Sadistic Hypnotist
+63 C Golgari Rotwurm
+64 R Gleancrawler
+65 R Doomgape
+66 C Golgari Signet
+67 U Ghoul's Feast
 68 C Yoke of the Damned
+69 R Life from the Loam
+70 U Golgari Germination
+71 U Putrefy
+72 C Feast or Famine
+73 U Nightmare Void
+74 U Vigor Mortis
+75 U Grim Flowering
+76 R Twilight's Call
+77 U Life // Death
+78 C Barren Moor
+79 U Dakmor Salvage
+80 C Golgari Rot Farm
+81 U Svogthos, the Restless Tomb
+82 C Tranquil Thicket
+83 L Swamp
+84 L Swamp
+85 L Swamp
+86 L Swamp
+87 L Forest
+88 L Forest
+89 L Forest
+90 L Forest
 
 [tokens]
 u_3_3_weird_defender_flying
diff --git a/forge-gui/res/editions/Duel Decks Jace vs. Chandra.txt b/forge-gui/res/editions/Duel Decks Jace vs. Chandra.txt
index 1054b62ad21..a6a83197cbc 100644
--- a/forge-gui/res/editions/Duel Decks Jace vs. Chandra.txt	
+++ b/forge-gui/res/editions/Duel Decks Jace vs. Chandra.txt	
@@ -6,69 +6,68 @@ MciCode=jvc
 Type=Duel_Decks
 
 [cards]
-17 C AEthersnipe
-13 U Air Elemental
-21 R Ancestral Vision
-7 U Bottle Gnomes
-18 U Brine Elemental
-34 M Chandra Nalaar
-47 C Chartooth Cougar
-28 C Condescend
-54 U Cone of Flame
-24 C Counterspell
-23 C Daze
-57 R Demonfire
-C Elemental Shaman
-20 C Errant Ephemeron
-26 U Fact or Fiction
-3 C Fathom Seer
-56 U Fireball
-55 C Fireblast
-49 C Firebolt
-36 C Fireslinger
-53 U Flame Javelin
-35 C Flamekin Brawler
-42 U Flametongue Kavu
-40 U Flamewave Invoker
-10 U Fledgling Mawcor
-43 U Furnace Whelp
-14 R Guile
-27 C Gush
-48 R Hostility
-51 C Incinerate
-45 C Ingot Chewer
-41 C Inner-Flame Acolyte
-33 L Island
-33 L Island
-33 L Island
-33 L Island
 1 M Jace Beleren
-58 U Keldon Megaliths
-52 U Magma Jet
-8 C Man-o'-War
 2 C Martyr of Frost
-22 U Mind Stone
-60 L Mountain
-60 L Mountain
-60 L Mountain
-60 L Mountain
-12 C Mulldrifter
-9 C Ophidian
-46 C Oxidda Golem
-38 U Pyre Charger
-19 R Quicksilver Dragon
-44 R Rakdos Pit Dragon
-25 C Repulse
-15 U Riftwing Cloudskate
-50 C Seal of Fire
-39 U Slith Firewalker
-37 C Soulbright Flamekin
-16 C Spire Golem
-29 U Terrain Generator
+3 C Fathom Seer
 4 C Voidmage Apprentice
 5 U Wall of Deceit
-11 U Waterspout Djinn
 6 U Willbender
+7 U Bottle Gnomes
+8 C Man-o'-War
+9 C Ophidian
+10 U Fledgling Mawcor
+11 U Waterspout Djinn
+12 C Mulldrifter
+13 U Air Elemental
+14 R Guile
+15 U Riftwing Cloudskate
+16 C Spire Golem
+17 C AEthersnipe
+18 U Brine Elemental
+19 R Quicksilver Dragon
+20 C Errant Ephemeron
+21 R Ancestral Vision
+22 U Mind Stone
+23 C Daze
+24 C Counterspell
+25 C Repulse
+26 U Fact or Fiction
+27 C Gush
+28 C Condescend
+29 U Terrain Generator
+30 L Island
+31 L Island
+32 L Island
+33 L Island
+34 M Chandra Nalaar
+35 C Flamekin Brawler
+36 C Fireslinger
+37 C Soulbright Flamekin
+38 U Pyre Charger
+39 U Slith Firewalker
+40 U Flamewave Invoker
+41 C Inner-Flame Acolyte
+42 U Flametongue Kavu
+43 U Furnace Whelp
+44 R Rakdos Pit Dragon
+45 C Ingot Chewer
+46 C Oxidda Golem
+47 C Chartooth Cougar
+48 R Hostility
+49 C Firebolt
+50 C Seal of Fire
+51 C Incinerate
+52 U Magma Jet
+53 U Flame Javelin
+54 U Cone of Flame
+55 C Fireblast
+56 U Fireball
+57 R Demonfire
+58 U Keldon Megaliths
+59 L Mountain
+60 L Mountain
+61 L Mountain
+62 L Mountain
 
 [tokens]
 r_3_1_elemental_shaman_haste
\ No newline at end of file
diff --git a/forge-gui/res/editions/Duel Decks Knights vs. Dragons.txt b/forge-gui/res/editions/Duel Decks Knights vs. Dragons.txt
index ef475b4e308..ff598ccae5f 100644
--- a/forge-gui/res/editions/Duel Decks Knights vs. Dragons.txt	
+++ b/forge-gui/res/editions/Duel Decks Knights vs. Dragons.txt	
@@ -6,87 +6,87 @@ MciCode=ddg
 Type=Duel_Decks
 
 [cards]
-18 U Alaborn Cavalier
-62 C Armillary Sphere
-12 C Benalish Lancer
-50 U Bloodmark Mentor
-47 M Bogardan Hellkite
-57 C Bogardan Rager
-64 U Breath of Darigaaz
-68 U Captive Flame
+1 M Knight of the Reliquary
 2 C Caravan Escort
-48 C Cinder Wall
-72 C Claws of Valakut
-75 U Cone of Flame
-65 C Dragon Fodder
-54 U Dragon Whelp
-63 U Dragon's Claw
-53 U Dragonspeaker Shaman
-25 C Edge of Autumn
-76 C Fiery Fall
-51 C Fire-Belly Changeling
-44 L Forest
-44 L Forest
-44 L Forest
-44 L Forest
-69 C Ghostfire
-35 U Grasslands
-33 U Griffin Guide
-23 U Harm's Way
-55 U Henge Guardian
-29 U Heroes' Reunion
-77 U Jaws of Stone
-21 U Juniper Order Ranger
-16 U Kabira Vindicator
-59 R Kilnmouth Dragon
-17 R Kinsbaile Cavalier
-14 R Knight Exemplar
+3 C Lionheart Maverick
 4 C Knight of Cliffhaven
 5 U Knight of Meadowgrain
-1 M Knight of the Reliquary
 6 R Knight of the White Orchid
-10 R Knotvine Paladin
 7 U Leonin Skyhunter
-3 C Lionheart Maverick
-31 R Loxodon Warhammer
-26 C Mighty Leap
-58 R Mordant Dragon
-78 L Mountain
-78 L Mountain
-78 L Mountain
-78 L Mountain
-52 C Mudbutton Torchrunner
-34 C Oblivion Ring
-22 U Paladin of Prahv
-42 L Plains
-42 L Plains
-42 L Plains
-42 L Plains
+8 U Silver Knight
+9 U White Knight
+10 R Knotvine Paladin
+11 C Steward of Valeron
+12 C Benalish Lancer
+13 U Zhalfirin Commander
+14 R Knight Exemplar
+15 U Wilt-Leaf Cavaliers
+16 U Kabira Vindicator
+17 R Kinsbaile Cavalier
+18 U Alaborn Cavalier
+19 C Skyhunter Patrol
 20 C Plover Knights
-66 U Punishing Fire
+21 U Juniper Order Ranger
+22 U Paladin of Prahv
+23 U Harm's Way
 24 U Reciprocate
+25 C Edge of Autumn
+26 C Mighty Leap
 27 U Reprisal
-70 C Seething Song
-71 C Seismic Strike
+28 U Test of Faith
+29 U Heroes' Reunion
+30 C Sigil Blessing
+31 R Loxodon Warhammer
+32 C Spidersilk Armor
+33 U Griffin Guide
+34 C Oblivion Ring
+35 U Grasslands
 36 C Sejiri Steppe
 37 C Selesnya Sanctuary
-74 U Shiv's Embrace
-60 R Shivan Hellkite
-30 C Sigil Blessing
-8 U Silver Knight
-49 C Skirk Prospector
-19 C Skyhunter Patrol
-32 C Spidersilk Armor
-67 C Spitting Earth
-11 C Steward of Valeron
-73 U Temporary Insanity
-28 U Test of Faith
-61 R Thunder Dragon
 38 U Treetop Village
+39 L Plains
+40 L Plains
+41 L Plains
+42 L Plains
+43 L Forest
+44 L Forest
+45 L Forest
+46 L Forest
+47 M Bogardan Hellkite
+48 C Cinder Wall
+49 C Skirk Prospector
+50 U Bloodmark Mentor
+51 C Fire-Belly Changeling
+52 C Mudbutton Torchrunner
+53 U Dragonspeaker Shaman
+54 U Dragon Whelp
+55 U Henge Guardian
 56 R Voracious Dragon
-9 U White Knight
-15 U Wilt-Leaf Cavaliers
-13 U Zhalfirin Commander
+57 C Bogardan Rager
+58 R Mordant Dragon
+59 R Kilnmouth Dragon
+60 R Shivan Hellkite
+61 R Thunder Dragon
+62 C Armillary Sphere
+63 U Dragon's Claw
+64 U Breath of Darigaaz
+65 C Dragon Fodder
+66 U Punishing Fire
+67 C Spitting Earth
+68 U Captive Flame
+69 C Ghostfire
+70 C Seething Song
+71 C Seismic Strike
+72 C Claws of Valakut
+73 U Temporary Insanity
+74 U Shiv's Embrace
+75 U Cone of Flame
+76 C Fiery Fall
+77 U Jaws of Stone
+78 L Mountain
+79 L Mountain
+80 L Mountain
+81 L Mountain
 
 [tokens]
 w_2_2_griffin_flying
diff --git a/forge-gui/res/editions/Duel Decks Phyrexia vs. the Coalition.txt b/forge-gui/res/editions/Duel Decks Phyrexia vs. the Coalition.txt
index 08f6da56144..f5dcba15e76 100644
--- a/forge-gui/res/editions/Duel Decks Phyrexia vs. the Coalition.txt	
+++ b/forge-gui/res/editions/Duel Decks Phyrexia vs. the Coalition.txt	
@@ -6,80 +6,77 @@ MciCode=pvc
 Type=Duel_Decks
 
 [cards]
-63 U Allied Strategies
-58 C Armadillo Cloak
-5 U Bone Shredder
-2 C Carrion Feeder
-45 U Charging Troll
-54 R Coalition Relic
-59 U Darigaaz's Charm
-47 R Darigaaz, the Igniter
-18 C Dark Ritual
-64 U Elfhame Palace
-50 U Evasive Action
-56 C Exotic Curse
-52 C Fertile Ground
-70 L Forest
-70 L Forest
-46 R Gerrard Capashen
-53 C Gerrard's Command
-57 C Harrow
-26 C Hideous End
-C Hornet
-28 U Hornet Cannon
-68 L Island
-19 U Lightning Greaves
-31 R Living Death
-C Minion
-69 L Mountain
-55 C Narrow Escape
-38 C Nomadic Elf
-11 U Order of Yawgmoth
-27 R Phyrexian Arena
-3 C Phyrexian Battleflies
-8 C Phyrexian Broodlings
-16 R Phyrexian Colossus
-10 C Phyrexian Debaser
-12 U Phyrexian Defiler
-4 C Phyrexian Denouncer
-15 U Phyrexian Gargantua
-6 C Phyrexian Ghoul
-14 U Phyrexian Hulk
 1 M Phyrexian Negator
+2 C Carrion Feeder
+3 C Phyrexian Battleflies
+4 C Phyrexian Denouncer
+5 U Bone Shredder
+6 C Phyrexian Ghoul
+7 U Priest of Gix
+8 C Phyrexian Broodlings
+9 U Sanguine Guard
+10 C Phyrexian Debaser
+11 U Order of Yawgmoth
+12 U Phyrexian Defiler
 13 R Phyrexian Plaguelord
-29 R Phyrexian Processor
+14 U Phyrexian Hulk
+15 U Phyrexian Gargantua
+16 R Phyrexian Colossus
+17 U Voltaic Key
+18 C Dark Ritual
+19 U Lightning Greaves
 20 U Phyrexian Totem
 21 U Phyrexian Vault
-67 L Plains
-62 U Power Armor
-7 U Priest of Gix
 22 U Puppet Strings
-39 C Quirion Elves
-60 U Rith's Charm
-48 R Rith, the Awakener
-9 U Sanguine Guard
-C Saproling
-65 U Shivan Oasis
-25 U Slay
-40 U Sunscape Battlemage
-32 L Swamp
-32 L Swamp
-32 L Swamp
-32 L Swamp
-30 C Tendrils of Corruption
-66 C Terramorphic Expanse
-37 C Thornscape Apprentice
-42 U Thornscape Battlemage
-41 U Thunderscape Battlemage
-61 U Treva's Charm
-49 R Treva, the Renewer
-51 C Tribal Flames
-36 M Urza's Rage
-43 U Verduran Emissary
-17 U Voltaic Key
 23 U Whispersilk Cloak
 24 U Worn Powerstone
+25 U Slay
+26 C Hideous End
+27 R Phyrexian Arena
+28 U Hornet Cannon
+29 R Phyrexian Processor
+30 C Tendrils of Corruption
+31 R Living Death
+32 L Swamp
+33 L Swamp
+34 L Swamp
+35 L Swamp
+36 M Urza's Rage
+37 C Thornscape Apprentice
+38 C Nomadic Elf
+39 C Quirion Elves
+40 U Sunscape Battlemage
+41 U Thunderscape Battlemage
+42 U Thornscape Battlemage
+43 U Verduran Emissary
 44 C Yavimaya Elder
+45 U Charging Troll
+46 R Gerrard Capashen
+47 R Darigaaz, the Igniter
+48 R Rith, the Awakener
+49 R Treva, the Renewer
+50 U Evasive Action
+51 C Tribal Flames
+52 C Fertile Ground
+53 C Gerrard's Command
+54 R Coalition Relic
+55 C Narrow Escape
+56 C Exotic Curse
+57 C Harrow
+58 C Armadillo Cloak
+59 U Darigaaz's Charm
+60 U Rith's Charm
+61 U Treva's Charm
+62 U Power Armor
+63 U Allied Strategies
+64 U Elfhame Palace
+65 U Shivan Oasis
+66 C Terramorphic Expanse
+67 L Plains
+68 L Island
+69 L Mountain
+70 L Forest
+71 L Forest
 
 [tokens]
 hornet
diff --git a/forge-gui/res/editions/Duel Decks Sorin vs. Tibalt.txt b/forge-gui/res/editions/Duel Decks Sorin vs. Tibalt.txt
index 6d56da49373..9e9547a55e0 100644
--- a/forge-gui/res/editions/Duel Decks Sorin vs. Tibalt.txt	
+++ b/forge-gui/res/editions/Duel Decks Sorin vs. Tibalt.txt	
@@ -6,86 +6,86 @@ MciCode=ddk
 Type=Duel_Decks
 
 [cards]
-31 C Absorb Vis
-73 U Akoum Refuge
-28 R Ancient Craving
-45 C Ashmouth Hound
-58 C Blazing Salvo
-69 C Blightning
-10 C Bloodrage Vampire
-67 R Breaking Point
-66 U Browbeat
-57 C Bump in the Night
-18 R Butcher of Malakir
-5 C Child of Night
-49 C Coal Stoker
-54 U Corpse Connoisseur
-32 R Death Grasp
-20 U Decompose
-72 R Devil's Play
-2 C Doomed Traveler
-6 C Duskhunter Bat
-33 C Evolving Wilds
-59 C Faithless Looting
-30 R Field of Souls
-11 U Fiend Hunter
-70 U Flame Javelin
-60 C Flame Slash
-56 U Gang of Devils
-8 U Gatekeeper of Malakir
-61 C Geistflame
-42 C Goblin Arsonist
-52 R Hellrider
-46 U Hellspark Elemental
-50 R Lavaborn Muse
-24 U Lingering Souls
-51 C Mad Prophet
-29 C Mark of the Vampire
-13 U Mausoleum Guard
-7 C Mesmeric Fiend
-25 U Mortify
-76 L Mountain
-76 L Mountain
-76 L Mountain
-14 U Phantom General
-38 L Plains
-38 L Plains
-38 L Plains
-62 U Pyroclasm
-74 C Rakdos Carnarium
-44 U Reassembling Skeleton
-63 U Recoup
-16 U Revenant Patriarch
-43 U Scorched Rusalka
-55 U Scourge Devil
-17 U Sengir Vampire
-48 U Shambling Remains
-53 U Skirsdag Cultist
-21 C Sorin's Thirst
 1 M Sorin, Lord of Innistrad
-26 U Spectral Procession
-65 C Strangling Soot
-68 R Sulfuric Vortex
-78 L Swamp
-78 L Swamp
-78 L Swamp
-78 L Swamp
-78 L Swamp
-78 L Swamp
-34 U Tainted Field
-64 C Terminate
-41 M Tibalt, the Fiend-Blooded
-71 U Torrent of Souls
-9 R Twilight Drover
-27 C Unmake
-22 U Urge to Feed
+2 C Doomed Traveler
 3 C Vampire Lacerator
-12 U Vampire Nighthawk
-15 U Vampire Outcasts
-19 C Vampire's Bite
-47 C Vithian Stinger
 4 U Wall of Omens
+5 C Child of Night
+6 C Duskhunter Bat
+7 C Mesmeric Fiend
+8 U Gatekeeper of Malakir
+9 R Twilight Drover
+10 C Bloodrage Vampire
+11 U Fiend Hunter
+12 U Vampire Nighthawk
+13 U Mausoleum Guard
+14 U Phantom General
+15 U Vampire Outcasts
+16 U Revenant Patriarch
+17 U Sengir Vampire
+18 R Butcher of Malakir
+19 C Vampire's Bite
+20 U Decompose
+21 C Sorin's Thirst
+22 U Urge to Feed
 23 U Zealous Persecution
+24 U Lingering Souls
+25 U Mortify
+26 U Spectral Procession
+27 C Unmake
+28 R Ancient Craving
+29 C Mark of the Vampire
+30 R Field of Souls
+31 C Absorb Vis
+32 R Death Grasp
+33 C Evolving Wilds
+34 U Tainted Field
+35 L Swamp
+36 L Swamp
+37 L Swamp
+38 L Plains
+39 L Plains
+40 L Plains
+41 M Tibalt, the Fiend-Blooded
+42 C Goblin Arsonist
+43 U Scorched Rusalka
+44 U Reassembling Skeleton
+45 C Ashmouth Hound
+46 U Hellspark Elemental
+47 C Vithian Stinger
+48 U Shambling Remains
+49 C Coal Stoker
+50 R Lavaborn Muse
+51 C Mad Prophet
+52 R Hellrider
+53 U Skirsdag Cultist
+54 U Corpse Connoisseur
+55 U Scourge Devil
+56 U Gang of Devils
+57 C Bump in the Night
+58 C Blazing Salvo
+59 C Faithless Looting
+60 C Flame Slash
+61 C Geistflame
+62 U Pyroclasm
+63 U Recoup
+64 C Terminate
+65 C Strangling Soot
+66 U Browbeat
+67 R Breaking Point
+68 R Sulfuric Vortex
+69 C Blightning
+70 U Flame Javelin
+71 U Torrent of Souls
+72 R Devil's Play
+73 U Akoum Refuge
+74 C Rakdos Carnarium
+75 L Mountain
+76 L Mountain
+77 L Mountain
+78 L Swamp
+79 L Swamp
+80 L Swamp
 
 [tokens]
 w_1_1_spirit_flying
diff --git a/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt b/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt
index cb3bd34b9d5..980f82b5cf0 100644
--- a/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt	
+++ b/forge-gui/res/editions/Duel Decks Speed vs. Cunning.txt	
@@ -40,17 +40,13 @@ Type=Duel_Decks
 32 C Evolving Wilds
 33 U Ghitu Encampment
 34 U Nomad Outpost
-78 L Mountain
-78 L Mountain
-78 L Mountain
-78 L Mountain
-81 L Plains
-81 L Plains
-81 L Plains
-81 L Plains
-40 L Swamp
-40 L Swamp
+35 L Mountain
+36 L Mountain
+37 L Mountain
+38 L Plains
+39 L Swamp
 40 L Swamp
+41 L Swamp
 42 M Arcanis the Omnipotent
 43 U Faerie Impostor
 44 C Coral Trickster
@@ -85,8 +81,12 @@ Type=Duel_Decks
 73 U Mystic Monastery
 74 C Terramorphic Expanse
 75 L Island
-75 L Island
-75 L Island
+76 L Island
+77 L Island
+78 L Mountain
+79 L Plains
+80 L Plains
+81 L Plains
 
 [tokens]
 r_1_1_goblin
\ No newline at end of file
diff --git a/forge-gui/res/editions/Duel Decks Venser vs. Koth.txt b/forge-gui/res/editions/Duel Decks Venser vs. Koth.txt
index 99c123284ad..02af1cfe1f0 100644
--- a/forge-gui/res/editions/Duel Decks Venser vs. Koth.txt	
+++ b/forge-gui/res/editions/Duel Decks Venser vs. Koth.txt	
@@ -6,80 +6,80 @@ MciCode=ddi
 Type=Duel_Decks
 
 [cards]
-48 U AEther Membrane
-27 U Angelic Shield
-51 U Anger
-64 C Armillary Sphere
+1 M Venser, the Sojourner
+2 C Whitemane Lion
 3 C Augury Owl
-33 C Azorius Chancery
-62 R Bloodfire Colossus
-54 U Bloodfire Kavu
-18 U Cache Raiders
-59 C Chartooth Cougar
-14 R Clone
 4 U Coral Fighters
-52 C Cosi's Ravager
-15 U Cryptic Annelid
-69 C Downhill Charge
-60 U Earth Servant
-49 C Fiery Hellhound
-34 U Flood Plain
-12 R Galepowder Mage
-56 U Geyser Glider
-61 U Greater Stone Spirit
-41 L Island
-41 L Island
-41 L Island
-72 U Jaws of Stone
-20 C Jedit's Dragoons
-65 R Journeyer's Kite
-13 C Kor Cartographer
-44 M Koth of the Hammer
-57 R Lithophage
 5 U Minamo Sightbender
 6 U Mistmeadow Witch
-74 L Mountain
-74 L Mountain
-74 L Mountain
-74 L Mountain
-8 C Neurok Invisimancer
-35 U New Benalia
-28 U Oblivion Ring
-32 C Overrule
-23 U Path to Exile
-47 C Pilgrim's Eye
-40 L Plains
-40 L Plains
-40 L Plains
-45 C Plated Geopede
-24 C Preordain
-16 C Primal Plasma
-46 C Pygmy Pyrosaur
-26 C Revoke Existence
-29 C Safe Passage
-17 U Sawtooth Loon
 7 C Scroll Thief
-67 C Searing Blaze
-70 C Seismic Strike
-36 U Sejiri Refuge
-25 C Sigil of Sleep
-10 U Sky Spirit
+8 C Neurok Invisimancer
 9 U Slith Strider
-37 C Soaring Seacliff
-22 R Sphinx of Uthuun
-71 C Spire Barrage
-30 C Steel of the Godhead
-55 U Stone Giant
-21 R Sunblast Angel
-58 R Torchling
-31 U Vanish into Memory
-1 M Venser, the Sojourner
-73 R Volley of Boulders
-68 U Vulshok Battlegear
-53 C Vulshok Berserker
-66 U Vulshok Morningstar
-50 C Vulshok Sorcerer
+10 U Sky Spirit
 11 U Wall of Denial
-63 C Wayfarer's Bauble
-2 C Whitemane Lion
+12 R Galepowder Mage
+13 C Kor Cartographer
+14 R Clone
+15 U Cryptic Annelid
+16 C Primal Plasma
+17 U Sawtooth Loon
+18 U Cache Raiders
 19 R Windreaver
+20 C Jedit's Dragoons
+21 R Sunblast Angel
+22 R Sphinx of Uthuun
+23 U Path to Exile
+24 C Preordain
+25 C Sigil of Sleep
+26 C Revoke Existence
+27 U Angelic Shield
+28 U Oblivion Ring
+29 C Safe Passage
+30 C Steel of the Godhead
+31 U Vanish into Memory
+32 C Overrule
+33 C Azorius Chancery
+34 U Flood Plain
+35 U New Benalia
+36 U Sejiri Refuge
+37 C Soaring Seacliff
+38 L Plains
+39 L Plains
+40 L Plains
+41 L Island
+42 L Island
+43 L Island
+44 M Koth of the Hammer
+45 C Plated Geopede
+46 C Pygmy Pyrosaur
+47 C Pilgrim's Eye
+48 U Aether Membrane
+49 C Fiery Hellhound
+50 C Vulshok Sorcerer
+51 U Anger
+52 C Cosi's Ravager
+53 C Vulshok Berserker
+54 U Bloodfire Kavu
+55 U Stone Giant
+56 U Geyser Glider
+57 R Lithophage
+58 R Torchling
+59 C Chartooth Cougar
+60 U Earth Servant
+61 U Greater Stone Spirit
+62 R Bloodfire Colossus
+63 C Wayfarer's Bauble
+64 C Armillary Sphere
+65 R Journeyer's Kite
+66 U Vulshok Morningstar
+67 C Searing Blaze
+68 U Vulshok Battlegear
+69 C Downhill Charge
+70 C Seismic Strike
+71 C Spire Barrage
+72 U Jaws of Stone
+73 R Volley of Boulders
+74 L Mountain
+75 L Mountain
+76 L Mountain
+77 L Mountain
diff --git a/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt b/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt
index 4b8d2528285..e686fe2d1a9 100644
--- a/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt	
+++ b/forge-gui/res/editions/Duel Decks Zendikar vs. Eldrazi.txt	
@@ -7,6 +7,46 @@ MciCode=ddp
 Type=Duel_Decks
 
 [cards]
+1 M Avenger of Zendikar
+2 U Affa Guard Hound
+3 C Caravan Escort
+4 U Kabira Vindicator
+5 C Knight of Cliffhaven
+6 C Makindi Griffin
+7 U Oust
+8 C Repel the Darkness
+9 C Sheer Drop
+10 U Beastbreaker of Bala Ged
+11 C Daggerback Basilisk
+12 U Frontier Guide
+13 C Graypelt Hunter
+14 C Grazing Gladehart
+15 C Groundswell
+16 C Harrow
+17 C Joraga Bard
+18 C Khalni Heart Expedition
+19 C Ondu Giant
+20 R Primal Command
+21 U Retreat to Kazandu
+22 R Scute Mob
+23 U Tajuru Archer
+24 C Territorial Baloth
+25 U Turntimber Basilisk
+26 C Wildheart Invoker
+27 R Veteran Warleader
+28 C Explorer's Scope
+29 R Seer's Sundial
+30 C Stonework Puma
+31 C Evolving Wilds
+32 U Graypelt Refuge
+33 R Stirring Wildwood
+34 C Turntimber Grove
+35 L Plains
+36 L Plains
+37 L Plains
+38 L Forest
+39 L Forest
+40 L Forest
 41 M Oblivion Sower
 42 U Artisan of Kozilek
 43 R It That Betrays
@@ -36,52 +76,12 @@ Type=Duel_Decks
 67 U Akoum Refuge
 68 U Eldrazi Temple
 69 U Rocky Tar Pit
+70 L Swamp
 71 L Swamp
-71 L Swamp
-71 L Swamp
+72 L Swamp
+73 L Mountain
 74 L Mountain
-74 L Mountain
-74 L Mountain
-1 M Avenger of Zendikar
-2 U Affa Guard Hound
-3 C Caravan Escort
-4 U Kabira Vindicator
-5 C Knight of Cliffhaven
-6 C Makindi Griffin
-7 U Oust
-8 C Repel the Darkness
-9 C Sheer Drop
-10 U Beastbreaker of Bala Ged
-11 C Daggerback Basilisk
-12 U Frontier Guide
-13 U Graypelt Hunter
-14 C Grazing Gladehart
-15 C Groundswell
-16 C Harrow
-17 C Joraga Bard
-18 C Khalni Heart Expedition
-19 C Ondu Giant
-20 R Primal Command
-21 U Retreat to Kazandu
-22 R Scute Mob
-23 U Tajuru Archer
-24 C Territorial Baloth
-25 U Turntimber Basilisk
-26 C Wildheart Invoker
-27 R Veteran Warleader
-28 C Explorer's Scope
-29 R Seer's Sundial
-30 C Stonework Puma
-31 C Evolving Wilds
-32 U Graypelt Refuge
-33 R Stirring Wildwood
-34 C Turntimber Grove
-35 L Plains
-35 L Plains
-35 L Plains
-38 L Forest
-38 L Forest
-38 L Forest
+75 L Mountain
 
 [tokens]
 c_0_1_eldrazi_spawn_sac
diff --git a/forge-gui/res/editions/Kaladesh.txt b/forge-gui/res/editions/Kaladesh.txt
index 8c6526c7e0a..171ebf37a44 100644
--- a/forge-gui/res/editions/Kaladesh.txt
+++ b/forge-gui/res/editions/Kaladesh.txt
@@ -277,7 +277,6 @@ AdditionalSetUnlockedInQuest=MPS_KLD
 264 L Forest
 
 [precon product]
-# Planeswalker Decks
 265 M Chandra, Pyrogenius
 266 C Flame Lash
 267 R Liberating Combustion
diff --git a/forge-gui/res/editions/Kaldheim Commander.txt b/forge-gui/res/editions/Kaldheim Commander.txt
index ede7ceb65c3..84eade4e0a9 100644
--- a/forge-gui/res/editions/Kaldheim Commander.txt	
+++ b/forge-gui/res/editions/Kaldheim Commander.txt	
@@ -133,4 +133,4 @@ g_7_7_elemental_trample
 w_1_1_bird_flying
 w_1_1_kithkin_soldier
 w_1_1_soldier
-w_1_1_pegasus
+w_1_1_pegasus_flying
diff --git a/forge-gui/res/editions/Mystery Booster.txt b/forge-gui/res/editions/Mystery Booster.txt
index 276d001b398..da3a7a87c2d 100644
--- a/forge-gui/res/editions/Mystery Booster.txt	
+++ b/forge-gui/res/editions/Mystery Booster.txt	
@@ -754,7 +754,7 @@ Foil=NotSupported
 744 C Rakshasa's Secret
 745 U Ravenous Chupacabra
 746 C Read the Bones
-747 C Reaper of Night // Harvest Fear
+747 C Reaper of Night
 748 U Reassembling Skeleton
 749 C Reckless Imp
 750 U Reckless Spite
diff --git a/forge-gui/res/editions/Secret Lair Drop Series.txt b/forge-gui/res/editions/Secret Lair Drop Series.txt
index 90fe49ea57b..af64ab0ee50 100644
--- a/forge-gui/res/editions/Secret Lair Drop Series.txt	
+++ b/forge-gui/res/editions/Secret Lair Drop Series.txt	
@@ -200,4 +200,4 @@ walker
 walker
 walker
 walker
-c_a_treasure
+c_a_treasure_sac
diff --git a/forge-gui/res/editions/Tempest.txt b/forge-gui/res/editions/Tempest.txt
index 2e94267eaf0..1e7246811c2 100644
--- a/forge-gui/res/editions/Tempest.txt
+++ b/forge-gui/res/editions/Tempest.txt
@@ -367,5 +367,5 @@ w_1_1_pegasus_flying
 w_2_2_reflection
 w_1_1_spirit_flying
 b_2_2_zombie
-g_1_1_hound
+g_1_1_dog
 g_1_1_saproling
\ No newline at end of file
diff --git a/forge-gui/res/editions/The List.txt b/forge-gui/res/editions/The List.txt
index cb22688810a..f2c818399a8 100644
--- a/forge-gui/res/editions/The List.txt	
+++ b/forge-gui/res/editions/The List.txt	
@@ -52,7 +52,7 @@ Type=Reprint
 45 R Battle of Wits
 46 U Brain Freeze
 47 R Brainstorm
-48 M Brazen Borrower // Petty Theft
+48 M Brazen Borrower
 49 R Broodstar
 50 U Chemister's Insight
 51 U Coveted Peacock
@@ -112,7 +112,7 @@ Type=Reprint
 105 U Murderous Cut
 106 R Necravolver
 107 U Necromancy
-108 U Nezumi Graverobber // Nighteyes the Desecrator
+108 U Nezumi Graverobber
 109 U Oubliette
 110 M Phyrexian Obliterator
 111 R Promise of Power
@@ -168,7 +168,7 @@ Type=Reprint
 161 U Alpha Kavu
 162 R Awakening
 163 U Cradle Guard
-164 C Curious Pair // Treats to Share
+164 C Curious Pair
 165 R Elvish Archdruid
 166 U Eternal Witness
 167 R Food Chain
diff --git a/forge-gui/res/editions/Theros Beyond Death.txt b/forge-gui/res/editions/Theros Beyond Death.txt
index f98bb0918a2..289fa942850 100644
--- a/forge-gui/res/editions/Theros Beyond Death.txt	
+++ b/forge-gui/res/editions/Theros Beyond Death.txt	
@@ -266,13 +266,11 @@ ChaosDraftThemes=GRAVEYARD_MATTERS
 254 L Forest
 
 [borderless]
-#Statue borderless planeswalkers
 255 M Elspeth, Sun's Nemesis
 256 M Ashiok, Nightmare Muse
 257 M Calix, Destiny's Hand
 
 [showcase]
-#Constellation Gods and Demigods
 258 U Daxos, Blessed by the Sun
 259 M Heliod, Sun-Crowned
 260 U Callaphe, Beloved of the Sea
@@ -289,7 +287,6 @@ ChaosDraftThemes=GRAVEYARD_MATTERS
 269 M Athreos, Shroud-Veiled
 
 [precon product]
-#Planeswalker Deck Cards
 270 M Elspeth, Undaunted Hero
 271 U Eidolon of Inspiration
 272 R Elspeth's Devotee
@@ -308,7 +305,6 @@ ChaosDraftThemes=GRAVEYARD_MATTERS
 285 L Mountain
 286 L Forest
 287 L Forest
-#Theme Booster Exclusive Rares
 288 R Grasping Giant
 289 R Victory's Envoy
 290 R Sphinx Mindbreaker
@@ -377,17 +373,13 @@ ChaosDraftThemes=GRAVEYARD_MATTERS
 351 R Temple of Plenty
 
 [promo]
-#Bundle promo
 352 R Arasta of the Endless Web
-#Promo Pack
 353 U Alseid of Life's Bounty
 354 C Thirst for Meaning
 355 U Gray Merchant of Asphodel
 356 C Thrill of Possibility
 357 U Wolfwillow Haven
 
-# custom rarity print runs to ensure correct art
-# (only generate those available in regular boosters + correct collation)
 [Commons]
 Captivating Unicorn|THB|1
 Daybreak Chimera|THB|1
diff --git a/forge-gui/res/formats/Sanctioned/Standard.txt b/forge-gui/res/formats/Sanctioned/Standard.txt
index 663c8547783..112c0aaae5f 100644
--- a/forge-gui/res/formats/Sanctioned/Standard.txt
+++ b/forge-gui/res/formats/Sanctioned/Standard.txt
@@ -3,5 +3,5 @@ Name:Standard
 Order:101
 Subtype:Standard
 Type:Sanctioned
-Sets:ELD, THB, IKO, M21, ZNR, , KHM
+Sets:ELD, THB, IKO, M21, ZNR, KHM
 Banned:Cauldron Familiar; Escape to the Wilds; Fires of Invention; Lucky Clover; Oko, Thief of Crowns; Omnath, Locus of Creation; Once Upon a Time; Uro, Titan of Nature's Wrath; Veil of Summer