diff --git a/res/cardsfolder/acorn_harvest.txt b/res/cardsfolder/acorn_harvest.txt
index 5d699a0ff12..5aa8e10820b 100644
--- a/res/cardsfolder/acorn_harvest.txt
+++ b/res/cardsfolder/acorn_harvest.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Sorcery
 Text:Put two 1/1 green Squirrel creature tokens onto the battlefield.
 #K:spMakeToken<>2<>Squirrel<>G 1 1 Squirrel<>Controller<>G<>Creature;Squirrel<>1<>1<>None
-A:SP$Token|Cost$3 G|TokenAmount$2|TokenName$Squirrel|TokenTypes$Creature,Squirrel|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 3 G | TokenAmount$ 2 | TokenName$ Squirrel | TokenTypes$ Creature,Squirrel | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 K:Flashback:1 G PayLife<3>
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acorn_harvest.jpg
diff --git a/res/cardsfolder/battle_screech.txt b/res/cardsfolder/battle_screech.txt
index 54d8d7211b1..d68a523e034 100644
--- a/res/cardsfolder/battle_screech.txt
+++ b/res/cardsfolder/battle_screech.txt
@@ -2,7 +2,7 @@ Name:Battle Screech
 ManaCost:2 W W
 Types:Sorcery
 Text:no text
-A:SP$Token|Cost$2 W W|TokenImage$W 1 1 Bird Flying|TokenOwner$Controller|TokenAmount$2|TokenName$Bird|TokenTypes$Creature,Bird|TokenColors$White|TokenPower$1|TokenToughness$1|TokenKeywords$Flying|SpellDescription$Put two 1/1 white Bird creature tokens with flying onto the battlefield.
+A:SP$Token | Cost$ 2 W W | TokenImage$ W 1 1 Bird Flying | TokenOwner$ Controller | TokenAmount$ 2 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put two 1/1 white Bird creature tokens with flying onto the battlefield.
 K:Flashback:tapXType<3/Creature.White>
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/battle_screech.jpg
diff --git a/res/cardsfolder/beast_attack.txt b/res/cardsfolder/beast_attack.txt
index c5c5a0fec27..0a6b7098054 100644
--- a/res/cardsfolder/beast_attack.txt
+++ b/res/cardsfolder/beast_attack.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G G
 Types:Instant
 Text:Put a 4/4 green Beast creature token onto the battlefield.
 #K:spMakeToken<>1<>Beast<>G 4 4 Beast<>Controller<>G<>Creature;Beast<>4<>4<>None
-A:SP$Token|Cost$2 G G G|TokenAmount$1|TokenName$Beast|TokenTypes$Creature,Beast|TokenColors$Green|TokenOwner$Controller|TokenPower$4|TokenToughness$4
+A:SP$Token | Cost$ 2 G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenColors$ Green | TokenOwner$ Controller | TokenPower$ 4 | TokenToughness$ 4
 K:Flashback:2 G G G
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/beast_attack.jpg
diff --git a/res/cardsfolder/call_of_the_herd.txt b/res/cardsfolder/call_of_the_herd.txt
index b3a5cc10baf..f5ea5d72390 100644
--- a/res/cardsfolder/call_of_the_herd.txt
+++ b/res/cardsfolder/call_of_the_herd.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 Text:Put a 3/3 green Elephant creature token onto the battlefield.
 #K:spMakeToken<>1<>Elephant<>G 3 3 Elephant<>Controller<>G<>Creature;Elephant<>3<>3<>None
-A:SP$Token|Cost$2 G|TokenAmount$1|TokenName$Elephant|TokenTypes$Creature,Elephant|TokenColors$Green|TokenPower$3|TokenToughness$3|TokenOwner$Controller
+A:SP$Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ Controller
 K:Flashback:3 G
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_of_the_herd.jpg
diff --git a/res/cardsfolder/carrion_call.txt b/res/cardsfolder/carrion_call.txt
index 04f3666f35c..a8471ea2400 100644
--- a/res/cardsfolder/carrion_call.txt
+++ b/res/cardsfolder/carrion_call.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Instant
 Text:Put two 1/1 green Insect creature tokens with infect onto the battlefield.
 #K:spMakeToken<>2<>Insect<>G 1 1 Insect<>Controller<>G<>Creature;Insect<>1<>1<>Infect
