From f17f87789384571c5fba8be5d03f7ccb4c3f9a32 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 10:37:24 +0000
Subject: [PATCH] *Converted all abMakeToken cards to AF_Token.

---
 res/cardsfolder/ant_queen.txt                 | 3 ++-
 res/cardsfolder/baku_altar.txt                | 3 ++-
 res/cardsfolder/boris_devilboon.txt           | 3 ++-
 res/cardsfolder/centaur_glade.txt             | 3 ++-
 res/cardsfolder/cloudseeder.txt               | 3 ++-
 res/cardsfolder/dragon_roost.txt              | 3 ++-
 res/cardsfolder/gargoyle_castle.txt           | 3 ++-
 res/cardsfolder/goblin_trenches.txt           | 3 ++-
 res/cardsfolder/goblin_warrens.txt            | 3 ++-
 res/cardsfolder/godsire.txt                   | 3 ++-
 res/cardsfolder/golem_foundry.txt             | 3 ++-
 res/cardsfolder/hornet_cannon.txt             | 3 ++-
 res/cardsfolder/icatian_crier.txt             | 3 ++-
 res/cardsfolder/imperious_perfect.txt         | 3 ++-
 res/cardsfolder/jund_battlemage.txt           | 6 ++++--
 res/cardsfolder/kher_keep.txt                 | 3 ++-
 res/cardsfolder/kjeldoran_outpost.txt         | 4 +++-
 res/cardsfolder/lich_lord_of_unx.txt          | 3 ++-
 res/cardsfolder/llanowar_mentor.txt           | 3 ++-
 res/cardsfolder/meloku_the_clouded_mirror.txt | 3 ++-
 res/cardsfolder/mobilization.txt              | 3 ++-
 res/cardsfolder/myr_matrix.txt                | 3 ++-
 res/cardsfolder/nemata_grove_guardian.txt     | 3 ++-
 res/cardsfolder/patrol_signaler.txt           | 3 ++-
 res/cardsfolder/pentavus.txt                  | 3 ++-
 res/cardsfolder/rakka_mar.txt                 | 3 ++-
 res/cardsfolder/rhys_the_redeemed.txt         | 3 ++-
 res/cardsfolder/selesnya_evangel.txt          | 3 ++-
 res/cardsfolder/selesnya_guildmage.txt        | 3 ++-
 res/cardsfolder/sliver_queen.txt              | 3 ++-
 res/cardsfolder/sliversmith.txt               | 3 ++-
 res/cardsfolder/sparkspitter.txt              | 3 ++-
 res/cardsfolder/the_hive.txt                  | 3 ++-
 res/cardsfolder/thopter_squadron.txt          | 3 ++-
 res/cardsfolder/tolsimir_wolfblood.txt        | 3 ++-
 res/cardsfolder/trigon_of_infestation.txt     | 3 ++-
 res/cardsfolder/triskelavus.txt               | 3 ++-
 res/cardsfolder/urzas_factory.txt             | 3 ++-
 res/cardsfolder/vitu_ghazi_the_city_tree.txt  | 3 ++-
 res/cardsfolder/wall_of_kelp.txt              | 3 ++-
 40 files changed, 83 insertions(+), 41 deletions(-)

diff --git a/res/cardsfolder/ant_queen.txt b/res/cardsfolder/ant_queen.txt
index 0b476738fa8..2d64f61e143 100644
--- a/res/cardsfolder/ant_queen.txt
+++ b/res/cardsfolder/ant_queen.txt
@@ -3,7 +3,8 @@ ManaCost:3 G G
 Types:Creature Insect
 Text:no text
 PT:5/5
-K:abMakeToken 1 G<>1<>Insect<>G 1 1 Insect<>Controller<>G<>Creature;Insect<>1<>1<>None<>put a 1/1 green Insect creature token onto the battlefield.
+#K:abMakeToken 1 G<>1<>Insect<>G 1 1 Insect<>Controller<>G<>Creature;Insect<>1<>1<>None<>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$Controller|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
 End
diff --git a/res/cardsfolder/baku_altar.txt b/res/cardsfolder/baku_altar.txt
index 7f5ddc7ab5a..8d6b4cd0fc0 100644
--- a/res/cardsfolder/baku_altar.txt
+++ b/res/cardsfolder/baku_altar.txt
@@ -3,7 +3,8 @@ ManaCost:2
 Types:Artifact
 Text:no text
 K:WheneverKeyword:CastSpell/Controller:OneTypeOfMany/Arcane/Spirit:Play:CustomCounter.KI/1:Self:ASAP:Yes_No:No Special Condition:Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Baku Altar.
-K:abMakeToken 2 T SubCounter<1/KI><>1<>Spirit<>C 1 1 Spirit<>Controller<>1<>Creature;Spirit<>1<>1<><>Put a 1/1 colorless Spirit creature token onto the battlefield.
+#K:abMakeToken 2 T SubCounter<1/KI><>1<>Spirit<>C 1 1 Spirit<>Controller<>1<>Creature;Spirit<>1<>1<><>Put a 1/1 colorless Spirit creature token onto the battlefield.
+A:AB$Token|Cost$2 T SubCounter<1/KI>|TokenAmount$1|TokenName$Spirit|TokenTypes$Creature,Spirit|TokenColors$Colorless|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 colorless Spirit creature token onto the battlefield.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/baku_altar.jpg
diff --git a/res/cardsfolder/boris_devilboon.txt b/res/cardsfolder/boris_devilboon.txt
index cee760af7ca..c97ebb0dd97 100644
--- a/res/cardsfolder/boris_devilboon.txt
+++ b/res/cardsfolder/boris_devilboon.txt
@@ -3,7 +3,8 @@ ManaCost:3 B R
 Types:Legendary Creature Zombie Wizard
 Text:no text
 PT:2/2
-K:abMakeToken 2 B R T<>1<>Minor Demon<>BR 1 1 Minor Demon<>Controller<>1<>Creature;Demon<>1<>1<>None<>Put a 1/1 black and red Demon creature token named Minor Demon onto the battlefield.
+#K:abMakeToken 2 B R T<>1<>Minor Demon<>BR 1 1 Minor Demon<>Controller<>1<>Creature;Demon<>1<>1<>None<>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$Controller|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
 End
