Merge pull request #6190 from luziferius/refactor_promo_sets

[RFC] Refactor promo sets, add missing sets as listed on Scryfall
2025-04-03 17:00:16 -09:00 · 2020-08-10 16:57:00 +02:00 · 2020-08-10 16:57:00 +02:00 · b16d30b79b
commit b16d30b79b
parent 3f4475a136 994dea99b3
438 changed files with 14861 additions and 3880 deletions
--- a/Mage.Client/release/sample-decks/1998/1998
+++ b/Mage.Client/release/sample-decks/1998/1998
@ -1,28 +1,28 @@
-1 [TMP:227] Cloudchaser Eagle
+1 [TMP:15] Cloudchaser Eagle
 1 [EXO:76] Thrull Surgeon
-2 [TMP:328] Reflecting Pool
-1 [MIR:44] Spirit of the Night
+2 [TMP:322] Reflecting Pool
+1 [MIR:146] Spirit of the Night
 1 [TMP:98] Tradewind Rider
 2 [VIS:167] Undiscovered Paradise
 2 [7ED:350] Underground River
 4 [EXO:129] Survival of the Fittest
 2 [WTH:101] Firestorm
 2 [9ED:149] Nekrataal
-1 [STH:137] Volrath's Stronghold
+1 [STH:143] Volrath's Stronghold
 2 [7ED:336] Karplusan Forest
 3 [5ED:413] City of Brass
-4 [STH:75] Wall of Blossoms
+4 [STH:125] Wall of Blossoms
 1 [M11:239] Swamp
 4 [M11:165] Birds of Paradise
 1 [TSB:119] Gemstone Mine
 1 [VIS:37] Man-o'-War
-2 [STH:68] Spike Feeder
+2 [STH:118] Spike Feeder
 1 [EXO:128] Spike Weaver
 1 [9ED:278] Verdant Force
-2 [TMP:298] Scroll Rack
+2 [TMP:308] Scroll Rack
 4 [EXO:72] Recurring Nightmare
 2 [TSB:89] Wall of Roots
 2 [INV:255] Lobotomy
 8 [M10:247] Forest
 1 [WTH:112] Orcish Settlers
-2 [VIS:73] Uktabi Orangutan
+2 [VIS:123] Uktabi Orangutan
--- a/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tim
+++ b/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tim
@ -12,4 +12,4 @@
 4 [ZEN:119] Burst Lightning
 4 [TMP:97] Time Warp
 2 [M11:47] Call to Mind
-7 [ZEN:264] Mountain
+7 [ZEN:242a] Mountain
--- a/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias
+++ b/Mage.Client/release/sample-decks/2011/Ala-M10-Zen/Tobias
@ -3,7 +3,7 @@
 3 [WWK:138] Khalni Garden
 4 [M11:70] Preordain
 4 [M12:63] Mana Leak
-10 [GUR:2] Island
+10 [PGRU:2] Island
 2 [ZEN:48] Into the Roil
 4 [ROE:86] See Beyond
 4 [M12:73] Ponder
@ -12,4 +12,4 @@
 3 [TMP:97] Time Warp
 3 [M11:54] Foresee
 2 [M11:47] Call to Mind
-5 [ZEN:264] Mountain
+5 [ZEN:242a] Mountain
--- a/Mage.Client/release/sample-decks/2011/Starter
+++ b/Mage.Client/release/sample-decks/2011/Starter
@ -25,7 +25,7 @@ AUTHOR:WotC
 2 [ZEN:231] Plains
 2 [ZEN:232] Plains
 2 [ZEN:233] Plains
-2 [ZEN:250] Plains
-2 [ZEN:251] Plains
-2 [ZEN:252] Plains
-2 [ZEN:253] Plains
+2 [ZEN:230a] Plains
+2 [ZEN:230a] Plains
+2 [ZEN:230a] Plains
+2 [ZEN:230a] Plains
--- a/Mage.Client/release/sample-decks/2011/Starter
+++ b/Mage.Client/release/sample-decks/2011/Starter
@ -30,11 +30,11 @@ AUTHOR:WotC
 1 [ZEN:247] Forest
 1 [ZEN:248] Forest
 1 [ZEN:249] Forest
-1 [ZEN:262] Mountain
-1 [ZEN:263] Mountain
-1 [ZEN:264] Mountain
-1 [ZEN:265] Mountain
-1 [ZEN:266] Forest
-1 [ZEN:267] Forest
-1 [ZEN:268] Forest
-1 [ZEN:269] Forest
+1 [ZEN:242a] Mountain
+1 [ZEN:242a] Mountain
+1 [ZEN:242a] Mountain
+1 [ZEN:242a] Mountain
+1 [ZEN:246a] Forest
+1 [ZEN:246a] Forest
+1 [ZEN:246a] Forest
+1 [ZEN:246a] Forest
--- a/Mage.Client/release/sample-decks/2011/Unsorted
+++ b/Mage.Client/release/sample-decks/2011/Unsorted
@ -1,21 +1,18 @@
-Hexproof Enchantress
-[general]
-constructed
-[main]
-3 Island
-5 Plains
-4 Invisible Stalker
-4 Mentor of the Meek
-4 Mesa Enchantress
-4 Mirran Crusader
-3 Angelic Destiny
-4 Bonds of Faith
-4 Nevermore
-4 Oblivion Ring
-3 Ghost Quarter
-4 Glacial Fortress
-2 Moorland Haunt
-4 Seachrome Coast
-4 Geist of Saint Traft
-4 Gitaxian Probe
-[sideboard]
+3 [M21:263] Island
+5 [M21:260] Plains
+4 [ISD:60] Invisible Stalker
+4 [M19:27] Mentor of the Meek
+4 [M12:25] Mesa Enchantress
+4 [MBS:14] Mirran Crusader
+3 [M12:3] Angelic Destiny
+4 [ISD:5] Bonds of Faith
+4 [ISD:25] Nevermore
+4 [M13:22] Oblivion Ring
+3 [ISD:240] Ghost Quarter
+4 [XLN:255] Glacial Fortress
+2 [ISD:244] Moorland Haunt
+4 [SOM:229] Seachrome Coast
+4 [ISD:213] Geist of Saint Traft
+4 [NPH:35] Gitaxian Probe
+LAYOUT MAIN:(1,5)(EDH_POWER_LEVEL,false,73)|([M21:263],[M21:263],[M21:263],[M21:260],[M21:260],[M21:260],[M21:260],[M21:260],[M12:3],[M12:3],[M12:3],[ISD:5],[ISD:5],[ISD:5],[ISD:5],[NPH:35],[NPH:35],[NPH:35],[NPH:35])([ISD:25],[ISD:25],[ISD:25],[ISD:25])([ISD:244],[ISD:244],[ISD:213],[ISD:213],[ISD:213],[ISD:213])([ISD:60],[ISD:60],[ISD:60],[ISD:60],[M12:25],[M12:25],[M12:25],[M12:25],[MBS:14],[MBS:14],[MBS:14],[MBS:14],[M13:22],[M13:22],[M13:22],[M13:22],[ISD:240],[ISD:240],[ISD:240])([M19:27],[M19:27],[M19:27],[M19:27],[XLN:255],[XLN:255],[XLN:255],[XLN:255],[SOM:229],[SOM:229],[SOM:229],[SOM:229])
+LAYOUT SIDEBOARD:(0,0)(EDH_POWER_LEVEL,false,50)|
--- a/Mage.Client/release/sample-decks/2011/Unsorted
+++ b/Mage.Client/release/sample-decks/2011/Unsorted
@ -1,27 +1,24 @@
-[metadata]
-Name=Shouta Yasooka's Blue-Black Control
-Deck Type=Constructed
-[main]
-1 Black Sun's Zenith|MBS
-1 Consume the Meek|ROE
-4 Creeping Tar Pit|WWK
-4 Darkslick Shores|SOM
-2 Despise|NPH
-2 Disfigure|ZEN
-2 Doom Blade|M12
-4 Drowned Catacomb|M12
-4 Everflowing Chalice|WWK
-2 Inkmoth Nexus|MBS
-3 Inquisition of Kozilek|ROE
-4 Island|ZEN
-2 Jace Beleren|M11
-2 Jace, the Mind Sculptor|WWK
-2 Mana Leak|STH
-4 Preordain|M11
-3 Swamp|ZEN
-3 Tectonic Edge|WWK
-3 Tezzeret, Agent of Bolas|MBS
-4 Torpor Orb|NPH
-3 Tumble Magnet|SOM
-1 Wurmcoil Engine|SOM
-[sideboard]
+1 [MBS:39] Black Sun's Zenith
+1 [ROE:100] Consume the Meek
+4 [WWK:134] Creeping Tar Pit
+4 [SOM:226] Darkslick Shores
+2 [KTK:69] Despise
+2 [M20:95] Disfigure
+2 [M14:96] Doom Blade
+4 [XLN:253] Drowned Catacomb
+4 [WWK:123] Everflowing Chalice
+2 [MBS:145] Inkmoth Nexus
+3 [ROE:115] Inquisition of Kozilek
+4 [M21:263] Island
+2 [M11:58] Jace Beleren
+2 [WWK:31] Jace, the Mind Sculptor
+2 [M12:63] Mana Leak
+4 [M11:70] Preordain
+3 [M21:266] Swamp
+3 [WWK:145] Tectonic Edge
+3 [MBS:97] Tezzeret, Agent of Bolas
+4 [NPH:162] Torpor Orb
+3 [SOM:218] Tumble Magnet
+1 [SOM:223] Wurmcoil Engine
+LAYOUT MAIN:(1,6)(EDH_POWER_LEVEL,false,73)|([KTK:69],[KTK:69],[M20:95],[M20:95],[M21:263],[M21:263],[M21:263],[M21:263],[M21:266],[M21:266],[M21:266],[NPH:162],[NPH:162],[NPH:162],[NPH:162])([M14:96],[M14:96],[SOM:218],[SOM:218],[SOM:218])([M11:70],[M11:70],[M11:70],[M11:70])([WWK:134],[WWK:134],[WWK:134],[WWK:134],[WWK:145],[WWK:145],[WWK:145],[MBS:97],[MBS:97],[MBS:97])([MBS:39],[ROE:100],[SOM:226],[SOM:226],[SOM:226],[SOM:226],[XLN:253],[XLN:253],[XLN:253],[XLN:253],[WWK:123],[WWK:123],[WWK:123],[WWK:123],[MBS:145],[MBS:145],[ROE:115],[ROE:115],[ROE:115],[M11:58],[M11:58],[M12:63],[M12:63],[SOM:223])([WWK:31],[WWK:31])
+LAYOUT SIDEBOARD:(0,0)(EDH_POWER_LEVEL,false,50)|
--- a/Mage.Client/release/sample-decks/2011/World
+++ b/Mage.Client/release/sample-decks/2011/World
@ -6,7 +6,7 @@
 4 [ISD:55] Forbidden Alchemy
 1 [MBS:43] Go for the Throat
 5 [ISD:261] Mountain
-1 [ISD:247] Shimmering Grotto
+1 [ISD:246] Shimmering Grotto
 1 [M12:147] Inferno Titan
 1 [SOM:225] Copperline Gorge
 2 [M12:226] Drowned Catacomb
--- a/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Budget
+++ b/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Budget
@ -1,7 +1,7 @@
 3 [DKA:76] Tragic Slip
 1 [AVR:104] Gloom Surgeon
-1 [ZEN:259] Swamp
-1 [ZEN:258] Swamp
+1 [ZEN:238a] Swamp
+1 [ZEN:238a] Swamp
 1 [NPH:170] Swamp
 1 [MBS:123] Pierce Strider
 1 [SOM:192] Perilous Myr
@ -17,7 +17,7 @@
 1 [USG:340] Swamp
 1 [SOM:241] Swamp
 3 [DKA:54] Black Cat
-1 [ZEN:260] Swamp
+1 [ZEN:238a] Swamp
 4 [NPH:104] Birthing Pod
 1 [SOM:238] Swamp
 1 [SOM:239] Swamp
--- a/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo
+++ b/Mage.Client/release/sample-decks/2012/ISD-DKA-AVR/Turbo
@ -2,7 +2,7 @@
 1 [ISD:262] Forest
 4 [MBS:145] Inkmoth Nexus
 2 [DKA:27] Artful Dodge
-1 [GUR:1] Forest
+1 [PGRU:5] Forest
 4 [SOM:166] Ichorclaw Myr
 3 [NPH:2] Apostle's Blessing
 1 [INV:335] Island
--- a/Mage.Client/release/sample-decks/2012/Starter
+++ b/Mage.Client/release/sample-decks/2012/Starter
@ -8,7 +8,7 @@ NAME:[DKA] Grave Power
 2 [ISD:69] Moon Heron
 1 [M12:167] Brindle Boar
 3 [ISD:43] Armored Skaab
-2 [STH:60] Mulch
+2 [STH:110] Mulch
 1 [M13:159] Acidic Slime
 2 [M12:48] Chasm Drake
 1 [ISD:205] Splinterfright
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -31,7 +31,7 @@ NAME:[T2] Avignon
 SB: 1 [ISD:74] Sensory Deprivation
 SB: 1 [WWK:26] Dispel
 SB: 3 [RTR:173] Izzet Staticaster
-SB: 1 [MPR:38] Negate
+SB: 1 [M20:69] Negate
 SB: 2 [RTR:201] Supreme Verdict
 SB: 2 [RTR:18] Rest in Peace
 SB: 2 [ISD:213] Geist of Saint Traft
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -10,7 +10,7 @@ NAME:[T2] Kangasu
 4 [ISD:122] Unburial Rites
 3 [RTR:148] Centaur Healer
 1 [AVR:106] Griselbrand
-3 [STH:60] Mulch
+3 [STH:110] Mulch
 1 [M13:159] Acidic Slime
 1 [AVR:229] Slayers' Stronghold
 1 [ISD:196] Mulch
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -10,7 +10,7 @@ NAME:[T2] Samite Healer
 4 [M13:193] Thragtusk
 2 [M13:228] Rootbound Crag
 4 [ISD:122] Unburial Rites
-2 [STH:60] Mulch
+2 [STH:110] Mulch
 2 [ISD:196] Mulch
 2 [M11:227] Rootbound Crag
 1 [RAV:284] Temple Garden
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -12,10 +12,10 @@ NAME:[T2] dhouse
 2 [AVR:32] Restoration Angel
 2 [M12:229] Sunpetal Grove
 1 [MMQ:348] Forest
-1 [4ED:177] Forest
+1 [4ED:376] Forest
 4 [M13:193] Thragtusk
 4 [ISD:122] Unburial Rites
-2 [STH:60] Mulch
+2 [STH:110] Mulch
 2 [ISD:196] Mulch
 1 [10E:375] Swamp
 3 [RAV:284] Temple Garden
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -2,7 +2,7 @@ NAME:[T2] puddingtime
 4 [ISD:170] Avacyn's Pilgrim
 1 [6ED:347] Forest
 3 [ULG:110] Rancor
-1 [4ED:188] Plains
+1 [4ED:364] Plains
 2 [ISD:239] Gavony Township
 1 [MMQ:350] Forest
 3 [AVR:206] Wolfir Silverheart
@ -17,7 +17,7 @@ NAME:[T2] puddingtime
 3 [M13:193] Thragtusk
 3 [AVR:36] Silverblade Paladin
 1 [RAV:303] Forest
-1 [ZEN:252] Plains
+1 [ZEN:230a] Plains
 1 [9ED:349] Forest
 1 [M11:248] Forest
 1 [WWK:95] Arbor Elf
--- a/Mage.Client/release/sample-decks/2012/T2/[T2]
+++ b/Mage.Client/release/sample-decks/2012/T2/[T2]
@ -3,7 +3,7 @@ NAME:[T2] sknbny
 3 [ISD:249] Woodland Cemetery
 1 [ULG:110] Rancor
 2 [ISD:239] Gavony Township
-1 [5ED:436] Plains
+1 [5ED:430] Plains
 1 [M11:228] Sunpetal Grove
 1 [RTR:1] Angel of Serenity
 4 [RTR:178] Loxodon Smiter
