diff --git a/res/cardsfolder/a/armada_wurm.txt b/res/cardsfolder/a/armada_wurm.txt
index 49ba145a8a2..cdfcc79980a 100644
--- a/res/cardsfolder/a/armada_wurm.txt
+++ b/res/cardsfolder/a/armada_wurm.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:5/5
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 5/5 Wurm creature token with trample onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample | TokenImage$ g 5 5 wurm rtr
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/armada_wurm.jpg
 SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/143.jpg
diff --git a/res/cardsfolder/c/call_of_the_conclave.txt b/res/cardsfolder/c/call_of_the_conclave.txt
index a14962e8c2b..fc48163852a 100644
--- a/res/cardsfolder/c/call_of_the_conclave.txt
+++ b/res/cardsfolder/c/call_of_the_conclave.txt
@@ -2,7 +2,7 @@ Name:Call of the Conclave
 ManaCost:G W
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
+A:SP$ Token | Cost$ G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 centaur rtr | 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/call_of_the_conclave.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/146.jpg
diff --git a/res/cardsfolder/c/centaurs_herald.txt b/res/cardsfolder/c/centaurs_herald.txt
index 590ebefed46..4e9775604a2 100644
--- a/res/cardsfolder/c/centaurs_herald.txt
+++ b/res/cardsfolder/c/centaurs_herald.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Elf Scout
 Text:no text
 PT:0/1
-A:AB$ Token | Cost$ 2 G Sac<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
+A:AB$ Token | Cost$ 2 G Sac<1/CARDNAME> | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 centaur rtr | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaurs_herald.jpg
 SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/118.jpg
diff --git a/res/cardsfolder/c/coursers_accord.txt b/res/cardsfolder/c/coursers_accord.txt
index 7d6edcaab2a..329da16cc00 100644
--- a/res/cardsfolder/c/coursers_accord.txt
+++ b/res/cardsfolder/c/coursers_accord.txt
@@ -2,7 +2,7 @@ Name:Coursers' Accord
 ManaCost:4 G W
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ 4 G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SubAbility$ DBChoose | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
+A:SP$ Token | Cost$ 4 G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 centaur rtr | SubAbility$ DBChoose | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 SVar:DBChoose:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.token+YouCtrl | SubAbility$ DBCopy | RememberChosen$ True
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/res/cardsfolder/e/eyes_in_the_skies.txt b/res/cardsfolder/e/eyes_in_the_skies.txt
index 1bb27a602ec..ccfd5fdaf04 100644
--- a/res/cardsfolder/e/eyes_in_the_skies.txt
+++ b/res/cardsfolder/e/eyes_in_the_skies.txt
@@ -2,7 +2,7 @@ Name:Eyes in the Skies
 ManaCost:3 W
 Types:Instant
 Text:no text
-A:SP$ Token | Cost$ 3 W | TokenImage$ W 1 1 Bird Flying | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ DBChoose | SpellDescription$ Put a 1/1 white Bird creature token with flying onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
+A:SP$ Token | Cost$ 3 W | TokenImage$ W 1 1 Bird Flying | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenImage$ w 1 1 bird rtr | SubAbility$ DBChoose | SpellDescription$ Put a 1/1 white Bird creature token with flying onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 SVar:DBChoose:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.token+YouCtrl | SubAbility$ DBCopy | RememberChosen$ True
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/g/goblin_rally.txt b/res/cardsfolder/g/goblin_rally.txt
index 92282aa153c..ccf7c372f0a 100644
--- a/res/cardsfolder/g/goblin_rally.txt
+++ b/res/cardsfolder/g/goblin_rally.txt
@@ -2,7 +2,7 @@ Name:Goblin Rally
 ManaCost:3 R R
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ 3 R R | TokenAmount$ 4 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put four 1/1 red Goblin creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 3 R R | TokenAmount$ 4 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ r 1 1 goblin rtr | SpellDescription$ Put four 1/1 red Goblin creature tokens onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rally.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/95.jpg
diff --git a/res/cardsfolder/g/grove_of_the_guardian.txt b/res/cardsfolder/g/grove_of_the_guardian.txt
index 57e69857f9c..ad038010e65 100644
--- a/res/cardsfolder/g/grove_of_the_guardian.txt
+++ b/res/cardsfolder/g/grove_of_the_guardian.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$ 3 G W T tapXType<2/Creature> Sac<1/CARDNAME> | CostDesc$ 3 G W T, Tap two untapped creatures you control, sacrifice CARDNAME: | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 8 | TokenToughness$ 8 | TokenKeywords$ Vigilance | SpellDescription$ Put an 8/8 green and white Elemental creature token with vigilance onto the battlefield.
+A:AB$ Token | Cost$ 3 G W T tapXType<2/Creature> Sac<1/CARDNAME> | CostDesc$ 3 G W T, Tap two untapped creatures you control, sacrifice CARDNAME: | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Green,White | TokenPower$ 8 | TokenToughness$ 8 | TokenKeywords$ Vigilance | TokenImage$ gw 8 8 elemental rtr | SpellDescription$ Put an 8/8 green and white Elemental creature token with vigilance onto the battlefield.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grove_of_the_guardian.jpg
 SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/240.jpg
