diff --git a/res/cardsfolder/angelic_favor.txt b/res/cardsfolder/angelic_favor.txt
index 0b93b502008..304bff8790f 100755
--- a/res/cardsfolder/angelic_favor.txt
+++ b/res/cardsfolder/angelic_favor.txt
@@ -2,8 +2,8 @@ Name:Angelic Favor
 ManaCost:3 W
 Types:Instant
 Text:no text
-A:SP$Token | Cost$ tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>At the beginning of the end step, exile CARDNAME. | ActivatingPhases$ BeginCombat->EndCombat | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
-A:SP$Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>At the beginning of the end step, exile CARDNAME. | ActivatingPhases$ BeginCombat->EndCombat | SpellDescription$ Cast Angelic Favor only during combat. Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>At the beginning of the end step, exile CARDNAME. | ActivatingPhases$ BeginCombat->EndCombat | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
+A:SP$ Token | Cost$ 3 W | TokenAmount$ 1 | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying<>At the beginning of the end step, exile CARDNAME. | ActivatingPhases$ BeginCombat->EndCombat | SpellDescription$ Cast CARDNAME only during combat. Put a 4/4 white Angel creature token with flying onto the battlefield. Exile it at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_favor.jpg
diff --git a/res/cardsfolder/ant_queen.txt b/res/cardsfolder/ant_queen.txt
index b633d0817fd..98dba399d5b 100644
--- a/res/cardsfolder/ant_queen.txt
+++ b/res/cardsfolder/ant_queen.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Insect
 Text:no text
 PT:5/5
-A:AB$Token | Cost$ 1 G | TokenAmount$ 1 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Insect creature token onto the battlefield.
+A:AB$ Token | Cost$ 1 G | TokenAmount$ 1 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Insect creature token onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ant_queen.jpg
 SetInfo:M10|Rare|http://magiccards.info/scans/en/m10/166.jpg
diff --git a/res/cardsfolder/ashnods_transmogrant.txt b/res/cardsfolder/ashnods_transmogrant.txt
index 79d6688644a..95e66caaf77 100644
--- a/res/cardsfolder/ashnods_transmogrant.txt
+++ b/res/cardsfolder/ashnods_transmogrant.txt
@@ -2,7 +2,7 @@ Name:Ashnod's Transmogrant
 ManaCost:1
 Types:Artifact
 Text:no text
-A:AB$PutCounter | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.nonArtifact | TgtPrompt$ Select target nonartifact creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ SVar=DBAnimate| SpellDescription$ Put a +1/+1 counter on target nonartifact creature. That creature becomes an artifact in addition to its other types.
+A:AB$ PutCounter | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature.nonArtifact | TgtPrompt$ Select target nonartifact creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ SVar=DBAnimate| SpellDescription$ Put a +1/+1 counter on target nonartifact creature. That creature becomes an artifact in addition to its other types.
 SVar:DBAnimate:DB$Animate | Defined$ Targeted | Types$ Artifact | Permanent$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ashnods_transmogrant.jpg
diff --git a/res/cardsfolder/beacon_of_creation.txt b/res/cardsfolder/beacon_of_creation.txt
index 1461f9430a5..281c8ff0390 100644
--- a/res/cardsfolder/beacon_of_creation.txt
+++ b/res/cardsfolder/beacon_of_creation.txt
@@ -2,7 +2,7 @@ Name:Beacon of Creation
 ManaCost:3 G
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ SVar=DBShuffle | SpellDescription$ Put a 1/1 green Insect creature token onto the battlefield for each Forest you control. Shuffle CARDNAME into its owner's library.
+A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SubAbility$ SVar=DBShuffle | SpellDescription$ Put a 1/1 green Insect creature token onto the battlefield for each Forest you control. Shuffle CARDNAME into its owner's library.
 SVar:DBShuffle:DB$ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
 SVar:X:Count$TypeYouCtrl.Forest
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/boris_devilboon.txt b/res/cardsfolder/boris_devilboon.txt
index 21b893e8719..7073acf07e5 100644
--- a/res/cardsfolder/boris_devilboon.txt
+++ b/res/cardsfolder/boris_devilboon.txt
@@ -3,7 +3,7 @@ ManaCost:3 B R
 Types:Legendary Creature Zombie Wizard
 Text:no text
 PT:2/2
-A:AB$Token | Cost$ 2 B R T | TokenAmount$ 1 | TokenName$ Minor Demon | TokenOwner$ You | TokenTypes$ Creature,Demon | TokenColors$ Black,Red | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 black and red Demon creature token named Minor Demon onto the battlefield.
+A:AB$ Token | Cost$ 2 B R T | TokenAmount$ 1 | TokenName$ Minor Demon | TokenOwner$ You | TokenTypes$ Creature,Demon | TokenColors$ Black,Red | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 black and red Demon creature token named Minor Demon onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boris_devilboon.jpg
 SetInfo:LEG|Rare|http://magiccards.info/scans/en/lg/263.jpg