@ -17,7 +17,7 @@ NAME:[T2] sknbny
 3 [M13:193] Thragtusk
 2 [RTR:208] Vraska the Unseen
 1 [RTR:141] Abrupt Decay
-1 [ZEN:266] Forest
+1 [ZEN:246a] Forest
 3 [AVR:36] Silverblade Paladin
 2 [RAV:284] Temple Garden
 3 [RTR:194] Selesnya Charm
--- a/Mage.Client/release/sample-decks/2013/Legacy/Tim
+++ b/Mage.Client/release/sample-decks/2013/Legacy/Tim
@ -1,7 +1,7 @@
 NAME:Tim Wilson's Nic Fit
 1 [MBS:92] Thrun, the Last Troll
 4 [CMD:131] Punishing Fire
-1 [3ED:302] Taiga
+1 [3ED:287] Taiga
 4 [ZEN:229] Verdant Catacombs
 2 [RTR:265] Mountain
 1 [M12:188] Primeval Titan
@ -29,7 +29,7 @@ NAME:Tim Wilson's Nic Fit
 4 [MBS:81] Green Sun's Zenith
 SB: 2 [LRW:145] Thoughtseize
 SB: 3 [USG:240] Carpet of Flowers
-SB: 3 [4ED:236] Red Elemental Blast
+SB: 3 [4ED:218] Red Elemental Blast
 SB: 2 [ZEN:57] Mindbreak Trap
 SB: 2 [RTR:197] Slaughter Games
 SB: 3 [NPH:74] Surgical Extraction
--- a/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Krond
+++ b/Mage.Client/release/sample-decks/2013/Modern/DailyMTG/Krond
@ -22,10 +22,10 @@ NAME:Krond — Clothes in a Bag
 2 [ARB:75] Qasali Pridemage
 1 [UDS:143] Yavimaya Hollow
 3 [PC2:99] Krond the Dawn-Clad
-1 [TMP:218] Auratog
+1 [TMP:6] Auratog
 3 [AVR:194] Somberwald Sage
 6 [AVR:230] Plains
 1 [INV:229] Armadillo Cloak
 1 [LRW:248] Gaddock Teeg
-1 [NMS:18] Seal of Cleansing
+1 [NEM:18] Seal of Cleansing
 1 [DIS:7] Celestial Ancient
--- a/Mage.Client/release/sample-decks/2013/Modern/GP
+++ b/Mage.Client/release/sample-decks/2013/Modern/GP
@ -20,7 +20,7 @@ NAME:Jonathan Riddell's Melira Pod
 1 [GPT:124] Orzhov Pontiff
 1 [ARB:75] Qasali Pridemage
 3 [RAV:156] Chord of Calling
-1 [MIR:151] Wall of Roots
+1 [MIR:253] Wall of Roots
 1 [ZEN:219] Marsh Flats
 1 [NPH:159] Spellskite
 1 [CMD:152] Eternal Witness
--- a/Mage.Client/release/sample-decks/2013/Modern/GP
+++ b/Mage.Client/release/sample-decks/2013/Modern/GP
@ -13,7 +13,7 @@ NAME:Josh Inoa's UWR Splinter Twin
 2 [AVR:233] Island
 1 [NPH:159] Spellskite
 3 [RAV:63] Remand
-4 [4ED:226] Lightning Bolt
+4 [4ED:208] Lightning Bolt
 2 [CHK:175] Kiki-Jiki, Mirror Breaker
 1 [AVR:230] Plains
 2 [DIS:174] Hallowed Fountain
--- a/Mage.Client/release/sample-decks/2013/Modern/GP
+++ b/Mage.Client/release/sample-decks/2013/Modern/GP
@ -24,7 +24,7 @@ NAME:Louis Kaplan's Kiki-Jiki Pod
 1 [GTC:247] Stomping Ground
 1 [GTC:245] Sacred Foundry
 3 [RAV:156] Chord of Calling
-4 [MIR:151] Wall of Roots
+4 [MIR:253] Wall of Roots
 1 [NPH:159] Spellskite
 1 [CMD:152] Eternal Witness
 2 [SHM:271] Fire-Lit Thicket
--- a/Mage.Client/release/sample-decks/2013/Modern/GP
+++ b/Mage.Client/release/sample-decks/2013/Modern/GP
@ -11,7 +11,7 @@ NAME:Noah Whinston's Splinter Twin
 3 [NPH:159] Spellskite
 4 [5DN:36] Serum Visions
 4 [RAV:63] Remand
-3 [4ED:226] Lightning Bolt
+3 [4ED:208] Lightning Bolt
 2 [CHK:175] Kiki-Jiki, Mirror Breaker
 3 [GPT:164] Steam Vents
 4 [ZEN:223] Scalding Tarn
--- a/Mage.Client/release/sample-decks/2013/Modern/GP
+++ b/Mage.Client/release/sample-decks/2013/Modern/GP
@ -13,19 +13,19 @@ NAME:Steven Locke's Domain Zoo
 1 [ZEN:219] Marsh Flats
 1 [RAV:284] Temple Garden
 4 [FUT:153] Tarmogoyf
-4 [4ED:226] Lightning Bolt
+4 [4ED:208] Lightning Bolt
 4 [GTC:119] Experiment One
 1 [AVR:230] Plains
 1 [DIS:174] Hallowed Fountain
 1 [GPT:164] Steam Vents
 2 [ZEN:223] Scalding Tarn
-4 [ARN:49] Kird Ape
+4 [ARN:40] Kird Ape
 2 [CMD:25] Path to Exile
 4 [WWK:13] Loam Lion
 2 [ZEN:229] Verdant Catacombs
 SB: 4 [LRW:145] Thoughtseize
 SB: 1 [GTC:167] Ghor-Clan Rampager
-SB: 1 [ATQ:93] Shatterstorm
+SB: 1 [ATQ:28] Shatterstorm
 SB: 2 [ISD:36] Stony Silence
 SB: 2 [MMA:190] Kitchen Finks
 SB: 1 [DDF:1] Elspeth, Knight-Errant
--- a/Mage.Client/release/sample-decks/2013/Modern/Gamma_Frog's
+++ b/Mage.Client/release/sample-decks/2013/Modern/Gamma_Frog's
@ -7,15 +7,15 @@ NAME:Gamma_Frog's Raka Tempo
 1 [DIS:174] Hallowed Fountain
 3 [ISD:213] Geist of Saint Traft
 4 [ISD:78] Snapcaster Mage
-1 [4ED:226] Lightning Bolt
-1 [MPR:40] Lightning Bolt
+1 [4ED:208] Lightning Bolt
+1 [M11:149] Lightning Bolt
 1 [RTR:172] Izzet Charm
 1 [RTR:247] Steam Vents
 1 [GPT:164] Steam Vents
-2 [3ED:161] Lightning Bolt
-1 [MPR:8] Mana Leak
+2 [3ED:162] Lightning Bolt
+1 [M12:63] Mana Leak
 1 [STH:36] Mana Leak
-2 [MPR:16] Lightning Helix
+2 [RAV:213] Lightning Helix
 2 [M11:62] Mana Leak
 4 [ZEN:223] Scalding Tarn
 1 [ZEN:242] Mountain
@ -39,4 +39,4 @@ SB: 3 [MRD:101] Molten Rain
 SB: 1 [M12:40] Timely Reinforcements
 SB: 1 [M12:11] Celestial Purge
 SB: 1 [M10:7] Celestial Purge
-SB: 1 [ATQ:93] Shatterstorm
+SB: 1 [ATQ:28] Shatterstorm
--- a/Mage.Client/release/sample-decks/2013/Modern/New
+++ b/Mage.Client/release/sample-decks/2013/Modern/New
@ -9,7 +9,7 @@ NAME:Brandon Remley 3rd Place
 1 [SHM:192] Murderous Redcap
 4 [CON:87] Noble Hierarch
 3 [AVR:32] Restoration Angel
-1 [5ED:142] Birds of Paradise
+1 [5ED:280] Birds of Paradise
 1 [RTR:247] Steam Vents
 1 [M12:72] Phantasmal Image
 1 [MMQ:348] Forest
@ -24,9 +24,9 @@ NAME:Brandon Remley 3rd Place
 1 [GTC:247] Stomping Ground
 2 [CHK:175] Kiki-Jiki, Mirror Breaker
 1 [10E:252] Birds of Paradise
-1 [2ED:95] Birds of Paradise
+1 [2ED:187] Birds of Paradise
 1 [TSP:240] Harmonic Sliver
-1 [MIR:151] Wall of Roots
+1 [MIR:253] Wall of Roots
 1 [SOM:230] Plains
 1 [DIS:172] Breeding Pool
 3 [TSB:89] Wall of Roots
@ -48,4 +48,4 @@ SB: 1 [M12:128] Combust
 SB: 1 [M10:65] Negate
 SB: 1 [AVR:210] Sigarda, Host of Herons
 SB: 1 [ISD:127] Ancient Grudge
-SB: 1 [ATQ:93] Shatterstorm
+SB: 1 [ATQ:28] Shatterstorm
--- a/Mage.Client/release/sample-decks/2013/Modern/New
+++ b/Mage.Client/release/sample-decks/2013/Modern/New
@ -6,13 +6,13 @@ NAME:David Daniel (1st place)
 1 [DIS:174] Hallowed Fountain
 1 [NPH:33] Deceiver Exarch
 3 [RAV:156] Chord of Calling
-2 [4ED:118] Birds of Paradise
+2 [4ED:234] Birds of Paradise
 2 [SHM:271] Fire-Lit Thicket
 1 [SHM:192] Murderous Redcap
 4 [CON:87] Noble Hierarch
 3 [AVR:32] Restoration Angel
 1 [RTR:247] Steam Vents
-1 [3ED:94] Birds of Paradise
+1 [3ED:187] Birds of Paradise
 1 [M12:72] Phantasmal Image
 1 [ARB:75] Qasali Pridemage
 4 [NPH:104] Birthing Pod
@ -25,13 +25,13 @@ NAME:David Daniel (1st place)
 1 [RAV:280] Sacred Foundry
 1 [GTC:247] Stomping Ground
 3 [CHK:175] Kiki-Jiki, Mirror Breaker
-1 [2ED:95] Birds of Paradise
+1 [2ED:187] Birds of Paradise
 1 [TSP:240] Harmonic Sliver
-2 [MIR:151] Wall of Roots
+2 [MIR:253] Wall of Roots
 2 [TSB:89] Wall of Roots
 1 [RTR:248] Temple Garden
 1 [INV:334] Plains
-1 [4ED:183] Mountain
+1 [4ED:373] Mountain
 3 [ZEN:220] Misty Rainforest
 3 [ZEN:211] Arid Mesa
 1 [AVR:166] Zealous Conscripts
--- a/Mage.Client/release/sample-decks/2013/Modern/New
+++ b/Mage.Client/release/sample-decks/2013/Modern/New
@ -1,6 +1,6 @@
 NAME:Donald Richter 2nd Place
 3 [TSP:204] Might of Old Krosa
-1 [LEG:250] Pendelhaven
+1 [LEG:305] Pendelhaven
 3 [ULG:110] Rancor
 4 [WWK:104] Groundswell
 2 [RTR:141] Abrupt Decay
@ -14,7 +14,7 @@ NAME:Donald Richter 2nd Place
 4 [NPH:29] Blighted Agent
 1 [7ED:335] Island
 4 [SOM:75] Plague Stinger
-1 [ZEN:268] Forest
+1 [ZEN:246a] Forest
 4 [ZEN:220] Misty Rainforest
 1 [SOM:241] Swamp
 4 [ZEN:193] Vines of Vastwood
--- a/Mage.Client/release/sample-decks/2013/Modern/New
+++ b/Mage.Client/release/sample-decks/2013/Modern/New
@ -6,7 +6,7 @@ NAME:Joseph Cardoza 4th Place
 1 [4ED:82] Lord of Atlantis
 4 [LRW:74] Merrow Reejerey
 1 [7ED:333] Island
-1 [ICE:336] Island
+1 [ICE:368] Island
 2 [2ED:63] Lord of Atlantis
 2 [M10:62] Merfolk Sovereign
 4 [M12:72] Phantasmal Image
@ -17,7 +17,7 @@ NAME:Joseph Cardoza 4th Place
 4 [EVE:31] Wake Thrasher
 1 [6ED:79] Lord of Atlantis
 1 [MRD:291] Island
-1 [ZEN:256] Island
+1 [ZEN:234a] Island
 1 [9ED:335] Island
 4 [M13:59] Master of the Pearl Trident
 1 [MMQ:336] Island
--- a/Mage.Client/release/sample-decks/2013/Modern/Zoizaite's
+++ b/Mage.Client/release/sample-decks/2013/Modern/Zoizaite's
@ -20,7 +20,7 @@ NAME:Zoizaite's Splinter Twin
 2 [CHK:175] Kiki-Jiki, Mirror Breaker
 1 [M13:234] Island
 3 [LRW:78] Pestermite
-1 [4ED:178] Island
+1 [4ED:367] Island
 3 [RAV:63] Remand
 4 [ZEN:220] Misty Rainforest
 1 [ZEN:211] Arid Mesa
--- a/Mage.Client/release/sample-decks/2013/Modern/_Blaze777_'s
+++ b/Mage.Client/release/sample-decks/2013/Modern/_Blaze777_'s
@ -18,7 +18,7 @@ NAME:_Blaze777_'s RG Tron
 2 [SOM:176] Mindslaver
 4 [NPH:1] Karn Liberated
 1 [10E:380] Forest
-1 [ATQ:75] Urza's Mine
+1 [ATQ:83a] Urza's Mine
 4 [FUT:176] Grove of the Burnwillows
 4 [ROE:174] Ancient Stirrings
 3 [MRD:222] Oblivion Stone
--- a/Mage.Client/release/sample-decks/2013/Modern/____czery's
+++ b/Mage.Client/release/sample-decks/2013/Modern/____czery's
@ -6,17 +6,17 @@ NAME:____czery's Kiki-Jiki Pod
 1 [DIS:174] Hallowed Fountain
 3 [ISD:213] Geist of Saint Traft
 4 [ISD:78] Snapcaster Mage
-1 [4ED:226] Lightning Bolt
+1 [4ED:208] Lightning Bolt
 1 [M11:149] Lightning Bolt
 1 [RTR:172] Izzet Charm
 1 [RTR:247] Steam Vents
 1 [GPT:164] Steam Vents
 1 [M12:145] Grim Lavamancer
-1 [3ED:161] Lightning Bolt
-1 [LEB:163] Lightning Bolt
-1 [MPR:8] Mana Leak
+1 [3ED:162] Lightning Bolt
+1 [LEB:162] Lightning Bolt
+1 [M12:63] Mana Leak
 1 [STH:36] Mana Leak
-2 [MPR:16] Lightning Helix
+2 [RAV:213] Lightning Helix
 1 [M11:62] Mana Leak
 4 [ZEN:223] Scalding Tarn
 1 [M12:63] Mana Leak
@ -36,7 +36,7 @@ SB: 1 [MOR:55] Vendilion Clique
 SB: 2 [NPH:159] Spellskite
 SB: 2 [ISD:36] Stony Silence
 SB: 2 [ALA:218] Relic of Progenitus
-SB: 1 [MPR:45] Celestial Purge
+SB: 1 [M12:11] Celestial Purge
 SB: 1 [HOP:124] Relic of Progenitus
 SB: 3 [MRD:101] Molten Rain
 SB: 1 [M12:40] Timely Reinforcements
--- a/Mage.Client/release/sample-decks/2013/Modern/max115's
+++ b/Mage.Client/release/sample-decks/2013/Modern/max115's
@ -1,7 +1,7 @@
 NAME:max115's Spirit Jund
 3 [ISD:105] Liliana of the Veil
-2 [4ED:226] Lightning Bolt
-1 [MPR:40] Lightning Bolt
+2 [4ED:208] Lightning Bolt
+1 [M11:149] Lightning Bolt
 1 [ISD:215] Olivia Voldaren
 4 [ZEN:229] Verdant Catacombs
 1 [ARB:92] Maelstrom Pulse
