diff --git a/Mage.Client/release/sample-decks/ALA Block Constructed.dck b/Mage.Client/release/sample-decks/ALA Block Constructed.dck
deleted file mode 100644
index 3ec473f9208..00000000000
--- a/Mage.Client/release/sample-decks/ALA Block Constructed.dck	
+++ /dev/null
@@ -1,21 +0,0 @@
-NAME:ALA Block Constructed
-AUTHOR:UNKNOWN
-# Creatures
-4 [ARB:50] Bloodbraid Elf
-4 [ALA:160] Broodmate Dragon
-4 [ARB:95] Putrid Leech
-2 [ARB:60] Spellbreaker Behemoth
-2 [ALA:197] Sprouting Thrinax
-# Spells
-3 [ARB:34] Bituminous Blast
-4 [ALA:156] Blightning
-4 [ARB:92] Maelstrom Pulse
-4 [ARB:46] Terminate
-2 [ARB:62] Vengeful Rebirth
-# Lands
-4 [ALA:222] Crumbling Necropolis
-5 [ALA:246] Forest
-4 [ALA:225] Jund Panorama
-4 [ALA:242] Mountain
-4 [ALA:228] Savage Lands
-4 [ALA:238] Swamp
diff --git a/Mage.Client/release/sample-decks/Architect Ramp.dck b/Mage.Client/release/sample-decks/Architect Ramp.dck
deleted file mode 100644
index f8867be804b..00000000000
--- a/Mage.Client/release/sample-decks/Architect Ramp.dck	
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME:Architect Ramp
-2 [SOM:180] Myr Battlesphere
-3 [ZEN:234] Island
-3 [ZEN:236] Island
-2 [ZEN:223] Scalding Tarn
-3 [M11:70] Preordain
-3 [ZEN:235] Island
-3 [ZEN:237] Island
-4 [ROE:66] Enclave Cryptologist
-4 [ROE:85] Sea Gate Oracle
-3 [WWK:137] Halimar Depths
-4 [ZEN:50] Kraken Hatchling
-4 [SOM:33] Grand Architect
-3 [SOM:177] Molten-Tail Masticore
-4 [ROE:75] Lighthouse Chronologist
-4 [WWK:145] Tectonic Edge
-4 [ZEN:220] Misty Rainforest
-3 [WWK:31] Jace, the Mind Sculptor
-4 [SOM:223] Wurmcoil Engine
diff --git a/Mage.Client/release/sample-decks/Black Blue M11.dck b/Mage.Client/release/sample-decks/Black Blue M11.dck
deleted file mode 100644
index 2b6d14a4716..00000000000
--- a/Mage.Client/release/sample-decks/Black Blue M11.dck	
+++ /dev/null
@@ -1,26 +0,0 @@
-NAME:Black Blue M11
-2 [M11:206] Elixir of Immortality
-2 [M11:97] Grave Titan
-4 [M11:112] Reassembling Skeleton
-4 [M11:95] Doom Blade
-4 [M11:105] Mind Rot
-2 [M11:102] Liliana Vess
-2 [M11:99] Haunting Echoes
-4 [M11:62] Mana Leak
-2 [M11:103] Liliana's Caress
-2 [M11:240] Swamp
-3 [M11:239] Swamp
-2 [M11:238] Swamp
-2 [M11:58] Jace Beleren
-2 [M11:77] Traumatize
-2 [M11:241] Swamp
-2 [M11:55] Frost Titan
-1 [M11:92] Demon of Death's Gate
-2 [M11:49] Clone
-2 [M11:234] Island
-4 [M11:224] Drowned Catacomb
-1 [M11:75] Time Reversal
-2 [M11:235] Island
-2 [M11:236] Island
-3 [M11:237] Island
-4 [M11:73] Sleep
diff --git a/Mage.Client/release/sample-decks/Boros.dck b/Mage.Client/release/sample-decks/Boros.dck
deleted file mode 100644
index b57f4c3b72f..00000000000
--- a/Mage.Client/release/sample-decks/Boros.dck
+++ /dev/null
@@ -1,24 +0,0 @@
-NAME:Boros
-3 [WWK:20] Stoneforge Mystic
-3 [ZEN:195] Adventuring Gear
-2 [SOM:94] Koth of the Hammer
-4 [ZEN:223] Scalding Tarn
-3 [ZEN:14] Journey to Nowhere
-4 [ZEN:126] Goblin Guide
-1 [M11:232] Plains
-2 [M11:233] Plains
-4 [M11:149] Lightning Bolt
-1 [M11:230] Plains
-4 [ZEN:219] Marsh Flats
-1 [M11:231] Plains
-1 [M11:243] Mountain
-2 [M11:242] Mountain
-4 [ZEN:36] Steppe Lynx
-2 [M11:245] Mountain
-1 [M11:244] Mountain
-3 [SOM:104] Spikeshot Elder
-4 [ZEN:211] Arid Mesa
-4 [M11:33] Squadron Hawk
-1 [SOM:208] Sword of Body and Mind
-2 [M11:229] Terramorphic Expanse
-4 [ZEN:141] Plated Geopede
diff --git a/Mage.Client/release/sample-decks/Event Decks/[M12] Illusionary Might.dck b/Mage.Client/release/sample-decks/Event Decks/[M12] Illusionary Might.dck
new file mode 100644
index 00000000000..fd24baa09b1
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Event Decks/[M12] Illusionary Might.dck	
@@ -0,0 +1,37 @@
+//Created with Mage - www.magefree.com
+NAME:Illusionary Might
+AUTHOR:WotC
+
+# Creature
+4 [NPH:45] Spined Thopter
+1 [M12:62] Lord of the Unreal
+2 [SOM:33] Grand Architect
+1 [SOM:194] Precursor Golem
+1 [SOM:205] Steel Hellkite
+3 [M12:71] Phantasmal Dragon
+4 [M12:41] AEther Adept
+1 [M12:72] Phantasmal Image
+4 [M12:70] Phantasmal Bear
+4 [NPH:19] Porcelain Legionnaire
+# Instant
+4 [M12:63] Mana Leak
+# Sorcery
+4 [M11:70] Preordain
+# Enchantment
+3 [M12:67] Mind Control
+# Land
+1 [M12:227] Glacial Fortress
+4 [SOM:227] Glimmerpost
+5 [M12:234] Island
+5 [M12:235] Island
+5 [M12:236] Island
+4 [M12:237] Island
+
+# Sideboard
+SB: 1 [SOM:46] Stoic Rebuttal
+SB: 4 [MBS:28] Neurok Commando
+SB: 2 [M12:54] Frost Breath
+SB: 1 [M12:67] Mind Control
+SB: 3 [M12:64] Master Thief
+SB: 2 [M12:52] Flashfreeze
+SB: 2 [M12:69] Negate
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Event Decks/[M12] Vampire Onslaught.dck b/Mage.Client/release/sample-decks/Event Decks/[M12] Vampire Onslaught.dck
new file mode 100644
index 00000000000..1030faef49d
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Event Decks/[M12] Vampire Onslaught.dck	
@@ -0,0 +1,33 @@
+//Created with Mage - www.magefree.com
+NAME:Vampire Onslaught
+AUTHOR:WotC
+
+# Creature
+1 [ZEN:114] Vampire Hexmage
+4 [ZEN:115] Vampire Lacerator
+3 [M12:115] Vampire Outcasts
+2 [ZEN:83] Bloodghast
+1 [WWK:59] Kalastria Highborn
+4 [ROE:122] Pawn of Ulamog
+4 [M11:85] Bloodthrone Vampire
+2 [ZEN:116] Vampire Nighthawk
+4 [M11:120] Viscera Seer
+4 [ZEN:89] Gatekeeper of Malakir
+# Instant
+4 [NPH:57] Dismember
+# Artifact
+2 [ZEN:196] Blade of the Bloodchief
+1 [SOM:175] Mimic Vat
+# Land
+1 [ZEN:229] Verdant Catacombs
+6 [M12:238] Swamp
+6 [M12:239] Swamp
+6 [M12:240] Swamp
+5 [M12:241] Swamp
+
+# Sideboard
+SB: 3 [ZEN:114] Vampire Hexmage
+SB: 2 [ZEN:116] Vampire Nighthawk
+SB: 4 [SOM:78] Skinrender
+SB: 2 [MBS:43] Go for the Throat
+SB: 4 [M12:94] Distress
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck b/Mage.Client/release/sample-decks/Event Decks/[MBS] Infect and Defile.dck
similarity index 66%
rename from Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck
rename to Mage.Client/release/sample-decks/Event Decks/[MBS] Infect and Defile.dck
index 5b9bfec9642..ca5f44daa16 100644
--- a/Mage.Client/release/sample-decks/Mirrodin Besieged Event Decks/Infect and Defile.dck	
+++ b/Mage.Client/release/sample-decks/Event Decks/[MBS] Infect and Defile.dck	
@@ -2,27 +2,41 @@
 NAME:Infect and Defile
 AUTHOR:WotC
 