diff --git a/res/cardsfolder/bottle_of_suleiman.txt b/res/cardsfolder/bottle_of_suleiman.txt
index ba8083b9c59..dd6c94dd102 100644
--- a/res/cardsfolder/bottle_of_suleiman.txt
+++ b/res/cardsfolder/bottle_of_suleiman.txt
@@ -2,7 +2,7 @@ Name:Bottle of Suleiman
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$FlipACoin | Cost$ 1 Sac<1/CARDNAME> | WinSubAbility$ DBToken | LoseSubAbility$ DBDamage | SpellDescription$ Flip a coin. If you lose the flip, CARDNAME deals 5 damage to you. If you win the flip, put a 5/5 colorless Djinn artifact creature token with flying onto the battlefield.
+A:AB$ FlipACoin | Cost$ 1 Sac<1/CARDNAME> | WinSubAbility$ DBToken | LoseSubAbility$ DBDamage | SpellDescription$ Flip a coin. If you lose the flip, CARDNAME deals 5 damage to you. If you win the flip, put a 5/5 colorless Djinn artifact creature token with flying onto the battlefield.
 SVar:DBDamage:DB$DealDamage | Defined$ You | NumDmg$ 5
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Djinn | TokenTypes$ Creature,Artifact,Djinn | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying  
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/call_of_the_herd.txt b/res/cardsfolder/call_of_the_herd.txt
index 74a939ce6f6..cfffa0fa55c 100644
--- a/res/cardsfolder/call_of_the_herd.txt
+++ b/res/cardsfolder/call_of_the_herd.txt
@@ -2,8 +2,8 @@ Name:Call of the Herd
 ManaCost:2 G
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ You | SpellDescription$ Put a 3/3 green Elephant creature token onto the battlefield.
-A:SP$Token | Cost$ 3 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ You | Flashback$ True | CostDesc$ Flashback 3 G | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+A:SP$ Token | Cost$ 2 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ You | SpellDescription$ Put a 3/3 green Elephant creature token onto the battlefield.
+A:SP$ Token | Cost$ 3 G | TokenAmount$ 1 | TokenName$ Elephant | TokenTypes$ Creature,Elephant | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenOwner$ You | Flashback$ True | CostDesc$ Flashback 3 G | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_of_the_herd.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/231.jpg
diff --git a/res/cardsfolder/call_the_skybreaker.txt b/res/cardsfolder/call_the_skybreaker.txt
index 6a0981a3791..487015c54a2 100644
--- a/res/cardsfolder/call_the_skybreaker.txt
+++ b/res/cardsfolder/call_the_skybreaker.txt
@@ -2,8 +2,8 @@ Name:Call the Skybreaker
 ManaCost:5 UR UR
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 5 UR UR | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue,Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 blue and red Elemental creature token with flying onto the battlefield.
-A:SP$Token | Cost$ 5 UR UR Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue,Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+A:SP$ Token | Cost$ 5 UR UR | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue,Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 blue and red Elemental creature token with flying onto the battlefield.
+A:SP$ Token | Cost$ 5 UR UR Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue,Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_the_skybreaker.jpg
 SetInfo:EVE|Rare|http://magiccards.info/scans/en/eve/98.jpg
diff --git a/res/cardsfolder/centaur_glade.txt b/res/cardsfolder/centaur_glade.txt
index fab1371d3d3..685f047b1ea 100644
--- a/res/cardsfolder/centaur_glade.txt
+++ b/res/cardsfolder/centaur_glade.txt
@@ -2,7 +2,7 @@ Name:Centaur Glade
 ManaCost:3 G G
 Types:Enchantment
 Text:no text
-A:AB$Token | Cost$ 2 G G | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
+A:AB$ Token | Cost$ 2 G G | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_glade.jpg
 SetInfo:ONS|Uncommon|http://magiccards.info/scans/en/on/251.jpg
diff --git a/res/cardsfolder/chainer_dementia_master.txt b/res/cardsfolder/chainer_dementia_master.txt
index 260f8f602ab..25de81541ef 100644
--- a/res/cardsfolder/chainer_dementia_master.txt
+++ b/res/cardsfolder/chainer_dementia_master.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Minion
 Text:no text
 PT:3/3
 K:stPumpAll:Creature.Nightmare:1/1:No Condition:Nightmare creatures get +1/+1.
-A:AB$ChangeZone | Cost$ B B B PayLife<3> | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Select target creature card in a graveyard | ValidTgts$ Creature | ChangeNum$ 1 | SubAbility$ SVar=DBAnimate| SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. That creature is black and is a Nightmare in addition to its other creature types.
+A:AB$ ChangeZone | Cost$ B B B PayLife<3> | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Select target creature card in a graveyard | ValidTgts$ Creature | ChangeNum$ 1 | SubAbility$ SVar=DBAnimate| SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. That creature is black and is a Nightmare in addition to its other creature types.
 SVar:DBAnimate:DB$Animate | Defined$ Targeted | Types$ Nightmare | Colors$ Black
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME leaves the battlefield, exile all Nightmares. 
 SVar:TrigExile:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ChangeType$ Nightmare
