Merge branch 'cube-update' into 'master'

- Update some ported draft cubes and add a new cube (Legacy 2018). See merge request core-developers/forge!369
2025-11-16 10:48:00 +00:00 · 2018-04-09 09:00:15 +00:00
parent aabfb0ab1c 7d2965ee34
commit 63094bee7a
34 changed files with 1631 additions and 1021 deletions
--- a/forge-gui/res/cube/Adam
+++ b/forge-gui/res/cube/Adam
@@ -1,7 +1,7 @@
 [metadata]
 Name=Adam Styborkski's Pauper Cube
 [main]
-1 Act of Treason|ORI
+1 Act of Treason|A25
 1 Adventuring Gear|ZEN
 1 Aerie Ouphes|EVE
 1 Aether Adept|M12
@@ -15,7 +15,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Arc Lightning|KTK
 1 Armillary Sphere|CFX
 1 Arrest|MM2
-1 Ash Barrens
+1 Ash Barrens|A25
 1 Ashes to Ashes|5ED
 1 Assault Zeppelid|DIS
 1 Attended Knight|MM3
@@ -33,7 +33,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Beneath the Sands|HOU
 1 Blastoderm|VMA
 1 Blazing Torch|ISD
-1 Blightning|ALA
+1 Blightning|A25
 1 Blinding Beam|MMA
 1 Bloodfell Caves|EMA
 1 Blossoming Sands|EMA
@@ -72,7 +72,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Compulsory Rest|AKH
 1 Consume Strength|APC
 1 Corrupted Zendikon|WWK
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Crippling Fatigue|TOR
 1 Crow of Dark Tidings|SOI
 1 Crypt Rats|7ED
@@ -81,7 +81,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Curse of Chains|SHM
 1 Custodi Squire|CNS
 1 Daring Skyjek|GTC
-1 Dauntless Cathar|SOI
+1 Dauntless Cathar|A25
 1 Dead Reveler|IMA
 1 Dead Weight|SOI
 1 Deadeye Tormentor|XLN
@@ -93,11 +93,11 @@ Name=Adam Styborkski's Pauper Cube
 1 Desert|TSB
 1 Desperate Sentry|EMN
 1 Devour Flesh|GTC
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dimir Guildgate|MM3
 1 Dinrova Horror|MM3
 1 Dire Fleet Hoarder|XLN
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismal Backwater|EMA
 1 Disowned Ancestor|KTK
 1 Doom Blade|IMA
@@ -112,11 +112,11 @@ Name=Adam Styborkski's Pauper Cube
 1 Elephant Guide|EMA
 1 Elite Vanguard|EMA
 1 Emperor Crocodile|EMA
-1 Epic Confrontation|DTK
+1 Epic Confrontation|A25
 1 Errant Ephemeron|MMA
 1 Esper Cormorants|CFX
 1 Evincar's Justice|TMP
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Faceless Butcher|TSB
 1 Faith's Fetters|EMA
 1 Falkenrath Noble|MM3
@@ -127,9 +127,9 @@ Name=Adam Styborkski's Pauper Cube
 1 Flayer Husk|MM2
 1 Flurry of Horns|JOU
 1 Forked Bolt|ROE
-1 Forsaken Sanctuary|SOI
+1 Forsaken Sanctuary|RIX
 1 Fortify|MM2
-1 Foul Orchard|SOI
+1 Foul Orchard|RIX
 1 Frilled Oculus|GTC
 1 Frostburn Weird|RTR
 1 Gathan Raiders|FUT
@@ -137,13 +137,13 @@ Name=Adam Styborkski's Pauper Cube
 1 Ghastly Demise|ODY
 1 Ghirapur Gearcrafter|ORI
 1 Ghitu Slinger|EMA
-1 Giant Growth|M14
+1 Giant Growth|A25
 1 Gideon's Lawkeeper|MM3
 1 Glint-Sleeve Artisan|KLD
 1 Gnawing Zombie|MM3
 1 Goblin Freerunner|OGW
 1 Goblin Heelcutter|FRF
-1 Gods Willing|THS
+1 Gods Willing|A25
 1 Goldmeadow Harrier|LRW
 1 Golgari Guildgate|MM3
 1 Gravedigger|AKH
@@ -161,7 +161,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Halimar Wavewatch|ROE
 1 Harrow|TPR
 1 Harsh Sustenance|FRF
-1 Highland Lake|SOI
+1 Highland Lake|RIX
 1 Hissing Iguanar|ALA
 1 Hooting Mandrills|KTK
 1 Humble|EMA
@@ -183,20 +183,20 @@ Name=Adam Styborkski's Pauper Cube
 1 Kor Skyfisher|MM3
 1 Kozilek's Channeler|BFZ
 1 Krenko's Command|M13
-1 Krosan Tusker|VMA
+1 Krosan Tusker|A25
 1 Kruin Striker|AVR
 1 Lash Out|LRW
 1 Last Gasp|RAV
 1 Leave in the Dust|AER
 1 Leonin Bola|DST
 1 Lifecraft Cavalry|AER
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Liliana's Specter|CNS
 1 Lotus Path Djinn|FRF
 1 Loyal Pegasus|BNG
 1 Magma Jet|MM3
 1 Makeshift Mauler|ISD
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Leak|IMA
 1 Manticore of the Gauntlet|AKH
 1 Mardu Hordechief|KTK
@@ -209,12 +209,12 @@ Name=Adam Styborkski's Pauper Cube
 1 Mind Stone|IMA
 1 Minotaur Skullcleaver|THS
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mist Raven|MM3
 1 Mistral Charger|EMA
 1 Mobile Garrison|AER
 1 Mogg Fanatic|EMA
-1 Mogg Flunkies|MM3
+1 Mogg Flunkies|A25
 1 Mogg War Marshal|EMA
 1 Moldervine Cloak|MMA
 1 Momentary Blink|MM3
@@ -225,7 +225,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Necromancer's Assistant|M15
 1 Nessian Asp|THS
 1 Nest Robber|XLN
-1 Nezumi Cutthroat|CHK
+1 Nezumi Cutthroat|A25
 1 Night's Whisper|EMA
 1 Nightscape Familiar|VMA
 1 Ninja of the Deep Hours|BOK
@@ -233,19 +233,19 @@ Name=Adam Styborkski's Pauper Cube
 1 Oona's Grace|EMA
 1 Orzhov Guildgate|MM3
 1 Otherworldly Journey|MM2
-1 Pacifism|EMA
+1 Pacifism|A25
 1 Paladin of the Bloodstained|XLN
 1 Peema Outrider|KLD
 1 Penumbra Spider|MM3
 1 Peregrine Drake|EMA
-1 Perilous Myr|SOM
+1 Perilous Myr|A25
 1 Pestermite|MMA
 1 Pestilence|6ED
 1 Phantom Nomad|VMA
 1 Phantom Tiger|IMA
 1 Pharika's Chosen|JOU
 1 Phyrexian Rager|IMA
-1 Pillory of the Sleepless|MM2
+1 Pillory of the Sleepless|A25
 1 Pit Fight|GTC
 1 Pit Keeper|MM3
 1 Plated Geopede|ZEN
@@ -257,7 +257,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Prey Upon|AER
 1 Prismatic Strands|JUD
 1 Pristine Talisman|IMA
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Pulse of Murasa|OGW
 1 Pursue Glory|AKH
 1 Putrid Leech|ARB
@@ -267,7 +267,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Rakdos Guildgate|MM3
 1 Rally the Peasants|EMA
 1 Rampant Growth|MM2
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger's Guile|M14
 1 Ray of Command|5ED
 1 Razorfin Hunter|APC
@@ -283,7 +283,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Rugged Highlands|EMA
 1 Runed Servitor|IMA
 1 Rushing River|PLS
-1 Sailor of Means|XLN
+1 Sailor of Means|RIX
 1 Sakura-Tribe Elder|CNS
 1 Sandsteppe Outcast|FRF
 1 Sangrite Backlash|ARB
@@ -326,7 +326,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Staggershock|IMA
 1 Star Compass|IMA
 1 Stitched Drake|ISD
-1 Stone Quarry|SOI
+1 Stone Quarry|RIX
 1 Storm Fleet Pyromancer|XLN
 1 Stormfront Pegasus|M12
 1 Stormscape Apprentice|INV
@@ -367,7 +367,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Ulamog's Crusher|MM2
 1 Ulvenwald Captive|EMN
 1 Undying Rage|EMA
-1 Unearth|ULG
+1 Unearth|A25
 1 Unmake|EVE
 1 Vampire Interloper|ISD
 1 Vault Skirge|NPH
@@ -387,7 +387,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Wasteland Scorpion|AKH
 1 Wayfarer's Bauble|MM2
 1 Werebear|EMA
-1 Whitemane Lion|EMA
+1 Whitemane Lion|A25
 1 Wild Instincts|ORI
 1 Wild Mongrel|VMA
 1 Wild Nacatl|ALA
@@ -397,7 +397,7 @@ Name=Adam Styborkski's Pauper Cube
 1 Winds of Rebuke|AKH
 1 Winged Coatl|ARB
 1 Wojek Halberdiers|GTC
-1 Woodland Stream|SOI
+1 Woodland Stream|RIX
 1 Wrecking Ball|MM2
 1 Wretched Gryff|EMN
 1 Yavimaya Elder|VMA
--- a/forge-gui/res/cube/Ben's
+++ b/forge-gui/res/cube/Ben's
@@ -16,7 +16,7 @@ Name=Ben's Cube (720 cards)
 1 Ajani Vengeant|ALA
 1 Ajani, Caller of the Pride|M14
 1 Akroma, Angel of Wrath|TSB
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 All Is Dust|MM2
 1 Ambition's Cost|8ED
 1 Ancestral Recall|VMA
@@ -27,12 +27,12 @@ Name=Ben's Cube (720 cards)
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
 1 Ankh of Mishra|VMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Lightning|KTK
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ash Zealot|RTR
 1 Ashen Rider|THS
 1 Augur of Bolas|MM3
@@ -77,11 +77,11 @@ Name=Ben's Cube (720 cards)
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
 1 Borderland Marauder|IMA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -111,7 +111,7 @@ Name=Ben's Cube (720 cards)
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
 1 Cloudthresher|LRW
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coiling Oracle|MM3
 1 Coldsteel Heart|CSP
 1 Compulsive Research|MM3
@@ -122,16 +122,16 @@ Name=Ben's Cube (720 cards)
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Countryside Crusher|MMA
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crucible of Worlds|10E
 1 Crypt Ghast|GTC
 1 Cryptic Command|IMA
 1 Crystal Shard|MRD
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
 1 Dack Fayden|EMA
@@ -139,13 +139,13 @@ Name=Ben's Cube (720 cards)
 1 Damnation|MM3
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Dauthi Horror|TPR
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
 1 Deceiver Exarch|NPH
-1 Decree of Justice|VMA
+1 Decree of Justice|A25
 1 Deep Analysis|EMA
 1 Defense of the Heart|ULG
 1 Demonic Tutor|VMA
@@ -159,8 +159,8 @@ Name=Ben's Cube (720 cards)
 1 Dig Through Time|KTK
 1 Diregraf Ghoul|ISD
 1 Disciple of Bolas|M13
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dissipate|M15
 1 Domri Rade|MM3
@@ -175,7 +175,7 @@ Name=Ben's Cube (720 cards)
 1 Duskmantle Seer|GTC
 1 Earthquake|M10
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Eight-and-a-Half-Tails|EMA
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
@@ -197,7 +197,7 @@ Name=Ben's Cube (720 cards)
 1 Eternal Dragon|VMA
 1 Eternal Witness|MMA
 1 Everflowing Chalice|MM2
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exhume|USG
 1 Experiment One|GTC
 1 Explore|MM3
@@ -208,10 +208,10 @@ Name=Ben's Cube (720 cards)
 1 Far // Away|DGM
 1 Farseek|M13
 1 Fastbond|VMA
-1 Fathom Seer|TSP
+1 Fathom Seer|A25
 1 Fauna Shaman|M11
 1 Fellwar Stone|9ED
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
 1 Fireblast|VMA
@@ -226,7 +226,7 @@ Name=Ben's Cube (720 cards)
 1 Forbidden Alchemy|MM3
 1 Force of Will|EMA
 1 Frantic Search|VMA
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Frost Titan|M12
 1 Future Sight|EMA
 1 Fyndhorn Elves|VMA
@@ -287,7 +287,7 @@ Name=Ben's Cube (720 cards)
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imposing Sovereign|M14
 1 Impulse|VIS
 1 Incinerate|M12
@@ -306,7 +306,7 @@ Name=Ben's Cube (720 cards)
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Jokulhaups|6ED
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
@@ -338,7 +338,7 @@ Name=Ben's Cube (720 cards)
 1 Legacy's Allure|TMP
 1 Library of Alexandria|VMA
 1 Life from the Loam|MMA
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -346,7 +346,7 @@ Name=Ben's Cube (720 cards)
 1 Liliana of the Veil|MM3
 1 Liliana Vess|M15
 1 Lingering Souls|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -355,7 +355,7 @@ Name=Ben's Cube (720 cards)
 1 Lotus Petal|TPR
 1 Loyal Cathar|DKA
 1 Loyal Retainers|PTK
-1 Luminarch Ascension|ZEN
+1 Luminarch Ascension|A25
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
 1 Makeshift Mannequin|LRW
@@ -365,12 +365,12 @@ Name=Ben's Cube (720 cards)
 1 Mana Leak|IMA
 1 Mana Vault|VMA
 1 Manamorphose|MMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Master of the Feast|JOU
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Masticore|VMA
 1 Mayor of Avabruck|ISD
 1 Maze of Ith|EMA
@@ -378,7 +378,7 @@ Name=Ben's Cube (720 cards)
 1 Memory Jar|VMA
 1 Memory Lapse|EMA
 1 Mentor of the Meek|ISD
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Mikaeus, the Lunarch|ISD
 1 Mimic Vat|SOM
 1 Mind Shatter|MM3
@@ -389,10 +389,10 @@ Name=Ben's Cube (720 cards)
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Moat|LEG
-1 Mogg Flunkies|MM3
+1 Mogg Flunkies|A25
 1 Mogg War Marshal|EMA
 1 Mold Shambler|ZEN
 1 Molten Rain|MM3
@@ -413,15 +413,15 @@ Name=Ben's Cube (720 cards)
 1 Murderous Redcap|MMA
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Mystical Tutor|EMA
 1 Nantuko Shade|M11
 1 Narcolepsy|MM2
 1 Natural Order|EMA
-1 Naturalize|DTK
+1 Naturalize|RIX
 1 Necromancy|VIS
 1 Necropotence|IMA
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nether Void|LEG
 1 Nevinyrral's Disk|EMA
@@ -447,19 +447,19 @@ Name=Ben's Cube (720 cards)
 1 Overgrown Tomb|RTR
 1 Overrun|TPR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Palinchron|VMA
 1 Palladium Myr|IMA
 1 Path to Exile|MM3
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
-1 Pillage|7ED
+1 Pillage|A25
 1 Pithing Needle|RTR
 1 Plateau|VMA
 1 Plated Geopede|ZEN
@@ -485,13 +485,13 @@ Name=Ben's Cube (720 cards)
 1 Purphoros, God of the Forge|THS
 1 Putrefy|MM3
 1 Putrid Leech|ARB
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Raging Ravine|WWK
 1 Rakdos Cackler|RTR
 1 Ral Zarek|DGM
 1 Rampant Growth|MM2
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ravages of War|PTK
 1 Ravenous Baboons|EXO
@@ -500,7 +500,7 @@ Name=Ben's Cube (720 cards)
 1 Reckless Waif|ISD
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Repeal|IMA
@@ -508,7 +508,7 @@ Name=Ben's Cube (720 cards)
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Rolling Earthquake|PTK
 1 Rootbound Crag|XLN
@@ -529,7 +529,7 @@ Name=Ben's Cube (720 cards)
 1 Searing Spear|M13
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shelldock Isle|LRW
 1 Sheoldred, Whispering One|IMA
 1 Show and Tell|USG
@@ -590,7 +590,7 @@ Name=Ben's Cube (720 cards)
 1 Sulfuric Vortex|EMA
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
@@ -599,7 +599,7 @@ Name=Ben's Cube (720 cards)
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -620,7 +620,7 @@ Name=Ben's Cube (720 cards)
 1 Terror|10E
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 The Tabernacle at Pendrell Vale
 1 Thelonite Hermit|TSP
@@ -663,19 +663,19 @@ Name=Ben's Cube (720 cards)
 1 Urabrask the Hidden|IMA
 1 Urborg, Tomb of Yawgmoth|M15
 1 Vampire Hexmage|CNS
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Varolz, the Scar-Striped|DGM
 1 Vault of the Archangel|DKA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
 1 Vexing Devil|AVR
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Voidslime|DIS
 1 Volcanic Island|VMA
--- a/forge-gui/res/cube/Cube
+++ b/forge-gui/res/cube/Cube
@@ -16,7 +16,7 @@ Name=Cube Tutor 360 Pauper
 1 Soltari Trooper|TPR
 1 Stormfront Pegasus|M12
 1 Syndic of Tithes|GTC
-1 Whitemane Lion|EMA
+1 Whitemane Lion|A25
 1 Youthful Knight|MM3
 1 Apex Hawks|CNS
 1 Attended Knight|MM3
@@ -31,7 +31,7 @@ Name=Cube Tutor 360 Pauper
 1 Plover Knights|LRW
 1 Totem-Guide Hartebeest|ORI
 1 Porcelain Legionnaire|NPH
-1 Cloudshift|AVR
+1 Cloudshift|A25
 1 Mana Tithe|PLC
 1 Apostle's Blessing|MM2
 1 Feeling of Dread|ISD
@@ -47,7 +47,7 @@ Name=Cube Tutor 360 Pauper
 1 Hyena Umbra|ROE
 1 Bonds of Faith|ISD
 1 Journey to Nowhere|ZEN
-1 Pacifism|EMA
+1 Pacifism|A25
 1 Temporal Isolation|TSP
 1 Arrest|MM2
 1 Cage of Hands|CHK
@@ -59,12 +59,12 @@ Name=Cube Tutor 360 Pauper
 1 Frilled Oculus|GTC
 1 Halimar Wavewatch|ROE
 1 Looter il-Kor|TSP
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Thought Courier|9ED
 1 Waterfront Bouncer|VMA
 1 Aether Adept|M12
 1 Calcite Snapper|WWK
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Pestermite|MMA
 1 Sea Gate Oracle|MM3
 1 Shaper Parasite|PLC
@@ -82,10 +82,10 @@ Name=Cube Tutor 360 Pauper
 1 Aethersnipe|MM2
 1 Errant Ephemeron|MMA
 1 Spined Thopter|NPH
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Force Spike|7ED
 1 Boomerang|10E
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Daze|EMA
 1 Into the Roil|ZEN
 1 Jilt|APC
@@ -95,7 +95,7 @@ Name=Cube Tutor 360 Pauper
 1 Think Twice|ISD
 1 Withdraw|PCY
 1 Capsize|TPR
-1 Exclude|INV
+1 Exclude|A25
 1 Forbidden Alchemy|MM3
 1 Repulse|INV
 1 Rushing River|PLS
@@ -114,12 +114,12 @@ Name=Cube Tutor 360 Pauper
 1 Carnophage|TPR
 1 Fume Spitter|SOM
 1 Typhoid Rats|FRF
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Basilica Screecher|GTC
 1 Blind Creeper|5DN
 1 Dauthi Horror|TPR
 1 Dauthi Slayer|TPR
-1 Nezumi Cutthroat|CHK
+1 Nezumi Cutthroat|A25
 1 Vampire Interloper|ISD
 1 Wretched Anurid|ONS
 1 Blind Zealot|NPH
@@ -136,15 +136,15 @@ Name=Cube Tutor 360 Pauper
 1 Mortis Dogs|NPH
 1 Okiba-Gang Shinobi|BOK
 1 Warren Pilferers|MMA
-1 Twisted Abomination|EMA
+1 Twisted Abomination|A25
 1 Vault Skirge|NPH
 1 Pith Driller|NPH
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Tragic Slip|EMA
 1 Undying Evil|DKA
 1 Vendetta|ROE
 1 Devour Flesh|GTC
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Doom Blade|IMA
 1 Grim Harvest|CSP
 1 Last Gasp|RAV
@@ -154,7 +154,7 @@ Name=Cube Tutor 360 Pauper
 1 Snuff Out|MMQ
 1 Death Denied|MM2
 1 Duress|IMA
-1 Unearth|ULG
+1 Unearth|A25
 1 Disturbed Burial|TMP
 1 Hymn to Tourach|EMA
 1 Sign in Blood|MM2
@@ -171,7 +171,7 @@ Name=Cube Tutor 360 Pauper
 1 Fireslinger|TMP
 1 Gore-House Chainwalker|RTR
 1 Keldon Marauders|EMA
-1 Mogg Flunkies|MM3
+1 Mogg Flunkies|A25
 1 Mogg War Marshal|EMA
 1 Plated Geopede|ZEN
 1 Skirk Marauder|LGN
@@ -189,7 +189,7 @@ Name=Cube Tutor 360 Pauper
 1 Slash Panther|NPH
 1 Brute Force|MM2
 1 Burst Lightning|MM2
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Incinerate|M12
 1 Lash Out|LRW
 1 Searing Blaze|WWK
@@ -205,7 +205,7 @@ Name=Cube Tutor 360 Pauper
 1 Reckless Charge|EMA
 1 Krenko's Command|M13
 1 Volcanic Hammer|9ED
-1 Act of Treason|ORI
+1 Act of Treason|A25
 1 Arc Lightning|KTK
 1 Rift Bolt|IMA
 1 Traitorous Instinct|MM3
@@ -213,7 +213,7 @@ Name=Cube Tutor 360 Pauper
 1 Fireball|IMA
 1 Rolling Thunder|BFZ
 1 Madcap Skills|MM3
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Basking Rootwalla|VMA
 1 Fyndhorn Elves|VMA
 1 Llanowar Elves|EMA
@@ -246,11 +246,11 @@ Name=Cube Tutor 360 Pauper
 1 Wickerbough Elder|EVE
 1 Nessian Asp|THS
 1 Sentinel Spider|EMA
-1 Krosan Tusker|VMA
+1 Krosan Tusker|A25
 1 Maul Splicer|NPH
 1 Walker of the Grove|MMA
 1 Thundering Tanadon|NPH
-1 Giant Growth|M14
+1 Giant Growth|A25
 1 Groundswell|WWK
 1 Vines of Vastwood|MM2
 1 Sprout Swarm|FUT
@@ -261,9 +261,9 @@ Name=Cube Tutor 360 Pauper
 1 Edge of Autumn|FUT
 1 Rampant Growth|MM2
 1 Travel Preparations|ISD
-1 Cultivate|M11
+1 Cultivate|A25
 1 Kodama's Reach|MMA
-1 Rancor|EMA
+1 Rancor|A25
 1 Arachnus Web|MM3
 1 Moldervine Cloak|MMA
 1 Deputy of Acquittals|MM3
@@ -275,7 +275,7 @@ Name=Cube Tutor 360 Pauper
 1 Terminate|MM3
 1 Auger Spree|MM3
 1 Wrecking Ball|MM2
-1 Blightning|ALA
+1 Blightning|A25
 1 Zhur-Taa Swine|GTC
 1 Pit Fight|GTC
 1 Branching Bolt|ALA
@@ -286,7 +286,7 @@ Name=Cube Tutor 360 Pauper
 1 Kingpin's Pet|GTC
 1 Blind Hunter|GPT
 1 Unmake|EVE
-1 Pillory of the Sleepless|MM2
+1 Pillory of the Sleepless|A25
 1 Putrid Leech|ARB
 1 Rendclaw Trow|EVE
 1 Sluiceway Scorpion|RTR
@@ -305,7 +305,7 @@ Name=Cube Tutor 360 Pauper
 1 Viashino Firstblade|DGM
 1 Martial Glory|GTC
 1 Ulamog's Crusher|MM2
-1 Perilous Myr|SOM
+1 Perilous Myr|A25
 1 Pilgrim's Eye|EMA
 1 Adventuring Gear|ZEN
 1 Blazing Torch|ISD
@@ -323,10 +323,10 @@ Name=Cube Tutor 360 Pauper
 1 Mind Stone|IMA
 1 Orzhov Signet|MM3
 1 Prismatic Lens|EMA
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Vulshok Morningstar|9ED
 1 Pristine Talisman|IMA
-1 Strider Harness|OGW
+1 Strider Harness|RIX
 1 Tumble Magnet|MM2
 1 Whispersilk Cloak|M11
 1 Serrated Arrows|TSB
@@ -337,19 +337,19 @@ Name=Cube Tutor 360 Pauper
 1 Desert|TSB
 1 Dimir Aqueduct|IMA
 1 Dimir Guildgate|MM3
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Golgari Guildgate|MM3
 1 Golgari Rot Farm|IMA
 1 Gruul Guildgate|MM3
 1 Gruul Turf|IMA
 1 Halimar Depths|WWK
-1 Haunted Fengraf|DKA
+1 Haunted Fengraf|A25
 1 Izzet Boilerworks|IMA
 1 Izzet Guildgate|MM3
 1 Khalni Garden|WWK
 1 Orzhov Basilica|IMA
 1 Orzhov Guildgate|MM3
-1 Quicksand|CNS
+1 Quicksand|A25
 1 Rakdos Carnarium|IMA
 1 Rakdos Guildgate|MM3
 1 Rupture Spire|CFX
--- a/forge-gui/res/cube/Cube
+++ b/forge-gui/res/cube/Cube
@@ -6,7 +6,7 @@ Name=Cube Tutor 720
 1 Isamaru, Hound of Konda|CHK
 1 Loam Lion|WWK
 1 Mother of Runes|EMA
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Soldier of the Pantheon|THS
 1 Steppe Lynx|ZEN
 1 Student of Warfare|ROE
@@ -25,11 +25,11 @@ Name=Cube Tutor 720
 1 Soltari Priest|TPR
 1 Soltari Trooper|TPR
 1 Stoneforge Mystic|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Wall of Omens|EMA
 1 Banisher Priest|M14
 1 Blade Splicer|MM3
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Flickerwisp|MM3
 1 Frontline Medic|GTC
 1 Kor Sanctifiers|ZEN
@@ -68,25 +68,25 @@ Name=Cube Tutor 720
 1 Enlightened Tutor|EMA
 1 Mana Tithe|PLC
 1 Path to Exile|MM3
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Momentary Blink|MM3
 1 Balance|EMA
 1 Lingering Souls|MM3
 1 Spectral Procession|MM2
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Day of Judgment|M12
 1 Wrath of God|EMA
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 Catastrophe|USG
 1 Terminus|MM3
 1 Martial Coup|CFX
 1 Entreat the Angels|MM3
