diff --git a/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Hexproof Enchantress.dck b/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Hexproof Enchantress.dck
index b3b2b6344c..192480000a 100644
--- a/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Hexproof Enchantress.dck	
+++ b/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Hexproof Enchantress.dck	
@@ -13,6 +13,4 @@
 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)|
+4 [NPH:35] Gitaxian Probe
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Shouta Yasooka's Blue-Black Control.dck b/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Shouta Yasooka's Blue-Black Control.dck
index c3e4d2ed6d..1ddd0ff1b0 100644
--- a/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Shouta Yasooka's Blue-Black Control.dck	
+++ b/Mage.Client/release/sample-decks/2011/Unsorted (submitted by Iran)/Shouta Yasooka's Blue-Black Control.dck	
@@ -19,6 +19,4 @@
 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)|
+1 [SOM:223] Wurmcoil Engine
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/AI/FastRedHaste.dck b/Mage.Client/release/sample-decks/AI/FastRedHaste.dck
index 94361d193b..08ba72bbc5 100644
--- a/Mage.Client/release/sample-decks/AI/FastRedHaste.dck
+++ b/Mage.Client/release/sample-decks/AI/FastRedHaste.dck
@@ -72,6 +72,4 @@ NAME:FastRedHaste
 1 [KLD:236] Snare Thopter
 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: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)|
+1 [ONS:199] Dwarven Blastminer
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/AI/Poison.dck b/Mage.Client/release/sample-decks/AI/Poison.dck
index aec84cce2f..c67af32bb7 100644
--- a/Mage.Client/release/sample-decks/AI/Poison.dck
+++ b/Mage.Client/release/sample-decks/AI/Poison.dck
@@ -93,6 +93,4 @@ NAME:Poison
 1 [MBS:145] Inkmoth Nexus
 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: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)|
+1 [AKH:187] Sixth Sense
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/AI/Zombi & Skeleton.dck b/Mage.Client/release/sample-decks/AI/Zombi & Skeleton.dck
index e9fe8430d1..f3dc4da9dc 100644
--- a/Mage.Client/release/sample-decks/AI/Zombi & Skeleton.dck	
+++ b/Mage.Client/release/sample-decks/AI/Zombi & Skeleton.dck	
@@ -113,6 +113,4 @@ NAME:Zombi & Skeleton
 1 [NPH:25] Suture Priest
 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: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)|
+1 [DTK:172] Ainok Survivalist
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2011/Devour for Power.dck b/Mage.Client/release/sample-decks/Commander/Commander 2011/Devour for Power.dck
index c453b22df4..f750ea0d79 100644
--- a/Mage.Client/release/sample-decks/Commander/Commander 2011/Devour for Power.dck	
+++ b/Mage.Client/release/sample-decks/Commander/Commander 2011/Devour for Power.dck	
@@ -82,6 +82,4 @@
 1 [CMD:98] Sewer Nemesis
 1 [CMD:99] Shared Trauma
 2 [CMD:318] Forest
-SB: 1 [CMD:210] The Mimeoplasm
-LAYOUT MAIN:(2,10)(CMC,true,50)|()()([CMD:92],[CMD:227])([CMD:152],[CMD:83],[CMD:59],[CMD:176],[CMD:179])([CMD:145],[CMD:193],[CMD:44],[CMD:86],[CMD:165],[CMD:89],[CMD:98],[CMD:262],[CMD:71])([CMD:140],[CMD:52],[CMD:236])([CMD:76],[CMD:81],[CMD:97],[CMD:235],[CMD:239])([CMD:75],[CMD:191],[CMD:93],[CMD:62],[CMD:228],[CMD:263])([CMD:73])([CMD:1])([CMD:266],[CMD:269],[CMD:270],[CMD:271],[CMD:315],[CMD:315],[CMD:316],[CMD:316],[CMD:317],[CMD:317],[CMD:318],[CMD:318],[CMD:275],[CMD:303],[CMD:303],[CMD:304],[CMD:304],[CMD:305],[CMD:305],[CMD:306],[CMD:306],[CMD:279],[CMD:281],[CMD:285],[CMD:288],[CMD:289],[CMD:307],[CMD:307],[CMD:307],[CMD:308],[CMD:308],[CMD:308],[CMD:309],[CMD:309],[CMD:309],[CMD:310],[CMD:310],[CMD:290],[CMD:291],[CMD:292])([CMD:51],[CMD:99],[CMD:261])([CMD:101],[CMD:102],[CMD:175],[CMD:246],[CMD:249],[CMD:253],[CMD:259])([CMD:74],[CMD:148],[CMD:70],[CMD:63],[CMD:254],[CMD:50],[CMD:68],[CMD:107],[CMD:178])([CMD:104],[CMD:105],[CMD:45],[CMD:85])([CMD:88],[CMD:96],[CMD:103],[CMD:168])()()()()
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([CMD:210])
+SB: 1 [CMD:210] The Mimeoplasm
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2011/Heavenly Inferno.dck b/Mage.Client/release/sample-decks/Commander/Commander 2011/Heavenly Inferno.dck
index 75669c7a99..a56e334d3a 100644
--- a/Mage.Client/release/sample-decks/Commander/Commander 2011/Heavenly Inferno.dck	
+++ b/Mage.Client/release/sample-decks/Commander/Commander 2011/Heavenly Inferno.dck	
@@ -85,6 +85,4 @@
 1 [CMD:202] Gwyllion Hedge-Mage
 1 [CMD:11] Congregate
 1 [CMD:129] Mana-Charged Dragon