diff --git a/res/cardsfolder/cloudseeder.txt b/res/cardsfolder/cloudseeder.txt
index 4c7d1be1ab9..55b161e6330 100644
--- a/res/cardsfolder/cloudseeder.txt
+++ b/res/cardsfolder/cloudseeder.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie Spellshaper
 Text:no text
 PT:1/1
 K:Flying
-A:AB$Token | Cost$ U T Discard<1/Card> | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Cloud Sprite | TokenTypes$ Creature,Faerie | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>CARDNAME can block only creatures with flying. | SpellDescription$ Put a 1/1 blue Faerie creature token named Cloud Sprite onto the battlefield. It has flying and "Cloud Sprite can block only creatures with flying."
+A:AB$ Token | Cost$ U T Discard<1/Card> | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Cloud Sprite | TokenTypes$ Creature,Faerie | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>CARDNAME can block only creatures with flying. | SpellDescription$ Put a 1/1 blue Faerie creature token named Cloud Sprite onto the battlefield. It has flying and "Cloud Sprite can block only creatures with flying."
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130309.jpg
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/33.jpg
diff --git a/res/cardsfolder/decree_of_justice.txt b/res/cardsfolder/decree_of_justice.txt
index 5f23ef20414..6b6fdaee8e8 100644
--- a/res/cardsfolder/decree_of_justice.txt
+++ b/res/cardsfolder/decree_of_justice.txt
@@ -3,7 +3,7 @@ ManaCost:X X 2 W W
 Types:Sorcery
 Text:no text
 K:Cycling:2 W
-A:SP$Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | SpellDescription$ Put X 4/4 white Angel creature tokens with flying onto the battlefield.
+A:SP$ Token | Cost$ X X 2 W W | TokenAmount$ X | TokenName$ Angel | TokenTypes$ Creature,Angel | TokenOwner$ You | TokenColors$ White | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | SpellDescription$ Put X 4/4 white Angel creature tokens with flying onto the battlefield.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/devastating_summons.txt b/res/cardsfolder/devastating_summons.txt
index cc61dd36f51..573b56a6af2 100644
--- a/res/cardsfolder/devastating_summons.txt
+++ b/res/cardsfolder/devastating_summons.txt
@@ -2,7 +2,7 @@ Name:Devastating Summons
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ R Sac<X/Land> | TokenAmount$ 2 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ X | TokenToughness$ X | SpellDescription$ Put two X/X red Elemental creature tokens onto the battlefield.
+A:SP$ Token | Cost$ R Sac<X/Land> | TokenAmount$ 2 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ X | TokenToughness$ X | SpellDescription$ Put two X/X red Elemental creature tokens onto the battlefield.
 SVar:X:Sacrificed$Amount
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/diamond_kaleidoscope.txt b/res/cardsfolder/diamond_kaleidoscope.txt
index e12f744f976..47792930bf7 100644
--- a/res/cardsfolder/diamond_kaleidoscope.txt
+++ b/res/cardsfolder/diamond_kaleidoscope.txt
@@ -2,7 +2,7 @@ Name:Diamond Kaleidoscope
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Token | Cost$ 3 T | TokenAmount$ 1 | TokenName$ Prism | TokenTypes$ Artifact,Creature,Prism | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Put a 0/1 colorless Prism artifact creature token onto the battlefield.
+A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenName$ Prism | TokenTypes$ Artifact,Creature,Prism | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 0 | TokenToughness$ 1 | SpellDescription$ Put a 0/1 colorless Prism artifact creature token onto the battlefield.
 A:AB$ Mana | Cost$ Sac<1/Prism.token> | CostDesc$ Sacrifice a Prism token: | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ Sac<1/Prism.token> | CostDesc$ Sacrifice a Prism token: | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ Sac<1/Prism.token> | CostDesc$ Sacrifice a Prism token: | Produced$ U | SpellDescription$ Add U to your mana pool.
diff --git a/res/cardsfolder/dragon_roost.txt b/res/cardsfolder/dragon_roost.txt
index 4cb9a657d9c..16ed55e4761 100644
--- a/res/cardsfolder/dragon_roost.txt
+++ b/res/cardsfolder/dragon_roost.txt
@@ -2,7 +2,7 @@ Name:Dragon Roost
 ManaCost:4 R R
 Types:Enchantment
 Text:no text