diff --git a/res/cardsfolder/centaur_glade.txt b/res/cardsfolder/centaur_glade.txt
index 0f9d804b0ff..a8c85c37bdb 100644
--- a/res/cardsfolder/centaur_glade.txt
+++ b/res/cardsfolder/centaur_glade.txt
@@ -2,7 +2,8 @@ Name:Centaur Glade
 ManaCost:3 G G
 Types:Enchantment
 Text:no text
-K:abMakeToken 2 G G<>1<>Centaur<>G 3 3 Centaur<>Controller<>G<>Creature;Centaur<>3<>3<>None<>Put a 3/3 green Centaur creature token onto the battlefield.
+#K:abMakeToken 2 G G<>1<>Centaur<>G 3 3 Centaur<>Controller<>G<>Creature;Centaur<>3<>3<>None<>Put a 3/3 green Centaur creature token onto the battlefield.
+A:AB$Token|Cost$2 G G|TokenAmount$1|TokenOwner$Controller|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
 End
diff --git a/res/cardsfolder/cloudseeder.txt b/res/cardsfolder/cloudseeder.txt
index 063ece97d84..0b4c2adebc3 100644
--- a/res/cardsfolder/cloudseeder.txt
+++ b/res/cardsfolder/cloudseeder.txt
@@ -4,7 +4,8 @@ Types:Creature Faerie Spellshaper
 Text:no text
 PT:1/1
 K:Flying
-K:abMakeToken U T Discard<1/Any><>1<>Cloud Sprite<>U 1 1 Cloud Sprite<>Controller<>1<>Creature;Faerie<>1<>1<>Flying;CARDNAME can block only creatures with flying.<>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."
+#K:abMakeToken U T Discard<1/Any><>1<>Cloud Sprite<>U 1 1 Cloud Sprite<>Controller<>1<>Creature;Faerie<>1<>1<>Flying;CARDNAME can block only creatures with flying.<>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/Any>|TokenOwner$Controller|TokenAmount$1|TokenName$Cloud Sprite|TokenTypes$Creature,Faerie|TokenColors$Blue|TokenPower$1|TokenToughness$1|TokenKeywords$Flying<>CARDNAEM 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
 End
diff --git a/res/cardsfolder/dragon_roost.txt b/res/cardsfolder/dragon_roost.txt
index 661c83ef274..1832909c988 100644
--- a/res/cardsfolder/dragon_roost.txt
+++ b/res/cardsfolder/dragon_roost.txt
@@ -2,7 +2,8 @@ Name:Dragon Roost
 ManaCost:4 R R
 Types:Enchantment
 Text:no text
-K:abMakeToken 5 R R<>1<>Dragon<>R 5 5 Dragon<>Controller<>R<>Creature;Dragon<>5<>5<>Flying<>Put a 5/5 red Dragon creature token with flying onto the battlefield.
+#K:abMakeToken 5 R R<>1<>Dragon<>R 5 5 Dragon<>Controller<>R<>Creature;Dragon<>5<>5<>Flying<>Put a 5/5 red Dragon creature token with flying onto the battlefield.
+A:AB$Token|Cost$5 R R|TokenOwner$Controller|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
 End
diff --git a/res/cardsfolder/gargoyle_castle.txt b/res/cardsfolder/gargoyle_castle.txt
index d6c3fa4e402..2ec7bd320ca 100644
--- a/res/cardsfolder/gargoyle_castle.txt
+++ b/res/cardsfolder/gargoyle_castle.txt
@@ -3,7 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:tap: add 1
-K:abMakeToken 5 T Sac<1/CARDNAME><>1<>Gargoyle<>C 3 4 Gargoyle<>Controller<>1<>Artifact;Creature;Gargoyle<>3<>4<>Flying<>Put a 3/4 colorless Gargoyle artifact creature token with flying onto the battlefield.
+#K:abMakeToken 5 T Sac<1/CARDNAME><>1<>Gargoyle<>C 3 4 Gargoyle<>Controller<>1<>Artifact;Creature;Gargoyle<>3<>4<>Flying<>Put a 3/4 colorless Gargoyle artifact creature token with flying onto the battlefield.
+A:AB$Token|Cost$5 T Sac<1/CARDNAME>|TokenOwner$Controller|TokenAmount$1|TokenName$Gargoyle|TokenTypes$Artifact,Creature,Gargoyle|TokenColors$Colorless|TokenPower$3|TokenToughness$4|TokenKeyWords$Flying|SpellDescription$Put a 3/4 colorless Gargoyle artifact creature token with flying onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gargoyle_castle.jpg
 End
diff --git a/res/cardsfolder/goblin_trenches.txt b/res/cardsfolder/goblin_trenches.txt
index 64bb2737ee3..e9db56f7f66 100644
--- a/res/cardsfolder/goblin_trenches.txt
+++ b/res/cardsfolder/goblin_trenches.txt
@@ -2,7 +2,8 @@ Name:Goblin Trenches
 ManaCost:1 R W
 Types:Enchantment
 Text:no text
-K:abMakeToken 2 Sac<1/Land><>2<>Goblin Soldier<>RW 1 1 Goblin Soldier<>Controller<>RW<>Creature;Goblin;Soldier<>1<>1<>None<>Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield.
+#K:abMakeToken 2 Sac<1/Land><>2<>Goblin Soldier<>RW 1 1 Goblin Soldier<>Controller<>RW<>Creature;Goblin;Soldier<>1<>1<>None<>Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield.
+A:AB$Token|Cost$2 Sac<1/Land>|TokenAmount$2|TokenName$Goblin Soldier|TokenTypes$Creature,Goblin,Soldier|TokenOwner$Controller|TokenColors$White,Red|TokenPower$1|TokenToughness$1|SpellDescription$Put two 1/1 red and white Goblin Soldier creature tokens onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_trenches.jpg
 End