-2 [M11:62] Mana Leak
-4 [SOM:147] Corpse Cur
-3 [M11:70] Preordain
-4 [MBS:22] Corrupted Conscience
-2 [ROE:101] Consuming Vapors
+# Creature
 1 [SOM:66] Hand of the Praetors
-2 [SOM:144] Contagion Clasp
-10 [SOM:234] Island
-2 [MBS:52] Phyrexian Vatmother
+4 [SOM:147] Corpse Cur
 4 [SOM:185] Necropede
-2 [ROE:59] Deprive
-1 [M11:95] Doom Blade
+2 [MBS:52] Phyrexian Vatmother
+4 [MBS:125] Plague Myr
+# Instant
 2 [WWK:68] Smother
+2 [ROE:59] Deprive
+2 [M11:62] Mana Leak
+1 [M11:95] Doom Blade
+# Sorcery
+4 [M11:54] Foresee
+3 [M11:70] Preordain
+2 [ROE:101] Consuming Vapors
+# Artifact
+2 [SOM:144] Contagion Clasp
+# Enchantment
+4 [MBS:22] Corrupted Conscience
+# Land
 4 [ZEN:215] Jwar Isle Refuge
 2 [M11:224] Drowned Catacomb
-4 [M11:54] Foresee
-7 [SOM:238] Swamp
-4 [MBS:125] Plague Myr
-SB: 2 [MBS:43] Go for the Throat
-SB: 3 [M11:53] Flashfreeze
+3 [SOM:234] Island
+3 [SOM:235] Island
+2 [SOM:236] Island
+2 [SOM:237] Island
+2 [SOM:238] Swamp
+2 [SOM:239] Swamp
+2 [SOM:240] Swamp
+1 [SOM:241] Swamp
+
+# Sideboard
 SB: 2 [WWK:68] Smother
+SB: 3 [M11:53] Flashfreeze
+SB: 4 [M11:68] Negate
 SB: 1 [M11:95] Doom Blade
 SB: 3 [M11:91] Deathmark
-SB: 4 [M11:68] Negate
+SB: 2 [MBS:43] Go for the Throat
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck b/Mage.Client/release/sample-decks/Event Decks/[NPH] War of Attrition.dck
similarity index 80%
rename from Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck
rename to Mage.Client/release/sample-decks/Event Decks/[NPH] War of Attrition.dck
index 7e0a5785fbc..f53ef17d9e7 100644
--- a/Mage.Client/release/sample-decks/New Phyrexia Event Decks/War of Attrition.dck	
+++ b/Mage.Client/release/sample-decks/Event Decks/[NPH] War of Attrition.dck	
@@ -2,28 +2,36 @@
 NAME:War of Attrition
 AUTHOR:WotC
 
+# Creature
+2 [ZEN:19] Kor Duelist
 2 [WWK:20] Stoneforge Mystic
-4 [MBS:107] Flayer Husk
-1 [SOM:149] Darksteel Axe
-1 [MBS:14] Mirran Crusader
-1 [NPH:20] Puresteel Paladin
-4 [ZEN:14] Journey to Nowhere
+4 [M11:13] Elite Vanguard
 1 [SOM:12] Kemba, Kha Regent
-1 [MBS:133] Skinwing
-1 [M11:216] Sword of Vengeance
-21 [NPH:166] Plains
-1 [NPH:2] Apostle's Blessing
-1 [NPH:157] Sickleslicer
 4 [MBS:10] Leonin Relic-Warder
 4 [MBS:11] Leonin Skyhunter
-1 [MBS:100] Bonehoard
-4 [M11:13] Elite Vanguard
-2 [ZEN:19] Kor Duelist
+1 [MBS:14] Mirran Crusader
 4 [NPH:19] Porcelain Legionnaire
+1 [NPH:20] Puresteel Paladin
+# Instant
+1 [NPH:2] Apostle's Blessing
+# Artifact
+1 [M11:216] Sword of Vengeance
+1 [SOM:149] Darksteel Axe
+1 [MBS:100] Bonehoard
+4 [MBS:107] Flayer Husk
+1 [MBS:133] Skinwing
+1 [NPH:157] Sickleslicer
+# Enchantment
+4 [ZEN:14] Journey to Nowhere
+# Land
 2 [WWK:135] Dread Statuary
+10 [NPH:167] Plains
+11 [NPH:166] Plains
+
+# Sideboard
 SB: 4 [SOM:18] Revoke Existence
 SB: 4 [WWK:11] Kor Firewalker
-SB: 3 [M11:9] Celestial Purge
 SB: 2 [SOM:2] Arrest
+SB: 3 [M11:9] Celestial Purge
 SB: 1 [ZEN:19] Kor Duelist