-A:AB$Token | Cost$ 5 R R | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 red Dragon creature token with flying onto the battlefield.
+A:AB$ Token | Cost$ 5 R R | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SpellDescription$ Put a 5/5 red Dragon creature token with flying onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_roost.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/198.jpg
diff --git a/res/cardsfolder/elvish_promenade.txt b/res/cardsfolder/elvish_promenade.txt
index 750c2ba8972..f82cd1429a9 100644
--- a/res/cardsfolder/elvish_promenade.txt
+++ b/res/cardsfolder/elvish_promenade.txt
@@ -2,7 +2,7 @@ Name:Elvish Promenade
 ManaCost:3 G
 Types:Tribal Sorcery Elf
 Text:no text
-A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield for each Elf you control.
+A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield for each Elf you control.
 SVar:X:Count$Valid Elf.YouCtrl
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/fable_of_wolf_and_owl.txt b/res/cardsfolder/fable_of_wolf_and_owl.txt
index dd2bda56f83..100910d84c1 100644
--- a/res/cardsfolder/fable_of_wolf_and_owl.txt
+++ b/res/cardsfolder/fable_of_wolf_and_owl.txt
@@ -2,8 +2,8 @@ Name:Fable of Wolf and Owl
 ManaCost:3 GU GU GU
 Types:Enchantment
 Text:no text
-T:Mode$SpellCast | ValidCard$ Card.Green+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigWolf | TriggerDescription$ Whenever you cast a green spell, you may put a 2/2 green Wolf creature token onto the battlefield.
-T:Mode$SpellCast | ValidCard$ Card.Blue+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigBird | TriggerDescription$ Whenever you cast a blue spell, you may put a 1/1 blue Bird creature token with flying onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card.Green+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigWolf | TriggerDescription$ Whenever you cast a green spell, you may put a 2/2 green Wolf creature token onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card.Blue+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigBird | TriggerDescription$ Whenever you cast a blue spell, you may put a 1/1 blue Bird creature token with flying onto the battlefield.
 SVar:TrigWolf:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2
 SVar:TrigBird:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:BuffedBy:Spell.Green,Spell.Blue
diff --git a/res/cardsfolder/gelatinous_genesis.txt b/res/cardsfolder/gelatinous_genesis.txt
index 55ead2fab0b..47e98b81e43 100644
--- a/res/cardsfolder/gelatinous_genesis.txt
+++ b/res/cardsfolder/gelatinous_genesis.txt
@@ -2,7 +2,7 @@ Name:Gelatinous Genesis
 ManaCost:X X G
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ X X G | TokenImage$ G X X Merfolk Wizard | TokenAmount$ X | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | SpellDescription$ Put X X/X green Ooze creature tokens onto the battlefield.
+A:SP$ Token | Cost$ X X G | TokenImage$ G X X Merfolk Wizard | TokenAmount$ X | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | SpellDescription$ Put X X/X green Ooze creature tokens onto the battlefield.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/golem_foundry.txt b/res/cardsfolder/golem_foundry.txt
index 19f3223353f..7832b68a079 100644
--- a/res/cardsfolder/golem_foundry.txt
+++ b/res/cardsfolder/golem_foundry.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact
 Text:no text
 T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast an artifact spell, you may put a charge counter on CARDNAME.
-A:AB$Token | Cost$ SubCounter<3/CHARGE> | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 colorless Golem artifact creature token onto the battlefield.
+A:AB$ Token | Cost$ SubCounter<3/CHARGE> | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 colorless Golem artifact creature token onto the battlefield.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterNum$ 1 | CounterType$ CHARGE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golem_foundry.jpg
diff --git a/res/cardsfolder/hearthcage_giant.txt b/res/cardsfolder/hearthcage_giant.txt
index be9c8ace8ea..732812fc898 100644
--- a/res/cardsfolder/hearthcage_giant.txt
+++ b/res/cardsfolder/hearthcage_giant.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ R 3 1 Elemental Shaman | TokenName$ Elemental Shaman | TokenColors$ Red | TokenTypes$ Creature,Elemental,Shaman | TokenPower$ 3 | TokenToughness$ 1 | TokenOwner$ You | TokenAmount$ 2
-A:AB$Pump | Cost$ Sac<1/Elemental> | ValidTgts$ Creature.Giant | TgtPrompt$ Select target Giant creature | NumAtt$ +3 | NumDef$ +1 | SpellDescription$ Target Giant creature gets +3/+1 until end of turn.
+A:AB$ Pump | Cost$ Sac<1/Elemental> | ValidTgts$ Creature.Giant | TgtPrompt$ Select target Giant creature | NumAtt$ +3 | NumDef$ +1 | SpellDescription$ Target Giant creature gets +3/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hearthcage_giant.jpg
 SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/174.jpg