-SB: 1 [CMD:206] Kaalia of the Vast
-LAYOUT MAIN:(2,10)(CMC,true,50)|()([CMD:21])([CMD:186],[CMD:217])([CMD:195],[CMD:202])([CMD:109],[CMD:120],[CMD:124],[CMD:18],[CMD:94],[CMD:35])([CMD:184],[CMD:82],[CMD:30],[CMD:31])([CMD:208],[CMD:129],[CMD:130],[CMD:216])([CMD:180],[CMD:5],[CMD:7],[CMD:185],[CMD:229])([CMD:108],[CMD:111],[CMD:95])([CMD:79])([CMD:264],[CMD:266],[CMD:267],[CMD:268],[CMD:269],[CMD:272],[CMD:273],[CMD:282],[CMD:311],[CMD:311],[CMD:312],[CMD:312],[CMD:313],[CMD:313],[CMD:314],[CMD:314],[CMD:283],[CMD:299],[CMD:299],[CMD:300],[CMD:300],[CMD:301],[CMD:301],[CMD:302],[CMD:302],[CMD:284],[CMD:285],[CMD:286],[CMD:307],[CMD:307],[CMD:308],[CMD:308],[CMD:309],[CMD:309],[CMD:310],[CMD:310],[CMD:297],[CMD:298])([CMD:121],[CMD:25],[CMD:261],[CMD:32])([CMD:242],[CMD:9],[CMD:243],[CMD:117],[CMD:253],[CMD:255],[CMD:257],[CMD:231])([CMD:245],[CMD:211],[CMD:24],[CMD:36],[CMD:138],[CMD:107])([CMD:11],[CMD:77],[CMD:80],[CMD:209],[CMD:132],[CMD:28],[CMD:136],[CMD:137],[CMD:104],[CMD:238])([CMD:116],[CMD:29],[CMD:103])([CMD:3],[CMD:118])()()()
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([CMD:206])
+SB: 1 [CMD:206] Kaalia of the Vast
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2011/Mirror Mastery.dck b/Mage.Client/release/sample-decks/Commander/Commander 2011/Mirror Mastery.dck
index a11a65dcb0..69a41fe751 100644
--- a/Mage.Client/release/sample-decks/Commander/Commander 2011/Mirror Mastery.dck	
+++ b/Mage.Client/release/sample-decks/Commander/Commander 2011/Mirror Mastery.dck	
@@ -81,6 +81,4 @@
 1 [CMD:204] Intet, the Dreamer
 1 [CMD:56] Ray of Command
 3 [CMD:318] Forest