@ -12,8 +12,8 @@ NAME:max115's Spirit Jund
 1 [9ED:341] Swamp
 2 [PLS:128] Terminate
 1 [SHM:229] Kitchen Finks
-1 [MPR:39] Terminate
-1 [ZEN:266] Forest
+1 [ARB:46] Terminate
+1 [ZEN:246a] Forest
 3 [ROE:115] Inquisition of Kozilek
 4 [RTR:213] Deathrite Shaman
 4 [FUT:153] Tarmogoyf
@ -23,7 +23,7 @@ NAME:max115's Spirit Jund
 2 [ULG:143] Treetop Village
 4 [ZEN:219] Marsh Flats
 1 [GTC:247] Stomping Ground
-1 [LEA:162] Lightning Bolt
+1 [LEA:161] Lightning Bolt
 2 [LRW:145] Thoughtseize
 4 [RAV:81] Dark Confidant
 1 [RTR:243] Overgrown Tomb
@ -37,5 +37,5 @@ SB: 2 [RTR:141] Abrupt Decay
 SB: 1 [ISD:105] Liliana of the Veil
 SB: 2 [RTR:197] Slaughter Games
 SB: 1 [SHM:229] Kitchen Finks
-SB: 1 [ATQ:93] Shatterstorm
+SB: 1 [ATQ:28] Shatterstorm
 SB: 1 [ISD:127] Ancient Grudge
--- a/Mage.Client/release/sample-decks/2013/Modern/optimus's
+++ b/Mage.Client/release/sample-decks/2013/Modern/optimus's
@ -8,10 +8,10 @@ NAME:optimus's Tribal Zoo
 4 [ISD:213] Geist of Saint Traft
 3 [ISD:78] Snapcaster Mage
 3 [INV:176] Tribal Flames
-1 [MPR:40] Lightning Bolt
+1 [M11:149] Lightning Bolt
 1 [RTR:247] Steam Vents
-1 [LEB:163] Lightning Bolt
-1 [MPR:16] Lightning Helix
+1 [LEB:162] Lightning Bolt
+1 [RAV:213] Lightning Helix
 4 [ZEN:223] Scalding Tarn
 1 [GTC:240] Breeding Pool
 4 [RTR:213] Deathrite Shaman
@ -23,7 +23,7 @@ NAME:optimus's Tribal Zoo
 4 [ZEN:36] Steppe Lynx
 2 [GTC:148] Boros Charm
 4 [ZEN:220] Misty Rainforest
-1 [MIR:295] Forest
+1 [MIR:347] Forest
 4 [ZEN:211] Arid Mesa
 1 [RTR:238] Blood Crypt
 1 [RTR:252] Plains
--- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
@ -9,7 +9,7 @@ NAME:Darryl Hoard's Bottoms Up
 4 [M14:246] Forest
 4 [M13:2] Ajani's Sunstriker
 2 [M14:1] Ajani, Caller of the Pride
-4 [DKA:146] Chalice of Death
+4 [DKA:146] Chalice of Life
 4 [M14:209] Elixir of Immortality
 4 [M13:229] Sunpetal Grove
 3 [M14:26] Path of Bravery
--- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Douglas Scheinberg's Séance Combo
 1 [AVR:42] Alchemist's Apprentice
 4 [RTR:1] Angel of Serenity
 1 [ISD:68] Mirror-Mad Phantasm
--- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG
@ -13,7 +13,7 @@ NAME:Disciple of Innistrad's Angelic Post
 1 [AVR:94] Demonic Rising
 3 [AVR:220] Scroll of Avacyn
 2 [M14:215] Ratchet Bomb
-1 [DKA:146] Chalice of Death
+1 [DKA:146] Chalice of Life
 2 [AVR:230] Plains
 1 [DKA:158] Vault of the Archangel
 4 [AVR:38] Terminus
--- a/Mage.Client/release/sample-decks/2013/Standard/GP
+++ b/Mage.Client/release/sample-decks/2013/Standard/GP
@ -1,4 +1,3 @@
-NAME:Emmanuel Ramírez's Reanimator
 4 [ISD:170] Avacyn's Pilgrim
 2 [ISD:249] Woodland Cemetery
 3 [M13:159] Acidic Slime
--- a/Mage.Client/release/sample-decks/2013/Standard/GP
+++ b/Mage.Client/release/sample-decks/2013/Standard/GP
@ -1,4 +1,3 @@
-NAME:Frédéric Mercier's Esper Control
 2 [M13:26] Planar Cleansing
 1 [RTR:250] Plains
 4 [M13:225] Glacial Fortress
--- a/Mage.Client/release/sample-decks/2013/Standard/GP
+++ b/Mage.Client/release/sample-decks/2013/Standard/GP
@ -1,4 +1,3 @@
-NAME:Jérémy Dezani's Jund Midrange
 4 [M13:170] Farseek
 3 [AVR:129] Bonfire of the Damned
 1 [DKA:76] Tragic Slip
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -21,8 +21,8 @@ NAME:Anthony Loman's Reanimator
 1 [CNS:102] Misdirection
 1 [KTK:258] Swamp
 4 [VMA:136] Reanimate
-4 [TMP:284] Lotus Petal
-SB: 1 [NMS:58] Massacre
+4 [TMP:294] Lotus Petal
+SB: 1 [NEM:58] Massacre
 SB: 1 [RTR:231] Pithing Needle
 SB: 3 [M14:97] Duress
 SB: 1 [EXO:143] City of Traitors
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Derek Reda's Esper Deathblade
-2 [TMP:340] Wasteland
+2 [TMP:330] Wasteland
 3 [C13:63] True-Name Nemesis
 4 [KTK:239] Polluted Delta
 1 [NPH:130] Batterskull
@ -12,7 +12,7 @@ NAME:Derek Reda's Esper Deathblade
 4 [VMA:69] Force of Will
 3 [ZEN:219] Marsh Flats
 1 [VMA:321] Tropical Island
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 3 [VMA:322] Tundra
 3 [VMA:323] Underground Sea
 4 [RTR:213] Deathrite Shaman
@ -23,12 +23,12 @@ NAME:Derek Reda's Esper Deathblade
 3 [M12:73] Ponder
 1 [ISD:105] Liliana of the Veil
 SB: 1 [ZEN:67] Spell Pierce
-SB: 1 [TMP:340] Wasteland
+SB: 1 [TMP:330] Wasteland
 SB: 2 [VMA:68] Flusterstorm
 SB: 1 [NPH:74] Surgical Extraction
 SB: 1 [RTR:231] Pithing Needle
 SB: 1 [VMA:321] Tropical Island
-SB: 1 [LEG:248] Karakas
+SB: 1 [LEG:303] Karakas
 SB: 1 [MMA:204] Engineered Explosives
 SB: 1 [ZEN:87] Disfigure
 SB: 1 [VMA:313] Scrubland
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Eric De Luca's Sultai Delver
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 2 [C13:63] True-Name Nemesis
 1 [MMA:180] Maelstrom Pulse
 4 [ZEN:220] Misty Rainforest
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,10 +1,10 @@
 NAME:Eric Markowicz's Jeskai Delver
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 3 [C13:63] True-Name Nemesis
 4 [M11:149] Lightning Bolt
 4 [ZEN:220] Misty Rainforest
 1 [NPH:130] Batterskull
-2 [4ED:236] Red Elemental Blast
+2 [4ED:218] Red Elemental Blast
 1 [BOK:163] Umezawa's Jitte
 2 [RTR:241] Hallowed Fountain
 2 [KTK:59] Treasure Cruise
@ -23,7 +23,7 @@ NAME:Eric Markowicz's Jeskai Delver
 3 [M12:73] Ponder
 1 [MMA:64] Spell Snare
 SB: 1 [MBS:138] Sword of Feast and Famine
-SB: 2 [NMS:48] Submerge
+SB: 2 [NEM:48] Submerge
 SB: 2 [ARB:8] Meddling Mage
 SB: 2 [DGM:135] Wear // Tear
 SB: 3 [ROE:146] Forked Bolt
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -4,7 +4,7 @@ NAME:JD Nir's Ad Nauseam
 4 [KTK:239] Polluted Delta
 1 [CNS:114] Ill-Gotten Gains
 1 [KTK:258] Swamp
-4 [TMP:284] Lotus Petal
+4 [TMP:294] Lotus Petal
 4 [JUD:62] Cabal Therapy
 4 [DIS:46] Infernal Tutor
 1 [KTK:254] Island
@ -24,7 +24,7 @@ NAME:JD Nir's Ad Nauseam
 4 [M12:73] Ponder
 SB: 2 [CHK:268] Sensei's Divining Top
 SB: 2 [VMA:68] Flusterstorm
-SB: 1 [NMS:58] Massacre
+SB: 1 [NEM:58] Massacre
 SB: 4 [RTR:141] Abrupt Decay
 SB: 3 [ONS:73] Chain of Vapor
 SB: 3 [SCG:135] Xantid Swarm
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,12 +1,12 @@
 NAME:John Gatza's Lands
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 4 [CNS:164] Exploration
 4 [MMQ:324] Rishadan Port
-1 [ICE:331] Glacial Chasm
+1 [ICE:353] Glacial Chasm
 3 [CMD:131] Punishing Fire
 4 [GTC:248] Thespian's Stage
 2 [KTK:248] Windswept Heath
-4 [STH:132] Mox Diamond
+4 [STH:138] Mox Diamond
 1 [KTK:249] Wooded Foothills
 1 [FUT:177] Horizon Canopy
 4 [FUT:176] Grove of the Burnwillows
@ -15,12 +15,12 @@ NAME:John Gatza's Lands
 4 [MMA:153] Life from the Loam
 1 [C13:278] Bojuka Bog
 2 [VMA:317] Taiga
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 1 [ISD:240] Ghost Quarter
-3 [DRK:114] Maze of Ith
+3 [DRK:117] Maze of Ith
 2 [CSP:145] Dark Depths
 2 [VMA:320] Tranquil Thicket
-1 [LEG:252] The Tabernacle at Pendrell Vale
+1 [LEG:307] The Tabernacle at Pendrell Vale
 4 [ULG:98] Crop Rotation
 4 [VMA:162] Gamble
 SB: 1 [LRW:262] Thorn of Amethyst
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:John Grudzina's Jeskai Delver
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 2 [C13:63] True-Name Nemesis
 4 [M11:149] Lightning Bolt
 4 [KTK:239] Polluted Delta
@ -25,6 +25,6 @@ SB: 1 [MMA:14] Ethersworn Canonist
 SB: 1 [MBS:138] Sword of Feast and Famine
 SB: 1 [VMA:74] Jace, the Mind Sculptor
 SB: 3 [ARB:8] Meddling Mage
-SB: 3 [4ED:236] Red Elemental Blast
+SB: 3 [4ED:218] Red Elemental Blast
 SB: 1 [DGM:135] Wear // Tear
 SB: 2 [RTR:18] Rest in Peace
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -5,7 +5,7 @@ NAME:Jon Goss's Esper Deathblade
 2 [ZEN:67] Spell Pierce
 4 [VMA:58] Brainstorm
 1 [VMA:321] Tropical Island
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 2 [VMA:322] Tundra
 1 [ZEN:87] Disfigure
 3 [VMA:323] Underground Sea
@ -14,7 +14,7 @@ NAME:Jon Goss's Esper Deathblade
 4 [WWK:20] Stoneforge Mystic
 3 [M12:73] Ponder
 1 [ISD:105] Liliana of the Veil
-2 [TMP:340] Wasteland
+2 [TMP:330] Wasteland
 3 [C13:63] True-Name Nemesis
 4 [KTK:239] Polluted Delta
 1 [NPH:130] Batterskull
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,6 +1,6 @@
 NAME:Louis Fata's Death and Taxes
 4 [C13:13] Flickerwisp
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 4 [MMQ:324] Rishadan Port
 2 [BNG:5] Brimaz, King of Oreskos
 2 [BNG:27] Spirit of the Labyrinth
@ -11,7 +11,7 @@ NAME:Louis Fata's Death and Taxes
 4 [MMA:197] Aether Vial
 3 [M15:225] Phyrexian Revoker
 10 [KTK:250] Plains
-3 [LEG:248] Karakas
+3 [LEG:303] Karakas
 1 [MMA:216] Sword of Fire and Ice
 4 [VMA:51] Swords to Plowshares
 4 [WWK:20] Stoneforge Mystic
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Marc Bertolin's Temur Delver
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 4 [M11:149] Lightning Bolt
 2 [KTK:249] Wooded Foothills
 2 [ROE:146] Forked Bolt
@ -22,6 +22,6 @@ SB: 3 [VMA:68] Flusterstorm
 SB: 3 [NPH:74] Surgical Extraction
 SB: 3 [C13:153] Krosan Grip
 SB: 1 [5ED:262] Pyroblast
-SB: 2 [4ED:236] Red Elemental Blast
+SB: 2 [4ED:218] Red Elemental Blast
 SB: 1 [MMA:70] Vendilion Clique
 SB: 2 [BOK:163] Umezawa's Jitte
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Michael Monks's Pox
-3 [TMP:340] Wasteland
+3 [TMP:330] Wasteland
 3 [CMD:131] Punishing Fire
 3 [M11:149] Lightning Bolt
 1 [MMA:180] Maelstrom Pulse
@ -25,7 +25,7 @@ NAME:Michael Monks's Pox
 SB: 1 [RTR:231] Pithing Needle
 SB: 2 [NPH:74] Surgical Extraction
 SB: 2 [DKA:149] Grafdigger's Cage
-SB: 1 [LEG:5] Chains of Mephistopheles
+SB: 1 [LEG:91] Chains of Mephistopheles
 SB: 2 [5ED:262] Pyroblast
 SB: 2 [M14:97] Duress
 SB: 1 [BOK:163] Umezawa's Jitte
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -17,13 +17,13 @@ NAME:Mike Midiri's Elves
 4 [USG:321] Gaea's Cradle
 1 [SOM:119] Ezuri, Renegade Leader
 4 [EVE:71] Nettle Sentinel
-3 [POR:101] Natural Order
+3 [POR:175] Natural Order
 2 [VMA:293] Bayou
-4 [VIS:67] Quirion Ranger
+4 [VIS:117] Quirion Ranger
 SB: 1 [RTR:231] Pithing Needle
 SB: 1 [VMA:278] Null Rod
 SB: 1 [MMA:182] Progenitus
-SB: 1 [POR:101] Natural Order
+SB: 1 [POR:175] Natural Order
 SB: 3 [RTR:141] Abrupt Decay
 SB: 3 [THS:107] Thoughtseize
 SB: 1 [M14:195] Scavenging Ooze
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -11,12 +11,12 @@ NAME:Nate Sturm's Punishing Maverick
 1 [KTK:266] Forest
 1 [FUT:174] Dryad Arbor
 4 [MMA:178] Knight of the Reliquary
-1 [LEG:248] Karakas
-1 [DRK:114] Maze of Ith
+1 [LEG:303] Karakas
+1 [DRK:117] Maze of Ith
 1 [LRW:248] Gaddock Teeg
 4 [VMA:51] Swords to Plowshares
 3 [WWK:20] Stoneforge Mystic
-3 [TMP:340] Wasteland
+3 [TMP:330] Wasteland
 1 [NPH:130] Batterskull
 1 [M14:195] Scavenging Ooze
 1 [M12:165] Birds of Paradise
@ -34,8 +34,8 @@ SB: 1 [MMA:216] Sword of Fire and Ice
 SB: 1 [VMA:235] Sylvan Library
 SB: 1 [VMA:20] Council's Judgment
 SB: 1 [LRW:248] Gaddock Teeg
-SB: 2 [4ED:236] Red Elemental Blast
+SB: 2 [4ED:218] Red Elemental Blast
 SB: 1 [MBS:92] Thrun, the Last Troll
-SB: 1 [LEG:252] The Tabernacle at Pendrell Vale
+SB: 1 [LEG:307] The Tabernacle at Pendrell Vale
 SB: 1 [M14:195] Scavenging Ooze
 SB: 1 [MMA:153] Life from the Loam
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -2,7 +2,7 @@ NAME:Nicholas DiJohn's Miracles
 4 [CHK:268] Sensei's Divining Top
 2 [AVR:20] Entreat the Angels
 4 [CSP:31] Counterbalance