-SB: 1 [NPH:2] Apostle's Blessing
+SB: 1 [NPH:2] Apostle's Blessing
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Jund.dck b/Mage.Client/release/sample-decks/Jund.dck
deleted file mode 100644
index f3c6764663f..00000000000
--- a/Mage.Client/release/sample-decks/Jund.dck
+++ /dev/null
@@ -1,26 +0,0 @@
-NAME:Jund
-4 [ALA:197] Sprouting Thrinax
-4 [ALA:156] Blightning
-4 [ARB:95] Putrid Leech
-4 [M10:146] Lightning Bolt
-2 [ARB:46] Terminate
-2 [M10:191] Master of the Wild Hunt
-2 [ZEN:221] Oran-Rief, the Vastwood
-1 [M10:242] Mountain
-4 [ZEN:229] Verdant Catacombs
-3 [ARB:92] Maelstrom Pulse
-4 [M10:227] Rootbound Crag
-4 [ALA:228] Savage Lands
-1 [M10:240] Swamp
-1 [M10:241] Swamp
-4 [ARB:50] Bloodbraid Elf
-1 [M10:239] Swamp
-1 [M10:244] Mountain
-2 [ALA:160] Broodmate Dragon
-1 [M10:245] Mountain
-1 [ZEN:119] Burst Lightning
-1 [M10:249] Forest
-3 [M10:223] Dragonskull Summit
-1 [M10:247] Forest
-2 [M10:183] Garruk Wildspeaker
-3 [ARB:34] Bituminous Blast
diff --git a/Mage.Client/release/sample-decks/M11 Starter Decks/Blades of Victory (M11).dck b/Mage.Client/release/sample-decks/M11 Starter Decks/Blades of Victory (M11).dck
deleted file mode 100644
index 25f23cc32f0..00000000000
--- a/Mage.Client/release/sample-decks/M11 Starter Decks/Blades of Victory (M11).dck	
+++ /dev/null
@@ -1,33 +0,0 @@
-1 [M11:81] Assassinate
-1 [M11:4] Angelic Arbiter
-1 [M11:26] Safe Passage
-1 [M11:2] Ajani's Mantra
-1 [M11:11] Condemn
-1 [M11:118] Stabbing Pain
-2 [M11:10] Cloud Crusader
-2 [M11:24] Palace Guard
-1 [M11:220] Warlord's Axe
-1 [M11:95] Doom Blade
-1 [M11:31] Silvercoat Lion
-2 [M11:19] Inspired Charge
-2 [M11:27] Serra Angel
-1 [M11:39] White Knight
-1 [M11:105] Mind Rot
-2 [M11:3] Ajani's Pridemate
-2 [M11:18] Infantry Veteran
-2 [M11:5] Armored Ascension
-1 [M11:96] Duress
-3 [M11:240] Swamp
-1 [M11:239] Swamp
-1 [M11:38] War Priest of Thune
-1 [M11:238] Swamp
-2 [M11:29] Siege Mastodon
-2 [M11:23] Pacifism
-4 [M11:241] Swamp
-4 [M11:232] Plains
-4 [M11:233] Plains
-4 [M11:230] Plains
-4 [M11:231] Plains
-1 [M11:22] Mighty Leap
-1 [M11:37] Vengeful Archon
-2 [M11:13] Elite Vanguard
diff --git a/Mage.Client/release/sample-decks/M11 Starter Decks/Breath of Fire (M11).dck b/Mage.Client/release/sample-decks/M11 Starter Decks/Breath of Fire (M11).dck
deleted file mode 100644
index 3044cb504dd..00000000000
--- a/Mage.Client/release/sample-decks/M11 Starter Decks/Breath of Fire (M11).dck	
+++ /dev/null
@@ -1,32 +0,0 @@
-1 [M11:126] Canyon Minotaur
-2 [M11:129] Chandra's Spitfire
-2 [M11:124] Berserkers of Blood Ridge
-2 [M11:147] Lava Axe
-1 [M11:156] Shiv's Embrace
-2 [M11:152] Prodigal Pyromancer
-1 [M11:68] Negate
-3 [M11:149] Lightning Bolt
-1 [M11:137] Fire Servant
-2 [M11:135] Ember Hauler
-3 [M11:128] Chandra's Outrage
-2 [M11:136] Fiery Hellhound
-1 [M11:122] Ancient Hellkite
-2 [M11:143] Goblin Tunneler
-1 [M11:138] Fireball
-1 [M11:70] Preordain
-1 [M11:131] Cyclops Gladiator
-1 [M11:134] Earth Servant
-1 [M11:215] Stone Golem
-1 [M11:78] Unsummon
-4 [M11:243] Mountain
-4 [M11:242] Mountain
-4 [M11:245] Mountain
-4 [M11:244] Mountain
-1 [M11:142] Goblin Piker
-1 [M11:45] Augury Owl
-2 [M11:234] Island
-2 [M11:235] Island
-1 [M11:54] Foresee
-3 [M11:236] Island
-1 [M11:47] Call to Mind
-2 [M11:237] Island
diff --git a/Mage.Client/release/sample-decks/M11 Starter Decks/Power of Prophecy (M11).dck b/Mage.Client/release/sample-decks/M11 Starter Decks/Power of Prophecy (M11).dck
deleted file mode 100644
index 2987be5ad57..00000000000
--- a/Mage.Client/release/sample-decks/M11 Starter Decks/Power of Prophecy (M11).dck	
+++ /dev/null
@@ -1,33 +0,0 @@
-1 [M11:67] Mind Control
-1 [M11:26] Safe Passage
-1 [M11:11] Condemn
-2 [M11:68] Negate
-1 [M11:72] Scroll Thief
-1 [M11:79] Wall of Frost
-1 [M11:51] Conundrum Sphinx
-2 [M11:60] Jace's Ingenuity
-1 [M11:203] Crystal Ball
-1 [M11:56] Harbor Serpent
-2 [M11:50] Cloud Elemental
-1 [M11:74] Stormtide Leviathan
-1 [M11:44] Armored Cancrix
-2 [M11:42] Air Servant
-1 [M11:32] Solemn Offering
-1 [M11:23] Pacifism
-1 [M11:46] Azure Drake
-2 [M11:232] Plains
-3 [M11:233] Plains
-2 [M11:230] Plains
-2 [M11:231] Plains
-1 [M11:22] Mighty Leap
-1 [M11:8] Blinding Mage
-2 [M11:41] AEther Adept
-2 [M11:45] Augury Owl
-2 [M11:63] Maritime Guard
-2 [M11:80] Water Servant
-4 [M11:234] Island
-4 [M11:235] Island
-2 [M11:54] Foresee
-4 [M11:236] Island
-4 [M11:237] Island
-2 [M11:73] Sleep
diff --git a/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck b/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck
deleted file mode 100644
index 9ecc9af9ab7..00000000000
--- a/Mage.Client/release/sample-decks/Magic 2011/Reign of Vampirism.dck	
+++ /dev/null
@@ -1,49 +0,0 @@
-//Created with Mage - www.magefree.com
-NAME:Reign of Vampirism
-AUTHOR:WotC
-
-1 [M11:259] Swamp
-1 [M11:258] Swamp
-1 [M11:240] Swamp
-1 [M11:87] Captivating Vampire
-2 [M11:112] Reassembling Skeleton
-2 [M11:89] Corrupt
-2 [M11:114] Rise from the GM11e
-1 [M11:296] Swamp
-3 [M11:120] Viscera Seer
-1 [M11:295] Swamp
-1 [M11:297] Swamp
-2 [M11:95] Doom Blade
-2 [M11:111] Quag Sickness
-1 [M11:260] Swamp
-1 [M11:116] Royal Assassin
-1 [M11:178] Giant Growth
-1 [M11:168] Cultivate
-1 [M11:179] Giant Spider
-3 [M11:82] Barony Vampire
-1 [M11:246] Forest
-1 [M11:240] Swamp
-3 [M11:88] Child of Night
-1 [M11:239] Swamp
-1 [M11:241] Swamp
-1 [M11:246] Forest
-1 [M11:381] Forest
-1 [M11:240] Swamp
-1 [M11:303] Forest
-1 [M11:187] Nature's Spiral
-1 [M11:238] Swamp
-3 [M11:85] Bloodthrone Vampire
-1 [M11:239] Swamp
-1 [M11:237] Swamp
-1 [M11:383] Forest
-1 [M11:186] Naturalize
-1 [M11:246] Forest
-1 [M11:197] Spined Wurm
-1 [M11:93] Diabolic Tutor
-1 [M11:296] Swamp
-3 [M11:100] Howling Banshee
-1 [M11:372] Swamp
-1 [M11:247] Forest
-1 [M11:305] Forest
-1 [M11:213] Sorcerer's Strongbox
-1 [M11:303] Forest
diff --git a/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck b/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck
deleted file mode 100644
index 34a2bf8281d..00000000000
--- a/Mage.Client/release/sample-decks/Magic 2011/Stampede of Beasts.dck	
+++ /dev/null
@@ -1,30 +0,0 @@
-//Created with Mage - www.magefree.com
-NAME:Stampede of Beasts
-AUTHOR:WotC
-
-1 [M11:190] Plummet
-1 [M11:147] Lava Axe
-1 [M11:194] Protean Hydra
-2 [M11:163] Awakener Druid
-1 [M11:149] Lightning Bolt
-2 [M11:200] Yavimaya Wurm
-2 [M11:195] Runeclaw Bear
-1 [M11:128] Chandra's Outrage
-2 [M11:178] Giant Growth
-1 [M11:138] Fireball
-1 [M11:189] Overwhelming Stampede
-1 [M11:168] Cultivate
-1 [M11:121] Act of Treason
-2 [M11:179] Giant Spider
-2 [M11:198] Sylvan Ranger
-1 [M11:196] Sacred Wolf
-2 [M11:170] Duskdale Wurm
-1 [M11:187] Nature's Spiral
-2 [M11:184] Llanowar Elves
-1 [M11:139] Fling
-1 [M11:221] Whispersilk Cloak
-1 [M11:197] Spined Wurm
-1 [M11:164] Back to Nature
-1 [M11:180] Greater Basilisk
-2 [M11:177] Garruk's Packleader
-2 [M11:193] Prized Unicorn
diff --git a/Mage.Client/release/sample-decks/NayaLightsaber.dck b/Mage.Client/release/sample-decks/NayaLightsaber.dck
deleted file mode 100644
index 4527be87973..00000000000
--- a/Mage.Client/release/sample-decks/NayaLightsaber.dck
+++ /dev/null
@@ -1,26 +0,0 @@
-NAME:Naya Lightsaber
-1 [ZEN:182] Scute Mob
-4 [M10:146] Lightning Bolt
-4 [CON:15] Path to Exile
-4 [ALA:209] Woolly Thoctar
-4 [M10:228] Sunpetal Grove
-1 [ZEN:221] Oran-Rief, the Vastwood
-4 [M10:4] Baneslayer Angel
-4 [CON:87] Noble Hierarch
-4 [M10:227] Rootbound Crag
-1 [ZEN:245] Mountain
-1 [ZEN:246] Forest
-1 [ZEN:243] Mountain
-1 [ZEN:242] Mountain
-1 [ZEN:249] Forest
-1 [ZEN:247] Forest
-1 [ZEN:248] Forest
-4 [ARB:50] Bloodbraid Elf
-1 [ZEN:233] Plains
-1 [ZEN:232] Plains
-1 [ZEN:231] Plains
-1 [ZEN:230] Plains
-4 [ALA:21] Ranger of Eos
-4 [ZEN:211] Arid Mesa
-3 [ALA:154] Ajani Vengeant
-4 [ALA:152] Wild Nacatl
diff --git a/Mage.Client/release/sample-decks/Pro Walker.dck b/Mage.Client/release/sample-decks/Pro Walker.dck
deleted file mode 100644
index 49fdd5b718c..00000000000
--- a/Mage.Client/release/sample-decks/Pro Walker.dck	
+++ /dev/null
@@ -1,24 +0,0 @@
-NAME:Pro Walker
-1 [ZEN:245] Mountain
-4 [M11:62] Mana Leak
-1 [ZEN:244] Mountain
-2 [ZEN:223] Scalding Tarn
-1 [ZEN:236] Island
-4 [CON:15] Path to Exile
-1 [ZEN:237] Island
-4 [ROE:53] Wall of Omens
-4 [M11:7] Baneslayer Angel
-2 [ROE:228] Evolving Wilds
-2 [ZEN:224] Sejiri Refuge
-1 [ZEN:232] Plains
-1 [ZEN:231] Plains
-3 [ALA:20] Oblivion Ring
-4 [ZEN:70] Spreading Seas
-4 [M11:225] Glacial Fortress
-4 [WWK:145] Tectonic Edge
-2 [ALA:9] Elspeth, Knight-Errant
-3 [WWK:31] Jace, the Mind Sculptor
-4 [WWK:133] Celestial Colonnade
-2 [ZEN:211] Arid Mesa
-3 [ALA:154] Ajani Vengeant
-3 [M11:12] Day of Judgment
diff --git a/Mage.Client/release/sample-decks/RB Aggro.dck b/Mage.Client/release/sample-decks/RB Aggro.dck
deleted file mode 100644
index 604fc329236..00000000000
--- a/Mage.Client/release/sample-decks/RB Aggro.dck	
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME:RB Aggro
-4 [ALA:156] Blightning
-2 [ZEN:245] Mountain
-2 [ZEN:244] Mountain
-2 [ZEN:243] Mountain
-2 [ZEN:242] Mountain
-4 [ZEN:223] Scalding Tarn
-4 [M10:146] Lightning Bolt
-4 [WWK:139] Lavaclaw Reaches
-3 [M10:134] Earthquake
-4 [ZEN:126] Goblin Guide
-4 [CON:65] Hellspark Elemental
-4 [M10:125] Ball Lightning
-4 [ALA:103] Hell's Thunder
-2 [CON:70] Quenchable Fire
-3 [ZEN:119] Burst Lightning
-4 [ZEN:211] Arid Mesa
-4 [M10:223] Dragonskull Summit
-4 [WWK:90] Searing Blaze
diff --git a/Mage.Client/release/sample-decks/SanDiegoLuisScott-Vargas.dck b/Mage.Client/release/sample-decks/SanDiegoLuisScott-Vargas.dck
deleted file mode 100644
index b6ec8eac967..00000000000
--- a/Mage.Client/release/sample-decks/SanDiegoLuisScott-Vargas.dck
+++ /dev/null
@@ -1,32 +0,0 @@
-NAME:SanDiegoLuisScott-Vargas
-1 [ZEN:182] Scute Mob
-1 [WWK:122] Basilisk Collar
-3 [M10:146] Lightning Bolt
-1 [CON:15] Path to Exile
-4 [CON:87] Noble Hierarch
-1 [WWK:141] Raging Ravine
-1 [M10:227] Rootbound Crag
-1 [ALA:247] Forest
-2 [M10:229] Terramorphic Expanse
-1 [ALA:246] Forest
-4 [CON:113] Knight of the Reliquary
-2 [ALA:248] Forest
-2 [WWK:20] Stoneforge Mystic
-1 [ALA:249] Forest
-1 [ALA:243] Mountain
-1 [ALA:242] Mountain
-4 [ARB:50] Bloodbraid Elf
-2 [ALA:20] Oblivion Ring
-1 [ALA:231] Plains
-1 [WWK:145] Tectonic Edge
-1 [ARB:65] Behemoth Sledge
-1 [ALA:9] Elspeth, Knight-Errant
-1 [ALA:232] Plains
-4 [ALA:21] Ranger of Eos
-3 [ZEN:220] Misty Rainforest
-2 [WWK:144] Stirring Wildwood
-4 [ZEN:211] Arid Mesa
-2 [ALA:154] Ajani Vengeant
-4 [ALA:152] Wild Nacatl
-1 [WWK:142] Sejiri Steppe
-2 [M10:168] Birds of Paradise
diff --git a/Mage.Client/release/sample-decks/SanDiegoVidugiris.dck b/Mage.Client/release/sample-decks/SanDiegoVidugiris.dck
deleted file mode 100644
index ec46e548d90..00000000000
--- a/Mage.Client/release/sample-decks/SanDiegoVidugiris.dck
+++ /dev/null
@@ -1,24 +0,0 @@
-NAME:PT SanDiego Vidurgiris
-4 [CON:113] Knight of the Reliquary
-1 [ZEN:246] Forest
-2 [ZEN:249] Forest
-1 [ZEN:235] Island
-1 [ZEN:247] Forest
-2 [ZEN:248] Forest
-1 [ZEN:237] Island
-2 [M10:228] Sunpetal Grove
-2 [ZEN:178] Rampaging Baloths
-1 [ZEN:233] Plains
-4 [CON:87] Noble Hierarch
-4 [M10:4] Baneslayer Angel
-4 [ZEN:229] Verdant Catacombs
-3 [ARB:126] Finest Hour
-1 [CON:95] Thornling
-4 [ZEN:220] Misty Rainforest
-4 [ZEN:168] Lotus Cobra
-3 [ALA:185] Rafiq of the Many
-3 [WWK:144] Stirring Wildwood
-4 [WWK:133] Celestial Colonnade
-4 [ALA:188] Rhox War Monk
-1 [WWK:142] Sejiri Steppe
-4 [M10:168] Birds of Paradise
diff --git a/Mage.Client/release/sample-decks/SanJuanMatignon.dck b/Mage.Client/release/sample-decks/SanJuanMatignon.dck
deleted file mode 100644
index 6bcddd40931..00000000000
--- a/Mage.Client/release/sample-decks/SanJuanMatignon.dck
+++ /dev/null
@@ -1,26 +0,0 @@
-NAME:San Juan Matignon
-4 [ROE:193] Kozilek's Predator
-1 [ROE:236] Island
-2 [ZEN:199] Eldrazi Monument
-1 [ROE:235] Island
-4 [WWK:138] Khalni Garden
-1 [ROE:233] Island
-4 [ROE:201] Nest Invader
-1 [WWK:97] Bestial Menace
-4 [WWK:141] Raging Ravine
-3 [WWK:31] Jace, the Mind Sculptor
-1 [ROE:242] Mountain
-4 [ROE:176] Awakening Zone
-3 [ROE:145] Flame Slash
-1 [ROE:246] Forest
-1 [ROE:247] Forest
-1 [ROE:248] Forest
-4 [ZEN:223] Scalding Tarn
-1 [ROE:142] Emrakul's Hatcher
-2 [ROE:85] Sea Gate Oracle
-2 [ZEN:159] Beastmaster Ascension
-1 [ROE:228] Evolving Wilds
-3 [ROE:92] Unified Will
-3 [ROE:86] See Beyond
-4 [ZEN:220] Misty Rainforest
-4 [ZEN:119] Burst Lightning
diff --git a/Mage.Client/release/sample-decks/SanJuanSwartz.dck b/Mage.Client/release/sample-decks/SanJuanSwartz.dck
deleted file mode 100644
index e8552643dc1..00000000000
--- a/Mage.Client/release/sample-decks/SanJuanSwartz.dck
+++ /dev/null
@@ -1,19 +0,0 @@
-NAME:Swartz San Juan
-3 [ZEN:246] Forest
-4 [ROE:193] Kozilek's Predator
-4 [ZEN:199] Eldrazi Monument
-4 [ZEN:249] Forest
-4 [WWK:138] Khalni Garden
-3 [ZEN:247] Forest
-4 [ROE:201] Nest Invader
-3 [ZEN:248] Forest
-3 [ZEN:159] Beastmaster Ascension
-4 [WWK:118] Wolfbriar Elemental
-4 [ROE:190] Joraga Treespeaker
-4 [WWK:95] Arbor Elf
-2 [ZEN:229] Verdant Catacombs
-4 [ROE:212] Vengevine
-1 [ZEN:180] River Boa
-4 [ZEN:220] Misty Rainforest
-4 [ZEN:168] Lotus Cobra
-1 [WWK:135] Dread Statuary
diff --git a/Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck b/Mage.Client/release/sample-decks/Starter Decks/[M11] Blades of Victory.dck
similarity index 77%
rename from Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[M11] Blades of Victory.dck
index fde1c138aad..46a4134d0a9 100644
--- a/Mage.Client/release/sample-decks/Magic 2011/Blades of Victory.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M11] Blades of Victory.dck	
@@ -2,36 +2,47 @@
 NAME:Blades of Victory
 AUTHOR:WotC
 
