diff --git a/res/cardsfolder/rakdos_carnarium.txt b/res/cardsfolder/rakdos_carnarium.txt
index 9ac7c3b0b69..758e5ce3d21 100644
--- a/res/cardsfolder/rakdos_carnarium.txt
+++ b/res/cardsfolder/rakdos_carnarium.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:Rakdos Carnarium enters the battlefield tapped.
 K:When Rakdos Carnarium enters the battlefield, return a land you control to its owner's hand.
-A:AB$Mana|Cost$T|Produced$B R|SpellDescription$Add B R to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B R | SpellDescription$ Add B R to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_carnarium.jpg
diff --git a/res/cardsfolder/rakdos_guildmage.txt b/res/cardsfolder/rakdos_guildmage.txt
index b63d4e476fe..63fdce65b5a 100644
--- a/res/cardsfolder/rakdos_guildmage.txt
+++ b/res/cardsfolder/rakdos_guildmage.txt
@@ -3,8 +3,8 @@ ManaCost:BR BR
 Types:Creature Zombie Shaman
 Text:no text
 PT:2/2
-A:AB$Pump | Cost$ 3 B Discard<1/Any> | Tgt$TgtC | NumAtt$ -2 | NumDef$ -2 | IsCurse$True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-A:AB$Token | Cost$ 3 R | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 1 | TokenKeywords$ Haste<>At the beginning of the end step, exile CARDNAME.|SpellDescription$Put a 2/1 red Goblin creature token with haste onto the battlefield. Exile it at the beginning of the next end step.
+A:AB$ Pump | Cost$ 3 B Discard<1/Any> | Tgt$ TgtC | NumAtt$ -2 | NumDef$ -2 | IsCurse$True | SpellDescription$ Target creature gets -2/-2 until end of turn.
+A:AB$Token | Cost$ 3 R | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 1 | TokenKeywords$ Haste<>At the beginning of the end step, exile CARDNAME. | SpellDescription$ Put a 2/1 red Goblin creature token with haste onto the battlefield. Exile it at the beginning of the next end step.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_guildmage.jpg
 SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/145.jpg
diff --git a/res/cardsfolder/rakdos_signet.txt b/res/cardsfolder/rakdos_signet.txt
index 6471a490b54..2585f84ba28 100644
--- a/res/cardsfolder/rakdos_signet.txt
+++ b/res/cardsfolder/rakdos_signet.txt
@@ -2,7 +2,7 @@ Name:Rakdos Signet
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$1 T|Produced$B R|SpellDescription$Add B R to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ B R | SpellDescription$ Add B R to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_signet.jpg
diff --git a/res/cardsfolder/rakka_mar.txt b/res/cardsfolder/rakka_mar.txt
index 7ef15e022f0..ea2b5e0776d 100644
--- a/res/cardsfolder/rakka_mar.txt
+++ b/res/cardsfolder/rakka_mar.txt
@@ -4,8 +4,7 @@ Types:Legendary Creature Human Shaman
 Text:no text
 PT:2/2
 K:Haste
-#K:abMakeToken R T<>1<>Elemental<>R 3 1 Elemental<>Controller<>R<>Creature;Elemental<>3<>1<>Haste<>put a 3/1 red Elemental creature token with haste onto the battlefield.
-A:AB$Token | Cost$ R T | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | SpellDescription$ Put a 3/1 red Elemental creature token with haste onto the battlefield.
+A:AB$ Token | Cost$ R T | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste | SpellDescription$ Put a 3/1 red Elemental creature token with haste onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakka_mar.jpg
 SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/71.jpg
diff --git a/res/cardsfolder/rashida_scalebane.txt b/res/cardsfolder/rashida_scalebane.txt
index 465144821bf..0c8e18e85e9 100644
--- a/res/cardsfolder/rashida_scalebane.txt
+++ b/res/cardsfolder/rashida_scalebane.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Legendary Creature Human Soldier
 Text:no text
 PT:3/4
-A:AB$Destroy|Cost$T|ValidTgts$ Dragon.attacking,Dragon.blocking|NoRegen$True | TgtPrompt$ Select target attacking or blocking Dragon | SpellDescription$ Destroy target attacking or blocking Dragon. It can't be regenerated. You gain life equal to its power.| SubAbility$ YouGainLife/dX
+A:AB$ Destroy | Cost$ T | ValidTgts$ Dragon.attacking,Dragon.blocking | NoRegen$ True | TgtPrompt$ Select target attacking or blocking Dragon | SpellDescription$ Destroy target attacking or blocking Dragon. It can't be regenerated. You gain life equal to its power. | SubAbility$ YouGainLife/dX
 SVar:dX:Count$TgtCardPower
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rashida_scalebane.jpg
diff --git a/res/cardsfolder/rats_of_rath.txt b/res/cardsfolder/rats_of_rath.txt
index a6a4cfecf13..bba7db419b2 100644
--- a/res/cardsfolder/rats_of_rath.txt
+++ b/res/cardsfolder/rats_of_rath.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Rat
 Text:no text
 PT:2/1