-SB: 1 [CMD:220] Riku of Two Reflections
-LAYOUT MAIN:(1,10)(CMC,false,50)|([CMD:269],[CMD:272],[CMD:315],[CMD:315],[CMD:315],[CMD:315],[CMD:316],[CMD:316],[CMD:316],[CMD:317],[CMD:317],[CMD:317],[CMD:318],[CMD:318],[CMD:318],[CMD:274],[CMD:276],[CMD:277],[CMD:303],[CMD:303],[CMD:304],[CMD:304],[CMD:305],[CMD:305],[CMD:306],[CMD:278],[CMD:280],[CMD:311],[CMD:311],[CMD:312],[CMD:312],[CMD:313],[CMD:313],[CMD:314],[CMD:314],[CMD:285],[CMD:288],[CMD:290],[CMD:293],[CMD:294],[CMD:295])([CMD:40],[CMD:147],[CMD:166],[CMD:261],[CMD:177])([CMD:242],[CMD:190],[CMD:250],[CMD:203],[CMD:252],[CMD:253],[CMD:256],[CMD:222],[CMD:259],[CMD:175])([CMD:181],[CMD:148],[CMD:196],[CMD:197],[CMD:155],[CMD:199],[CMD:162],[CMD:163],[CMD:63],[CMD:68],[CMD:138],[CMD:178])([CMD:113],[CMD:42],[CMD:153],[CMD:198],[CMD:157],[CMD:56],[CMD:134])([CMD:219])([CMD:39],[CMD:143],[CMD:115],[CMD:150],[CMD:118],[CMD:151],[CMD:161],[CMD:204],[CMD:214],[CMD:133],[CMD:135],[CMD:232],[CMD:233])([CMD:188],[CMD:119],[CMD:122],[CMD:160],[CMD:164],[CMD:226])([CMD:110],[CMD:128],[CMD:65])([CMD:1])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([CMD:220])
+SB: 1 [CMD:220] Riku of Two Reflections
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Commander/Commander 2011/Political Puppets.dck b/Mage.Client/release/sample-decks/Commander/Commander 2011/Political Puppets.dck
index 6ffc7cb9d6..6df75275b3 100644
--- a/Mage.Client/release/sample-decks/Commander/Commander 2011/Political Puppets.dck	
+++ b/Mage.Client/release/sample-decks/Commander/Commander 2011/Political Puppets.dck	
@@ -81,6 +81,4 @@
 1 [CMD:54] Perilous Research
 1 [CMD:55] Propaganda
 1 [CMD:12] Crescendo of War
-SB: 1 [CMD:240] Zedruu the Greathearted
-LAYOUT MAIN:(2,9)(CMC,true,50)|()([CMD:125],[CMD:33])([CMD:183],[CMD:47],[CMD:16],[CMD:213],[CMD:37])([CMD:43],[CMD:48],[CMD:49],[CMD:218],[CMD:66],[CMD:237])([CMD:187],[CMD:13],[CMD:123],[CMD:221],[CMD:38])([CMD:41],[CMD:194],[CMD:205])([CMD:215],[CMD:133])([CMD:6])()([CMD:265],[CMD:268],[CMD:269],[CMD:272],[CMD:303],[CMD:303],[CMD:303],[CMD:304],[CMD:304],[CMD:304],[CMD:305],[CMD:305],[CMD:305],[CMD:306],[CMD:306],[CMD:306],[CMD:278],[CMD:311],[CMD:311],[CMD:312],[CMD:312],[CMD:313],[CMD:313],[CMD:314],[CMD:314],[CMD:299],[CMD:299],[CMD:300],[CMD:300],[CMD:301],[CMD:301],[CMD:302],[CMD:302],[CMD:291])([CMD:40],[CMD:46],[CMD:261],[CMD:32])([CMD:242],[CMD:112],[CMD:248],[CMD:251],[CMD:17],[CMD:127],[CMD:253],[CMD:54],[CMD:26],[CMD:256],[CMD:131],[CMD:61],[CMD:67],[CMD:69])([CMD:244],[CMD:114],[CMD:245],[CMD:14],[CMD:53],[CMD:22],[CMD:27],[CMD:55],[CMD:58],[CMD:63],[CMD:64],[CMD:36],[CMD:68],[CMD:138])([CMD:12],[CMD:57],[CMD:60],[CMD:139])()([CMD:8],[CMD:118],[CMD:247],[CMD:19])()([CMD:126])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([CMD:240])
+SB: 1 [CMD:240] Zedruu the Greathearted
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck b/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck
index 7720b6c3a9..d921b8d28e 100644
--- a/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck	
+++ b/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck	
@@ -3,6 +3,4 @@ NAME:Mormir Basic
 12 [BFZ:260a] Swamp
 12 [BFZ:270a] Forest
 12 [BFZ:265a] Mountain