-1 Decree of Justice|VMA
+1 Decree of Justice|A25
 1 Land Tax|4ED
 1 Honor of the Pure|M12
 1 Journey to Nowhere|ZEN
-1 Pacifism|EMA
+1 Pacifism|A25
 1 Seal of Cleansing|EMA
 1 Glorious Anthem|10E
 1 Oblivion Ring|MM2
@@ -99,19 +99,19 @@ Name=Cube Tutor 720
 1 Augur of Bolas|MM3
 1 Gilded Drake|USG
 1 Looter il-Kor|TSP
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Phantasmal Image|MM3
 1 Snapcaster Mage|MM3
 1 Waterfront Bouncer|VMA
-1 Willbender|TSB
+1 Willbender|A25
 1 Aether Adept|M12
 1 Kira, Great Glass-Spinner|MMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Pestermite|MMA
 1 Sea Gate Oracle|MM3
 1 Serendib Efreet|EMA
 1 Trinket Mage|SOM
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Clone|M14
 1 Dungeon Geists|DKA
 1 Glen Elendra Archmage|MMA
@@ -136,12 +136,12 @@ Name=Cube Tutor 720
 1 Phyrexian Metamorph|NPH
 1 Inkwell Leviathan|EMA
 1 Ancestral Recall|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Force Spike|7ED
 1 Mystical Tutor|EMA
 1 Spell Pierce|XLN
-1 Arcane Denial|ALL
+1 Arcane Denial|A25
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Cyclonic Rift|MM3
 1 Daze|EMA
 1 Impulse|VIS
@@ -150,7 +150,7 @@ Name=Cube Tutor 720
 1 Mana Leak|IMA
 1 Memory Lapse|EMA
 1 Miscalculation|ULG
-1 Negate|AER
+1 Negate|RIX
 1 Remand|MM2
 1 Capsize|TPR
 1 Dissipate|M15
@@ -163,7 +163,7 @@ Name=Cube Tutor 720
 1 Fact or Fiction|EMA
 1 Gifts Ungiven|MM3
 1 Force of Will|EMA
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Condescend|IMA
 1 Repeal|IMA
 1 Ancestral Vision|IMA
@@ -187,7 +187,7 @@ Name=Cube Tutor 720
 1 Diregraf Ghoul|ISD
 1 Gravecrawler|DKA
 1 Tormented Hero|THS
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Blood Artist|EMA
 1 Blood Scrivener|DGM
 1 Bloodghast|IMA
@@ -229,11 +229,11 @@ Name=Cube Tutor 720
 1 Liliana of the Veil|MM3
 1 Liliana Vess|M15
 1 Sorin Markov|M12
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Entomb|EMA
 1 Tragic Slip|EMA
 1 Vampiric Tutor|EMA
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Doom Blade|IMA
 1 Go for the Throat|MBS
 1 Ultimate Price|DTK
@@ -260,7 +260,7 @@ Name=Cube Tutor 720
 1 Barter in Blood|AVR
 1 Consuming Vapors|ROE
 1 Damnation|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Unburial Rites|MM3
 1 Mind Twist|4ED
 1 Black Sun's Zenith|MBS
@@ -277,7 +277,7 @@ Name=Cube Tutor 720
 1 Goblin Guide|MM3
 1 Goblin Welder|ULG
 1 Grim Lavamancer|M12
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Kird Ape|EMA
 1 Legion Loyalist|GTC
 1 Mogg Fanatic|EMA
@@ -296,7 +296,7 @@ Name=Cube Tutor 720
 1 Stormblood Berserker|MM2
 1 Torch Fiend|M15
 1 Young Pyromancer|EMA
-1 Ball Lightning|M10
+1 Ball Lightning|A25
 1 Chandra's Phoenix|M14
 1 Countryside Crusher|MMA
 1 Goblin Ruinblaster|ZEN
@@ -323,7 +323,7 @@ Name=Cube Tutor 720
 1 Koth of the Hammer|SOM
 1 Chandra Nalaar|M11
 1 Burst Lightning|MM2
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Ancient Grudge|MM3
 1 Incinerate|M12
 1 Lightning Strike|XLN
@@ -343,11 +343,11 @@ Name=Cube Tutor 720
 1 Reckless Charge|EMA
 1 Arc Trail|SOM
 1 Mizzium Mortars|MM3
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Arc Lightning|KTK
 1 Flames of the Firebrand|M14
 1 Molten Rain|MM3
-1 Pillage|7ED
+1 Pillage|A25
 1 Rift Bolt|IMA
 1 Slagstorm|MBS
 1 Stone Rain|9ED
@@ -360,7 +360,7 @@ Name=Cube Tutor 720
 1 Bonfire of the Damned|MM3
 1 Sulfuric Vortex|EMA
 1 Sneak Attack|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Avacyn's Pilgrim|MM3
 1 Birds of Paradise|M12
 1 Elves of Deep Shadow|RAV
@@ -395,7 +395,7 @@ Name=Cube Tutor 720
 1 Blastoderm|VMA
 1 Chameleon Colossus|MOR
 1 Deadbridge Goliath|RTR
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Obstinate Baloth|IMA
 1 Oracle of Mul Daya|ZEN
 1 Polukranos, World Eater|THS
@@ -414,7 +414,7 @@ Name=Cube Tutor 720
 1 Rampaging Baloths|IMA
 1 Avenger of Zendikar|WWK
 1 Hornet Queen|M15
-1 Krosan Tusker|VMA
+1 Krosan Tusker|A25
 1 Craterhoof Behemoth|MM3
 1 Terastodon|CNS
 1 Woodfall Primus|MMA
@@ -422,10 +422,10 @@ Name=Cube Tutor 720
 1 Garruk Wildspeaker|M11
 1 Garruk, Primal Hunter|M13
 1 Birthing Pod|NPH
-1 Giant Growth|M14
+1 Giant Growth|A25
 1 Vines of Vastwood|MM2
 1 Worldly Tutor|6ED
-1 Naturalize|DTK
+1 Naturalize|RIX
 1 Beast Within|NPH
 1 Harrow|TPR
 1 Krosan Grip|MMA
@@ -434,9 +434,9 @@ Name=Cube Tutor 720
 1 Farseek|M13
 1 Life from the Loam|MMA
 1 Rampant Growth|MM2
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Call of the Herd|MM3
-1 Cultivate|M11
+1 Cultivate|A25
 1 Kodama's Reach|MMA
 1 Search for Tomorrow|IMA
 1 Harmonize|MM3
@@ -446,7 +446,7 @@ Name=Cube Tutor 720
 1 Primal Command|MM3
 1 Green Sun's Zenith|EMA
 1 Tooth and Nail|MMA
-1 Rancor|EMA
+1 Rancor|A25
 1 Survival of the Fittest|TPR
 1 Sylvan Library|EMA
 1 Awakening Zone|ROE
@@ -459,7 +459,7 @@ Name=Cube Tutor 720
 1 Supreme Verdict|IMA
 1 Detention Sphere|RTR
 1 Psychatog|VMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Duskmantle Seer|GTC
 1 Oona, Queen of the Fae|MMA
 1 Tezzeret, Agent of Bolas|MBS
@@ -473,7 +473,7 @@ Name=Cube Tutor 720
 1 Terminate|MM3
 1 Bituminous Blast|ARB
 1 Dreadbore|RTR
-1 Blightning|ALA
+1 Blightning|A25
 1 Burning-Tree Emissary|MM3
 1 Boggart Ram-Gang|SHM
 1 Bloodbraid Elf|EMA
@@ -496,7 +496,7 @@ Name=Cube Tutor 720
 1 Sorin, Lord of Innistrad|DKA
 1 Tidehollow Sculler|MMA
 1 Mortify|CNS
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Deathrite Shaman|EMA
 1 Lotleth Troll|RTR
 1 Putrid Leech|ARB
@@ -506,11 +506,11 @@ Name=Cube Tutor 720
 1 Abrupt Decay|MM3
 1 Putrefy|MM3
 1 Maelstrom Pulse|MMA
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Coiling Oracle|MM3
 1 Edric, Spymaster of Trest|VMA
 1 Trygon Predator|EMA
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Prime Speaker Zegana|GTC
 1 Simic Sky Swallower|IMA
 1 Shardless Agent|EMA
@@ -526,7 +526,7 @@ Name=Cube Tutor 720
 1 Figure of Destiny|MMA
 1 Boros Reckoner|MM3
 1 Ajani Vengeant|ALA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Lightning Helix|IMA
 1 Assemble the Legion|GTC
 1 Sphinx of the Steel Wind|EMA
@@ -535,7 +535,7 @@ Name=Cube Tutor 720
 1 Ulamog, the Infinite Gyre|MM2
 1 Karn Liberated|MM2
 1 Epochrasite|MMA
-1 Perilous Myr|SOM
+1 Perilous Myr|A25
 1 Phyrexian Revoker|M15
 1 Spellskite|MM2
 1 Palladium Myr|IMA
@@ -550,7 +550,7 @@ Name=Cube Tutor 720
 1 Triskelion|M11
 1 Wurmcoil Engine|SOM
 1 Myr Battlesphere|SOM
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Black Lotus|VMA
 1 Chrome Mox|EMA
 1 Everflowing Chalice|MM2
@@ -598,7 +598,7 @@ Name=Cube Tutor 720
 1 Winter Orb|EMA
 1 Basalt Monolith|3ED
 1 Chromatic Lantern|RTR
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Crucible of Worlds|10E
 1 Crystal Shard|MRD
 1 Darksteel Ingot|M14
@@ -637,7 +637,7 @@ Name=Cube Tutor 720
 1 Bloodstained Mire|KTK
 1 Boros Garrison|IMA
 1 Breeding Pool|GTC
-1 Cascade Bluffs|EVE
+1 Cascade Bluffs|A25
 1 Caves of Koilos|ORI
 1 Celestial Colonnade|WWK
 1 City of Brass|MMA
@@ -647,9 +647,9 @@ Name=Cube Tutor 720
 1 Dimir Aqueduct|IMA
 1 Dragonskull Summit|XLN
 1 Drowned Catacomb|XLN
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Faerie Conclave|10E
-1 Fetid Heath|EVE
+1 Fetid Heath|A25
 1 Flooded Strand|KTK
 1 Gaea's Cradle|USG
 1 Gavony Township|ISD
@@ -670,7 +670,7 @@ Name=Cube Tutor 720
 1 Llanowar Wastes|ORI
 1 Marsh Flats|MM3
 1 Maze of Ith|EMA
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mutavault|M14
 1 Orzhov Basilica|IMA
@@ -680,9 +680,9 @@ Name=Cube Tutor 720
 1 Raging Ravine|WWK
 1 Rakdos Carnarium|IMA
 1 Reflecting Pool|CNS
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rootbound Crag|XLN
-1 Rugged Prairie|EVE
+1 Rugged Prairie|A25
 1 Sacred Foundry|GTC
 1 Savage Lands|MM3
 1 Savannah|VMA
@@ -705,7 +705,7 @@ Name=Cube Tutor 720
 1 Treetop Village|10E
 1 Tropical Island|VMA
 1 Tundra|VMA
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Underground Sea|VMA
 1 Verdant Catacombs|MM3
 1 Vivid Crag|MMA
--- a/forge-gui/res/cube/Eric
+++ b/forge-gui/res/cube/Eric
@@ -10,7 +10,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Ajani Vengeant|ALA
 1 Ajani, Mentor of Heroes|JOU
 1 Akroma's Blessing|ONS
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 Ancient Tomb|VMA
 1 Angel of Despair|GPT
 1 Aquamoeba|VMA
@@ -21,7 +21,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Arcbound Worker|MMA
 1 Archangel Avacyn|SOI
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Arrogant Wurm|VMA
 1 Atarka's Command|DTK
 1 Aura of Silence|10E
@@ -34,13 +34,13 @@ Name=Eric Klug's Pro Tour Cube
 1 Barbed Lightning|DST
 1 Basking Rootwalla|VMA
 1 Become Immense|KTK
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Birds of Paradise|M12
 1 Bitterblossom|MM2
 1 Bituminous Blast|ARB
 1 Black Knight|M11
 1 Blazing Specter|VMA
-1 Blightning|ALA
+1 Blightning|A25
 1 Blood Crypt|RTR
 1 Bloodbraid Elf|EMA
 1 Bogardan Hellkite|IMA
@@ -48,7 +48,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Boros Reckoner|MM3
 1 Boros Signet|MM3
 1 Bosh, Iron Golem|MRD
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Brave the Elements|M14
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
@@ -60,7 +60,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Capsize|TPR
 1 Careful Consideration|MMA
 1 Carven Caryatid|IMA
-1 Cascade Bluffs|EVE
+1 Cascade Bluffs|A25
 1 Cavern of Souls|MM3
 1 Caves of Koilos|ORI
 1 Celestial Colonnade|WWK
@@ -87,9 +87,9 @@ Name=Eric Klug's Pro Tour Cube
 1 Contagion|ALL
 1 Control Magic|EMA
 1 Convolute|EMN
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
-1 Court Hussar|DIS
+1 Court Hussar|A25
 1 Covetous Dragon|UDS
 1 Cranial Plating|MM2
 1 Crater Hellion|EMA
@@ -101,14 +101,14 @@ Name=Eric Klug's Pro Tour Cube
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Darksteel Citadel|MM2
 1 Daru Sanctifier|LGN
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Debtors' Knell|GPT
 1 Deceiver Exarch|NPH
-1 Decree of Justice|VMA
+1 Decree of Justice|A25
 1 Deep Analysis|EMA
 1 Demonfire|DIS
 1 Demonic Consultation|ICE
@@ -116,8 +116,8 @@ Name=Eric Klug's Pro Tour Cube
 1 Devil's Play|ISD
 1 Dimir Signet|MM3
 1 Disciple of the Vault|MRD
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dispatch|MM2
 1 Dissipate|M15
@@ -150,7 +150,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Eternal Witness|MMA
 1 Ethersworn Canonist|MMA
 1 Evolutionary Leap|ORI
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exalted Angel|ONS
 1 Experiment One|GTC
 1 Explore|MM3
@@ -176,7 +176,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Force Spike|7ED
 1 Force of Will|EMA
 1 Foundry Street Denizen|M15
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Frogmite|MM2
 1 Frostburn Weird|RTR
 1 Fyndhorn Elves|VMA
@@ -184,7 +184,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Garruk Wildspeaker|M11
 1 Gempalm Incinerator|LGN
 1 Gemstone Mine|TSB
-1 Giant Growth|M14
+1 Giant Growth|A25
 1 Giant Solifuge|EMA
 1 Gideon Jura|M12
 1 Gideon, Ally of Zendikar|BFZ
@@ -210,7 +210,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Hero's Downfall|THS
 1 Hideous Laughter|CHK
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Horizon Canopy|IMA
 1 Horobi's Whisper|MMA
 1 Hunted Dragon|RAV
@@ -218,7 +218,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
 1 Icy Manipulator|10E
-1 Ihsan's Shade|HML
+1 Ihsan's Shade|A25
 1 Illusions of Grandeur|ICE
 1 Imperious Perfect|EMA
 1 Impulse|VIS
@@ -230,7 +230,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Jareth, Leonine Titan|VMA
 1 Jayemdae Tome|ORI
 1 Jokulhaups|6ED
@@ -254,7 +254,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Lavaclaw Reaches|WWK
 1 Leonin Relic-Warder|MBS
 1 Lightning Berserker|DTK
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Strike|XLN
@@ -269,7 +269,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Lotus Cobra|IMA
 1 Lotus Petal|TPR
 1 Maelstrom Pulse|MMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
 1 Mana Vault|VMA
@@ -284,7 +284,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Mindslaver|SOM
 1 Mirari|TSB
 1 Mirari's Wake|CNS
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mogg Conscripts|TPR
 1 Mogg Fanatic|EMA
@@ -306,7 +306,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Nameless Inversion|MM2
 1 Necropotence|IMA
 1 Nekrataal|EMA
-1 Nettle Sentinel|EVE
+1 Nettle Sentinel|A25
 1 Nevinyrral's Disk|EMA
 1 Nightscape Familiar|VMA
 1 Nightveil Specter|GTC
@@ -327,13 +327,13 @@ Name=Eric Klug's Pro Tour Cube
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
 1 Pentavus|M12
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phyrexian Colossus|8ED
 1 Phyrexian Processor|USG
 1 Phyrexian Scuta|PLS
 1 Phyrexian War Beast|ALL
-1 Pillage|7ED
+1 Pillage|A25
 1 Pithing Needle|RTR
 1 Plague Spitter|INV
 1 Planar Cleansing|M14
@@ -355,7 +355,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Putrefy|MM3
 1 Putrid Leech|ARB
 1 Pyrite Spellbomb|MMA
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Raging Ravine|WWK
 1 Rakdos Guildmage|DIS
 1 Rampant Growth|MM2
@@ -369,7 +369,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Repulse|INV
 1 Restoration Angel|IMA
 1 Ring of Gix|VMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roar of the Wurm|EMA
 1 Rootborn Defenses|MM3
 1 Ruination Guide|BFZ
@@ -379,7 +379,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Sandsteppe Citadel|KTK
 1 Savage Lands|MM3
 1 Savannah|VMA
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Scab-Clan Mauler|GPT
 1 Scalding Tarn|MM3
 1 Scorched Rusalka|MM3
@@ -445,12 +445,12 @@ Name=Eric Klug's Pro Tour Cube
 1 Stupor|TSB
 1 Sudden Death|TSP
 1 Sulfurous Springs|10E
-1 Summoner's Pact|MMA
+1 Summoner's Pact|A25
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
 1 Sword of Feast and Famine|MBS
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
@@ -499,7 +499,7 @@ Name=Eric Klug's Pro Tour Cube
 1 Vampiric Tutor|EMA
 1 Vault Skirge|NPH
 1 Vendetta|ROE
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengeful Dreams|TOR
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
--- a/forge-gui/res/cube/Guillaume
+++ b/forge-gui/res/cube/Guillaume
@@ -19,7 +19,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Angelic Destiny|M12
 1 Anguished Unmaking|SOI
 1 Aphetto Grifter|ONS
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arcanis the Omnipotent|EMA
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
@@ -54,9 +54,9 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Bosh, Iron Golem|MRD
 1 Brain Maggot|JOU
 1 Braingeyser|3ED
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
-1 Brion Stoutarm|LRW
+1 Brion Stoutarm|A25
 1 Brushland|10E
 1 Burning Vengeance|EMA
 1 Burst Lightning|MM2
@@ -88,7 +88,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Compulsion|TOR
 1 Compulsive Research|MM3
 1 Condescend|IMA
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Cradle of Vitality|ALA
 1 Crippling Fatigue|TOR
 1 Crucible of Worlds|10E
@@ -161,7 +161,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Feldon of the Third Path
 1 Felidar Umbra
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
@@ -173,7 +173,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Flux|WTH
 1 Foundry Street Denizen|M15
 1 Frantic Search|VMA
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 Fyndhorn Elves|VMA
 1 Gamble|EMA
@@ -237,7 +237,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 High Market|MMQ
 1 Hinterland Harbor|ISD
 1 Hopeful Eidolon|THS
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Idyllic Tutor|MOR
 1 Immaculate Magistrate|LRW
 1 Imperious Perfect|EMA
@@ -269,7 +269,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
 1 Life from the Loam|MMA
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Surge|JUD
@@ -319,14 +319,14 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Nearheath Pilgrim|AVR
 1 Necromancer's Stockpile|M15
 1 Necromancy|VIS
-1 Negate|AER
+1 Negate|RIX
 1 Nephalia Drownyard|ISD
 1 Nighthowler|THS
 1 Nissa, Vastwood Seer|ORI
 1 Noose Constrictor|EMN
 1 Norin the Wary|TSP
 1 Nullmage Shepherd|RAV
-1 Nyx-Fleece Ram|JOU
+1 Nyx-Fleece Ram|A25
 1 Obelisk of Urd|M15
 1 Obliterate|8ED
 1 Oblivion Ring|MM2
@@ -350,7 +350,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Phyrexian Metamorph|NPH
 1 Pia and Kiran Nalaar|ORI
 1 Pilgrim's Eye|EMA
-1 Pillage|7ED
+1 Pillage|A25
 1 Pious Evangel|SOI
 1 Plateau|VMA
 1 Polluted Delta|KTK
@@ -362,12 +362,12 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Pristine Talisman|IMA
 1 Prized Amalgam|SOI
 1 Prophetic Bolt|VMA
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Psychic Spiral|RTR
 1 Punishing Fire|ZEN
 1 Purphoros, God of the Forge|THS
 1 Quiet Speculation|EMA
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Raven's Crime|MMA
 1 Read the Bones|ORI
@@ -486,7 +486,7 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Traverse the Ulvenwald|SOI
 1 Tropical Island|VMA
 1 Tundra|VMA
-1 Twisted Abomination|EMA
+1 Twisted Abomination|A25
 1 Ulamog, the Infinite Gyre|MM2
 1 Ulvenwald Hydra|SOI
 1 Undead Alchemist|ISD
@@ -495,14 +495,14 @@ Name=Guillaume Matignon's Jenny's-Johnny's Cube
 1 Underground Sea|VMA
 1 Underworld Coinsmith|JOU
 1 Unstable Obelisk
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vapor Snag|MM2
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
-1 Vessel of Nascency|SOI
+1 Vessel of Nascency|A25
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Violent Eruption|TOR
 1 Viridian Zealot|DST
 1 Voidmage Prodigy|TSB
--- a/forge-gui/res/cube/Jim
+++ b/forge-gui/res/cube/Jim
@@ -15,7 +15,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Ankh of Mishra|VMA
 1 Arcbound Ravager|MMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashen Rider|THS
 1 Avacyn's Pilgrim|MM3
 1 Avenger of Zendikar|WWK
@@ -34,7 +34,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Bitterblossom|MM2
 1 Blackcleave Cliffs|SOM
 1 Blade Splicer|MM3
-1 Blightning|ALA
+1 Blightning|A25
 1 Blinkmoth Nexus|MM2
 1 Blood Artist|EMA
 1 Blood Crypt|RTR
@@ -43,12 +43,12 @@ Name=Jim Davis's Cube (469 cards)
 1 Bloodsoaked Champion|KTK
 1 Bloodstained Mire|KTK
 1 Bonesplitter|MMA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Bounding Krasis|ORI
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Bring to Light|BFZ
@@ -69,13 +69,13 @@ Name=Jim Davis's Cube (469 cards)
 1 City of Brass|MMA
 1 City of Traitors|TPR
 1 Clifftop Retreat|ISD
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coercive Portal|VMA
 1 Collected Company|DTK
 1 Condescend|IMA
 1 Copperline Gorge|SOM
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Cranial Plating|MM2
 1 Creeping Tar Pit|WWK
 1 Crop Rotation|ULG
@@ -86,7 +86,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Cursed Scroll|TPR
 1 Damnation|MM3
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Darkslick Shores|SOM
 1 Darksteel Citadel|MM2
 1 Daze|EMA
@@ -107,7 +107,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Dust Bowl|MMQ
 1 Dwarven Blastminer|ONS
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Emrakul, the Aeons Torn|MM2
 1 Engineered Explosives|MMA
@@ -189,7 +189,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Hooting Mandrills|KTK
 1 Horizon Canopy|IMA
 1 Hymn to Tourach|EMA
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
@@ -215,7 +215,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Kytheon, Hero of Akros|ORI
 1 Land Tax|4ED
 1 Life from the Loam|MMA
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
 1 Liliana of the Veil|MM3
@@ -246,7 +246,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Mind Stone|IMA
 1 Mindslaver|SOM
 1 Mirari's Wake|CNS
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Molten Rain|MM3
 1 Moment's Peace|ODY
@@ -277,7 +277,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Pack Rat|RTR
 1 Painful Truths|BFZ
 1 Path to Exile|MM3
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
@@ -298,7 +298,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Putrid Imp|VMA
 1 Qasali Pridemage|ARB
 1 Rakdos Cackler|RTR
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ratchet Bomb|M14
 1 Ravenous Baboons|EXO
@@ -308,12 +308,12 @@ Name=Jim Davis's Cube (469 cards)
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic Seeker|ORI
 1 Remand|MM2
 1 Restoration Angel|IMA
 1 Reveillark|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Rude Awakening|MMA
 1 Sacred Foundry|GTC
@@ -329,7 +329,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Seat of the Synod|MRD
 1 Seeker of the Way|IMA
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
 1 Shelldock Isle|LRW
@@ -371,11 +371,11 @@ Name=Jim Davis's Cube (469 cards)
 1 Sulfur Falls|ISD
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Survival of the Fittest|TPR
 1 Sword of Feast and Famine|MBS
 1 Sword of Fire and Ice|MMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Library|EMA
 1 Taiga|VMA
 1 Tangle Wire|NMS
@@ -389,7 +389,7 @@ Name=Jim Davis's Cube (469 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Tezzeret, Agent of Bolas|MBS
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia's Lieutenant|SOI
 1 The Abyss|LEG
 1 The Tabernacle at Pendrell Vale
@@ -428,17 +428,17 @@ Name=Jim Davis's Cube (469 cards)
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
 1 Urborg, Tomb of Yawgmoth|M15
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampiric Tutor|EMA
 1 Vault of Whispers|MRD
 1 Vault Skirge|NPH
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Village Messenger|SOI
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Voltaic Key|M11
--- a/forge-gui/res/cube/Jospeh
+++ b/forge-gui/res/cube/Jospeh
@@ -14,7 +14,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Ancient Ziggurat|CFX
 1 Anticipate|BFZ
 1 Arachnogenesis
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Lightning|KTK
 1 Arc Trail|SOM
 1 Arcane Sanctum|MM3
@@ -29,7 +29,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Azorius Signet|MM3
 1 Azure Mage|MM3
 1 Baleful Strix|EMA
-1 Baloth Null|OGW
+1 Baloth Null|A25
 1 Bane of Bala Ged|BFZ
 1 Banisher Priest|M14
 1 Banishing Light|JOU
@@ -41,7 +41,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Bestial Menace|MM2
 1 Bituminous Blast|ARB
 1 Blastoderm|VMA
-1 Blightning|ALA
+1 Blightning|A25
 1 Blind with Anger|CHK
 1 Blinding Beam|MMA
 1 Blood Artist|EMA
@@ -53,7 +53,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Bonesplitter|MMA
 1 Borderland Marauder|IMA
 1 Borderland Ranger|AVR
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Guildgate|MM3
 1 Branching Bolt|ALA
 1 Briarhorn|LRW
