diff --git a/res/cardsfolder/moriok_replica.txt b/res/cardsfolder/moriok_replica.txt
index 44050accc16..1bb0ecb7965 100644
--- a/res/cardsfolder/moriok_replica.txt
+++ b/res/cardsfolder/moriok_replica.txt
@@ -3,9 +3,9 @@ ManaCost:3
 Types:Artifact Creature Warrior
 Text:no text
 PT:2/2
-K:abDrawCards 1 BSac<1/CARDNAME>:2:Drawback$YouLoseLife/2:You draw two cards and lose 2 life.:Moriok Replica - draw two cards and lose 2 life
+A:AB$Draw | Cost$ 1 B Sac<1/CARDNAME> | NumCards$ 2 | SpellDescription$ You draw two cards and lose 2 life. | SubAbility$ YouLoseLife/2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moriok_replica.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/som/178.jpg
 SetInfo:SOM|Common|http://magiccards.info/scans/en/som/178.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/niv_mizzet_the_firemind.txt b/res/cardsfolder/niv_mizzet_the_firemind.txt
index 61a2171b35f..6211f16589a 100644
--- a/res/cardsfolder/niv_mizzet_the_firemind.txt
+++ b/res/cardsfolder/niv_mizzet_the_firemind.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Dragon Wizard
 Text:no text
 PT:4/4
 K:Flying
-K:abDrawCards T:1:Draw a card.:Niv-Mizzet, the Firemind - Draw a card
+A:AB$Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card.
 K:WheneverKeyword:DrawCard:ControllingPlayer_Self:Play:Damage/1:InputType - CreatureORPlayer:ASAP:No_Condition:SingleTarget:Whenever you draw a card, Niv-Mizzet, the Firemind deals 1 damage to target creature or player
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/niv_mizzet_the_firemind.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/123.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/reckless_scholar.txt b/res/cardsfolder/reckless_scholar.txt
index a168f50bdaa..79875a605c8 100644
--- a/res/cardsfolder/reckless_scholar.txt
+++ b/res/cardsfolder/reckless_scholar.txt
@@ -3,8 +3,8 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:2/1
-K:abDrawCardsTgt T:1:Drawback$TgtDiscard/1:Target player draws a card, then discards a card.:Reckless Scholar - target player draws a card and discards a card
+A:AB$Draw | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to draw a card, then discard a card | SpellDescription$ Target player draws a card, then discards a card. | SubAbility$ TgtDiscard/1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reckless_scholar.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/60.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/riptide_director.txt b/res/cardsfolder/riptide_director.txt
index 2ed7646f43a..6c3447704c9 100644
--- a/res/cardsfolder/riptide_director.txt
+++ b/res/cardsfolder/riptide_director.txt
@@ -3,9 +3,10 @@ ManaCost:2 U U
 Types:Creature Human Wizard
 Text:no text
 PT:2/3
-K:abDrawCards 2 U U T:X:Draw a card for each Wizard you control.:Riptide Director - draw X cards
-SVar:X:Count$TypeYouCtrl.Wizard
+A:AB$Draw | Cost$ 2 U U T | NumCards$ X | SpellDescription$ Draw a card for each Wizard you control.
+SVar:X:Count$TypeYouCtrl.Wizard
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_director.jpg
 SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/50.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/sage_of_lat_nam.txt b/res/cardsfolder/sage_of_lat_nam.txt
index c744901286b..9522f3ce427 100644
--- a/res/cardsfolder/sage_of_lat_nam.txt
+++ b/res/cardsfolder/sage_of_lat_nam.txt
@@ -3,9 +3,9 @@ ManaCost:1 U
 Types:Creature Human Artificer
 Text:no text
 PT:1/2