diff --git a/res/cardsfolder/icatian_town.txt b/res/cardsfolder/icatian_town.txt
index cf4fa1df3be..c06dfeff740 100644
--- a/res/cardsfolder/icatian_town.txt
+++ b/res/cardsfolder/icatian_town.txt
@@ -2,7 +2,7 @@ Name:Icatian Town
 ManaCost:5 W
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 5 W | TokenAmount$ 4 | TokenName$ Citizen | TokenTypes$ Creature,Citizen | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put four 1/1 white Citizen creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 5 W | TokenAmount$ 4 | TokenName$ Citizen | TokenTypes$ Creature,Citizen | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put four 1/1 white Citizen creature tokens onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icatian_town.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/314.jpg
diff --git a/res/cardsfolder/imperious_perfect.txt b/res/cardsfolder/imperious_perfect.txt
index 63666e6b534..0de65980739 100644
--- a/res/cardsfolder/imperious_perfect.txt
+++ b/res/cardsfolder/imperious_perfect.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Warrior
 Text:no text
 PT:2/2
 K:stPumpAll:Creature.Elf+Other+YouCtrl:1/1:No Condition:Other Elf creatures you control get +1/+1.
-A:AB$Token | Cost$ G T | TokenAmount$ 1 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield.
+A:AB$ Token | Cost$ G T | TokenAmount$ 1 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Elf Warrior creature token onto the battlefield.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imperious_perfect.jpg
diff --git a/res/cardsfolder/mitotic_slime.txt b/res/cardsfolder/mitotic_slime.txt
index fb59899abfb..cf3ac8b638e 100644
--- a/res/cardsfolder/mitotic_slime.txt
+++ b/res/cardsfolder/mitotic_slime.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Ooze
 Text:no text
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerDescription$ When Mitotic Slime is put into a graveyard from the battlefield, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenSenior | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
 SVar:TrigTokenSenior:AB$Token | Cost$ 0 | TokenImage$ g 2 2 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ You | TokenPower$ 2 | TokenToughness$ 2 | TokenAmount$ 2 | TokenTriggers$ TriggerJunior | TokenSVars$ TrigTokenJunior
 SVar:TriggerJunior:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigTokenJunior | TriggerDescription$ When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.
 SVar:TrigTokenJunior:AB$Token | Cost$ 0 | TokenImage$ g 1 1 ooze | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenColors$ Green | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenAmount$ 2
diff --git a/res/cardsfolder/myrsmith.txt b/res/cardsfolder/myrsmith.txt
index 644f39bd14c..1c3b354daf4 100644
--- a/res/cardsfolder/myrsmith.txt
+++ b/res/cardsfolder/myrsmith.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Artificer
 Text:no text
 PT:2/1
-T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, you may pay 1.  If you do, put a 1/1 colorless Myr artifact creature token onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an artifact spell, you may pay 1. If you do, put a 1/1 colorless Myr artifact creature token onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 1 | TokenImage$ C 1 1 Myr | TokenAmount$ 1 | TokenName$ Myr | TokenTypes$ Artifact,Creature,Myr | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myrsmith.jpg
diff --git a/res/cardsfolder/one_dozen_eyes.txt b/res/cardsfolder/one_dozen_eyes.txt
index cc5c09ee15c..35dca4a6596 100644
--- a/res/cardsfolder/one_dozen_eyes.txt
+++ b/res/cardsfolder/one_dozen_eyes.txt
@@ -2,9 +2,9 @@ Name:One Dozen Eyes
 ManaCost:5 G
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 5 G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Choose one - Put a 5/5 green Beast creature token onto the battlefield;
-A:SP$Token | Cost$ 5 G | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ or put five 1/1 green Insect creature tokens onto the battlefield.
-A:SP$Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ SVar=DBToken2
+A:SP$ Token | Cost$ 5 G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Choose one - Put a 5/5 green Beast creature token onto the battlefield;
+A:SP$ Token | Cost$ 5 G | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ or put five 1/1 green Insect creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ SVar=DBToken2
 SVar:DBToken2:DB$Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/ooze_garden.txt b/res/cardsfolder/ooze_garden.txt
index 4d7db3acd22..8bd47a63f66 100644
--- a/res/cardsfolder/ooze_garden.txt
+++ b/res/cardsfolder/ooze_garden.txt
@@ -2,7 +2,7 @@ Name:Ooze Garden
 ManaCost:1 G
 Types:Enchantment
 Text:no text
-A:AB$Token | Cost$ 1 G Sac<1/Creature.nonOoze> | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SorcerySpeed$ True | CostDesc$ 1 G, Sacrifice a non-Ooze creature | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
+A:AB$ Token | Cost$ 1 G Sac<1/Creature.nonOoze> | TokenAmount$ 1 | TokenName$ Ooze | TokenOwner$ You | TokenPower$ X | TokenToughness$ X | TokenTypes$ Creature,Ooze | TokenColors$ Green | SorcerySpeed$ True | CostDesc$ 1 G, Sacrifice a non-Ooze creature | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
 SVar:X:Sacrificed$CardPower
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ooze_garden.jpg
diff --git a/res/cardsfolder/orochi_hatchery.txt b/res/cardsfolder/orochi_hatchery.txt
index bed1d90b2cf..e1d67c34e44 100644
--- a/res/cardsfolder/orochi_hatchery.txt
+++ b/res/cardsfolder/orochi_hatchery.txt
@@ -3,7 +3,7 @@ ManaCost:X X
 Types:Artifact
 Text:no text
 K:etbCounter:CHARGE:X