-12 [BFZ:255a] Island
-LAYOUT MAIN:(1,5)(COLOR_IDENTITY,true,5)|([BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a])([BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a])([BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a])([BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a])([BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a])
-LAYOUT SIDEBOARD:(0,0)(COLOR,true,5)|
+12 [BFZ:255a] Island
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Ajani, Valiant Protector.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Ajani, Valiant Protector.dck
index 2ffcb886d6..558e7e0150 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Ajani, Valiant Protector.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Ajani, Valiant Protector.dck	
@@ -22,6 +22,4 @@
 1 [AER:15] Deadeye Harpooner
 2 [AER:117] Narnam Renegade
 1 [AER:118] Natural Obsolescence
-2 [AER:113] Lifecraft Cavalry
-LAYOUT MAIN:(1,7)(CMC,false,50)|([KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[AER:189],[AER:189],[AER:189],[AER:189])([AER:117],[AER:117],[AER:120],[AER:173],[AER:173],[AER:173],[AER:126],[AER:126])([AER:187],[AER:187],[AER:187],[AER:7],[AER:7],[AER:7],[AER:118],[AER:180],[AER:180])([AER:149],[AER:15],[KLD:156],[AER:125],[AER:125],[AER:22])([AER:188],[AER:188],[KLD:144],[KLD:144],[AER:186],[AER:186],[AER:186],[AER:186])([AER:105],[AER:5],[KLD:181],[AER:113],[AER:113],[AER:121])([AER:185])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+2 [AER:113] Lifecraft Cavalry
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Bold Pyromancer.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Bold Pyromancer.dck
index acbe40635f..a26d06192d 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Bold Pyromancer.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Bold Pyromancer.dck	
@@ -27,5 +27,3 @@
 3 [DOM:277] Karplusan Hound
 2 [DOM:156] Baloth Gorger
 4 [DOM:278] Pyromantic Pilgrim
-LAYOUT MAIN:(2,7)(CMC,true,50)|()([DOM:168],[DOM:168])([DOM:159],[DOM:159],[DOM:159],[DOM:125])([DOM:172],[DOM:278],[DOM:278],[DOM:278],[DOM:278],[DOM:167])([DOM:277],[DOM:277],[DOM:277],[DOM:162],[DOM:156],[DOM:156])([DOM:120],[DOM:120],[DOM:120])([DOM:165],[DOM:177])([DOM:262],[DOM:262],[DOM:262],[DOM:263],[DOM:263],[DOM:263],[DOM:264],[DOM:264],[DOM:264],[DOM:265],[DOM:265],[DOM:266],[DOM:266],[DOM:266],[DOM:267],[DOM:267],[DOM:267],[DOM:268],[DOM:268],[DOM:268],[DOM:269],[DOM:269],[DOM:279],[DOM:279],[DOM:279],[DOM:279])([DOM:142],[DOM:142])([DOM:163],[DOM:163],[DOM:176])([DOM:119])()([DOM:276],[DOM:276],[DOM:215],[DOM:118])([DOM:275])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Pyrogenius.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Pyrogenius.dck
index 29dd1db50a..9fd5686f93 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Pyrogenius.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Chandra, Pyrogenius.dck	
@@ -22,6 +22,4 @@
 1 [KLD:236] Snare Thopter
 1 [KLD:214] Fleetwheel Cruiser
 1 [KLD:114] Fateful Showdown
-1 [KLD:238] Weldfast Monitor
-LAYOUT MAIN:(1,7)(CMC,false,50)|([KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:261],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[KLD:250],[AKH:274],[AKH:274],[AKH:274],[AKH:274])([KLD:7],[KLD:7])([KLD:109],[KLD:16],[KLD:233],[KLD:233],[KLD:132],[KLD:33],[KLD:33],[KLD:188],[KLD:188])([KLD:2],[KLD:2],[KLD:107],[KLD:268],[KLD:268],[KLD:268],[KLD:230],[KLD:230],[KLD:133],[KLD:133],[KLD:238])([KLD:198],[KLD:114],[KLD:266],[KLD:266],[KLD:266],[KLD:266],[KLD:214],[KLD:225],[KLD:236])([KLD:267],[KLD:267],[KLD:28])([KLD:265])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+1 [KLD:238] Weldfast Monitor
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Gideon, Martial Paragon.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Gideon, Martial Paragon.dck
index 1b296855a2..d9cba3f0ec 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Gideon, Martial Paragon.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Gideon, Martial Paragon.dck	
@@ -19,6 +19,4 @@
 4 [AKH:273] Graceful Cat
 3 [AKH:152] Trial of Zeal
 1 [AKH:144] Nef-Crop Entangler
-10 [AKH:253] Mountain
-LAYOUT MAIN:(1,6)(CMC,false,50)|([AKH:274],[AKH:274],[AKH:274],[AKH:274],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:250],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253],[AKH:253])([AKH:124],[AKH:124])([AKH:16],[AKH:17],[AKH:17],[AKH:17],[AKH:144],[AKH:146],[AKH:200],[AKH:200],[AKH:18])([AKH:271],[AKH:271],[AKH:271],[AKH:10],[AKH:273],[AKH:273],[AKH:273],[AKH:273],[AKH:117],[AKH:117],[AKH:117],[AKH:137],[AKH:152],[AKH:152],[AKH:152])([AKH:29],[AKH:29],[AKH:31],[AKH:139],[AKH:139],[AKH:129],[AKH:129])([AKH:270],[AKH:272],[AKH:272])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+10 [AKH:253] Mountain
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Huatli, Dinosaur Knight.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Huatli, Dinosaur Knight.dck
index 8ccdfcc303..92cfc31602 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Huatli, Dinosaur Knight.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Huatli, Dinosaur Knight.dck	
@@ -23,6 +23,4 @@
 2 [XLN:41] Territorial Hammerskull
 3 [XLN:261] Plains
 3 [XLN:260] Plains