-K:abDrawCards T Sac<1/Artifact>:1:Draw a card.:Sage of Lat-Nam - Controller draws a card.
+A:AB$Draw | Cost$ T Sac<1/Artifact> | NumCards$ 1| SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sage_of_lat_nam.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/97.jpg
 SetInfo:ATQ|Common|http://magiccards.info/scans/en/aq/57.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/scarecrone.txt b/res/cardsfolder/scarecrone.txt
index ac7d54863c2..9ca13cc9556 100644
--- a/res/cardsfolder/scarecrone.txt
+++ b/res/cardsfolder/scarecrone.txt
@@ -3,9 +3,9 @@ ManaCost:3
 Types:Artifact Scarecrow
 Text:no text
 PT:1/2
-K:abDrawCards 1 T Sac<1/Scarecrow>:1:Draw a card.:Scarecrone - draw a card
+A:AB$Draw | Cost$ 1 T Sac<1/Scarecrow> | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$Retrieve | Cost$ 4 T | TgtPrompt$ Choose target artifact creature card in your graveyard | ValidTgts$ Artifact.Creature+YouCtrl | Destination$ Battlefield | SpellDescription$ Return target artifact creature card from your graveyard to the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scarecrone.jpg
 SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/172.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/sea_gate_loremaster.txt b/res/cardsfolder/sea_gate_loremaster.txt
index 4f56769b9d9..b2913632417 100644
--- a/res/cardsfolder/sea_gate_loremaster.txt
+++ b/res/cardsfolder/sea_gate_loremaster.txt
@@ -3,10 +3,11 @@ ManaCost:4 U
 Types:Creature Merfolk Wizard Ally
 Text:no text
 PT:1/3
-K:abDrawCards T:X:Draw a card for each Ally you control.
+A:AB$Draw | Cost$ T | NumCards$ X | SpellDescription$ Draw a card for each Ally you control.
 SVar:X:Count$TypeYouCtrl.Ally
-SVar:PlayMain1:TRUE
+SVar:PlayMain1:TRUE
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sea_gate_loremaster.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/63.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/seaside_haven.txt b/res/cardsfolder/seaside_haven.txt
index 49f3f913923..6503b73cc29 100644
--- a/res/cardsfolder/seaside_haven.txt
+++ b/res/cardsfolder/seaside_haven.txt
@@ -3,8 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:tap: add 1
-K:abDrawCards W U T Sac<1/Bird>:1:Draw a card.:Seaside Haven - Controller draws a card.
+A:AB$Draw | Cost$ W U T Sac<1/Bird> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seaside_haven.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/323.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/slinking_skirge.txt b/res/cardsfolder/slinking_skirge.txt
index 36b30d6ed1c..72bea3d18b2 100644
--- a/res/cardsfolder/slinking_skirge.txt
+++ b/res/cardsfolder/slinking_skirge.txt
@@ -4,8 +4,8 @@ Types:Creature Imp
 Text:no text
 PT:2/1
 K:Flying
-K:abDrawCards 2 Sac<1/CARDNAME>:1:Draw a card.:Slinking Skirge - Controller draws a card.
+A:AB$Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slinking_skirge.jpg
 SetInfo:UDS|Common|http://magiccards.info/scans/en/ud/71.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/soratami_cloudskater.txt b/res/cardsfolder/soratami_cloudskater.txt
index e2675fbbd53..e5d1765ba1c 100644
--- a/res/cardsfolder/soratami_cloudskater.txt
+++ b/res/cardsfolder/soratami_cloudskater.txt
@@ -4,9 +4,9 @@ Types:Creature Moonfolk Rogue
 Text:no text
 PT:1/1
 K:Flying
-K:abDrawCards 2 Return<1/Land>:1:Drawback$YouDiscard/1:Draw a card, then discard a card.:Soratami Cloudskater - Draw a card, then discard a card.
+A:AB$Draw | Cost$ 2 Return<1/Land> | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ YouDiscard/1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soratami_cloudskater.jpg
 SetInfo:CHK|Common|http://magiccards.info/scans/en/chk/86.jpg
-End
\ No newline at end of file
+End