-1 [M11:81] Assassinate
-1 [M11:4] Angelic Arbiter
-1 [M11:26] Safe Passage
-1 [M11:2] Ajani's Mantra
-1 [M11:11] Condemn
-1 [M11:118] Stabbing Pain
-2 [M11:10] Cloud Crusader
-2 [M10:23] Palace Guard
-1 [M11:220] Warlord's Axe
-1 [M11:95] Doom Blade
-1 [M11:31] Silvercoat Lion
-2 [M11:19] Inspired Charge
-2 [M10:29] Serra Angel
-1 [M11:39] White Knight
-1 [M11:105] Mind Rot
+# Creature
 2 [M11:3] Ajani's Pridemate
+1 [M11:4] Angelic Arbiter
+2 [M11:10] Cloud Crusader
+2 [M11:13] Elite Vanguard
 2 [M11:18] Infantry Veteran
-2 [M11:5] Armored Ascension
-1 [M11:96] Duress
-3 [M11:240] Swamp
-1 [M11:239] Swamp
-1 [M11:38] War Priest of Thune
-1 [M11:238] Swamp
+2 [M11:24] Palace Guard
+2 [M11:27] Serra Angel
 2 [M11:29] Siege Mastodon
+1 [M11:31] Silvercoat Lion
+1 [M11:37] Vengeful Archon
+1 [M11:38] War Priest of Thune
+1 [M11:39] White Knight
+
+# Instant
+1 [M11:11] Condemn
+2 [M11:19] Inspired Charge
+1 [M11:22] Mighty Leap
+1 [M11:26] Safe Passage
+1 [M11:95] Doom Blade
+1 [M11:118] Stabbing Pain
+
+# Sorcery
+1 [M11:81] Assassinate
+1 [M11:96] Duress
+1 [M11:105] Mind Rot
+
+# Artifact
+1 [M11:220] Warlord's Axe
+
+# Enchantment
+1 [M11:2] Ajani's Mantra
+2 [M11:5] Armored Ascension
 2 [M11:23] Pacifism