diff --git a/res/cardsfolder/h/horncallers_chant.txt b/res/cardsfolder/h/horncallers_chant.txt
index 319f96a57bd..577d49cf861 100644
--- a/res/cardsfolder/h/horncallers_chant.txt
+++ b/res/cardsfolder/h/horncallers_chant.txt
@@ -2,7 +2,7 @@ Name:Horncaller's Chant
 ManaCost:7 G
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ 7 G | TokenAmount$ 1 | TokenName$ Rhino | TokenTypes$ Creature,Rhino | TokenColors$ Green | TokenOwner$ You | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Trample | SubAbility$ DBChoose | SpellDescription$ Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
+A:SP$ Token | Cost$ 7 G | TokenAmount$ 1 | TokenName$ Rhino | TokenTypes$ Creature,Rhino | TokenColors$ Green | TokenOwner$ You | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Trample | TokenImage$ g 4 4 rhino rtr | SubAbility$ DBChoose | SpellDescription$ Put a 4/4 green Rhino creature token with trample onto the battlefield, then populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 SVar:DBChoose:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.token+YouCtrl | SubAbility$ DBCopy | RememberChosen$ True
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/res/cardsfolder/k/knightly_valor.txt b/res/cardsfolder/k/knightly_valor.txt
index c10a67fa0bb..49d7f8ab84c 100644
--- a/res/cardsfolder/k/knightly_valor.txt
+++ b/res/cardsfolder/k/knightly_valor.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 4 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2 and has vigilance.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 2/2 white Knight creature token with vigilance onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight rtr
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/knightly_valor.jpg
 SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/13.jpg
diff --git a/res/cardsfolder/k/korozda_guildmage.txt b/res/cardsfolder/k/korozda_guildmage.txt
index eaf952b3b05..fcf7d4f1961 100644
--- a/res/cardsfolder/k/korozda_guildmage.txt
+++ b/res/cardsfolder/k/korozda_guildmage.txt
@@ -4,7 +4,7 @@ Types:Creature Elf Shaman
 Text:no text
 PT:2/2
 A:AB$ Pump | Cost$ 1 B G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Intimidate | SpellDescription$ Target creature gets +1/+1 and gains intimidate until end of turn.
-A:AB$ Token | Cost$ 2 B G Sac<1/Creature> | TokenAmount$ X | References$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the sacrificed creature's toughness.
+A:AB$ Token | Cost$ 2 B G Sac<1/Creature> | TokenAmount$ X | References$ X | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 saproling rtr | SpellDescription$ Put X 1/1 green Saproling creature tokens onto the battlefield, where X is the sacrificed creature's toughness.
 SVar:X:Sacrificed$CardToughness
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/korozda_guildmage.jpg
diff --git a/res/cardsfolder/p/precinct_captain.txt b/res/cardsfolder/p/precinct_captain.txt
index 64e3dc1a0a1..bab64feabe0 100644
--- a/res/cardsfolder/p/precinct_captain.txt
+++ b/res/cardsfolder/p/precinct_captain.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/2
 K:First Strike
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a 1/1 white Soldier creature token onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Soldier | TokenName$ Soldier | TokenColors$ White | TokenTypes$ Creature,Soldier | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ You | TokenAmount$ 1
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Soldier | TokenName$ Soldier | TokenColors$ White | TokenTypes$ Creature,Soldier | TokenPower$ 1 | TokenToughness$ 1 | TokenOwner$ You | TokenAmount$ 1 | TokenImage$ w 1 1 soldier rtr
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/precinct_captain.jpg
 SetInfo:RTR|Rare|http://magiccards.info/scans/en/rtr/17.jpg