diff --git a/res/cardsfolder/goblin_warrens.txt b/res/cardsfolder/goblin_warrens.txt
index 60d36c74863..5d43081ad01 100644
--- a/res/cardsfolder/goblin_warrens.txt
+++ b/res/cardsfolder/goblin_warrens.txt
@@ -2,7 +2,8 @@ Name:Goblin Warrens
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-K:abMakeToken 2 R Sac<2/Goblin><>3<>Goblin<>R 1 1 Goblin<>Controller<>R<>Creature;Goblin<>1<>1<>None<>Put three 1/1 red Goblin creature tokens onto the battlefield.  
+#K:abMakeToken 2 R Sac<2/Goblin><>3<>Goblin<>R 1 1 Goblin<>Controller<>R<>Creature;Goblin<>1<>1<>None<>Put three 1/1 red Goblin creature tokens onto the battlefield.
+A:AB$Token|Cost$2 R Sac<2/Goblin>|TokenAmount$3|TokenName$Goblin|TokenTypes$Creature,Goblin|TokenOwner$Controller|TokenColors$Red|TokenPower$1|TokenToughness$1|SpellDescription$Put three 1/1 red Goblin Soldier creature tokens onto the battlefield.  
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_warrens.jpg
diff --git a/res/cardsfolder/godsire.txt b/res/cardsfolder/godsire.txt
index 30d4f13774c..1009e3d5fe6 100644
--- a/res/cardsfolder/godsire.txt
+++ b/res/cardsfolder/godsire.txt
@@ -4,7 +4,8 @@ Types:Creature Beast
 Text:no text
 PT:8/8
 K:Vigilance
-K:abMakeToken T<>1<>Beast<>RGW 8 8 Beast<>Controller<>R G W<>Creature;Beast<>8<>8<>None<>put an 8/8 Beast creature token that's red, green, and white onto the battlefield.
+#K:abMakeToken T<>1<>Beast<>RGW 8 8 Beast<>Controller<>R G W<>Creature;Beast<>8<>8<>None<>put an 8/8 Beast creature token that's red, green, and white onto the battlefield.
+A:AB$Token|Cost$T|TokenAmount$1|TokenName$Beast|TokenTypes$Creature,Beast|TokenOwner$Controller|TokenColors$White,Red,Green|TokenPower$8|TokenToughness$8|SpellDescription$Put an 8/8 Beast creature token that's red, green, and white onto the battlefield.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/godsire.jpg
 End
diff --git a/res/cardsfolder/golem_foundry.txt b/res/cardsfolder/golem_foundry.txt
index 217e9401d15..73fb6a962cc 100644
--- a/res/cardsfolder/golem_foundry.txt
+++ b/res/cardsfolder/golem_foundry.txt
@@ -3,7 +3,8 @@ ManaCost:3
 Types:Artifact
 Text:no text
 K:WheneverKeyword:CastSpell/Controller:Type/Artifact:Play:CustomCounter.CHARGE/1:Self:ASAP:Yes_No:No Special Condition:Whenever you cast an artifact spell, you may put a charge counter on Golem Foundry.
-K:abMakeToken SubCounter<3/CHARGE><>1<>Golem<>C 3 3 Golem<>Controller<>1<>Artifact;Creature;Golem<>3<>3<><>Put a 3/3 colorless Golem artifact creature token onto the battlefield.
+#K:abMakeToken SubCounter<3/CHARGE><>1<>Golem<>C 3 3 Golem<>Controller<>1<>Artifact;Creature;Golem<>3<>3<><>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$Controller|TokenColors$Colorless|TokenPower$3|TokenToughness$3|SpellDescription$Put a 3/3 colorless Golem artifact creature token onto the battlefield.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golem_foundry.jpg
diff --git a/res/cardsfolder/hornet_cannon.txt b/res/cardsfolder/hornet_cannon.txt
index a1cbdf7f595..fee28e6fb4f 100644
--- a/res/cardsfolder/hornet_cannon.txt
+++ b/res/cardsfolder/hornet_cannon.txt
@@ -2,7 +2,8 @@ Name:Hornet Cannon
 ManaCost:4
 Types:Artifact
 Text:no text
-K:abMakeToken 3 T<>1<>Hornet<>C 1 1 Hornet<>Controller<>1<>Artifact;Creature;Insect<>1<>1<>Flying;Haste;HIDDEN At the beginning of the end step, destroy CARDNAME.<>put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy it at the beginning of the next end step.
+#K:abMakeToken 3 T<>1<>Hornet<>C 1 1 Hornet<>Controller<>1<>Artifact;Creature;Insect<>1<>1<>Flying;Haste;HIDDEN At the beginning of the end step, destroy CARDNAME.<>put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy it at the beginning of the next end step.
+A:AB$Token|Cost$3 T|TokenAmount$1|TokenName$Hornet|TokenTypes$Artifact,Creature,Insect|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|TokenKeywords$Flying<>Haste<>HIDDEN At the beginning of the end step, destroy CARDNAME.|SpellDescription$Put a 1/1 colorless Insect artifact creature token with flying and haste named Hornet onto the battlefield. Destroy it at the beginning of the next end step.  
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_cannon.jpg
 End
diff --git a/res/cardsfolder/icatian_crier.txt b/res/cardsfolder/icatian_crier.txt
index 71d3d2b53cc..cad44c9b223 100644
--- a/res/cardsfolder/icatian_crier.txt
+++ b/res/cardsfolder/icatian_crier.txt
@@ -3,7 +3,8 @@ ManaCost:2 W
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-K:abMakeToken 1 W T Discard<1/Any><>2<>Citizen<>W 1 1 Citizen<>Controller<>W<>Creature;Citizen<>1<>1<>None<>put two 1/1 white Citizen creature tokens onto the battlefield.
+#K:abMakeToken 1 W T Discard<1/Any><>2<>Citizen<>W 1 1 Citizen<>Controller<>W<>Creature;Citizen<>1<>1<>None<>put two 1/1 white Citizen creature tokens onto the battlefield.
+A:AB$Token|Cost$1 W T Discard<1/Any>|TokenAmount$2|TokenName$Citizen|TokenTypes$Creature,Citizen|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1|SpellDescription$Put two 1/1 white Citizen creature tokens onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icatian_crier.jpg
 End