-4 [M11:241] Swamp
-4 [M11:232] Plains
-4 [M11:233] Plains
+
+# Land
 4 [M11:230] Plains
 4 [M11:231] Plains
-1 [M11:22] Mighty Leap
-1 [M11:37] Vengeful Archon
-2 [M11:13] Elite Vanguard
+4 [M11:232] Plains
+4 [M11:233] Plains
+3 [M11:238] Swamp
+2 [M11:239] Swamp
+2 [M11:240] Swamp
+2 [M11:241] Swamp
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck b/Mage.Client/release/sample-decks/Starter Decks/[M11] Breath of Fire.dck
similarity index 83%
rename from Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[M11] Breath of Fire.dck
index 799c01231e0..37b5735cb6f 100644
--- a/Mage.Client/release/sample-decks/Magic 2011/Breath of Fire.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M11] Breath of Fire.dck	
@@ -2,35 +2,44 @@
 NAME:Breath of Fire
 AUTHOR:WotC
 
+# Creature
+1 [M11:45] Augury Owl
+1 [M11:122] Ancient Hellkite
+2 [M11:124] Berserkers of Blood Ridge
 1 [M11:126] Canyon Minotaur
 2 [M11:129] Chandra's Spitfire
-2 [M11:124] Berserkers of Blood Ridge
-2 [M11:147] Lava Axe
-1 [M11:156] Shiv's Embrace
-2 [M11:152] Prodigal Pyromancer
-1 [M11:68] Negate
-3 [M11:149] Lightning Bolt
-1 [M11:137] Fire Servant
-2 [M11:135] Ember Hauler
-3 [M11:128] Chandra's Outrage
-2 [M11:136] Fiery Hellhound
-1 [M11:122] Ancient Hellkite
-2 [M11:143] Goblin Tunneler
-1 [M11:138] Fireball
-1 [M11:70] Preordain
 1 [M11:131] Cyclops Gladiator
 1 [M11:134] Earth Servant
-1 [M11:215] Stone Golem
-1 [M11:78] Unsummon
-4 [M11:243] Mountain
-4 [M11:242] Mountain
-4 [M11:245] Mountain
-4 [M11:244] Mountain
+2 [M11:135] Ember Hauler
+2 [M11:136] Fiery Hellhound
+1 [M11:137] Fire Servant
 1 [M11:142] Goblin Piker
-1 [M11:45] Augury Owl
-2 [M11:234] Island
-2 [M11:235] Island
-1 [M11:54] Foresee
-3 [M11:236] Island
+2 [M11:143] Goblin Tunneler
+2 [M11:152] Prodigal Pyromancer
+1 [M11:215] Stone Golem
+
+# Instant
+1 [M11:68] Negate
+1 [M11:78] Unsummon
+3 [M11:128] Chandra's Outrage
+3 [M11:149] Lightning Bolt
+
+# Sorcery
 1 [M11:47] Call to Mind
+1 [M11:54] Foresee
+1 [M11:70] Preordain
+1 [M11:138] Fireball
+2 [M11:147] Lava Axe
+
+# Enchantment
+1 [M11:156] Shiv's Embrace
+
+# Land
+3 [M11:234] Island
+2 [M11:235] Island
+2 [M11:236] Island
 2 [M11:237] Island
+4 [M11:242] Mountain
+4 [M11:243] Mountain
+4 [M11:244] Mountain
+4 [M11:245] Mountain
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck b/Mage.Client/release/sample-decks/Starter Decks/[M11] Power of Prophecy.dck
similarity index 81%
rename from Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[M11] Power of Prophecy.dck
index 30cd2b60292..97fe9a2b7ff 100644
--- a/Mage.Client/release/sample-decks/Magic 2011/Power of Prophecy.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M11] Power of Prophecy.dck	
@@ -2,36 +2,47 @@
 NAME:Power of Prophecy
 AUTHOR:WotC
 