-A:SP$Token|Cost$3 G|TokenImage$G 1 1 Insect Infect|TokenAmount$2|TokenName$Insect|TokenTypes$Creature,Insect|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|TokenKeywords$Infect
+A:SP$Token | Cost$ 3 G | TokenImage$ G 1 1 Insect Infect | TokenAmount$ 2 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Infect
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/carrion_call.jpg
 End
diff --git a/res/cardsfolder/chatter_of_the_squirrel.txt b/res/cardsfolder/chatter_of_the_squirrel.txt
index 379777830f7..d12085cfe82 100644
--- a/res/cardsfolder/chatter_of_the_squirrel.txt
+++ b/res/cardsfolder/chatter_of_the_squirrel.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Sorcery
 Text:Put a 1/1 green Squirrel creature token onto the battlefield.
 #K:spMakeToken<>1<>Squirrel<>G 1 1 Squirrel<>Controller<>G<>Creature;Squirrel<>1<>1<>None
-A:SP$Token|Cost$G|TokenAmount$1|TokenName$Squirrel|TokenColors$Green|TokenTypes$Creature,Squirrel|TokenOwner$Controller|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Squirrel | TokenColors$ Green | TokenTypes$ Creature,Squirrel | TokenOwner$ Controller | TokenPower$ 1 | TokenToughness$ 1
 K:Flashback:1 G
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chatter_of_the_squirrel.jpg
diff --git a/res/cardsfolder/crush_of_wurms.txt b/res/cardsfolder/crush_of_wurms.txt
index 2f33aef1e02..e06477a2e2d 100644
--- a/res/cardsfolder/crush_of_wurms.txt
+++ b/res/cardsfolder/crush_of_wurms.txt
@@ -3,7 +3,7 @@ ManaCost:6 G G G
 Types:Sorcery
 Text:Put three 6/6 green Wurm creature tokens onto the battlefield.
 #K:spMakeToken<>3<>Wurm<>G 6 6 Wurm<>Controller<>G<>Creature;Wurm<>6<>6<>None
-A:SP$Token|Cost$6 G G G|TokenAmount$3|TokenName$Wurm|TokenColors$Green|TokenTypes$Creature,Wurm|TokenOwner$Controller|TokenPower$6|TokenToughness$6
+A:SP$Token | Cost$ 6 G G G | TokenAmount$ 3 | TokenName$ Wurm | TokenColors$ Green | TokenTypes$ Creature,Wurm | TokenOwner$ Controller | TokenPower$ 6 | TokenToughness$ 6
 K:Flashback:9 G G G
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crush_of_wurms.jpg
diff --git a/res/cardsfolder/dragon_fodder.txt b/res/cardsfolder/dragon_fodder.txt
index 532b935a102..f3f30ef7b3c 100644
--- a/res/cardsfolder/dragon_fodder.txt
+++ b/res/cardsfolder/dragon_fodder.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Sorcery
 Text:Put two 1/1 red Goblin creature tokens onto the battlefield.
 #K:spMakeToken<>2<>Goblin<>R 1 1 Goblin<>Controller<>R<>Creature;Goblin<>1<>1<>None
-A:SP$Token|Cost$1 R|TokenAmount$2|TokenName$Goblin|TokenTypes$Creature,Goblin|TokenOwner$Controller|TokenColors$Red|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 1 R | TokenAmount$ 2 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_fodder.jpg
 End
diff --git a/res/cardsfolder/elephant_ambush.txt b/res/cardsfolder/elephant_ambush.txt
index 7cace419f5b..442d039e756 100644
--- a/res/cardsfolder/elephant_ambush.txt
+++ b/res/cardsfolder/elephant_ambush.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Instant
 Text:Put a 3/3 green Elephant creature token onto the battlefield.
 #K:spMakeToken<>1<>Elephant<>G 3 3 Elephant<>Controller<>G<>Creature;Elephant<>3<>3<>None
-A:SP$Token|Cost$2 G G|TokenAmount$1|TokenName$Elephant|TokenTypes$Creature,Elephant|TokenOwner$Controller|TokenColors$Green|TokenPower$3|TokenToughness$3
+A:SP$Token | Cost$ 2 G G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3
 K:Flashback:6 G G
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_ambush.jpg
diff --git a/res/cardsfolder/empty_the_warrens.txt b/res/cardsfolder/empty_the_warrens.txt
index 285b8a1cd07..9247e18b2ce 100644
--- a/res/cardsfolder/empty_the_warrens.txt
+++ b/res/cardsfolder/empty_the_warrens.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Sorcery
 Text:Put two 1/1 red Goblin creature tokens into play.
 #K:spMakeToken<>2<>Goblin<>R 1 1 Goblin<>Controller<>R<>Creature;Goblin<>1<>1<>None