-A:AB$Token | Cost$ 5 T | TokenAmount$ Y | TokenController$ You | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Snake creature token onto the battlefield for each charge counter on CARDNAME.
+A:AB$ Token | Cost$ 5 T | TokenAmount$ Y | TokenController$ You | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Snake creature token onto the battlefield for each charge counter on CARDNAME.
 SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/quirion_druid.txt b/res/cardsfolder/quirion_druid.txt
index fce8ff282d0..8ce1f41d0f6 100644
--- a/res/cardsfolder/quirion_druid.txt
+++ b/res/cardsfolder/quirion_druid.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf Druid
 Text:no text
 PT:1/2
-A:AB$Animate | Cost$ G T | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 2 | Toughness$ 2 | Colors$ Green | Types$ Creature | Permanent$ True | SpellDescription$ Target land becomes a 2/2 green creature that's still a land. (This effect lasts indefinitely.)
+A:AB$ Animate | Cost$ G T | ValidTgts$ Land | TgtPrompt$ Select target land | Power$ 2 | Toughness$ 2 | Colors$ Green | Types$ Creature | Permanent$ True | SpellDescription$ Target land becomes a 2/2 green creature that's still a land. (This effect lasts indefinitely.)
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quirion_druid.jpg
 SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/66.jpg
diff --git a/res/cardsfolder/rhys_the_redeemed.txt b/res/cardsfolder/rhys_the_redeemed.txt
index e7545c56b11..faa78120e7c 100644
--- a/res/cardsfolder/rhys_the_redeemed.txt
+++ b/res/cardsfolder/rhys_the_redeemed.txt
@@ -3,7 +3,7 @@ ManaCost:GW
 Types:Legendary Creature Elf Warrior
 Text:no text
 PT:1/1
-A:AB$Token | Cost$ 2 GW T | TokenAmount$ 1 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green and white Elf Warrior creature token onto the battlefield.
+A:AB$ Token | Cost$ 2 GW T | TokenAmount$ 1 | TokenName$ Elf Warrior | TokenTypes$ Creature,Elf,Warrior | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green and white Elf Warrior creature token onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rhys_the_redeemed.jpg
 SetInfo:SHM|Rare|http://magiccards.info/scans/en/shm/237.jpg
diff --git a/res/cardsfolder/savage_conception.txt b/res/cardsfolder/savage_conception.txt
index 38495b0d684..a073bcc322d 100644
--- a/res/cardsfolder/savage_conception.txt
+++ b/res/cardsfolder/savage_conception.txt
@@ -2,8 +2,8 @@ Name:Savage Conception
 ManaCost:3 G G
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
-A:SP$Token | Cost$ 3 G G Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3| TokenToughness$ 3 | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+A:SP$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
+A:SP$ Token | Cost$ 3 G G Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3| TokenToughness$ 3 | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_conception.jpg
 SetInfo:EVE|Uncommon|http://magiccards.info/scans/en/eve/75.jpg
diff --git a/res/cardsfolder/selesnya_evangel.txt b/res/cardsfolder/selesnya_evangel.txt
index 77d794ff81c..ea41f09da19 100644
--- a/res/cardsfolder/selesnya_evangel.txt
+++ b/res/cardsfolder/selesnya_evangel.txt
@@ -3,7 +3,7 @@ ManaCost:G W
 Types:Creature Elf Shaman
 Text:no text
 PT:1/2
-A:AB$Token | Cost$ 1 T tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$ Token | Cost$ 1 T tapXType<1/Creature> | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_evangel.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/228.jpg
diff --git a/res/cardsfolder/spectral_procession.txt b/res/cardsfolder/spectral_procession.txt
index c6cbc27601e..0e698487ccb 100644
--- a/res/cardsfolder/spectral_procession.txt
+++ b/res/cardsfolder/spectral_procession.txt
@@ -2,7 +2,7 @@ Name:Spectral Procession
 ManaCost:2/W 2/W 2/W
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 2/W 2/W 2/W | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put three 1/1 white Spirit creature tokens with flying onto the battlefield.
+A:SP$ Token | Cost$ 2/W 2/W 2/W | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put three 1/1 white Spirit creature tokens with flying onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spectral_procession.jpg
 SetInfo:SHM|Uncommon|http://magiccards.info/scans/en/shm/23.jpg
diff --git a/res/cardsfolder/spontaneous_generation.txt b/res/cardsfolder/spontaneous_generation.txt
index cd96c3f3fb2..1ba58c7bb60 100644
--- a/res/cardsfolder/spontaneous_generation.txt
+++ b/res/cardsfolder/spontaneous_generation.txt
@@ -1,8 +1,8 @@
 Name:Spontaneous Generation
 ManaCost:3 G
 Types:Sorcery