-1 [M11:67] Mind Control
-1 [M11:26] Safe Passage
-1 [M11:11] Condemn
-2 [M11:68] Negate
-1 [M11:72] Scroll Thief
-1 [M11:79] Wall of Frost
-1 [M11:51] Conundrum Sphinx
-2 [M11:60] Jace's Ingenuity
-1 [M11:203] Crystal Ball
-1 [M11:56] Harbor Serpent
-2 [M11:50] Cloud Elemental
-1 [M11:74] Stormtide Leviathan
-1 [M11:44] Armored Cancrix
-2 [M11:42] Air Servant
-1 [M11:32] Solemn Offering
-1 [M11:23] Pacifism
-1 [M11:46] Azure Drake
-2 [M11:232] Plains
-3 [M11:233] Plains
-2 [M11:230] Plains
-2 [M11:231] Plains
-1 [M11:22] Mighty Leap
+# Creature
 1 [M11:8] Blinding Mage
 2 [M11:41] AEther Adept
+2 [M11:42] Air Servant
+1 [M11:44] Armored Cancrix
 2 [M11:45] Augury Owl
+1 [M11:46] Azure Drake
+2 [M11:50] Cloud Elemental
+1 [M11:51] Conundrum Sphinx
+1 [M11:56] Harbor Serpent
 2 [M11:63] Maritime Guard
+1 [M11:72] Scroll Thief
+1 [M11:74] Stormtide Leviathan
+1 [M11:79] Wall of Frost
 2 [M11:80] Water Servant
+
+# Instant
+1 [M11:11] Condemn
+1 [M11:22] Mighty Leap
+1 [M11:26] Safe Passage
+2 [M11:60] Jace's Ingenuity
+2 [M11:68] Negate
+
+# Sorcery
+1 [M11:32] Solemn Offering
+2 [M11:54] Foresee
+2 [M11:73] Sleep
+
+# Artifact
+1 [M11:203] Crystal Ball
+
+# Enchantment
+1 [M11:23] Pacifism
+1 [M11:67] Mind Control
+
+# Land
+3 [M11:230] Plains
+2 [M11:231] Plains
+2 [M11:232] Plains
+2 [M11:233] Plains
 4 [M11:234] Island
 4 [M11:235] Island
-2 [M11:54] Foresee
 4 [M11:236] Island
-4 [M11:237] Island
-2 [M11:73] Sleep
+4 [M11:237] Island
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/M11 Starter Decks/Reign of Vampirism (M11).dck b/Mage.Client/release/sample-decks/Starter Decks/[M11] Reign of Vampirism.dck
similarity index 76%
rename from Mage.Client/release/sample-decks/M11 Starter Decks/Reign of Vampirism (M11).dck
rename to Mage.Client/release/sample-decks/Starter Decks/[M11] Reign of Vampirism.dck
index 42a1788cdce..8abe2048ea8 100644
--- a/Mage.Client/release/sample-decks/M11 Starter Decks/Reign of Vampirism (M11).dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M11] Reign of Vampirism.dck	
@@ -1,23 +1,38 @@
-1 [M11:87] Captivating Vampire
-2 [M11:112] Reassembling Skeleton
-2 [M11:89] Corrupt
-2 [M11:114] Rise from the Grave
-3 [M11:120] Viscera Seer
-2 [M11:95] Doom Blade
-2 [M11:111] Quag Sickness
-1 [M11:116] Royal Assassin
-1 [M11:178] Giant Growth
-1 [M11:168] Cultivate
-1 [M11:179] Giant Spider
+//Created with Mage - www.magefree.com
+NAME:Reign of Vampirism
+AUTHOR:WotC
+
+# Creature
 3 [M11:82] Barony Vampire
-3 [M11:88] Child of Night
-1 [M11:187] Nature's Spiral
 3 [M11:85] Bloodthrone Vampire
-1 [M11:186] Naturalize
-1 [M11:197] Spined Wurm
-2 [M11:93] Diabolic Tutor
+1 [M11:87] Captivating Vampire
+3 [M11:88] Child of Night
 2 [M11:100] Howling Banshee
+2 [M11:112] Reassembling Skeleton
+1 [M11:116] Royal Assassin
+3 [M11:120] Viscera Seer
+1 [M11:179] Giant Spider
+1 [M11:197] Spined Wurm
+
+# Instant
+2 [M11:93] Diabolic Tutor
+2 [M11:95] Doom Blade
+2 [M11:114] Rise from the Grave
+1 [M11:178] Giant Growth
+1 [M11:186] Naturalize
+
+#Sorcery
+2 [M11:89] Corrupt
+1 [M11:168] Cultivate
+1 [M11:187] Nature's Spiral
+
+# Artifact
 1 [M11:213] Sorcerer's Strongbox
+
+# Enchantment
+2 [M11:111] Quag Sickness
+
+# Land
 4 [M11:238] Swamp
 4 [M11:239] Swamp
 4 [M11:240] Swamp
@@ -25,4 +40,4 @@
 3 [M11:246] Forest
 2 [M11:247] Forest
 2 [M11:248] Forest
-2 [M11:249] Forest
+2 [M11:249] Forest
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/M11 Starter Decks/Stampede of Beasts (M11).dck b/Mage.Client/release/sample-decks/Starter Decks/[M11] Stampede of Beasts.dck
similarity index 80%
rename from Mage.Client/release/sample-decks/M11 Starter Decks/Stampede of Beasts (M11).dck
rename to Mage.Client/release/sample-decks/Starter Decks/[M11] Stampede of Beasts.dck
index 7dfa5bd33a2..8372a5ff1b9 100644
--- a/Mage.Client/release/sample-decks/M11 Starter Decks/Stampede of Beasts (M11).dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M11] Stampede of Beasts.dck	
@@ -1,34 +1,47 @@
-1 [M11:190] Plummet
-1 [M11:147] Lava Axe
-1 [M11:194] Protean Hydra
+//Created with Mage - www.magefree.com
+NAME:Stampede of Beasts
+AUTHOR:WotC
+
+# Creature
 2 [M11:163] Awakener Druid
-1 [M11:149] Lightning Bolt
-2 [M11:200] Yavimaya Wurm
-2 [M11:243] Mountain
-2 [M11:242] Mountain
-2 [M11:245] Mountain
-2 [M11:244] Mountain
-2 [M11:195] Runeclaw Bear
-1 [M11:128] Chandra's Outrage
-1 [M11:138] Fireball
-2 [M11:178] Giant Growth
-1 [M11:189] Overwhelming Stampede
-1 [M11:168] Cultivate
-1 [M11:121] Act of Treason
+2 [M11:170] Duskdale Wurm
+2 [M11:177] Garruk's Packleader
 2 [M11:179] Giant Spider
-2 [M11:198] Sylvan Ranger
+1 [M11:180] Greater Basilisk
+2 [M11:184] Llanowar Elves
+2 [M11:193] Prized Unicorn
+1 [M11:194] Protean Hydra
+2 [M11:195] Runeclaw Bear
 1 [M11:196] Sacred Wolf
+1 [M11:197] Spined Wurm
+2 [M11:198] Sylvan Ranger
+2 [M11:200] Yavimaya Wurm
+
+# Instant
+1 [M11:128] Chandra's Outrage
+1 [M11:139] Fling
+1 [M11:149] Lightning Bolt
+1 [M11:164] Back to Nature
+2 [M11:178] Giant Growth
+1 [M11:190] Plummet
+
+# Sorcery
+1 [M11:121] Act of Treason
+1 [M11:138] Fireball
+1 [M11:147] Lava Axe
+1 [M11:168] Cultivate
+1 [M11:187] Nature's Spiral
+1 [M11:189] Overwhelming Stampede
+
+# Artifact
+1 [M11:221] Whispersilk Cloak
+
+# Land
+2 [M11:242] Mountain
+2 [M11:243] Mountain
+2 [M11:244] Mountain
+2 [M11:245] Mountain
 4 [M11:246] Forest
 4 [M11:247] Forest
 4 [M11:248] Forest