-A:SP$Token|Cost$3 R|TokenAmount$2|TokenName$Goblin|TokenTypes$Creature,Goblin|TokenOwner$Controller|TokenColors$Red|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 3 R | TokenAmount$ 2 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
 K:Storm
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/empty_the_warrens.jpg
diff --git a/res/cardsfolder/feast_or_famine.txt b/res/cardsfolder/feast_or_famine.txt
index 96dcdeffde6..e83086a6504 100644
--- a/res/cardsfolder/feast_or_famine.txt
+++ b/res/cardsfolder/feast_or_famine.txt
@@ -2,7 +2,7 @@ Name:Feast or Famine
 ManaCost:3 B
 Types:Instant
 Text:no text
-A:SP$Token|Cost$3 B|TokenAmount$1|TokenName$Zombie|TokenTypes$Creature,Zombie|TokenOwner$Controller|TokenColors$Black|TokenPower$2|TokenToughness$2|PrecostDesc$Choose one - |SpellDescription$Put a 2/2 black Zombie creature token onto the battlefield;
+A:SP$Token | Cost$ 3 B | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | PrecostDesc$ Choose one - | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield;
 A:SP$Destroy|Cost$3 B|ValidTgts$Creature.nonBlack+nonArtifact|TgtPrompt$Select target nonblack, nonartifact creature|NoRegen$True|SpellDescription$or destroy target nonblack, nonartifact creature and it can't be regenerated.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/feral_lightning.txt b/res/cardsfolder/feral_lightning.txt
index b2265ada76b..eecad90a7b8 100644
--- a/res/cardsfolder/feral_lightning.txt
+++ b/res/cardsfolder/feral_lightning.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R R
 Types:Sorcery
 Text:Put three 3/1 red Elemental creature tokens with haste into play. Remove them from the game at end of turn.
 #K:spMakeToken<>3<>Elemental<>R 3 1 Elemental<>Controller<>R<>Creature;Elemental<>3<>1<>Haste;At the beginning of the end step, exile CARDNAME.
-A:SP$Token|Cost$3 R R R|TokenAmount$3|TokenName$Elemental|TokenTypes$Creature,Elemental|TokenOwner$Controller|TokenColors$Red|TokenPower$3|TokenToughness$1|TokenKeywords$Haste<>At the beginning of the end step, exile CARDNAME.
+A:SP$Token | Cost$ 3 R R R | TokenAmount$ 3 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 1 | TokenKeywords$ Haste<>At the beginning of the end step, exile CARDNAME.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/sok/en-us/card84373.jpg
diff --git a/res/cardsfolder/goblin_offensive.txt b/res/cardsfolder/goblin_offensive.txt
index d7f23d947e1..e6d1aa93324 100644
--- a/res/cardsfolder/goblin_offensive.txt
+++ b/res/cardsfolder/goblin_offensive.txt
@@ -3,7 +3,7 @@ ManaCost:X 1 R R
 Types:Sorcery
 Text:Put X 1/1 red Goblin creature tokens onto the battlefield.
 #K:spMakeToken<>X<>Goblin<>R 1 1 Goblin<>Controller<>R<>Creature;Goblin<>1<>1<>None
-A:SP$Token|Cost$X 1 R R|TokenAmount$X|TokenName$Goblin|TokenTypes$Creature,Goblin|TokenOwner$Controller|TokenColors$Red|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ X 1 R R | TokenAmount$ X | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$xPaid
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_offensive.jpg
diff --git a/res/cardsfolder/goblin_scouts.txt b/res/cardsfolder/goblin_scouts.txt
index 5687e88b4cb..9e7df52bdb9 100644
--- a/res/cardsfolder/goblin_scouts.txt
+++ b/res/cardsfolder/goblin_scouts.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Sorcery
 Text:Put three 1/1 red Goblin Scout creature tokens with mountainwalk onto the battlefield.
 #K:spMakeToken<>3<>Goblin Scout<>R 1 1 Goblin Scout<>Controller<>R<>Creature;Goblin;Scout<>1<>1<>Mountainwalk
