diff --git a/res/cardsfolder/sisays_ring.txt b/res/cardsfolder/sisays_ring.txt
index 50161caca58..55b4ec3c45c 100644
--- a/res/cardsfolder/sisays_ring.txt
+++ b/res/cardsfolder/sisays_ring.txt
@@ -2,7 +2,7 @@ Name:Sisay's Ring
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$T|Produced$1|Amount$2|SpellDescription$Add 2 to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ 1 | Amount$ 2 | SpellDescription$ Add 2 to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sisays_ring.jpg
diff --git a/res/cardsfolder/sisters_of_the_flame.txt b/res/cardsfolder/sisters_of_the_flame.txt
index 01f69df8016..accc6098725 100644
--- a/res/cardsfolder/sisters_of_the_flame.txt
+++ b/res/cardsfolder/sisters_of_the_flame.txt
@@ -3,7 +3,7 @@ ManaCost:1 R R
 Types:Creature Human Shaman
 Text:no text
 PT:2/2
-A:AB$Mana|Cost$T|Produced$R|SpellDescription$Add R to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/dk/en-us/card1800.jpg
 SetInfo:DRK|Rare|http://magiccards.info/scans/en/dk/73.jpg
diff --git a/res/cardsfolder/skarrg_the_rage_pits.txt b/res/cardsfolder/skarrg_the_rage_pits.txt
index 1bd6b35bff7..7767bcb6ea9 100644
--- a/res/cardsfolder/skarrg_the_rage_pits.txt
+++ b/res/cardsfolder/skarrg_the_rage_pits.txt
@@ -2,8 +2,8 @@ Name:Skarrg, the Rage Pits
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$Mana|Cost$T|Produced$1|SpellDescription$Add 1 to your mana pool.
-A:AB$Pump | Cost$ R G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Target creature gets +1/+1 and gains trample until end of turn.
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
+A:AB$ Pump | Cost$ R G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Target creature gets +1/+1 and gains trample until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skarrg_the_rage_pits.jpg
 SetInfo:GPT|Uncommon|http://magiccards.info/scans/en/gp/163.jpg
diff --git a/res/cardsfolder/skirk_fire_marshal.txt b/res/cardsfolder/skirk_fire_marshal.txt
index 1b2fed3383e..de52cc2f893 100644
--- a/res/cardsfolder/skirk_fire_marshal.txt
+++ b/res/cardsfolder/skirk_fire_marshal.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Goblin
 Text:no text
 PT:2/2
-A:AB$DamageAll | Cost$tapXType<5/Goblin> | ValidCards$ Creature | ValidPlayers$ Each | NumDmg$ 10 | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 10 damage to each creature and each player.
+A:AB$ DamageAll | Cost$ tapXType<5/Goblin> | ValidCards$ Creature | ValidPlayers$ Each | NumDmg$ 10 | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 10 damage to each creature and each player.
 K:Protection from red
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skirk_fire_marshal.jpg
diff --git a/res/cardsfolder/skirk_prospector.txt b/res/cardsfolder/skirk_prospector.txt
index 925a30c5a9f..e56bc8099b5 100644
--- a/res/cardsfolder/skirk_prospector.txt
+++ b/res/cardsfolder/skirk_prospector.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-A:AB$Mana|Cost$Sac<1/Goblin>|Produced$R|SpellDescription$Add R to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/Goblin> | Produced$ R | SpellDescription$ Add R to your mana pool.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skirk_prospector.jpg
 SetInfo:ONS|Common|http://magiccards.info/scans/en/on/230.jpg
diff --git a/res/cardsfolder/skittering_invasion.txt b/res/cardsfolder/skittering_invasion.txt
index be49239ab7a..f8791adfe59 100644
--- a/res/cardsfolder/skittering_invasion.txt
+++ b/res/cardsfolder/skittering_invasion.txt
@@ -2,8 +2,7 @@ Name:Skittering Invasion
 ManaCost:7
 Types:Tribal Sorcery Eldrazi
 Text:Put five 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. They have "Sacrifice this creature: Add 1 to your mana pool."
-#K:spMakeToken<>5<>Eldrazi Spawn<>C 0 1 Eldrazi Spawn<>Controller<>""<>Creature;Eldrazi;Spawn<>0<>1<>Sacrifice CARDNAME: Add 1 to your mana pool.
-A:SP$Token | Cost$ 7 | TokenAmount$ 5 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Sacrifice CARDNAME: Add 1 to your mana pool.
+A:SP$ Token | Cost$ 7 | TokenAmount$ 5 | TokenName$ Eldrazi Spawn | TokenTypes$ Creature,Eldrazi,Spawn | TokenOwner$ Controller | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Sacrifice CARDNAME: Add 1 to your mana pool.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skittering_invasion.jpg
 SetInfo:ROE|Uncommon|http://magiccards.info/scans/en/roe/10.jpg
diff --git a/res/cardsfolder/skull_of_ramos.txt b/res/cardsfolder/skull_of_ramos.txt
index e31ecf73a26..69ad343e4e7 100644
--- a/res/cardsfolder/skull_of_ramos.txt
+++ b/res/cardsfolder/skull_of_ramos.txt
@@ -2,8 +2,8 @@ Name:Skull of Ramos
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$T|Produced$B|SpellDescription$Add B to your mana pool.
-A:AB$Mana|Cost$Sac<1/CARDNAME>|Produced$B|SpellDescription$Add B to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
+A:AB$ Mana | Cost$ Sac<1/CARDNAME> | Produced$ B | SpellDescription$ Add B to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skull_of_ramos.jpg
diff --git a/res/cardsfolder/sky_diamond.txt b/res/cardsfolder/sky_diamond.txt
index a149f932c2c..1171b7bc7fe 100644
--- a/res/cardsfolder/sky_diamond.txt
+++ b/res/cardsfolder/sky_diamond.txt
@@ -2,7 +2,7 @@ Name:Sky Diamond
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$Mana|Cost$T|Produced$U|SpellDescription$Add U to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 K:CARDNAME enters the battlefield tapped.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_diamond.jpg
diff --git a/res/cardsfolder/skycloud_expanse.txt b/res/cardsfolder/skycloud_expanse.txt
index dea70456511..893fa271cb5 100644
--- a/res/cardsfolder/skycloud_expanse.txt
+++ b/res/cardsfolder/skycloud_expanse.txt
@@ -2,7 +2,7 @@ Name:Skycloud Expanse
 ManaCost:no cost
 Types:Land
 Text:no text
-A:AB$Mana|Cost$1 T|Produced$W U|SpellDescription$Add W U to your mana pool.
+A:AB$ Mana | Cost$ 1 T | Produced$ W U | SpellDescription$ Add W U to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skycloud_expanse.jpg
diff --git a/res/cardsfolder/skyshaper.txt b/res/cardsfolder/skyshaper.txt
index 7e31dca0f22..e0ab329e0aa 100644
--- a/res/cardsfolder/skyshaper.txt
+++ b/res/cardsfolder/skyshaper.txt
@@ -2,7 +2,7 @@ Name:Skyshaper
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$PumpAll|Cost$Sac<1/CARDNAME>|ValidCards$Creature.YouCtrl|KW$Flying|SpellDescription$Creatures you control gain flying until end of turn.
+A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | KW$ Flying | SpellDescription$ Creatures you control gain flying until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshaper.jpg
 SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/137.jpg