-2 [XLN:18] Kinjalli's Caller
-LAYOUT MAIN:(1,4)(CARD_TYPE,false,50)|([XLN:13],[XLN:288],[XLN:288],[XLN:135],[XLN:18],[XLN:18],[XLN:286],[XLN:286],[XLN:286],[XLN:286],[XLN:31],[XLN:31],[XLN:169],[XLN:169],[XLN:146],[XLN:146],[XLN:41],[XLN:41],[XLN:133],[XLN:133],[XLN:28],[XLN:28],[XLN:36],[XLN:36])([XLN:287],[XLN:287],[XLN:287],[XLN:38],[XLN:38],[XLN:149],[XLN:149],[XLN:30],[XLN:30])([XLN:289],[XLN:289],[XLN:289],[XLN:289],[XLN:260],[XLN:260],[XLN:260],[XLN:261],[XLN:261],[XLN:261],[XLN:262],[XLN:262],[XLN:262],[XLN:263],[XLN:263],[XLN:272],[XLN:272],[XLN:272],[XLN:273],[XLN:273],[XLN:273],[XLN:274],[XLN:274],[XLN:274],[XLN:275],[XLN:275])([XLN:285])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+2 [XLN:18] Kinjalli's Caller
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Liliana, Death Wielder.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Liliana, Death Wielder.dck
index a559eca379..b5f3cdf8db 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Liliana, Death Wielder.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Liliana, Death Wielder.dck	
@@ -21,6 +21,4 @@
 2 [AKH:166] Giant Spider
 1 [AKH:232] Luxa River Shrine
 9 [AKH:254] Forest
-1 [AKH:275] Liliana, Death Wielder
-LAYOUT MAIN:(1,8)(CMC,false,50)|([AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:254],[AKH:279],[AKH:279],[AKH:279],[AKH:279],[AKH:244],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252],[AKH:252])([AKH:91])([AKH:160],[AKH:89],[AKH:89],[AKH:278],[AKH:278],[AKH:278],[AKH:278],[AKH:113],[AKH:113])([AKH:79],[AKH:79],[AKH:83],[AKH:83],[AKH:158],[AKH:158],[AKH:276],[AKH:276],[AKH:276],[AKH:226],[AKH:167],[AKH:232],[AKH:109],[AKH:109])([AKH:162],[AKH:166],[AKH:166],[AKH:93],[AKH:93],[AKH:234])([AKH:197],[AKH:197])([AKH:277],[AKH:277])([AKH:275])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+1 [AKH:275] Liliana, Death Wielder
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Genesis Mage.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Genesis Mage.dck
index ed93833cce..e7d76b50a8 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Genesis Mage.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Genesis Mage.dck	
@@ -18,6 +18,4 @@
 1 [HOU:154] Reason // Believe
 2 [HOU:143] River Hoopoe
 2 [HOU:110] Ambuscade