-A:SP$Token|Cost$3 R R|TokenAmount$3|TokenName$Goblin Scout|TokenTypes$Creature,Goblin,Scout|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|TokenKeywords$Mountainwalk
+A:SP$Token | Cost$ 3 R R | TokenAmount$ 3 | TokenName$ Goblin Scout | TokenTypes$ Creature,Goblin,Scout | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Mountainwalk
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_scouts.jpg
 End
diff --git a/res/cardsfolder/howl_of_the_night_pack.txt b/res/cardsfolder/howl_of_the_night_pack.txt
index f282d84959b..3e851d5dc51 100644
--- a/res/cardsfolder/howl_of_the_night_pack.txt
+++ b/res/cardsfolder/howl_of_the_night_pack.txt
@@ -3,7 +3,7 @@ ManaCost:6 G
 Types:Sorcery
 Text:Put a 2/2 green Wolf creature token onto the battlefield for each Forest you control.
 #K:spMakeToken<>X<>Wolf<>G 2 2 Wolf<>Controller<>G<>Creature;Wolf<>2<>2<>None
-A:SP$Token|Cost$6 G|TokenAmount$X|TokenName$Wolf|TokenTypes$Creature,Wolf|TokenOwner$Controller|TokenColors$Green|TokenPower$2|TokenToughness$2
+A:SP$Token | Cost$ 6 G | TokenAmount$ X | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2
 SVar:X:Count$TypeYouCtrl.Forest
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/howl_of_the_night_pack.jpg
diff --git a/res/cardsfolder/hunting_pack.txt b/res/cardsfolder/hunting_pack.txt
index f0da7e50f0d..5c4f08afbdf 100644
--- a/res/cardsfolder/hunting_pack.txt
+++ b/res/cardsfolder/hunting_pack.txt
@@ -3,7 +3,7 @@ ManaCost:5 G G
 Types:Instant
 Text:Put a 4/4 green Beast creature token onto the battlefield.
 #K:spMakeToken<>1<>Beast<>G 4 4 Beast<>Controller<>G<>Creature;Beast<>4<>4<>None
-A:SP$Token|Cost$5 G G|TokenAmount$1|TokenName$Beast|TokenTypes$Creature,Beast|TokenOwner$Controller|TokenColors$Green|TokenPower$4|TokenToughness$4
+A:SP$Token | Cost$ 5 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4
 K:Storm
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_pack.jpg
diff --git a/res/cardsfolder/icatian_town.txt b/res/cardsfolder/icatian_town.txt
index 04e69be8746..1c9f6b3e460 100644
--- a/res/cardsfolder/icatian_town.txt
+++ b/res/cardsfolder/icatian_town.txt
@@ -3,7 +3,7 @@ ManaCost:5 W
 Types:Sorcery
 Text:Put four 1/1 white Citizen creature tokens onto the battlefield.
 #K:spMakeToken<>4<>Citizen<>W 1 1 Citizen<>Controller<>W<>Creature;Citizen<>1<>1<>None
-A:SP$Token|Cost$5 W|TokenAmount$4|TokenName$Citizen|TokenTypes$Creature,Citizen|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 5 W | TokenAmount$ 4 | TokenName$ Citizen | TokenTypes$ Creature,Citizen | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icatian_town.jpg
 End
diff --git a/res/cardsfolder/join_the_ranks.txt b/res/cardsfolder/join_the_ranks.txt
index 46e7f0ec60c..fd3e7b9859d 100644
--- a/res/cardsfolder/join_the_ranks.txt
+++ b/res/cardsfolder/join_the_ranks.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Instant
 Text:Put two 1/1 white Soldier Ally creature tokens onto the battlefield.
 #K:spMakeToken<>2<>Soldier Ally<>W 1 1 Soldier Ally<>Controller<>W<>Creature;Soldier;Ally<>1<>1<>None