-1 [4ED:236] Red Elemental Blast
+1 [4ED:218] Red Elemental Blast
 2 [ZEN:211] Arid Mesa
 4 [KTK:233] Flooded Strand
 1 [ZEN:67] Spell Pierce
@ -13,7 +13,7 @@ NAME:Nicholas DiJohn's Miracles
 4 [ZEN:223] Scalding Tarn
 3 [VMA:322] Tundra
 2 [KTK:250] Plains
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 2 [VMA:64] Counterspell
 1 [VMA:20] Council's Judgment
 1 [VMA:324] Volcanic Island
@ -25,7 +25,7 @@ NAME:Nicholas DiJohn's Miracles
 SB: 1 [6ED:19] Enlightened Tutor
 SB: 1 [FUT:46] Venser, Shaper Savant
 SB: 2 [5ED:262] Pyroblast
-SB: 1 [4ED:236] Red Elemental Blast
+SB: 1 [4ED:218] Red Elemental Blast
 SB: 1 [RTR:201] Supreme Verdict
 SB: 2 [VMA:68] Flusterstorm
 SB: 1 [RTR:231] Pithing Needle
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -2,7 +2,7 @@ NAME:Pat Fehling's Deathblade
 1 [BOK:163] Umezawa's Jitte
 4 [VMA:58] Brainstorm
 3 [VMA:322] Tundra
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 4 [VMA:323] Underground Sea
 2 [NPH:35] Gitaxian Probe
 4 [VMA:51] Swords to Plowshares
@ -11,7 +11,7 @@ NAME:Pat Fehling's Deathblade
 2 [MMA:70] Vendilion Clique
 4 [M12:73] Ponder
 1 [ISD:105] Liliana of the Veil
-3 [TMP:340] Wasteland
+3 [TMP:330] Wasteland
 2 [C13:63] True-Name Nemesis
 3 [KTK:239] Polluted Delta
 1 [NPH:130] Batterskull
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Ralph Betesh's Temur Delver
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 4 [M11:149] Lightning Bolt
 2 [KTK:239] Polluted Delta
 1 [KTK:249] Wooded Foothills
@ -23,8 +23,8 @@ SB: 1 [VMA:68] Flusterstorm
 SB: 2 [DKA:149] Grafdigger's Cage
 SB: 2 [5ED:262] Pyroblast
 SB: 1 [VMA:235] Sylvan Library
-SB: 2 [NMS:48] Submerge
-SB: 1 [4ED:236] Red Elemental Blast
+SB: 2 [NEM:48] Submerge
+SB: 1 [4ED:218] Red Elemental Blast
 SB: 1 [MMA:70] Vendilion Clique
 SB: 2 [C13:118] Rough // Tumble
 SB: 1 [ISD:127] Ancient Grudge
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -2,7 +2,7 @@ NAME:Reid Duke's Miracles
 4 [CHK:268] Sensei's Divining Top
 2 [AVR:20] Entreat the Angels
 3 [CSP:31] Counterbalance
-2 [4ED:236] Red Elemental Blast
+2 [4ED:218] Red Elemental Blast
 2 [ZEN:211] Arid Mesa
 2 [KTK:36] Dig Through Time
 4 [KTK:233] Flooded Strand
@ -14,7 +14,7 @@ NAME:Reid Duke's Miracles
 4 [ZEN:223] Scalding Tarn
 2 [KTK:250] Plains
 3 [VMA:322] Tundra
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 1 [VMA:324] Volcanic Island
 2 [VMA:64] Counterspell
 2 [VMA:20] Council's Judgment
@ -32,4 +32,4 @@ SB: 1 [M11:7] Baneslayer Angel
 SB: 2 [MMA:70] Vendilion Clique
 SB: 1 [RTR:18] Rest in Peace
 SB: 1 [4ED:63] Blue Elemental Blast
-SB: 1 [WTH:138] Peacekeeper
+SB: 1 [WTH:22] Peacekeeper
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -4,7 +4,7 @@ NAME:Rodrigo Togores's Ad Nauseam Tendrils
 4 [KTK:239] Polluted Delta
 4 [ZEN:220] Misty Rainforest
 1 [KTK:258] Swamp
-4 [TMP:284] Lotus Petal
+4 [TMP:294] Lotus Petal
 3 [JUD:62] Cabal Therapy
 4 [DIS:46] Infernal Tutor
 4 [VMA:106] Cabal Ritual
@ -23,7 +23,7 @@ NAME:Rodrigo Togores's Ad Nauseam Tendrils
 4 [M12:73] Ponder
 1 [VMA:293] Bayou
 SB: 2 [VMA:68] Flusterstorm
-SB: 2 [NMS:58] Massacre
+SB: 2 [NEM:58] Massacre
 SB: 1 [VMA:142] Tendrils of Agony
 SB: 2 [USG:240] Carpet of Flowers
 SB: 3 [RTR:141] Abrupt Decay
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -3,7 +3,7 @@ NAME:Stephen Harvey's Reanimator
 4 [KTK:239] Polluted Delta
 2 [THS:107] Thoughtseize
 1 [KTK:258] Swamp
-4 [TMP:284] Lotus Petal
+4 [TMP:294] Lotus Petal
 3 [DD2:23] Daze
 2 [KTK:233] Flooded Strand
 1 [DIS:34] Tidespout Tyrant
@ -26,7 +26,7 @@ SB: 2 [USG:96] Show and Tell
 SB: 2 [RTR:231] Pithing Needle
 SB: 1 [MMA:204] Engineered Explosives
 SB: 1 [THS:187] Ashen Rider
-SB: 2 [NMS:58] Massacre
+SB: 2 [NEM:58] Massacre
 SB: 1 [ODY:124] Coffin Purge
 SB: 1 [M12:98] Grave Titan
 SB: 1 [CON:30] Inkwell Leviathan
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -12,7 +12,7 @@ NAME:Wang Zixi's Deathblade
 4 [WWK:20] Stoneforge Mystic
 1 [MMA:70] Vendilion Clique
 2 [ISD:105] Liliana of the Veil
-2 [TMP:340] Wasteland
+2 [TMP:330] Wasteland
 3 [C13:63] True-Name Nemesis
 1 [WWK:134] Creeping Tar Pit
 4 [KTK:239] Polluted Delta
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -1,5 +1,5 @@
 NAME:Xin Sui's Shardless Sultai
-2 [TMP:340] Wasteland
+2 [TMP:330] Wasteland
 1 [C13:96] Toxic Deluge
 2 [WWK:134] Creeping Tar Pit
 4 [KTK:239] Polluted Delta
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -9,7 +9,7 @@ NAME:Zach Dobbin's Helmerator
 1 [M15:248] Urborg, Tomb of Yawgmoth
 4 [VMA:323] Underground Sea
 1 [MMA:219] Academy Ruins
-3 [ATQ:58] Transmute Artifact
+3 [ATQ:14] Transmute Artifact
 4 [VMA:243] Baleful Strix
 4 [MBS:97] Tezzeret, Agent of Bolas
 1 [CSP:153] Snow-Covered Swamp
@ -17,7 +17,7 @@ NAME:Zach Dobbin's Helmerator
 4 [KTK:239] Polluted Delta
 4 [CMD:246] Dimir Signet
 1 [FUT:165] Sword of the Meek
-1 [ALL:163] Helm of Obedience
+1 [ALL:121] Helm of Obedience
 4 [VMA:69] Force of Will
 2 [DDF:39] Tezzeret the Seeker
 4 [MMA:203] Chalice of the Void
--- a/Mage.Client/release/sample-decks/2014/Legacy/Championship
+++ b/Mage.Client/release/sample-decks/2014/Legacy/Championship
@ -3,13 +3,13 @@ NAME:Zack Mullin's Miracles
 1 [SHM:277] Mystic Gate
 2 [AVR:20] Entreat the Angels
 1 [ZEN:220] Misty Rainforest
-2 [4ED:236] Red Elemental Blast
+2 [4ED:218] Red Elemental Blast
 1 [ISD:78] Snapcaster Mage
 4 [VMA:58] Brainstorm
 1 [KTK:262] Mountain
 4 [ZEN:223] Scalding Tarn
 2 [VMA:322] Tundra
-2 [LEG:248] Karakas
+2 [LEG:303] Karakas
 1 [VMA:324] Volcanic Island
 3 [VMA:74] Jace, the Mind Sculptor
 3 [VMA:51] Swords to Plowshares
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -4,30 +4,30 @@ NAME:Javier Dominguez's BUG Delver
 4 [MMA:166] Tarmogoyf
 1 [ZEN:220] Misty Rainforest
 4 [ISD:51] Delver of Secrets
-3 [ALL:42] Force of Will
+3 [ALL:28] Force of Will
 3 [M12:73] Ponder
 2 [MMA:75] Dark Confidant
 4 [CMD:40] Brainstorm
-4 [TMP:340] Wasteland
-4 [NMS:30] Daze
+4 [TMP:330] Wasteland
+4 [NEM:30] Daze
 2 [THS:107] Thoughtseize
 4 [ONS:321] Polluted Delta
-3 [FEM:12] Hymn to Tourach
+3 [FEM:38a] Hymn to Tourach
 2 [3ED:283] Bayou
-4 [3ED:305] Underground Sea
+4 [3ED:290] Underground Sea
 4 [RTR:141] Abrupt Decay
-1 [3ED:303] Tropical Island
+1 [3ED:288] Tropical Island
 4 [ZEN:229] Verdant Catacombs
 SB: 1 [WTH:154] Null Rod
 SB: 1 [DKA:149] Grafdigger's Cage
 SB: 1 [7ED:133] Engineered Plague
 SB: 1 [NPH:57] Dismember
 SB: 1 [WWK:31] Jace, the Mind Sculptor
-SB: 1 [ALL:42] Force of Will
+SB: 1 [ALL:28] Force of Will
 SB: 2 [ZEN:87] Disfigure
 SB: 1 [ZEN:67] Spell Pierce
 SB: 2 [RTR:164] Golgari Charm
 SB: 1 [MMA:70] Vendilion Clique
-SB: 1 [5ED:191] Sylvan Library
-SB: 1 [FEM:12] Hymn to Tourach
-SB: 1 [TMP:22] Diabolic Edict
+SB: 1 [5ED:329] Sylvan Library
+SB: 1 [FEM:38a] Hymn to Tourach
+SB: 1 [TMP:128] Diabolic Edict
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -1,7 +1,7 @@
 NAME:Jean-Mary Accart's Imperial Painter
 1 [FUT:101] Magus of the Moon
 4 [5ED:262] Pyroblast
-4 [TMP:305] Ancient Tomb
+4 [TMP:315] Ancient Tomb
 3 [PLC:122] Simian Spirit Guide
 1 [HOP:133] Great Furnace
 3 [CHK:268] Sensei's Divining Top
@ -12,18 +12,18 @@ NAME:Jean-Mary Accart's Imperial Painter
 4 [MMA:106] Blood Moon
 2 [6ED:19] Enlightened Tutor
 3 [ULG:80] Goblin Welder
-2 [4ED:236] Red Elemental Blast
+2 [4ED:218] Red Elemental Blast
 4 [C13:349] Mountain
 2 [ONS:330] Wooded Foothills
 4 [SHM:257] Painter's Servant
-2 [3ED:296] Plateau
-4 [TMP:280] Grindstone
+2 [3ED:284] Plateau
+4 [TMP:290] Grindstone
 2 [8ED:300] Ensnaring Bridge
-2 [TMP:284] Lotus Petal
+2 [TMP:294] Lotus Petal
 1 [TSP:166] Jaya Ballard, Task Mage
 SB: 1 [LRW:262] Thorn of Amethyst
 SB: 4 [ODY:193] Firebolt
-SB: 1 [4ED:236] Red Elemental Blast
+SB: 1 [4ED:218] Red Elemental Blast
 SB: 1 [M14:215] Ratchet Bomb
 SB: 2 [M13:219] Tormod's Crypt
 SB: 1 [DST:154] Trinisphere
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -4,18 +4,18 @@ NAME:Jose Manuel Fernandez Castello's BUG Delver
 4 [ZEN:220] Misty Rainforest
 3 [C13:63] True-Name Nemesis
 4 [ISD:51] Delver of Secrets
-4 [ALL:42] Force of Will
+4 [ALL:28] Force of Will
 4 [M12:73] Ponder
 4 [CMD:40] Brainstorm
-4 [TMP:340] Wasteland
+4 [TMP:330] Wasteland
 1 [NPH:57] Dismember
-4 [NMS:30] Daze
+4 [NEM:30] Daze
 4 [ONS:321] Polluted Delta
-4 [FEM:12] Hymn to Tourach
+4 [FEM:38a] Hymn to Tourach
 1 [3ED:283] Bayou
-4 [3ED:305] Underground Sea
+4 [3ED:290] Underground Sea
 4 [RTR:141] Abrupt Decay
-2 [3ED:303] Tropical Island
+2 [3ED:288] Tropical Island
 1 [ZEN:229] Verdant Catacombs
 SB: 1 [C13:249] Nihil Spellbomb
 SB: 1 [7ED:133] Engineered Plague
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -6,21 +6,21 @@ NAME:Loic Le Briand's Reanimator
 1 [C13:345] Swamp
 1 [ONS:313] Bloodstained Mire
 4 [ODY:132] Entomb
-4 [ALL:42] Force of Will
+4 [ALL:28] Force of Will
 1 [THS:187] Ashen Rider
 2 [M12:73] Ponder
 1 [NPH:9] Elesh Norn, Grand Cenobite
 4 [ODY:70] Careful Study
 4 [CMD:40] Brainstorm
 4 [USG:134] Exhume
-3 [NMS:30] Daze
+3 [NEM:30] Daze
 4 [AVR:106] Griselbrand
 3 [THS:107] Thoughtseize
 2 [USG:96] Show and Tell
 4 [ONS:321] Polluted Delta
-4 [TMP:45] Reanimate
-4 [3ED:305] Underground Sea
-4 [TMP:284] Lotus Petal
+4 [TMP:151] Reanimate
+4 [3ED:290] Underground Sea
+4 [TMP:294] Lotus Petal
 1 [ZEN:229] Verdant Catacombs
 SB: 3 [RTR:231] Pithing Needle
 SB: 1 [ALA:166] Empyrial Archangel
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -6,28 +6,28 @@ NAME:Maxime Gilles' UWr Miracles
 3 [AVR:20] Entreat the Angels
 3 [WWK:31] Jace, the Mind Sculptor
 2 [ISD:78] Snapcaster Mage
-4 [ALL:42] Force of Will
+4 [ALL:28] Force of Will
 3 [ZEN:211] Arid Mesa
 1 [RTR:201] Supreme Verdict
 2 [M12:73] Ponder
 2 [MMA:70] Vendilion Clique
 4 [CMD:40] Brainstorm
-1 [LEG:248] Karakas
-1 [4ED:236] Red Elemental Blast
+1 [LEG:303] Karakas
+1 [4ED:218] Red Elemental Blast
 2 [7ED:67] Counterspell
 3 [CSP:31] Counterbalance
 3 [AVR:38] Terminus
 3 [ZEN:223] Scalding Tarn
 2 [C13:337] Plains
-2 [3ED:306] Volcanic Island
-3 [3ED:304] Tundra
+2 [3ED:291] Volcanic Island
+3 [3ED:289] Tundra
 3 [DDF:22] Swords to Plowshares
 SB: 1 [RTR:231] Pithing Needle
 SB: 2 [CMD:46] Flusterstorm
 SB: 2 [RTR:18] Rest in Peace
 SB: 1 [DGM:135] Wear // Tear
 SB: 1 [DKA:149] Grafdigger's Cage
-SB: 1 [4ED:236] Red Elemental Blast
+SB: 1 [4ED:218] Red Elemental Blast
 SB: 1 [MMA:204] Engineered Explosives
 SB: 1 [C13:349] Mountain
 SB: 1 [AVR:38] Terminus
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -5,13 +5,13 @@ NAME:Paulo Vitor Damo da Rosa's UWr Miracles
 2 [AVR:20] Entreat the Angels
 4 [WWK:31] Jace, the Mind Sculptor
 2 [ISD:78] Snapcaster Mage