diff --git a/res/cardsfolder/imperious_perfect.txt b/res/cardsfolder/imperious_perfect.txt
index 722cc537d2b..e956f6a8cef 100644
--- a/res/cardsfolder/imperious_perfect.txt
+++ b/res/cardsfolder/imperious_perfect.txt
@@ -3,7 +3,8 @@ ManaCost:2 G
 Types:Creature Elf Warrior
 Text:All Elf creatures you control get +1/+1
 PT:1/1
-K:abMakeToken G T<>1<>Elf Warrior<>G 1 1 Elf Warrior<>Controller<>G<>Creature;Elf;Warrior<>1<>1<>None<>put a 1/1 green Elf Warrior creature token onto the battlefield.
+#K:abMakeToken G T<>1<>Elf Warrior<>G 1 1 Elf Warrior<>Controller<>G<>Creature;Elf;Warrior<>1<>1<>None<>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$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 green Elf Warrior creature token onto the battlefield.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imperious_perfect.jpg
diff --git a/res/cardsfolder/jund_battlemage.txt b/res/cardsfolder/jund_battlemage.txt
index d1f788345cb..44a921a524b 100644
--- a/res/cardsfolder/jund_battlemage.txt
+++ b/res/cardsfolder/jund_battlemage.txt
@@ -3,8 +3,10 @@ ManaCost:2 R
 Types:Creature Human Shaman
 Text:no text
 PT:2/2
-K:abLoseLifeTgt B T:1
-K:abMakeToken G T<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+#K:abLoseLifeTgt B T:1
+#K:abMakeToken G T<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$LoseLife|Cost$B T|Tgt$TgtP|LifeAmount$1|SpellDescription$Target player loses 1 life.
+A:AB$Token|Cost$G T|TokenAmount$1|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|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/jund_battlemage.jpg
 End
diff --git a/res/cardsfolder/kher_keep.txt b/res/cardsfolder/kher_keep.txt
index 1b023fcf727..23e4b320ff9 100644
--- a/res/cardsfolder/kher_keep.txt
+++ b/res/cardsfolder/kher_keep.txt
@@ -3,7 +3,8 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 K:tap: add 1
-K:abMakeToken 1 R T<>1<>Kobold<>R 0 1 Kobold<>Controller<>R<>Creature;Kobold<>0<>1<>None<>Put a 0/1 red Kobold creature token named Kobolds of Kher Keep onto the battlefield.
+#K:abMakeToken 1 R T<>1<>Kobold<>R 0 1 Kobold<>Controller<>R<>Creature;Kobold<>0<>1<>None<>Put a 0/1 red Kobold creature token named Kobolds of Kher Keep onto the battlefield.
+A:AB$Token|Cost$1 R T|TokenAmount$1|TokenName$Kobolds of Kher Keep|TokenTypes$Creature,Kobold|TokenOwner$Controller|TokenColors$Red|TokenPower$0|TokenToughness$1|SpellDescription$Put a 0/1 red Kobold creature token named Kobolds of Kher Keep onto the battlefield.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kher_keep.jpg
 End
diff --git a/res/cardsfolder/kjeldoran_outpost.txt b/res/cardsfolder/kjeldoran_outpost.txt
index 3786df2c219..e8c7a88c171 100644
--- a/res/cardsfolder/kjeldoran_outpost.txt
+++ b/res/cardsfolder/kjeldoran_outpost.txt
@@ -3,7 +3,9 @@ ManaCost:no cost
 Types:Land
 Text:If Kjeldoran Outpost would enter the battlefield, sacrifice a Plains instead. If you do, put Kjeldoran Outpost onto the battlefield. If you don't, put it into its owner's graveyard.
 K:tap: add W
-K:abMakeToken 1 W T<>1<>Soldier<>W 1 1 Soldier<>Controller<>W<>Creature;Soldier<>1<>1<>None<>Put a 1/1 white Soldier creature token onto the battlefield.
+#K:abMakeToken 1 W T<>1<>Soldier<>W 1 1 Soldier<>Controller<>W<>Creature;Soldier<>1<>1<>None<>Put a 1/1 white Soldier creature token onto the battlefield.
+A:AB$Token|Cost$1 W T|TokenAmount$1|TokenName$Soldier|TokenTypes$Creature,Soldier|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 white Soldier creature token onto the battlefield.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kjeldoran_outpost.jpg
 End
+#Uses card-specific code!
\ No newline at end of file
diff --git a/res/cardsfolder/lich_lord_of_unx.txt b/res/cardsfolder/lich_lord_of_unx.txt
index acb59370cb0..3645296a492 100644
--- a/res/cardsfolder/lich_lord_of_unx.txt
+++ b/res/cardsfolder/lich_lord_of_unx.txt
@@ -3,7 +3,8 @@ ManaCost:1 U B
 Types:Creature Zombie Wizard
 Text:no text
 PT:2/2
-K:abMakeToken U B T<>1<>Zombie Wizard<>UB 1 1 Zombie Wizard<>Controller<>UB<>Creature;Zombie;Wizard<>1<>1<>None<>put a 1/1 blue and black Zombie Wizard creature token onto the battlefield.
+#K:abMakeToken U B T<>1<>Zombie Wizard<>UB 1 1 Zombie Wizard<>Controller<>UB<>Creature;Zombie;Wizard<>1<>1<>None<>put a 1/1 blue and black Zombie Wizard creature token onto the battlefield.
+A:AB$Token|Cost$U B T|TokenAmount$1|TokenName$Zombie Wizard|TokenTypes$Creature,Zombie,Wizard|TokenOwner$Controller|TokenColors$Blue,Black|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 blue and black Zombie Wizard creature token onto the battlefield.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lich_lord_of_unx.jpg
 End
diff --git a/res/cardsfolder/llanowar_mentor.txt b/res/cardsfolder/llanowar_mentor.txt
index 2e2395d5e8b..7ea738348cc 100644
--- a/res/cardsfolder/llanowar_mentor.txt
+++ b/res/cardsfolder/llanowar_mentor.txt
@@ -3,7 +3,8 @@ ManaCost:G
 Types:Creature Elf Spellshaper
 Text:no text
 PT:1/1