@@ -91,12 +91,12 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Consul's Lieutenant|ORI
 1 Control Magic|EMA
 1 Corpse Augur
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Crossway Vampire|ISD
 1 Crumbling Necropolis|MM3
 1 Crystal Shard|MRD
 1 Cudgel Troll|M12
-1 Cultivate|M11
+1 Cultivate|A25
 1 Curse of Chains|SHM
 1 Curse of Predation|IMA
 1 Curse of Shallow Graves
@@ -106,12 +106,12 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Deadly Recluse|M14
 1 Deadwood Treefolk|PLC
 1 Death Frenzy|KTK
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Diabolic Servitude|USG
 1 Dimir Aqueduct|IMA
 1 Dimir Signet|MM3
 1 Diregraf Ghoul|ISD
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Doom Blade|IMA
@@ -139,15 +139,15 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Enlisted Wurm|ARB
 1 Enslave|NPH
 1 Entomber Exarch|MM3
-1 Epic Confrontation|DTK
+1 Epic Confrontation|A25
 1 Epochrasite|MMA
 1 Errant Ephemeron|MMA
 1 Esper Charm|ALA
 1 Essence Scatter|AKH
 1 Eternal Witness|MMA
 1 Everflowing Chalice|MM2
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
-1 Exclude|INV
+1 Exclude|A25
 1 Expedition Envoy|BFZ
 1 Explore|MM3
 1 Fact or Fiction|EMA
@@ -159,7 +159,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Fencer Clique|MOR
 1 Fervent Cathar|EMA
 1 Feudkiller's Verdict|MMA
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fire Covenant|ICE
 1 Fire Imp|POR
 1 Fireblast|VMA
@@ -175,13 +175,13 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Force Spike|7ED
 1 Forked Bolt|ROE
 1 Foundry Street Denizen|M15
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Frontier Bivouac|KTK
 1 Frost Lynx|IMA
 1 Fyndhorn Elves|VMA
 1 Galvanic Juggernaut|CNS
 1 Gemstone Mine|TSB
-1 Genju of the Spires|BOK
+1 Genju of the Spires|A25
 1 Ghor-Clan Rampager|MM3
 1 Gideon's Lawkeeper|MM3
 1 Gnarled Scarhide|JOU
@@ -213,7 +213,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Herald of the Host
 1 Hermit of the Natterknolls|SOI
 1 Hit // Run|DIS
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
 1 Icy Manipulator|10E
@@ -226,7 +226,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Izzet Boilerworks|IMA
 1 Izzet Charm|MM3
 1 Izzet Signet|MM3
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Jade Mage|M12
 1 Jeskai Charm|KTK
 1 Jeskai Elder|KTK
@@ -248,11 +248,11 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Kor Castigator|BFZ
 1 Kor Hookmaster|MM3
 1 Kozilek's Predator|MM2
-1 Krosan Tusker|VMA
+1 Krosan Tusker|A25
 1 Krosan Verge|JUD
 1 Lashknife Barrier|PLS
 1 Leafcrown Dryad|THS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Strike|XLN
@@ -265,7 +265,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Lust for War|ROE
 1 Magma Jet|MM3
 1 Makindi Sliderunner|BFZ
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
 1 Mardu Roughrider|KTK
@@ -279,14 +279,14 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Memory Lapse|EMA
 1 Merciless Executioner|FRF
 1 Mercurial Geists|EMN
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Midnight Haunting|ISD
 1 Mind Control|M12
 1 Mind Stone|IMA
 1 Mirrodin's Core|CNS
 1 Mirror Match
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mist Raven|MM3
 1 Mistral Charger|EMA
 1 Moan of the Unhallowed|ISD
@@ -295,7 +295,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Mortarpod|MM2
 1 Mother of Runes|EMA
 1 Mulldrifter|MM2
-1 Murder of Crows|ISD
+1 Murder of Crows|A25
 1 Murderous Cut|KTK
 1 Murderous Redcap|MMA
 1 Mwonvuli Beast Tracker|M13
@@ -319,17 +319,17 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Oreskos Explorer
 1 Ornitharch|BNG
 1 Overrun|TPR
-1 Pacifism|EMA
+1 Pacifism|A25
 1 Path to Exile|MM3
 1 Pelakka Wurm|MM2
 1 Penumbra Spider|MM3
 1 Penumbra Wurm|VMA
-1 Perilous Myr|SOM
+1 Perilous Myr|A25
 1 Persuasion|10E
 1 Pestermite|MMA
 1 Phantom Centaur|JUD
 1 Phyrexian Gargantua|EMA
-1 Phyrexian Ghoul|USG
+1 Phyrexian Ghoul|A25
 1 Phyrexian Ingester|EMA
 1 Phyrexian Rager|IMA
 1 Pianna, Nomad Captain|VMA
@@ -350,7 +350,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Psionic Blast|TSB
 1 Psychatog|VMA
 1 Pulse Tracker|WWK
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Pyrotechnics|FRF
 1 Qarsi High Priest|FRF
 1 Qasali Pridemage|ARB
@@ -369,7 +369,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Reckless Waif|ISD
 1 Reclamation Sage|M15
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relief Captain|OGW
 1 Remand|MM2
 1 Remove Soul|10E
@@ -395,7 +395,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Savage Lands|MM3
 1 Savage Punch|KTK
 1 Savage Twister|MM2
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Scoured Barrens|EMA
 1 Sea Gate Oracle|MM3
 1 Search for Tomorrow|IMA
@@ -455,7 +455,7 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Sunhome Guildmage|MM3
 1 Swift Warkite|DTK
 1 Swiftwater Cliffs|EMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Library|EMA
 1 Symbiotic Wurm|VMA
 1 Tainted Field|TOR
@@ -497,11 +497,11 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Undercity Troll|IMA
 1 Undo|VIS
 1 Undying Evil|DKA
-1 Unearth|ULG
+1 Unearth|A25
 1 Urza's Factory|TSP
 1 Valley Dasher|KTK
 1 Vampire Aristocrat|MM3
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampiric Rites|BFZ
 1 Viashino Firstblade|DGM
@@ -538,4 +538,4 @@ Name=Jospeh Vasoli's Peasant Cube
 1 Yavimaya Elder|VMA
 1 Young Pyromancer|EMA
 1 Zealous Persecution|EMA
-1 Zulaport Cutthroat|BFZ
+1 Zulaport Cutthroat|A25
--- a/forge-gui/res/cube/Legendary
+++ b/forge-gui/res/cube/Legendary
@@ -4,7 +4,7 @@ Name=Legendary Cube (598 cards)
 1 Aboshan, Cephalid Emperor|ODY
 1 Absorb Vis|MMA
 1 Akroma's Memorial|FUT
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 Akroma, Angel of Wrath|TSB
 1 Akuta, Born of Ash|SOK
 1 Alesha, Who Smiles at Death|FRF
@@ -14,7 +14,7 @@ Name=Legendary Cube (598 cards)
 1 Anger of the Gods|IMA
 1 Anticipate|BFZ
 1 Arashi, the Sky Asunder|SOK
-1 Arcane Denial|ALL
+1 Arcane Denial|A25
 1 Arcane Sanctum|MM3
 1 Arcanis the Omnipotent|EMA
 1 Arid Mesa|MM3
@@ -29,7 +29,7 @@ Name=Legendary Cube (598 cards)
 1 Azami, Lady of Scrolls|CHK
 1 Azorius Chancery|IMA
 1 Azorius Signet|MM3
-1 Azusa, Lost but Seeking|CHK
+1 Azusa, Lost but Seeking|A25
 1 Bad River|VMA
 1 Badlands|VMA
 1 Banishing Light|JOU
@@ -50,10 +50,10 @@ Name=Legendary Cube (598 cards)
 1 Boros Signet|MM3
 1 Brago, King Eternal|VMA
 1 Brainbite|ARB
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
-1 Brion Stoutarm|LRW
+1 Brion Stoutarm|A25
 1 Brothers Yamazaki|CHK
 1 Brothers Yamazaki|CHK
 1 Caged Sun|NPH
@@ -61,7 +61,7 @@ Name=Legendary Cube (598 cards)
 1 Canopy Vista|BFZ
 1 Captain Sisay|INV
 1 Careful Consideration|MMA
-1 Cascade Bluffs|EVE
+1 Cascade Bluffs|A25
 1 Catch // Release|DGM
 1 Cauldron of Souls|SHM
 1 Chain Reaction|WWK
@@ -75,13 +75,13 @@ Name=Legendary Cube (598 cards)
 1 Chromatic Star|10E
 1 Cinder Glade|BFZ
 1 Clifftop Retreat|ISD
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coalition Victory|TSB
 1 Coldsteel Heart|CSP
 1 Commander Eesha|JUD
 1 Compulsive Research|MM3
 1 Condemn|M11
-1 Conflux|CFX
+1 Conflux|A25
 1 Contagion Clasp|SOM
 1 Council's Judgment|CNS
 1 Crackling Doom|KTK
@@ -92,7 +92,7 @@ Name=Legendary Cube (598 cards)
 1 Crumbling Necropolis|MM3
 1 Crux of Fate|FRF
 1 Crystal Ball|M11
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cyclonic Rift|MM3
 1 Daretti, Scrap Savant
 1 Dark Depths|CSP
@@ -106,7 +106,7 @@ Name=Legendary Cube (598 cards)
 1 Diaochan, Artful Beauty|PTK
 1 Dimir Aqueduct|IMA
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Dismantling Blow|INV
 1 Divine Reckoning|ISD
 1 Door to Nothingness|M13
@@ -128,7 +128,7 @@ Name=Legendary Cube (598 cards)
 1 Edric, Spymaster of Trest|VMA
 1 Eiganjo Castle|CHK
 1 Eight-and-a-Half-Tails|EMA
-1 Eladamri's Call|PLS
+1 Eladamri's Call|A25
 1 Eladamri, Lord of Leaves|TMP
 1 Elbrus, the Binding Blade|DKA
 1 Elesh Norn, Grand Cenobite|IMA
@@ -138,7 +138,7 @@ Name=Legendary Cube (598 cards)
 1 Enlightened Tutor|EMA
 1 Esper Charm|ALA
 1 Everflowing Chalice|MM2
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exava, Rakdos Blood Witch|DGM
 1 Experiment Kraj|DIS
 1 Explore|MM3
@@ -151,7 +151,7 @@ Name=Legendary Cube (598 cards)
 1 Far // Away|DGM
 1 Farseek|M13
 1 Fellwar Stone|9ED
-1 Fetid Heath|EVE
+1 Fetid Heath|A25
 1 Fiery Confluence
 1 Fiery Fall|MM2
 1 Finest Hour|ARB
@@ -160,7 +160,7 @@ Name=Legendary Cube (598 cards)
 1 Firebolt|EMA
 1 Fires of Yavimaya|VMA
 1 Flood Plain|VMA
-1 Flooded Grove|EVE
+1 Flooded Grove|A25
 1 Flooded Strand|KTK
 1 Forbidden Alchemy|MM3
 1 Foresee|M11
@@ -180,7 +180,7 @@ Name=Legendary Cube (598 cards)
 1 Glissa, the Traitor|MBS
 1 Godless Shrine|GTC
 1 Godo, Bandit Warlord|CHK
-1 Gods Willing|THS
+1 Gods Willing|A25
 1 Golgari Rot Farm|IMA
 1 Golgari Signet|MM3
 1 Grasslands|VMA
@@ -190,7 +190,7 @@ Name=Legendary Cube (598 cards)
 1 Gruul Signet|MM3
 1 Gruul Turf|IMA
 1 Hallowed Fountain|RTR
-1 Hanna, Ship's Navigator|INV
+1 Hanna, Ship's Navigator|A25
 1 Harmonize|MM3
 1 Heartless Hidetsugu|CNS
 1 Hedron Archive|BFZ
@@ -255,7 +255,7 @@ Name=Legendary Cube (598 cards)
 1 Kolaghan's Command|DTK
 1 Kolaghan, the Storm's Fury|FRF
 1 Konda's Banner|CHK
-1 Kongming, "Sleeping Dragon"
+1 Kongming, "Sleeping Dragon"|A25
 1 Kozilek, Butcher of Truth|MM2
 1 Krenko, Mob Boss|M13
 1 Kresh the Bloodbraided|ALA
@@ -268,7 +268,7 @@ Name=Legendary Cube (598 cards)
 1 Lavalanche|ARB
 1 Legacy Weapon|10E
 1 Life's Legacy|M15
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Liliana, Heretical Healer|ORI
 1 Linvala, Keeper of Silence|MM3
@@ -294,7 +294,7 @@ Name=Legendary Cube (598 cards)
 1 Meren of Clan Nel Toth
 1 Mikaeus, the Lunarch|ISD
 1 Mikaeus, the Unhallowed|DKA
-1 Mikokoro, Center of the Sea|SOK
+1 Mikokoro, Center of the Sea|A25
 1 Minamo, School at Water's Edge|CHK
 1 Mind Stone|IMA
 1 Mind's Eye|MRD
@@ -320,19 +320,19 @@ Name=Legendary Cube (598 cards)
 1 Mycosynth Wellspring|NPH
 1 Myojin of Cleansing Fire|CHK
 1 Myojin of Life's Web|CHK
-1 Myriad Landscape
+1 Myriad Landscape|A25
 1 Mystic Confluence
 1 Mystic Gate|SHM
 1 Mystic Monastery|KTK
 1 Nagao, Bound by Honor|CHK
 1 Nath of the Gilt-Leaf|LRW
-1 Naturalize|DTK
+1 Naturalize|RIX
-1 Negate|AER
+1 Negate|RIX
 1 Night's Whisper|EMA
 1 Nissa's Revelation|ORI
 1 Nissa, Vastwood Seer|ORI
 1 Niv-Mizzet, Dracogenius|RTR
-1 Niv-Mizzet, the Firemind|MM2
+1 Niv-Mizzet, the Firemind|A25
 1 Nomad Outpost|KTK
 1 Noyan Dar, Roil Shaper|BFZ
 1 Ob Nixilis, the Fallen|IMA
@@ -356,7 +356,7 @@ Name=Legendary Cube (598 cards)
 1 Panoptic Mirror|DST
 1 Pariah|10E
 1 Path to Exile|MM3
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Phage the Untouchable|CNS
 1 Phyrexian Arena|9ED
 1 Pia and Kiran Nalaar|ORI
@@ -371,7 +371,7 @@ Name=Legendary Cube (598 cards)
 1 Primeval Bounty|M14
 1 Prismatic Lens|EMA
 1 Progenitus|MMA
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Psychotic Fury|DIS
 1 Pure // Simple|DIS
 1 Putrefy|MM3
@@ -388,7 +388,7 @@ Name=Legendary Cube (598 cards)
 1 Read the Bones|ORI
 1 Recoup|ODY
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Reiterate|TSP
 1 Reki, the History of Kamigawa|SOK
 1 Repeal|IMA
@@ -402,7 +402,7 @@ Name=Legendary Cube (598 cards)
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
 1 Rorix Bladewing|EMA
-1 Rugged Prairie|EVE
+1 Rugged Prairie|A25
 1 Rupture Spire|CFX
 1 Ruric Thar, the Unbowed|DGM
 1 Rush of Knowledge|SCG
@@ -470,7 +470,7 @@ Name=Legendary Cube (598 cards)
 1 Sunpetal Grove|XLN
 1 Surrak Dragonclaw|KTK
 1 Surrak, the Hunt Caller|DTK
-1 Swiftfoot Boots|M12
+1 Swiftfoot Boots|A25
 1 Sword of the Animist|ORI
 1 Sword of the Chosen|STH
 1 Sydri, Galvanic Genius
@@ -539,7 +539,7 @@ Name=Legendary Cube (598 cards)
 1 Tumble Magnet|MM2
 1 Tundra|VMA
 1 Turn // Burn|DGM
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Tymaret, the Murder King|THS
 1 Ugin's Insight|BFZ
 1 Ulamog, the Infinite Gyre|MM2
@@ -558,7 +558,7 @@ Name=Legendary Cube (598 cards)
 1 Vanish into Memory|MM3
 1 Vedalken Orrery|CNS
 1 Vendetta|ROE
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdant Confluence
--- a/forge-gui/res/cube/Legendary
+++ b/forge-gui/res/cube/Legendary
@@ -15,9 +15,9 @@ Name=Legendary Cube April 2016 (566 cards)
 1 All Suns' Dawn|MM2
 1 Anafenza, Kin-Tree Spirit|DTK
 1 Ancestral Mask|EMA
-1 Ancient Craving|S99
+1 Ancient Craving|A25
 1 Annihilate|EMA
-1 Arcane Denial|ALL
+1 Arcane Denial|A25
 1 Arcane Sanctum|MM3
 1 Argothian Enchantress|EMA
 1 Armillary Sphere|CFX
@@ -33,7 +33,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Ayli, Eternal Pilgrim|OGW
 1 Azami, Lady of Scrolls|CHK
 1 Azorius Chancery|IMA
-1 Azusa, Lost but Seeking|CHK
+1 Azusa, Lost but Seeking|A25
 1 Badlands|VMA
 1 Baneslayer Angel|M11
 1 Barren Moor|VMA
@@ -41,7 +41,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Bayou|VMA
 1 Beacon of Destruction|10E
 1 Beacon of Tomorrows
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Bitter Revelation|KTK
 1 Black Sun's Zenith|MBS
 1 Bladewing the Risen|IMA
@@ -52,10 +52,10 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Boros Garrison|IMA
 1 Brago, King Eternal|VMA
 1 Braid of Fire|CSP
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
-1 Brion Stoutarm|LRW
+1 Brion Stoutarm|A25
 1 Brittle Effigy|M11
 1 Buried Ruin|M12
 1 Burn Away|KTK
@@ -83,7 +83,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Conjurer's Closet|AVR
 1 Corpse Churn|OGW
 1 Corpsehatch|ROE
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crib Swap|LRW
 1 Crovax, Ascendant Hero|PLC
 1 Crucible of the Spirit Dragon|FRF
@@ -146,7 +146,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Eternal Dragon|VMA
 1 Everflowing Chalice|MM2
 1 Evil Twin|MM3
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exile into Darkness|SOK
 1 Expedition Map|MM2
 1 Explore|MM3
@@ -163,7 +163,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Fated Retribution|BNG
 1 Fellwar Stone|9ED
 1 Fertile Ground|LRW
-1 Fierce Empath|SCG
+1 Fierce Empath|A25
 1 Fiery Fall|MM2
 1 Fire Diamond|7ED
 1 Flamekin Village
@@ -297,7 +297,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Mesa Enchantress|EMA
 1 Mikaeus, the Lunarch|ISD
 1 Mikaeus, the Unhallowed|DKA
-1 Mikokoro, Center of the Sea|SOK
+1 Mikokoro, Center of the Sea|A25
 1 Millikin|EMA
 1 Mimic Vat|SOM
 1 Mina and Denn, Wildborn|OGW
@@ -330,7 +330,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Nissa's Revelation|ORI
 1 Nissa, Vastwood Seer|ORI
 1 Niv-Mizzet, Dracogenius|RTR
-1 Niv-Mizzet, the Firemind|MM2
+1 Niv-Mizzet, the Firemind|A25
 1 Nomad Outpost|KTK
 1 Noyan Dar, Roil Shaper|BFZ
 1 Nylea, God of the Hunt|THS
@@ -350,7 +350,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Orzhov Basilica|IMA
 1 Outpost Siege|FRF
 1 Overgrown Tomb|RTR
-1 Pacifism|EMA
+1 Pacifism|A25
 1 Pariah|10E
 1 Perilous Vault|M15
 1 Phage the Untouchable|CNS
@@ -385,7 +385,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Reclamation Sage|M15
 1 Recumbent Bliss|EVE
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Reiterate|TSP
 1 Reki, the History of Kamigawa|SOK
 1 Repeal|IMA
@@ -466,7 +466,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Sun Ce, Young Conquerer
 1 Sun Quan, Lord of Wu|PTK
 1 Sunpetal Grove|XLN
-1 Swiftfoot Boots|M12
+1 Swiftfoot Boots|A25
 1 Sword of the Animist|ORI
 1 Sword of the Chosen|STH
 1 Sylvan Messenger|ORI
@@ -536,7 +536,7 @@ Name=Legendary Cube April 2016 (566 cards)
 1 Vedalken Archmage|MRD
 1 Vedalken Orrery|CNS
 1 Vendetta|ROE
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdeloth the Ancient|MMA
 1 Vish Kal, Blood Arbiter
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -11,19 +11,19 @@ Name=MTGO Cube March 2014
 1 Ajani Vengeant|ALA
 1 Ajani, Caller of the Pride|M14
 1 Akroma, Angel of Wrath|TSB
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 All Is Dust|MM2
 1 Ancestral Vision|IMA
 1 Ancient Grudge|MM3
 1 Ancient Tomb|VMA
 1 Angel of Serenity|RTR
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Arcane Sanctum|MM3
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ash Zealot|RTR
 1 Attrition|UDS
 1 Augur of Bolas|MM3
@@ -38,7 +38,7 @@ Name=MTGO Cube March 2014
 1 Badlands|VMA
 1 Balance|EMA
 1 Baleful Strix|EMA
-1 Ball Lightning|M10
+1 Ball Lightning|A25
 1 Bane of the Living|LGN
 1 Baneslayer Angel|M11
 1 Banisher Priest|M14
@@ -55,7 +55,7 @@ Name=MTGO Cube March 2014
 1 Black Sun's Zenith|MBS
 1 Blade Splicer|MM3
 1 Blastoderm|VMA
-1 Blightning|ALA
+1 Blightning|A25
 1 Blistering Firecat|ONS
 1 Blood Baron of Vizkopa|IMA
 1 Blood Crypt|RTR
@@ -64,7 +64,7 @@ Name=MTGO Cube March 2014
 1 Bloodgift Demon|ISD
 1 Bloodline Keeper|ISD
 1 Bloodstained Mire|KTK
-1 Blue Elemental Blast|4ED
+1 Blue Elemental Blast|A25
 1 Bogardan Hellkite|IMA
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
@@ -75,7 +75,7 @@ Name=MTGO Cube March 2014
 1 Boros Garrison|IMA
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -89,7 +89,7 @@ Name=MTGO Cube March 2014
 1 Call of the Herd|MM3
 1 Capsize|TPR
 1 Carnophage|TPR
-1 Cascade Bluffs|EVE
+1 Cascade Bluffs|A25
 1 Catastrophe|USG
 1 Caves of Koilos|ORI
 1 Celestial Colonnade|WWK
@@ -108,7 +108,7 @@ Name=MTGO Cube March 2014
 1 City of Brass|MMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Compulsive Research|MM3
 1 Condemn|M11
 1 Condescend|IMA
@@ -116,27 +116,27 @@ Name=MTGO Cube March 2014
 1 Control Magic|EMA
 1 Coralhelm Commander|ROE
 1 Corrupt|M14
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Countryside Crusher|MMA
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
-1 Court Hussar|DIS
+1 Court Hussar|A25
 1 Creeping Tar Pit|WWK
 1 Crucible of Worlds|10E
 1 Crumbling Necropolis|MM3
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
-1 Cursecatcher|SHM
+1 Cursecatcher|A25
 1 Cursed Scroll|TPR
 1 Damnation|MM3
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Daxos of Meletis|THS
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deadbridge Chant|DGM
 1 Death Cloud|MMA
-1 Decree of Justice|VMA
+1 Decree of Justice|A25
 1 Deep Analysis|EMA
 1 Delver of Secrets|ISD
 1 Demonic Tutor|VMA
@@ -149,8 +149,8 @@ Name=MTGO Cube March 2014
 1 Dimir Aqueduct|IMA
 1 Dimir Charm|GTC
 1 Diregraf Ghoul|ISD
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismantling Blow|INV
 1 Dismember|MM2
 1 Dismiss|TPR
@@ -203,10 +203,10 @@ Name=MTGO Cube March 2014
 1 Faith's Fetters|EMA
 1 Falkenrath Aristocrat|MM3
 1 Farseek|M13
-1 Fathom Seer|TSP
+1 Fathom Seer|A25
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fetid Heath|EVE
+1 Fetid Heath|A25
 1 Figure of Destiny|MMA
 1 Fireblast|VMA
 1 Firebolt|EMA
@@ -222,14 +222,14 @@ Name=MTGO Cube March 2014
 1 Flickerwisp|MM3
 1 Flinthoof Boar|EMA
 1 Flood Plain|VMA
-1 Flooded Grove|EVE
+1 Flooded Grove|A25
 1 Flooded Strand|KTK
 1 Forbid|TPR
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Forked Bolt|ROE
 1 Frantic Search|VMA
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Frost Titan|M12
 1 Future Sight|EMA
 1 Fyndhorn Elves|VMA
@@ -243,7 +243,7 @@ Name=MTGO Cube March 2014
 1 Geist of Saint Traft|ISD
 1 Genesis Wave|IMA
 1 Genesis|VMA
-1 Genju of the Spires|BOK
+1 Genju of the Spires|A25
 1 Geralf's Messenger|DKA
 1 Ghitu Encampment|10E
 1 Gideon Jura|M12
@@ -312,7 +312,7 @@ Name=MTGO Cube March 2014
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Jotun Grunt|CSP
 1 Journey to Nowhere|ZEN
@@ -343,7 +343,7 @@ Name=MTGO Cube March 2014
 1 Leonin Relic-Warder|MBS
 1 Life from the Loam|MMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
 1 Liliana of the Veil|MM3
@@ -352,7 +352,7 @@ Name=MTGO Cube March 2014
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Loam Lion|WWK
@@ -366,19 +366,19 @@ Name=MTGO Cube March 2014
 1 Makeshift Mannequin|LRW
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Manriki-Gusari|SOK
 1 Mark of Mutiny|IMA
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Memory Jar|VMA
 1 Mentor of the Meek|ISD
 1 Merciless Eviction|GTC
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Mind Stone|IMA
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
@@ -386,7 +386,7 @@ Name=MTGO Cube March 2014
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
 1 Misdirection|CNS
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
@@ -403,19 +403,19 @@ Name=MTGO Cube March 2014
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystic Gate|SHM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Mystical Tutor|EMA
 1 Nantuko Shade|M11
 1 Nantuko Vigilante|LGN
 1 Narcolepsy|MM2
 1 Natural Order|EMA
-1 Naturalize|DTK
+1 Naturalize|RIX
 1 Nature's Claim|IMA
 1 Nature's Lore|5ED
 1 Nearheath Pilgrim|AVR
 1 Necromancy|VIS
 1 Necropotence|IMA
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nevinyrral's Disk|EMA
 1 Nezumi Graverobber|CHK