-4 [ALL:42] Force of Will
+4 [ALL:28] Force of Will
 2 [ZEN:211] Arid Mesa
 2 [M12:73] Ponder
 1 [MMA:64] Spell Snare
 2 [MMA:70] Vendilion Clique
 4 [CMD:40] Brainstorm
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 2 [7ED:67] Counterspell
 2 [CSP:31] Counterbalance
 4 [AVR:38] Terminus
@ -19,8 +19,8 @@ NAME:Paulo Vitor Damo da Rosa's UWr Miracles
 1 [SHM:277] Mystic Gate
 1 [ZEN:67] Spell Pierce
 2 [C13:337] Plains
-2 [3ED:306] Volcanic Island
-2 [3ED:304] Tundra
+2 [3ED:291] Volcanic Island
+2 [3ED:289] Tundra
 4 [DDF:22] Swords to Plowshares
 SB: 1 [DGM:135] Wear // Tear
 SB: 3 [5ED:262] Pyroblast
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -1,29 +1,28 @@
-NAME:Philipp Schönegger's Miracles
 4 [C13:341] Island
 4 [CHK:268] Sensei's Divining Top
 4 [ONS:316] Flooded Strand
 2 [AVR:20] Entreat the Angels
 3 [WWK:31] Jace, the Mind Sculptor
 3 [ISD:78] Snapcaster Mage
-4 [ALL:42] Force of Will
+4 [ALL:28] Force of Will
 2 [ZEN:211] Arid Mesa
 2 [M12:73] Ponder
 1 [MMA:70] Vendilion Clique
 4 [CMD:40] Brainstorm
-1 [LEG:248] Karakas
+1 [LEG:303] Karakas
 2 [7ED:67] Counterspell
 3 [CSP:31] Counterbalance
 4 [AVR:38] Terminus
 4 [ZEN:223] Scalding Tarn
 2 [ZEN:67] Spell Pierce
 2 [C13:337] Plains
-2 [3ED:306] Volcanic Island
-3 [3ED:304] Tundra
+2 [3ED:291] Volcanic Island
+3 [3ED:289] Tundra
 4 [DDF:22] Swords to Plowshares
 SB: 1 [5ED:262] Pyroblast
 SB: 1 [AVR:20] Entreat the Angels
 SB: 3 [CMD:46] Flusterstorm
-SB: 2 [4ED:236] Red Elemental Blast
+SB: 2 [4ED:218] Red Elemental Blast
 SB: 1 [TSB:6] Disenchant
 SB: 2 [MMA:204] Engineered Explosives
 SB: 1 [7ED:67] Counterspell
--- a/Mage.Client/release/sample-decks/2014/Legacy/GP
+++ b/Mage.Client/release/sample-decks/2014/Legacy/GP
@ -1,4 +1,3 @@
-NAME:Stefan Böttcher's Deathblade
 1 [WWK:134] Creeping Tar Pit
 4 [RTR:213] Deathrite Shaman
 1 [AVR:20] Entreat the Angels
@ -13,18 +12,18 @@ NAME:Stefan B
 2 [THS:107] Thoughtseize
 1 [MMA:204] Engineered Explosives
 1 [BOK:163] Umezawa's Jitte
-1 [3ED:298] Scrubland
+1 [3ED:286] Scrubland
 1 [C13:337] Plains
-3 [3ED:305] Underground Sea
-3 [3ED:304] Tundra
+3 [3ED:290] Underground Sea
+3 [3ED:289] Tundra
 4 [DDF:22] Swords to Plowshares
-1 [3ED:303] Tropical Island
+1 [3ED:288] Tropical Island
 1 [C13:341] Island
 3 [ONS:316] Flooded Strand
 1 [C13:345] Swamp
 1 [ZEN:219] Marsh Flats
-2 [TMP:340] Wasteland
-1 [LEG:248] Karakas
+2 [TMP:330] Wasteland
+1 [LEG:303] Karakas
 1 [MMA:219] Academy Ruins
 1 [7ED:67] Counterspell
 3 [ONS:321] Polluted Delta
@ -32,11 +31,11 @@ NAME:Stefan B
 3 [WWK:20] Stoneforge Mystic
 SB: 1 [ISD:105] Liliana of the Veil
 SB: 1 [RTR:155] Detention Sphere
-SB: 3 [ALL:42] Force of Will
+SB: 3 [ALL:28] Force of Will
 SB: 1 [RTR:201] Supreme Verdict
 SB: 3 [M11:21] Leyline of Sanctity
 SB: 1 [MBS:138] Sword of Feast and Famine
 SB: 2 [NPH:74] Surgical Extraction
 SB: 1 [THS:65] Swan Song
 SB: 1 [MMA:213] Relic of Progenitus
-SB: 1 [NMS:111] Reverent Silence
+SB: 1 [NEM:111] Reverent Silence
--- a/Mage.Client/release/sample-decks/2014/Modern/GP
+++ b/Mage.Client/release/sample-decks/2014/Modern/GP
@ -1,4 +1,3 @@
-NAME:James Cady – UWR Splinter Twin
 2 [M12:145] Grim Lavamancer
 4 [WWK:133] Celestial Colonnade
 2 [C13:341] Island
--- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Ajani Nakano’s Infinite Ajani
 2 [RTR:243] Overgrown Tomb
 2 [RTR:120] Deadbridge Goliath
 2 [RTR:248] Temple Garden
--- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Colin Reilly’s Quadruple Strike
 4 [M14:10] Brave the Elements
 4 [C13:179] Boros Charm
 4 [GTC:245] Sacred Foundry
--- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Devon Straub’s The One-ders
 4 [RTR:214] Dryad Militant
 2 [RTR:82] Ultimate Price
 2 [THS:33] Spear of Heliod
--- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Gavin Verhey’s Nyxchantress
 4 [RTR:24] Sphere of Safety
 4 [RTR:248] Temple Garden
 4 [BNG:165] Temple of Plenty
--- a/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
+++ b/Mage.Client/release/sample-decks/2014/Standard/DailyMTG
@ -1,4 +1,3 @@
-NAME:Mahdi Fozi’s UR One-shot combo
 2 [THS:205] Steam Augury
 4 [JOU:164] Temple of Epiphany
 4 [RTR:247] Steam Vents
--- a/Mage.Client/release/sample-decks/2015/Legacy/Manaless
+++ b/Mage.Client/release/sample-decks/2015/Legacy/Manaless
@ -4,7 +4,7 @@
 4 [FUT:54] Narcomoeba
 4 [TSP:104] Dread Return
 4 [PLC:77] Phantasmagorian
-3 [ALL:4] Contagion
+3 [ALL:45] Contagion
 4 [FUT:174] Dryad Arbor
 4 [JUD:62] Cabal Therapy
 4 [TOR:65] Ichorid
@ -12,11 +12,11 @@
 4 [RAV:107] Stinkweed Imp
 2 [DKA:89] Flayer of the Hatebound
 4 [FUT:81] Bridge from Below
-4 [5ED:45] Nether Shadow
+4 [5ED:183] Nether Shadow
 4 [FUT:90] Street Wraith
 1 [BOK:82] Sickening Shoal
 SB: 3 [NPH:118] Noxious Revival
-SB: 4 [NMS:111] Reverent Silence
+SB: 4 [NEM:111] Reverent Silence
 SB: 2 [ZEN:229] Verdant Catacombs
 SB: 3 [WWK:108] Nature's Claim
 SB: 1 [DTK:262] Forest
--- a/Mage.Client/release/sample-decks/2015/Legacy/Manaless
+++ b/Mage.Client/release/sample-decks/2015/Legacy/Manaless
@ -13,10 +13,10 @@
 1 [DKA:89] Flayer of the Hatebound
 4 [FUT:81] Bridge from Below
 4 [FUT:90] Street Wraith
-3 [5ED:45] Nether Shadow
+3 [5ED:183] Nether Shadow
 4 [BOK:82] Sickening Shoal
 SB: 4 [ZEN:57] Mindbreak Trap
 SB: 1 [GPT:101] Angel of Despair
 SB: 4 [M11:21] Leyline of Sanctity
 SB: 4 [NPH:35] Gitaxian Probe
-SB: 2 [ALL:4] Contagion
+SB: 2 [ALL:45] Contagion
--- a/Mage.Client/release/sample-decks/2015/Legacy/Manaless
+++ b/Mage.Client/release/sample-decks/2015/Legacy/Manaless
@ -12,11 +12,11 @@
 4 [RAV:107] Stinkweed Imp
 1 [DKA:89] Flayer of the Hatebound
 4 [FUT:81] Bridge from Below
-4 [5ED:45] Nether Shadow
+4 [5ED:183] Nether Shadow
 4 [FUT:90] Street Wraith
 SB: 1 [NPH:6] Chancellor of the Annex
 SB: 1 [THS:187] Ashen Rider
 SB: 4 [M15:237] Tormod's Crypt
 SB: 4 [MMQ:168] Unmask
-SB: 1 [ALL:4] Contagion
+SB: 1 [ALL:45] Contagion
 SB: 4 [BOK:82] Sickening Shoal
--- a/Mage.Client/release/sample-decks/AI/FastRedHaste.dck
+++ b/Mage.Client/release/sample-decks/AI/FastRedHaste.dck
@ -7,7 +7,7 @@ NAME:FastRedHaste
 1 [C16:16] Charging Cinderhorn
 1 [M13:200] Akroma's Memorial
 1 [RAV:193] Boros Swiftblade
-1 [3ED:296] Plateau
+1 [3ED:284] Plateau
 1 [EMN:149] Weaver of Lightning
 1 [BNG:108] Satyr Firedancer
 1 [WTH:93] Cinder Giant
@ -16,7 +16,7 @@ NAME:FastRedHaste
 1 [BFZ:150] Outnumber
 1 [M14:139] Flames of the Firebrand
 1 [INV:11] Crimson Acolyte
-1 [LEG:247] Hammerheim
+1 [LEG:302] Hammerheim
 1 [KLD:246] Inspiring Vantage
 1 [DGM:107] Tajic, Blade of the Legion
 1 [GTC:97] Legion Loyalist
@ -32,7 +32,7 @@ NAME:FastRedHaste
 1 [ISD:4] Avacynian Priest
 1 [ODY:200] Lava Blister
 1 [EVE:139] Figure of Destiny
-1 [LEG:175] Clergy of the Holy Nimbus
+1 [LEG:6] Clergy of the Holy Nimbus
 1 [LEG:133] Beasts of Bogardan
 1 [DTK:151] Roast
 1 [ME4:113] Fire Imp
@ -55,7 +55,7 @@ NAME:FastRedHaste
 1 [HOU:92] Firebrand Archer
 1 [AVR:141] Hound of Griselbrand
 1 [ONS:189] Blistering Firecat
-1 [VIS:125] Zhalfirin Crusader
+1 [VIS:25] Zhalfirin Crusader
 1 [RAV:243] Boros Recruit
 1 [ROE:15] Caravan Escort
 1 [C14:40] Volcanic Offering
@ -73,5 +73,5 @@ NAME:FastRedHaste
 1 [DTK:134] Draconic Roar
 1 [2ED:245] Gauntlet of Might
 1 [ONS:199] Dwarven Blastminer
-LAYOUT MAIN:(1,8)(CARD_TYPE,false,50)|([KLD:236])([M13:200],[RAV:255],[2ED:245])([BNG:108])([M15:35],[C16:16],[EMN:149],[KLD:130],[TSB:72],[ISD:23],[ISD:4],[LEG:133],[ZEN:127],[HOU:104],[HOU:103],[AVR:141],[ONS:189],[RAV:243],[ROE:15],[SOI:190],[KTK:118],[MMQ:53],[ONS:199],[DKA:93],[WTH:93],[DGM:56],[INV:11],[DGM:107],[GTC:97],[USG:11],[AKH:21],[M12:133],[LEG:175],[ME4:113],[M11:129],[OGW:105],[M13:148],[M10:34],[HOU:92],[VIS:125],[EVE:139],[KTK:11],[DIS:10],[RAV:193],[GTC:215])([SOI:28])([ZEN:119],[CHK:40],[C14:40],[M11:149],[DTK:134],[8ED:200],[ZEN:142],[WWK:90],[TSP:180],[BFZ:150],[HOU:20],[FUT:115],[RAV:213],[DKA:84])([DOM:262],[DOM:250],[DOM:250],[DOM:250],[DOM:250],[KLD:246],[OGW:175],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[LEG:247],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[DOM:250],[DOM:262],[DOM:262],[3ED:296],[DOM:250],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[DOM:250],[DOM:250],[DOM:250],[DOM:262])([ODY:193],[XLN:145],[DTK:151],[ODY:193],[ORI:143],[ODY:200],[C15:28],[M14:139])
+LAYOUT MAIN:(1,8)(CARD_TYPE,false,50)|([KLD:236])([M13:200],[RAV:255],[2ED:245])([BNG:108])([M15:35],[C16:16],[EMN:149],[KLD:130],[TSB:72],[ISD:23],[ISD:4],[LEG:133],[ZEN:127],[HOU:104],[HOU:103],[AVR:141],[ONS:189],[RAV:243],[ROE:15],[SOI:190],[KTK:118],[MMQ:53],[ONS:199],[DKA:93],[WTH:93],[DGM:56],[INV:11],[DGM:107],[GTC:97],[USG:11],[AKH:21],[M12:133],[LEG:6],[ME4:113],[M11:129],[OGW:105],[M13:148],[M10:34],[HOU:92],[VIS:25],[EVE:139],[KTK:11],[DIS:10],[RAV:193],[GTC:215])([SOI:28])([ZEN:119],[CHK:40],[C14:40],[M11:149],[DTK:134],[8ED:200],[ZEN:142],[WWK:90],[TSP:180],[BFZ:150],[HOU:20],[FUT:115],[RAV:213],[DKA:84])([DOM:262],[DOM:250],[DOM:250],[DOM:250],[DOM:250],[KLD:246],[OGW:175],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[LEG:302],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[DOM:250],[DOM:262],[DOM:262],[3ED:284],[DOM:250],[DOM:262],[DOM:262],[DOM:262],[DOM:262],[DOM:250],[DOM:250],[DOM:250],[DOM:250],[DOM:262])([ODY:193],[XLN:145],[DTK:151],[ODY:193],[ORI:143],[ODY:200],[C15:28],[M14:139])
 LAYOUT SIDEBOARD:(0,0)(CMC,true,50)|
--- a/Mage.Client/release/sample-decks/AI/Poison.dck
+++ b/Mage.Client/release/sample-decks/AI/Poison.dck
@ -3,13 +3,13 @@
 1 [FUT:171] Llanowar Reborn
 1 [KLD:243] Blooming Marsh
 1 [ALA:225] Jund Panorama
-1 [MIR:12] Crypt Cobra
+1 [MIR:114] Crypt Cobra
 1 [ZEN:221] Oran-Rief, the Vastwood
-1 [STH:132] Mox Diamond
+1 [STH:138] Mox Diamond
 1 [M15:194] Reclamation Sage
 NAME:Poison
 1 [M13:168] Elvish Archdruid
-1 [STH:137] Volrath's Stronghold
+1 [STH:143] Volrath's Stronghold
 1 [FUT:174] Dryad Arbor
 1 [M15:101] Indulgent Tormentor
 1 [DKA:125] Scorned Villager
@ -62,7 +62,7 @@ NAME:Poison
 1 [CMA:186] Meren of Clan Nel Toth
 1 [SHM:273] Leechridden Swamp
 1 [NPH:72] Reaper of Sheoldred
-1 [MIR:136] Sabertooth Cobra
+1 [MIR:238] Sabertooth Cobra
 1 [RTR:243] Overgrown Tomb
 1 [AER:106] Druid of the Cowl
 1 [AKH:237] Throne of the God-Pharaoh
@ -94,5 +94,5 @@ NAME:Poison
 1 [BFZ:240] Mortuary Mire
 1 [SOM:223] Wurmcoil Engine
 1 [AKH:187] Sixth Sense