-Text:Put a 1/1 green Saproling creature token onto the battlefield for each card in your hand.
-A:SP$Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
+Text:no text
+A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield for each card in your hand.
 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/sprout.txt b/res/cardsfolder/sprout.txt
index 48b303e2852..17c1b5eaf2b 100644
--- a/res/cardsfolder/sprout.txt
+++ b/res/cardsfolder/sprout.txt
@@ -1,8 +1,8 @@
 Name:Sprout
 ManaCost:G
 Types:Instant
-Text:Put a 1/1 green Saproling creature token onto the battlefield.
-A:SP$Token | Cost$ G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
+Text:no text
+A:SP$ Token | Cost$ G | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sprout.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/221.jpg
diff --git a/res/cardsfolder/stitch_in_time.txt b/res/cardsfolder/stitch_in_time.txt
index eaf39a53d9c..d2c306f35bd 100644
--- a/res/cardsfolder/stitch_in_time.txt
+++ b/res/cardsfolder/stitch_in_time.txt
@@ -2,7 +2,7 @@ Name:Stitch in Time
 ManaCost:1 U R
 Types:Sorcery
 Text:no text
-A:SP$FlipACoin | Cost$ 1 U R | WinSubAbility$ DBAddTurn | SpellDescription$ Flip a coin. If you win the flip, take an extra turn after this one.
+A:SP$ FlipACoin | Cost$ 1 U R | WinSubAbility$ DBAddTurn | SpellDescription$ Flip a coin. If you win the flip, take an extra turn after this one.
 SVar:DBAddTurn:DB$AddTurn | Defined$ You | NumTurns$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stitch_in_time.jpg
diff --git a/res/cardsfolder/the_hive.txt b/res/cardsfolder/the_hive.txt
index 5b3fef40523..6c545aebc4e 100644
--- a/res/cardsfolder/the_hive.txt
+++ b/res/cardsfolder/the_hive.txt
@@ -2,7 +2,7 @@ Name:The Hive
 ManaCost:5
 Types:Artifact
 Text:no text
-A:AB$Token | Cost$ 5 T | TokenAmount$ 1 | TokenName$ Wasp | TokenTypes$ Artifact,Creature,Insect | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 colorless Insect artifact creature token with flying named Wasp onto the battlefield.
+A:AB$ Token | Cost$ 5 T | TokenAmount$ 1 | TokenName$ Wasp | TokenTypes$ Artifact,Creature,Insect | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 colorless Insect artifact creature token with flying named Wasp onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/the_hive.jpg
 SetInfo:LEA|Rare|http://magiccards.info/scans/en/al/272.jpg
diff --git a/res/cardsfolder/thunderheads.txt b/res/cardsfolder/thunderheads.txt
index f8a7e3d544e..cd0609f9e92 100644
--- a/res/cardsfolder/thunderheads.txt
+++ b/res/cardsfolder/thunderheads.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Instant
 Text:no text
 K:Replicate 2 U
-A:SP$Token | Cost$ 2 U | TokenName$ Weird | TokenOwner$ You | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Defender<>Flying<>HIDDEN At the beginning of the end step, exile CARDNAME. | TokenAmount$ 1 | TokenColors$ Blue | TokenTypes$ Creature,Weird | SpellDescription$ Put a 3/3 blue Weird creature token with defender and flying onto the battlefield. Exile it at the beginning of the next end step.
+A:SP$ Token | Cost$ 2 U | TokenName$ Weird | TokenOwner$ You | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Defender<>Flying<>HIDDEN At the beginning of the end step, exile CARDNAME. | TokenAmount$ 1 | TokenColors$ Blue | TokenTypes$ Creature,Weird | SpellDescription$ Put a 3/3 blue Weird creature token with defender and flying onto the battlefield. Exile it at the beginning of the next end step.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderheads.jpg
diff --git a/res/cardsfolder/tolsimir_wolfblood.txt b/res/cardsfolder/tolsimir_wolfblood.txt
index 61fd05cbe69..23a2764d132 100644
--- a/res/cardsfolder/tolsimir_wolfblood.txt
+++ b/res/cardsfolder/tolsimir_wolfblood.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/4
 K:stPumpAll:Creature.Green+Other+YouCtrl:1/1:No Condition:Other green creatures you control get +1/+1.
 K:stPumpAll:Creature.White+Other+YouCtrl:1/1:No Condition:Other white creatures you control get +1/+1.