-4 [M11:249] Forest
-2 [M11:170] Duskdale Wurm
-1 [M11:187] Nature's Spiral
-2 [M11:184] Llanowar Elves
-1 [M11:139] Fling
-1 [M11:221] Whispersilk Cloak
-1 [M11:197] Spined Wurm
-1 [M11:164] Back to Nature
-1 [M11:180] Greater Basilisk
-2 [M11:193] Prized Unicorn
-2 [M11:177] Garruk's Packleader
+4 [M11:249] Forest
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Starter Decks/[M12] Sacred Assault.dck b/Mage.Client/release/sample-decks/Starter Decks/[M12] Sacred Assault.dck
new file mode 100644
index 00000000000..04baa1c1128
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Starter Decks/[M12] Sacred Assault.dck	
@@ -0,0 +1,34 @@
+//Created with Mage - www.magefree.com
+NAME:Sacred Assault
+AUTHOR:WotC
+
+2 [M12:194] Sacred Wolf
+1 [M12:183] Lure
+2 [M12:35] Spirit Mantle
+2 [M12:29] Peregrine Griffin
+2 [M12:20] Griffin Rider
+1 [M12:181] Jade Mage
+2 [M12:169] Cudgel Troll
+1 [M12:1] Aegis Angel
+2 [M12:2] Alabaster Mage
+2 [M12:21] Griffin Sentinel
+1 [M12:178] Gladecover Scout
+3 [M12:28] Pacifism
+2 [M12:14] Divine Favor
+2 [M12:220] Thran Golem
+1 [M12:185] Naturalize
+1 [M12:199] Trollhide
+3 [M12:8] Assault Griffin
+2 [M12:9] Auramancer
+1 [M12:24] Lifelink
+1 [M12:25] Mesa Enchantress
+2 [M12:15] Elite Vanguard
+# Land
+4 [M12:230] Plains
+4 [M12:231] Plains
+3 [M12:232] Plains
+3 [M12:233] Plains
+3 [M12:246] Forest
+3 [M12:247] Forest
+2 [M12:248] Forest
+2 [M12:249] Forest
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Starter Decks/[MBS] Doom Inevitable.dck b/Mage.Client/release/sample-decks/Starter Decks/[MBS] Doom Inevitable.dck
new file mode 100644
index 00000000000..78626639801
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Starter Decks/[MBS] Doom Inevitable.dck	
@@ -0,0 +1,34 @@
+//Created with Mage - www.magefree.com
+NAME:Doom Inevitable
+AUTHOR:WotC
+
+1 [M11:67] Mind Control
+1 [MBS:107] Flayer Husk
+1 [MBS:126] Psychosis Crawler
+2 [MBS:133] Skinwing
+2 [MBS:123] Pierce Strider
+1 [M11:94] Disentomb
+1 [MBS:56] Spread the Sickness
+2 [SOM:213] Trigon of Corruption
+1 [M11:95] Doom Blade
+1 [MBS:100] Bonehoard
+2 [MBS:51] Phyrexian Rager
+1 [M11:82] Barony Vampire
+1 [MBS:36] Vedalken Anatomist
+3 [MBS:29] Oculus
+1 [MBS:33] Steel Sabotage
+1 [M11:44] Armored Cancrix
+1 [SOM:78] Skinrender
+2 [MBS:116] Myr Sire
+2 [MBS:38] Vivisection
+1 [MBS:137] Strandwalker
+2 [SOM:144] Contagion Clasp
+1 [MBS:40] Caustic Hound
+2 [SOM:63] Fume Spitter
+1 [MBS:45] Horrifying Revelation
+1 [SOM:45] Steady Progress
+# Land
+7 [MBS:148] Island
+6 [MBS:149] Island
+6 [MBS:150] Swamp
+6 [MBS:151] Swamp
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Deadspread.dck
similarity index 93%
rename from Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[SOM] Deadspread.dck
index cbb7aa2441f..d06db62a10a 100644
--- a/Mage.Client/release/sample-decks/Scars of Mirrodin/Deadspread.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Deadspread.dck	
@@ -7,10 +7,6 @@ AUTHOR:WotC
 1 [SOM:217] Trigon of Thought
 2 [SOM:170] Leaden Myr
 1 [M11:95] Doom Blade
-4 [SOM:238] Swamp
-3 [SOM:239] Swamp
-3 [SOM:240] Swamp
-3 [SOM:241] Swamp
 1 [M11:56] Harbor Serpent
 2 [SOM:202] Silver Myr
 1 [SOM:211] Throne of Geth
@@ -20,10 +16,6 @@ AUTHOR:WotC
 2 [SOM:44] Sky-Eel School
 2 [SOM:144] Contagion Clasp
 2 [SOM:47] Thrummingbird
-4 [SOM:234] Island
-3 [SOM:235] Island
-3 [SOM:236] Island
-3 [SOM:237] Island
 2 [SOM:63] Fume Spitter
 1 [SOM:30] Darkslick Drake
 1 [SOM:213] Trigon of Corruption
@@ -33,3 +25,11 @@ AUTHOR:WotC
 1 [SOM:145] Contagion Engine
 2 [SOM:68] Instill Infection
 1 [M11:213] Sorcerer's Strongbox
+4 [SOM:234] Island
+3 [SOM:235] Island
+3 [SOM:236] Island
+3 [SOM:237] Island
+4 [SOM:238] Swamp
+3 [SOM:239] Swamp
+3 [SOM:240] Swamp
+3 [SOM:241] Swamp
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Starter Decks/[SOM] Metalcraft.dck b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Metalcraft.dck
new file mode 100644
index 00000000000..d720029058d
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Metalcraft.dck	
@@ -0,0 +1,33 @@
+//Created with Mage - www.magefree.com
+NAME:Metalcraft
+AUTHOR:WotC
+
+1 [SOM:161] Golem's Heart
+2 [SOM:36] Lumengrid Drake
+1 [SOM:28] Argent Sphinx
+1 [SOM:199] Rusted Relic
+2 [SOM:48] Trinket Mage
+1 [SOM:153] Echo Circlet
+2 [SOM:31] Disperse
+1 [SOM:209] Sylvok Lifestaff
+3 [SOM:142] Chrome Steed
+2 [SOM:174] Memnite
+2 [SOM:168] Iron Myr
+3 [SOM:203] Snapsail Glider
+2 [SOM:202] Silver Myr
+1 [SOM:160] Golem Foundry
+1 [SOM:149] Darksteel Axe
+1 [SOM:154] Etched Champion
+2 [SOM:87] Embersmith
+1 [SOM:136] Accorder's Shield
+2 [SOM:84] Blade-Tribe Berserkers
+3 [SOM:91] Galvanic Blast
+2 [SOM:40] Riddlesmith
+3 [SOM:234] Island
+3 [SOM:235] Island
+3 [SOM:236] Island
+3 [SOM:237] Island
+3 [SOM:242] Mountain
+3 [SOM:243] Mountain
+3 [SOM:244] Mountain
+3 [SOM:245] Mountain
diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Myr of Mirrodin.dck
similarity index 96%
rename from Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[SOM] Myr of Mirrodin.dck
index 2373c139d75..e0ba6c3af0c 100644
--- a/Mage.Client/release/sample-decks/Scars of Mirrodin/Myr of Mirrodin.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Myr of Mirrodin.dck	
@@ -18,10 +18,10 @@ AUTHOR:WotC
 2 [SOM:16] Myrsmith
 1 [SOM:152] Darksteel Sentinel
 1 [SOM:22] Sunblast Angel
+2 [M11:19] Inspired Charge
+3 [SOM:2] Arrest
+2 [SOM:13] Kemba's Skyguard
 6 [SOM:230] Plains
 6 [SOM:231] Plains
 6 [SOM:232] Plains
 6 [SOM:233] Plains