-LAYOUT MAIN:(1,11)(CARD_TYPE,false,50)|([SOM:170],[MBS:121],[MBS:125],[SOM:166],[SOM:185],[SOM:223])([THS:153])([MOR:145])([RTR:229],[BFZ:225],[SOM:140],[M14:207],[STH:132],[RAV:262],[AKH:237],[MRD:270])([JOU:154],[BNG:68])([FUT:174])([RAV:231],[M15:194],[M14:168],[M15:101],[DKA:125],[ORI:101],[ORI:100],[EMN:159],[M12:195],[NPH:119],[DGM:26],[SOI:203],[SOI:202],[LRW:250],[SOM:66],[NPH:72],[NPH:111],[AER:106],[DTK:123],[EVE:79],[EVE:124],[RTR:198],[AER:117],[EMN:175],[THS:91],[AVR:107],[THS:201],[ALA:71],[MIR:12],[MOR:140],[GTC:123],[CHK:236],[SOM:79],[MBS:94],[C13:84],[M13:118],[MBS:96],[MBS:90],[CMA:186],[M13:168],[CHK:238],[ODY:282],[MIR:136],[DTK:204],[BFZ:170],[BNG:122],[MBS:77],[BOK:136],[KTK:152],[M12:81],[LRW:219],[APC:109])([VMA:250],[AKH:187])([MBS:57])([KLD:243],[ZEN:221],[DOM:266],[DOM:266],[DOM:258],[DOM:258],[USG:321],[LRW:268],[RTR:243],[OGW:172],[OGW:171],[FUT:171],[DOM:266],[DOM:266],[DOM:266],[DOM:266],[DOM:266],[DOM:258],[WWK:140],[FRF:169],[MBS:145],[BFZ:240],[ALA:225],[DOM:258],[DOM:266],[STH:137],[SHM:273],[DOM:258],[DOM:258],[CON:144],[DOM:266],[RAV:283])([M15:183],[AER:70])
+LAYOUT MAIN:(1,11)(CARD_TYPE,false,50)|([SOM:170],[MBS:121],[MBS:125],[SOM:166],[SOM:185],[SOM:223])([THS:153])([MOR:145])([RTR:229],[BFZ:225],[SOM:140],[M14:207],[STH:138],[RAV:262],[AKH:237],[MRD:270])([JOU:154],[BNG:68])([FUT:174])([RAV:231],[M15:194],[M14:168],[M15:101],[DKA:125],[ORI:101],[ORI:100],[EMN:159],[M12:195],[NPH:119],[DGM:26],[SOI:203],[SOI:202],[LRW:250],[SOM:66],[NPH:72],[NPH:111],[AER:106],[DTK:123],[EVE:79],[EVE:124],[RTR:198],[AER:117],[EMN:175],[THS:91],[AVR:107],[THS:201],[ALA:71],[MIR:114],[MOR:140],[GTC:123],[CHK:236],[SOM:79],[MBS:94],[C13:84],[M13:118],[MBS:96],[MBS:90],[CMA:186],[M13:168],[CHK:238],[ODY:282],[MIR:238],[DTK:204],[BFZ:170],[BNG:122],[MBS:77],[BOK:136],[KTK:152],[M12:81],[LRW:219],[APC:109])([VMA:250],[AKH:187])([MBS:57])([KLD:243],[ZEN:221],[DOM:266],[DOM:266],[DOM:258],[DOM:258],[USG:321],[LRW:268],[RTR:243],[OGW:172],[OGW:171],[FUT:171],[DOM:266],[DOM:266],[DOM:266],[DOM:266],[DOM:266],[DOM:258],[WWK:140],[FRF:169],[MBS:145],[BFZ:240],[ALA:225],[DOM:258],[DOM:266],[STH:143],[SHM:273],[DOM:258],[DOM:258],[CON:144],[DOM:266],[RAV:283])([M15:183],[AER:70])
 LAYOUT SIDEBOARD:(0,0)(CMC,true,50)|
--- a/Mage.Client/release/sample-decks/AI/Zombi
+++ b/Mage.Client/release/sample-decks/AI/Zombi
@ -1,4 +1,4 @@
-NAME:Zombi & Skeleton 
+NAME:Zombi & Skeleton
 1 [FUT:171] Llanowar Reborn
 1 [LGN:77] Noxious Ghoul
 1 [M12:116] Vengeful Pharaoh
@ -35,7 +35,7 @@ NAME:Zombi & Skeleton
 1 [DOM:241] Isolated Chapel
 1 [AER:109] Heroic Intervention
 2 [DOM:248] Woodland Cemetery
-1 [MIR:296] Grasslands
+1 [MIR:327] Grasslands
 1 [SOI:216] Loam Dryad
 1 [SOM:63] Fume Spitter
 1 [SOI:212] Inexorable Blob
@ -64,8 +64,8 @@ NAME:Zombi & Skeleton
 1 [ALA:221] Bant Panorama
 1 [CHK:122] Kokusho, the Evening Star
 1 [AKH:6] Binding Mummy
-1 [MIR:11] Choking Sands
-1 [3ED:298] Scrubland
+1 [MIR:113] Choking Sands
+1 [3ED:286] Scrubland
 1 [WTH:152] Mana Web
 4 [DOM:266] Forest
 1 [PLC:145] Essence Warden
@ -114,5 +114,5 @@ NAME:Zombi & Skeleton
 1 [AKH:104] Plague Belcher
 1 [MRD:278] Ancient Den
 1 [DTK:172] Ainok Survivalist
-LAYOUT MAIN:(1,7)(CARD_TYPE,false,50)|([MRD:278],[MRD:285])([LRW:265],[4ED:299],[AER:173],[WTH:152],[3ED:274])([EVE:119],[LGN:77],[M12:116],[SHM:229],[M14:103],[THS:89],[DKA:70],[RTR:174],[RAV:238],[10E:155],[MBS:50],[CMD:227],[RTR:158],[DKA:63],[RTR:213],[DKA:64],[LGN:80],[7ED:166],[AKH:91],[SCG:62],[KTK:73],[TSB:52],[AKH:99],[SOI:216],[SOM:63],[SOI:212],[AKH:81],[M14:195],[CSP:71],[CMD:98],[M15:121],[M15:111],[6ED:162],[ISD:170],[SOI:107],[ALA:70],[NPH:68],[SOM:78],[SOK:69],[CHK:122],[AKH:6],[EVE:117],[ONS:164],[MBS:96],[E01:36],[M12:81],[AKH:208],[DTK:116],[PLC:145],[ODY:282],[EMN:89],[BFZ:210],[M13:92],[CMA:66],[GTC:182],[APC:109],[M12:86],[NPH:25],[AKH:104],[DTK:172])([ZEN:108],[ROE:207],[EMN:90])([C16:21],[MMQ:129],[TSP:135],[APC:86],[TOR:51],[AER:109],[TSP:206],[OGW:26],[ROE:131],[ISD:124],[PLC:127],[DGM:132])([M11:229],[DOM:258],[DOM:258],[DOM:258],[BFZ:234],[DOM:266],[AKH:247],[SHM:279],[DOM:266],[KTK:248],[FUT:171],[DOM:258],[MIR:296],[DOM:266],[JUD:141],[ONS:312],[HOU:171],[DOM:250],[DOM:258],[GTC:242],[ONS:324],[ONS:326],[ONS:327],[3ED:283],[SHM:273],[DOM:258],[ALA:221],[DOM:241],[DOM:258],[DOM:248],[DOM:248],[3ED:298],[EVE:180],[DOM:266],[SHM:281],[DKA:158])([JUD:72],[ISD:26],[TOR:57],[MIR:11],[TOR:78],[JOU:120],[DKA:80])
+LAYOUT MAIN:(1,7)(CARD_TYPE,false,50)|([MRD:278],[MRD:285])([LRW:265],[4ED:299],[AER:173],[WTH:152],[3ED:274])([EVE:119],[LGN:77],[M12:116],[SHM:229],[M14:103],[THS:89],[DKA:70],[RTR:174],[RAV:238],[10E:155],[MBS:50],[CMD:227],[RTR:158],[DKA:63],[RTR:213],[DKA:64],[LGN:80],[7ED:166],[AKH:91],[SCG:62],[KTK:73],[TSB:52],[AKH:99],[SOI:216],[SOM:63],[SOI:212],[AKH:81],[M14:195],[CSP:71],[CMD:98],[M15:121],[M15:111],[6ED:162],[ISD:170],[SOI:107],[ALA:70],[NPH:68],[SOM:78],[SOK:69],[CHK:122],[AKH:6],[EVE:117],[ONS:164],[MBS:96],[E01:36],[M12:81],[AKH:208],[DTK:116],[PLC:145],[ODY:282],[EMN:89],[BFZ:210],[M13:92],[CMA:66],[GTC:182],[APC:109],[M12:86],[NPH:25],[AKH:104],[DTK:172])([ZEN:108],[ROE:207],[EMN:90])([C16:21],[MMQ:129],[TSP:135],[APC:86],[TOR:51],[AER:109],[TSP:206],[OGW:26],[ROE:131],[ISD:124],[PLC:127],[DGM:132])([M11:229],[DOM:258],[DOM:258],[DOM:258],[BFZ:234],[DOM:266],[AKH:247],[SHM:279],[DOM:266],[KTK:248],[FUT:171],[DOM:258],[MIR:327],[DOM:266],[JUD:141],[ONS:312],[HOU:171],[DOM:250],[DOM:258],[GTC:242],[ONS:324],[ONS:326],[ONS:327],[3ED:283],[SHM:273],[DOM:258],[ALA:221],[DOM:241],[DOM:258],[DOM:248],[DOM:248],[3ED:286],[EVE:180],[DOM:266],[SHM:281],[DKA:158])([JUD:72],[ISD:26],[TOR:57],[MIR:113],[TOR:78],[JOU:120],[DKA:80])
 LAYOUT SIDEBOARD:(0,0)(CMC,true,50)|
--- a/Mage.Client/release/sample-decks/Commander/Commander
+++ b/Mage.Client/release/sample-decks/Commander/Commander
@ -46,8 +46,8 @@
 1 [C15:268] Sol Ring
 1 [C15:301] Reliquary Tower
 1 [C15:57] Ajani's Chosen
-1 [C15:302] Scoured Barrens
-1 [C15:303] Secluded Steppe
+1 [C15:303] Scoured Barrens
+1 [C15:304] Secluded Steppe
 1 [C15:229] Necromancer's Covenant
 1 [C15:22] Thief of Blood
 1 [C15:66] Dawn to Dusk
--- a/Mage.Client/release/sample-decks/Commander/Commander
+++ b/Mage.Client/release/sample-decks/Commander/Commander
@ -1,6 +1,6 @@
 1 [C17:100] Blood Tribute
 1 [C17:101] Bloodhusk Ritualist
-1 [C17:102] Bloodlord of Vaasgoth
+1 [M12:82] Bloodlord of Vaasgoth
 1 [C17:103] Butcher of Malakir
 1 [C17:104] Captivating Vampire
 1 [C17:105] Consuming Vapors
--- a/Mage.Client/release/sample-decks/Commander/Commander
+++ b/Mage.Client/release/sample-decks/Commander/Commander
@ -1,93 +1,93 @@
-1 [C18:102] Sigiled Starfish  
-1 [C18:103] Sphinx of Jwar Isle  
-1 [C18:104] Sphinx of Uthuun  
-1 [C18:105] Telling Time  
-1 [C18:109] Treasure Hunt  
-1 [C18:113] Army of the Damned  
-1 [C18:115] Phyrexian Delver  
-1 [C18:12] Primordial Mist  
-1 [C18:15] Entreat the Dead  
-1 [C18:168] Aethermage's Touch  
-1 [C18:16] Loyal Subordinate  
-1 [C18:176] Duskmantle Seer  
-1 [C18:178] Enigma Sphinx  
-1 [C18:179] Esper Charm  
-1 [C18:17] Night Incarnate  
-1 [C18:183] High Priest of Penance  
-1 [C18:186] Mortify  
-1 [C18:18] Skull Storm  
-1 [C18:191] Silent-Blade Oni  
-1 [C18:193] Utter End  
-1 [C18:196] Azorius Signet  
-1 [C18:19] Sower of Discord  
-1 [C18:1] Boreas Charger  
-1 [C18:200] Commander's Sphere  
-1 [C18:201] Crystal Ball  
-1 [C18:203] Dimir Signet  
-1 [C18:210] Mind Stone  
-1 [C18:213] Orzhov Signet  
-1 [C18:214] Pilgrim's Eye  
-1 [C18:220] Seer's Lantern  
-1 [C18:222] Sol Ring  
-1 [C18:232] Arcane Sanctum  
-1 [C18:233] Azorius Chancery  
-1 [C18:234] Azorius Guildgate  
-1 [C18:235] Barren Moor  
-1 [C18:240] Command Tower  
-1 [C18:242] Dimir Aqueduct  
-1 [C18:243] Dimir Guildgate  
-1 [C18:244] Dismal Backwater  
-1 [C18:247] Forsaken Sanctuary  
-1 [C18:253] Halimar Depths  
-1 [C18:260] Jwar Isle Refuge  
-1 [C18:264] Lonely Sandbar  
-1 [C18:265] Meandering River  
-1 [C18:266] Mortuary Mire  
-1 [C18:270] New Benalia  
-1 [C18:271] Orzhov Basilica  
-1 [C18:272] Orzhov Guildgate  
-1 [C18:276] Scoured Barrens  
-1 [C18:279] Secluded Steppe  
-1 [C18:280] Sejiri Refuge  
-1 [C18:283] Submerged Boneyard  
-1 [C18:48] Varina, Lich Queen  
-1 [C18:4] Loyal Unicorn  
-1 [C18:56] Geode Golem  
-1 [C18:58] Forge of Heroes  
-1 [C18:59] Isolated Watchtower  
-1 [C18:5] Magus of the Balance  
-1 [C18:60] Adarkar Valkyrie  
-1 [C18:62] Akroma's Vengeance  
-1 [C18:63] Banishing Stroke  
-1 [C18:65] Crib Swap  
-1 [C18:67] Entreat the Angels  
-1 [C18:68] Lightform  
-1 [C18:71] Return to Dust  
-1 [C18:73] Serra Avatar  
-1 [C18:77] Terminus  
-1 [C18:82] Brainstorm  
-1 [C18:83] Cloudform  
-1 [C18:84] Conundrum Sphinx  
-1 [C18:85] Devastation Tide  
-1 [C18:87] Djinn of Wishes  
-1 [C18:88] Dream Cache  
-1 [C18:93] Jeskai Infiltrator  
-1 [C18:94] Mulldrifter  
-1 [C18:95] Ninja of the Deep Hours  
-1 [C18:96] Ponder  
-1 [C18:97] Portent  
-1 [C18:98] Predict  
-1 [C18:298] Island  
-1 [C18:299] Swamp  
-1 [C18:300] Swamp  
-1 [C18:301] Swamp  
-1 [C18:006] Aminatou's Augury
+1 [C18:102] Sigiled Starfish
+1 [C18:103] Sphinx of Jwar Isle
+1 [C18:104] Sphinx of Uthuun
+1 [C18:105] Telling Time
+1 [C18:109] Treasure Hunt
+1 [C18:113] Army of the Damned
+1 [C18:115] Phyrexian Delver
+1 [C18:12] Primordial Mist
+1 [C18:15] Entreat the Dead
+1 [C18:168] Aethermage's Touch
+1 [C18:16] Loyal Subordinate
+1 [C18:176] Duskmantle Seer
+1 [C18:178] Enigma Sphinx
+1 [C18:179] Esper Charm
+1 [C18:17] Night Incarnate
+1 [C18:183] High Priest of Penance
+1 [C18:186] Mortify
+1 [C18:18] Skull Storm
+1 [C18:191] Silent-Blade Oni
+1 [C18:193] Utter End
+1 [C18:196] Azorius Signet
+1 [C18:19] Sower of Discord
+1 [C18:1] Boreas Charger
+1 [C18:200] Commander's Sphere
+1 [C18:201] Crystal Ball
+1 [C18:203] Dimir Signet
+1 [C18:210] Mind Stone
+1 [C18:213] Orzhov Signet
+1 [C18:214] Pilgrim's Eye
+1 [C18:220] Seer's Lantern
+1 [C18:222] Sol Ring
+1 [C18:232] Arcane Sanctum
+1 [C18:233] Azorius Chancery
+1 [C18:234] Azorius Guildgate
+1 [C18:235] Barren Moor
+1 [C18:240] Command Tower
+1 [C18:242] Dimir Aqueduct
+1 [C18:243] Dimir Guildgate
+1 [C18:244] Dismal Backwater
+1 [C18:247] Forsaken Sanctuary
+1 [C18:253] Halimar Depths
+1 [C18:260] Jwar Isle Refuge
+1 [C18:264] Lonely Sandbar
+1 [C18:265] Meandering River
+1 [C18:266] Mortuary Mire
+1 [C18:270] New Benalia
+1 [C18:271] Orzhov Basilica
+1 [C18:272] Orzhov Guildgate
+1 [C18:276] Scoured Barrens
+1 [C18:279] Secluded Steppe
+1 [C18:280] Sejiri Refuge
+1 [C18:283] Submerged Boneyard
+1 [C18:48] Varina, Lich Queen
+1 [C18:4] Loyal Unicorn
+1 [C18:56] Geode Golem
+1 [C18:58] Forge of Heroes
+1 [C18:59] Isolated Watchtower
+1 [C18:5] Magus of the Balance
+1 [C18:60] Adarkar Valkyrie
+1 [C18:62] Akroma's Vengeance
+1 [C18:63] Banishing Stroke
+1 [C18:65] Crib Swap
+1 [C18:67] Entreat the Angels
+1 [C18:68] Lightform
+1 [C18:71] Return to Dust
+1 [C18:73] Serra Avatar
+1 [C18:77] Terminus
+1 [C18:82] Brainstorm
+1 [C18:83] Cloudform
+1 [C18:84] Conundrum Sphinx
+1 [C18:85] Devastation Tide
+1 [C18:87] Djinn of Wishes
+1 [C18:88] Dream Cache
+1 [C18:93] Jeskai Infiltrator
+1 [C18:94] Mulldrifter
+1 [C18:95] Ninja of the Deep Hours
+1 [C18:96] Ponder
+1 [C18:97] Portent
+1 [C18:98] Predict
+1 [C18:298] Island
+1 [C18:299] Swamp
+1 [C18:300] Swamp
+1 [C18:301] Swamp
+1 [C18:6] Aminatou's Augury
 1 [C18:288] Tranquil Cove
 1 [C18:51] Yennett, Cryptic Sovereign
 1 [C18:52] Yuriko, the Tiger's Shadow
