diff --git a/forge-gui/res/cardsfolder/b/brood_keeper.txt b/forge-gui/res/cardsfolder/b/brood_keeper.txt
index 3852e68c249..54b950bb5ad 100644
--- a/forge-gui/res/cardsfolder/b/brood_keeper.txt
+++ b/forge-gui/res/cardsfolder/b/brood_keeper.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Creature Human Shaman
 PT:2/3
 T:Mode$ Attached | ValidSource$ Aura | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an Aura becomes attached to CARDNAME, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | TokenAbilities$ BroodPump
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ r 2 2 dragon M15 | TokenKeywords$ Flying | TokenAbilities$ BroodPump
 SVar:BroodPump:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:EnchantMe:Multiple
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_keeper.jpg
-Oracle:Whenever an Aura becomes attached to Brood Keeper, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
+Oracle:Whenever an Aura becomes attached to Brood Keeper, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/feral_incarnation.txt b/forge-gui/res/cardsfolder/f/feral_incarnation.txt
index 3efcf1a7f03..5bec22d1928 100644
--- a/forge-gui/res/cardsfolder/f/feral_incarnation.txt
+++ b/forge-gui/res/cardsfolder/f/feral_incarnation.txt
@@ -2,6 +2,6 @@ Name:Feral Incarnation
 ManaCost:8 G
 Types:Sorcery
 K:Convoke
-A:SP$ Token | Cost$ 8 G | TokenAmount$ 3 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put three 3/3 green Beast creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 8 G | TokenAmount$ 3 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 beast M15 | SpellDescription$ Put three 3/3 green Beast creature tokens onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/feral_incarnation.jpg
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nPut three 3/3 green Beast creature tokens onto the battlefield.
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nPut three 3/3 green Beast creature tokens onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/first_response.txt b/forge-gui/res/cardsfolder/f/first_response.txt
index a3d135bf49b..a97143c9acf 100644
--- a/forge-gui/res/cardsfolder/f/first_response.txt
+++ b/forge-gui/res/cardsfolder/f/first_response.txt
@@ -2,7 +2,7 @@ Name:First Response
 ManaCost:3 W
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 soldier M15
 SVar:X:Count$Controller$LifeLostLastTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/first_response.jpg