-A:SP$Token|Cost$3 W|TokenAmount$2|TokenName$Soldier Ally|TokenTypes$Creature,Soldier,Ally|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 3 W | TokenAmount$ 2 | TokenName$ Soldier Ally | TokenTypes$ Creature,Soldier,Ally | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/join_the_ranks.jpg
diff --git a/res/cardsfolder/kuldotha_rebirth.txt b/res/cardsfolder/kuldotha_rebirth.txt
index 38d1f60c71b..47fc5b5a58e 100644
--- a/res/cardsfolder/kuldotha_rebirth.txt
+++ b/res/cardsfolder/kuldotha_rebirth.txt
@@ -2,7 +2,7 @@ Name:Kuldotha Rebirth
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$Token|Cost$R Sac<1/Artifact>|TokenAmount$3|TokenOwner$Controller|TokenName$Goblin|TokenTypes$Creature,Goblin|TokenColors$Red|TokenPower$1|TokenToughness$1|SpellDescription$Put three 1/1 red Goblin creature tokens onto the battlefield.
+A:SP$Token | Cost$ R Sac<1/Artifact> | TokenAmount$ 3 | TokenOwner$ Controller | TokenName$ Goblin |TokenTypes$ Creature,Goblin | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put three 1/1 red Goblin creature tokens onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kuldotha_rebirth.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/ordered_migration.txt b/res/cardsfolder/ordered_migration.txt
index 5475b5f8b72..41bc9e5f255 100644
--- a/res/cardsfolder/ordered_migration.txt
+++ b/res/cardsfolder/ordered_migration.txt
@@ -3,7 +3,7 @@ ManaCost:3 W U
 Types:Sorcery
 Text:Domain — Put a 1/1 blue Bird creature token with flying onto the battlefield for each basic land type among lands you control.
 #K:spMakeToken<>X<>Bird<>U 1 1 Bird<>Controller<>U<>Creature;Bird<>1<>1<>Flying
-A:SP$Token|Cost$3 W U|TokenAmount$X|TokenName$Bird|TokenTypes$Creature,Bird|TokenOwner$Controller|TokenColors$Blue|TokenPower$1|TokenToughness$1|TokenKeywords$Flying
+A:SP$Token | Cost$ 3 W U | TokenAmount$ X | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenOwner$ Controller | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:X:Count$Domain
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordered_migration.jpg
diff --git a/res/cardsfolder/raise_the_alarm.txt b/res/cardsfolder/raise_the_alarm.txt
index 2b7c3944813..4589b19273e 100644
--- a/res/cardsfolder/raise_the_alarm.txt
+++ b/res/cardsfolder/raise_the_alarm.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Instant
 Text:Put two 1/1 white Soldier creature tokens into play.
 #K:spMakeToken<>2<>Soldier<>W 1 1 Soldier<>Controller<>W<>Creature;Soldier<>1<>1<>None
-A:SP$Token|Cost$1 W|TokenAmount$2|TokenName$Soldier|TokenTypes$Creature,Soldier|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 1 W | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/mrd/en-us/card48103.jpg
 End
diff --git a/res/cardsfolder/reach_of_branches.txt b/res/cardsfolder/reach_of_branches.txt
index 032c6a90a73..a52df47f50c 100644
--- a/res/cardsfolder/reach_of_branches.txt
+++ b/res/cardsfolder/reach_of_branches.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Tribal Instant Treefolk
 Text:Put a 2/5 green Treefolk Shaman creature token into play.
 #K:spMakeToken<>1<>Treefolk Shaman<>G 2 5 Treefolk Shaman<>Controller<>G<>Creature;Treefolk;Shaman<>2<>5<>None
-A:SP$Token|Cost$4 G|TokenAmount$1|TokenName$Treefolk Shaman|TokenTypes$Creature,Treefolk,Shaman|TokenOwner$Controller|TokenColors$Green|TokenPower$2|TokenToughness$5
+A:SP$Token | Cost$ 4 G | TokenAmount$ 1 | TokenName$ Treefolk Shaman | TokenTypes$ Creature,Treefolk,Shaman | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 5
 K:WheneverKeyword:EntersBattleField:Type/Forest:Graveyard:MoveFrom-Graveyard-Hand:Self:ASAP:Yes_No:Initiator - OwnedByController:Whenever a Forest enters the battlefield under your control, you may return Reach of Branches from your graveyard to your hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reach_of_branches.jpg