-2 [C18:296] Island  
-2 [C18:297] Island  
-2 [C18:295] Plains  
-3 [C18:293] Plains  
-3 [C18:294] Plains  
+2 [C18:296] Island
+2 [C18:297] Island
+2 [C18:295] Plains
+3 [C18:293] Plains
+3 [C18:294] Plains
 SB: 1 [C18:37] Aminatou, the Fateshifter
--- a/Mage.Client/release/sample-decks/Commander/Tasigur
+++ b/Mage.Client/release/sample-decks/Commander/Tasigur
@ -1,11 +1,11 @@
 1 [MMQ:316] Dust Bowl
 1 [MBS:43] Go for the Throat
-1 [ALL:42] Force of Will
+1 [ALL:28] Force of Will
 1 [ZEN:220] Misty Rainforest
 1 [10E:361] Treetop Village
 1 [10E:362] Underground River
 1 [ROE:115] Inquisition of Kozilek
-1 [STH:137] Volrath's Stronghold
+1 [STH:143] Volrath's Stronghold
 1 [PLC:85] Damnation
 1 [FUT:173] Tolaria West
 1 [ISD:78] Snapcaster Mage
@ -23,14 +23,14 @@
 1 [GTC:240] Breeding Pool
 1 [DTK:262] Forest
 1 [ISD:105] Liliana of the Veil
-1 [TMP:340] Wasteland
+1 [TMP:330] Wasteland
 1 [JUD:46] Mental Note
 1 [ULG:36] Miscalculation
 2 [CSP:152] Snow-Covered Island
 1 [RAV:63] Remand
 1 [LRW:56] Cryptic Command
 1 [3ED:283] Bayou
-1 [5ED:191] Sylvan Library
+1 [5ED:329] Sylvan Library
 1 [CMD:269] Command Tower
 1 [EXO:35] Forbid
 1 [DDO:36] Aetherize
@ -41,7 +41,7 @@
 1 [ARB:92] Maelstrom Pulse
 1 [KTK:81] Murderous Cut
 1 [TSP:48] Ancestral Vision
-1 [TMP:22] Diabolic Edict
+1 [TMP:128] Diabolic Edict
 1 [10E:319] Crucible of Worlds
 1 [M12:63] Mana Leak
 1 [FUT:52] Logic Knot
@ -65,13 +65,13 @@
 1 [RTR:243] Overgrown Tomb
 1 [7ED:76] Force Spike
 1 [TMP:70] Intuition
-1 [3ED:305] Underground Sea
+1 [3ED:290] Underground Sea
 1 [M15:248] Urborg, Tomb of Yawgmoth
 1 [AVR:226] Cavern of Souls
 1 [ISD:241] Hinterland Harbor
 1 [DKA:52] Thought Scour
-1 [3ED:303] Tropical Island
-1 [3ED:13] Demonic Tutor
+1 [3ED:288] Tropical Island
+1 [3ED:105] Demonic Tutor
 1 [ISD:249] Woodland Cemetery
 1 [M12:73] Ponder
 1 [DTK:65] Negate
--- a/Mage.Client/release/sample-decks/Commander/Zurgo
+++ b/Mage.Client/release/sample-decks/Commander/Zurgo
@ -34,7 +34,7 @@
 1 [M14:1] Ajani, Caller of the Pride
 1 [M12:109] Sorin Markov
 1 [M12:147] Inferno Titan
-1 [ICE:278] Swords to Plowshares
+1 [ICE:54] Swords to Plowshares
 1 [CMD:269] Command Tower
 1 [M12:222] Worldslayer
 1 [M15:133] Burning Anger
@ -66,7 +66,7 @@
 1 [ZEN:203] Grappling Hook
 1 [ORI:244] Battlefield Forge
 1 [ORI:245] Caves of Koilos
-1 [3ED:13] Demonic Tutor
+1 [3ED:105] Demonic Tutor
 1 [GTC:143] Aurelia, the Warleader
 1 [AVR:36] Silverblade Paladin
 1 [THS:85] Erebos, God of the Dead
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -1,44 +1,44 @@
-4 [KTK:248] Windswept Heath
-1 [TPR:267] Forest
-2 [JOU:165] Temple of Malady
-1 [PLC:165] Urborg, Tomb of Yawgmoth
-1 [JOU:5] Banishing Light
-4 [KTK:200] Siege Rhino
-2 [M15:34] Soul of Theros
-2 [C14:191] Elvish Mystic
-1 [FNMP:172] Banishing Light
-1 [M11:233] Plains
-1 [LRW:299] Forest
-4 [KTK:241] Sandsteppe Citadel
-1 [10E:355] Llanowar Wastes
-1 [M15:178] Hornet Queen
-1 [UNH:140] Forest
-1 [APC:140] Caves of Koilos
-1 [M15:173] Elvish Mystic
-2 [BNG:136] Satyr Wayfinder
-4 [BNG:119] Courser of Kruphix
-1 [RAV:287] Plains
-2 [THS:227] Temple of Silence
-1 [APC:141] Llanowar Wastes
-4 [KTK:31] Wingmate Roc
-2 [M15:198] Satyr Wayfinder
-2 [THS:155] Commune with the Gods
-2 [THS:180] Sylvan Caryatid
-1 [MBP:77] Sylvan Caryatid
-2 [THS:110] Whip of Erebos
-1 [FNMP:165] Elvish Mystic
-3 [KTK:81] Murderous Cut
-2 [CMD:159] Hornet Queen
-2 [M15:244] Llanowar Wastes
-SB: 1 [M15:194] Reclamation Sage
-SB: 1 [PTC:80] Doomwake Giant
-SB: 2 [LRW:145] Thoughtseize
-SB: 1 [KTK:174] Duneblast
-SB: 1 [M15:187] Nissa, Worldwaker
-SB: 1 [THS:110] Whip of Erebos
-SB: 2 [THS:15] Glare of Heresy
-SB: 2 [KTK:8] End Hostilities
-SB: 1 [JOU:66] Doomwake Giant
-SB: 1 [C14:213] Reclamation Sage
-SB: 1 [THS:101] Read the Bones
-SB: 1 [MBP:103] Nissa, Worldwaker
+4 [KTK:248] Windswept Heath
+1 [TPR:267] Forest
+2 [JOU:165] Temple of Malady
+1 [PLC:165] Urborg, Tomb of Yawgmoth
+1 [JOU:5] Banishing Light
+4 [KTK:200] Siege Rhino
+2 [M15:34] Soul of Theros
+2 [C14:191] Elvish Mystic
+1 [F14:9] Banishing Light
+1 [M11:233] Plains
+1 [LRW:299] Forest
+4 [KTK:241] Sandsteppe Citadel
+1 [10E:355] Llanowar Wastes
+1 [M15:178] Hornet Queen
+1 [UNH:140] Forest
+1 [APC:140] Caves of Koilos
+1 [M15:173] Elvish Mystic
+2 [BNG:136] Satyr Wayfinder
+4 [BNG:119] Courser of Kruphix
+1 [RAV:287] Plains
+2 [THS:227] Temple of Silence
+1 [APC:141] Llanowar Wastes
+4 [KTK:31] Wingmate Roc
+2 [M15:198] Satyr Wayfinder
+2 [THS:155] Commune with the Gods
+2 [THS:180] Sylvan Caryatid
+1 [THS:180] Sylvan Caryatid
+2 [THS:110] Whip of Erebos
+1 [F14:2] Elvish Mystic
+3 [KTK:81] Murderous Cut
+2 [CMD:159] Hornet Queen
+2 [M15:244] Llanowar Wastes
+SB: 1 [M15:194] Reclamation Sage
+SB: 1 [PJOU:66] Doomwake Giant
+SB: 2 [LRW:145] Thoughtseize
+SB: 1 [KTK:174] Duneblast
+SB: 1 [M15:187] Nissa, Worldwaker
+SB: 1 [THS:110] Whip of Erebos
+SB: 2 [THS:15] Glare of Heresy
+SB: 2 [KTK:8] End Hostilities
+SB: 1 [JOU:66] Doomwake Giant
+SB: 1 [C14:213] Reclamation Sage
+SB: 1 [THS:101] Read the Bones
+SB: 1 [M15:187] Nissa, Worldwaker
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -19,7 +19,7 @@
 3 [THS:227] Temple of Silence
 1 [APC:141] Llanowar Wastes
 2 [KTK:31] Wingmate Roc
-1 [JR:46] Windswept Heath
+1 [G09:9] Windswept Heath
 1 [JOU:163] Mana Confluence
 1 [BNG:165] Temple of Plenty
 2 [LRW:145] Thoughtseize
@ -27,13 +27,13 @@
 2 [9ED:322] Llanowar Wastes
 4 [THS:180] Sylvan Caryatid
 1 [ARC:150] Forest
-SB: 1 [MBP:101] Liliana Vess
+SB: 1 [M15:103] Liliana Vess
 SB: 2 [M15:169] Back to Nature
-SB: 1 [FNMP:171] Bile Blight
+SB: 1 [F14:8] Bile Blight
 SB: 2 [BNG:61] Bile Blight
 SB: 1 [C14:158] Read the Bones
 SB: 1 [M15:187] Nissa, Worldwaker
 SB: 1 [KTK:8] End Hostilities
 SB: 2 [KTK:163] Anafenza, the Foremost
-SB: 1 [MBP:103] Nissa, Worldwaker
+SB: 1 [M15:187] Nissa, Worldwaker
 SB: 3 [BNG:65] Drown in Sorrow
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -16,7 +16,7 @@
 1 [NPH:9] Elesh Norn, Grand Cenobite
 4 [ISD:241] Hinterland Harbor
 1 [ISD:207] Tree of Redemption
-1 [FNMP:147] Avacyn's Pilgrim
+1 [F12:8] Avacyn's Pilgrim
 1 [ISD:193] Mayor of Avabruck
 1 [NPH:4] Blade Splicer
 1 [C14:283] Wurmcoil Engine
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -1,46 +1,46 @@
-1 [POR:214] Mountain
-4 [MBS:64] Goblin Wardriver
-1 [WWK:145] Tectonic Edge
-3 [M10:139] Goblin Chieftain
-1 [M12:138] Goblin Chieftain
-1 [SHM:296] Mountain
-1 [ARC:147] Mountain
-1 [RTR:267] Mountain
-1 [C13:352] Mountain
-4 [ZEN:125] Goblin Bushwhacker
-1 [DDE:69] Mountain
-2 [ZEN:126] Goblin Guide
-3 [MPRP:47] Burst Lightning
-1 [ZEN:226] Teetering Peaks
-1 [SOM:81] Arc Trail
-1 [S00:102] Mountain
-2 [MM2:127] Spikeshot Elder
-1 [LEA:283] Mountain
-1 [MMQ:345] Mountain
-1 [RAV:300] Mountain
-2 [GPX:6] Goblin Guide
-4 [M11:135] Ember Hauler
-2 [JR:1] Lightning Bolt
-1 [M10:146] Lightning Bolt
-1 [M10:243] Mountain
-1 [M12:242] Mountain
-2 [ROE:166] Staggershock
-1 [C14:313] Tectonic Edge
-1 [MIR:301] Mountain
-1 [DDL:77] Mountain
-2 [GRC:48] Staggershock
-1 [ZEN:119] Burst Lightning
-1 [DD3B:60] Mountain
-3 [FNMP:136] Teetering Peaks
-2 [SOM:104] Spikeshot Elder
-1 [HOP:163] Mountain
-1 [LEB:163] Lightning Bolt
-1 [SOM:243] Mountain
-SB: 2 [M12:151] Manic Vandal
-SB: 2 [M13:141] Mark of Mutiny
-SB: 1 [DDN:23] Arc Trail
-SB: 1 [SOM:196] Ratchet Bomb
-SB: 2 [PC2:39] Arc Trail
-SB: 2 [PC2:47] Mark of Mutiny
-SB: 3 [M14:215] Ratchet Bomb
-SB: 2 [M11:151] Manic Vandal
+1 [POR:208] Mountain
+4 [MBS:64] Goblin Wardriver
+1 [WWK:145] Tectonic Edge
+3 [M10:139] Goblin Chieftain
+1 [M12:138] Goblin Chieftain
+1 [SHM:296] Mountain
+1 [ARC:147] Mountain
+1 [RTR:267] Mountain
+1 [C13:352] Mountain
+4 [ZEN:125] Goblin Bushwhacker
+1 [DDE:69] Mountain
+2 [ZEN:126] Goblin Guide
+3 [P10:8] Burst Lightning
+1 [ZEN:226] Teetering Peaks
+1 [SOM:81] Arc Trail
+1 [4ED:373] Mountain
+2 [MM2:127] Spikeshot Elder
+1 [LEA:292] Mountain
+1 [MMQ:345] Mountain
+1 [RAV:300] Mountain
+2 [PGPX:2012a] Goblin Guide
+4 [M11:135] Ember Hauler
+2 [JGP:1] Lightning Bolt
+1 [M10:146] Lightning Bolt
+1 [M10:243] Mountain
+1 [M12:242] Mountain
+2 [ROE:166] Staggershock
+1 [C14:313] Tectonic Edge
+1 [MIR:343] Mountain
+1 [DDL:77] Mountain
+2 [ROE:166] Staggershock
+1 [ZEN:119] Burst Lightning
+1 [M21:269] Mountain
+3 [F11:9] Teetering Peaks
+2 [SOM:104] Spikeshot Elder
+1 [HOP:163] Mountain
+1 [LEB:162] Lightning Bolt
+1 [SOM:243] Mountain
+SB: 2 [M12:151] Manic Vandal
+SB: 2 [M13:141] Mark of Mutiny
+SB: 1 [DDN:23] Arc Trail
+SB: 1 [SOM:196] Ratchet Bomb
+SB: 2 [PC2:39] Arc Trail
+SB: 2 [PC2:47] Mark of Mutiny
+SB: 3 [M14:215] Ratchet Bomb
+SB: 2 [M11:151] Manic Vandal
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -2,7 +2,7 @@
 1 [THS:127] Lightning Strike
 1 [7ED:339] Mountain
 1 [INV:343] Mountain