-A:AB$Token | Cost$ T | TokenAmount$ 1 | TokenName$ Voja | TokenTypes$ Legendary,Creature,Wolf | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a legendary 2/2 green and white Wolf creature token named Voja onto the battlefield.
+A:AB$ Token | Cost$ T | TokenAmount$ 1 | TokenName$ Voja | TokenTypes$ Legendary,Creature,Wolf | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a legendary 2/2 green and white Wolf creature token named Voja onto the battlefield.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tolsimir_wolfblood.jpg
diff --git a/res/cardsfolder/vitu_ghazi_the_city_tree.txt b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
index cf01939b8c5..99ba58c4212 100644
--- a/res/cardsfolder/vitu_ghazi_the_city_tree.txt
+++ b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$Token | Cost$ 2 G W T | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$ Token | Cost$ 2 G W T | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 green Saproling creature token onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vitu_ghazi_the_city_tree.jpg
 SetInfo:RAV|Uncommon|http://magiccards.info/scans/en/rav/285.jpg
diff --git a/res/cardsfolder/wall_of_kelp.txt b/res/cardsfolder/wall_of_kelp.txt
index 7e6b1f0d9bd..75748054a13 100644
--- a/res/cardsfolder/wall_of_kelp.txt
+++ b/res/cardsfolder/wall_of_kelp.txt
@@ -4,7 +4,7 @@ Types:Creature Wall
 Text:no text
 PT:0/3
 K:Defender
-A:AB$Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant,Wall | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
+A:AB$ Token | Cost$ U U T | TokenAmount$ 1 | TokenName$ Plant Wall | TokenTypes$ Creature,Plant,Wall | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 0 | TokenToughness$ 1 | TokenKeywords$ Defender | SpellDescription$ Put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/hm/en-us/card2959.jpg
diff --git a/res/cardsfolder/wand_of_the_elements.txt b/res/cardsfolder/wand_of_the_elements.txt
index ccc416a7147..cd6d704e82d 100644
--- a/res/cardsfolder/wand_of_the_elements.txt
+++ b/res/cardsfolder/wand_of_the_elements.txt
@@ -2,8 +2,8 @@ Name:Wand of the Elements
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Token | Cost$ T Sac<1/Island> | TokenImage$ U 2 2 Elemental Flying | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying| SpellDescription$ Put a 2/2 blue Elemental creature token with flying onto the battlefield.
-A:AB$Token | Cost$ T Sac<1/Mountain> | TokenImage$ R 3 3 Elemental | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 red Elemental creature token onto the battlefield.
+A:AB$ Token | Cost$ T Sac<1/Island> | TokenImage$ U 2 2 Elemental Flying | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying| SpellDescription$ Put a 2/2 blue Elemental creature token with flying onto the battlefield.
+A:AB$ Token | Cost$ T Sac<1/Mountain> | TokenImage$ R 3 3 Elemental | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 red Elemental creature token onto the battlefield.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wand_of_the_elements.jpg
diff --git a/res/cardsfolder/worm_harvest.txt b/res/cardsfolder/worm_harvest.txt
index a691cf42249..befa78513e8 100644
--- a/res/cardsfolder/worm_harvest.txt
+++ b/res/cardsfolder/worm_harvest.txt
@@ -2,8 +2,8 @@ Name:Worm Harvest
 ManaCost:2 BG BG BG
 Types:Sorcery
 Text:no text
-A:SP$Token | Cost$ 2 BG BG BG | TokenAmount$ X | TokenName$ Worm | TokenTypes$ Creature,Worm | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 black and green Worm creature token onto the battlefield for each land card in your graveyard.
-A:SP$Token | Cost$ 2 BG BG BG Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ X | TokenName$ Worm | TokenTypes$ Creature,Worm | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
+A:SP$ Token | Cost$ 2 BG BG BG | TokenAmount$ X | TokenName$ Worm | TokenTypes$ Creature,Worm | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 black and green Worm creature token onto the battlefield for each land card in your graveyard.
+A:SP$ Token | Cost$ 2 BG BG BG Discard<1/Land> | ActivatingZone$ Graveyard | CostDesc$ Retrace | TokenAmount$ X | TokenName$ Worm | TokenTypes$ Creature,Worm | TokenOwner$ You | TokenColors$ Black,Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ (You may cast this card from your graveyard by discarding a land card in addition to paying its other costs.)
 SVar:X:Count$TypeInYourYard.Land
 SVar:Rarity:Rare
 SVar:Picture:http://magiccards.info/scans/en/eve/131.jpg
diff --git a/res/cardsfolder/zombie_infestation.txt b/res/cardsfolder/zombie_infestation.txt
index 297aab2234a..efea8dc00b0 100644
--- a/res/cardsfolder/zombie_infestation.txt
+++ b/res/cardsfolder/zombie_infestation.txt
@@ -2,7 +2,7 @@ Name:Zombie Infestation
 ManaCost:1 B
 Types:Enchantment
 Text:no text
-A:AB$Token | Cost$ Discard<2/Card> | TokenImage$ B 2 2 Zombie | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield.
+A:AB$ Token | Cost$ Discard<2/Card> | TokenImage$ B 2 2 Zombie | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield.
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zombie_infestation.jpg