@@ -440,7 +440,7 @@ Name=MTGO Cube March 2014
 1 Orzhov Basilica|IMA
 1 Oust|ROE
 1 Overgrown Tomb|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Pain Seer|BNG
 1 Palinchron|VMA
 1 Palladium Myr|IMA
@@ -448,16 +448,16 @@ Name=MTGO Cube March 2014
 1 Path to Exile|MM3
 1 Pattern of Rebirth|UDS
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Persecute|9ED
-1 Phantasmal Bear|M12
+1 Phantasmal Bear|A25
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
-1 Pillage|7ED
+1 Pillage|A25
 1 Pithing Needle|RTR
 1 Plague Sliver|TSP
 1 Plateau|VMA
@@ -481,14 +481,14 @@ Name=MTGO Cube March 2014
 1 Putrefy|MM3
 1 Putrid Imp|VMA
 1 Putrid Leech|ARB
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Raging Ravine|WWK
 1 Rakdos Cackler|RTR
 1 Rakdos Carnarium|IMA
 1 Ral Zarek|DGM
 1 Rampant Growth|MM2
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ratchet Bomb|M14
 1 Ravages of War|PTK
@@ -496,9 +496,9 @@ Name=MTGO Cube March 2014
 1 Reanimate|TPR
 1 Reckless Charge|EMA
 1 Recurring Nightmare|TPR
-1 Red Elemental Blast|4ED
+1 Red Elemental Blast|A25
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Repeal|IMA
@@ -507,20 +507,20 @@ Name=MTGO Cube March 2014
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rocky Tar Pit|VMA
 1 Rofellos, Llanowar Emissary|VMA
 1 Rolling Earthquake|PTK
 1 Rootbound Crag|XLN
 1 Rout|CNS
 1 Rude Awakening|MMA
-1 Rugged Prairie|EVE
+1 Rugged Prairie|A25
 1 Sacred Foundry|GTC
 1 Sakashima's Student
 1 Sakura-Tribe Elder|CNS
 1 Sarcomancy|TPR
 1 Savage Lands|MM3
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Savannah|VMA
 1 Scalding Tarn|MM3
 1 Scavenging Ooze|MM3
@@ -537,7 +537,7 @@ Name=MTGO Cube March 2014
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shardless Agent|EMA
 1 Shivan Reef|ORI
 1 Show and Tell|USG
@@ -597,7 +597,7 @@ Name=MTGO Cube March 2014
 1 Sulfuric Vortex|EMA
 1 Sulfurous Springs|10E
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunken Ruins|SHM
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
@@ -605,7 +605,7 @@ Name=MTGO Cube March 2014
 1 Sword of Body and Mind|SOM
 1 Sword of Fire and Ice|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -624,7 +624,7 @@ Name=MTGO Cube March 2014
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 Thawing Glaciers|VMA
 1 Thelonite Hermit|TSP
@@ -655,7 +655,7 @@ Name=MTGO Cube March 2014
 1 Tropical Island|VMA
 1 Tundra|VMA
 1 Turnabout|VMA
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Ulamog, the Infinite Gyre|MM2
 1 Ultimate Price|DTK
 1 Ulvenwald Tracker|MM3
@@ -668,16 +668,16 @@ Name=MTGO Cube March 2014
 1 Urabrask the Hidden|IMA
 1 Urborg, Tomb of Yawgmoth|M15
 1 Vampire Hexmage|CNS
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
-1 Vesuvan Shapeshifter|TSP
+1 Vesuvan Shapeshifter|A25
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Vines of Vastwood|MM2
 1 Visara the Dreadful|EMA
 1 Voice of Resurgence|MM3
@@ -699,7 +699,7 @@ Name=MTGO Cube March 2014
 1 Wickerbough Elder|EVE
 1 Wild Nacatl|ALA
 1 Wildfire|MM2
-1 Willbender|TSB
+1 Willbender|A25
 1 Windbrisk Heights|LRW
 1 Windswept Heath|KTK
 1 Winter Orb|EMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -19,11 +19,11 @@ Name=MTGO Legacy Cube (600 cards)
 1 Angelic Destiny|M12
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashcloud Phoenix|KTK
 1 Ashiok, Nightmare Weaver|THS
 1 Augur of Bolas|MM3
@@ -44,7 +44,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Bayou|VMA
 1 Beast Within|NPH
 1 Beetleback Chief|EMA
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Birds of Paradise|M12
 1 Birthing Pod|NPH
 1 Bitterblossom|MM2
@@ -61,12 +61,12 @@ Name=MTGO Legacy Cube (600 cards)
 1 Bonfire of the Damned|MM3
 1 Boon Satyr|THS
 1 Borderland Marauder|IMA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Elite|GTC
 1 Boros Reckoner|MM3
 1 Brago, King Eternal|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -90,7 +90,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Clifftop Retreat|ISD
 1 Cloudfin Raptor|GTC
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Commune with the Gods|EMA
 1 Compulsive Research|MM3
 1 Condemn|M11
@@ -101,20 +101,20 @@ Name=MTGO Legacy Cube (600 cards)
 1 Coralhelm Commander|ROE
 1 Corrupt|M14
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crusade|6ED
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Curse of Predation|IMA
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Darkblast|RAV
 1 Day of Judgment|M12
 1 Daze|EMA
@@ -130,8 +130,8 @@ Name=MTGO Legacy Cube (600 cards)
 1 Dig Through Time|KTK
 1 Diregraf Ghoul|ISD
 1 Disciple of Bolas|M13
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissolve|IMA
@@ -190,7 +190,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Forbidden Alchemy|MM3
 1 Force of Will|EMA
 1 Force Spike|7ED
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 Frontline Medic|GTC
 1 Frost Titan|M12
@@ -249,12 +249,12 @@ Name=MTGO Legacy Cube (600 cards)
 1 Hero's Downfall|THS
 1 Hinterland Harbor|ISD
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imposing Sovereign|M14
 1 Impulse|VIS
 1 Incinerate|M12
@@ -269,7 +269,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kami of Ancient Law|MM2
@@ -294,7 +294,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Land Tax|4ED
 1 Legacy's Allure|TMP
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -303,7 +303,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Liliana Vess|M15
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Looter il-Kor|TSP
@@ -313,7 +313,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Madcap Skills|MM3
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
@@ -321,17 +321,17 @@ Name=MTGO Legacy Cube (600 cards)
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
 1 Master of the Feast|JOU
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Mind Stone|IMA
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg Fanatic|EMA
@@ -348,12 +348,12 @@ Name=MTGO Legacy Cube (600 cards)
 1 Mutagenic Growth|MM2
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Mystical Teachings|MM3
 1 Nantuko Shade|M11
 1 Natural Order|EMA
-1 Naturalize|DTK
+1 Naturalize|RIX
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nicol Bolas, Planeswalker|M13
 1 Night's Whisper|EMA
@@ -372,7 +372,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Oust|ROE
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Pain Seer|BNG
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
@@ -381,7 +381,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Phantom Centaur|JUD
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pillar of Flame|IMA
 1 Plateau|VMA
@@ -407,14 +407,14 @@ Name=MTGO Legacy Cube (600 cards)
 1 Rakdos Cackler|RTR
 1 Ral Zarek|DGM
 1 Rampant Growth|MM2
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ravages of War|PTK
 1 Reanimate|TPR
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Remove Soul|10E
 1 Repeal|IMA
@@ -423,7 +423,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
 1 Riptide Laboratory|ONS
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
 1 Sacred Foundry|GTC
@@ -433,7 +433,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Sarkhan, the Dragonspeaker|KTK
 1 Satyr Wayfinder|M15
 1 Savannah|VMA
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Scalding Tarn|MM3
 1 Scavenging Ooze|MM3
 1 Scorched Rusalka|MM3
@@ -450,7 +450,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
 1 Setessan Tactics|JOU
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shardless Agent|EMA
 1 Sheoldred, Whispering One|IMA
 1 Shivan Reef|ORI