diff --git a/res/cardsfolder/roar_of_the_wurm.txt b/res/cardsfolder/roar_of_the_wurm.txt
index 6d2032294b6..229e9e41951 100644
--- a/res/cardsfolder/roar_of_the_wurm.txt
+++ b/res/cardsfolder/roar_of_the_wurm.txt
@@ -3,7 +3,7 @@ ManaCost:6 G
 Types:Sorcery
 Text:Put a 6/6 green Wurm creature token onto the battlefield.
 #K:spMakeToken<>1<>Wurm<>G 6 6 Wurm<>Controller<>G<>Creature;Wurm<>6<>6<>None
-A:SP$Token|Cost$6 G|TokenAmount$1|TokenName$Wurm|TokenTypes$Creature,Wurm|TokenOwner$Controller|TokenColors$Green|TokenPower$6|TokenToughness$6
+A:SP$Token | Cost$ 6 G | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 6
 K:Flashback:3 G
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/roar_of_the_wurm.jpg
diff --git a/res/cardsfolder/skittering_invasion.txt b/res/cardsfolder/skittering_invasion.txt
index 4980cae81e9..b4bc857c14d 100644
--- a/res/cardsfolder/skittering_invasion.txt
+++ b/res/cardsfolder/skittering_invasion.txt
@@ -3,7 +3,7 @@ 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$Green|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$ Green | 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
 End
diff --git a/res/cardsfolder/sosukes_summons.txt b/res/cardsfolder/sosukes_summons.txt
index a449287725b..bcc5d8a5f92 100644
--- a/res/cardsfolder/sosukes_summons.txt
+++ b/res/cardsfolder/sosukes_summons.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 Text:Put two 1/1 green Snake creature tokens onto the battlefield.\r\nWhenever a nontoken Snake enters the battlefield under your control, you may return Sosuke's Summons from your graveyard to your hand.
 #K:spMakeToken<>2<>Snake<>G 1 1 Snake<>Controller<>G<>Creature;Snake<>1<>1<>None
-A:SP$Token|Cost$2 G|TokenAmount$2|TokenName$Snake|TokenTypes$Creature,Snake|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 2 G | TokenAmount$ 2 | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sosukes_summons.jpg
 End
diff --git a/res/cardsfolder/sound_the_call.txt b/res/cardsfolder/sound_the_call.txt
index 90e1aea713f..21a399f397a 100644
--- a/res/cardsfolder/sound_the_call.txt
+++ b/res/cardsfolder/sound_the_call.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 Text:Put a 1/1 green Wolf creature token onto the battlefield. It has "This creature gets +1/+1 for each card named Sound the Call in each graveyard."
 #K:spMakeToken<>1<>Wolf<>G 1 1 Wolf<>Controller<>G<>Creature;Wolf<>1<>1<>This creature gets +1/+1 for each card named Sound the Call in each graveyard.
-A:SP$Token|Cost$2 G|TokenAmount$1|TokenName$Wolf|TokenTypes$Creature,Wolf|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|TokenKeywords$This creature gets +1/+1 for each card named Sound the Call in each graveyard.
+A:SP$Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ This creature gets +1/+1 for each card named Sound the Call in each graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sound_the_call.jpg
 End
diff --git a/res/cardsfolder/spectral_procession.txt b/res/cardsfolder/spectral_procession.txt
index ea096f40b18..0c3b8ab76ab 100644
--- a/res/cardsfolder/spectral_procession.txt
+++ b/res/cardsfolder/spectral_procession.txt
@@ -3,7 +3,7 @@ ManaCost:2/W 2/W 2/W
 Types:Sorcery
 Text:Put three 1/1 white Spirit creature tokens with flying into play.
 #K:spMakeToken<>3<>Spirit<>W 1 1 Spirit<>Controller<>W<>Creature;Spirit<>1<>1<>Flying
-A:SP$Token|Cost$2/W 2/W 2/W|TokenAmount$3|TokenName$Spirit|TokenTypes$Creature,Spirit|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1|TokenKeywords$Flying
+A:SP$Token | Cost$ 2/W 2/W 2/W | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_procession.jpg
 End
diff --git a/res/cardsfolder/spontaneous_generation.txt b/res/cardsfolder/spontaneous_generation.txt
index d7fab2acd83..179ccefab3b 100644
--- a/res/cardsfolder/spontaneous_generation.txt
+++ b/res/cardsfolder/spontaneous_generation.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Sorcery
 Text:Put a 1/1 green Saproling creature token onto the battlefield for each card in your hand.
 #K:spMakeToken<>X<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