-A:AB$Destroy|Cost$B|ValidTgts$Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl|TgtPrompt$Select target artifact, creature or land you control.|SpellDescription$Destroy target artifact, creature, or land you control.
+A:AB$Destroy | Cost$ B | ValidTgts$ Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl | TgtPrompt$ Select target artifact, creature or land you control | SpellDescription$ Destroy target artifact, creature, or land you control.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rats_of_rath.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/44.jpg
diff --git a/res/cardsfolder/ravaged_highlands.txt b/res/cardsfolder/ravaged_highlands.txt
index 84a57ef1906..4b1e10c7403 100644
--- a/res/cardsfolder/ravaged_highlands.txt
+++ b/res/cardsfolder/ravaged_highlands.txt
@@ -2,12 +2,12 @@ Name:Ravaged Highlands
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$Mana|Cost$T|Produced$R|SpellDescription$Add R to your mana pool.
-A:AB$Mana|Cost$T Sac<1/CARDNAME>|Produced$W|SpellDescription$Add W to your mana pool.
-A:AB$Mana|Cost$T Sac<1/CARDNAME>|Produced$U|SpellDescription$Add U to your mana pool.
-A:AB$Mana|Cost$T Sac<1/CARDNAME>|Produced$B|SpellDescription$Add B to your mana pool.
-A:AB$Mana|Cost$T Sac<1/CARDNAME>|Produced$R|SpellDescription$Add R to your mana pool.
-A:AB$Mana|Cost$T Sac<1/CARDNAME>|Produced$G|SpellDescription$Add G to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ W | SpellDescription$ Add W to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ U | SpellDescription$ Add U to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add B to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ R | SpellDescription$ Add R to your mana pool.
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ G | SpellDescription$ Add G to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ravaged_highlands.jpg
diff --git a/res/cardsfolder/ray_of_command.txt b/res/cardsfolder/ray_of_command.txt
index 627a3ad527a..34c1e1adecf 100644
--- a/res/cardsfolder/ray_of_command.txt
+++ b/res/cardsfolder/ray_of_command.txt
@@ -2,7 +2,7 @@ Name:Ray of Command
 ManaCost:3 U
 Types:Instant
 Text:no text
-A:SP$GainControl|Cost$3 U|ValidTgts$Creature.YouDontCtrl|TgtPrompt$Select target creature opponent controls.|LoseControl$EOT|Untap$True|AddKWs$Haste|TapOnLose$True|SpellDescription$Untap target creature an opponent controls and gain control of it until end of turn. That creature gains haste until end of turn. When you lose control of the creature, tap it.
+A:SP$ GainControl | Cost$ 3 U | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature opponent controls | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | TapOnLose$ True | SpellDescription$ Untap target creature an opponent controls and gain control of it until end of turn. That creature gains haste until end of turn. When you lose control of the creature, tap it.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ray_of_command.jpg
diff --git a/res/cardsfolder/razorverge_thicket.txt b/res/cardsfolder/razorverge_thicket.txt
index 9cdea79f681..62a34949450 100644
--- a/res/cardsfolder/razorverge_thicket.txt
+++ b/res/cardsfolder/razorverge_thicket.txt
@@ -2,8 +2,8 @@ Name:Razorverge Thicket
 ManaCost:no cost
 Types:Land
 text:Razorverge Thicket enters the battlefield tapped unless you control two or fewer other lands.
-A:AB$Mana|Cost$T|Produced$G|SpellDescription$Add G to your mana pool.
-A:AB$Mana|Cost$T|Produced$W|SpellDescription$Add W to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 K:CARDNAME enters the battlefield tapped unless you control two or fewer other lands.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razorverge_thicket.jpg
diff --git a/res/cardsfolder/reach_of_branches.txt b/res/cardsfolder/reach_of_branches.txt
index f82879035d4..9b25a5ec052 100644
--- a/res/cardsfolder/reach_of_branches.txt
+++ b/res/cardsfolder/reach_of_branches.txt
@@ -2,7 +2,7 @@ Name:Reach of Branches
 ManaCost:4 G
 Types:Tribal Instant Treefolk
 Text:no text
-A:SP$Token | Cost$ 4 G | TokenAmount$ 1 | TokenName$ Treefolk Shaman | TokenTypes$ Creature,Treefolk,Shaman | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 5|SpellDescription$Put a 2/5 green Treefolk Shaman creature token onto the battlefield.
+A:SP$ Token | Cost$ 4 G | TokenAmount$ 1 | TokenName$ Treefolk Shaman | TokenTypes$ Creature,Treefolk,Shaman | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 5 | SpellDescription$ Put a 2/5 green Treefolk Shaman creature token onto the battlefield.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Forest.YouCtrl | TriggerZones$ Graveyard | Optional$ True | Execute$ TrigReturn | TriggerDescription$ Whenever a Forest enters the battlefield under your control, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 SVar:Rarity:Rare