@@ -499,10 +499,10 @@ Name=MTGO Legacy Cube (600 cards)
 1 Sulfurous Springs|10E
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -529,7 +529,7 @@ Name=MTGO Legacy Cube (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 Think Twice|ISD
 1 Thoughtseize|IMA
@@ -559,15 +559,15 @@ Name=MTGO Legacy Cube (600 cards)
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
 1 Vampire Hexmage|CNS
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Visara the Dreadful|EMA
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -18,11 +18,11 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Anger of the Gods|IMA
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel Avacyn|SOI
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Assemble the Legion|GTC
 1 Augur of Bolas|MM3
@@ -57,10 +57,10 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Bomat Courier|KLD
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Botanical Sanctum|KLD
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -85,7 +85,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 City of Brass|MMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coldsteel Heart|CSP
 1 Collective Brutality|EMN
 1 Collective Defiance|EMN
@@ -97,20 +97,20 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Control Magic|EMA
 1 Copperline Gorge|SOM
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Darkslick Shores|SOM
 1 Day of Judgment|M12
 1 Daze|EMA
@@ -125,7 +125,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Devil's Play|ISD
 1 Devoted Druid|SHM
 1 Disallow|AER
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -177,7 +177,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Fatal Push|AER
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
@@ -243,13 +243,13 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Hinterland Harbor|ISD
 1 Hissing Quagmire|OGW
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
 1 Icefall Regent|DTK
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incendiary Flow|EMN
 1 Incinerate|M12
@@ -257,7 +257,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Inquisition of Kozilek|MM3
 1 Inspiring Vantage|KLD
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isolated Chapel|ISD
 1 Izzet Charm|MM3
@@ -265,7 +265,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kalitas, Traitor of Ghet|OGW
@@ -290,7 +290,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Lavaclaw Reaches|WWK
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -302,17 +302,17 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Looter il-Kor|TSP
 1 Lotus Cobra|IMA
 1 Lumbering Falls|BFZ
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
-1 Magus of the Wheel
+1 Magus of the Wheel|A25
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Tithe|PLC
 1 Managorger Hydra|ORI
@@ -320,19 +320,19 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Mimic Vat|SOM
 1 Mind Stone|IMA
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
@@ -344,13 +344,13 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Murderous Redcap|MMA
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Natural Order|EMA
 1 Nature's Lore|5ED
 1 Necromancy|VIS
 1 Needle Spires|OGW
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nevinyrral's Disk|EMA
 1 Nicol Bolas, Planeswalker|M13
@@ -378,17 +378,17 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Panharmonicon|KLD
 1 Parallax Wave|VMA
 1 Part the Waterveil|BFZ
 1 Path to Exile|MM3
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
@@ -404,7 +404,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Primeval Titan|IMA
 1 Profane Command|MM2
 1 Purphoros, God of the Forge|THS
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Quarantine Field|BFZ
 1 Raging Ravine|WWK
@@ -425,7 +425,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Remove Soul|10E
@@ -434,7 +434,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rishkar, Peema Renegade|AER
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
@@ -460,7 +460,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shaman of Forgotten Ways|DTK
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -508,7 +508,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Sulfur Falls|ISD
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
@@ -517,7 +517,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
@@ -532,7 +532,7 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thassa, God of the Sea|THS
 1 Thing in the Ice|SOI
@@ -562,15 +562,15 @@ Name=MTGO Legacy Cube April 2017 (600 cards)
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
 1 Victimize|EMA
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Vorinclex, Voice of Hunger|IMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -0,0 +1,603 @@
 [metadata]
 Name=MTGO Legacy Cube February 2018 (600 cards)
 [main]
 1 Abbot of Keral Keep|ORI
 1 Abrade|HOU
 1 Abrupt Decay|MM3
 1 Abyssal Persecutor|IMA
 1 Acidic Slime|M13
 1 Act of Aggression|NPH
 1 Adanto Vanguard|XLN
 1 Ajani Goldmane|M11
 1 Ajani Vengeant|ALA
 1 Anafenza, Kin-Tree Spirit|DTK
 1 Ancestral Vision|IMA
 1 Ancient Tomb|VMA
 1 Angel of Invention|KLD
 1 Angel of Serenity|RTR
 1 Anger of the Gods|IMA
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
 1 Approach of the Second Sun|AKH
 1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel Avacyn|SOI
 1 Arid Mesa|MM3
 1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Assemble the Legion|GTC
 1 Augur of Bolas|MM3
 1 Avacyn's Pilgrim|MM3
 1 Avalanche Riders|TSB
 1 Avenger of Zendikar|WWK
 1 Badlands|VMA
 1 Baleful Strix|EMA
 1 Banefire|MM2
 1 Baneslayer Angel|M11
 1 Banisher Priest|M14
 1 Banishing Light|JOU
 1 Baral, Chief of Compliance|AER
 1 Batterskull|NPH
 1 Bayou|VMA
 1 Beast Within|NPH
 1 Bedlam Reveler|EMN
 1 Birds of Paradise|M12
 1 Birthing Pod|NPH
 1 Bitterblossom|MM2
 1 Blackcleave Cliffs|SOM
 1 Blade Splicer|MM3
 1 Blood Crypt|RTR
 1 Bloodbraid Elf|EMA
 1 Bloodghast|IMA
 1 Bloodstained Mire|KTK
 1 Bloom Tender|EVE
 1 Blooming Marsh|KLD
 1 Bogardan Hellkite|IMA
 1 Bomat Courier|KLD
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
 1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Botanical Sanctum|KLD
 1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
 1 Bruna, the Fading Light|EMN
 1 Buried Alive|ODY
 1 Burst Lightning|MM2
 1 Careful Consideration|MMA
 1 Careful Study|ODY
 1 Carnage Tyrant|XLN
 1 Cathartic Reunion|KLD
 1 Celestial Colonnade|WWK
 1 Censor|AKH
 1 Chain Lightning|EMA
 1 Chainer's Edict|TOR
 1 Chandra's Phoenix|M14
 1 Chandra, Fire of Kaladesh|ORI
 1 Chandra, Flamecaller|OGW
 1 Chandra, Pyromaster|M15
 1 Chandra, Torch of Defiance|KLD
 1 Char|RAV
 1 Chart a Course|XLN
 1 Chord of Calling|M15
 1 Chromatic Lantern|RTR
 1 City of Brass|MMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
 1 Coalition Relic|A25
 1 Coldsteel Heart|CSP
 1 Collective Brutality|EMN
 1 Collective Defiance|EMN
 1 Collective Effort|EMN
 1 Compulsive Research|MM3
 1 Concealed Courtyard|KLD
 1 Condemn|M11
 1 Consecrated Sphinx|IMA
 1 Control Magic|EMA
 1 Copperline Gorge|SOM
 1 Council's Judgment|CNS
 1 Counterspell|A25
 1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
 1 Cultivate|A25
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
 1 Dark Ritual|A25
 1 Darkslick Shores|SOM
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
 1 Deceiver Exarch|NPH
 1 Declaration in Stone|SOI
 1 Delver of Secrets|ISD
 1 Den Protector|DTK
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
 1 Devil's Play|ISD
 1 Devoted Druid|SHM
 1 Disallow|AER
 1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
 1 Dissolve|IMA
 1 Distended Mindbender|EMN
 1 Domri Rade|MM3
 1 Doom Blade|IMA
 1 Dragonlord Atarka|DTK
 1 Dragonlord Dromoka|DTK
 1 Dragonlord Ojutai|DTK
 1 Dragonlord Silumgar|DTK
 1 Dragonskull Summit|XLN
 1 Drana, Liberator of Malakir|BFZ
 1 Dread Return|TSP
 1 Dreadbore|RTR
 1 Dromoka's Command|DTK
 1 Drowned Catacomb|XLN
 1 Dualcaster Mage|EMA
 1 Dungeon Geists|DKA
 1 Duplicant|EMA
 1 Duress|IMA
 1 Duskwatch Recruiter|SOI
 1 Edric, Spymaster of Trest|VMA
 1 Elder Deep-Fiend|EMN
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth Tirel|SOM
 1 Elspeth, Knight-Errant|MMA
 1 Elspeth, Sun's Champion|THS
 1 Elves of Deep Shadow|RAV
 1 Elvish Mystic|M15
 1 Emeria Angel|IMA
 1 Emrakul, the Aeons Torn|MM2
 1 Emrakul, the Promised End|EMN
 1 Entomb|EMA
 1 Entreat the Angels|MM3
 1 Erebos, God of the Dead|THS
 1 Eternal Witness|MMA
 1 Exhume|USG
 1 Explore|MM3
 1 Exquisite Firecraft|ORI
 1 Fact or Fiction|EMA
 1 Faith's Fetters|EMA
 1 Falkenrath Gorger|SOI
 1 Farseek|M13
 1 Fatal Push|AER
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
 1 Field of Ruin|XLN
 1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
 1 Flame Slash|ROE
 1 Flametongue Kavu|VMA
 1 Flickerwisp|MM3
 1 Flooded Strand|KTK
 1 Forbid|TPR
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Forked Bolt|ROE
 1 Frost Titan|M12
 1 Fyndhorn Elves|VMA
 1 Gaea's Cradle|USG
 1 Garruk Relentless|ISD
 1 Garruk Wildspeaker|M11
 1 Garruk, Apex Predator|M15
 1 Garruk, Primal Hunter|M13
 1 Gatekeeper of Malakir|ZEN
 1 Geist of Saint Traft|ISD
 1 Genesis Wave|IMA
 1 Geralf's Messenger|DKA
 1 Ghor-Clan Rampager|MM3
 1 Gideon Jura|M12
 1 Gideon of the Trials|AKH
 1 Gideon, Ally of Zendikar|BFZ
 1 Gifted Aetherborn|AER
 1 Gifts Ungiven|MM3
 1 Gilded Lotus|M13
 1 Gisela, the Broken Blade|EMN
 1 Gitaxian Probe|NPH
 1 Glacial Fortress|XLN
 1 Glen Elendra Archmage|MMA
 1 Glorious Anthem|10E
 1 Glorybringer|AKH
 1 Go for the Throat|MBS
 1 Goblin Dark-Dwellers|OGW
 1 Goblin Guide|MM3
 1 Goblin Rabblemaster|M15
 1 God-Pharaoh's Gift|HOU
 1 Godless Shrine|GTC
 1 Gonti, Lord of Luxury|KLD
 1 Grave Titan|M12
 1 Gray Merchant of Asphodel|THS
 1 Greater Gargadon|MMA
 1 Green Sun's Zenith|EMA
 1 Greenwarden of Murasa|BFZ
 1 Grim Lavamancer|M12
 1 Griselbrand|MM3
 1 Hallowed Fountain|RTR
 1 Hallowed Spiritkeeper
 1 Hangarback Walker|ORI
 1 Harbinger of the Tides|ORI
 1 Harmonize|MM3
 1 Hazoret the Fervent|AKH
 1 Hellrider|MM3
 1 Hero of Bladehold|MBS
 1 Hero's Downfall|THS
 1 Hidden Dragonslayer|DTK
 1 Hinterland Harbor|ISD
 1 Hissing Quagmire|OGW
 1 Honor of the Pure|M12
 1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Hostage Taker|XLN
 1 Hour of Devastation|HOU
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
 1 Icefall Regent|DTK
 1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incendiary Flow|EMN
 1 Incinerate|M12
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
 1 Inspiring Vantage|KLD
 1 Into the Roil|ZEN
 1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isolated Chapel|ISD
 1 Izzet Charm|MM3
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
 1 Jackal Pup|A25
 1 Jadelight Ranger|RIX
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kalitas, Traitor of Ghet|OGW
 1 Karmic Guide|EMA
 1 Karn Liberated|MM2
 1 Keiga, the Tide Star|MMA
 1 Keranos, God of Storms|JOU
 1 Kiki-Jiki, Mirror Breaker|IMA
 1 Kiln Fiend|IMA
 1 Kiora's Follower|BNG
 1 Kiora, the Crashing Wave|BNG
 1 Kira, Great Glass-Spinner|MMA
 1 Kitchen Finks|MMA
 1 Kitesail Freebooter|XLN
 1 Knight of the Reliquary|IMA
 1 Kodama's Reach|MMA
 1 Kokusho, the Evening Star|MMA
 1 Kolaghan's Command|DTK
 1 Koth of the Hammer|SOM
 1 Kytheon, Hero of Akros|ORI
 1 Land Tax|4ED
 1 Languish|ORI
 1 Lavaclaw Reaches|WWK
 1 Legacy's Allure|TMP
 1 Legion's Landing|XLN
 1 Leonin Relic-Warder|MBS
 1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
 1 Lightning Strike|XLN
 1 Liliana of the Veil|MM3
 1 Liliana Vess|M15
 1 Liliana, Death's Majesty|AKH
 1 Liliana, Heretical Healer|ORI
 1 Liliana, the Last Hope|EMN
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
 1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Looter il-Kor|TSP
 1 Lotus Cobra|IMA
 1 Loxodon Warhammer|10E
 1 Lumbering Falls|BFZ
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
 1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Tithe|PLC
 1 Managorger Hydra|ORI
 1 Manic Vandal|M12
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
 1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Maze of Ith|EMA
 1 Mentor of the Meek|ISD
 1 Merfolk Looter|A25
 1 Mimic Vat|SOM
 1 Mind Stone|IMA
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
 1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
 1 Monastery Mentor|FRF
 1 Monastery Swiftspear|IMA
 1 Mother of Runes|EMA
 1 Mulldrifter|MM2
 1 Murderous Cut|KTK
 1 Murderous Redcap|MMA
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Natural Order|EMA
 1 Nature's Lore|5ED
 1 Necromancy|VIS
 1 Needle Spires|OGW
 1 Negate|RIX
 1 Nekrataal|EMA
 1 Nevinyrral's Disk|EMA
 1 Nicol Bolas, God-Pharaoh|HOU
 1 Nicol Bolas, Planeswalker|M13
 1 Nightveil Specter|GTC
 1 Nimble Obstructionist|HOU
 1 Nissa, Vastwood Seer|ORI
 1 Nissa, Vital Force|KLD
 1 Nissa, Voice of Zendikar|OGW
 1 Nissa, Worldwaker|M15
 1 Noble Hierarch|MM2
 1 Noxious Gearhulk|KLD
 1 Nykthos, Shrine to Nyx|THS
 1 Oath of Nissa|OGW
 1 Ob Nixilis Reignited|BFZ
 1 Oblivion Ring|MM2
 1 Oblivion Stone|IMA
 1 Obstinate Baloth|IMA
 1 Old Man of the Sea|ARN
 1 Olivia Voldaren|MM3
 1 Oona's Prowler|LRW
 1 Ophiomancer
 1 Opposition|7ED
 1 Opt|XLN
 1 Oracle of Mul Daya|ZEN
 1 Oust|ROE
 1 Outpost Siege|FRF
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
 1 Pact of Negation|A25
 1 Parallax Wave|VMA
 1 Part the Waterveil|BFZ
 1 Path to Exile|MM3
 1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
 1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
 1 Pillar of Flame|IMA
 1 Plateau|VMA
 1 Polluted Delta|KTK
 1 Polukranos, World Eater|THS
 1 Ponder|M12
 1 Porcelain Legionnaire|NPH
 1 Precinct Captain|RTR
 1 Preordain|M11
 1 Primal Command|MM3
 1 Primeval Titan|IMA
 1 Profane Command|MM2
 1 Purphoros, God of the Forge|THS
 1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Quarantine Field|BFZ
 1 Raging Ravine|WWK
 1 Raise the Alarm|EMA
 1 Rakdos's Return|RTR
 1 Ral Zarek|DGM
 1 Rampaging Baloths|IMA
 1 Rampaging Ferocidon|XLN
 1 Rampant Growth|MM2
 1 Ravages of War|PTK
 1 Ravenous Chupacabra|A25
 1 Razaketh, the Foulblooded|HOU
 1 Razorverge Thicket|SOM
 1 Read the Bones|ORI
 1 Reanimate|TPR
 1 Reckless Bushwhacker|OGW
 1 Reclamation Sage|M15
 1 Recruiter of the Guard
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
 1 Reflector Mage|OGW
 1 Regrowth|A25
 1 Rekindling Phoenix|RIX
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Remove Soul|10E
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
 1 Rishadan Port|A25
 1 Rishkar, Peema Renegade|AER
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
 1 Rune-Scarred Demon|IMA
 1 Sacred Foundry|GTC
 1 Sakura-Tribe Elder|CNS
 1 Sarkhan, the Dragonspeaker|KTK
 1 Savannah|VMA
 1 Scalding Tarn|MM3
 1 Scavenging Ooze|MM3
 1 Scrapheap Scrounger|KLD
 1 Scrubland|VMA
 1 Sea Gate Oracle|MM3
 1 Seachrome Coast|SOM
 1 Seal of Fire|DIS
 1 Search for Azcanta|XLN
 1 Search for Tomorrow|IMA
 1 Searing Spear|M13
 1 Secure the Wastes|DTK
 1 Seeker of the Way|IMA
 1 Selfless Spirit|EMN
 1 Selvala, Heart of the Wilds
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
 1 Settle the Wreckage|XLN
 1 Shaman of Forgotten Ways|DTK
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
 1 Shelldock Isle|LRW
 1 Sheoldred, Whispering One|IMA
 1 Show and Tell|USG
 1 Shriekmaw|LRW
 1 Siege-Gang Commander|EMA
 1 Silverblade Paladin|AVR
 1 Skinrender|SOM
 1 Skymarcher Aspirant|RIX
 1 Slagstorm|MBS
 1 Slaughter Pact|MMA
 1 Smuggler's Copter|KLD
 1 Snapcaster Mage|MM3
 1 Sneak Attack|EMA
 1 Solemn Simulacrum|M12
 1 Song of the Dryads
 1 Sorin Markov|M12
 1 Sorin, Solemn Visitor|KTK
 1 Soulfire Grand Master|FRF
 1 Sower of Temptation|LRW
 1 Spear of Heliod|THS
 1 Spectral Procession|MM2
 1 Spell Queller|EMN
 1 Spellskite|MM2
 1 Sphinx's Revelation|MM3
 1 Spirebluff Canal|KLD
 1 Splinter Twin|MM2
 1 Staggershock|IMA
 1 Steam Vents|RTR
 1 Stirring Wildwood|WWK
 1 Stoke the Flames|M15
 1 Stomping Ground|GTC
 1 Stoneforge Mystic|WWK
 1 Stormbreath Dragon|THS
 1 Stormchaser Mage|OGW
 1 Stratus Dancer|DTK
 1 Stroke of Genius|VMA
 1 Stromkirk Noble|ISD
 1 Student of Warfare|ROE
 1 Sublime Archangel|M13
 1 Sulfur Falls|ISD
 1 Sun Titan|M12
 1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
 1 Sword of Body and Mind|SOM
 1 Sword of Feast and Famine|MBS
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
 1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
 1 Talrand, Sky Summoner|M13
 1 Tamiyo, the Moon Sage|AVR
 1 Tangle Wire|NMS
 1 Tarmogoyf|MM3
 1 Tasigur, the Golden Fang|FRF
 1 Teferi, Mage of Zhalfir|IMA
 1 Temple Garden|RTR
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
 1 Tetzimoc, Primal Death|RIX
 1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thassa, God of the Sea|THS
 1 The Scarab God|HOU
 1 Thing in the Ice|SOI
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
 1 Thragtusk|MM3
 1 Thrun, the Last Troll|MBS
 1 Thunderbreak Regent|DTK
 1 Thundermaw Hellkite|IMA
 1 Tidehollow Sculler|MMA
 1 Time Warp|TPR
 1 Tireless Tracker|SOI
 1 Tooth and Nail|MMA
 1 Torch Fiend|M15
 1 Tower of the Magistrate|MMQ
 1 Toxic Deluge|EMA
 1 Treachery|UDS
 1 Tropical Island|VMA
 1 Trygon Predator|EMA
 1 Tundra|VMA
 1 Ugin, the Spirit Dragon|FRF
 1 Ulamog, the Ceaseless Hunger|BFZ
 1 Ultimate Price|DTK
 1 Umezawa's Jitte|BOK
 1 Unburial Rites|MM3
 1 Underground Sea|VMA
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
 1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
 1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
 1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Vraska's Contempt|XLN
 1 Vraska, Relic Seeker|XLN
 1 Walking Ballista|AER
 1 Wall of Blossoms|TPR
 1 Wall of Omens|EMA
 1 Wandering Fumarole|OGW
 1 Wasteland|EMA
 1 Watery Grave|GTC
 1 Whip of Erebos|THS
 1 Whirler Rogue|ORI
 1 Whisperwood Elemental|FRF
 1 Wickerbough Elder|EVE
 1 Windbrisk Heights|LRW
 1 Windswept Heath|KTK
 1 Wolfir Silverheart|AVR
 1 Wood Elves|9ED
 1 Wooded Foothills|KTK
 1 Woodfall Primus|MMA
 1 Woodland Cemetery|ISD
 1 Wrath of God|EMA
 1 Wretched Confluence
 1 Wurmcoil Engine|SOM
 1 Xenagos, the Reveler|THS
 1 Yavimaya Elder|VMA
 1 Young Pyromancer|EMA
 1 Zealous Conscripts|MM3
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -9,7 +9,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Acidic Slime|M13
 1 Act of Aggression|NPH
 1 Adarkar Wastes|10E
-1 Ainok Survivalist|DTK
+1 Ainok Survivalist|A25
 1 Ajani Goldmane|M11
 1 Ajani Vengeant|ALA
 1 Ajani, Caller of the Pride|M14
@@ -19,11 +19,11 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Angel of Serenity|RTR
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashcloud Phoenix|KTK
 1 Ashen Rider|THS
 1 Ashenmoor Gouger|MM2
@@ -60,10 +60,10 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Brago, King Eternal|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -98,14 +98,14 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Control Magic|EMA
 1 Coralhelm Commander|ROE
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crusade|6ED
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
@@ -114,7 +114,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Dark Confidant|MM2
 1 Dark Depths|CSP
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -128,7 +128,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Diabolic Servitude|USG
 1 Dictate of Heliod|JOU
 1 Disciple of Bolas|M13
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -172,7 +172,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Eureka|VMA
 1 Evolutionary Leap|ORI
 1 Exalted Angel|ONS
-1 Exclude|INV
+1 Exclude|A25
 1 Exhume|USG
 1 Explore|MM3
 1 Exquisite Firecraft|ORI
@@ -182,7 +182,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Farseek|M13
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
@@ -197,7 +197,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Forked Bolt|ROE
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 From Beyond|BFZ
 1 Frontline Medic|GTC
@@ -256,19 +256,19 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 High Market|MMQ
 1 Hinterland Harbor|ISD
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incinerate|M12
 1 Indrik Stomphowler|DIS
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isochron Scepter|EMA
 1 Isolated Chapel|ISD
@@ -277,7 +277,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kami of Ancient Law|MM2
@@ -302,7 +302,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Land Tax|4ED
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -312,7 +312,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Liliana, Heretical Healer|ORI
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Looter il-Kor|TSP
@@ -322,7 +322,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Magma Jet|MM3
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Tithe|PLC
 1 Managorger Hydra|ORI
@@ -330,17 +330,17 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Meteor Blast
 1 Mimic Vat|SOM
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
@@ -353,12 +353,12 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystic Confluence
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nantuko Husk|ORI
 1 Natural Order|EMA
 1 Nature's Lore|5ED
 1 Necromancy|VIS
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nicol Bolas, Planeswalker|M13
 1 Nightveil Specter|GTC
@@ -382,7 +382,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Parallax Wave|VMA
 1 Part the Waterveil|BFZ
 1 Path to Exile|MM3
@@ -390,7 +390,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
 1 Pillar of Flame|IMA
@@ -424,7 +424,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Remove Soul|10E
@@ -434,7 +434,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
 1 Righteous Confluence
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -456,7 +456,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shaman of Forgotten Ways|DTK
 1 Shardless Agent|EMA
 1 Sheoldred, Whispering One|IMA
@@ -502,11 +502,11 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Sulfurous Springs|10E
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -531,7 +531,7 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 Thespian's Stage|GTC
 1 Thoughtseize|IMA
@@ -559,15 +559,15 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Viscera Seer|M11
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
@@ -600,4 +600,4 @@ Name=MTGO Legacy Cube January 2016 (600 cards)
 1 Yosei, the Morning Star|MMA
 1 Young Pyromancer|EMA
 1 Zealous Conscripts|MM3
-1 Zulaport Cutthroat|BFZ
+1 Zulaport Cutthroat|A25
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -18,11 +18,11 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Anger of the Gods|IMA
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel Avacyn|SOI
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashenmoor Gouger|MM2
 1 Ashiok, Nightmare Weaver|THS
 1 Assemble the Legion|GTC
@@ -58,9 +58,9 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -96,20 +96,20 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Control Magic|EMA
 1 Coralhelm Commander|ROE
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -122,7 +122,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Desecration Demon|MM3
 1 Devil's Play|ISD
 1 Devoted Druid|SHM
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -174,7 +174,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Farseek|M13
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
@@ -243,19 +243,19 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Hinterland Harbor|ISD
 1 Hissing Quagmire|OGW
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incendiary Flow|EMN
 1 Incinerate|M12
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isochron Scepter|EMA
 1 Isolated Chapel|ISD
@@ -264,7 +264,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kalitas, Traitor of Ghet|OGW
@@ -290,7 +290,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Lavaclaw Reaches|WWK
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -302,7 +302,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Looter il-Kor|TSP
 1 Lotus Cobra|IMA
@@ -313,7 +313,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Magus of the Will
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Tithe|PLC
 1 Managorger Hydra|ORI
@@ -321,18 +321,18 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Mimic Vat|SOM
 1 Mindslaver|SOM
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
@@ -343,12 +343,12 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Murderous Cut|KTK
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Nature's Lore|5ED
 1 Necromancy|VIS
 1 Needle Spires|OGW
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nevinyrral's Disk|EMA
 1 Nicol Bolas, Planeswalker|M13
@@ -376,7 +376,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Panharmonicon|KLD
 1 Parallax Wave|VMA
 1 Part the Waterveil|BFZ
@@ -385,7 +385,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
@@ -402,7 +402,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Primeval Titan|IMA
 1 Profane Command|MM2
 1 Purphoros, God of the Forge|THS
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Quarantine Field|BFZ
 1 Raging Ravine|WWK
@@ -422,7 +422,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relentless Dead|SOI
 1 Relic of Progenitus|EMA
 1 Remand|MM2
@@ -432,7 +432,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -458,7 +458,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shaman of Forgotten Ways|DTK
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -502,11 +502,11 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Sulfur Falls|ISD
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
@@ -532,7 +532,7 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thassa, God of the Sea|THS
 1 Thing in the Ice|SOI
@@ -560,16 +560,16 @@ Name=MTGO Legacy Cube January 2017 (600 cards)
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
 1 Vapor Snag|MM2
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
 1 Victimize|EMA
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Vorinclex, Voice of Hunger|IMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -10,7 +10,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Ajani Goldmane|M11
 1 Ajani Vengeant|ALA
 1 Ajani, Caller of the Pride|M14
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 Ancestral Vision|IMA
 1 Ancient Tomb|VMA
 1 Angel of Serenity|RTR
@@ -18,11 +18,11 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
 1 Anowon, the Ruin Sage|WWK
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ascendant Evincar|10E
 1 Ashcloud Phoenix|KTK
 1 Ashiok, Nightmare Weaver|THS
@@ -45,7 +45,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Bayou|VMA
 1 Beast Within|NPH
 1 Beetleback Chief|EMA
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Birds of Paradise|M12
 1 Birthing Pod|NPH
 1 Bitterblossom|MM2
@@ -65,10 +65,10 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
 1 Boon Satyr|THS
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Brago, King Eternal|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -93,7 +93,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 City of Brass|MMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Compulsive Research|MM3
 1 Condemn|M11
 1 Condescend|IMA
@@ -102,21 +102,21 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Control Magic|EMA
 1 Coralhelm Commander|ROE
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crusade|6ED
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
 1 Dark Impostor|AVR
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -131,7 +131,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Dictate of Heliod|JOU
 1 Dig Through Time|KTK
 1 Disciple of Bolas|M13
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -178,7 +178,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Farseek|M13
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fire // Ice|APC
 1 Firebolt|EMA
 1 Fires of Yavimaya|VMA
@@ -194,7 +194,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Form of the Dragon|9ED
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 Frontline Medic|GTC
 1 Frost Titan|M12
@@ -251,12 +251,12 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Hero's Downfall|THS
 1 Hinterland Harbor|ISD
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incinerate|M12
 1 Indrik Stomphowler|DIS
@@ -269,7 +269,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kalastria Highborn|WWK
@@ -296,7 +296,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
 1 Life from the Loam|MMA
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -305,7 +305,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Liliana Vess|M15
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Looter il-Kor|TSP
@@ -317,7 +317,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Magma Jet|MM3
 1 Malakir Bloodwitch|ZEN
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
@@ -326,16 +326,16 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Mind Stone|IMA
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg Fanatic|EMA
@@ -350,12 +350,12 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Murderous Cut|KTK
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Natural Order|EMA
 1 Nature's Lore|5ED
 1 Necromancy|VIS
 1 Necropolis Regent|RTR
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nicol Bolas, Planeswalker|M13
 1 Night's Whisper|EMA
@@ -377,7 +377,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Overgrown Tomb|RTR
 1 Overrun|TPR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Pain Seer|BNG
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
@@ -415,7 +415,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Remove Soul|10E
@@ -425,7 +425,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
 1 Riptide Laboratory|ONS
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 River Boa|ZEN
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -448,7 +448,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shardless Agent|EMA
 1 Sheoldred, Whispering One|IMA
 1 Shivan Reef|ORI
@@ -493,10 +493,10 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Sulfurous Springs|10E
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -522,7 +522,7 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 Thieving Magpie|10E
 1 Think Twice|ISD
@@ -552,20 +552,20 @@ Name=MTGO Legacy Cube March 2015 (600 cards)
 1 Unexpectedly Absent|EMA
 1 Unflinching Courage|MM3
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Valakut, the Molten Pinnacle|ZEN
 1 Vampire Hexmage|CNS
 1 Vampire Interloper|ISD
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampire Nocturnus|M13
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -10,22 +10,22 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Act of Aggression|NPH
 1 Adarkar Wastes|10E
 1 Aether Vial|IMA
-1 Ainok Survivalist|DTK
+1 Ainok Survivalist|A25
 1 Ajani Goldmane|M11
 1 Ajani Vengeant|ALA
 1 Ajani, Caller of the Pride|M14
-1 Akroma's Vengeance|ONS
+1 Akroma's Vengeance|A25
 1 Ancestral Vision|IMA
 1 Ancient Tomb|VMA
 1 Angel of Serenity|RTR
 1 Angelic Destiny|M12
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashcloud Phoenix|KTK
 1 Ashen Rider|THS
 1 Ashenmoor Gouger|MM2
@@ -62,10 +62,10 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Brago, King Eternal|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -91,7 +91,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 City of Brass|MMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Collected Company|DTK
 1 Compulsive Research|MM3
 1 Condemn|M11
@@ -100,14 +100,14 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crusade|6ED
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
@@ -116,7 +116,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Dark Confidant|MM2
 1 Dark Depths|CSP
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -132,7 +132,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Dictate of Heliod|JOU
 1 Dig Through Time|KTK
 1 Disciple of Bolas|M13
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -187,7 +187,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Farseek|M13
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fire // Ice|APC
 1 Firebolt|EMA
 1 Firefist Striker|GTC
@@ -202,7 +202,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Forked Bolt|ROE
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 Frontline Medic|GTC
 1 Frost Titan|M12
@@ -257,19 +257,19 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Hidden Dragonslayer|DTK
 1 Hinterland Harbor|ISD
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incinerate|M12
 1 Indrik Stomphowler|DIS
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isochron Scepter|EMA
 1 Isolated Chapel|ISD
@@ -278,7 +278,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kami of Ancient Law|MM2
@@ -303,7 +303,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Land Tax|4ED
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -313,7 +313,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Liliana, Heretical Healer|ORI
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Mentor|FUT
 1 Llanowar Wastes|ORI
@@ -325,7 +325,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Magma Jet|MM3
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Leak|IMA
 1 Mana Tithe|PLC
@@ -334,17 +334,17 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Midnight Banshee|MM2
 1 Mind Stone|IMA
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg Fanatic|EMA
@@ -358,11 +358,11 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Murderous Cut|KTK
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Natural Order|EMA
 1 Nature's Lore|5ED
 1 Necromancy|VIS
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nicol Bolas, Planeswalker|M13
 1 Nightveil Specter|GTC
@@ -385,14 +385,14 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Overgrown Tomb|RTR
 1 Overrun|TPR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pillar of Flame|IMA
 1 Plateau|VMA
@@ -425,7 +425,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Remove Soul|10E
 1 Repeal|IMA
@@ -433,7 +433,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -455,7 +455,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shardless Agent|EMA
 1 Sheoldred, Whispering One|IMA
@@ -502,11 +502,11 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Sulfurous Springs|10E
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -532,7 +532,7 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 Thespian's Stage|GTC
 1 Thoughtseize|IMA
@@ -559,16 +559,16 @@ Name=MTGO Legacy Cube September 2015 (600 cards)
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Voyaging Satyr|THS
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -18,11 +18,11 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Anger of the Gods|IMA
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel Avacyn|SOI
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashenmoor Gouger|MM2
 1 Ashiok, Nightmare Weaver|THS
 1 Assemble the Legion|GTC
@@ -57,9 +57,9 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Brimaz, King of Oreskos|BNG
 1 Brimstone Volley|CNS
@@ -94,21 +94,21 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Control Magic|EMA
 1 Coralhelm Commander|ROE
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crux of Fate|FRF
 1 Cryptic Command|IMA
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cunning Sparkmage|WWK
 1 Cursed Scroll|TPR
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -123,7 +123,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Devoted Druid|SHM
 1 Dictate of Heliod|JOU
 1 Disciple of Bolas|M13
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dismiss|TPR
 1 Dissipate|M15
@@ -167,7 +167,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Eternal Witness|MMA
 1 Ever After|SOI
 1 Evolutionary Leap|ORI
-1 Exclude|INV
+1 Exclude|A25
 1 Exhume|USG
 1 Explore|MM3
 1 Exquisite Firecraft|ORI
@@ -179,7 +179,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Farseek|M13
 1 Fauna Shaman|M11
 1 Fertile Ground|LRW
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Fire // Ice|APC
 1 Firebolt|EMA
@@ -249,13 +249,13 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Hinterland Harbor|ISD
 1 Hissing Quagmire|OGW
 1 Honor of the Pure|M12
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
 1 Icefall Regent|DTK
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Impulse|VIS
 1 Incendiary Flow|EMN
 1 Incinerate|M12
@@ -263,7 +263,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Inferno Titan|M12
 1 Inquisition of Kozilek|MM3
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isochron Scepter|EMA
 1 Isolated Chapel|ISD
@@ -272,7 +272,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kalitas, Traitor of Ghet|OGW
@@ -298,7 +298,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Lavaclaw Reaches|WWK
 1 Legacy's Allure|TMP
 1 Leonin Relic-Warder|MBS
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -310,7 +310,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Lingering Souls|MM3
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Looter il-Kor|TSP
 1 Lotus Cobra|IMA
@@ -320,7 +320,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Magma Jet|MM3
 1 Makeshift Mannequin|LRW
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Confluence|JOU
 1 Mana Tithe|PLC
 1 Managorger Hydra|ORI
@@ -328,18 +328,18 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Marsh Flats|MM3
 1 Martial Coup|CFX
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Master of Waves|THS
 1 Meloku the Clouded Mirror|MMA
 1 Mentor of the Meek|ISD
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Mimic Vat|SOM
 1 Mindslaver|SOM
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
 1 Mogg War Marshal|EMA
@@ -351,12 +351,12 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystic Confluence
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Nature's Lore|5ED
 1 Necromancy|VIS
 1 Needle Spires|OGW
-1 Negate|AER
+1 Negate|RIX
 1 Nekrataal|EMA
 1 Nevinyrral's Disk|EMA
 1 Nicol Bolas, Planeswalker|M13
@@ -384,7 +384,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Overgrown Battlement|IMA
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Parallax Wave|VMA
 1 Part the Waterveil|BFZ
 1 Path to Exile|MM3
@@ -392,7 +392,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Rager|IMA
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
@@ -409,7 +409,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Primeval Titan|IMA
 1 Profane Command|MM2
 1 Purphoros, God of the Forge|THS
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Quarantine Field|BFZ
 1 Raging Ravine|WWK
@@ -428,7 +428,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relentless Dead|SOI
 1 Relic of Progenitus|EMA
 1 Remand|MM2
@@ -438,7 +438,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -462,7 +462,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shaman of Forgotten Ways|DTK
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -505,11 +505,11 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Sulfur Falls|ISD
 1 Summoning Trap|MM3
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Surrak, the Hunt Caller|DTK
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
@@ -535,7 +535,7 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Terastodon|CNS
 1 Terminate|MM3
 1 Terminus|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thassa, God of the Sea|THS
 1 Thing in the Ice|SOI
@@ -562,14 +562,14 @@ Name=MTGO Legacy Cube September 2016 (600 cards)
 1 Underworld Connections|RTR
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Victimize|EMA
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
 1 Vorinclex, Voice of Hunger|IMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -13,12 +13,12 @@ Name=MTGO Vintage Cube 2013
 1 Elesh Norn, Grand Cenobite|IMA
 1 Lingering Souls|MM3
 1 Terminus|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Mother of Runes|EMA
 1 Weathered Wayfarer|9ED
 1 Ravages of War|PTK
 1 Student of Warfare|ROE
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Elspeth Tirel|SOM
 1 Mirran Crusader|MM2
 1 Elite Vanguard|EMA
@@ -34,7 +34,7 @@ Name=MTGO Vintage Cube 2013
 1 Whipcorder|ONS
 1 Kami of Ancient Law|MM2
 1 Isamaru, Hound of Konda|CHK
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Paladin en-Vec|TPR
 1 Wrath of God|EMA
 1 Cloudgoat Ranger|MMA
@@ -50,14 +50,14 @@ Name=MTGO Vintage Cube 2013
 1 Ajani Goldmane|M11
 1 Porcelain Legionnaire|NPH
 1 Blade Splicer|MM3
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Restoration Angel|IMA
 1 Knight of Glory|M13
 1 Moat|LEG
 1 Elspeth, Sun's Champion|THS
 1 Spear of Heliod|THS
 1 Unexpectedly Absent|EMA
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Faith's Fetters|EMA
 1 Stoneforge Mystic|WWK
 1 Linvala, Keeper of Silence|MM3
@@ -73,9 +73,9 @@ Name=MTGO Vintage Cube 2013
 1 Mana Drain|IMA
 1 Frantic Search|VMA
 1 Treachery|UDS
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Brain Freeze|VMA
-1 Vesuvan Shapeshifter|TSP
+1 Vesuvan Shapeshifter|A25
 1 Venser, Shaper Savant|MM3
 1 Sower of Temptation|LRW
 1 Wake Thrasher|EVE
@@ -87,7 +87,7 @@ Name=MTGO Vintage Cube 2013
 1 Force Spike|7ED
 1 Upheaval|VMA
 1 Voidmage Prodigy|TSB
-1 Willbender|TSB
+1 Willbender|A25
 1 Gifts Ungiven|MM3
 1 Compulsive Research|MM3
 1 Riftwing Cloudskate|MMA
@@ -126,8 +126,8 @@ Name=MTGO Vintage Cube 2013
 1 Dream Halls|TPR
 1 Opposition|7ED
 1 Mind's Desire|SCG
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Force of Will|EMA
 1 Control Magic|EMA
 1 Jace, Architect of Thought|RTR
@@ -143,11 +143,11 @@ Name=MTGO Vintage Cube 2013
 1 Buried Alive|ODY
 1 Tendrils of Agony|VMA
 1 Unburial Rites|MM3
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Slaughter Pact|MMA
 1 Gatekeeper of Malakir|ZEN
 1 Grave Titan|M12
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Necromancy|VIS
 1 Corpse Dance|TPR
 1 Yawgmoth's Will|USG
@@ -166,7 +166,7 @@ Name=MTGO Vintage Cube 2013
 1 Erebos, God of the Dead|THS
 1 Toxic Deluge|EMA
 1 Vampiric Tutor|EMA
-1 Living Death|TPR
+1 Living Death|A25
 1 Reanimate|TPR
 1 Bone Shredder|ULG
 1 Braids, Cabal Minion|EMA
@@ -182,7 +182,7 @@ Name=MTGO Vintage Cube 2013
 1 Bitterblossom|MM2
 1 Demonic Tutor|VMA
 1 Necropotence|IMA
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Vampire Nighthawk|MM3
 1 Guul Draz Assassin|ROE
 1 Consuming Vapors|ROE
@@ -198,17 +198,17 @@ Name=MTGO Vintage Cube 2013
 1 Lifebane Zombie|M14
 1 Thoughtseize|IMA
 1 Hero's Downfall|THS
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Sarcomancy|TPR
 1 Oona's Prowler|LRW
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Hypnotic Specter|M10
 1 Bloodghast|IMA
 1 Inquisition of Kozilek|MM3
 1 Phyrexian Rager|IMA
 1 Bloodgift Demon|ISD
 1 Mind Twist|4ED
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Torch Fiend|M15
 1 Earthquake|M10
 1 Goblin Ruinblaster|ZEN
@@ -225,7 +225,7 @@ Name=MTGO Vintage Cube 2013
 1 Taurean Mauler|MOR
 1 Ember Hauler|M11
 1 Koth of the Hammer|SOM
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Incinerate|M12
 1 Chandra, the Firebrand|M13
 1 Stormblood Berserker|MM2
@@ -249,14 +249,14 @@ Name=MTGO Vintage Cube 2013
 1 Magus of the Moon|IMA
 1 Smash to Smithereens|ORI
 1 Hellspark Elemental|CFX
-1 Ball Lightning|M10
+1 Ball Lightning|A25
 1 Siege-Gang Commander|EMA
 1 Burning of Xinye|VMA
 1 Goblin Guide|MM3
 1 Searing Blaze|WWK
 1 Kargan Dragonlord|ROE
 1 Wheel of Fortune|VMA
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Arc Trail|SOM
 1 Spikeshot Elder|MM2
 1 Urabrask the Hidden|IMA
@@ -271,7 +271,7 @@ Name=MTGO Vintage Cube 2013
 1 Mizzium Mortars|MM3
 1 Goblin Vandal|WTH
 1 Plated Geopede|ZEN
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Chain Lightning|EMA
 1 Chaos Warp|VMA
 1 Fireblast|VMA
@@ -293,7 +293,7 @@ Name=MTGO Vintage Cube 2013
 1 Primal Command|MM3
 1 Stunted Growth|ICE
 1 Wickerbough Elder|EVE
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Harmonize|MM3
 1 Terastodon|CNS
 1 Garruk Wildspeaker|M11
@@ -314,7 +314,7 @@ Name=MTGO Vintage Cube 2013
 1 Noble Hierarch|MM2
 1 Channel|IMA
 1 Oracle of Mul Daya|ZEN
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Joraga Treespeaker|ROE
 1 Awakening Zone|ROE
 1 Vengevine|ROE
@@ -322,7 +322,7 @@ Name=MTGO Vintage Cube 2013
 1 Genesis Wave|IMA
 1 Thrun, the Last Troll|MBS
 1 Beast Within|NPH
-1 Naturalize|DTK
+1 Naturalize|RIX
 1 Garruk Relentless|ISD
 1 Ulvenwald Tracker|MM3
 1 Polukranos, World Eater|THS
@@ -338,7 +338,7 @@ Name=MTGO Vintage Cube 2013
 1 Acidic Slime|M13
 1 Garruk, Primal Hunter|M13
 1 Llanowar Elves|EMA
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Fyndhorn Elves|VMA
 1 Thragtusk|MM3
 1 Elvish Mystic|M15
@@ -368,7 +368,7 @@ Name=MTGO Vintage Cube 2013
 1 Treetop Village|10E
 1 Adarkar Wastes|10E
 1 Plateau|VMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Scalding Tarn|MM3
 1 Shivan Reef|ORI
 1 Steam Vents|RTR
@@ -401,7 +401,7 @@ Name=MTGO Vintage Cube 2013
 1 Karplusan Forest|10E
 1 Verdant Catacombs|MM3
 1 Wasteland|EMA
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Selesnya Sanctuary|IMA
 1 Rakdos Carnarium|IMA
 1 Simic Growth Chamber|IMA
@@ -418,7 +418,7 @@ Name=MTGO Vintage Cube 2013
 1 Battlefield Forge|ORI
 1 Ral Zarek|DGM
 1 Void|EMA
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Lightning Helix|IMA
 1 Electrolyze|IMA
 1 Grand Arbiter Augustin IV|MMA
@@ -434,7 +434,7 @@ Name=MTGO Vintage Cube 2013
 1 Izzet Charm|MM3
 1 Abrupt Decay|MM3
 1 Domri Rade|MM3
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Firemane Angel|IMA
 1 Angel of Despair|GPT
 1 Trygon Predator|EMA
@@ -456,9 +456,9 @@ Name=MTGO Vintage Cube 2013
 1 Daxos of Meletis|THS
 1 Steam Augury|THS
 1 Prophetic Bolt|VMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Ajani Vengeant|ALA
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Maelstrom Pulse|MMA
 1 Tezzeret, Agent of Bolas|MBS
 1 Sorin, Lord of Innistrad|DKA
@@ -500,7 +500,7 @@ Name=MTGO Vintage Cube 2013
 1 Sword of Light and Shadow|MMA
 1 Razormane Masticore|10E
 1 Pentad Prism|5DN
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Mind Stone|IMA
 1 Precursor Golem|MM2
 1 Wurmcoil Engine|SOM
@@ -532,7 +532,7 @@ Name=MTGO Vintage Cube 2013
 1 Worn Powerstone|EMA
 1 Smokestack|VMA
 1 Lightning Greaves|MRD
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sword of Fire and Ice|MMA
 1 Skullclamp|VMA
 1 Vedalken Shackles|MMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -16,11 +16,11 @@ Name=MTGO Vintage Cube 2014
 1 Ancient Tomb|VMA
 1 Angel of Serenity|RTR
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Augur of Bolas|MM3
 1 Avacyn's Pilgrim|MM3
@@ -56,13 +56,13 @@ Name=MTGO Vintage Cube 2014
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
 1 Borderland Marauder|IMA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Boros Signet|MM3
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -82,14 +82,14 @@ Name=MTGO Vintage Cube 2014
 1 Chrome Mox|EMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Compulsive Research|MM3
 1 Consecrated Sphinx|IMA
 1 Containment Priest
 1 Control Magic|EMA
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crucible of Worlds|10E
@@ -99,7 +99,7 @@ Name=MTGO Vintage Cube 2014
 1 Damnation|MM3
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deceiver Exarch|NPH
@@ -108,11 +108,11 @@ Name=MTGO Vintage Cube 2014
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
 1 Detention Sphere|RTR
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dimir Signet|MM3
 1 Diregraf Ghoul|ISD
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Domri Rade|MM3
 1 Dragonskull Summit|XLN
@@ -122,7 +122,7 @@ Name=MTGO Vintage Cube 2014
 1 Dungeon Geists|DKA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elite Vanguard|EMA
@@ -156,7 +156,7 @@ Name=MTGO Vintage Cube 2014
 1 Force of Will|EMA
 1 Force Spike|7ED
 1 Frantic Search|VMA
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Freyalise, Llanowar's Fury
 1 Frost Titan|M12
 1 Fyndhorn Elves|VMA
@@ -209,7 +209,7 @@ Name=MTGO Vintage Cube 2014
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Imposing Sovereign|M14
 1 Impulse|VIS
@@ -226,7 +226,7 @@ Name=MTGO Vintage Cube 2014
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Kami of Ancient Law|MM2
@@ -248,7 +248,7 @@ Name=MTGO Vintage Cube 2014
 1 Library of Alexandria|VMA
 1 Life from the Loam|MMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -256,7 +256,7 @@ Name=MTGO Vintage Cube 2014
 1 Liliana of the Veil|MM3
 1 Lingering Souls|MM3
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Lodestone Golem|MM2
@@ -276,19 +276,19 @@ Name=MTGO Vintage Cube 2014
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
 1 Master of the Feast|JOU
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Masticore|VMA
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Memory Jar|VMA
 1 Memory Lapse|EMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -337,12 +337,12 @@ Name=MTGO Vintage Cube 2014
 1 Path to Exile|MM3
 1 Pattern of Rebirth|UDS
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
 1 Phyrexian Negator|UDS
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pithing Needle|RTR
 1 Plateau|VMA
@@ -361,13 +361,13 @@ Name=MTGO Vintage Cube 2014
 1 Rakdos Cackler|RTR
 1 Rakdos Signet|MM3
 1 Ral Zarek|DGM
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ravages of War|PTK
 1 Reanimate|TPR
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Repeal|IMA
@@ -375,7 +375,7 @@ Name=MTGO Vintage Cube 2014
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
 1 Sacred Foundry|GTC
@@ -383,7 +383,7 @@ Name=MTGO Vintage Cube 2014
 1 Sarcomancy|TPR
 1 Sarkhan, the Dragonspeaker|KTK
 1 Savannah|VMA
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Scalding Tarn|MM3
 1 Scavenging Ooze|MM3
 1 Scroll Rack|TMP
@@ -395,7 +395,7 @@ Name=MTGO Vintage Cube 2014
 1 Selesnya Signet|MM3
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shardless Agent|EMA
 1 Sheoldred, Whispering One|IMA
 1 Shivan Reef|ORI
@@ -438,7 +438,7 @@ Name=MTGO Vintage Cube 2014
 1 Sulfuric Vortex|EMA
 1 Sulfurous Springs|10E
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
@@ -447,7 +447,7 @@ Name=MTGO Vintage Cube 2014
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -464,7 +464,7 @@ Name=MTGO Vintage Cube 2014
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
@@ -501,16 +501,16 @@ Name=MTGO Vintage Cube 2014
 1 Unexpectedly Absent|EMA
 1 Upheaval|VMA
 1 Urborg, Tomb of Yawgmoth|M15
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -15,10 +15,10 @@ Name=MTGO Vintage Cube 2015
 1 Ancient Tomb|VMA
 1 Angel of Serenity|RTR
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Augur of Bolas|MM3
 1 Avacyn's Pilgrim|MM3
@@ -52,13 +52,13 @@ Name=MTGO Vintage Cube 2015
 1 Bloodstained Mire|KTK
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Boros Signet|MM3
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -75,14 +75,14 @@ Name=MTGO Vintage Cube 2015
 1 Chrome Mox|EMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Compulsive Research|MM3
 1 Consecrated Sphinx|IMA
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crucible of Worlds|10E
@@ -91,7 +91,7 @@ Name=MTGO Vintage Cube 2015
 1 Damnation|MM3
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -100,11 +100,11 @@ Name=MTGO Vintage Cube 2015
 1 Demonic Tutor|VMA
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dig Through Time|KTK
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Domri Rade|MM3
 1 Dragon Hunter|DTK
@@ -117,7 +117,7 @@ Name=MTGO Vintage Cube 2015
 1 Duplicant|EMA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth, Knight-Errant|MMA
@@ -138,7 +138,7 @@ Name=MTGO Vintage Cube 2015
 1 Faithless Looting|EMA
 1 Fastbond|VMA
 1 Fauna Shaman|M11
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
 1 Fireblast|VMA
@@ -202,7 +202,7 @@ Name=MTGO Vintage Cube 2015
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Impulse|VIS
 1 Incinerate|M12
@@ -219,7 +219,7 @@ Name=MTGO Vintage Cube 2015
 1 Jace Beleren|M11
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Jeskai Ascendancy|KTK
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
@@ -239,7 +239,7 @@ Name=MTGO Vintage Cube 2015
 1 Library of Alexandria|VMA
 1 Life from the Loam|MMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -247,7 +247,7 @@ Name=MTGO Vintage Cube 2015
 1 Liliana of the Veil|MM3
 1 Lingering Souls|MM3
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Llanowar Wastes|ORI
 1 Lodestone Golem|MM2
@@ -265,24 +265,24 @@ Name=MTGO Vintage Cube 2015
 1 Mana Tithe|PLC
 1 Mana Vault|VMA
 1 Manic Vandal|M12
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Masticore|VMA
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Mental Misstep|NPH
 1 Memory Jar|VMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mindslaver|SOM
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -302,7 +302,7 @@ Name=MTGO Vintage Cube 2015
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystical Tutor|EMA
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Narset Transcendent|DTK
 1 Natural Order|EMA
 1 Nature's Claim|IMA
@@ -332,11 +332,11 @@ Name=MTGO Vintage Cube 2015
 1 Path to Exile|MM3
 1 Pattern of Rebirth|UDS
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pithing Needle|RTR
 1 Plateau|VMA
@@ -362,14 +362,14 @@ Name=MTGO Vintage Cube 2015
 1 Reanimate|TPR
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
 1 Sacred Foundry|GTC
@@ -388,7 +388,7 @@ Name=MTGO Vintage Cube 2015
 1 Seething Song|9ED
 1 Selesnya Signet|MM3
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shardless Agent|EMA
 1 Shelldock Isle|LRW
@@ -437,7 +437,7 @@ Name=MTGO Vintage Cube 2015
 1 Sulfuric Vortex|EMA
 1 Sulfurous Springs|10E
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
@@ -446,7 +446,7 @@ Name=MTGO Vintage Cube 2015
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -461,7 +461,7 @@ Name=MTGO Vintage Cube 2015
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
@@ -503,13 +503,13 @@ Name=MTGO Vintage Cube 2015
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
 1 Villainous Wealth|KTK
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Volrath's Stronghold|TPR
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -16,10 +16,10 @@ Name=MTGO Vintage Cube 2016
 1 Angel of Serenity|RTR
 1 Animate Dead|EMA
 1 Anticipate|BFZ
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Augur of Bolas|MM3
 1 Avacyn's Pilgrim|MM3
@@ -50,14 +50,14 @@ Name=MTGO Vintage Cube 2016
 1 Bloodstained Mire|KTK
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Boros Signet|MM3
 1 Brago, King Eternal|VMA
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -76,14 +76,14 @@ Name=MTGO Vintage Cube 2016
 1 Chrome Mox|EMA
 1 Clifftop Retreat|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Compulsive Research|MM3
 1 Consecrated Sphinx|IMA
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Crucible of Worlds|10E
@@ -93,7 +93,7 @@ Name=MTGO Vintage Cube 2016
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -103,11 +103,11 @@ Name=MTGO Vintage Cube 2016
 1 Den Protector|DTK
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dig Through Time|KTK
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Domri Rade|MM3
 1 Dragonlord Atarka|DTK
@@ -121,7 +121,7 @@ Name=MTGO Vintage Cube 2016
 1 Duplicant|EMA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth, Knight-Errant|MMA
@@ -143,7 +143,7 @@ Name=MTGO Vintage Cube 2016
 1 Faithless Looting|EMA
 1 Fastbond|VMA
 1 Fauna Shaman|M11
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
 1 Fireblast|VMA
@@ -204,7 +204,7 @@ Name=MTGO Vintage Cube 2016
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Impulse|VIS
 1 Incinerate|M12
@@ -222,7 +222,7 @@ Name=MTGO Vintage Cube 2016
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Karakas|EMA
@@ -240,7 +240,7 @@ Name=MTGO Vintage Cube 2016
 1 Leonin Relic-Warder|MBS
 1 Library of Alexandria|VMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -249,7 +249,7 @@ Name=MTGO Vintage Cube 2016
 1 Liliana, Heretical Healer|ORI
 1 Lingering Souls|MM3
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -267,23 +267,23 @@ Name=MTGO Vintage Cube 2016
 1 Mana Tithe|PLC
 1 Mana Vault|VMA
 1 Manic Vandal|M12
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Mental Misstep|NPH
 1 Memory Jar|VMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mindslaver|SOM
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -302,7 +302,7 @@ Name=MTGO Vintage Cube 2016
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystical Tutor|EMA
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Natural Order|EMA
 1 Nature's Claim|IMA
 1 Necromancy|VIS
@@ -331,7 +331,7 @@ Name=MTGO Vintage Cube 2016
 1 Path to Exile|MM3
 1 Pattern of Rebirth|UDS
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
@@ -359,14 +359,14 @@ Name=MTGO Vintage Cube 2016
 1 Reanimate|TPR
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Rootbound Crag|XLN
@@ -386,7 +386,7 @@ Name=MTGO Vintage Cube 2016
 1 Seething Song|9ED
 1 Selesnya Signet|MM3
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shelldock Isle|LRW
 1 Sheoldred, Whispering One|IMA
@@ -431,7 +431,7 @@ Name=MTGO Vintage Cube 2016
 1 Sulfur Falls|ISD
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Sunpetal Grove|XLN
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
@@ -440,7 +440,7 @@ Name=MTGO Vintage Cube 2016
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -465,7 +465,7 @@ Name=MTGO Vintage Cube 2016
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
@@ -506,13 +506,13 @@ Name=MTGO Vintage Cube 2016
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
 1 Villainous Wealth|KTK
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Volcanic Island|VMA
 1 Wall of Blossoms|TPR
 1 Wall of Omens|EMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -12,7 +12,7 @@ Name=MTGO Vintage Cube December 2017
 1 Grim Lavamancer|M12
 1 Fiery Confluence
 1 Mox Ruby|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Stormbreath Dragon|THS
 1 Flametongue Kavu|VMA
 1 Chandra, Pyromaster|M15
@@ -32,7 +32,7 @@ Name=MTGO Vintage Cube December 2017
 1 Koth of the Hammer|SOM
 1 Firedrinker Satyr|THS
 1 Reckless Bushwhacker|OGW
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Monastery Swiftspear|IMA
 1 Adanto Vanguard|XLN
 1 Angel of Sanctions|AKH
@@ -48,10 +48,10 @@ Name=MTGO Vintage Cube December 2017
 1 Angel of Invention|KLD
 1 Banisher Priest|M14
 1 Declaration in Stone|SOI
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Linvala, Keeper of Silence|MM3
 1 Knight of the White Orchid|ORI
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Emeria Angel|IMA
 1 Mother of Runes|EMA
 1 Brimaz, King of Oreskos|BNG
@@ -73,7 +73,7 @@ Name=MTGO Vintage Cube December 2017
 1 Lingering Souls|MM3
 1 Leonin Relic-Warder|MBS
 1 Parallax Wave|VMA
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Awakening Zone|ROE
 1 Elesh Norn, Grand Cenobite|IMA
 1 Council's Judgment|CNS
@@ -83,7 +83,7 @@ Name=MTGO Vintage Cube December 2017
 1 Honor of the Pure|M12
 1 Bitterblossom|MM2
 1 Wrath of God|EMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Spear of Heliod|THS
 1 Day of Judgment|M12
 1 Leyline of Sanctity|MM2
@@ -95,7 +95,7 @@ Name=MTGO Vintage Cube December 2017
 1 Zealous Conscripts|MM3
 1 Reveillark|MMA
 1 Unexpectedly Absent|EMA
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Mana Tithe|PLC
 1 Ravages of War|PTK
 1 Angel of Serenity|RTR
@@ -134,10 +134,10 @@ Name=MTGO Vintage Cube December 2017
 1 Inkwell Leviathan|EMA
 1 Mana Drain|IMA
 1 Remand|MM2
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Pestermite|MMA
 1 Mana Leak|IMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Glen Elendra Archmage|MMA
 1 Daze|EMA
 1 Snapcaster Mage|MM3
@@ -146,7 +146,7 @@ Name=MTGO Vintage Cube December 2017
 1 True-Name Nemesis
 1 Vedalken Shackles|MMA
 1 Timetwister|VMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Empty the Warrens|MMA
 1 Compulsive Research|MM3
 1 Time Walk|VMA
@@ -190,7 +190,7 @@ Name=MTGO Vintage Cube December 2017
 1 Liliana, Death's Majesty|AKH
 1 Kalitas, Traitor of Ghet|OGW
 1 Painful Truths|BFZ
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Skinrender|SOM
 1 Toxic Deluge|EMA
 1 Ophiomancer
@@ -207,7 +207,7 @@ Name=MTGO Vintage Cube December 2017
 1 Inquisition of Kozilek|MM3
 1 Murderous Cut|KTK
 1 Hypnotic Specter|M10
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Magus of the Will
 1 Dark Confidant|MM2
 1 Ultimate Price|DTK
@@ -219,7 +219,7 @@ Name=MTGO Vintage Cube December 2017
 1 Fatal Push|AER
 1 Hymn to Tourach|EMA
 1 Tendrils of Agony|VMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Grave Titan|M12
 1 Entomb|EMA
 1 Bazaar of Baghdad|VMA
@@ -229,8 +229,8 @@ Name=MTGO Vintage Cube December 2017
 1 Mox Jet|VMA
 1 Necropotence|IMA
 1 Looter il-Kor|TSP
-1 Living Death|TPR
+1 Living Death|A25
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Sheoldred, Whispering One|IMA
 1 Terastodon|CNS
 1 Corpse Dance|TPR
@@ -271,7 +271,7 @@ Name=MTGO Vintage Cube December 2017
 1 Desperate Ritual|MMA
 1 Through the Breach|CHK
 1 Searing Spear|M13
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Fireblast|VMA
 1 Incinerate|M12
 1 Hazoret the Fervent|AKH
@@ -286,7 +286,7 @@ Name=MTGO Vintage Cube December 2017
 1 Rift Bolt|IMA
 1 Chandra, Flamecaller|OGW
 1 Chandra, Torch of Defiance|KLD
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Bonfire of the Damned|MM3
 1 Shrine of Burning Rage|NPH
 1 Lightning Strike|XLN
@@ -294,7 +294,7 @@ Name=MTGO Vintage Cube December 2017
 1 Search for Tomorrow|IMA
 1 Fyndhorn Elves|VMA
 1 Lotus Cobra|IMA
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Managorger Hydra|ORI
 1 Primeval Titan|IMA
 1 Harmonize|MM3
@@ -311,14 +311,14 @@ Name=MTGO Vintage Cube December 2017
 1 Survival of the Fittest|TPR
 1 Noble Hierarch|MM2
 1 Dissenter's Deliverance|AKH
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Natural Order|EMA
 1 Oath of Druids|TPR
 1 Sylvan Caryatid|THS
 1 Llanowar Elves|EMA
 1 Wall of Roots|IMA
 1 Green Sun's Zenith|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Elves of Deep Shadow|RAV
 1 Eureka|VMA
 1 Yavimaya Elder|VMA
@@ -333,7 +333,7 @@ Name=MTGO Vintage Cube December 2017
 1 Archangel of Thune|IMA
 1 Beast Within|NPH
 1 Manglehorn|AKH
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Avenger of Zendikar|WWK
 1 High Tide|VMA
 1 Wall of Blossoms|TPR
@@ -411,9 +411,9 @@ Name=MTGO Vintage Cube December 2017
 1 Celestial Colonnade|WWK
 1 Trygon Predator|EMA
 1 Boros Signet|MM3
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Karn Liberated|MM2
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Crucible of Worlds|10E
 1 Winter Orb|EMA
 1 Anguished Unmaking|SOI
@@ -431,14 +431,14 @@ Name=MTGO Vintage Cube December 2017
 1 Misty Rainforest|MM3
 1 Ajani Vengeant|ALA
 1 Sacred Foundry|GTC
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Breeding Pool|GTC
 1 Arid Mesa|MM3
 1 Sword of Light and Shadow|MMA
 1 Orzhov Signet|MM3
 1 Scrubland|VMA
 1 Umezawa's Jitte|BOK
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Huntmaster of the Fells|DKA
 1 Tidehollow Sculler|MMA
 1 Skullclamp|VMA
@@ -459,7 +459,7 @@ Name=MTGO Vintage Cube December 2017
 1 Taiga|VMA
 1 Marsh Flats|MM3
 1 Sword of Fire and Ice|MMA
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Lightning Greaves|MRD
 1 Sword of Feast and Famine|MBS
 1 Sword of Body and Mind|SOM
@@ -507,7 +507,7 @@ Name=MTGO Vintage Cube December 2017
 1 Spirebluff Canal|KLD
 1 Golgari Signet|MM3
 1 Izzet Charm|MM3
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Kuldotha Forgemaster|SOM
 1 Deathrite Shaman|EMA
 1 Verdant Catacombs|MM3
@@ -517,7 +517,7 @@ Name=MTGO Vintage Cube December 2017
 1 Blooming Marsh|KLD
 1 Gilded Lotus|M13
 1 Worn Powerstone|EMA
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Volcanic Island|VMA
 1 Smuggler's Copter|KLD
 1 God-Pharaoh's Gift|HOU
@@ -540,3 +540,4 @@ Name=MTGO Vintage Cube December 2017
 1 Sphinx of the Steel Wind|EMA
 1 Basalt Monolith|3ED
 1 Fire // Ice|APC
 1 Thran Dynamo|IMA
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -15,10 +15,10 @@ Name=MTGO Vintage Cube June 2016
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
 1 Anticipate|BFZ
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Avacyn's Pilgrim|MM3
 1 Avalanche Riders|TSB
@@ -47,12 +47,12 @@ Name=MTGO Vintage Cube June 2016
 1 Bloodstained Mire|KTK
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Signet|MM3
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -70,7 +70,7 @@ Name=MTGO Vintage Cube June 2016
 1 Char|RAV
 1 Channel|IMA
 1 Chrome Mox|EMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coercive Portal|VMA
 1 Compulsive Research|MM3
 1 Conclave Naturalists|ORI
@@ -78,8 +78,8 @@ Name=MTGO Vintage Cube June 2016
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
@@ -90,7 +90,7 @@ Name=MTGO Vintage Cube June 2016
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -101,11 +101,11 @@ Name=MTGO Vintage Cube June 2016
 1 Den Protector|DTK
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dig Through Time|KTK
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dragonlord Atarka|DTK
 1 Dragonlord Dromoka|DTK
@@ -117,7 +117,7 @@ Name=MTGO Vintage Cube June 2016
 1 Duplicant|EMA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth, Knight-Errant|MMA
@@ -141,7 +141,7 @@ Name=MTGO Vintage Cube June 2016
 1 Falkenrath Gorger|SOI
 1 Fastbond|VMA
 1 Fauna Shaman|M11
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
@@ -201,7 +201,7 @@ Name=MTGO Vintage Cube June 2016
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Impulse|VIS
 1 Incinerate|M12
@@ -217,7 +217,7 @@ Name=MTGO Vintage Cube June 2016
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Kalitas, Traitor of Ghet|OGW
 1 Karakas|EMA
@@ -238,7 +238,7 @@ Name=MTGO Vintage Cube June 2016
 1 Leyline of Sanctity|MM2
 1 Library of Alexandria|VMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -248,7 +248,7 @@ Name=MTGO Vintage Cube June 2016
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -258,7 +258,7 @@ Name=MTGO Vintage Cube June 2016
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
 1 Magus of the Moon|IMA
-1 Magus of the Wheel
+1 Magus of the Wheel|A25
 1 Makeshift Mannequin|LRW
 1 Managorger Hydra|ORI
 1 Mana Confluence|JOU
@@ -271,19 +271,19 @@ Name=MTGO Vintage Cube June 2016
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Maze of Ith|EMA
 1 Meloku the Clouded Mirror|MMA
 1 Mental Misstep|NPH
 1 Memory Jar|VMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mindslaver|SOM
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -303,7 +303,7 @@ Name=MTGO Vintage Cube June 2016
 1 Myr Battlesphere|SOM
 1 Mystical Tutor|EMA
 1 Mystic Confluence
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Natural Order|EMA
 1 Nature's Claim|IMA
@@ -335,7 +335,7 @@ Name=MTGO Vintage Cube June 2016
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
@@ -364,14 +364,14 @@ Name=MTGO Vintage Cube June 2016
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Sacred Foundry|GTC
@@ -390,7 +390,7 @@ Name=MTGO Vintage Cube June 2016
 1 Seething Song|9ED
 1 Selesnya Signet|MM3
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -433,7 +433,7 @@ Name=MTGO Vintage Cube June 2016
 1 Student of Warfare|ROE
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
 1 Sword of Body and Mind|SOM
@@ -441,7 +441,7 @@ Name=MTGO Vintage Cube June 2016
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -466,7 +466,7 @@ Name=MTGO Vintage Cube June 2016
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thing in the Ice|SOI
 1 Thirst for Knowledge|MMA
@@ -508,11 +508,11 @@ Name=MTGO Vintage Cube June 2016
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Villainous Wealth|KTK
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Vryn Wingmare|ORI
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -15,10 +15,10 @@ Name=MTGO Vintage Cube June 2017
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
 1 Anticipate|BFZ
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Avacyn's Pilgrim|MM3
 1 Avalanche Riders|TSB
@@ -49,13 +49,13 @@ Name=MTGO Vintage Cube June 2017
 1 Blooming Marsh|KLD
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Signet|MM3
 1 Botanical Sanctum|KLD
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -75,7 +75,7 @@ Name=MTGO Vintage Cube June 2017
 1 Channel|IMA
 1 Char|RAV
 1 Chrome Mox|EMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coercive Portal|VMA
 1 Commit // Memory|AKH
 1 Compulsive Research|MM3
@@ -85,8 +85,8 @@ Name=MTGO Vintage Cube June 2017
 1 Copperline Gorge|SOM
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
@@ -97,7 +97,7 @@ Name=MTGO Vintage Cube June 2017
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Darkslick Shores|SOM
 1 Day of Judgment|M12
 1 Daze|EMA
@@ -109,10 +109,10 @@ Name=MTGO Vintage Cube June 2017
 1 Den Protector|DTK
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dig Through Time|KTK
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Dismember|MM2
 1 Dissenter's Deliverance|AKH
 1 Dragonlord Atarka|DTK
@@ -125,7 +125,7 @@ Name=MTGO Vintage Cube June 2017
 1 Duplicant|EMA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth, Knight-Errant|MMA
@@ -150,7 +150,7 @@ Name=MTGO Vintage Cube June 2017
 1 Fastbond|VMA
 1 Fatal Push|AER
 1 Fauna Shaman|M11
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
@@ -211,7 +211,7 @@ Name=MTGO Vintage Cube June 2017
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Impulse|VIS
 1 Incinerate|M12
@@ -226,7 +226,7 @@ Name=MTGO Vintage Cube June 2017
 1 Jace, Architect of Thought|RTR
 1 Jace, Vryn's Prodigy|ORI
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Kalitas, Traitor of Ghet|OGW
 1 Karakas|EMA
@@ -247,7 +247,7 @@ Name=MTGO Vintage Cube June 2017
 1 Leyline of Sanctity|MM2
 1 Library of Alexandria|VMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -258,7 +258,7 @@ Name=MTGO Vintage Cube June 2017
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -268,7 +268,7 @@ Name=MTGO Vintage Cube June 2017
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
 1 Magus of the Moon|IMA
-1 Magus of the Wheel
+1 Magus of the Wheel|A25
 1 Magus of the Will
 1 Makeshift Mannequin|LRW
 1 Mana Confluence|JOU
@@ -283,18 +283,18 @@ Name=MTGO Vintage Cube June 2017
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Maze of Ith|EMA
 1 Memory Jar|VMA
 1 Mental Misstep|NPH
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mind's Desire|SCG
 1 Mindslaver|SOM
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -313,7 +313,7 @@ Name=MTGO Vintage Cube June 2017
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystic Confluence
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Mystical Tutor|EMA
 1 Nahiri, the Harbinger|SOI
 1 Natural Order|EMA
@@ -345,7 +345,7 @@ Name=MTGO Vintage Cube June 2017
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
@@ -374,14 +374,14 @@ Name=MTGO Vintage Cube June 2017
 1 Recruiter of the Guard
 1 Recurring Nightmare|TPR
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rishkar, Peema Renegade|AER
 1 Rofellos, Llanowar Emissary|VMA
 1 Sacred Foundry|GTC
@@ -401,7 +401,7 @@ Name=MTGO Vintage Cube June 2017
 1 Selesnya Signet|MM3
 1 Selfless Spirit|EMN
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -445,7 +445,7 @@ Name=MTGO Vintage Cube June 2017
 1 Student of Warfare|ROE
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
 1 Sweltering Suns|AKH
@@ -454,7 +454,7 @@ Name=MTGO Vintage Cube June 2017
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -469,7 +469,7 @@ Name=MTGO Vintage Cube June 2017
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
@@ -510,11 +510,11 @@ Name=MTGO Vintage Cube June 2017
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Vryn Wingmare|ORI
--- a/forge-gui/res/cube/MTGO
+++ b/forge-gui/res/cube/MTGO
@@ -15,10 +15,10 @@ Name=MTGO Vintage Cube November 2016
 1 Anguished Unmaking|SOI
 1 Animate Dead|EMA
 1 Anticipate|BFZ
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ashiok, Nightmare Weaver|THS
 1 Avacyn's Pilgrim|MM3
 1 Avalanche Riders|TSB
@@ -47,12 +47,12 @@ Name=MTGO Vintage Cube November 2016
 1 Bloodstained Mire|KTK
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Signet|MM3
 1 Braids, Cabal Minion|EMA
 1 Brain Freeze|VMA
 1 Brain Maggot|JOU
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Brimaz, King of Oreskos|BNG
@@ -71,7 +71,7 @@ Name=MTGO Vintage Cube November 2016
 1 Channel|IMA
 1 Char|RAV
 1 Chrome Mox|EMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coercive Portal|VMA
 1 Compulsive Research|MM3
 1 Conclave Naturalists|ORI
@@ -79,8 +79,8 @@ Name=MTGO Vintage Cube November 2016
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crater's Claws|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
@@ -91,7 +91,7 @@ Name=MTGO Vintage Cube November 2016
 1 Daretti, Scrap Savant
 1 Dark Confidant|MM2
 1 Dark Petition|ORI
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deathrite Shaman|EMA
@@ -102,11 +102,11 @@ Name=MTGO Vintage Cube November 2016
 1 Den Protector|DTK
 1 Deranged Hermit|VMA
 1 Desecration Demon|MM3
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dig Through Time|KTK
 1 Dimir Signet|MM3
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dragonlord Atarka|DTK
 1 Dragonlord Dromoka|DTK
@@ -118,7 +118,7 @@ Name=MTGO Vintage Cube November 2016
 1 Duplicant|EMA
 1 Duress|IMA
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Electrolyze|IMA
 1 Elesh Norn, Grand Cenobite|IMA
 1 Elspeth, Knight-Errant|MMA
@@ -143,7 +143,7 @@ Name=MTGO Vintage Cube November 2016
 1 Falkenrath Gorger|SOI
 1 Fastbond|VMA
 1 Fauna Shaman|M11
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Confluence
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
@@ -202,7 +202,7 @@ Name=MTGO Vintage Cube November 2016
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
 1 Hypnotic Specter|M10
-1 Imperial Recruiter|PTK
+1 Imperial Recruiter|A25
 1 Imperial Seal|PTK
 1 Impulse|VIS
 1 Incinerate|M12
@@ -217,7 +217,7 @@ Name=MTGO Vintage Cube November 2016
 1 Jace, Architect of Thought|RTR
 1 Jace, the Mind Sculptor|VMA
 1 Jace, Vryn's Prodigy|ORI
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Kalitas, Traitor of Ghet|OGW
 1 Karakas|EMA
@@ -237,7 +237,7 @@ Name=MTGO Vintage Cube November 2016
 1 Leyline of Sanctity|MM2
 1 Library of Alexandria|VMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -247,7 +247,7 @@ Name=MTGO Vintage Cube November 2016
 1 Linvala, Keeper of Silence|MM3
 1 Linvala, the Preserver|OGW
 1 Lion's Eye Diamond|MIR
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -257,7 +257,7 @@ Name=MTGO Vintage Cube November 2016
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
 1 Magus of the Moon|IMA
-1 Magus of the Wheel
+1 Magus of the Wheel|A25
 1 Magus of the Will
 1 Makeshift Mannequin|LRW
 1 Managorger Hydra|ORI
@@ -271,18 +271,18 @@ Name=MTGO Vintage Cube November 2016
 1 Mardu Woe-Reaper|FRF
 1 Marsh Flats|MM3
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Maze of Ith|EMA
 1 Mental Misstep|NPH
 1 Memory Jar|VMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Metalworker|UDS
 1 Mind Twist|4ED
 1 Mindslaver|SOM
 1 Mind's Desire|SCG
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Misty Rainforest|MM3
 1 Mizzium Mortars|MM3
@@ -302,7 +302,7 @@ Name=MTGO Vintage Cube November 2016
 1 Myr Battlesphere|SOM
 1 Mystical Tutor|EMA
 1 Mystic Confluence
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Nahiri, the Harbinger|SOI
 1 Natural Order|EMA
 1 Nature's Claim|IMA
@@ -333,7 +333,7 @@ Name=MTGO Vintage Cube November 2016
 1 Parallax Wave|VMA
 1 Path to Exile|MM3
 1 Pentad Prism|5DN
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
@@ -363,14 +363,14 @@ Name=MTGO Vintage Cube November 2016
 1 Recruiter of the Guard
 1 Recurring Nightmare|TPR
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Repeal|IMA
 1 Restoration Angel|IMA
 1 Reveillark|MMA
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Roast|DTK
 1 Rofellos, Llanowar Emissary|VMA
 1 Sacred Foundry|GTC
@@ -389,7 +389,7 @@ Name=MTGO Vintage Cube November 2016
 1 Selesnya Signet|MM3
 1 Selfless Spirit|EMN
 1 Sensei's Divining Top|EMA
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shallow Grave|MIR
 1 Shambling Vent|BFZ
 1 Shardless Agent|EMA
@@ -432,7 +432,7 @@ Name=MTGO Vintage Cube November 2016
 1 Student of Warfare|ROE
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
 1 Sword of Body and Mind|SOM
@@ -440,7 +440,7 @@ Name=MTGO Vintage Cube November 2016
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -465,7 +465,7 @@ Name=MTGO Vintage Cube November 2016
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
 1 Thada Adel, Acquisitor|WWK
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 The Abyss|LEG
 1 Thing in the Ice|SOI
 1 Thirst for Knowledge|MMA
@@ -508,12 +508,12 @@ Name=MTGO Vintage Cube November 2016
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
 1 Villainous Wealth|KTK
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
 1 Vryn Wingmare|ORI
--- a/forge-gui/res/cube/Modern
+++ b/forge-gui/res/cube/Modern
@@ -20,7 +20,7 @@ Name=Modern Cube 2017
 1 Anger of the Gods|IMA
 1 Anguished Unmaking|SOI
 1 Anticipate|BFZ
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Trail|SOM
 1 Archangel Avacyn|SOI
 1 Archangel of Thune|IMA
@@ -67,7 +67,7 @@ Name=Modern Cube 2017
 1 Bygone Bishop|SOI
 1 Canopy Vista|BFZ
 1 Careful Consideration|MMA
-1 Cascade Bluffs|EVE
+1 Cascade Bluffs|A25
 1 Caves of Koilos|ORI
 1 Celestial Colonnade|WWK
 1 Chained to the Rocks|THS
@@ -86,7 +86,7 @@ Name=Modern Cube 2017
 1 Clifftop Retreat|ISD
 1 Cloistered Youth|ISD
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coldsteel Heart|CSP
 1 Collective Defiance|EMN
 1 Collective Effort|EMN
@@ -96,13 +96,13 @@ Name=Modern Cube 2017
 1 Confiscate|9ED
 1 Consecrated Sphinx|IMA
 1 Consuming Vapors|ROE
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
 1 Crypt Ghast|GTC
 1 Cryptic Command|IMA
 1 Crystal Shard|MRD
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cyclonic Rift|MM3
 1 Damnation|MM3
 1 Dark Confidant|MM2
@@ -117,8 +117,8 @@ Name=Modern Cube 2017
 1 Devour Flesh|GTC
 1 Dictate of Heliod|JOU
 1 Disallow|AER
-1 Disenchant|IMA
+1 Disenchant|A25
-1 Disfigure|ZEN
+1 Disfigure|A25
 1 Dismember|MM2
 1 Dissipate|M15
 1 Dissolve|IMA
@@ -151,7 +151,7 @@ Name=Modern Cube 2017
 1 Eternal Witness|MMA
 1 Ever After|SOI
 1 Everflowing Chalice|MM2
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exquisite Firecraft|ORI
 1 Faith's Fetters|EMA
 1 Falkenrath Aristocrat|MM3
@@ -161,7 +161,7 @@ Name=Modern Cube 2017
 1 Fatal Push|AER
 1 Felidar Guardian|AER
 1 Fertile Ground|LRW
-1 Fetid Heath|EVE
+1 Fetid Heath|A25
 1 Figure of Destiny|MMA
 1 Firedrinker Satyr|THS
 1 Flame Javelin|SHM
@@ -169,7 +169,7 @@ Name=Modern Cube 2017
 1 Fleecemane Lion|THS
 1 Flickerwisp|MM3
 1 Flinthoof Boar|EMA
-1 Flooded Grove|EVE
+1 Flooded Grove|A25
 1 Flooded Strand|KTK
 1 Frost Lynx|IMA
 1 Frost Titan|M12
@@ -179,7 +179,7 @@ Name=Modern Cube 2017
 1 Garruk, Apex Predator|M15
 1 Garruk, Primal Hunter|M13
 1 Geist of Saint Traft|ISD
-1 Genju of the Spires|BOK
+1 Genju of the Spires|A25
 1 Geralf's Messenger|DKA
 1 Gideon Jura|M12
 1 Gideon's Lawkeeper|MM3
@@ -230,7 +230,7 @@ Name=Modern Cube 2017
 1 Ink-Eyes, Servant of Oni|BOK
 1 Inquisition of Kozilek|MM3
 1 Into the Roil|ZEN
-1 Ire Shaman|DTK
+1 Ire Shaman|A25
 1 Isamaru, Hound of Konda|CHK
 1 Isolated Chapel|ISD
 1 Izzet Charm|MM3
@@ -260,7 +260,7 @@ Name=Modern Cube 2017
 1 Lash Out|LRW
 1 Lavaclaw Reaches|WWK
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
 1 Lightning Strike|XLN
@@ -284,7 +284,7 @@ Name=Modern Cube 2017
 1 Martial Coup|CFX
 1 Masked Admirers|MMA
 1 Massacre Wurm|MBS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Mayor of Avabruck|ISD
 1 Meloku the Clouded Mirror|MMA
 1 Mikaeus, the Lunarch|ISD
@@ -303,7 +303,7 @@ Name=Modern Cube 2017
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Nahiri, the Harbinger|SOI
-1 Negate|AER
+1 Negate|RIX
 1 Nest Invader|MM2
 1 Nicol Bolas, Planeswalker|M13
 1 Night's Whisper|EMA
@@ -326,16 +326,16 @@ Name=Modern Cube 2017
 1 Overgrown Tomb|RTR
 1 Overwhelming Stampede|MM2
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Palladium Myr|IMA
 1 Path to Exile|MM3
-1 Perilous Myr|SOM
+1 Perilous Myr|A25
 1 Pestermite|MMA
-1 Phantasmal Bear|M12
+1 Phantasmal Bear|A25
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
-1 Phyrexian Obliterator|NPH
+1 Phyrexian Obliterator|A25
 1 Phyrexian Revoker|M15
 1 Pia and Kiran Nalaar|ORI
 1 Pilgrim's Eye|EMA
@@ -352,7 +352,7 @@ Name=Modern Cube 2017
 1 Prophet of Kruphix|THS
 1 Prophetic Flamespeaker|JOU
 1 Psionic Blast|TSB
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Pridemage|ARB
 1 Quarantine Field|BFZ
 1 Rabid Bite|SOI
@@ -377,11 +377,11 @@ Name=Modern Cube 2017
 1 Rishkar's Expertise|AER
 1 Rishkar, Peema Renegade|AER
 1 Rootbound Crag|XLN
-1 Rugged Prairie|EVE
+1 Rugged Prairie|A25
 1 Ruinous Path|BFZ
 1 Rune Snag|CSP
 1 Rune-Scarred Demon|IMA
-1 Ruthless Ripper|KTK
+1 Ruthless Ripper|A25
 1 Sacred Foundry|GTC
 1 Saheeli Rai|KLD
 1 Sakura-Tribe Elder|CNS
@@ -397,7 +397,7 @@ Name=Modern Cube 2017
 1 Selesnya Charm|RTR
 1 Selfless Spirit|EMN
 1 Serum Visions|MM3
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shelldock Isle|LRW
 1 Sheoldred, Whispering One|IMA
 1 Shivan Reef|ORI
@@ -470,7 +470,7 @@ Name=Modern Cube 2017
 1 Temporal Mastery|MM3
 1 Terastodon|CNS
 1 Terramorphic Expanse|MMA
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thirst for Knowledge|MMA
 1 Thoughtseize|IMA
@@ -489,7 +489,7 @@ Name=Modern Cube 2017
 1 Treetop Village|10E
 1 Trophy Mage|AER
 1 Trygon Predator|EMA
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Ugin, the Spirit Dragon|FRF
 1 Ulamog, the Ceaseless Hunger|BFZ
 1 Ulcerate|IMA
@@ -497,17 +497,17 @@ Name=Modern Cube 2017
 1 Unburial Rites|MM3
 1 Underground River|10E
 1 Undergrowth Champion|BFZ
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Valorous Stance|FRF
 1 Vampire Hexmage|CNS
 1 Vampire Nighthawk|MM3
 1 Vendetta|ROE
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
 1 Verdurous Gearhulk|KLD
-1 Vesuvan Shapeshifter|TSP
+1 Vesuvan Shapeshifter|A25
 1 Victim of Night|ISD
 1 Viridian Emissary|MBS
 1 Vivid Grove|MMA
--- a/forge-gui/res/cube/Mono
+++ b/forge-gui/res/cube/Mono
@@ -21,18 +21,18 @@ Name=Mono Blue Cube
 1 Archive Trap|ZEN
 1 Augur of Bolas|MM3
 1 Basalt Monolith|3ED
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Black Lotus|VMA
 1 Black Vise|4ED
 1 Blightsteel Colossus|MBS
 1 Blinkmoth Nexus|MM2
-1 Blue Sun's Zenith|MBS
+1 Blue Sun's Zenith|A25
 1 Bonesplitter|MMA
 1 Boomerang|10E
 1 Braids, Conjurer Adept|PLC
 1 Brain Freeze|VMA
 1 Braingeyser|3ED
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Briarberry Cohort|SHM
 1 Brittle Effigy|M11
 1 Broken Ambitions|LRW
@@ -43,13 +43,13 @@ Name=Mono Blue Cube
 1 Capsize|TPR
 1 Careful Consideration|MMA
 1 Cavern of Souls|MM3
-1 Chalice of the Void|MMA
+1 Chalice of the Void|A25
 1 Chancellor of the Spires|NPH
 1 Chronomaton|M13
 1 Claustrophobia|IMA
 1 Cloud of Faeries|VMA
 1 Cloudfin Raptor|GTC
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coat of Arms|TPR
 1 Codex Shredder|RTR
 1 Cold-Eyed Selkie|MMA
@@ -62,10 +62,10 @@ Name=Mono Blue Cube
 1 Conundrum Sphinx|M11
 1 Copper Gnomes|USG
 1 Coralhelm Commander|ROE
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Crippling Chill|MM3
 1 Cryptic Command|IMA
-1 Cursecatcher|SHM
+1 Cursecatcher|A25
 1 Cyclonic Rift|MM3
 1 Darksteel Colossus|M10
 1 Daze|EMA
@@ -96,7 +96,7 @@ Name=Mono Blue Cube
 1 Errant Ephemeron|MMA
 1 Ertai, Wizard Adept|EXO
 1 Evacuation|10E
-1 Exclude|INV
+1 Exclude|A25
 1 Extraplanar Lens|MRD
 1 Eye of the Storm|RAV
 1 Fabricate|M10
@@ -179,7 +179,7 @@ Name=Mono Blue Cube
 1 Memory Sluice|SHM
 1 Mental Misstep|NPH
 1 Merchant Scroll|8ED
-1 Merfolk Looter|EMA
+1 Merfolk Looter|A25
 1 Merfolk Mesmerist|M12
 1 Merfolk Sovereign|M11
 1 Merfolk Spy|M14
@@ -193,7 +193,7 @@ Name=Mono Blue Cube
 1 Minister of Impediments|DIS
 1 Miscalculation|ULG
 1 Misdirection|CNS
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Helix|USG
 1 Mishra's Workshop|ATQ
 1 Mortarpod|MM2
@@ -205,7 +205,7 @@ Name=Mono Blue Cube
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
 1 Mystical Tutor|EMA
-1 Negate|AER
+1 Negate|RIX
 1 Nevinyrral's Disk|EMA
 1 Nightveil Specter|GTC
 1 Nimbus Naiad|THS
@@ -215,7 +215,7 @@ Name=Mono Blue Cube
 1 Oona, Queen of the Fae|MMA
 1 Opportunity|MM3
 1 Overtaker|MMQ
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Painter's Servant|SHM
 1 Palinchron|VMA
 1 Patron Wizard|ODY
@@ -223,7 +223,7 @@ Name=Mono Blue Cube
 1 Peer Through Depths|MMA
 1 Personal Tutor|POR
 1 Pestermite|MMA
-1 Phantasmal Bear|M12
+1 Phantasmal Bear|A25
 1 Phantasmal Dragon|M12
 1 Phantasmal Image|MM3
 1 Phyrexian Ingester|EMA
@@ -243,7 +243,7 @@ Name=Mono Blue Cube
 1 Psionic Blast|TSB
 1 Psychic Barrier|NPH
 1 Puresight Merrow|SHM
-1 Quicksand|CNS
+1 Quicksand|A25
 1 Rapid Hybridization|GTC
 1 Ratchet Bomb|M14
 1 Rath's Edge|NMS
@@ -258,7 +258,7 @@ Name=Mono Blue Cube
 1 Riftwing Cloudskate|MMA
 1 Riptide Director|LGN
 1 Riptide Laboratory|ONS
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Runechanter's Pike|ISD
 1 Sage of Fables|MOR
 1 Sand Squid|MMQ
@@ -277,7 +277,7 @@ Name=Mono Blue Cube
 1 Shelldock Isle|LRW
 1 Show and Tell|USG
 1 Signal Pest|MBS
-1 Silvergill Adept|LRW
+1 Silvergill Adept|RIX
 1 Skullclamp|VMA
 1 Skywatcher Adept|ROE
 1 Sleight of Hand|9ED
@@ -341,9 +341,9 @@ Name=Mono Blue Cube
 1 Vedalken Aethermage|FUT
 1 Vedalken Shackles|MMA
 1 Veiled Serpent|USG
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
-1 Vesuvan Shapeshifter|TSP
+1 Vesuvan Shapeshifter|A25
 1 Vexing Sphinx|CSP
 1 Vision Charm|VIS
 1 Visions of Beyond|M12
--- a/forge-gui/res/cube/Sam
+++ b/forge-gui/res/cube/Sam
@@ -17,10 +17,10 @@ Name=Sam Black's No Search Cube
 1 Angel of Serenity|RTR
 1 Anger of the Gods|IMA
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arcane Sanctum|MM3
 1 Archangel Avacyn|SOI
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Artisan of Kozilek|MM2
 1 Ashiok, Nightmare Weaver|THS
 1 Atarka's Command|DTK
@@ -56,7 +56,7 @@ Name=Sam Black's No Search Cube
 1 Bomat Courier|KLD
 1 Bone Shredder|ULG
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Garrison|IMA
 1 Braids, Cabal Minion|EMA
 1 Brimaz, King of Oreskos|BNG
@@ -78,7 +78,7 @@ Name=Sam Black's No Search Cube
 1 Chromatic Star|10E
 1 Chrome Mox|EMA
 1 City of Traitors|TPR
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coercive Portal|VMA
 1 Coldsteel Heart|CSP
 1 Compulsive Research|MM3
@@ -89,8 +89,8 @@ Name=Sam Black's No Search Cube
 1 Control Magic|EMA
 1 Corpse Dance|TPR
 1 Council's Judgment|CNS
-1 Counterspell|EMA
+1 Counterspell|A25
-1 Courser of Kruphix|BNG
+1 Courser of Kruphix|A25
 1 Crackling Doom|KTK
 1 Craterhoof Behemoth|MM3
 1 Creeping Tar Pit|WWK
@@ -103,7 +103,7 @@ Name=Sam Black's No Search Cube
 1 Dack's Duplicate|CNS
 1 Damnation|MM3
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Daze|EMA
 1 Deceiver Exarch|NPH
 1 Delver of Secrets|ISD
@@ -113,7 +113,7 @@ Name=Sam Black's No Search Cube
 1 Dig Through Time|KTK
 1 Dimir Aqueduct|IMA
 1 Disciple of Bolas|M13
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Dismember|MM2
 1 Distended Mindbender|EMN
 1 Domri Rade|MM3
@@ -128,7 +128,7 @@ Name=Sam Black's No Search Cube
 1 Duplicant|EMA
 1 Duskwatch Recruiter|SOI
 1 Edric, Spymaster of Trest|VMA
-1 Eidolon of the Great Revel|JOU
+1 Eidolon of the Great Revel|A25
 1 Elder Deep-Fiend|EMN
 1 Eldrazi Displacer|OGW
 1 Eldrazi Skyspawner|BFZ
@@ -142,7 +142,7 @@ Name=Sam Black's No Search Cube
 1 Emrakul, the Promised End|EMN
 1 Enclave Cryptologist|ROE
 1 Engineered Explosives|MMA
-1 Ensnaring Bridge|8ED
+1 Ensnaring Bridge|A25
 1 Entomber Exarch|MM3
 1 Eternal Witness|MMA
 1 Everflowing Chalice|MM2
@@ -156,7 +156,7 @@ Name=Sam Black's No Search Cube
 1 Fastbond|VMA
 1 Feldon of the Third Path
 1 Fellwar Stone|9ED
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Justice|MM3
 1 Figure of Destiny|MMA
 1 Fire // Ice|APC
@@ -168,7 +168,7 @@ Name=Sam Black's No Search Cube
 1 Fleecemane Lion|THS
 1 Fleetwheel Cruiser|KLD
 1 Flickerwisp|MM3
-1 Flooded Grove|EVE
+1 Flooded Grove|A25
 1 Force of Will|EMA
 1 Forked Bolt|ROE
 1 Frantic Search|VMA
@@ -217,7 +217,7 @@ Name=Sam Black's No Search Cube
 1 Hissing Quagmire|OGW
 1 Honor of the Pure|M12
 1 Hooting Mandrills|KTK
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Hornet Queen|M15
 1 Huntmaster of the Fells|DKA
 1 Hymn to Tourach|EMA
@@ -262,7 +262,7 @@ Name=Sam Black's No Search Cube
 1 Library of Alexandria|VMA
 1 Lifebane Zombie|M14
 1 Lightning Berserker|DTK
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
 1 Liliana of the Veil|MM3
@@ -270,7 +270,7 @@ Name=Sam Black's No Search Cube
 1 Liliana, the Last Hope|EMN
 1 Lingering Souls|MM3
 1 Linvala, the Preserver|OGW
-1 Living Death|TPR
+1 Living Death|A25
 1 Llanowar Elves|EMA
 1 Lodestone Golem|MM2
 1 Looter il-Kor|TSP
@@ -281,7 +281,7 @@ Name=Sam Black's No Search Cube
 1 Maelstrom Wanderer|EMA
 1 Magma Jet|MM3
 1 Malicious Affliction|EMA
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Crypt|EMA
 1 Mana Drain|IMA
 1 Mana Leak|IMA
@@ -292,7 +292,7 @@ Name=Sam Black's No Search Cube
 1 Marsh Flitter|MMA
 1 Martial Coup|CFX
 1 Master of Waves|THS
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Mastery of the Unseen|FRF
 1 Masticore|VMA
 1 Maze of Ith|EMA
@@ -305,7 +305,7 @@ Name=Sam Black's No Search Cube
 1 Mirari's Wake|CNS
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Mishra's Workshop|ATQ
 1 Mogg War Marshal|EMA
 1 Molten Rain|MM3
@@ -340,7 +340,7 @@ Name=Sam Black's No Search Cube
 1 Nomad Outpost|KTK
 1 Noose Constrictor|EMN
 1 Noxious Gearhulk|KLD
-1 Nyx-Fleece Ram|JOU
+1 Nyx-Fleece Ram|A25
 1 Oath of Druids|TPR
 1 Oath of Nissa|OGW
 1 Oblivion Ring|MM2
@@ -356,13 +356,13 @@ Name=Sam Black's No Search Cube
 1 Orzhov Basilica|IMA
 1 Outpost Siege|FRF
 1 Pack Rat|RTR
-1 Pact of Negation|MMA
+1 Pact of Negation|A25
 1 Painful Truths|BFZ
 1 Palinchron|VMA
 1 Palladium Myr|IMA
 1 Pelakka Wurm|MM2
 1 Pentavus|M12
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Pestermite|MMA
 1 Phantasmal Image|MM3
 1 Phyrexian Metamorph|NPH
@@ -386,7 +386,7 @@ Name=Sam Black's No Search Cube
 1 Raging Ravine|WWK
 1 Rakdos Carnarium|IMA
 1 Rakdos's Return|RTR
-1 Rancor|EMA
+1 Rancor|A25
 1 Ratchet Bomb|M14
 1 Reality Smasher|OGW
 1 Reanimate|TPR
@@ -394,7 +394,7 @@ Name=Sam Black's No Search Cube
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
 1 Reflector Mage|OGW
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relic of Progenitus|EMA
 1 Remand|MM2
 1 Restoration Angel|IMA
@@ -402,7 +402,7 @@ Name=Sam Black's No Search Cube
 1 Ribbons of Night|RAV
 1 Rift Bolt|IMA
 1 Riftwing Cloudskate|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 Rofellos, Llanowar Emissary|VMA
 1 Sandsteppe Citadel|KTK
 1 Satyr Wayfinder|M15
@@ -467,11 +467,11 @@ Name=Sam Black's No Search Cube
 1 Sublime Archangel|M13
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Supreme Verdict|IMA
 1 Sword of Feast and Famine|MBS
 1 Sword of Fire and Ice|MMA
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Advocate|OGW
 1 Sylvan Caryatid|THS
 1 Taiga|VMA
@@ -494,7 +494,7 @@ Name=Sam Black's No Search Cube
 1 Terminus|MM3
 1 Tezzeret, Agent of Bolas|MBS
 1 Thalia's Lieutenant|SOI
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thalia, Heretic Cathar|EMN
 1 Thassa, God of the Sea|THS
 1 Thing in the Ice|SOI
@@ -528,7 +528,7 @@ Name=Sam Black's No Search Cube
 1 Tropical Island|VMA
 1 True-Name Nemesis
 1 Tundra|VMA
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Ugin, the Spirit Dragon|FRF
 1 Ulamog, the Ceaseless Hunger|BFZ
 1 Umezawa's Jitte|BOK
@@ -537,18 +537,18 @@ Name=Sam Black's No Search Cube
 1 Unexpectedly Absent|EMA
 1 Unlicensed Disintegration|KLD
 1 Upheaval|VMA
-1 Utopia Sprawl|DIS
+1 Utopia Sprawl|A25
 1 Valorous Stance|FRF
 1 Vampire Nighthawk|MM3
 1 Varolz, the Scar-Striped|DGM
 1 Vault of the Archangel|DKA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Venser, Shaper Savant|MM3
 1 Verdurous Gearhulk|KLD
-1 Vesuvan Shapeshifter|TSP
+1 Vesuvan Shapeshifter|A25
 1 Veteran Motorist|KLD
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Viscera Seer|M11
 1 Voice of Resurgence|MM3
 1 Volcanic Island|VMA
@@ -582,5 +582,5 @@ Name=Sam Black's No Search Cube
 1 Yawgmoth's Will|USG
 1 Young Pyromancer|EMA
 1 Zealous Conscripts|MM3
-1 Zulaport Cutthroat|BFZ
+1 Zulaport Cutthroat|A25
 1 Zurgo Bellstriker|DTK
--- a/forge-gui/res/cube/The
+++ b/forge-gui/res/cube/The
@@ -20,7 +20,7 @@ Name=The Peasant's Toolbox
 1 Alive // Well|DGM
 1 Altac Bloodseeker|M15
 1 Ambush Viper|ISD
-1 Ancient Stirrings|ROE
+1 Ancient Stirrings|A25
 1 Apex Hawks|CNS
 1 Aquastrand Spider|MM2
 1 Aqueous Form|THS
@@ -62,7 +62,7 @@ Name=The Peasant's Toolbox
 1 Bituminous Blast|ARB
 1 Blast of Genius|DGM
 1 Blessings of Nature|AVR
-1 Blightning|ALA
+1 Blightning|A25
 1 Blind Creeper|5DN
 1 Blind Hunter|GPT
 1 Blind Zealot|NPH
@@ -80,7 +80,7 @@ Name=The Peasant's Toolbox
 1 Bonds of Faith|ISD
 1 Bonds of Quicksilver|SOM
 1 Bonesplitter|MMA
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Elite|GTC
 1 Boros Garrison|IMA
 1 Boros Guildgate|MM3
@@ -134,7 +134,7 @@ Name=The Peasant's Toolbox
 1 Controvert|CSP
 1 Coordinated Assault|IMA
 1 Corpse Traders|AVR
-1 Court Hussar|DIS
+1 Court Hussar|A25
 1 Courtly Provocateur|M13
 1 Crackling Triton|THS
 1 Cradle to Grave|PLC
@@ -181,7 +181,7 @@ Name=The Peasant's Toolbox
 1 Disciple of Griselbrand|ISD
 1 Dispense Justice|SOM
 1 Dissolve|IMA
-1 Divine Verdict|THS
+1 Divine Verdict|RIX
 1 Domestication|M14
 1 Double Stroke|CNS
 1 Down // Dirty|DGM
@@ -231,7 +231,7 @@ Name=The Peasant's Toolbox
 1 Feral Invocation|THS
 1 Festerhide Boar|ISD
 1 Fettergeist|AVR
-1 Fiend Hunter|ISD
+1 Fiend Hunter|A25
 1 Fiery Fall|MM2
 1 Final-Sting Faerie|MOR
 1 Fire at Will|EVE
@@ -255,8 +255,8 @@ Name=The Peasant's Toolbox
 1 Foriysian Totem|TSP
 1 Forked Bolt|ROE
 1 Forlorn Pseudamma|BNG
-1 Freed from the Real|SOK
+1 Freed from the Real|A25
-1 Frenzied Goblin|M15
+1 Frenzied Goblin|A25
 1 Frilled Oculus|GTC
 1 Frontline Sage|CFX
 1 Frostburn Weird|RTR
@@ -268,10 +268,10 @@ Name=The Peasant's Toolbox
 1 Gelectrode|GPT
 1 Generator Servant|M15
 1 Genju of the Cedars|BOK
-1 Genju of the Falls|BOK
+1 Genju of the Falls|A25
 1 Genju of the Fens|BOK
 1 Genju of the Fields|BOK
-1 Genju of the Spires|BOK
+1 Genju of the Spires|A25
 1 Geyser Glider|ZEN
 1 Ghitu Encampment|10E
 1 Ghor-Clan Rampager|MM3
@@ -345,7 +345,7 @@ Name=The Peasant's Toolbox
 1 Horizon Chimera|THS
 1 Hour of Need|JOU
 1 Hunger of the Howlpack|CNS
-1 Hunt the Weak|IMA
+1 Hunt the Weak|RIX
 1 Hunting Triad|MOR
 1 Hyena Umbra|ROE
 1 Hypervolt Grasp|GPT
@@ -389,7 +389,7 @@ Name=The Peasant's Toolbox
 1 Knight of Cliffhaven|ROE
 1 Knight of Obligation|GTC
 1 Knight of the Holy Nimbus|TSP
-1 Knight of the Skyward Eye|ALA
+1 Knight of the Skyward Eye|A25
 1 Knightly Valor|ORI
 1 Kor Aeronaut|ZEN
 1 Kor Skyfisher|MM3
@@ -411,7 +411,7 @@ Name=The Peasant's Toolbox
 1 Llanowar Augur|FUT
 1 Logic Knot|MMA
 1 Looter il-Kor|TSP
-1 Lorescale Coatl|MM2
+1 Lorescale Coatl|A25
 1 Lost in the Mist|ISD
 1 Loyal Pegasus|BNG
 1 Lust for War|ROE
@@ -471,14 +471,14 @@ Name=The Peasant's Toolbox
 1 Nucklavee|EVE
 1 Nylea's Emissary|THS
 1 Nyx Weaver|JOU
-1 Nyx-Fleece Ram|JOU
+1 Nyx-Fleece Ram|A25
 1 Observant Alseid|THS
 1 Ocular Halo|DIS
 1 O-Naginata|SOK
 1 Onyx Mage|M12
 1 Oppressive Rays|M15
 1 Ordeal of Erebos|THS
-1 Ordeal of Heliod|THS
+1 Ordeal of Heliod|A25
 1 Ordeal of Nylea|THS
 1 Ordeal of Purphoros|THS
 1 Ordeal of Thassa|THS
@@ -520,14 +520,14 @@ Name=The Peasant's Toolbox
 1 Prismatic Lens|EMA
 1 Prized Elephant|M13
 1 Profit // Loss|DGM
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Puncturing Light|SOI
 1 Purphoros's Emissary|THS
 1 Pursuit of Flight|RTR
 1 Putrid Leech|ARB
 1 Pyreheart Wolf|DKA
 1 Pyrite Spellbomb|MMA
-1 Pyroclasm|MM3
+1 Pyroclasm|A25
 1 Qasali Ambusher|ALA
 1 Qasali Pridemage|ARB
 1 Quest for the Gemblades|ZEN
@@ -547,7 +547,7 @@ Name=The Peasant's Toolbox
 1 Repel Intruders|SHM
 1 Resize|CSP
 1 Restless Apparition|MM2
-1 Returned Phalanx|THS
+1 Returned Phalanx|A25
 1 Revenant Patriarch|GPT
 1 Ribbons of Night|RAV
 1 Ridge Rannet|ALA
@@ -672,7 +672,7 @@ Name=The Peasant's Toolbox
 1 Strangling Soot|TSP
 1 Stratus Walk|ORI
 1 Street Spasm|RTR
-1 Strider Harness|OGW
+1 Strider Harness|RIX
 1 Stun Sniper|ARB
 1 Sunblade Elf|M15
 1 Sunhome Guildmage|MM3
@@ -719,7 +719,7 @@ Name=The Peasant's Toolbox
 1 Transguild Promenade|RTR
 1 Traumatic Visions|MMA
 1 Travel Preparations|ISD
-1 Traveler's Amulet|HOU
+1 Traveler's Amulet|RIX
 1 Treetop Village|10E
 1 Trestle Troll|RTR
 1 Triclopean Sight|LRW
@@ -734,7 +734,7 @@ Name=The Peasant's Toolbox
 1 Turntimber Basilisk|ZEN
 1 Twinblade Slasher|EVE
 1 Twinstrike|DIS
-1 Twisted Abomination|EMA
+1 Twisted Abomination|A25
 1 Ulvenwald Bear|DKA
 1 Unburial Rites|MM3
 1 Undercity Informer|GTC
--- a/forge-gui/res/cube/Timothee
+++ b/forge-gui/res/cube/Timothee
@@ -34,7 +34,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Beast Within|NPH
 1 Beastmaster Ascension|ZEN
 1 Become Immense|KTK
-1 Bident of Thassa|THS
+1 Bident of Thassa|A25
 1 Bitterblossom|MM2
 1 Blackcleave Cliffs|SOM
 1 Blasting Station|5DN
@@ -130,14 +130,14 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Enlightened Tutor|EMA
 1 Entomb|EMA
 1 Entomber Exarch|MM3
-1 Epic Confrontation|DTK
+1 Epic Confrontation|A25
 1 Epochrasite|MMA
 1 Equilibrium|7ED
 1 Eternal Dragon|VMA
 1 Eternal Witness|MMA
 1 Ethereal Armor|RTR
 1 Evangelize|TSP
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Executioner's Capsule|MMA
 1 Experiment One|GTC
 1 Faceless Butcher|TSB
@@ -149,7 +149,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Feldon of the Third Path
 1 Felidar Sovereign|BFZ
 1 Festering Goblin|MMA
-1 Fetid Heath|EVE
+1 Fetid Heath|A25
 1 Fire Diamond|7ED
 1 Fire-Lit Thicket|SHM
 1 Fireslinger|TMP
@@ -209,7 +209,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Hermit Druid|TPR
 1 Hollow Specter|LGN
 1 Hopeful Eidolon|THS
-1 Hordeling Outburst|KTK
+1 Hordeling Outburst|A25
 1 Horizon Canopy|IMA
 1 Huntmaster of the Fells|DKA
 1 Hypnotic Specter|M10
@@ -246,7 +246,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Leafcrown Dryad|THS
 1 Leonin Bola|DST
 1 Life from the Loam|MMA
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Crafter|MOR
 1 Lignify|LRW
 1 Liliana of the Veil|MM3
@@ -255,7 +255,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Looter il-Kor|TSP
 1 Loyal Retainers|PTK
 1 Lumbering Falls|BFZ
-1 Luminarch Ascension|ZEN
+1 Luminarch Ascension|A25
 1 Magma Jet|MM3
 1 Magus of the Tabernacle|PLC
 1 Mana Confluence|JOU
@@ -275,13 +275,13 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Memory Lapse|EMA
 1 Meren of Clan Nel Toth
 1 Mesa Enchantress|EMA
-1 Mesmeric Fiend|VMA
+1 Mesmeric Fiend|A25
 1 Mesmeric Orb|MRD
 1 Military Intelligence|M15
 1 Mindslaver|SOM
 1 Miraculous Recovery|VIS
 1 Misdirection|CNS
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Mogg Fanatic|EMA
 1 Mogg War Marshal|EMA
@@ -301,18 +301,18 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Necromancer's Stockpile|M15
 1 Needle Spires|OGW
 1 Nether Traitor|TSP
-1 Nettle Sentinel|EVE
+1 Nettle Sentinel|A25
 1 Nezumi Shortfang|CHK
 1 Niblis of Frost|EMN
 1 Nicol Bolas, Planeswalker|M13
 1 Nightveil Specter|GTC
 1 Ninja of the Deep Hours|BOK
-1 Niv-Mizzet, the Firemind|MM2
+1 Niv-Mizzet, the Firemind|A25
 1 Noose Constrictor|EMN
 1 Norn's Annex|NPH
 1 Nykthos, Shrine to Nyx|THS
 1 Nyx Weaver|JOU
-1 Nyx-Fleece Ram|JOU
+1 Nyx-Fleece Ram|A25
 1 Obliterate|8ED
 1 Oblivion Ring|MM2
 1 Obzedat, Ghost Council|GTC
@@ -330,12 +330,12 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Parallax Tide|NMS
 1 Patron Wizard|ODY
 1 Peace of Mind|EMN
-1 Phantasmal Bear|M12
+1 Phantasmal Bear|A25
 1 Phantasmal Image|MM3
 1 Phyrexian Revoker|M15
 1 Phyrexian Totem|TSP
 1 Pia and Kiran Nalaar|ORI
-1 Pillory of the Sleepless|MM2
+1 Pillory of the Sleepless|A25
 1 Plateau|VMA
 1 Platinum Emperion|SOM
 1 Polluted Delta|KTK
@@ -346,7 +346,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Prey Upon|AER
 1 Pristine Talisman|IMA
 1 Propaganda|TMP
-1 Prophetic Prism|KLD
+1 Prophetic Prism|A25
 1 Proteus Staff|MRD
 1 Psionic Blast|TSB
 1 Psychic Spiral|RTR
@@ -358,14 +358,14 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Rakdos Keyrune|RTR
 1 Rakdos Signet|MM3
 1 Rakdos's Return|RTR
-1 Rancor|EMA
+1 Rancor|A25
 1 Raven's Crime|MMA
 1 Ravenous Rats|M13
 1 Razorfin Hunter|APC
 1 Reassembling Skeleton|MM2
 1 Reclamation Sage|M15
 1 Recurring Nightmare|TPR
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Relentless Dead|SOI
 1 Remand|MM2
 1 Replenish|UDS
@@ -398,7 +398,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Setessan Tactics|JOU
 1 Sever the Bloodline|MM3
 1 Sewer Nemesis
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Shambling Vent|BFZ
 1 Shelldock Isle|LRW
 1 Sheoldred, Whispering One|IMA
@@ -448,7 +448,7 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Strip Mine|VMA
 1 Stronghold Assassin|TPR
 1 Sun Droplet|MRD
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Survival of the Fittest|TPR
 1 Sylvan Library|EMA
 1 Syndic of Tithes|GTC
@@ -478,13 +478,13 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Trash for Treasure|MRD
 1 Treetop Village|10E
 1 Trinket Mage|SOM
-1 Triskaidekaphobia|SOI
+1 Triskaidekaphobia|A25
 1 Troll Ascetic|10E
 1 Tropical Island|VMA
 1 Tuktuk the Explorer|ROE
 1 Tundra|VMA
 1 Turn Aside|EMN
-1 Twilight Mire|EVE
+1 Twilight Mire|A25
 1 Ugin, the Spirit Dragon|FRF
 1 Ulamog, the Ceaseless Hunger|BFZ
 1 Ulamog, the Infinite Gyre|MM2
@@ -499,11 +499,11 @@ Name=Timothee Simonot's Twisted Color Pie Cube
 1 Vapor Snag|MM2
 1 Varolz, the Scar-Striped|DGM
 1 Vedalken Mastermind|10E
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Verdant Catacombs|MM3
-1 Vessel of Nascency|SOI
+1 Vessel of Nascency|A25
 1 Viridian Zealot|DST
 1 Visara the Dreadful|EMA
 1 Viscera Seer|M11
--- a/forge-gui/res/cube/www.mtgcube.com
+++ b/forge-gui/res/cube/www.mtgcube.com
@@ -11,13 +11,13 @@ Name=www.mtgcube.com (502 cards)
 1 Ancestral Recall|VMA
 1 Ancestral Vision|IMA
 1 Animate Dead|EMA
-1 Arbor Elf|M13
+1 Arbor Elf|A25
 1 Arc Lightning|KTK
 1 Arc Trail|SOM
-1 Arcane Denial|ALL
+1 Arcane Denial|A25
 1 Archangel of Thune|IMA
 1 Arid Mesa|MM3
-1 Armageddon|VMA
+1 Armageddon|A25
 1 Ash Zealot|RTR
 1 Augur of Bolas|MM3
 1 Avalanche Riders|TSB
@@ -39,7 +39,7 @@ Name=www.mtgcube.com (502 cards)
 1 Black Lotus|VMA
 1 Black Vise|4ED
 1 Blade Splicer|MM3
-1 Blightning|ALA
+1 Blightning|A25
 1 Blistering Firecat|ONS
 1 Blood Crypt|RTR
 1 Blood Scrivener|DGM
@@ -49,11 +49,11 @@ Name=www.mtgcube.com (502 cards)
 1 Bone Shredder|ULG
 1 Bonesplitter|MMA
 1 Bonfire of the Damned|MM3
-1 Boros Charm|GTC
+1 Boros Charm|A25
 1 Boros Reckoner|MM3
 1 Boros Signet|MM3
 1 Braids, Cabal Minion|EMA
-1 Brainstorm|EMA
+1 Brainstorm|A25
 1 Breeding Pool|GTC
 1 Bribery|8ED
 1 Broodmate Dragon|MM3
@@ -73,34 +73,34 @@ Name=www.mtgcube.com (502 cards)
 1 Chrome Mox|EMA
 1 City of Brass|MMA
 1 Cloudgoat Ranger|MMA
-1 Coalition Relic|FUT
+1 Coalition Relic|A25
 1 Coldsteel Heart|CSP
 1 Consecrated Sphinx|IMA
 1 Consuming Vapors|ROE
 1 Contagion|ALL
 1 Control Magic|EMA
-1 Counterspell|EMA
+1 Counterspell|A25
 1 Creakwood Liege|MM2
 1 Creeping Tar Pit|WWK
 1 Crucible of Worlds|10E
 1 Cryptic Command|IMA
 1 Crystal Shard|MRD
-1 Cultivate|M11
+1 Cultivate|A25
 1 Cursed Scroll|TPR
 1 Damnation|MM3
 1 Dance of the Dead|ICE
 1 Dark Confidant|MM2
-1 Dark Ritual|TPR
+1 Dark Ritual|A25
 1 Day of Judgment|M12
 1 Daze|EMA
 1 Deep Analysis|EMA
 1 Demonic Tutor|VMA
 1 Deranged Hermit|VMA
 1 Detention Sphere|RTR
-1 Diabolic Edict|TPR
+1 Diabolic Edict|A25
 1 Dimir Signet|MM3
 1 Diregraf Ghoul|ISD
-1 Disenchant|IMA
+1 Disenchant|A25
 1 Dismember|MM2
 1 Dreadbore|RTR
 1 Dryad Militant|RTR
@@ -124,7 +124,7 @@ Name=www.mtgcube.com (502 cards)
 1 Eternal Witness|MMA
 1 Eureka|VMA
 1 Everflowing Chalice|MM2
-1 Evolving Wilds|IMA
+1 Evolving Wilds|RIX
 1 Exalted Angel|ONS
 1 Exhume|USG
 1 Experiment One|GTC
@@ -208,7 +208,7 @@ Name=www.mtgcube.com (502 cards)
 1 Izzet Signet|MM3
 1 Jace Beleren|M11
 1 Jace, the Mind Sculptor|VMA
-1 Jackal Pup|TMP
+1 Jackal Pup|A25
 1 Joraga Treespeaker|ROE
 1 Journey to Nowhere|ZEN
 1 Jund Charm|ALA
@@ -233,7 +233,7 @@ Name=www.mtgcube.com (502 cards)
 1 Library of Alexandria|VMA
 1 Life from the Loam|MMA
 1 Lifebane Zombie|M14
-1 Lightning Bolt|MM2
+1 Lightning Bolt|A25
 1 Lightning Greaves|MRD
 1 Lightning Helix|IMA
 1 Lightning Mauler|AVR
@@ -246,10 +246,10 @@ Name=www.mtgcube.com (502 cards)
 1 Looter il-Kor|TSP
 1 Lotleth Troll|RTR
 1 Lotus Cobra|IMA
-1 Luminarch Ascension|ZEN
+1 Luminarch Ascension|A25
 1 Maelstrom Pulse|MMA
 1 Magma Jet|MM3
-1 Man-o'-War|VIS
+1 Man-o'-War|A25
 1 Mana Crypt|EMA
 1 Mana Drain|IMA
 1 Mana Leak|IMA
@@ -257,7 +257,7 @@ Name=www.mtgcube.com (502 cards)
 1 Mana Vault|VMA
 1 Manic Vandal|M12
 1 Marsh Flats|MM3
-1 Master of the Wild Hunt|M10
+1 Master of the Wild Hunt|A25
 1 Masticore|VMA
 1 Mayor of Avabruck|ISD
 1 Maze of Ith|EMA
@@ -271,7 +271,7 @@ Name=www.mtgcube.com (502 cards)
 1 Mirran Crusader|MM2
 1 Mirror Entity|MM2
 1 Miscalculation|ULG
-1 Mishra's Factory|EMA
+1 Mishra's Factory|A25
 1 Misty Rainforest|MM3
 1 Moat|LEG
 1 Mogg Fanatic|EMA
@@ -290,7 +290,7 @@ Name=www.mtgcube.com (502 cards)
 1 Murderous Redcap|MMA
 1 Mutavault|M14
 1 Myr Battlesphere|SOM
-1 Mystic Snake|MM2
+1 Mystic Snake|A25
 1 Mystical Tutor|EMA
 1 Nantuko Vigilante|LGN
 1 Natural Order|EMA
@@ -309,12 +309,12 @@ Name=www.mtgcube.com (502 cards)
 1 Overgrown Tomb|RTR
 1 Pack Rat|RTR
 1 Path to Exile|MM3
-1 Pernicious Deed|CNS
+1 Pernicious Deed|A25
 1 Phantasmal Image|MM3
 1 Phyrexian Arena|9ED
 1 Phyrexian Metamorph|NPH
 1 Phyrexian Revoker|M15
-1 Pillage|7ED
+1 Pillage|A25
 1 Pithing Needle|RTR
 1 Plateau|VMA
 1 Plated Geopede|ZEN
@@ -333,7 +333,7 @@ Name=www.mtgcube.com (502 cards)
 1 Rakdos Cackler|RTR
 1 Rakdos Signet|MM3
 1 Ral Zarek|DGM
-1 Rancor|EMA
+1 Rancor|A25
 1 Ranger of Eos|MM3
 1 Ratchet Bomb|M14
 1 Ravages of War|PTK
@@ -342,18 +342,18 @@ Name=www.mtgcube.com (502 cards)
 1 Reckless Waif|ISD
 1 Recurring Nightmare|TPR
 1 Reflecting Pool|CNS
-1 Regrowth|VMA
+1 Regrowth|A25
 1 Remand|MM2
 1 Restoration Angel|IMA
 1 Reveillark|MMA
-1 Rishadan Port|MMQ
+1 Rishadan Port|A25
 1 River Boa|ZEN
 1 Rolling Earthquake|PTK
 1 Sacred Foundry|GTC
 1 Sakura-Tribe Elder|CNS
 1 Sarkhan Vol|MMA
 1 Savannah|VMA
-1 Savannah Lions|9ED
+1 Savannah Lions|A25
 1 Scalding Tarn|MM3
 1 Scavenging Ooze|MM3
 1 Scroll Rack|TMP
@@ -364,7 +364,7 @@ Name=www.mtgcube.com (502 cards)
 1 Sensei's Divining Top|EMA
 1 Serendib Efreet|EMA
 1 Shadowborn Demon|M14
-1 Shadowmage Infiltrator|MM2
+1 Shadowmage Infiltrator|A25
 1 Show and Tell|USG
 1 Shriekmaw|LRW
 1 Siege-Gang Commander|EMA
@@ -411,7 +411,7 @@ Name=www.mtgcube.com (502 cards)
 1 Student of Warfare|ROE
 1 Sulfuric Vortex|EMA
 1 Sun Titan|M12
-1 Sundering Titan|DST
+1 Sundering Titan|A25
 1 Supreme Verdict|IMA
 1 Survival of the Fittest|TPR
 1 Sword of Body and Mind|SOM
@@ -419,7 +419,7 @@ Name=www.mtgcube.com (502 cards)
 1 Sword of Fire and Ice|MMA
 1 Sword of Light and Shadow|MMA
 1 Sword of War and Peace|NPH
-1 Swords to Plowshares|IMA
+1 Swords to Plowshares|A25
 1 Sylvan Caryatid|THS
 1 Sylvan Library|EMA
 1 Taiga|VMA
@@ -430,7 +430,7 @@ Name=www.mtgcube.com (502 cards)
 1 Terramorphic Expanse|MMA
 1 Tezzeret the Seeker|MM2
 1 Tezzeret, Agent of Bolas|MBS
-1 Thalia, Guardian of Thraben|DKA
+1 Thalia, Guardian of Thraben|A25
 1 Thassa, God of the Sea|THS
 1 The Abyss|LEG
 1 Thirst for Knowledge|MMA
@@ -462,16 +462,16 @@ Name=www.mtgcube.com (502 cards)
 1 Undiscovered Paradise|VIS
 1 Upheaval|VMA
 1 Vampire Hexmage|CNS
-1 Vampire Lacerator|MM2
+1 Vampire Lacerator|A25
 1 Vampire Nighthawk|MM3
 1 Vampiric Tutor|EMA
 1 Vedalken Shackles|MMA
-1 Vendilion Clique|MM2
+1 Vendilion Clique|A25
 1 Vengevine|ROE
 1 Venser, Shaper Savant|MM3
 1 Venser, the Sojourner|SOM
 1 Verdant Catacombs|MM3
-1 Vindicate|EMA
+1 Vindicate|A25
 1 Vinelasher Kudzu|RAV
 1 Viridian Shaman|10E
 1 Voice of Resurgence|MM3
@@ -488,7 +488,7 @@ Name=www.mtgcube.com (502 cards)
 1 Wild Mongrel|VMA
 1 Wild Nacatl|ALA
 1 Wildfire|MM2
-1 Willbender|TSB
+1 Willbender|A25
 1 Windswept Heath|KTK
 1 Winter Orb|EMA
 1 Wolfbitten Captive|DKA
--- a/forge-gui/res/draft/MTGO
+++ b/forge-gui/res/draft/MTGO
@@ -0,0 +1,6 @@
 Name:MTGO Legacy Cube February 2018 (600 cards)
 DeckFile:MTGO Legacy Cube February 2018 (600 cards)
 Singleton:True
 Booster: 15 Any
 NumPacks: 3