-A:SP$Token|Cost$3 G|TokenAmount$X|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$InYourHand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spontaneous_generation.jpg
diff --git a/res/cardsfolder/spore_burst.txt b/res/cardsfolder/spore_burst.txt
index 51339af1a8b..b26e10b5b9d 100644
--- a/res/cardsfolder/spore_burst.txt
+++ b/res/cardsfolder/spore_burst.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Sorcery
 Text:Domain — Put a 1/1 green Saproling creature token onto the battlefield for each basic land type among lands you control.
 #K:spMakeToken<>X<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
-A:SP$Token|Cost$3 G|TokenAmount$X|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$Domain
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spore_burst.jpg
diff --git a/res/cardsfolder/sprout.txt b/res/cardsfolder/sprout.txt
index 426c6ddcc58..999a27ce397 100644
--- a/res/cardsfolder/sprout.txt
+++ b/res/cardsfolder/sprout.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Instant
 Text:Put a 1/1 green Saproling creature token onto the battlefield.
 #K:spMakeToken<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None
-A:SP$Token|Cost$G|TokenAmount$1|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sprout.jpg
 End
diff --git a/res/cardsfolder/storm_herd.txt b/res/cardsfolder/storm_herd.txt
index 25ab87bf14e..95bd2ab3744 100644
--- a/res/cardsfolder/storm_herd.txt
+++ b/res/cardsfolder/storm_herd.txt
@@ -3,7 +3,7 @@ ManaCost:8 W W
 Types:Sorcery
 Text:Put X 1/1 white Pegasus creature tokens with flying into play, where X is your life total.
 #K:spMakeToken<>X<>Pegasus<>W 1 1 Pegasus<>Controller<>W<>Creature;Pegasus<>1<>1<>None
-A:SP$Token|Cost$8 W W|TokenAmount$X|TokenName$Pegasus|TokenTypes$Creature,Pegasus|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1
+A:SP$Token | Cost$ 8 W W | TokenAmount$ X | TokenName$ Pegasus |TokenTypes$ Creature,Pegasus | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
 SVar:X:Count$YourLifeTotal
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/gpt/en-us/card96968.jpg
diff --git a/res/cardsfolder/tidal_wave.txt b/res/cardsfolder/tidal_wave.txt
index a444f05c62b..da853b4674b 100644
--- a/res/cardsfolder/tidal_wave.txt
+++ b/res/cardsfolder/tidal_wave.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Instant
 Text:Put a 5/5 blue Wall creature token with defender onto the battlefield. Sacrifice it at the beginning of the next end step.
 #K:spMakeToken<>1<>Wall<>U 5 5 Wall<>Controller<>U<>Creature;Wall<>3<>1<>Defender;At the beginning of the end step, sacrifice CARDNAME.
-A:SP$Token|Cost$2 U|TokenAmount$1|TokenName$Wall|TokenTypes$Creature,Wall|TokenOwner$Controller|TokenColors$Green|TokenPower$5|TokenToughness$5|TokenKeywords$Defender<>At the beginning of the end step, sacrifice CARDNAME.
+A:SP$Token | Cost$ 2 U | TokenAmount$ 1 | TokenName$ Wall | TokenTypes$ Creature,Wall | TokenOwner$ Controller | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Defender<>At the beginning of the end step, sacrifice CARDNAME.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_wave.jpg
diff --git a/res/cardsfolder/waylay.txt b/res/cardsfolder/waylay.txt
index b861cc5fd85..369477c2fac 100644
--- a/res/cardsfolder/waylay.txt
+++ b/res/cardsfolder/waylay.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Instant
 Text:Put three 2/2 white Knight creature tokens onto the battlefield. Exile them at the beginning of the next cleanup step.
 #K:spMakeToken<>3<>Knight<>W 2 2 Knight<>Controller<>W<>Creature;Knight<>2<>2<>At the beginning of the end step, exile CARDNAME.
-A:SP$Token|Cost$2 W|TokenAmount$3|TokenName$Knight|TokenTypes$Creature,Knight|TokenOwner$Controller|TokenColors$White|TokenPower$2|TokenToughness$2|TokenKeywords$At the beginning of the end step, exile CARDNAME.
+A:SP$Token | Cost$ 2 W | TokenAmount$ 3 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ At the beginning of the end step, exile CARDNAME.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waylay.jpg