-K:abMakeToken G T Discard<1/Any><>1<>Llanowar Elves<>G 1 1 Llanowar Elves<>Controller<>G<>Creature;Elf;Druid<>1<>1<>tap: add G<>Put a 1/1 green Elf Druid creature token named Llanowar Elves onto the battlefield. It has "Tap: Add Green to your mana pool."
+#K:abMakeToken G T Discard<1/Any><>1<>Llanowar Elves<>G 1 1 Llanowar Elves<>Controller<>G<>Creature;Elf;Druid<>1<>1<>tap: add G<>Put a 1/1 green Elf Druid creature token named Llanowar Elves onto the battlefield. It has "Tap: Add Green to your mana pool."
+A:AB$Token|Cost$G T Discard<1/Any>|TokenAmount$1|TokenName$Llanowar Elves|TokenTypes$Creature,Elf,Druid|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|TokenKeywords$tap: add G|SpellDescription$Put a 1/1 green Elf Druid creature token named Llanowar Elves onto the battlefield. It has "Tap: Add Green to your mana pool."  
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card126166.jpg
 End
diff --git a/res/cardsfolder/meloku_the_clouded_mirror.txt b/res/cardsfolder/meloku_the_clouded_mirror.txt
index 679b0cc67bb..e51ba66fcbd 100644
--- a/res/cardsfolder/meloku_the_clouded_mirror.txt
+++ b/res/cardsfolder/meloku_the_clouded_mirror.txt
@@ -4,7 +4,8 @@ Types:Legendary Creature Moonfolk Wizard
 Text:no text
 PT:2/4
 K:Flying
-K:abMakeToken 1 Return<1/Land><>1<>Illusion<>U 1 1 Illusion<>Controller<>U<>Creature;Illusion<>1<>1<>Flying<>Put a 1/1 blue Illusion creature token with flying onto the battlefield.
+#K:abMakeToken 1 Return<1/Land><>1<>Illusion<>U 1 1 Illusion<>Controller<>U<>Creature;Illusion<>1<>1<>Flying<>Put a 1/1 blue Illusion creature token with flying onto the battlefield.
+A:AB$Token|Cost$1 Return<1/Land>|TokenAmount$1|TokenName$Illusion|TokenTypes$Creature,Illusion|TokenOwner$Controller|TokenColors$Blue|TokenPower$1|TokenToughness$1|TokenKeywords$Flying|SpellDescription$Put a 1/1 blue Illusion creature token with flying onto the battlefield.  
 SVar:Rarity:Rare
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card75268.jpg
diff --git a/res/cardsfolder/mobilization.txt b/res/cardsfolder/mobilization.txt
index c7af1d6d56a..74c90aaa444 100644
--- a/res/cardsfolder/mobilization.txt
+++ b/res/cardsfolder/mobilization.txt
@@ -2,7 +2,8 @@ Name:Mobilization
 ManaCost:2 W
 Types:Enchantment
 Text:no text
-K:abMakeToken 2 W<>1<>Soldier<>W 1 1 Soldier<>Controller<>W<>Creature;Soldier<>1<>1<>None<>Put a 1/1 white Soldier creature token onto the battlefield.
+#K:abMakeToken 2 W<>1<>Soldier<>W 1 1 Soldier<>Controller<>W<>Creature;Soldier<>1<>1<>None<>Put a 1/1 white Soldier creature token onto the battlefield.
+A:AB$Token|Cost$2 W|TokenAmount$1|TokenName$Soldier|TokenTypes$Creature,Soldier|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 white Soldier creature token onto the battlefield.  
 K:stPumpAll:Creature.Soldier:0/0/Vigilance:No Condition:Soldier creatures have vigilance.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mobilization.jpg
diff --git a/res/cardsfolder/myr_matrix.txt b/res/cardsfolder/myr_matrix.txt
index ee522b2b5f6..74ef86692f4 100644
--- a/res/cardsfolder/myr_matrix.txt
+++ b/res/cardsfolder/myr_matrix.txt
@@ -4,7 +4,8 @@ Types:Artifact
 Text:no text
 K:Indestructible
 K:stPumpAll:Creature.Myr:1/1:No Condition:Myr creatures get +1/+1.
-K:abMakeToken 5<>1<>Myr<>C 1 1 Myr<>Controller<>1<>Artifact;Creature;Myr<>1<>1<>None<>put a 1/1 colorless Myr artifact creature token onto the battlefield.
+#K:abMakeToken 5<>1<>Myr<>C 1 1 Myr<>Controller<>1<>Artifact;Creature;Myr<>1<>1<>None<>put a 1/1 colorless Myr artifact creature token onto the battlefield.
+A:AB$Token|Cost$5|TokenAmount$1|TokenName$Myr|TokenTypes$Artifact,Creature,Myr|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 colorless Myr artifact creature token onto the battlefield.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/myr_matrix.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/nemata_grove_guardian.txt b/res/cardsfolder/nemata_grove_guardian.txt
index 269a72757e4..27144600097 100644
--- a/res/cardsfolder/nemata_grove_guardian.txt
+++ b/res/cardsfolder/nemata_grove_guardian.txt
@@ -3,7 +3,8 @@ ManaCost:4 G G
 Types:Legendary Creature Treefolk
 Text:no text
 PT:4/5
-K:abMakeToken 2 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+#K:abMakeToken 2 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token|Cost$2 G|TokenAmount$1|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 green Saproling creature token onto the battlefield.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nemata_grove_guardian.jpg
 End
diff --git a/res/cardsfolder/patrol_signaler.txt b/res/cardsfolder/patrol_signaler.txt
index 3c562e12c9a..0146beca18a 100644
--- a/res/cardsfolder/patrol_signaler.txt
+++ b/res/cardsfolder/patrol_signaler.txt
@@ -3,7 +3,8 @@ ManaCost:1 W
 Types:Creature Kithkin Soldier
 Text:no text
 PT:1/1