-2 [M11:19] Inspired Charge
-3 [SOM:2] Arrest
-2 [SOM:13] Kemba's Skyguard
diff --git a/Mage.Client/release/sample-decks/Starter Decks/[SOM] Phyrexian Poison.dck b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Phyrexian Poison.dck
new file mode 100644
index 00000000000..e41c5fbf932
--- /dev/null
+++ b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Phyrexian Poison.dck	
@@ -0,0 +1,32 @@
+//Created with Mage - www.magefree.com
+NAME:Phyrexian Poison
+AUTHOR:WotC
+
+2 [SOM:147] Corpse Cur
+2 [M11:81] Assassinate
+1 [SOM:164] Heavy Arbalest
+3 [SOM:166] Ichorclaw Myr
+2 [SOM:117] Cystbearer
+1 [M11:114] Rise from the Grave
+3 [SOM:75] Plague Stinger
+2 [SOM:127] Slice in Twain
+1 [SOM:207] Strider Harness
+2 [M11:178] Giant Growth
+2 [SOM:128] Tangle Angler
+1 [SOM:54] Blackcleave Goblin
+2 [SOM:140] Bladed Pinions
+1 [SOM:66] Hand of the Praetors
+1 [SOM:126] Putrefax
+1 [SOM:58] Contagious Nim
+2 [SOM:185] Necropede
+2 [SOM:115] Carrion Call
+2 [SOM:67] Ichor Rats
+1 [SOM:77] Relic Putrescence
+4 [SOM:238] Swamp
+3 [SOM:239] Swamp
+3 [SOM:240] Swamp
+3 [SOM:241] Swamp
+4 [SOM:246] Forest
+3 [SOM:247] Forest
+3 [SOM:248] Forest
+3 [SOM:249] Forest
diff --git a/Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Relic Breaker.dck
similarity index 93%
rename from Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck
rename to Mage.Client/release/sample-decks/Starter Decks/[SOM] Relic Breaker.dck
index ed6b36fe9ce..97c8606a7b9 100644
--- a/Mage.Client/release/sample-decks/Scars of Mirrodin/Relic Breaker.dck	
+++ b/Mage.Client/release/sample-decks/Starter Decks/[SOM] Relic Breaker.dck	
@@ -16,10 +16,6 @@ AUTHOR:WotC
 2 [SOM:146] Copper Myr
 1 [SOM:132] Viridian Revel
 1 [SOM:108] Acid Web Spider
-3 [SOM:242] Mountain
-3 [SOM:243] Mountain
-3 [SOM:244] Mountain
-3 [SOM:245] Mountain
 2 [SOM:81] Arc Trail
 1 [SOM:139] Barbed Battlegear
 2 [SOM:89] Flameborn Hellion
@@ -28,8 +24,12 @@ AUTHOR:WotC
 3 [SOM:221] Vulshok Replica
 2 [SOM:83] Barrage Ogre
 2 [SOM:210] Sylvok Replica
+1 [SOM:165] Horizon Spellbomb
+3 [SOM:242] Mountain
+3 [SOM:243] Mountain
+3 [SOM:244] Mountain
+3 [SOM:245] Mountain
 3 [SOM:246] Forest
 3 [SOM:247] Forest
 3 [SOM:248] Forest
-3 [SOM:249] Forest
-1 [SOM:165] Horizon Spellbomb
+3 [SOM:249] Forest
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/UW Control.dck b/Mage.Client/release/sample-decks/UW Control.dck
deleted file mode 100644
index 3033c885668..00000000000
--- a/Mage.Client/release/sample-decks/UW Control.dck	
+++ /dev/null
@@ -1,29 +0,0 @@
-NAME:UW Control
-2 [ROE:236] Island
-1 [ROE:235] Island
-1 [ROE:234] Island
-2 [ROE:233] Island
-2 [CON:15] Path to Exile
-3 [ROE:21] Gideon Jura
-1 [CON:11] Martial Coup
-2 [ZEN:9] Day of Judgment
-1 [ZEN:216] Kabira Crossroads
-4 [WWK:31] Jace, the Mind Sculptor
-3 [M10:64] Mind Spring
-3 [WWK:123] Everflowing Chalice
-1 [ROE:232] Plains
-4 [ROE:53] Wall of Omens
-1 [ROE:229] Plains
-1 [ROE:230] Plains
-1 [ROE:231] Plains
-3 [ALA:20] Oblivion Ring
-4 [ZEN:70] Spreading Seas
-4 [WWK:145] Tectonic Edge
-1 [ALA:9] Elspeth, Knight-Errant
-2 [ROE:59] Deprive
-1 [ZEN:220] Misty Rainforest
-4 [WWK:133] Celestial Colonnade
-1 [ZEN:211] Arid Mesa
-4 [M10:226] Glacial Fortress
-1 [WWK:142] Sejiri Steppe
-2 [M10:65] Negate
diff --git a/Mage.Client/release/sample-decks/UWR Walker.dck b/Mage.Client/release/sample-decks/UWR Walker.dck
deleted file mode 100644
index 55b9769bddd..00000000000
--- a/Mage.Client/release/sample-decks/UWR Walker.dck	
+++ /dev/null
@@ -1,28 +0,0 @@
-NAME:UWR Walker
-3 [CON:15] Path to Exile
-3 [M11:149] Lightning Bolt
-1 [ROE:21] Gideon Jura
-2 [M11:35] Sun Titan
-3 [WWK:31] Jace, the Mind Sculptor
-2 [M11:12] Day of Judgment
-1 [ZEN:244] Mountain
-1 [ZEN:234] Island
-4 [M11:62] Mana Leak
-1 [ZEN:243] Mountain
-1 [ZEN:236] Island
-3 [ZEN:223] Scalding Tarn
-2 [M11:70] Preordain
-1 [ZEN:237] Island
-3 [ROE:53] Wall of Omens
-2 [M11:58] Jace Beleren
-3 [ROE:85] Sea Gate Oracle
-1 [ZEN:233] Plains
-1 [ZEN:232] Plains
-1 [ALA:20] Oblivion Ring
-1 [ZEN:231] Plains
-4 [M11:225] Glacial Fortress
-3 [WWK:145] Tectonic Edge
-2 [ALA:9] Elspeth, Knight-Errant
-4 [ZEN:211] Arid Mesa
-3 [ALA:154] Ajani Vengeant
-4 [WWK:133] Celestial Colonnade
diff --git a/Mage.Client/release/sample-decks/WhiteTokens.dck b/Mage.Client/release/sample-decks/WhiteTokens.dck
deleted file mode 100644
index 90d20b542bf..00000000000
--- a/Mage.Client/release/sample-decks/WhiteTokens.dck
+++ /dev/null
@@ -1,24 +0,0 @@
-NAME:Mono-white Tokens
-4 [CON:15] Path to Exile
-2 [M10:41] White Knight
-2 [M10:225] Gargoyle Castle
-2 [ZEN:11] Emeria Angel
-2 [ZEN:4] Brave the Elements
-2 [ZEN:233] Plains
-4 [ZEN:219] Marsh Flats
-2 [ZEN:232] Plains
-3 [ALA:20] Oblivion Ring
-2 [ZEN:231] Plains
-1 [ALA:230] Plains
-4 [ZEN:36] Steppe Lynx
-2 [ZEN:230] Plains
-1 [ALA:231] Plains
-1 [CON:11] Martial Coup
-2 [ALA:232] Plains
-4 [ALA:21] Ranger of Eos
-2 [ALA:233] Plains
-4 [M10:16] Honor of the Pure
-4 [ZEN:211] Arid Mesa
-2 [M10:34] Soul Warden
-4 [ZEN:8] Conqueror's Pledge
-4 [ALA:16] Knight of the White Orchid
diff --git a/Mage.Client/release/sample-decks/WorldChampionships-Calafell.dck b/Mage.Client/release/sample-decks/WorldChampionships-Calafell.dck
deleted file mode 100644
index 5629d9f6901..00000000000
--- a/Mage.Client/release/sample-decks/WorldChampionships-Calafell.dck
+++ /dev/null
@@ -1,22 +0,0 @@
-NAME:World Championships Calafell
-4 [M10:75] Time Warp
-3 [M10:234] Island
-1 [CON:15] Path to Exile
-1 [M10:233] Plains
-2 [M10:237] Island
-4 [M10:212] Howling Mine
-3 [M10:236] Island
-1 [M10:231] Plains
-2 [M10:235] Island
-2 [M10:232] Plains
-4 [M10:58] Jace Beleren
-2 [M10:230] Plains
-4 [CON:136] Font of Mythos
-2 [ZEN:37] Sunspring Expedition
-2 [ZEN:41] Archive Trap
-3 [ZEN:9] Day of Judgment
-4 [ZEN:216] Kabira Crossroads
-4 [M10:53] Flashfreeze
-4 [M10:226] Glacial Fortress
-4 [ALA:4] Angelsong
-4 [M10:28] Safe Passage