diff --git a/res/cardsfolder/s/security_blockade.txt b/res/cardsfolder/s/security_blockade.txt
index 3ab8810a368..3b24b1bc3f5 100644
--- a/res/cardsfolder/s/security_blockade.txt
+++ b/res/cardsfolder/s/security_blockade.txt
@@ -7,7 +7,7 @@ A:SP$ Attach | Cost$ 2 W | ValidTgts$ Land | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Land.AttachedBy | AddAbility$ PreventDamage | Description$ Enchanted land has "Tap: Prevent the next 1 damage that would be dealt to you this turn."
 SVar:PreventDamage:AB$ PreventDamage | Cost$ T | Defined$ You | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to you this turn.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 2/2 white Knight creature token with vigilance onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight rtr
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/security_blockade.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/20.jpg
diff --git a/res/cardsfolder/s/selesnya_charm.txt b/res/cardsfolder/s/selesnya_charm.txt
index 6e3012e532b..fd6642a6e83 100644
--- a/res/cardsfolder/s/selesnya_charm.txt
+++ b/res/cardsfolder/s/selesnya_charm.txt
@@ -5,7 +5,7 @@ Text:no text
 A:SP$ Charm | Cost$ G W | Choices$ Buff,Exile,Knight | CharmNum$ 1 | SpellDescription$ Choose one - Target creature gets +2/+2 and gains trample until end of turn; or exile target creature with power 5 or greater; or put a 2/2 white Knight creature token with vigilance onto the battlefield.
 SVar:Buff:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature. | NumAtt$ 2 | NumDef$ 2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
 SVar:Exile:DB$ ChangeZone | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Choose target creature with power 5 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power 5 or greater.
-SVar:Knight:DB$ Token | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | SpellDescription$ Put a 2/2 white Knight creature token with vigilance onto the battlefield.
+SVar:Knight:DB$ Token | TokenAmount$ 1 | TokenName$ Knight | TokenTypes$ Creature,Knight | TokenOwner$ You | TokenColors$ White | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Vigilance | TokenImage$ w 2 2 knight rtr | SpellDescription$ Put a 2/2 white Knight creature token with vigilance onto the battlefield.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/selesnya_charm.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/194.jpg
diff --git a/res/cardsfolder/s/seller_of_songbirds.txt b/res/cardsfolder/s/seller_of_songbirds.txt
index fe051554665..5309d4c01d2 100644
--- a/res/cardsfolder/s/seller_of_songbirds.txt
+++ b/res/cardsfolder/s/seller_of_songbirds.txt
@@ -4,7 +4,7 @@ Types:Creature Human
 Text:no text
 PT:1/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 1/1 white Bird creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ W 1 1 Bird Flying | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenImage$ W 1 1 Bird Flying | TokenOwner$ You | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenImage$ w 1 1 bird rtr
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seller_of_songbirds.jpg
 SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/22.jpg
diff --git a/res/cardsfolder/s/slime_molding.txt b/res/cardsfolder/s/slime_molding.txt
index 8b7eec2daba..0e471fe79b0 100644
--- a/res/cardsfolder/s/slime_molding.txt
+++ b/res/cardsfolder/s/slime_molding.txt
@@ -2,7 +2,7 @@ Name:Slime Molding
 ManaCost:X G
 Types:Sorcery
 Text:no text
-A:SP$ Token | Cost$ X G | TokenImage$ G X X Ooze | TokenAmount$ 1 | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | References$ X | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield.
+A:SP$ Token | Cost$ X G | TokenImage$ G X X Ooze | TokenAmount$ 1 | TokenName$ Ooze | TokenTypes$ Creature,Ooze | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | References$ X | TokenImage$ g x x ooze rtr | SpellDescription$ Put an X/X green Ooze creature token onto the battlefield.
 SVar:X:Count$xPaid
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slime_molding.jpg
diff --git a/res/cardsfolder/s/survey_the_wreckage.txt b/res/cardsfolder/s/survey_the_wreckage.txt
index 567f9e8b7f9..ab3f54abb40 100644
--- a/res/cardsfolder/s/survey_the_wreckage.txt
+++ b/res/cardsfolder/s/survey_the_wreckage.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Sorcery
 Text:no text
 A:SP$ Destroy | Cost$ 4 R | ValidTgts$ Land | TgtPrompt$ Select target land | SubAbility$ DBGoblin | SpellDescription$ Destroy target land. Put a 1/1 red Goblin creature token onto the battlefield.