-K:abMakeToken 1 W Untap<>1<>Kithkin Soldier<>W 1 1 Kithkin Soldier<>Controller<>W<>Creature;Kithkin;Soldier<>1<>1<>None<>put a 1/1 white Kithkin Soldier creature token onto the battlefield.
+#K:abMakeToken 1 W Untap<>1<>Kithkin Soldier<>W 1 1 Kithkin Soldier<>Controller<>W<>Creature;Kithkin;Soldier<>1<>1<>None<>put a 1/1 white Kithkin Soldier creature token onto the battlefield.
+A:AB$Token|Cost$1 W Untap|TokenAmount$1|TokenName$Kithkin Soldier|TokenTypes$Creature,Kithkin,Soldier|TokenOwner$Controller|TokenColors$White|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 white Kithkin Soldier creature token onto the battlefield.  
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/patrol_signaler.jpg
 End
diff --git a/res/cardsfolder/pentavus.txt b/res/cardsfolder/pentavus.txt
index cae64c4da93..e33cfefd8ce 100644
--- a/res/cardsfolder/pentavus.txt
+++ b/res/cardsfolder/pentavus.txt
@@ -4,7 +4,8 @@ Types:Artifact Creature Construct
 Text:no text
 PT:0/0
 K:etbCounter:P1P1:5
-K:abMakeToken 1 SubCounter<1/P1P1><>1<>Pentavite<>1 1 Pentavite<>Controller<>0<>Artifact;Creature;Pentavite<>1<>1<>Flying<>Put a 1/1 colorless Pentavite artifact creature token with flying onto the battlefield.
+#K:abMakeToken 1 SubCounter<1/P1P1><>1<>Pentavite<>1 1 Pentavite<>Controller<>0<>Artifact;Creature;Pentavite<>1<>1<>Flying<>Put a 1/1 colorless Pentavite artifact creature token with flying onto the battlefield.
+A:AB$Token|Cost$1 SubCounter<1/P1P1>|TokenAmount$1|TokenName$Pentavite|TokenTypes$Artifact,Creature,Pentavite|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|TokenKeywords$Flying|SpellDescription$Put a 1/1 colorless Pentavite artifact creature token with flying onto the battlefield.  
 A:AB$PutCounter|Cost$1 Sac<1/Pentavite>|CounterType$P1P1|CounterNum$1|SpellDescription$Put a +1/+1 counter on Pentavus.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pentavus.jpg
diff --git a/res/cardsfolder/rakka_mar.txt b/res/cardsfolder/rakka_mar.txt
index 18ce0b2afbe..458e29026b3 100644
--- a/res/cardsfolder/rakka_mar.txt
+++ b/res/cardsfolder/rakka_mar.txt
@@ -4,7 +4,8 @@ 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.
+#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.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakka_mar.jpg
 End
diff --git a/res/cardsfolder/rhys_the_redeemed.txt b/res/cardsfolder/rhys_the_redeemed.txt
index b0f3ada4e56..801d3548e44 100644
--- a/res/cardsfolder/rhys_the_redeemed.txt
+++ b/res/cardsfolder/rhys_the_redeemed.txt
@@ -3,7 +3,8 @@ ManaCost:GW
 Types:Legendary Creature Elf Warrior
 Text:no text
 PT:1/1
-K:abMakeToken 2 GW T<>1<>Elf Warrior<>GW 1 1 Elf Warrior<>Controller<>G W<>Creature;Elf;Warrior<>1<>1<>None<>put a 1/1 green and white Elf Warrior creature token onto the battlefield.
+#K:abMakeToken 2 GW T<>1<>Elf Warrior<>GW 1 1 Elf Warrior<>Controller<>G W<>Creature;Elf;Warrior<>1<>1<>None<>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$Controller|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
 End
diff --git a/res/cardsfolder/selesnya_evangel.txt b/res/cardsfolder/selesnya_evangel.txt
index 43b68f859c2..6a631e70520 100644
--- a/res/cardsfolder/selesnya_evangel.txt
+++ b/res/cardsfolder/selesnya_evangel.txt
@@ -3,7 +3,8 @@ ManaCost:G W
 Types:Creature Elf Shaman
 Text:no text
 PT:1/2
-K:abMakeToken 1 T tapXType<1/Creature><>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+#K:abMakeToken 1 T tapXType<1/Creature><>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>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$Controller|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
 End
diff --git a/res/cardsfolder/selesnya_guildmage.txt b/res/cardsfolder/selesnya_guildmage.txt
index 0d2fa281dc0..dfedaca538e 100644
--- a/res/cardsfolder/selesnya_guildmage.txt
+++ b/res/cardsfolder/selesnya_guildmage.txt
@@ -3,7 +3,8 @@ ManaCost:GW GW
 Types:Creature Elf Wizard
 Text:no text
 PT:2/2
-K:abMakeToken 3 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>Put a 1/1 green Saproling creature token onto the battlefield.
+#K:abMakeToken 3 G<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>Put a 1/1 green Saproling creature token onto the battlefield.
+A:AB$Token|Cost$3 G|TokenAmount$1|TokenName$Saproling|TokenTypes$Creature,Saproling|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 green Saproling creature token onto the battlefield.  
 K:abAllPump 3 W:YouCtrl:+1/+1:Creatures you control get +1/+1 until end of turn.:Selesnya Guildmage - creatures get +1/+1 until EOT.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_guildmage.jpg
diff --git a/res/cardsfolder/sliver_queen.txt b/res/cardsfolder/sliver_queen.txt
index 239d4dbf984..eec3c2ffbd5 100644
--- a/res/cardsfolder/sliver_queen.txt
+++ b/res/cardsfolder/sliver_queen.txt
@@ -3,7 +3,8 @@ ManaCost:W U B R G
 Types:Legendary Creature Sliver
 Text:no text
 PT:7/7