-7 [HOU:198] Forest
-LAYOUT MAIN:(1,7)(CARD_TYPE,false,50)|([HOU:115],[HOU:115],[HOU:143],[HOU:143],[HOU:201],[HOU:201],[HOU:201],[AKH:179],[AKH:179],[AKH:179],[HOU:29],[HOU:29],[AKH:209],[AKH:209],[HOU:30],[HOU:30],[HOU:202],[HOU:202],[HOU:202],[HOU:202],[AKH:41],[AKH:41])([AKH:196])([AKH:219],[AKH:219])([HOU:54],[HOU:54],[HOU:54],[HOU:110],[HOU:110])([HOU:204],[HOU:204],[HOU:204],[HOU:204],[HOU:192],[HOU:192],[HOU:192],[HOU:192],[HOU:193],[HOU:193],[HOU:193],[HOU:193],[HOU:198],[HOU:198],[HOU:198],[HOU:198],[HOU:198],[HOU:198],[HOU:198],[HOU:199],[HOU:199],[HOU:199],[HOU:199],[HOU:199],[HOU:199],[HOU:199])([HOU:200])([HOU:154],[HOU:203],[HOU:203])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+7 [HOU:198] Forest
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Nature's Artisan.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Nature's Artisan.dck
index e67fcf5bf2..d5e51350c6 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Nature's Artisan.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Nissa, Nature's Artisan.dck	
@@ -19,6 +19,4 @@
 1 [KLD:39] Aethersquall Ancient
 1 [KLD:168] Sage of Shaila's Claim
 2 [KLD:169] Servant of the Conduit
-1 [KLD:147] Bristling Hydra
-LAYOUT MAIN:(1,8)(CMC,false,50)|([KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:263],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:274],[KLD:274],[KLD:274],[KLD:274])([KLD:145],[KLD:145],[KLD:145],[KLD:66],[KLD:66])([KLD:161],[KLD:161],[KLD:168],[KLD:169],[KLD:169],[KLD:272],[KLD:272],[KLD:272],[KLD:272])([KLD:141],[KLD:141],[KLD:180],[KLD:180],[KLD:53],[KLD:53],[KLD:171],[KLD:171])([KLD:147],[KLD:271],[KLD:271],[KLD:271],[KLD:54],[KLD:54],[KLD:55],[KLD:55],[KLD:273],[KLD:273])([KLD:142],[KLD:142],[KLD:167])([KLD:270])([KLD:39])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+1 [KLD:147] Bristling Hydra
\ No newline at end of file
diff --git a/Mage.Client/release/sample-decks/Planeswalk Decks/Tezzeret, Master of Metal.dck b/Mage.Client/release/sample-decks/Planeswalk Decks/Tezzeret, Master of Metal.dck
index 48ecec315f..b2700cce95 100644
--- a/Mage.Client/release/sample-decks/Planeswalk Decks/Tezzeret, Master of Metal.dck	
+++ b/Mage.Client/release/sample-decks/Planeswalk Decks/Tezzeret, Master of Metal.dck	
@@ -22,6 +22,4 @@
 2 [AER:50] Wind-Kin Raiders
 1 [AER:177] Treasure Keeper
 2 [AER:30] Bastion Inventor
-1 [KLD:80] Essence Extraction
-LAYOUT MAIN:(1,8)(CMC,false,50)|([KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[KLD:253],[AER:167],[AER:194],[AER:194],[AER:194],[AER:194],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258],[KLD:258])([AER:143],[AER:143],[AER:163],[AER:178],[AER:178])([KLD:74],[KLD:74],[AER:192],[AER:192],[AER:192],[AER:192])([KLD:80],[AER:156],[AER:156],[AER:193],[AER:193],[AER:193],[AER:138],[AER:138])([KLD:207],[AER:41],[AER:177])([AER:151],[AER:42],[AER:191],[AER:191])([AER:30],[AER:30],[AER:65],[AER:190],[AER:50],[AER:50])([AER:144],[AER:58])
-LAYOUT SIDEBOARD:(0,0)(NONE,false,50)|
+1 [KLD:80] Essence Extraction
\ No newline at end of file