-SVar:DBGoblin:DB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1
+SVar:DBGoblin:DB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ r 1 1 goblin rtr
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/survey_the_wreckage.jpg
 SetInfo:RTR|Common|http://magiccards.info/scans/en/rtr/107.jpg
diff --git a/res/cardsfolder/u/utvara_hellkite.txt b/res/cardsfolder/u/utvara_hellkite.txt
index 1bab65e0b5f..9f377bc54cd 100644
--- a/res/cardsfolder/u/utvara_hellkite.txt
+++ b/res/cardsfolder/u/utvara_hellkite.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/6
 K:Flying
 T:Mode$ Attacks | ValidCard$ Dragon.YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a dragon you control attacks, put a 6/6 red dragon creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 6 | TokenToughness$ 6 | TokenKeywords$ Flying
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 6 | TokenToughness$ 6 | TokenKeywords$ Flying | TokenImage$ r 6 6 dragon rtr
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/utvara_hellkite.jpg
 SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/110.jpg
diff --git a/res/cardsfolder/v/vitu_ghazi_guildmage.txt b/res/cardsfolder/v/vitu_ghazi_guildmage.txt
index a527db9a5cb..b35a27a588c 100644
--- a/res/cardsfolder/v/vitu_ghazi_guildmage.txt
+++ b/res/cardsfolder/v/vitu_ghazi_guildmage.txt
@@ -3,7 +3,7 @@ ManaCost:G W
 Types:Creature Dryad Shaman
 Text:no text
 PT:2/2