-K:abMakeToken 2<>1<>Sliver<>C 1 1 Sliver<>Controller<>1<>Creature;Sliver<>1<>1<>None<>Put a 1/1 colorless Sliver creature token onto the battlefield.
+#K:abMakeToken 2<>1<>Sliver<>C 1 1 Sliver<>Controller<>1<>Creature;Sliver<>1<>1<>None<>Put a 1/1 colorless Sliver creature token onto the battlefield.
+A:AB$Token|Cost$2|TokenAmount$1|TokenName$Sliver|TokenTypes$Creature,Sliver|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 colorless Sliver creature token onto the battlefield.  
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_queen.jpg
diff --git a/res/cardsfolder/sliversmith.txt b/res/cardsfolder/sliversmith.txt
index c99e0c5341c..cb98f55cd4e 100644
--- a/res/cardsfolder/sliversmith.txt
+++ b/res/cardsfolder/sliversmith.txt
@@ -3,7 +3,8 @@ ManaCost:2
 Types:Artifact Creature Spellshaper
 Text:no text
 PT:1/1
-K:abMakeToken 1 T Discard<1/Any><>1<>Metallic Sliver<>C 1 1 Metallic Sliver<>Controller<>1<>Artifact;Creature;Sliver<>1<>1<>None<>put a 1/1 colorless Sliver artifact creature token named Metallic Sliver onto the battlefield.
+#K:abMakeToken 1 T Discard<1/Any><>1<>Metallic Sliver<>C 1 1 Metallic Sliver<>Controller<>1<>Artifact;Creature;Sliver<>1<>1<>None<>put a 1/1 colorless Sliver artifact creature token named Metallic Sliver onto the battlefield.
+A:AB$Token|Cost$1 T Discard<1/Any>|TokenAmount$1|TokenName$Metallic Sliver|TokenTypes$Artifact,Creature,Sliver|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|SpellDescription$Put a 1/1 colorless Sliver artifact creature token named Metallic Sliver onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130329.jpg
 End
diff --git a/res/cardsfolder/sparkspitter.txt b/res/cardsfolder/sparkspitter.txt
index 95a8d598698..2c8a9ad320c 100644
--- a/res/cardsfolder/sparkspitter.txt
+++ b/res/cardsfolder/sparkspitter.txt
@@ -3,7 +3,8 @@ ManaCost:2 R
 Types:Creature Elemental Spellshaper
 Text:no text
 PT:1/3
-K:abMakeToken R T Discard<1/Any><>1<>Spark Elemental<>R 3 1 Spark Elemental<>Controller<>R<>Creature;Elemental<>3<>1<>Haste;Trample;At the beginning of the end step, sacrifice CARDNAME.<>Put a 3/1 red Elemental creature token named Spark Elemental onto the battlefield. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."
+#K:abMakeToken R T Discard<1/Any><>1<>Spark Elemental<>R 3 1 Spark Elemental<>Controller<>R<>Creature;Elemental<>3<>1<>Haste;Trample;At the beginning of the end step, sacrifice CARDNAME.<>Put a 3/1 red Elemental creature token named Spark Elemental onto the battlefield. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."
+A:AB$Token|Cost$R T Discard<1/Any>|TokenAmount$1|TokenName$Spark Elemental|TokenTypes$Creature,Goblin|TokenOwner$Controller|TokenColors$Red|TokenPower$3|TokenToughness$1|TokenKeywords$Haste<>Trample<>At the beginning of the end step, sacrifice CARDNAME.|SpellDescription$Put a 3/1 red Elemental creature token named Spark Elemental onto the battlefield. It has trample, haste, and "At the beginning of the end step, sacrifice Spark Elemental."  
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130341.jpg
 End
diff --git a/res/cardsfolder/the_hive.txt b/res/cardsfolder/the_hive.txt
index d84a1ab5d9a..b53e31dfa1b 100644
--- a/res/cardsfolder/the_hive.txt
+++ b/res/cardsfolder/the_hive.txt
@@ -2,7 +2,8 @@ Name:The Hive
 ManaCost:5
 Types:Artifact
 Text:no text
-K:abMakeToken 5 T<>1<>Wasp<>C 1 1 Wasp<>Controller<>1<>Artifact;Creature;Insect<>1<>1<>Flying<>Put a 1/1 colorless Insect artifact creature token with flying named Wasp onto the battlefield.
+#K:abMakeToken 5 T<>1<>Wasp<>C 1 1 Wasp<>Controller<>1<>Artifact;Creature;Insect<>1<>1<>Flying<>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$Controller|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
 End
diff --git a/res/cardsfolder/thopter_squadron.txt b/res/cardsfolder/thopter_squadron.txt
index 4a9d7be4f42..f074c2887bd 100644
--- a/res/cardsfolder/thopter_squadron.txt
+++ b/res/cardsfolder/thopter_squadron.txt
@@ -5,7 +5,8 @@ Text:no text
 PT:0/0
 K:Flying
 K:etbCounter:P1P1:3
-K:abMakeToken 1 SubCounter<1/P1P1><>1<>Thopter<>1 1 Thopter<>Controller<>0<>Artifact;Creature;Thopter<>1<>1<>Flying<>Put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield.
+#K:abMakeToken 1 SubCounter<1/P1P1><>1<>Thopter<>1 1 Thopter<>Controller<>0<>Artifact;Creature;Thopter<>1<>1<>Flying<>Put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield.
+A:AB$Token|Cost$1 SubCounter<1/P1P1>|TokenAmount$1|TokenName$Thopter|TokenTypes$Artifact,Creature,Thopter|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|TokenKeywords$Flying|SpellDescription$Put a 1/1 colorless Thopter artifact creature token with flying onto the battlefield.  
 A:AB$PutCounter|Cost$1 Sac<1/Thopter>|CounterType$P1P1|CounterNum$1|SorcerySpeed$True|SpellDescription$Put a +1/+1 counter on Thopter Squadron. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thopter_squadron.jpg
diff --git a/res/cardsfolder/tolsimir_wolfblood.txt b/res/cardsfolder/tolsimir_wolfblood.txt
index a612645f285..6e2a6a18ab7 100644
--- a/res/cardsfolder/tolsimir_wolfblood.txt
+++ b/res/cardsfolder/tolsimir_wolfblood.txt
@@ -3,7 +3,8 @@ ManaCost:4 G W
 Types:Legendary Creature Elf Warrior
 Text:Other green creatures you control get +1/+1.\r\nOther white creatures you control get +1/+1.
 PT:3/4