-1 [ZEN:263] Mountain
+1 [ZEN:242a] Mountain
 1 [APC:140] Caves of Koilos
 3 [KTK:22] Seeker of the Way
 1 [THS:227] Temple of Silence
@ -15,11 +15,11 @@
 1 [DDL:22] Magma Jet
 3 [THS:4] Chained to the Rocks
 1 [10E:348] Battlefield Forge
-1 [PO2:157] Mountain
+1 [M21:269] Mountain
 1 [SOM:238] Swamp
 1 [DDO:1] Elspeth, Sun's Champion
-1 [JR:43] Bloodstained Mire
-2 [MBP:98] Goblin Rabblemaster
+1 [G09:6] Bloodstained Mire
+2 [M15:145] Goblin Rabblemaster
 1 [KTK:31] Wingmate Roc
 2 [KTK:97] Arc Lightning
 1 [9ED:320] Caves of Koilos
@ -35,14 +35,14 @@
 1 [TPR:262] Mountain
 SB: 1 [ULG:7] Erase
 SB: 1 [THS:15] Glare of Heresy
-SB: 1 [MBP:75] Chandra, Pyromaster
+SB: 1 [M15:134] Chandra, Pyromaster
 SB: 2 [THS:112] Anger of the Gods
 SB: 1 [THS:101] Read the Bones
 SB: 1 [KTK:104] Burn Away
 SB: 1 [THS:107] Thoughtseize
 SB: 1 [C14:158] Read the Bones
 SB: 1 [KTK:186] Mardu Charm
-SB: 1 [MGDC:38] Utter End
+SB: 1 [KTK:210] Utter End
 SB: 1 [KTK:9] Erase
 SB: 2 [KTK:8] End Hostilities
 SB: 1 [THS:9] Elspeth, Sun's Champion
--- a/Mage.Client/release/sample-decks/Decks
+++ b/Mage.Client/release/sample-decks/Decks
@ -1,43 +1,43 @@
-1 [WMCQ:2] Geist of Saint Traft
-2 [M12:18] Gideon's Lawkeeper
-1 [M12:19] Grand Abolisher
-3 [C13:11] Fiend Hunter
-1 [ALA:20] Oblivion Ring
-3 [C14:74] Grand Abolisher
-2 [M10:16] Honor of the Pure
-1 [POR:216] Plains
-1 [M10:233] Plains
-1 [M13:225] Glacial Fortress
-4 [PTC:47] Hero of Bladehold
-3 [ISD:11] Doomed Traveler
-1 [DDK:2] Doomed Traveler
-1 [DDN:81] Plains
-1 [ODY:333] Plains
-1 [DDI:40] Plains
-3 [ISD:244] Moorland Haunt
-1 [MBS:14] Mirran Crusader
-1 [ALA:230] Plains
-2 [M10:226] Glacial Fortress
-1 [M12:227] Glacial Fortress
-2 [MBP:32] Mirran Crusader
-3 [M12:3] Angelic Destiny
-1 [LRW:34] Oblivion Ring
-1 [ZEN:232] Plains
-1 [DDN:38] Plains
-1 [HOP:145] Plains
-1 [KTK:250] Plains
-1 [MM2:25] Mirran Crusader
-1 [ISD:251] Plains
-4 [SOM:229] Seachrome Coast
-1 [ISD:213] Geist of Saint Traft
-2 [M12:23] Honor of the Pure
-1 [ME3:220] Island
-4 [ISD:6] Champion of the Parish
-1 [AVR:231] Plains
-SB: 2 [NPH:161] Sword of War and Peace
-SB: 2 [NPH:57] Dismember
-SB: 1 [M12:11] Celestial Purge
-SB: 1 [MBS:115] Mortarpod
-SB: 4 [M12:40] Timely Reinforcements
-SB: 3 [M12:63] Mana Leak
-SB: 2 [M15:71] Negate
+1 [ISD:213] Geist of Saint Traft
+2 [M12:18] Gideon's Lawkeeper
+1 [M12:19] Grand Abolisher
+3 [C13:11] Fiend Hunter
+1 [ALA:20] Oblivion Ring
+3 [C14:74] Grand Abolisher
+2 [M10:16] Honor of the Pure
+1 [POR:196] Plains
+1 [M10:233] Plains
+1 [M13:225] Glacial Fortress
+4 [PMBS:8] Hero of Bladehold
+3 [ISD:11] Doomed Traveler
+1 [DDK:2] Doomed Traveler
+1 [DDN:81] Plains
+1 [ODY:333] Plains
+1 [DDI:40] Plains
+3 [ISD:244] Moorland Haunt
+1 [MBS:14] Mirran Crusader
+1 [ALA:230] Plains
+2 [M10:226] Glacial Fortress
+1 [M12:227] Glacial Fortress
+2 [MBS:14] Mirran Crusader
+3 [M12:3] Angelic Destiny
+1 [LRW:34] Oblivion Ring
+1 [ZEN:232] Plains
+1 [DDN:38] Plains
+1 [HOP:145] Plains
+1 [KTK:250] Plains
+1 [MM2:25] Mirran Crusader
+1 [ISD:251] Plains
+4 [SOM:229] Seachrome Coast
+1 [ISD:213] Geist of Saint Traft
+2 [M12:23] Honor of the Pure
+1 [ME3:220] Island
+4 [ISD:6] Champion of the Parish
+1 [AVR:231] Plains
+SB: 2 [NPH:161] Sword of War and Peace
+SB: 2 [NPH:57] Dismember
+SB: 1 [M12:11] Celestial Purge
+SB: 1 [MBS:115] Mortarpod
+SB: 4 [M12:40] Timely Reinforcements
+SB: 3 [M12:63] Mana Leak
+SB: 2 [M15:71] Negate
--- a/Mage.Client/release/sample-decks/Duel
+++ b/Mage.Client/release/sample-decks/Duel
@ -15,7 +15,7 @@
 1 [DDQ:16] Moorland Inquisitor
 2 [DDQ:17] Rebuke
 1 [DDQ:7] Doomed Traveler
-4 [DDQ:35] Plains
+4 [DDQ:38] Plains
 1 [DDQ:32] Sharpened Pitchfork
 1 [DDQ:6] Dearly Departed
 1 [DDQ:14] Increasing Devotion
@ -24,16 +24,16 @@
 1 [DDQ:15] Momentary Blink
 2 [DDQ:12] Gather the Townsfolk
 1 [DDQ:4] Champion of the Parish
-3 [DDQ:38] Island
+3 [DDQ:35] Island
 1 [DDQ:3] Cathedral Sanctifier
 1 [DDQ:13] Goldnight Redeemer
-2 [DDQ:39] Island
-4 [DDQ:36] Plains
+2 [DDQ:35] Island
+4 [DDQ:38] Plains
 1 [DDQ:10] Emancipation Angel
 1 [DDQ:2] Bonds of Faith
-4 [DDQ:37] Plains
+4 [DDQ:38] Plains
 1 [DDQ:11] Fiend Hunter
 1 [DDQ:1] Geist of Saint Traft
-2 [DDQ:40] Island
+2 [DDQ:35] Island
 1 [DDQ:31] Butcher's Cleaver
 1 [DDQ:30] Tower Geist
--- a/Mage.Client/release/sample-decks/Duel
+++ b/Mage.Client/release/sample-decks/Duel
@ -15,19 +15,19 @@
 1 [DDQ:63] Sever the Bloodline
 1 [DDQ:61] Human Frailty
 2 [DDQ:62] Moan of the Unhallowed
-3 [DDQ:38] Island
-1 [DDQ:41] Mindbreaker Demon
-3 [DDQ:39] Island
+3 [DDQ:35] Island
+1 [DDQ:41] Mindwrack Demon
+3 [DDQ:35] Island
 1 [DDQ:42] Compelling Deterrence
 1 [DDQ:60] Harvester of Souls
-2 [DDQ:40] Island
+2 [DDQ:35] Island
 1 [DDQ:46] Relentless Skaabs
 1 [DDQ:45] Makeshift Mauler
 1 [DDQ:44] Havengul Runebinder
 1 [DDQ:69] Cobbled Wings
 1 [DDQ:43] Forbidden Alchemy
 2 [DDQ:68] Diregraf Captain
-1 [SOI:997] Tooth Collector
+1 [SOI:140] Tooth Collector
 1 [DDQ:67] Victim of Night
 2 [DDQ:49] Stitched Drake
 1 [DDQ:66] Unbreathing Horde
--- a/Mage.Client/release/sample-decks/Duel
+++ b/Mage.Client/release/sample-decks/Duel
@ -1,31 +1,31 @@
-2 [EVG:3] Elvish Eulogist
-1 [EVG:26] Wirewood Lodge
-1 [EVG:2] Allosaurus Rider
-2 [EVG:27] Tranquil Thicket
-3 [EVG:5] Elvish Warrior
-3 [EVG:24] Moonglove Extract
-1 [EVG:4] Elvish Harbinger
-1 [EVG:25] Slate of Ancestry
-4 [EVG:28] Forest
-1 [EVG:1] Ambush Commander
-5 [EVG:29] Forest
-1 [EVG:22] Harmonize
-1 [EVG:23] Wildsize
-1 [EVG:20] Elvish Promenade
-2 [EVG:21] Giant Growth
-2 [EVG:8] Imperious Perfect
-3 [EVG:9] Llanowar Elves
-2 [EVG:6] Gempalm Strider
-1 [EVG:7] Heedless One
-1 [EVG:13] Timberwatch Elf
-5 [EVG:31] Forest
-1 [EVG:14] Voice of the Woods
-2 [EVG:15] Wellwisher
-1 [EVG:16] Wirewood Herald
-1 [EVG:17] Wirewood Symbiote
-2 [EVG:18] Wood Elves
-5 [EVG:30] Forest
-1 [EVG:19] Wren's Run Vanquisher
-2 [EVG:10] Lys Alana Huntmaster
-1 [EVG:11] Stonewood Invoker
-1 [EVG:12] Sylvan Messenger
+2 [DD1:3] Elvish Eulogist
+1 [DD1:26] Wirewood Lodge
+1 [DD1:2] Allosaurus Rider
+2 [DD1:27] Tranquil Thicket
+3 [DD1:5] Elvish Warrior
+3 [DD1:24] Moonglove Extract
+1 [DD1:4] Elvish Harbinger
+1 [DD1:25] Slate of Ancestry
+4 [DD1:28] Forest
+1 [DD1:1] Ambush Commander
+5 [DD1:29] Forest
+1 [DD1:22] Harmonize
+1 [DD1:23] Wildsize
+1 [DD1:20] Elvish Promenade
+2 [DD1:21] Giant Growth
+2 [DD1:8] Imperious Perfect
+3 [DD1:9] Llanowar Elves
+2 [DD1:6] Gempalm Strider
+1 [DD1:7] Heedless One
+1 [DD1:13] Timberwatch Elf
+5 [DD1:31] Forest
+1 [DD1:14] Voice of the Woods
+2 [DD1:15] Wellwisher
+1 [DD1:16] Wirewood Herald
+1 [DD1:17] Wirewood Symbiote
+2 [DD1:18] Wood Elves
+5 [DD1:30] Forest
+1 [DD1:19] Wren's Run Vanquisher
+2 [DD1:10] Lys Alana Huntmaster
+1 [DD1:11] Stonewood Invoker
+1 [DD1:12] Sylvan Messenger
--- a/Mage.Client/release/sample-decks/Duel
+++ b/Mage.Client/release/sample-decks/Duel
@ -1,31 +1,31 @@
-2 [EVG:45] Mogg War Marshal
-5 [EVG:62] Mountain
-1 [EVG:44] Mogg Fanatic
-5 [EVG:61] Mountain
-1 [EVG:43] Ib Halfheart, Goblin Tactician
-6 [EVG:60] Mountain
-1 [EVG:42] Goblin Warchief
-1 [EVG:41] Goblin Sledder
-1 [EVG:40] Goblin Ringleader
-2 [EVG:49] Skirk Drill Sergeant
-1 [EVG:48] Reckless One
-2 [EVG:47] Raging Goblin
-2 [EVG:46] Mudbutton Torchrunner
-1 [EVG:50] Skirk Fire Marshal
-1 [EVG:32] Siege-Gang Commander
-1 [EVG:52] Skirk Shaman
-1 [EVG:34] Clickslither
-1 [EVG:51] Skirk Prospector
-1 [EVG:33] Akki Coalflinger
-2 [EVG:54] Boggart Shenanigans
-1 [EVG:53] Tar Pitcher
-3 [EVG:56] Tarfire
-1 [EVG:55] Spitting Earth
-1 [EVG:58] Goblin Burrows
-1 [EVG:57] Forgotten Cave
-1 [EVG:39] Goblin Matron
-6 [EVG:59] Mountain
-1 [EVG:36] Flamewave Invoker
-3 [EVG:35] Emberwilde Augur
-3 [EVG:38] Goblin Cohort
-1 [EVG:37] Gempalm Incinerator
+2 [DD1:45] Mogg War Marshal
+5 [DD1:62] Mountain
+1 [DD1:44] Mogg Fanatic
+5 [DD1:61] Mountain
+1 [DD1:43] Ib Halfheart, Goblin Tactician
+6 [DD1:60] Mountain
+1 [DD1:42] Goblin Warchief
+1 [DD1:41] Goblin Sledder
+1 [DD1:40] Goblin Ringleader
+2 [DD1:49] Skirk Drill Sergeant
+1 [DD1:48] Reckless One
+2 [DD1:47] Raging Goblin
+2 [DD1:46] Mudbutton Torchrunner
+1 [DD1:50] Skirk Fire Marshal
+1 [DD1:32] Siege-Gang Commander
+1 [DD1:52] Skirk Shaman
+1 [DD1:34] Clickslither
+1 [DD1:51] Skirk Prospector
+1 [DD1:33] Akki Coalflinger
+2 [DD1:54] Boggart Shenanigans
+1 [DD1:53] Tar Pitcher
+3 [DD1:56] Tarfire
+1 [DD1:55] Spitting Earth
+1 [DD1:58] Goblin Burrows
+1 [DD1:57] Forgotten Cave
+1 [DD1:39] Goblin Matron
+6 [DD1:59] Mountain
+1 [DD1:36] Flamewave Invoker
+3 [DD1:35] Emberwilde Augur
+3 [DD1:38] Goblin Cohort
+1 [DD1:37] Gempalm Incinerator
--- a/Mage.Client/release/sample-decks/Top8
+++ b/Mage.Client/release/sample-decks/Top8
@ -1,11 +1,11 @@
-1 [ATQ:88] Atog
+1 [ATQ:23] Atog
 2 [MRD:283] Seat of the Synod
 3 [MMA:198] Arcbound Ravager
 1 [HOP:136] Seat of the Synod
 4 [MRD:62] Disciple of the Vault
 4 [DST:91] Aether Vial
 2 [MRD:286] Vault of Whispers
-1 [FNMP:105] Myr Enforcer
+1 [F09:2] Myr Enforcer
 1 [DDF:40] Arcbound Worker
 3 [HOP:110] Cranial Plating
 2 [MRD:86] Atog
--- a/Mage.Client/release/sample-decks/Top8
+++ b/Mage.Client/release/sample-decks/Top8
@ -12,7 +12,7 @@
 2 [7ED:327] City of Brass
 1 [MRD:172] Frogmite
 2 [INV:299] Chromatic Sphere
-2 [GPX:3] Chrome Mox
+2 [PGPX:2009] Chrome Mox
 1 [MRD:151] Chromatic Sphere
 1 [MRD:152] Chrome Mox
 1 [5DN:113] Cranial Plating
--- a/Show more
+++ b/Show more