-A:AB$ Token | Cost$ 4 G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
+A:AB$ Token | Cost$ 4 G W | TokenAmount$ 1 | TokenName$ Centaur | TokenTypes$ Creature,Centaur | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 centaur rtr | SpellDescription$ Put a 3/3 green Centaur creature token onto the battlefield.
 A:AB$ ChooseCard | Cost$ 2 G W | Defined$ You | Amount$ 1 | Choices$ Creature.token+YouCtrl | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ AtLeast1 | SpellDescription$ Populate. (Put a token onto the battlefield that's a copy of a creature token you control.)
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | NumCopies$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/res/cardsfolder/v/vraska_the_unseen.txt b/res/cardsfolder/v/vraska_the_unseen.txt
index 69be414b371..a0d2816ba9f 100644
--- a/res/cardsfolder/v/vraska_the_unseen.txt
+++ b/res/cardsfolder/v/vraska_the_unseen.txt
@@ -7,7 +7,7 @@ A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ Self
 SVar:TrigVraska:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ Card.Self | TriggerZones$ Battlefield | CombatDamage$ True | Execute$ VraskaGaze | TriggerDescription$ Until your next turn, whenever a creature deals combat damage to CARDNAME, destroy that creature.
 SVar:VraskaGaze:AB$ Destroy | Cost$ 0 | Defined$ TriggeredSource
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Destroy target nonland permanent.
-A:AB$ Token | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenAmount$ 3 | TokenName$ Assassin | TokenTypes$ Creature,Assassin | TokenOwner$ You | TokenImage$ B 1 1 Assassin | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | TokenTriggers$ TrigAssassin | TokenSVars$ Assassination,MustBeBlocked | SpellDescription$ Put three 1/1 black Assassin creature tokens onto the battlefield with "Whenever this creature deals combat damage to a player, that player loses the game."
+A:AB$ Token | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenAmount$ 3 | TokenName$ Assassin | TokenTypes$ Creature,Assassin | TokenOwner$ You | TokenImage$ B 1 1 Assassin rtr | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | TokenTriggers$ TrigAssassin | TokenSVars$ Assassination,MustBeBlocked | SpellDescription$ Put three 1/1 black Assassin creature tokens onto the battlefield with "Whenever this creature deals combat damage to a player, that player loses the game."
 SVar:TrigAssassin:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ Assassination | TriggerDescription$ Whenever this creature deals combat damage to a player, that player loses the game.
 SVar:Assassination:DB$ LosesGame | Defined$ TriggeredTarget
 SVar:MustBeBlocked:True
diff --git a/res/cardsfolder/w/worldspine_wurm.txt b/res/cardsfolder/w/worldspine_wurm.txt
index 65822437a73..1899a6e944d 100644
--- a/res/cardsfolder/w/worldspine_wurm.txt
+++ b/res/cardsfolder/w/worldspine_wurm.txt
@@ -7,7 +7,7 @@ K:Trample
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put three 5/5 green Wurm creature tokens with trample onto the battlefield.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.Self  | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME is put into a graveyard from anywhere, shuffle it into its owner's library.
 SVar:TrigShuffle:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ Self
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 3 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 3 | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Trample | TokenImage$ g 5 5 wurm rtr
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/worldspine_wurm.jpg
 SetInfo:RTR|Mythic|http://magiccards.info/scans/en/rtr/140.jpg
diff --git a/res/token-images.txt b/res/token-images.txt
index 591fbb9cbda..2e6156a03f5 100644
--- a/res/token-images.txt
+++ b/res/token-images.txt
@@ -2,6 +2,7 @@ b_0_0_germ.jpg                         http://www.cardforge.org/fpics/tokens/b_0
 b_0_1_insect.jpg                       http://www.cardforge.org/fpics/tokens/b_0_1_insect.jpg
 b_0_1_serf.jpg                         http://www.cardforge.org/fpics/tokens/b_0_1_serf.jpg
 b_0_1_thrull.jpg                       http://www.cardforge.org/fpics/tokens/b_0_1_thrull.jpg
+b_1_1_assassin_rtr.jpg                 http://www.cardforge.org/fpics/tokens/RTR/b_1_1_assassin_rtr.jpg
 b_1_1_bat.jpg                          http://www.cardforge.org/fpics/tokens/b_1_1_bat.jpg
 b_1_1_faerie_rogue.jpg                 http://www.cardforge.org/fpics/tokens/b_1_1_faerie_rogue.jpg
 b_1_1_festering_goblin.jpg             http://www.cardforge.org/fpics/tokens/b_1_1_festering_goblin.jpg
@@ -83,6 +84,7 @@ g_1_1_insect_infect.jpg                http://www.cardforge.org/fpics/tokens/g_1
 g_1_1_llanowar_elves.jpg               http://www.cardforge.org/fpics/tokens/g_1_1_llanowar_elves.jpg
 g_1_1_ooze.jpg                         http://www.cardforge.org/fpics/tokens/g_1_1_ooze.jpg
 g_1_1_saproling.jpg                    http://www.cardforge.org/fpics/tokens/g_1_1_saproling.jpg
+g_1_1_saproling_rtr.jpg                http://www.cardforge.org/fpics/tokens/RTR/g_1_1_saproling_rtr.jpg
 g_1_1_snake.jpg                        http://www.cardforge.org/fpics/tokens/g_1_1_snake.jpg
 g_1_1_spike.jpg                        http://www.cardforge.org/fpics/tokens/g_1_1_spike.jpg
 g_1_1_splinter.jpg                     http://www.cardforge.org/fpics/tokens/g_1_1_splinter.jpg
@@ -101,16 +103,20 @@ g_3_3_ape.jpg                          http://www.cardforge.org/fpics/tokens/g_3
 g_3_3_beast.jpg                        http://www.cardforge.org/fpics/tokens/g_3_3_beast.jpg
 g_3_3_centaur.jpg                      http://www.cardforge.org/fpics/tokens/g_3_3_centaur.jpg
 g_3_3_centaur_pro_black.jpg            http://www.cardforge.org/fpics/tokens/g_3_3_centaur_pro_black.jpg
+g_3_3_centaur_rtr.jpg                  http://www.cardforge.org/fpics/tokens/RTR/g_3_3_centaur_rtr.jpg
 g_3_3_elephant.jpg                     http://www.cardforge.org/fpics/tokens/g_3_3_elephant.jpg
 g_4_4_beast.jpg                        http://www.cardforge.org/fpics/tokens/g_4_4_beast.jpg
 g_4_4_elemental.jpg                    http://www.cardforge.org/fpics/tokens/g_4_4_elemental.jpg
+g_4_4_rhino_rtr.jpg                    http://www.cardforge.org/fpics/tokens/RTR/g_4_4_rhino_rtr.jpg
 g_5_5_beast.jpg                        http://www.cardforge.org/fpics/tokens/g_5_5_beast.jpg
+g_5_5_wurm_rtr.jpg                     http://www.cardforge.org/fpics/tokens/RTR/g_5_5_wurm_rtr.jpg
 g_6_1_insect.jpg                       http://www.cardforge.org/fpics/tokens/g_6_1_insect.jpg
 g_6_6_wurm.jpg                         http://www.cardforge.org/fpics/tokens/g_6_6_wurm.jpg
 g_7_7_elemental.jpg                    http://www.cardforge.org/fpics/tokens/g_7_7_elemental.jpg
 g_x_x_elemental.jpg                    http://www.cardforge.org/fpics/tokens/g_x_x_elemental.jpg
 g_x_x_elephant.jpg                     http://www.cardforge.org/fpics/tokens/g_x_x_elephant.jpg
 g_x_x_ooze.jpg                         http://www.cardforge.org/fpics/tokens/g_x_x_ooze.jpg
+g_x_x_ooze_rtr.jpg                     http://www.cardforge.org/fpics/tokens/RTR/g_x_x_ooze_rtr.jpg
 g_x_x_saproling.jpg                    http://www.cardforge.org/fpics/tokens/g_x_x_saproling.jpg
 g_x_x_wurm.jpg                         http://www.cardforge.org/fpics/tokens/g_x_x_wurm.jpg
 gr_1_1_dragon.jpg                      http://www.cardforge.org/fpics/tokens/gr_1_1_dragon.jpg
@@ -119,10 +125,12 @@ gu_2_2_drake.jpg                       http://www.cardforge.org/fpics/tokens/gu_
 gu_1_1_snake.jpg                       http://www.cardforge.org/fpics/tokens/gu_1_1_snake.jpg
 gw_1_1_elf_warrior.jpg                 http://www.cardforge.org/fpics/tokens/gw_1_1_elf_warrior.jpg
 gw_2_2_voja.jpg                        http://www.cardforge.org/fpics/tokens/gw_2_2_voja.jpg
+gw_8_8_elemental_rtr.jpg               http://www.cardforge.org/fpics/tokens/RTR/gw_8_8_elemental_rtr.jpg
 r_0_1_kobolds_of_kher_keep.jpg         http://www.cardforge.org/fpics/tokens/r_0_1_kobolds_of_kher_keep.jpg
 r_1_1_elemental_cat.jpg                http://www.cardforge.org/fpics/tokens/r_1_1_elemental_cat.jpg
 r_1_1_elemental.jpg                    http://www.cardforge.org/fpics/tokens/r_1_1_elemental.jpg
 r_1_1_goblin.jpg                       http://www.cardforge.org/fpics/tokens/r_1_1_goblin.jpg
+r_1_1_goblin_rtr.jpg                   http://www.cardforge.org/fpics/tokens/RTR/r_1_1_goblin_rtr.jpg
 r_1_1_goblin_scout.jpg                 http://www.cardforge.org/fpics/tokens/r_1_1_goblin_scout.jpg
 r_1_1_human_avr.jpg                    http://www.cardforge.org/fpics/tokens/r_1_1_human_avr.jpg 
 r_1_1_survivor.jpg                     http://www.cardforge.org/fpics/tokens/r_1_1_survivor.jpg
@@ -138,6 +146,7 @@ r_4_4_dragon.jpg                       http://www.cardforge.org/fpics/tokens/r_4
 r_4_4_giant.jpg                        http://www.cardforge.org/fpics/tokens/r_4_4_giant.jpg
 r_4_4_hellion.jpg                      http://www.cardforge.org/fpics/tokens/r_4_4_hellion.jpg
 r_5_5_dragon.jpg                       http://www.cardforge.org/fpics/tokens/r_5_5_dragon.jpg
+r_6_6_dragon_rtr.jpg                   http://www.cardforge.org/fpics/tokens/RTR/r_6_6_dragon_rtr.jpg
 r_7_1_elemental.jpg                    http://www.cardforge.org/fpics/tokens/r_7_1_elemental.jpg
 r_x_x_elemental.jpg                    http://www.cardforge.org/fpics/tokens/r_x_x_elemental.jpg
 rg_3_4_stangg_twin.jpg                 http://www.cardforge.org/fpics/tokens/rg_3_4_stangg_twin.jpg
@@ -169,6 +178,7 @@ w_0_1_goat.jpg                         http://www.cardforge.org/fpics/tokens/w_0
 w_1_1_bird.jpg                         http://www.cardforge.org/fpics/tokens/w_1_1_bird.jpg
 w_1_1_bird_flying.jpg                  http://www.cardforge.org/fpics/tokens/w_1_1_bird_flying.jpg
 w_1_1_bird_soldier.jpg                 http://www.cardforge.org/fpics/tokens/w_1_1_bird_soldier.jpg
+w_1_1_bird_rtr.jpg                     http://www.cardforge.org/fpics/tokens/RTR/w_1_1_bird_rtr.jpg
 w_1_1_citizen.jpg                      http://www.cardforge.org/fpics/tokens/w_1_1_citizen.jpg
 w_1_1_goldmeadow_harrier.jpg           http://www.cardforge.org/fpics/tokens/w_1_1_goldmeadow_harrier.jpg
 w_1_1_human_dka.jpg                    http://www.cardforge.org/fpics/tokens/w_1_1_human_dka.jpg 
@@ -178,12 +188,14 @@ w_1_1_kor_soldier.jpg                  http://www.cardforge.org/fpics/tokens/w_1
 w_1_1_pegasus.jpg                      http://www.cardforge.org/fpics/tokens/w_1_1_pegasus.jpg
 w_1_1_soldier.jpg                      http://www.cardforge.org/fpics/tokens/w_1_1_soldier.jpg
 w_1_1_soldier_ally.jpg                 http://www.cardforge.org/fpics/tokens/w_1_1_soldier_ally.jpg
+w_1_1_soldier_rtr.jpg                  http://www.cardforge.org/fpics/tokens/RTR/w_1_1_soldier_rtr.jpg
 w_1_1_spirit.jpg                       http://www.cardforge.org/fpics/tokens/w_1_1_spirit.jpg
 w_1_1_spirit_avr.jpg                   http://www.cardforge.org/fpics/tokens/w_1_1_spirit_avr.jpg
 w_2_2_cat.jpg                          http://www.cardforge.org/fpics/tokens/w_2_2_cat.jpg
 w_2_2_griffin.jpg                      http://www.cardforge.org/fpics/tokens/w_2_2_griffin.jpg
 w_2_2_knight.jpg                       http://www.cardforge.org/fpics/tokens/w_2_2_knight.jpg
 w_2_2_knight_first_strike.jpg          http://www.cardforge.org/fpics/tokens/w_2_2_knight_first_strike.jpg
+w_2_2_knight_rtr.jpg                   http://www.cardforge.org/fpics/tokens/RTR/w_2_2_knight_rtr.jpg
 w_2_2_reflection.jpg                   http://www.cardforge.org/fpics/tokens/w_2_2_reflection.jpg
 w_3_3_bird.jpg                         http://www.cardforge.org/fpics/tokens/w_3_3_bird.jpg
 w_3_3_spirit.jpg                       http://www.cardforge.org/fpics/tokens/w_3_3_spirit.jpg
@@ -197,6 +209,7 @@ wb_1_1_spirit.jpg                      http://www.cardforge.org/fpics/tokens/wb_
 wrg_8_8_beast.jpg                      http://www.cardforge.org/fpics/tokens/wrg_8_8_beast.jpg
 wr_1_1_goblin_soldier.jpg              http://www.cardforge.org/fpics/tokens/wr_1_1_goblin_soldier.jpg
 wu_1_1_bird.jpg                        http://www.cardforge.org/fpics/tokens/wu_1_1_bird.jpg
+
 # //Emblems and extras
 chandra_the_firebrand_effect.jpg       http://www.cardforge.org/fpics/effects/chandra_the_firebrand_effect.jpg
 elspeth_knight_errant_emblem.jpg       http://www.cardforge.org/fpics/effects/elspeth_knight_errant_emblem.jpg