-Oracle:At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
+Oracle:At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
index 88b95d012fe..2bd6ad813b9 100644
--- a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
@@ -1,13 +1,13 @@
-Name:Goblin Rabblemaster
-ManaCost:2 R
-Types:Creature Goblin Warrior
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Other Goblin creatures you control attack each turn if able.
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
-SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | References$ X
-SVar:X:Count$Valid Goblin.attacking+Other
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rabblemaster.jpg
-Oracle:Other Goblin creatures you control attack each turn if able.\nAt the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.\nWhenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
+Name:Goblin Rabblemaster
+ManaCost:2 R
+Types:Creature Goblin Warrior
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Other Goblin creatures you control attack each turn if able.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ r 1 1 goblin M15 | TokenKeywords$ Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
+SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | References$ X
+SVar:X:Count$Valid Goblin.attacking+Other
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rabblemaster.jpg
+Oracle:Other Goblin creatures you control attack each turn if able.\nAt the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.\nWhenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hornet_nest.txt b/forge-gui/res/cardsfolder/h/hornet_nest.txt
index e4508833742..6204615da85 100644
--- a/forge-gui/res/cardsfolder/h/hornet_nest.txt
+++ b/forge-gui/res/cardsfolder/h/hornet_nest.txt
@@ -4,8 +4,8 @@ Types:Creature Insect
 PT:0/2
 K:Defender
 T:Mode$ DamageDone | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Deathtouch | References$ X
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 insect M15 | TokenKeywords$ Flying<>Deathtouch | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_nest.jpg
-Oracle:Defender (This creature can't attack.)\nWhenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
+Oracle:Defender (This creature can't attack.)\nWhenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hornet_queen.txt b/forge-gui/res/cardsfolder/h/hornet_queen.txt
index 7f91289c2cf..455b90150a3 100644
--- a/forge-gui/res/cardsfolder/h/hornet_queen.txt
+++ b/forge-gui/res/cardsfolder/h/hornet_queen.txt
@@ -5,6 +5,6 @@ PT:2/2
 K:Flying
 K:Deathtouch
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put four 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 4 | TokenName$ Insect | TokenImage$ G 1 1 Insect Deathtouch | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Deathtouch
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 4 | TokenName$ Insect | TokenImage$ G 1 1 Insect M15 | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Deathtouch
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_queen.jpg
-Oracle:Flying\nDeathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Hornet Queen enters the battlefield, put four 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
+Oracle:Flying\nDeathtouch (Any amount of damage this deals to a creature is enough to destroy it.)\nWhen Hornet Queen enters the battlefield, put four 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt b/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
index 6f41a233c7a..eb588d05b1d 100644
--- a/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
+++ b/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
@@ -2,9 +2,9 @@ Name:Necromancer's Stockpile
 ManaCost:1 B
 Types:Enchantment
 A:AB$ Draw | Cost$ 1 B Discard<1/Creature> | NumCards$ 1 | SubAbility$ DBToken | SpellDescription$ Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
-SVar:DBToken:DB$ Token | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X
+SVar:DBToken:DB$ Token | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie M15 | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X
 SVar:X:Discarded$Valid Card.Zombie
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_stockpile.jpg
-Oracle:{1}{B}, Discard a creature card: Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
+Oracle:{1}{B}, Discard a creature card: Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/raise_the_alarm.txt b/forge-gui/res/cardsfolder/r/raise_the_alarm.txt
index 82982d67e80..b70addb1ba9 100644
--- a/forge-gui/res/cardsfolder/r/raise_the_alarm.txt
+++ b/forge-gui/res/cardsfolder/r/raise_the_alarm.txt
@@ -1,6 +1,6 @@
 Name:Raise the Alarm
 ManaCost:1 W
 Types:Instant
-A:SP$ Token | Cost$ 1 W | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 soldier MRD | SpellDescription$ Put two 1/1 white Soldier creature tokens onto the battlefield.
+A:SP$ Token | Cost$ 1 W | TokenAmount$ 2 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 soldier M15 | SpellDescription$ Put two 1/1 white Soldier creature tokens onto the battlefield.
 SVar:Picture:http://resources.wizards.com/magic/cards/mrd/en-us/card48103.jpg
-Oracle:Put two 1/1 white Soldier creature tokens onto the battlefield.
+Oracle:Put two 1/1 white Soldier creature tokens onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sliver_hive.txt b/forge-gui/res/cardsfolder/s/sliver_hive.txt
index 731914c3a5e..60c44f005d3 100644
--- a/forge-gui/res/cardsfolder/s/sliver_hive.txt
+++ b/forge-gui/res/cardsfolder/s/sliver_hive.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Sliver | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.
-A:AB$ Token | Cost$ 5 T | IsPresent$ Sliver.YouCtrl | TokenAmount$ 1 | TokenName$ Sliver | TokenTypes$ Creature,Sliver | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
+A:AB$ Token | Cost$ 5 T | IsPresent$ Sliver.YouCtrl | TokenAmount$ 1 | TokenName$ Sliver | TokenTypes$ Creature,Sliver | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ c 1 1 sliver M15 | SpellDescription$ Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
 SVar:BuffedBy:Sliver
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hive.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
+Oracle:{T}: Add {1} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt b/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
index 6d369826699..d28f4a18bae 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Creature Avatar
 PT:6/6
 K:Reach
-A:AB$ 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:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | 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:AB$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | TokenImage$ g 3 3 beast M15 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
+A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3| TokenToughness$ 3 | TokenImage$ g 3 3 beast M15 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_zendikar.jpg
-Oracle:Reach\n{3}{G}{G}: Put a 3/3 green Beast creature token onto the battlefield.\n{3}{G}{G}, Exile Soul of Zendikar from your graveyard: Put a 3/3 green Beast creature token onto the battlefield.
+Oracle:Reach\n{3}{G}{G}: Put a 3/3 green Beast creature token onto the battlefield.\n{3}{G}{G}, Exile Soul of Zendikar from your graveyard: Put a 3/3 green Beast creature token onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/spirit_bonds.txt b/forge-gui/res/cardsfolder/s/spirit_bonds.txt
index b002db93aa2..b23925a8785 100644
--- a/forge-gui/res/cardsfolder/s/spirit_bonds.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_bonds.txt
@@ -2,8 +2,8 @@ Name:Spirit Bonds
 ManaCost:1 W
 Types:Enchantment
 T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ W | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+SVar:TrigToken:AB$ Token | Cost$ W | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 spirit M15 | TokenKeywords$ Flying
 A:AB$ Pump | Cost$ 1 W Sac<1/Spirit> | ValidTgts$ Creature.nonSpirit+YouCtrl | TgtPrompt$ Select target non-Spirit creature you control  | KW$ Indestructible | SpellDescription$ Target non-Spirit creature you control gains indestructible until end of turn.
 SVar:BuffedBy:Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_bonds.jpg
-Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.\n{1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
+Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.\n{1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/triplicate_spirits.txt b/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
index 46ea6c4febc..5f750d74a0c 100644
--- a/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
+++ b/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
@@ -2,6 +2,6 @@ Name:Triplicate Spirits
 ManaCost:4 W W
 Types:Sorcery
 K:Convoke
-A:SP$ Token | Cost$ 4 W 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$ 4 W W | TokenAmount$ 3 | TokenImage$ w 1 1 spirit M15 | 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:Picture:http://www.wizards.com/global/images/magic/general/triplicate_spirits.jpg
-Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nPut three 1/1 white Spirit creature tokens with flying onto the battlefield. (They can't be blocked except by creatures with flying or reach.)
+Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nPut three 1/1 white Spirit creature tokens with flying onto the battlefield. (They can't be blocked except by creatures with flying or reach.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/waste_not.txt b/forge-gui/res/cardsfolder/w/waste_not.txt
index fb677351af6..6c0a018723d 100644
--- a/forge-gui/res/cardsfolder/w/waste_not.txt
+++ b/forge-gui/res/cardsfolder/w/waste_not.txt
@@ -2,11 +2,11 @@ Name:Waste Not
 ManaCost:1 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Creature.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie M15 | 
 T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B} to your mana pool.
 SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 2 | Defined$ You
 T:Mode$ Discarded | ValidCard$ Card.nonLand+nonCreature+OppOwn | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a noncreature, nonland card, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_not.jpg
-Oracle:Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.\nWhenever an opponent discards a land card, add {B}{B} to your mana pool.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
+Oracle:Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.\nWhenever an opponent discards a land card, add {B}{B} to your mana pool.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
\ No newline at end of file