-K:abMakeToken T<>1<>Voja<>GW 2 2 Voja<>Controller<>GW<>Legendary;Creature;Wolf<>2<>2<>None<>put a legendary 2/2 green and white Wolf creature token named Voja onto the battlefield.
+#K:abMakeToken T<>1<>Voja<>GW 2 2 Voja<>Controller<>GW<>Legendary;Creature;Wolf<>2<>2<>None<>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$Controller|TokenColors$White,Green|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/trigon_of_infestation.txt b/res/cardsfolder/trigon_of_infestation.txt
index c31659d87b2..581e46df682 100644
--- a/res/cardsfolder/trigon_of_infestation.txt
+++ b/res/cardsfolder/trigon_of_infestation.txt
@@ -4,7 +4,8 @@ Types:Artifact
 Text:no text
 K:etbCounter:CHARGE:3
 A:AB$PutCounter|Cost$G G T|CounterType$CHARGE|CounterNum$1|SpellDescription$Put a charge counter on CARDNAME.
-K:abMakeToken 2 T SubCounter<1/CHARGE><>1<>Insect<>G 1 1 Insect Infect<>Controller<>G<>Creature;Insect<>1<>1<>Infect<>Put a 1/1 green Insect creature token with infect onto the battlefield.
+#K:abMakeToken 2 T SubCounter<1/CHARGE><>1<>Insect<>G 1 1 Insect Infect<>Controller<>G<>Creature;Insect<>1<>1<>Infect<>Put a 1/1 green Insect creature token with infect onto the battlefield.
+A:AB$Token|Cost$2 T SubCounter<1/CHARGE>|TokenAmount$1|TokenName$Insect|TokenTypes$Creature,Insect|TokenOwner$Controller|TokenColors$Green|TokenPower$1|TokenToughness$1|TokenKeywords$Infect|SpellDescription$Put a 1/1 green Insect creature token with infect onto the battlefield.  
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trigon_of_infestation.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/triskelavus.txt b/res/cardsfolder/triskelavus.txt
index ccb5c51f03c..43244cb3025 100644
--- a/res/cardsfolder/triskelavus.txt
+++ b/res/cardsfolder/triskelavus.txt
@@ -5,7 +5,8 @@ Text:(NOTE: Triskelavites do not have sacrifice abilities yet).
 PT:1/1
 K:Flying
 K:etbCounter:P1P1:3
-K:abMakeToken 1 SubCounter<1/P1P1><>1<>Triskelavite<>1 1 Triskelavite<>Controller<>0<>Artifact;Creature;Triskelavite<>1<>1<>Flying<>Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield.
+#K:abMakeToken 1 SubCounter<1/P1P1><>1<>Triskelavite<>1 1 Triskelavite<>Controller<>0<>Artifact;Creature;Triskelavite<>1<>1<>Flying<>Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield.
+A:AB$Token|Cost$1 SubCounter<1/P1P1>|TokenAmount$1|TokenName$Triskelavite|TokenTypes$Artifact,Creature,Triskelavite|TokenOwner$Controller|TokenColors$Colorless|TokenPower$1|TokenToughness$1|TokenKeywords$Flying|SpellDescription$Put a 1/1 colorless Triskelavite artifact creature token with flying onto the battlefield.  
 K:abDamageTgtCP Sac<1/Triskelavite>:1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/triskelavus.jpg
diff --git a/res/cardsfolder/urzas_factory.txt b/res/cardsfolder/urzas_factory.txt
index 3a2887f60db..afad2b1bd3b 100644
--- a/res/cardsfolder/urzas_factory.txt
+++ b/res/cardsfolder/urzas_factory.txt
@@ -3,7 +3,8 @@ ManaCost:no cost
 Types:Land Urza's
 Text:no text
 K:tap: add 1
-K:abMakeToken 7<>1<>Assembly-Worker<>C 2 2 Assembly-Worker<>Controller<>1<>Artifact;Creature;Assembly-Worker<>2<>2<>None<>Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield.
+#K:abMakeToken 7<>1<>Assembly-Worker<>C 2 2 Assembly-Worker<>Controller<>1<>Artifact;Creature;Assembly-Worker<>2<>2<>None<>Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield.
+A:AB$Token|Cost$7|TokenAmount$1|TokenName$Assembly-Worker|TokenTypes$Artifact,Creature,Assembly-Worker|TokenOwner$Controller|TokenColors$Colorless|TokenPower$2|TokenToughness$2|SpellDescription$Put a 2/2 colorless Assembly-Worker artifact creature token onto the battlefield.  
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_factory.jpg
 End
diff --git a/res/cardsfolder/vitu_ghazi_the_city_tree.txt b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
index 157b22d6517..48456fcbb73 100644
--- a/res/cardsfolder/vitu_ghazi_the_city_tree.txt
+++ b/res/cardsfolder/vitu_ghazi_the_city_tree.txt
@@ -3,7 +3,8 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:tap: add 1
-K:abMakeToken 2 G W T<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>put a 1/1 green Saproling creature token onto the battlefield.
+#K:abMakeToken 2 G W T<>1<>Saproling<>G 1 1 Saproling<>Controller<>G<>Creature;Saproling<>1<>1<>None<>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$Controller|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
 End
diff --git a/res/cardsfolder/wall_of_kelp.txt b/res/cardsfolder/wall_of_kelp.txt
index 3892358a81b..c88deb45d19 100644
--- a/res/cardsfolder/wall_of_kelp.txt
+++ b/res/cardsfolder/wall_of_kelp.txt
@@ -4,7 +4,8 @@ Types:Creature Wall
 Text:no text
 PT:0/3
 K:Defender
-K:abMakeToken U U T<>1<>Plant Wall<>U 0 1 Plant Wall<>Controller<>U<>Creature;Plant;Wall<>0<>1<>Defender<>put a 0/1 blue Plant Wall creature token with defender named Kelp onto the battlefield.
+#K:abMakeToken U U T<>1<>Plant Wall<>U 0 1 Plant Wall<>Controller<>U<>Creature;Plant;Wall<>0<>1<>Defender<>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$Controller|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:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/hm/en-us/card2959.jpg